diff --git a/app/build.gradle b/app/build.gradle
index afb1e483343883a56b36d073f424395053e1cedf..8d6b07cd5fb340f8c91b616f5c1f0993c8f72b14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,6 +13,7 @@ android {
     }
 
     compileOptions {
+        encoding = 'UTF-8'
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml
index 95420f6f23a639625ad80de8387919269ddb8698..3b78875b0576a3df7dc81e4343738ad62118d612 100644
--- a/app/src/main/res/values/iconpack.xml
+++ b/app/src/main/res/values/iconpack.xml
@@ -4,8 +4,8 @@
 <item>aard</item>
 <item>aat</item>
 <item>abcore</item>
-<item>acaldav</item>
 <item>acal</item>
+    <item>acaldav</item>
 <item>activitylauncher</item>
 <item>adaway</item>
 <item>addi</item>
@@ -14,8 +14,8 @@
 <item>agit</item>
 <item>aizoban</item>
 <item>alarm</item>
+    <item>alogcat</item>
 <item>alogcatroot</item>
-<item>alogcat</item>
 <item>altcoin</item>
 <item>amaze</item>
 <item>ametro</item>
@@ -53,8 +53,8 @@
 <item>atomic</item>
 <item>audiofx</item>
 <item>aurdroid</item>
+    <item>aurora</item>
 <item>aurorastore</item>
-<item>aurora</item>
 <item>authenticator</item>
 <item>autoairplanemode</item>
 <item>autostarts</item>
@@ -92,8 +92,8 @@
 <item>bronylivewallpaper</item>
 <item>brouter</item>
 <item>browser</item>
-<item>bubblecomics</item>
 <item>bubble</item>
+    <item>bubblecomics</item>
 <item>budget</item>
 <item>budgetwatch</item>
 <item>bugreport</item>
@@ -101,12 +101,12 @@
 <item>bvnc</item>
 <item>cachecleaner</item>
 <item>cadroid</item>
-<item>calculator2</item>
 <item>calculator</item>
+    <item>calculator2</item>
 <item>caldavsync</item>
+    <item>calendar</item>
 <item>calendarie</item>
 <item>calendarnotifications</item>
-<item>calendar</item>
 <item>calendarwidget</item>
 <item>calendula</item>
 <item>callerid</item>
@@ -164,10 +164,10 @@
 <item>crocodilenote</item>
 <item>crosswords</item>
 <item>csipsimple</item>
+    <item>csploit</item>
 <item>csploit2</item>
-<item>csploit</item>
+    <item>cupsprint</item>
 <item>cupsprintservice</item>
-<item>cupsprint</item>
 <item>currencyconverter</item>
 <item>cythara</item>
 <item>dashclock</item>
@@ -209,8 +209,8 @@
 <item>drumon</item>
 <item>dspmanager</item>
 <item>dsub</item>
-<item>duckduckgo2</item>
 <item>duckduckgo</item>
+    <item>duckduckgo2</item>
 <item>dumbphoneassistant</item>
 <item>dvfont</item>
 <item>easer</item>
@@ -218,8 +218,8 @@
 <item>easytoken</item>
 <item>easyxkcd</item>
 <item>eddymalou</item>
-<item>editor920</item>
 <item>editor</item>
+    <item>editor920</item>
 <item>edslite</item>
 <item>effalerts</item>
 <item>electrum</item>
@@ -250,12 +250,12 @@
 <item>ffreddit</item>
 <item>ffupdater</item>
 <item>fileexplorer</item>
+    <item>filemanager</item>
 <item>filemanagerpro</item>
 <item>filemanagersc</item>
-<item>filemanager</item>
 <item>findmyphone</item>
+    <item>firefox</item>
 <item>firefoxfocus</item>
-<item>firefox</item>
 <item>firewall</item>
 <item>floatingstickies</item>
 <item>flym</item>
@@ -283,8 +283,8 @@
 <item>getbackgps</item>
 <item>ghostcommander</item>
 <item>gigaget</item>
-<item>github2</item>
 <item>github</item>
+    <item>github2</item>
 <item>gitlab</item>
 <item>gloomydungeons</item>
 <item>gltron</item>
@@ -390,8 +390,8 @@
 <item>malp</item>
 <item>manman</item>
 <item>manyverse</item>
-<item>mapsme</item>
 <item>maps</item>
+    <item>mapsme</item>
 <item>marblemaps</item>
 <item>markdownview</item>
 <item>markers</item>
@@ -413,12 +413,12 @@
 <item>micromath</item>
 <item>midisheetmusic</item>
 <item>mifare</item>
+    <item>mimanganu</item>
 <item>minetest</item>
 <item>minilens</item>
 <item>miniopenwlanmap</item>
 <item>ministro</item>
 <item>minivector</item>
-<item>minumanga</item>
 <item>mirakel</item>
 <item>miros</item>
 <item>mitzuli</item>
@@ -434,10 +434,10 @@
 <item>mtgfamiliar</item>
 <item>multirommgr</item>
 <item>mupdf</item>
+    <item>music</item>
 <item>musicplayergo</item>
-<item>music</item>
+    <item>mustard</item>
 <item>mustardmod</item>
-<item>mustard</item>
 <item>muzei</item>
 <item>myapplist</item>
 <item>mybanq</item>
@@ -461,8 +461,8 @@
 <item>neuralnetworks</item>
 <item>newpipe</item>
 <item>newsblur</item>
-<item>nextclouddev</item>
 <item>nextcloud</item>
+    <item>nextclouddev</item>
 <item>nextcloudtalk</item>
 <item>nhbooks</item>
 <item>nicecompass</item>
@@ -510,8 +510,8 @@
 <item>openobservatory</item>
 <item>openredmine</item>
 <item>opentraining</item>
-<item>openvpnsettings</item>
 <item>openvpn</item>
+    <item>openvpnsettings</item>
 <item>openwlanmap</item>
 <item>opesudoku</item>
 <item>orbot</item>
@@ -526,14 +526,14 @@
 <item>osmtracker</item>
 <item>osmuploader</item>
 <item>otaupdate</item>
-<item>otpauth</item>
 <item>otp</item>
+    <item>otpauth</item>
 <item>overchan</item>
+    <item>owncloud</item>
 <item>owncloudbeta</item>
 <item>owncloudnews</item>
 <item>owncloudnotes</item>
 <item>owncloudsms</item>
-<item>owncloud</item>
 <item>packetsender</item>
 <item>packlist</item>
 <item>paddletennis</item>
@@ -544,8 +544,8 @@
 <item>passwdsafe</item>
 <item>pdfcreator</item>
 <item>pdfreader</item>
+    <item>pedometer</item>
 <item>pedometer2</item>
-<item>pedometer</item>
 <item>penandpdf</item>
 <item>performancecontrol</item>
 <item>periodical</item>
@@ -575,8 +575,8 @@
 <item>pwdhash</item>
 <item>pwdstore</item>
 <item>pyload</item>
-<item>qksmspink</item>
 <item>qksms</item>
+    <item>qksmspink</item>
 <item>qrscanner</item>
 <item>qrstream</item>
 <item>quake1</item>
@@ -607,7 +607,6 @@
 <item>revolution</item>
 <item>rgbtool</item>
 <item>ringdroid</item>
-<item>ring</item>
 <item>riot</item>
 <item>ripple</item>
 <item>rmaps</item>
@@ -638,8 +637,8 @@
 <item>secrecy</item>
 <item>secscanqr</item>
 <item>secusodame</item>
-<item>secusodicegame</item>
 <item>secusodice</item>
+    <item>secusodicegame</item>
 <item>secusoludo</item>
 <item>secusomemory</item>
 <item>secusonotes</item>
@@ -662,8 +661,8 @@
 <item>seriesguide</item>
 <item>servdroid</item>
 <item>servestream</item>
+    <item>settings</item>
 <item>settings2</item>
-<item>settings</item>
 <item>sfen</item>
 <item>sgit</item>
 <item>shadereditor</item>
@@ -675,8 +674,8 @@
 <item>shoppinglist</item>
 <item>sicmuplayer</item>
 <item>sieben</item>
-<item>signalgenerator</item>
 <item>signal</item>
+    <item>signalgenerator</item>
 <item>sigspoof</item>
 <item>silentnight</item>
 <item>simplealarm</item>
@@ -708,16 +707,16 @@
 <item>slimfacebook</item>
 <item>smarterwifimanager</item>
 <item>smartnavi</item>
+    <item>sms</item>
 <item>sms2</item>
 <item>smsbackup</item>
 <item>smsscheduler</item>
 <item>smssecure</item>
-<item>sms</item>
 <item>snooperstopper</item>
 <item>snoopsnitch</item>
 <item>sokoban</item>
-<item>solitairecg</item>
 <item>solitaire</item>
+    <item>solitairecg</item>
 <item>soundrecorder</item>
 <item>soundwaves</item>
 <item>sparserss</item>
@@ -761,19 +760,19 @@
 <item>tapandturn</item>
 <item>taskbar</item>
 <item>taskkeeper</item>
-<item>tasks2</item>
 <item>tasks</item>
+    <item>tasks2</item>
 <item>taskwarrior</item>
 <item>td</item>
 <item>teatimer</item>
 <item>telegram</item>
 <item>tempmonitor</item>
+    <item>terminal</item>
 <item>terminalemulator</item>
-<item>terminal</item>
 <item>terminightor</item>
+    <item>termux</item>
 <item>termuxboot</item>
 <item>termuxfloat</item>
-<item>termux</item>
 <item>testnet3</item>
 <item>tethercompanion</item>
 <item>textfiction</item>
@@ -791,12 +790,12 @@
 <item>toffeed</item>
 <item>togozip</item>
 <item>tomdroid</item>
-<item>torchlight</item>
 <item>torch</item>
+    <item>torchlight</item>
 <item>torrentclient</item>
 <item>traccar</item>
-<item>transdroidsearch</item>
 <item>transdroid</item>
+    <item>transdroidsearch</item>
 <item>transdrone</item>
 <item>transistor</item>
 <item>transportr</item>
@@ -815,8 +814,8 @@
 <item>tusky</item>
 <item>tutanota</item>
 <item>tuxemon</item>
+    <item>tuxpaint</item>
 <item>tuxpaintconfig</item>
-<item>tuxpaint</item>
 <item>tuxrider</item>
 <item>tvkill</item>
 <item>twidere</item>
@@ -839,10 +838,10 @@
 <item>vinyl</item>
 <item>visualbitcoin</item>
 <item>vlc</item>
+    <item>voice</item>
 <item>voicedialer</item>
 <item>voicerecorder</item>
 <item>voicesmith</item>
-<item>voice</item>
 <item>vudroid</item>
 <item>vxconnectbot</item>
 <item>wakeonlan</item>
@@ -895,10 +894,10 @@
 <item>xdafeedreader</item>
 <item>xjackoverride</item>
 <item>xkcdviewer</item>
-<item>xposeddownloader</item>
 <item>xposed</item>
-<item>xprivacylua</item>
+    <item>xposeddownloader</item>
 <item>xprivacy</item>
+    <item>xprivacylua</item>
 <item>xsdl</item>
 <item>xskat</item>
 <item>yaab</item>
diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml
index 4f78f412c1dde2867a6ee5481e5eafbf568e2e39..68dc221a0a803d1ae6c6cedce72b37e51a6ef555 100644
--- a/app/src/main/res/xml/appfilter.xml
+++ b/app/src/main/res/xml/appfilter.xml
@@ -14,6 +14,9 @@
     <item
         component="ComponentInfo{ch.bailu.aat/ch.bailu.aat.activities.MainActivity}"
         drawable="aat" />
+    <item
+        component="ComponentInfo{com.greenaddress.abcore/com.greenaddress.abcore.MainActivity}"
+        drawable="abcore" />
     <item
         component="ComponentInfo{com.morphoss.acal/com.morphoss.acal.aCal}"
         drawable="acal" />
@@ -86,6 +89,9 @@
     <item
         component="ComponentInfo{fr.asterope/fr.asterope.MainActivity}"
         drawable="androidrun" />
+    <item
+        component="ComponentInfo{jp.ksksue.app.terminal/jp.ksksue.app.terminal.AndroidUSBSerialMonitorLite}"
+        drawable="androidusbterminal" />
     <item
         component="ComponentInfo{android.androidVNC/android.androidVNC.androidVNC}"
         drawable="androidvnc" />
@@ -101,6 +107,12 @@
     <item
         component="ComponentInfo{org.andstatus.app/org.andstatus.app.FirstActivity}"
         drawable="andstatus" />
+    <item
+        component="ComponentInfo{dev.dworks.apps.anexplorer.pro/dev.dworks.apps.anexplorer.DocumentsActivity}"
+        drawable="anexplorer" />
+    <item
+        component="ComponentInfo{dev.dworks.apps.anexplorer/dev.dworks.apps.anexplorer.DocumentsActivity}"
+        drawable="anexplorer" />
     <item
         component="ComponentInfo{gq.nulldev.animeopenings.app/gq.nulldev.animeopenings.app.ActivityNewVideo}"
         drawable="animeopenings" />
@@ -146,6 +158,9 @@
     <item
         component="ComponentInfo{axp.tool.apkextractor/axp.tool.apkextractor.MainActivity}"
         drawable="apkextractor" />
+    <item
+        component="ComponentInfo{taco.apkmirror/.activities.MainActivity}"
+        drawable="apkmirror" />
     <item
         component="ComponentInfo{fr.kwiatkowski.ApkTrack/fr.kwiatkowski.ApkTrack.MainActivity}"
         drawable="apktrack" />
@@ -173,6 +188,9 @@
     <item
         component="ComponentInfo{com.github.marmalade.aRevelation/com.github.marmalade.aRevelation.MainActivity}"
         drawable="arevelations" />
+    <item
+        component="ComponentInfo{com.gianlu.aria2android/com.gianlu.aria2android.MainActivity}"
+        drawable="aria2android" />
     <item
         component="ComponentInfo{com.tadamski.arij/com.tadamski.arij.account.activity.AccountSelectorActivity_}"
         drawable="arij" />
@@ -200,12 +218,13 @@
     <item
         component="ComponentInfo{com.android.musicfx/com.android.musicfx.ActivityMusic}"
         drawable="audiofx" />
-    <item
-        component="ComponentInfo{com.rascarlo.aurdroid/com.rascarlo.aurdroid.MainActivity}"
-        drawable="aurdroid" />
+
     <item
         component="ComponentInfo{org.lineageos.audiofx/org.lineageos.audiofx.activity.ActivityMusic}"
         drawable="audiofx" />
+    <item
+        component="ComponentInfo{com.rascarlo.aurdroid/com.rascarlo.aurdroid.MainActivity}"
+        drawable="aurdroid" />
     <item
         component="ComponentInfo{org.mozilla.fennec/org.mozilla.fennec.App}"
         drawable="aurora" />
@@ -215,6 +234,9 @@
     <item
         component="ComponentInfo{org.mozilla.fennec_aurora/org.mozilla.gecko.BrowserApp}"
         drawable="aurora" />
+    <item
+        component="ComponentInfo{com.dragons.aurora/.activities.AuroraActivity}"
+        drawable="aurorastore" />
     <item
         component="ComponentInfo{com.google.android.apps.authenticator2/com.google.android.apps.authenticator.AuthenticatorActivity}"
         drawable="authenticator" />
@@ -236,6 +258,9 @@
     <item
         component="ComponentInfo{org.jfet.batsHIIT/org.jfet.batsHIIT.HIITMain}"
         drawable="batshiit" />
+    <item
+        component="ComponentInfo{com.slash.batterychargelimit/com.slash.batterychargelimit.activities.MainActivity}"
+        drawable="batterychargelimit" />
     <item
         component="ComponentInfo{com.tobykurien.batteryfu/com.tobykurien.batteryfu.ModeSelect}"
         drawable="batteryfu" />
@@ -254,6 +279,9 @@
     <item
         component="ComponentInfo{com.beem.project.beem/com.beem.project.beem.ui.Login}"
         drawable="beem" />
+    <item
+        component="ComponentInfo{com.vlath.keyboard/com.vlath.keyboard.Main}"
+        drawable="behekeyboard" />
     <item
         component="ComponentInfo{net.iexos.musicalarm/net.iexos.musicalarm.AlarmViewActivity}"
         drawable="bipolalarm" />
@@ -263,6 +291,9 @@
     <item
         component="ComponentInfo{org.birthdayadapter.free/org.birthdayadapter.ui.BaseActivity}"
         drawable="birthdayadapter" />
+    <item
+        component="ComponentInfo{com.tmendes.birthdaydroid/.MainActivity}"
+        drawable="birthdaydroid" />
     <item
         component="ComponentInfo{com.rigid.birthdroid/com.rigid.birthdroid.BirthdroidActivity}"
         drawable="birthdroid" />
@@ -282,7 +313,7 @@
         component="ComponentInfo{se.leap.bitmaskclient/se.leap.bitmaskclient.StartActivity}"
         drawable="bitmask" />
     <item
-        component="ComponentInfo{com.x8bit.bitwarden/md5fb78b69c5ddbc157f4db38fd738139a6.SplashActivity}"
+        component="ComponentInfo{com.x8bit.bitwarden/md5b95ad25b85f158431f24aa9fc17a1c1e.SplashActivity}"
         drawable="bitwarden" />
     <item
         component="ComponentInfo{org.blokada.alarm/org.blokada.ui.app.android.MainActivity}"
@@ -323,6 +354,9 @@
     <item
         component="ComponentInfo{org.briarproject.briar.beta/org.briarproject.briar.android.splash.SplashScreenActivity}"
         drawable="briar" />
+    <item
+        component="ComponentInfo{de.tobiasbielefeld.brickgames/de.tobiasbielefeld.brickgames.ui.Main}"
+        drawable="brickgames" />
     <item
         component="ComponentInfo{com.android.cellbroadcastreceiver/com.android.cellbroadcastreceiver.CellBroadcastListActivity}"
         drawable="broadcast" />
@@ -401,6 +435,12 @@
     <item
         component="ComponentInfo{com.notriddle.budget/com.notriddle.budget.EnvelopesActivity}"
         drawable="budget" />
+    <item
+        component="ComponentInfo{protect.budgetwatch/protect.budgetwatch.MainActivity}"
+        drawable="budgetwatch" />
+    <item
+        component="ComponentInfo{protect.budgetwatch.play/protect.budgetwatch.MainActivity}"
+        drawable="budgetwatch" />
     <item
         component="ComponentInfo{org.cyanogenmod.bugreport/org.cyanogenmod.bugreport.CrashFeedbackActivity}"
         drawable="bugreport" />
@@ -527,6 +567,9 @@
     <item
         component="ComponentInfo{com.call.recorder/com.call.recorder.MainActivity}"
         drawable="callrecorder" />
+    <item
+        component="ComponentInfo{com.github.axet.callrecorder/com.github.axet.callrecorder.activities.MainActivity}"
+        drawable="callrecorder" />
     <item
         component="ComponentInfo{com.android.camera/com.android.camera.CamcorderEntry}"
         drawable="camcorder" />
@@ -575,6 +618,9 @@
     <item
         component="ComponentInfo{com.jadn.cc/com.jadn.cc.ui.CarCast}"
         drawable="carcast" />
+    <item
+        component="ComponentInfo{com.spisoft.quicknote/com.spisoft.quicknote.MainActivity}"
+        drawable="carnet" />
     <item
         component="ComponentInfo{me.kuehle.carreport/me.kuehle.carreport.gui.MainActivity}"
         drawable="carreport" />
@@ -617,9 +663,15 @@
     <item
         component="ComponentInfo{org.chromium.chrome/com.google.android.apps.chrome.Main}"
         drawable="chromium" />
+    <item
+        component="ComponentInfo{com.nathanosman.chronosnap/com.nathanosman.chronosnap.ui.MainActivity}"
+        drawable="chronosnap" />
     <item
         component="ComponentInfo{us.lindanrandy.cidrcalculator/us.lindanrandy.cidrcalculator.CIDRCalculator}"
         drawable="cidrcalc" />
+    <item
+        component="ComponentInfo{com.cityzen.cityzen/com.cityzen.cityzen.Activities.SplashScreenActivity}"
+        drawable="cityzen" />
     <item
         component="ComponentInfo{de.qspool.clementineremote/de.qspool.clementineremote.ui.ConnectDialog}"
         drawable="clementineremote" />
@@ -860,6 +912,9 @@
     <item
         component="ComponentInfo{com.android.providers.contacts/com.android.providers.contacts.debug.ContactsDumpActivity}"
         drawable="contacts" />
+    <item
+        component="ComponentInfo{de.k3b.android.contentproviderhelper/com.jensdriller.contentproviderhelper.ui.activity.MainActivity}"
+        drawable="contentproviderhelper" />
     <item
         component="ComponentInfo{com.github.nutomic.controldlna/com.github.nutomic.controldlna.gui.MainActivity}"
         drawable="controldlna" />
@@ -875,6 +930,12 @@
     <item
         component="ComponentInfo{me.tsukanov.counter/me.tsukanov.counter.ui.MainActivity}"
         drawable="counterme" />
+    <item
+        component="ComponentInfo{org.pipoypipagames.cowsrevenge/org.godotengine.godot.Godot}"
+        drawable="cowsrevenge" />
+    <item
+        component="ComponentInfo{com.kgurgul.cpuinfo/com.kgurgul.cpuinfo.features.HostActivity}"
+        drawable="cpuinfo" />
     <item
         component="ComponentInfo{org.carbonrom.quarks/org.carbonrom.quarks.MainActivity}"
         drawable="crbrowser" />
@@ -965,12 +1026,15 @@
     <item
         component="ComponentInfo{ir.hsn6.defendo/org.godotengine.godot.Godot}"
         drawable="defendo" />
+    <item
+        component="ComponentInfo{com.b44t.messenger/com.b44t.messenger.LaunchActivity}"
+        drawable="deltachat" />
     <item
         component="ComponentInfo{com.workingagenda.democracydroid/com.workingagenda.democracydroid.MainActivity}"
         drawable="democracydroid" />
     <item
-        component="ComponentInfo{org.jak_linux.dns66/org.jak_linux.dns66.MainActivity}"
-        drawable="dns66" />
+        component="ComponentInfo{org.asnelt.derandom/org.asnelt.derandom.MainActivity}"
+        drawable="derandom" />
     <item
         component="ComponentInfo{net.screenfreeze.deskcon/net.screenfreeze.deskcon.MainActivity}"
         drawable="deskcon" />
@@ -1007,6 +1071,9 @@
     <item
         component="ComponentInfo{com.google.android.diskusage/com.google.android.diskusage.SelectActivity}"
         drawable="diskusage" />
+    <item
+        component="ComponentInfo{org.jak_linux.dns66/org.jak_linux.dns66.MainActivity}"
+        drawable="dns66" />
     <item
         component="ComponentInfo{io.github.otakuchiyan.dnsman/io.github.otakuchiyan.dnsman.MainActivity}"
         drawable="dnsman" />
@@ -1077,7 +1144,7 @@
         component="ComponentInfo{github.daneren2005.dsub/github.daneren2005.dsub.activity.SubsonicFragmentActivity}"
         drawable="dsub" />
     <item
-        component="ComponentInfo{com.duckduckgo.mobile.android/com.duckduckgo.mobile.android.activity.DuckDuckGo}"
+        component="ComponentInfo{com.duckduckgo.mobile.android/com.duckduckgo.app.launch.LaunchActivity}"
         drawable="duckduckgo" />
     <item
         component="ComponentInfo{se.johanhil.duckduckgo/se.johanhil.duckduckgo.DuckDuckGoSettings}"
@@ -1088,24 +1155,24 @@
     <item
         component="ComponentInfo{org.sufficientlysecure.viewer.fontpack/org.sufficientlysecure.viewer.fontpack.ui.MainActivity}"
         drawable="dvfont" />
+    <item
+        component="ComponentInfo{ryey.easer/.core.ui.MainActivity}"
+        drawable="easer" />
     <item
         component="ComponentInfo{net.pejici.easydice/net.pejici.easydice.DiceRollerActivity}"
         drawable="easydice" />
     <item
         component="ComponentInfo{app.easytoken/app.easytoken.MainActivity}"
         drawable="easytoken" />
-    <item
-        component="ComponentInfo{com.tap.xkcd_reader/com.tap.xkcd_reader.Activities.MainActivity}"
-        drawable="easyxkcd" />
-    <item
-        component="ComponentInfo{com.tap.xkcd_reader/de.tap.easy_xkcd.Activities.MainActivity}"
-        drawable="easyxkcd" />
     <item
         component="ComponentInfo{de.tap.easy_xkcd/de.tap.easy_xkcd.Activities.MainActivity}"
         drawable="easyxkcd" />
     <item
         component="ComponentInfo{com.f0x.eddymalou/com.f0x.eddymalou.MainActivity}"
         drawable="eddymalou" />
+    <item
+        component="ComponentInfo{org.billthefarmer.editor/Editor}"
+        drawable="editor" />
     <item
         component="ComponentInfo{com.jecelyin.editor/com.jecelyin.editor.JecEditor}"
         drawable="editor920" />
@@ -1113,8 +1180,8 @@
         component="ComponentInfo{com.jecelyin.editor.v2/com.jecelyin.editor.v2.ui.MainActivity}"
         drawable="editor920" />
     <item
-        component="ComponentInfo{org.billthefarmer.editor/org.billthefarmer.editor.Editor}"
-        drawable="editor920" />
+        component="ComponentInfo{com.sovworks.edslite/com.sovworks.eds.android.filemanager.activities.FileManagerActivity}"
+        drawable="edslite" />
     <item
         component="ComponentInfo{org.eff.actioncenter/CordovaApp}"
         drawable="effalerts" />
@@ -1127,6 +1194,9 @@
     <item
         component="ComponentInfo{com.ultramegatech.ey/com.ultramegatech.ey.PeriodicTableActivity}"
         drawable="elementary" />
+    <item
+        component="ComponentInfo{ru.henridellal.dialer/ru.henridellal.dialer.DialerActivity}"
+        drawable="emeralddialer" />
     <item
         component="ComponentInfo{de.vanitasvitae.enigmandroid/de.vanitasvitae.enigmandroid.MainActivity}"
         drawable="enigmandroid" />
@@ -1148,18 +1218,33 @@
     <item
         component="ComponentInfo{ws.xsoh.etar/com.android.calendar.AllInOneActivity}"
         drawable="etarcalendar" />
+    <item
+        component="ComponentInfo{eu.depau.etchdroid/eu.depau.etchdroid.activities.StartActivity}"
+        drawable="etchdroid" />
     <item
         component="ComponentInfo{net.sf.ethersynth/net.sf.ethersynth.EtherSynthActivity}"
         drawable="ethersynth" />
+    <item
+        component="ComponentInfo{de.pinyto.exalteddicer/de.pinyto.exalteddicer.MainActivity}"
+        drawable="exalteddicer" />
     <item
         component="ComponentInfo{com.android.exchange/com.android.exchange.EasCertificateRequestor}"
         drawable="exchange" />
     <item
         component="ComponentInfo{com.android.exchange/com.android.exchange.SettingsRedirector}"
         drawable="exchange" />
+    <item
+        component="ComponentInfo{org.eu.exodus_privacy.exodusprivacy/org.eu.exodus_privacy.exodusprivacy.MainActivity}"
+        drawable="exodusprivacy" />
     <item
         component="ComponentInfo{org.surrel.facebooknotifications/org.surrel.facebooknotifications.MainActivity}"
         drawable="facebooknotifications" />
+    <item
+        component="ComponentInfo{eu.faircode.email/eu.faircode.email.ActivityMain}"
+        drawable="fairemail" />
+    <item
+        component="ComponentInfo{cl.coders.faketraveler/cl.coders.faketraveler.MainActivity}"
+        drawable="faketraveler" />
     <item
         component="ComponentInfo{org.fastergps/org.fastergps.ui.BaseActivity}"
         drawable="fastergps" />
@@ -1241,9 +1326,6 @@
     <item
         component="ComponentInfo{eu.faircode.finegeotag/eu.faircode.finegeotag.ActivitySettings}"
         drawable="finegeotag" />
-    <item
-        component="ComponentInfo{cn.mozilla.firefox/cn.mozilla.firefox.App}"
-        drawable="firefox" />
     <item
         component="ComponentInfo{org.mozilla.firefox/org.mozilla.firefox.App}"
         drawable="firefox" />
@@ -1295,6 +1377,9 @@
     <item
         component="ComponentInfo{org.legtux.m_316k.fortune/org.legtux.m_316k.fortune.MainActivity}"
         drawable="fortunes" />
+    <item
+        component="ComponentInfo{de.baumann.browser.Ninja/de.baumann.browser.Activity.BrowserActivity}"
+        drawable="fossbrowser" />
     <item
         component="ComponentInfo{de.k3b.android.androFotoFinder/de.k3b.android.androFotoFinder.FotoGalleryActivity}"
         drawable="fotofinder" />
@@ -1307,9 +1392,18 @@
     <item
         component="ComponentInfo{de.cwde.freeshisen/de.cwde.freeshisen.ShisenShoActivity}"
         drawable="freeshisen" />
+    <item
+        component="ComponentInfo{nf.frex.android/nf.frex.android.FrexActivity}"
+        drawable="frex" />
     <item
         component="ComponentInfo{de.wikilab.android.friendica01/de.wikilab.android.friendica01.HomeActivity}"
         drawable="friendica" />
+    <item
+        component="ComponentInfo{io.github.froodyapp/io.github.froodyapp.activity.MainActivity}"
+        drawable="froody" />
+    <item
+        component="ComponentInfo{com.dkanada.icecons/com.dkanada.icecons.activities.MainActivity}"
+        drawable="frost" />
     <item
         component="ComponentInfo{org.jfedor.frozenbubble/com.efortin.frozenbubble.HomeScreen}"
         drawable="frozenbuble" />
@@ -1439,6 +1533,9 @@
     <item
         component="ComponentInfo{com.mendhak.gpslogger/com.mendhak.gpslogger.GpsMainActivity}"
         drawable="gpslogger" />
+    <item
+        component="ComponentInfo{com.android.gpstest.osmdroid/com.android.gpstest.GpsTestActivity}"
+        drawable="gpstest" />
     <item
         component="ComponentInfo{org.omnirom.gramophone/com.kabouzeid.gramophone.ui.activities.MainActivity}"
         drawable="gramophone" />
@@ -1496,6 +1593,9 @@
     <item
         component="ComponentInfo{io.github.hidroh.materialistic/io.github.hidroh.materialistic.Application}"
         drawable="hn" />
+    <item
+        component="ComponentInfo{io.github.hidroh.materialistic/io.github.hidroh.materialistic.LauncherActivity}"
+        drawable="hn" />
     <item
         component="ComponentInfo{com.omegavesko.holocounter/com.omegavesko.simplecounter.MainActivity}"
         drawable="holocounter" />
@@ -1505,12 +1605,18 @@
     <item
         component="ComponentInfo{com.tortuca.holoken/com.tortuca.holoken.MainActivity}"
         drawable="holokenmod" />
+    <item
+        component="ComponentInfo{com.dynamicg.homebuttonlauncher/com.dynamicg.homebuttonlauncher.MainActivityOpen}"
+        drawable="homelauncher" />
     <item
         component="ComponentInfo{com.jwetherell.heart_rate_monitor/com.jwetherell.heart_rate_monitor.HeartRateMonitor}"
         drawable="hrm" />
     <item
         component="ComponentInfo{de.nico.ha_manager/de.nico.ha_manager.activities.Main}"
         drawable="hwmanager" />
+    <item
+        component="ComponentInfo{com.roguetemple.hyperroid/com.roguetemple.hyperroid.HyperRogue}"
+        drawable="hyperrogue" />
     <item
         component="ComponentInfo{net.i2p.android/net.i2p.android.I2PActivity}"
         drawable="i2p" />
@@ -1553,6 +1659,9 @@
     <item
         component="ComponentInfo{uk.co.ashtonbrsc.android.intentintercept/uk.co.ashtonbrsc.intentexplode.StartupActivity}"
         drawable="intentexplode" />
+    <item
+        component="ComponentInfo{de.k3b.android.intentintercept/uk.co.ashtonbrsc.intentexplode.StartupActivity}"
+        drawable="intentintercept" />
     <item
         component="ComponentInfo{org.safermobile.intheclear/org.safermobile.intheclear.apps.Panic}"
         drawable="intheclear" />
@@ -1565,6 +1674,9 @@
     <item
         component="ComponentInfo{org.woltage.irssiconnectbot/org.woltage.irssiconnectbot.HostListActivity}"
         drawable="irssiconnectbot" />
+    <item
+        component="ComponentInfo{ru.playsoftware.j2meloader/ru.playsoftware.j2meloader.MainActivity}"
+        drawable="j2meloader" />
     <item
         component="ComponentInfo{uk.co.jarofgreen.JustADamnCompass/uk.co.jarofgreen.JustADamnCompass.MainActivity}"
         drawable="jadcompass" />
@@ -1640,6 +1752,9 @@
     <item
         component="ComponentInfo{com.nhellfire.kerneladiutor/com.grarak.kerneladiutor.activities.StartActivityMaterial}"
         drawable="kerneladiutor" />
+    <item
+        component="ComponentInfo{com.kunzisoft.keyboard.switcher/com.kunzisoft.keyboard.switcher.settings.PreferenceActivity}"
+        drawable="keyboardswitcher" />
     <item
         component="ComponentInfo{de.enaikoon.android.keypadmapper3/org.osm.keypadmapper2.KeypadMapper2Activity}"
         drawable="keypadmapper" />
@@ -1652,6 +1767,12 @@
     <item
         component="ComponentInfo{org.kiwix.kiwixmobile/org.kiwix.kiwixmobile.utils.SplashActivity}"
         drawable="kiwix" />
+    <item
+        component="ComponentInfo{io.github.lonamiwebs.klooni/io.github.lonamiwebs.klooni.AndroidLauncher}"
+        drawable="klooni" />
+    <item
+        component="ComponentInfo{me.impa.knockonports/me.impa.knockonports.MainActivity}"
+        drawable="knockonports" />
     <item
         component="ComponentInfo{org.xbmc.kodi/org.xbmc.kodi.Splash}"
         drawable="kodi" />
@@ -1697,6 +1818,9 @@
     <item
         component="ComponentInfo{com.cgogolin.library/com.cgogolin.library.Library}"
         drawable="library" />
+    <item
+        component="ComponentInfo{app.librenews.io.librenews/app.librenews.io.librenews.views.MainFlashActivity}"
+        drawable="librenews" />
     <item
         component="ComponentInfo{com.collabora.libreoffice/com.collabora.libreoffice.LibreOfficeMainActivity}"
         drawable="libreoffice" />
@@ -1766,6 +1890,9 @@
     <item
         component="ComponentInfo{info.guardianproject.lildebi/info.guardianproject.lildebi.LilDebi}"
         drawable="lildebi" />
+    <item
+        component="ComponentInfo{com.limbo.emu.main/com.limbo.emu.main.LimboEmuActivity}"
+        drawable="limbo" />
     <item
         component="ComponentInfo{felixwiemuth.lincal/felixwiemuth.lincal.ui.CalendarListActivity}"
         drawable="lincal" />
@@ -1805,6 +1932,9 @@
     <item
         component="ComponentInfo{org.sufficientlysecure.localcalendar/org.sufficientlysecure.localcalendar.ui.MainActivity}"
         drawable="localcalendar" />
+    <item
+        component="ComponentInfo{org.thosp.yourlocalweather/.MainActivity}"
+        drawable="localweather" />
     <item
         component="ComponentInfo{info.guardianproject.locationprivacy/info.guardianproject.locationprivacy.MainActivity}"
         drawable="locationprivacy" />
@@ -1835,6 +1965,12 @@
     <item
         component="ComponentInfo{org.lumicall.android/org.lumicall.android.sip.RegisterAccount}"
         drawable="lumicall" />
+    <item
+        component="ComponentInfo{com.rehanced.lunary/rehanced.com.simpleetherwallet.activities.MainActivity}"
+        drawable="lunary" />
+    <item
+        component="ComponentInfo{com.topjohnwu.magisk/a.c}"
+        drawable="magiskmanager" />
     <item
         component="ComponentInfo{com.anoshenko.android.mahjongg/com.anoshenko.android.mahjongg.SelectActivity}"
         drawable="mahjonggbuilder" />
@@ -1844,9 +1980,24 @@
     <item
         component="ComponentInfo{com.google.android.email/com.android.email.activity.Welcome}"
         drawable="mail" />
+    <item
+        component="ComponentInfo{org.gateshipone.malp/org.gateshipone.malp.application.activities.SplashActivity}"
+        drawable="malp" />
+    <item
+        component="ComponentInfo{org.gateshipone.malp/.application.activities.SplashActivity}"
+        drawable="malp" />
     <item
         component="ComponentInfo{com.adonai.manman/com.adonai.manman.MainPagerActivity}"
         drawable="manman" />
+    <item
+        component="ComponentInfo{se.manyver/se.manyver.MainActivity}"
+        drawable="manyverse" />
+    <item
+        component="ComponentInfo{com.github.axet.maps/com.mapswithme.maps.SplashActivity}"
+        drawable="maps" />
+    <item
+        component="ComponentInfo{com.github.axet.maps/com.mapswithme.maps.DownloadResourcesActivity}"
+        drawable="maps" />
     <item
         component="ComponentInfo{com.mapswithme.maps/com.mapswithme.maps.DownloadResourcesActivity}"
         drawable="mapsme" />
@@ -1871,6 +2022,9 @@
     <item
         component="ComponentInfo{net.gsantner.markor/net.gsantner.markor.activity.MainActivity}"
         drawable="markor" />
+    <item
+        component="ComponentInfo{fr.gouv.etalab.mastodon/fr.gouv.etalab.mastodon.activities.SplashActivity}"
+        drawable="mastalab" />
     <item
         component="ComponentInfo{org.materialos.icons/com.afollestad.polar.ui.SplashScreen}"
         drawable="materialicons" />
@@ -1934,6 +2088,12 @@
     <item
         component="ComponentInfo{de.syss.MifareClassicTool/de.syss.MifareClassicTool.Activities.MainMenu}"
         drawable="mifare" />
+    <item
+        component="ComponentInfo{ar.rulosoft.mimanganu/ar.rulosoft.mimanganu.ActivityMisMangas}"
+        drawable="mimanganu" />
+    <item
+        component="ComponentInfo{ar.rulosoft.mimanganu/ar.rulosoft.mimanganu.MainActivity}"
+        drawable="mimanganu" />
     <item
         component="ComponentInfo{net.minetest.minetest/net.minetest.minetest.MtNativeActivity}"
         drawable="minetest" />
@@ -1953,11 +2113,8 @@
         component="ComponentInfo{org.kde.ministro.config/org.kde.ministro.config.MinistroConfigurationToolActivity}"
         drawable="ministro" />
     <item
-        component="ComponentInfo{ar.rulosoft.mimanganu/ar.rulosoft.mimanganu.ActivityMisMangas}"
-        drawable="minumanga" />
-    <item
-        component="ComponentInfo{ar.rulosoft.mimanganu/ar.rulosoft.mimanganu.MainActivity}"
-        drawable="minumanga" />
+        component="ComponentInfo{com.lavadip.miniVector/im.vector.activity.LoginActivity}"
+        drawable="minivector" />
     <item
         component="ComponentInfo{de.azapps.mirakelandroid/de.azapps.mirakel.new_ui.activities.SplashScreenActivity}"
         drawable="mirakel" />
@@ -2078,6 +2235,9 @@
     <item
         component="ComponentInfo{org.lineageos.eleven/org.lineageos.eleven.ui.activities.HomeActivity}"
         drawable="music" />
+    <item
+        component="ComponentInfo{com.iven.musicplayergo/com.iven.musicplayergo.MainActivity}"
+        drawable="musicplayergo" />
     <item
         component="ComponentInfo{org.mustard.android/org.mustard.android.activity.Mustard}"
         drawable="mustard" />
@@ -2129,6 +2289,9 @@
     <item
         component="ComponentInfo{org.vono.narau/org.vono.narau.Narau}"
         drawable="narau" />
+    <item
+        component="ComponentInfo{atm.nasaimages/.main.MainActivity}"
+        drawable="nasaimages" />
     <item
         component="ComponentInfo{com.zoffcc.applications.zanavi/com.zoffcc.applications.zanavi.Navit}"
         drawable="navit" />
@@ -2159,6 +2322,9 @@
     <item
         component="ComponentInfo{com.unwind.networkmonitor/com.unwind.networkmonitor.Scan}"
         drawable="networkscanner" />
+    <item
+        component="ComponentInfo{com.EthanHeming.NeuralNetworkSimulator/com.EthanHeming.NeuralNetworkSimulator.MainActivity}"
+        drawable="neuralnetworks" />
     <item
         component="ComponentInfo{org.schabi.newpipe/org.schabi.newpipe.MainActivity}"
         drawable="newpipe" />
@@ -2171,6 +2337,9 @@
     <item
         component="ComponentInfo{com.nextcloud.client/com.owncloud.android.ui.activity.FileDisplayActivity}"
         drawable="nextcloud" />
+    <item
+        component="ComponentInfo{com.nextcloud.talk2/com.nextcloud.talk.activities.MainActivity}"
+        drawable="nextcloudtalk" />
     <item
         component="ComponentInfo{com.nextcloud.android.beta/com.owncloud.android.ui.activity.FileDisplayActivity}"
         drawable="nextclouddev" />
@@ -2243,6 +2412,15 @@
     <item
         component="ComponentInfo{org.microg.nlp.ui/org.microg.nlp.ui.SettingsLauncherActivity}"
         drawable="nlpconfig" />
+    <item
+        component="ComponentInfo{com.afollestad.nocknock/com.afollestad.nocknock.ui.MainActivity}"
+        drawable="nocknock" />
+    <item
+        component="ComponentInfo{co.copperhead.noise/org.thoughtcrime.securesms.RoutingActivity}"
+        drawable="noise" />
+    <item
+        component="ComponentInfo{com.dfa.hubzilla_android/com.dfa.hubzilla_android.activity.MainActivity}"
+        drawable="nomad" />
     <item
         component="ComponentInfo{com.nononsenseapps.notepad/com.nononsenseapps.notepad.ActivityMain_}"
         drawable="nonsensenotepad" />
@@ -2298,23 +2476,23 @@
         component="ComponentInfo{org.gateshipone.odyssey/org.gateshipone.odyssey.activities.OdysseySplashActivity}"
         drawable="odyssey" />
     <item
-        component="ComponentInfo{org.gateshipone.malp/org.gateshipone.malp.application.activities.SplashActivity}"
-        drawable="malp" />
+        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.directions.DirectionsActivity}"
+        drawable="oeffidirections" />
     <item
-        component="ComponentInfo{org.gateshipone.malp/.application.activities.SplashActivity}"
-        drawable="malp" />
+        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.plans.PlansPickerActivity}"
+        drawable="oeffiplans" />
+    <item
+        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.stations.StationsActivity}"
+        drawable="oeffistations" />
     <item
         component="ComponentInfo{org.openintents.shopping/org.openintents.shopping.ShoppingActivity}"
         drawable="oishoppinglist" />
-    <item
-        component="ComponentInfo{free.rm.skytube.oss/free.rm.skytube.gui.activities.MainActivity}"
-        drawable="skytube" />
-    <item
-        component="ComponentInfo{free.rm.skytube.extra/free.rm.skytube.gui.activities.MainActivity}"
-        drawable="skytube" />
     <item
         component="ComponentInfo{it.feio.android.omninotes/it.feio.android.omninotes.MainActivity}"
         drawable="omninotes" />
+    <item
+        component="ComponentInfo{it.feio.android.omninotes.foss/it.feio.android.omninotes.MainActivity}"
+        drawable="omninotes" />
     <item
         component="ComponentInfo{org.omnirom.omniswitch/org.omnirom.omniswitch.SettingsActivity}"
         drawable="omniswitch" />
@@ -2342,9 +2520,21 @@
     <item
         component="ComponentInfo{openfoodfacts.github.scrachx.openfood/openfoodfacts.github.scrachx.openfood.views.SplashActivity}"
         drawable="openfood" />
+    <item
+        component="ComponentInfo{org.openhab.habdroid/org.openhab.habdroid.ui.OpenHABMainActivity}"
+        drawable="openhab" />
+    <item
+        component="ComponentInfo{org.openhab.habdroid.beta/.ui.OpenHABMainActivity}"
+        drawable="openhab" />
+    <item
+        component="ComponentInfo{com.thirtydegreesray.openhub/com.thirtydegreesray.openhub.ui.activity.SplashActivity}"
+        drawable="openhub" />
     <item
         component="ComponentInfo{com.kenny.openimgur/com.kenny.openimgur.activities.MainActivity}"
         drawable="openimgur" />
+    <item
+        component="ComponentInfo{ru.gelin.android.browser.open/ru.gelin.android.browser.open.MainActivity}"
+        drawable="openinbrowser" />
     <item
         component="ComponentInfo{org.sufficientlysecure.keychain/org.sufficientlysecure.keychain.ui.KeyListActivity}"
         drawable="openkeychain" />
@@ -2366,6 +2556,9 @@
     <item
         component="ComponentInfo{de.uni_potsdam.hpi.openmensa/de.uni_potsdam.hpi.openmensa.MainActivity}"
         drawable="openmensa" />
+    <item
+        component="ComponentInfo{com.libopenmw.openmw/ui.activity.MainActivity}"
+        drawable="openmw" />
     <item
         component="ComponentInfo{com.todobom.opennotescanner/com.todobom.opennotescanner.OpenNoteScannerActivity}"
         drawable="opennotescanner" />
@@ -2397,22 +2590,13 @@
         component="ComponentInfo{cz.romario.opensudoku/cz.romario.opensudoku.gui.FolderListActivity}"
         drawable="opesudoku" />
     <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.Orbot}"
-        drawable="orbot" />
-    <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.OrbotApp}"
+        component="ComponentInfo{org.torproject.android/.OrbotApp}"
         drawable="orbot" />
     <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.OrbotMainActivity}"
+        component="ComponentInfo{org.torproject.android/.OrbotMainActivity}"
         drawable="orbot" />
     <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.settings.AppManager}"
-        drawable="orbot" />
-    <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.settings.SettingsPreferences}"
-        drawable="orbot" />
-    <item
-        component="ComponentInfo{org.torproject.android/org.torproject.android.ui.OrbotLogActivity}"
+        component="ComponentInfo{org.torproject.android/.settings.SettingsPreferences}"
         drawable="orbot" />
     <item
         component="ComponentInfo{info.guardianproject.orfox/info.guardianproject.orfox.App}"
@@ -2495,6 +2679,9 @@
     <item
         component="ComponentInfo{fr.unix_experience.owncloud_sms/fr.unix_experience.owncloud_sms.activities.MainActivity}"
         drawable="owncloudsms" />
+    <item
+        component="ComponentInfo{com.packetsender.android/com.packetsender.android.MainActivity}"
+        drawable="packetsender" />
     <item
         component="ComponentInfo{com.nbossard.packlist/com.nbossard.packlist.gui.MainActivity}"
         drawable="packlist" />
@@ -2511,7 +2698,10 @@
         component="ComponentInfo{org.palemoon.mobile/org.palemoon.mobile.App}"
         drawable="palemoon" />
     <item
-        component="ComponentInfo{com.alexcruz.papuhwalls/com.alexcruz.papuhwalls.Papuh}"
+        component="ComponentInfo{de.devmil.paperlaunch/de.devmil.paperlaunch.MainActivity}"
+        drawable="paperlaunch" />
+    <item
+        component="ComponentInfo{com.alexcruz.papuhwalls/com.alexcruz.papuhwalls.Papuh}"
         drawable="papuh" />
     <item
         component="ComponentInfo{org.ligi.passandroid/org.ligi.passandroid.ui.PassListActivity}"
@@ -2537,6 +2727,9 @@
     <item
         component="ComponentInfo{org.secuso.privacyfriendlyactivitytracker/org.secuso.privacyfriendlyactivitytracker.activities.SplashActivity}"
         drawable="pedometer" />
+    <item
+        component="ComponentInfo{com.cgogolin.penandpdf/PenAndPDFActivity}"
+        drawable="penandpdf" />
     <item
         component="ComponentInfo{com.brewcrewfoo.performance/com.brewcrewfoo.performance.activities.MainActivity}"
         drawable="performancecontrol" />
@@ -2831,6 +3024,9 @@
     <item
         component="ComponentInfo{com.watabou.pixeldungeon/com.watabou.pixeldungeon.PixelDungeon}"
         drawable="pixeldungeon" />
+    <item
+        component="ComponentInfo{com.rj.pixelesque/com.rj.pixelesque.PixelArtEditor}"
+        drawable="pixelesque" />
     <item
         component="ComponentInfo{com.morlunk.mumbleclient/com.morlunk.mumbleclient.app.PlumbleActivity}"
         drawable="plumble" />
@@ -2855,6 +3051,9 @@
     <item
         component="ComponentInfo{com.aaronjwood.portauthority/com.aaronjwood.portauthority.activity.MainActivity}"
         drawable="portauthority" />
+    <item
+        component="ComponentInfo{com.antoniotari.reactiveampacheapp/com.antoniotari.reactiveampacheapp.ui.activities.SplashActivity}"
+        drawable="powerampache" />
     <item
         component="ComponentInfo{org.ppsspp.ppsspp/org.ppsspp.ppsspp.PpssppActivity}"
         drawable="ppsspp" />
@@ -2924,6 +3123,15 @@
     <item
         component="ComponentInfo{com.github.xloem.qrstream/com.github.xloem.qrstream.Launcher}"
         drawable="qrstream" />
+    <item
+        component="ComponentInfo{com.android.quake/com.android.quake.QuakeActivity}"
+        drawable="quake1" />
+    <item
+        component="ComponentInfo{com.jeyries.quake2/com.jeyries.quake2.Quake2}"
+        drawable="quake2" />
+    <item
+        component="ComponentInfo{org.kwaak3/org.kwaak3.Launcher}"
+        drawable="quake3" />
     <item
         component="ComponentInfo{com.iskrembilen.quasseldroid/com.iskrembilen.quasseldroid.gui.SplashActivity}"
         drawable="quasseldroid" />
@@ -2954,9 +3162,6 @@
     <item
         component="ComponentInfo{net.programmierecke.radiodroid2/net.programmierecke.radiodroid2.ActivityMain}"
         drawable="radiodroid" />
-    <item
-        component="ComponentInfo{net.programmierecke.radiodroid2/net.programmierecke.radiodroid2.MainActivity}"
-        drawable="radiodroid" />
     <item
         component="ComponentInfo{cc.rainwave.android/cc.rainwave.android.LandingActivity}"
         drawable="rainwave" />
@@ -3011,15 +3216,29 @@
     <item
         component="ComponentInfo{com.retroarch/com.retroarch.browser.mainmenu.MainMenuActivity}"
         drawable="retroarch" />
+    <item
+        component="ComponentInfo{com.retroarch.aarch64/com.retroarch.browser.mainmenu.MainMenuActivity}"
+        drawable="retroarch" />
     <item
         component="ComponentInfo{br.usp.ime.retrobreaker/br.usp.ime.retrobreaker.MainActivity}"
         drawable="retrobreaker" />
+    <item
+        component="ComponentInfo{org.retroshare.android.qml_app/org.retroshare.android.qml_app.RetroShareQmlActivity}"
+        drawable="retroshare" />
     <item
         component="ComponentInfo{io.mrarm.irc/io.mrarm.irc.MainActivity}"
         drawable="revolution" />
     <item
-        component="ComponentInfo{cx.ring/cx.ring.client.HomeActivity}"
-        drawable="ring" />
+        component="ComponentInfo{com.fastebro.androidrgbtool/com.fastebro.androidrgbtool.ui.MainActivity}"
+        drawable="rgbtool" />
+    <!--
+        <item
+            component="ComponentInfo{cx.ring/cx.ring.client.HomeActivity}"
+            drawable="ring" />
+        <item
+            component="ComponentInfo{cx.ring/cx.ring.launch.LaunchActivity}"
+            drawable="ring" />
+    -->
     <item
         component="ComponentInfo{com.ringdroid/com.ringdroid.RingdroidSelectActivity}"
         drawable="ringdroid" />
@@ -3035,12 +3254,21 @@
     <item
         component="ComponentInfo{com.robert.maps/com.robert.maps.applib.MainActivity}"
         drawable="rmaps" />
+    <item
+        component="ComponentInfo{chat.rocket.android/chat.rocket.android.authentication.ui.AuthenticationActivity}"
+        drawable="rocketchat" />
     <item
         component="ComponentInfo{com.abcdjdj.rootverifier/com.abcdjdj.rootverifier.MainActivity}"
         drawable="rootverifier" />
     <item
         component="ComponentInfo{com.spydiko.rotationmanager_foss/com.spydiko.rotationmanager_foss.HelperActivity}"
         drawable="rotationmanager" />
+    <item
+        component="ComponentInfo{mohammad.adib.roundr/mohammad.adib.roundr.MainActivity}"
+        drawable="roundr" />
+    <item
+        component="ComponentInfo{net.yolosec.routerkeygen2/org.exobel.routerkeygen.ui.NetworksListActivity}"
+        drawable="routerkeygen" />
     <item
         component="ComponentInfo{com.ath0.rpn/com.ath0.rpn.Main}"
         drawable="rpn" />
@@ -3074,6 +3302,12 @@
     <item
         component="ComponentInfo{fr.xtof54.scrabble/fr.xtof54.scrabble.ScrabbleActivity}"
         drawable="scrabble" />
+    <item
+        component="ComponentInfo{com.jarsilio.android.scrambledeggsif/com.jarsilio.android.scrambledeggsif.MainActivity}"
+        drawable="scrambledeggsif" />
+    <item
+        component="ComponentInfo{com.orpheusdroid.screenrecorder/com.orpheusdroid.screenrecorder.MainActivity}"
+        drawable="screencam" />
     <item
         component="ComponentInfo{com.cyanogenmod.screencast/com.cyanogenmod.screencast.MainActivity}"
         drawable="screencast" />
@@ -3086,6 +3320,9 @@
     <item
         component="ComponentInfo{com.lukekorth.screennotifications/com.lukekorth.screennotifications.ScreenNotificationsActivity}"
         drawable="screennotifications" />
+    <item
+        component="ComponentInfo{info.dvkr.screenstream/info.dvkr.screenstream.ui.StartActivity}"
+        drawable="screenstream" />
     <item
         component="ComponentInfo{org.scummvm.scummvm/org.scummvm.scummvm.Unpacker}"
         drawable="scummvm" />
@@ -3167,9 +3404,15 @@
     <item
         component="ComponentInfo{org.secuso.privacyfriendlycardgameone/org.secuso.privacyfriendlywerwolf.activity.SplashActivity}"
         drawable="secusowerwolf" />
+    <item
+        component="ComponentInfo{com.mrbimc.selinux/com.mrbimc.selinux.MainActivity}"
+        drawable="selinuxmodechanger" />
     <item
         component="ComponentInfo{mobi.omegacentauri.SendReduced/mobi.omegacentauri.SendReduced.Options}"
         drawable="sendreduced" />
+    <item
+        component="ComponentInfo{ru.gelin.android.sendtosd/ru.gelin.android.sendtosd.PreferencesActivity}"
+        drawable="sendtosd" />
     <item
         component="ComponentInfo{org.totschnig.sendwithftp/org.totschnig.sendwithftp.UriList}"
         drawable="sendwithftp" />
@@ -3179,6 +3422,9 @@
     <item
         component="ComponentInfo{com.battlelancer.seriesguide/com.battlelancer.seriesguide.ui.ShowsActivity}"
         drawable="seriesguide" />
+    <item
+        component="ComponentInfo{org.servDroid.web/org.servDroid.ui.activity.StartActivity}"
+        drawable="servdroid" />
     <item
         component="ComponentInfo{net.sourceforge.servestream/net.sourceforge.servestream.activity.MainActivity}"
         drawable="servestream" />
@@ -3236,6 +3482,9 @@
     <item
         component="ComponentInfo{com.android.shellms/com.android.shellms.MainActivity}"
         drawable="shellms" />
+    <item
+        component="ComponentInfo{net.typeblog.shelter/net.typeblog.shelter.ui.MainActivity}"
+        drawable="shelter" />
     <item
         component="ComponentInfo{org.janb.shoppinglist/org.janb.shoppinglist.activity.MainActivity}"
         drawable="shoppinglist" />
@@ -3263,6 +3512,18 @@
     <item
         component="ComponentInfo{com.better.alarm/com.better.alarm.presenter.AlarmsListActivity}"
         drawable="simplealarm" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.applauncher/com.simplemobiletools.applauncher.activities.SplashActivity}"
+        drawable="simpleapplauncher" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.applauncher/com.simplemobiletools.applauncher.activities.SplashActivity.Orange}"
+        drawable="simpleapplauncher" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.calculator/com.simplemobiletools.calculator.activities.SplashActivity}"
+        drawable="simplecalculator" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.calculator/com.simplemobiletools.calculator.activities.SplashActivity.Orange}"
+        drawable="simplecalculator" />
     <item
         component="ComponentInfo{com.simplemobiletools.calendar/com.simplemobiletools.calendar.activities.SplashActivity}"
         drawable="simplecalendar" />
@@ -3270,14 +3531,32 @@
         component="ComponentInfo{com.simplemobiletools.calendar/com.simplemobiletools.calendar.activities.SplashActivity.Orange}"
         drawable="simplecalendar" />
     <item
-        component="ComponentInfo{com.dnielfe.manager/com.dnielfe.manager.BrowserActivity}"
-        drawable="simpleexplorer" />
+        component="ComponentInfo{com.simplemobiletools.camera/com.simplemobiletools.camera.activities.SplashActivity}"
+        drawable="simplecamera" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.camera/com.simplemobiletools.camera.activities.SplashActivity.Orange}"
+        drawable="simplecamera" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.clock/com.simplemobiletools.clock.activities.SplashActivity}"
+        drawable="simpleclock" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.clock/com.simplemobiletools.clock.activities.SplashActivity.Orange}"
+        drawable="simpleclock" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.contacts/com.simplemobiletools.contacts.activities.SplashActivity}"
+        drawable="simplecontacts" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.contacts/com.simplemobiletools.contacts.activities.SplashActivity.Orange}"
+        drawable="simplecontacts" />
     <item
         component="ComponentInfo{com.simplemobiletools.draw/com.simplemobiletools.draw.activities.SplashActivity}"
         drawable="simpledraw" />
     <item
         component="ComponentInfo{com.simplemobiletools.draw/com.simplemobiletools.draw.activities.SplashActivity.Orange}"
         drawable="simpledraw" />
+    <item
+        component="ComponentInfo{com.dnielfe.manager/com.dnielfe.manager.BrowserActivity}"
+        drawable="simpleexplorer" />
     <item
         component="ComponentInfo{com.simplemobiletools.filemanager/com.simplemobiletools.filemanager.activities.SplashActivity}"
         drawable="simplefilemanager" />
@@ -3287,12 +3566,30 @@
     <item
         component="ComponentInfo{com.sec.android.app.myfiles/com.sec.android.app.myfiles.common.MainActivity}"
         drawable="simplefilemanager" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.flashlight/com.simplemobiletools.flashlight.activities.SplashActivity}"
+        drawable="simpleflashlight" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.flashlight/com.simplemobiletools.flashlight.activities.SplashActivity.Orange}"
+        drawable="simpleflashlight" />
     <item
         component="ComponentInfo{com.simplemobiletools.gallery/com.simplemobiletools.gallery.activities.SplashActivity}"
         drawable="simplegallery" />
     <item
         component="ComponentInfo{com.simplemobiletools.gallery/com.simplemobiletools.gallery.activities.SplashActivity.Orange}"
         drawable="simplegallery" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.musicplayer/com.simplemobiletools.musicplayer.activities.SplashActivity}"
+        drawable="simplemusicplayer" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.musicplayer/com.simplemobiletools.musicplayer.activities.SplashActivity.Orange}"
+        drawable="simplemusicplayer" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.notes/com.simplemobiletools.notes.activities.SplashActivity}"
+        drawable="simplenotes" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.notes/com.simplemobiletools.notes.activities.SplashActivity.Orange}"
+        drawable="simplenotes" />
     <item
         component="ComponentInfo{simple.reboot.com/simple.reboot.com.MainActivity}"
         drawable="simplereboot" />
@@ -3305,6 +3602,15 @@
     <item
         component="ComponentInfo{nl.mpcjanssen.simpletask/nl.mpcjanssen.simpletask.Simpletask}"
         drawable="simpletask" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.thankyou/com.simplemobiletools.thankyou.activities.SplashActivity}"
+        drawable="simplethankyou" />
+    <item
+        component="ComponentInfo{com.simplemobiletools.thankyou/com.simplemobiletools.thankyou.activities.SplashActivity.Orange}"
+        drawable="simplethankyou" />
+    <item
+        component="ComponentInfo{apps.jizzu.simpletodo/apps.jizzu.simpletodo.activity.MainActivity}"
+        drawable="simpletodo" />
     <item
         component="ComponentInfo{com.android.cp.stkmanager/com.android.cp.stkmanager.STKManagerActivity}"
         drawable="simtk" />
@@ -3374,6 +3680,12 @@
     <item
         component="ComponentInfo{com.sismics.reader/com.sismics.reader.activity.LoginActivity}"
         drawable="sismicsreader" />
+    <item
+        component="ComponentInfo{free.rm.skytube.oss/free.rm.skytube.gui.activities.MainActivity}"
+        drawable="skytube" />
+    <item
+        component="ComponentInfo{free.rm.skytube.extra/free.rm.skytube.gui.activities.MainActivity}"
+        drawable="skytube" />
     <item
         component="ComponentInfo{com.adam.aslfms/com.adam.aslfms.SettingsActivity}"
         drawable="slfms" />
@@ -3470,9 +3782,6 @@
     <item
         component="ComponentInfo{com.github.axet.audiorecorder/com.github.axet.audiorecorder.activities.MainActivity}"
         drawable="soundrecorder" />
-    <item
-        component="ComponentInfo{com.github.axet.callrecorder/com.github.axet.callrecorder.activities.MainActivity}"
-        drawable="callrecorder" />
     <item
         component="ComponentInfo{org.bottiger.podcast/org.bottiger.podcast.MainActivity}"
         drawable="soundwaves" />
@@ -3494,18 +3803,27 @@
     <item
         component="ComponentInfo{fly.speedmeter.grub/fly.speedmeter.grub.MainActivity}"
         drawable="speedmeter" />
+    <item
+        component="ComponentInfo{net.codechunk.speedofsound/net.codechunk.speedofsound.SpeedActivity}"
+        drawable="speedofsound" />
     <item
         component="ComponentInfo{fm.a2d.sf/fm.a2d.sf.gui_act}"
         drawable="spiritf" />
     <item
         component="ComponentInfo{net.majorkernelpanic.spydroid/net.majorkernelpanic.spydroid.ui.SpydroidActivity}"
         drawable="spydroid" />
+    <item
+        component="ComponentInfo{org.ea.sqrl/org.ea.sqrl.activites.SimplifiedActivity}"
+        drawable="sqrl" />
     <item
         component="ComponentInfo{csci567.squeez/csci567.squeez.FileViewer}"
         drawable="squeez" />
     <item
         component="ComponentInfo{org.sufficientlysecure.standalonecalendar/com.android.calendar.AllInOneActivity}"
         drawable="standalonecalendar" />
+    <item
+        component="ComponentInfo{fr.xgouchet.packageexplorer/fr.xgouchet.packageexplorer.applist.AppListActivity}"
+        drawable="stanley" />
     <item
         component="ComponentInfo{com.google.android.stardroid/com.google.android.stardroid.activities.SplashScreenActivity}"
         drawable="stardroid" />
@@ -3521,6 +3839,9 @@
     <item
         component="ComponentInfo{net.sourceforge.subsonic.androidapp/net.sourceforge.subsonic.androidapp.activity.MainActivity}"
         drawable="subsonic" />
+    <item
+        component="ComponentInfo{projekt.substratum/projekt.substratum.LauncherActivity}"
+        drawable="substratum" />
     <item
         component="ComponentInfo{com.app2go.sudokufree/com.app2go.sudokufree.MainActivity}"
         drawable="sudokufree" />
@@ -3530,6 +3851,9 @@
     <item
         component="ComponentInfo{org.sudowars/org.sudowars.Controller.Local.Activity.MainMenu}"
         drawable="sudowars" />
+    <item
+        component="ComponentInfo{com.gitlab.kreikenbaum.suntime/.SunTimeActivity}"
+        drawable="suntime" />
     <item
         component="ComponentInfo{org.supertuxkart.stk/android.app.NativeActivity}"
         drawable="supertuxkart" />
@@ -3599,6 +3923,9 @@
     <item
         component="ComponentInfo{eu.kanade.tachiyomi/eu.kanade.tachiyomi.ui.main.MainActivity}"
         drawable="tachiyomi" />
+    <item
+        component="ComponentInfo{eu.kanade.tachiyomi.dev/eu.kanade.tachiyomi.ui.main.MainActivity}"
+        drawable="tachiyomi" />
     <item
         component="ComponentInfo{com.github.mofosyne.tagdrop/com.github.mofosyne.tagdrop.main}"
         drawable="tagdrop" />
@@ -3611,9 +3938,18 @@
     <item
         component="ComponentInfo{in.p1x.tanks_of_freedom/org.godotengine.godot.Godot}"
         drawable="tanksoffreedom" />
+    <item
+        component="ComponentInfo{trikita.talalarmo/trikita.talalarmo.MainActivity}"
+        drawable="talalarmo" />
     <item
         component="ComponentInfo{com.gabm.screenrotationcontrol/com.gabm.tapandturn.ui.MainActivity}"
         drawable="tapandturn" />
+    <item
+        component="ComponentInfo{com.farmerbb.taskbar/com.farmerbb.taskbar.MainActivity}"
+        drawable="taskbar" />
+    <item
+        component="ComponentInfo{io.gitlab.allenb1.todolist/.TaskActivity}"
+        drawable="taskeeper" />
     <item
         component="ComponentInfo{org.dmfs.tasks/org.dmfs.tasks.TaskListActivity}"
         drawable="tasks" />
@@ -3638,6 +3974,9 @@
     <item
         component="ComponentInfo{org.telegram.messenger/org.telegram.ui.LaunchActivity}"
         drawable="telegram" />
+    <item
+        component="ComponentInfo{com.gmail.jiwopene.temperature/com.gmail.jiwopene.temperature.TemperaturesActivity}"
+        drawable="tempmonitor" />
     <item
         component="ComponentInfo{com.android.terminal/com.android.terminal.TerminalActivity}"
         drawable="terminal" />
@@ -3653,6 +3992,9 @@
     <item
         component="ComponentInfo{com.termux/com.termux.app.TermuxActivity}"
         drawable="termux" />
+    <item
+        component="ComponentInfo{com.termux.boot/com.termux.boot.BootActivity}"
+        drawable="termuxboot" />
     <item
         component="ComponentInfo{com.termux.window/com.termux.window.TermuxFloatActivity}"
         drawable="termuxfloat" />
@@ -3692,6 +4034,9 @@
     <item
         component="ComponentInfo{com.alfray.timeriffic/com.alfray.timeriffic.profiles.ProfilesUI}"
         drawable="timeriffic" />
+    <item
+        component="ComponentInfo{org.pacien.tincapp/org.pacien.tincapp.activities.start.StartActivity}"
+        drawable="tinc" />
     <item
         component="ComponentInfo{com.danvelazco.fbwrapper/com.danvelazco.fbwrapper.FbWrapper}"
         drawable="tinfoilfb" />
@@ -3734,6 +4079,9 @@
     <item
         component="ComponentInfo{org.traccar.client/org.traccar.client.Launcher}"
         drawable="traccar" />
+    <item
+        component="ComponentInfo{org.y20k.trackbook/org.y20k.trackbook.MainActivity}"
+        drawable="trackbook" />
     <item
         component="ComponentInfo{org.transdroid/org.transdroid.core.gui.TorrentsActivity_}"
         drawable="transdroid" />
@@ -3753,14 +4101,17 @@
         component="ComponentInfo{org.y20k.transistor/org.y20k.transistor.MainActivity}"
         drawable="transistor" />
     <item
-        component="ComponentInfo{de.grobox.liberario/de.grobox.liberario.activities.MainActivity}"
-        drawable="transportr" />
-    <item
-        component="ComponentInfo{de.grobox.liberario/de.grobox.transport.map.MapActivity}"
+        component="ComponentInfo{de.grobox.liberario/de.grobox.transportr.map.MapActivity}"
         drawable="transportr" />
     <item
-        component="ComponentInfo{de.grobox.liberario.debug/de.grobox.liberario.activities.MainActivity}"
+        component="ComponentInfo{de.grobox.liberario.debug/de.grobox.transportr.map.MapActivity}"
         drawable="transportrdev" />
+    <item
+        component="ComponentInfo{com.genonbeta.TrebleShot/com.genonbeta.TrebleShot.activity.TrebleShotActivity}"
+        drawable="trebleshot" />
+    <item
+        component="ComponentInfo{com.genonbeta.TrebleShot/com.genonbeta.TrebleShot.activity.HomeActivity}"
+        drawable="trebleshot" />
     <item
         component="ComponentInfo{com.android.launcher3/com.android.launcher3.Launcher}"
         drawable="trebuchet" />
@@ -3782,12 +4133,18 @@
     <item
         component="ComponentInfo{org.hermit.tricorder/org.hermit.tricorder.Tricorder}"
         drawable="tricorder" />
+    <item
+        component="ComponentInfo{com.zoffcc.applications.trifa/com.zoffcc.applications.trifa.StartMainActivityWrapper}"
+        drawable="trifa" />
     <item
         component="ComponentInfo{caldwell.ben.trolly/caldwell.ben.trolly.Trolly}"
         drawable="trolly" />
     <item
         component="ComponentInfo{org.fox.ttcomics2/org.fox.ttcomics2.LaunchActivity}"
         drawable="ttcomics" />
+    <item
+        component="ComponentInfo{org.segin.ttleditor/org.segin.ttleditor.TTLEditor}"
+        drawable="ttleditor" />
     <item
         component="ComponentInfo{org.fox.ttrss/org.fox.ttrss.LaunchActivity}"
         drawable="ttrss" />
@@ -3857,6 +4214,9 @@
     <item
         component="ComponentInfo{org.madore.android.unicodeMap/org.madore.android.unicodeMap.UnicodeMapActivity}"
         drawable="unicodemap" />
+    <item
+        component="ComponentInfo{org.emunix.unipatcher/org.emunix.unipatcher.ui.activity.MainActivity}"
+        drawable="unipatcher" />
     <item
         component="ComponentInfo{app.varlorg.unote/app.varlorg.unote.NoteMain}"
         drawable="unote" />
@@ -3893,6 +4253,9 @@
     <item
         component="ComponentInfo{net.momodalo.app.vimtouch/net.momodalo.app.vimtouch.VimTouch}"
         drawable="vimtouch" />
+    <item
+        component="ComponentInfo{com.poupa.vinylmusicplayer/com.poupa.vinylmusicplayer.ui.activities.MainActivity}"
+        drawable="vinyl" />
     <item
         component="ComponentInfo{com.btcontract.wallet/com.btcontract.wallet.MainActivity}"
         drawable="visualbitcoin" />
@@ -3902,6 +4265,9 @@
     <item
         component="ComponentInfo{org.videolan.vlc/org.videolan.vlc.StartActivity}"
         drawable="vlc" />
+    <item
+        component="ComponentInfo{de.ph1b.audiobook/.features.coldStart.SplashActivity}"
+        drawable="voice" />
     <item
         component="ComponentInfo{com.android.voicedialer/com.android.voicedialer.VoiceDialerActivity}"
         drawable="voicedialer" />
@@ -3935,6 +4301,9 @@
     <item
         component="ComponentInfo{org.cyanogenmod.voiceplus/org.cyanogenmod.voiceplus.VoicePlusSetup}"
         drawable="voicerecorder" />
+    <item
+        component="ComponentInfo{de.jurihock.voicesmith/de.jurihock.voicesmith.activities.HomeActivity}"
+        drawable="voicesmith" />
     <item
         component="ComponentInfo{org.vudroid/org.vudroid.core.MainBrowserActivity}"
         drawable="vudroid" />
@@ -3953,6 +4322,9 @@
     <item
         component="ComponentInfo{fr.gaulupeau.apps.InThePoche/fr.gaulupeau.apps.Poche.ui.MainActivity}"
         drawable="wallabag" />
+    <item
+        component="ComponentInfo{org.walleth/org.walleth.activities.MainActivity}"
+        drawable="walleth" />
     <item
         component="ComponentInfo{com.android.dreams.basic/com.android.dreams.basic.Colors}"
         drawable="wallpaper" />
@@ -4037,6 +4409,9 @@
     <item
         component="ComponentInfo{org.wheelmap.android.online/org.wheelmap.android.online.StartupActivity}"
         drawable="wheelmap" />
+    <item
+        component="ComponentInfo{menion.android.whereyougo/menion.android.whereyougo.gui.activity.MainActivity}"
+        drawable="whereyougo" />
     <item
         component="ComponentInfo{org.whispersystems.whisperpush/org.whispersystems.whisperpush.ui.RegistrationActivity}"
         drawable="whisperpush" />
@@ -4083,20 +4458,8 @@
         component="ComponentInfo{eu.wikijourney.wikijourney/eu.wikijourney.wikijourney.HomeActivity}"
         drawable="wikijourney" />
     <item
-        component="ComponentInfo{fr.free.nrw.commons/fr.free.nrw.commons.auth.LoginActivity}"
-        drawable="wikimedia" />
-    <item
-        component="ComponentInfo{org.wikimedia.commons/org.wikimedia.commons.campaigns.CampaignActivity}"
+        component="ComponentInfo{fr.free.nrw.commons/.auth.LoginActivity}"
         drawable="wikimedia" />
-    <item
-        component="ComponentInfo{org.wikimedia.commons/org.wikimedia.commons.contributions.ContributionsActivity}"
-        drawable="wikimedia" />
-    <item
-        component="ComponentInfo{org.wikipedia/org.wikipedia.page.PageActivity}"
-        drawable="wikipedia" />
-    <item
-        component="ComponentInfo{org.wikipedia/org.wikipedia.WikipediaActivity}"
-        drawable="wikipedia" />
     <item
         component="ComponentInfo{org.wikipedia/org.wikipedia.main.MainActivity}"
         drawable="wikipedia" />
@@ -4112,9 +4475,15 @@
     <item
         component="ComponentInfo{com.wire/com.waz.zclient.LaunchActivity}"
         drawable="wireapp" />
+    <item
+        component="ComponentInfo{com.wireguard.android/com.wireguard.android.activity.MainActivity}"
+        drawable="wireguard" />
     <item
         component="ComponentInfo{org.whispersystems.whisperpush/org.whispersystems.whisperpush.ui.RegistrationActivity}"
         drawable="wishperpush" />
+    <item
+        component="ComponentInfo{org.bitbatzen.wlanscanner/org.bitbatzen.wlanscanner.MainActivity}"
+        drawable="wlanscanner" />
     <item
         component="ComponentInfo{org.wordpress.android/org.wordpress.android.Dashboard}"
         drawable="wordpress" />
@@ -4133,6 +4502,12 @@
     <item
         component="ComponentInfo{ch.corten.aha.worldclock/ch.corten.aha.worldclock.WorldClockActivity}"
         drawable="worldclock" />
+    <item
+        component="ComponentInfo{com.averi.worldscribe/com.averi.worldscribe.activities.PermissionActivity}"
+        drawable="worldscribe" />
+    <item
+        component="ComponentInfo{com.wownero.wownerujo/com.wownero.wownerujo.LoginActivity}"
+        drawable="wownerujo" />
     <item
         component="ComponentInfo{net.glsk.wpgen/net.glsk.wpgen.ColorsActivity}"
         drawable="wpgen" />
@@ -4145,6 +4520,9 @@
     <item
         component="ComponentInfo{me.writeily.pro/me.writeily.pro.PromptPinActivity}"
         drawable="writeily" />
+    <item
+        component="ComponentInfo{net.sourceforge.x11basic/net.sourceforge.x11basic.X11BasicActivity}"
+        drawable="x11basic" />
     <item
         component="ComponentInfo{com.xabber.android/com.xabber.android.ui.activity.ContactList}"
         drawable="xabber" />
@@ -4166,6 +4544,9 @@
     <item
         component="ComponentInfo{com.iven.xdafeedreader/com.iven.xdafeedreader.mainact.SplashActivity}"
         drawable="xdafeedreader" />
+    <item
+        component="ComponentInfo{de.antonarnold.android.xoverrideheadphonejackdetection/de.antonarnold.android.xoverrideheadphonejackdetection.MainActivity}"
+        drawable="xjackoverride" />
     <item
         component="ComponentInfo{net.bytten.xkcdviewer/net.bytten.xkcdviewer.XkcdViewerActivity}"
         drawable="xkcdviewer" />
@@ -4178,6 +4559,9 @@
     <item
         component="ComponentInfo{biz.bokhorst.xprivacy/biz.bokhorst.xprivacy.ActivityMain}"
         drawable="xprivacy" />
+    <item
+        component="ComponentInfo{eu.faircode.xlua/eu.faircode.xlua.ActivityMain}"
+        drawable="xprivacylua" />
     <item
         component="ComponentInfo{x.org.server/x.org.server.MainActivity}"
         drawable="xsdl" />
@@ -4205,477 +4589,26 @@
     <item
         component="ComponentInfo{com.github.yeriomin.yalpstore/com.github.yeriomin.yalpstore.InstalledAppsActivity}"
         drawable="yalpstore" />
+    <item
+        component="ComponentInfo{com.github.yeriomin.yalpstore.contemporary/com.github.yeriomin.yalpstore.UpdatableAppsActivity}"
+        drawable="yalpstore" />
+    <item
+        component="ComponentInfo{com.github.yeriomin.yalpstore.contemporary/com.github.yeriomin.yalpstore.InstalledAppsActivity}"
+        drawable="yalpstore" />
     <item
         component="ComponentInfo{org.yaxim.androidclient/org.yaxim.androidclient.MainWindow}"
         drawable="yaxim" />
+    <item
+        component="ComponentInfo{com.simonramstedt.yoke/com.simonramstedt.yoke.YokeActivity}"
+        drawable="yoke" />
     <item
         component="ComponentInfo{com.yubico.yubioath/com.yubico.yubioath.MainActivity}"
         drawable="yubico" />
     <item
         component="ComponentInfo{de.christinecoenen.code.zapp/de.christinecoenen.code.zapp.app.MainActivity}"
         drawable="zapp" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.applauncher/com.simplemobiletools.applauncher.activities.SplashActivity}"
-        drawable="simpleapplauncher" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.applauncher/com.simplemobiletools.applauncher.activities.SplashActivity.Orange}"
-        drawable="simpleapplauncher" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.calculator/com.simplemobiletools.calculator.activities.SplashActivity}"
-        drawable="simplecalculator" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.calculator/com.simplemobiletools.calculator.activities.SplashActivity.Orange}"
-        drawable="simplecalculator" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.calendar/com.simplemobiletools.calendar.activities.SplashActivity}"
-        drawable="simplecalendar" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.calendar/com.simplemobiletools.calendar.activities.SplashActivity.Orange}"
-        drawable="simplecalendar" />
-    <item
-        component="ComponentInfo{com.nathanosman.chronosnap/com.nathanosman.chronosnap.ui.MainActivity}"
-        drawable="chronosnap" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.clock/com.simplemobiletools.clock.activities.SplashActivity}"
-        drawable="simpleclock" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.clock/com.simplemobiletools.clock.activities.SplashActivity.Orange}"
-        drawable="simpleclock" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.contacts/com.simplemobiletools.contacts.activities.SplashActivity}"
-        drawable="simplecontacts" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.contacts/com.simplemobiletools.contacts.activities.SplashActivity.Orange}"
-        drawable="simplecontacts" />
-    <item
-        component="ComponentInfo{org.asnelt.derandom/org.asnelt.derandom.MainActivity}"
-        drawable="derandom" />
-    <item
-        component="ComponentInfo{com.sovworks.edslite/com.sovworks.eds.android.filemanager.activities.FileManagerActivity}"
-        drawable="edslite" />
-    <item
-        component="ComponentInfo{ru.henridellal.dialer/ru.henridellal.dialer.DialerActivity}"
-        drawable="emeralddialer" />
-    <item
-        component="ComponentInfo{eu.depau.etchdroid/eu.depau.etchdroid.activities.StartActivity}"
-        drawable="etchdroid" />
-    <item
-        component="ComponentInfo{cl.coders.faketraveler/cl.coders.faketraveler.MainActivity}"
-        drawable="faketraveler" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.flashlight/com.simplemobiletools.flashlight.activities.SplashActivity}"
-        drawable="simpleflashlight" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.flashlight/com.simplemobiletools.flashlight.activities.SplashActivity.Orange}"
-        drawable="simpleflashlight" />
-    <item
-        component="ComponentInfo{nf.frex.android/nf.frex.android.FrexActivity}"
-        drawable="frex" />
-    <item
-        component="ComponentInfo{ru.playsoftware.j2meloader/ru.playsoftware.j2meloader.MainActivity}"
-        drawable="j2meloader" />
-    <item
-        component="ComponentInfo{me.impa.knockonports/me.impa.knockonports.MainActivity}"
-        drawable="knockonports" />
-    <item
-        component="ComponentInfo{com.limbo.emu.main/com.limbo.emu.main.LimboEmuActivity}"
-        drawable="limbo" />
-    <item
-        component="ComponentInfo{com.topjohnwu.magisk/a.c}"
-        drawable="magiskmanager" />
-    <item
-        component="ComponentInfo{se.manyver/se.manyver.MainActivity}"
-        drawable="manyverse" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.musicplayer/com.simplemobiletools.musicplayer.activities.SplashActivity}"
-        drawable="simplemusicplayer" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.musicplayer/com.simplemobiletools.musicplayer.activities.SplashActivity.Orange}"
-        drawable="simplemusicplayer" />
-    <item
-        component="ComponentInfo{com.afollestad.nocknock/com.afollestad.nocknock.ui.MainActivity}"
-        drawable="nocknock" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.notes/com.simplemobiletools.notes.activities.SplashActivity}"
-        drawable="simplenotes" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.notes/com.simplemobiletools.notes.activities.SplashActivity.Orange}"
-        drawable="simplenotes" />
-    <item
-        component="ComponentInfo{com.libopenmw.openmw/ui.activity.MainActivity}"
-        drawable="openmw" />
-    <item
-        component="ComponentInfo{com.packetsender.android/com.packetsender.android.MainActivity}"
-        drawable="packetsender" />
-    <item
-        component="ComponentInfo{com.rj.pixelesque/com.rj.pixelesque.PixelArtEditor}"
-        drawable="pixelesque" />
-    <item
-        component="ComponentInfo{com.retroarch/com.retroarch.browser.mainmenu.MainMenuActivity}"
-        drawable="retroarch" />
-    <item
-        component="ComponentInfo{com.retroarch.aarch64/com.retroarch.browser.mainmenu.MainMenuActivity}"
-        drawable="retroarch" />
-    <item
-        component="ComponentInfo{com.fastebro.androidrgbtool/com.fastebro.androidrgbtool.ui.MainActivity}"
-        drawable="rgbtool" />
-    <item
-        component="ComponentInfo{mohammad.adib.roundr/mohammad.adib.roundr.MainActivity}"
-        drawable="roundr" />
-    <item
-        component="ComponentInfo{net.yolosec.routerkeygen2/org.exobel.routerkeygen.ui.NetworksListActivity}"
-        drawable="routerkeygen" />
-    <item
-        component="ComponentInfo{com.jarsilio.android.scrambledeggsif/com.jarsilio.android.scrambledeggsif.MainActivity}"
-        drawable="scrambledeggsif" />
-    <item
-        component="ComponentInfo{info.dvkr.screenstream/info.dvkr.screenstream.ui.StartActivity}"
-        drawable="screenstream" />
-    <item
-        component="ComponentInfo{de.t_dankworth.secscanqr/de.t_dankworth.secscanqr.activities.MainActivity}"
-        drawable="secscanqr" />
-    <item
-        component="ComponentInfo{com.mrbimc.selinux/com.mrbimc.selinux.MainActivity}"
-        drawable="selinuxmodechanger" />
-    <item
-        component="ComponentInfo{ru.gelin.android.sendtosd/ru.gelin.android.sendtosd.PreferencesActivity}"
-        drawable="sendtosd" />
-    <item
-        component="ComponentInfo{net.typeblog.shelter/net.typeblog.shelter.ui.MainActivity}"
-        drawable="shelter" />
-    <item
-        component="ComponentInfo{fr.xgouchet.packageexplorer/fr.xgouchet.packageexplorer.applist.AppListActivity}"
-        drawable="stanley" />
-    <item
-        component="ComponentInfo{projekt.substratum/projekt.substratum.LauncherActivity}"
-        drawable="substratum" />
-    <item
-        component="ComponentInfo{com.gmail.jiwopene.temperature/com.gmail.jiwopene.temperature.TemperaturesActivity}"
-        drawable="tempmonitor" />
-    <item
-        component="ComponentInfo{com.termux.window/com.termux.window.TermuxFloatActivity}"
-        drawable="termuxfloat" />
-    <item
-        component="ComponentInfo{com.termux.boot/com.termux.boot.BootActivity}"
-        drawable="termuxboot" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.thankyou/com.simplemobiletools.thankyou.activities.SplashActivity}"
-        drawable="simplethankyou" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.thankyou/com.simplemobiletools.thankyou.activities.SplashActivity.Orange}"
-        drawable="simplethankyou" />
-    <item
-        component="ComponentInfo{org.pacien.tincapp/org.pacien.tincapp.activities.start.StartActivity}"
-        drawable="tinc" />
-    <item
-        component="ComponentInfo{com.zoffcc.applications.trifa/com.zoffcc.applications.trifa.StartMainActivityWrapper}"
-        drawable="trifa" />
-    <item
-        component="ComponentInfo{de.jurihock.voicesmith/de.jurihock.voicesmith.activities.HomeActivity}"
-        drawable="voicesmith" />
-    <item
-        component="ComponentInfo{com.wireguard.android/com.wireguard.android.activity.MainActivity}"
-        drawable="wireguard" />
-    <item
-        component="ComponentInfo{com.averi.worldscribe/com.averi.worldscribe.activities.PermissionActivity}"
-        drawable="worldscribe" />
-    <item
-        component="ComponentInfo{io.github.lonamiwebs.klooni/io.github.lonamiwebs.klooni.AndroidLauncher}"
-        drawable="klooni" />
-    <item
-        component="ComponentInfo{dev.dworks.apps.anexplorer.pro/dev.dworks.apps.anexplorer.DocumentsActivity}"
-        drawable="anexplorer" />
-    <item
-        component="ComponentInfo{dev.dworks.apps.anexplorer/dev.dworks.apps.anexplorer.DocumentsActivity}"
-        drawable="anexplorer" />
-    <item
-        component="ComponentInfo{com.spisoft.quicknote/com.spisoft.quicknote.MainActivity}"
-        drawable="carnet" />
-    <item
-        component="ComponentInfo{com.kgurgul.cpuinfo/com.kgurgul.cpuinfo.features.HostActivity}"
-        drawable="cpuinfo" />
-    <item
-        component="ComponentInfo{com.b44t.messenger/com.b44t.messenger.LaunchActivity}"
-        drawable="deltachat" />
-    <item
-        component="ComponentInfo{com.roguetemple.hyperroid/com.roguetemple.hyperroid.HyperRogue}"
-        drawable="hyperrogue" />
-    <item
-        component="ComponentInfo{org.kwaak3/org.kwaak3.Launcher}"
-        drawable="quake3" />
-    <item
-        component="ComponentInfo{com.dfa.hubzilla_android/com.dfa.hubzilla_android.activity.MainActivity}"
-        drawable="nomad" />
-    <item
-        component="ComponentInfo{com.android.quake/com.android.quake.QuakeActivity}"
-        drawable="quake1" />
-    <item
-        component="ComponentInfo{com.jeyries.quake2/com.jeyries.quake2.Quake2}"
-        drawable="quake2" />
-    <item
-        component="ComponentInfo{org.emunix.unipatcher/org.emunix.unipatcher.ui.activity.MainActivity}"
-        drawable="unipatcher" />
-    <item
-        component="ComponentInfo{org.walleth/org.walleth.activities.MainActivity}"
-        drawable="walleth" />
-    <item
-        component="ComponentInfo{com.simonramstedt.yoke/com.simonramstedt.yoke.YokeActivity}"
-        drawable="yoke" />
-    <item
-        component="ComponentInfo{com.rehanced.lunary/rehanced.com.simpleetherwallet.activities.MainActivity}"
-        drawable="lunary" />
-    <item
-        component="ComponentInfo{com.lavadip.miniVector/im.vector.activity.LoginActivity}"
-        drawable="minivector" />
-    <item
-        component="ComponentInfo{com.nextcloud.talk2/com.nextcloud.talk.activities.MainActivity}"
-        drawable="nextcloudtalk" />
-    <item
-        component="ComponentInfo{chat.rocket.android/chat.rocket.android.authentication.ui.AuthenticationActivity}"
-        drawable="rocketchat" />
-    <item
-        component="ComponentInfo{com.poupa.vinylmusicplayer/com.poupa.vinylmusicplayer.ui.activities.MainActivity}"
-        drawable="vinyl" />
-    <item
-        component="ComponentInfo{com.wownero.wownerujo/com.wownero.wownerujo.LoginActivity}"
-        drawable="wownerujo" />
-    <item
-        component="ComponentInfo{net.sourceforge.x11basic/net.sourceforge.x11basic.X11BasicActivity}"
-        drawable="x11basic" />
-    <item
-        component="ComponentInfo{com.greenaddress.abcore/com.greenaddress.abcore.MainActivity}"
-        drawable="abcore" />
-    <item
-        component="ComponentInfo{jp.ksksue.app.terminal/jp.ksksue.app.terminal.AndroidUSBSerialMonitorLite}"
-        drawable="androidusbterminal" />
-    <item
-        component="ComponentInfo{com.gianlu.aria2android/com.gianlu.aria2android.MainActivity}"
-        drawable="aria2android" />
-    <item
-        component="ComponentInfo{com.slash.batterychargelimit/com.slash.batterychargelimit.activities.MainActivity}"
-        drawable="batterychargelimit" />
-    <item
-        component="ComponentInfo{de.k3b.android.contentproviderhelper/com.jensdriller.contentproviderhelper.ui.activity.MainActivity}"
-        drawable="contentproviderhelper" />
-    <item
-        component="ComponentInfo{org.pipoypipagames.cowsrevenge/org.godotengine.godot.Godot}"
-        drawable="cowsrevenge" />
-    <item
-        component="ComponentInfo{org.billthefarmer.editor/org.billthefarmer.editor.Editor}"
-        drawable="editor" />
-    <item
-        component="ComponentInfo{org.eu.exodus_privacy.exodusprivacy/org.eu.exodus_privacy.exodusprivacy.MainActivity}"
-        drawable="exodusprivacy" />
-    <item
-        component="ComponentInfo{eu.faircode.email/eu.faircode.email.ActivityMain}"
-        drawable="fairemail" />
-    <item
-        component="ComponentInfo{com.android.gpstest.osmdroid/com.android.gpstest.GpsTestActivity}"
-        drawable="gpstest" />
-    <item
-        component="ComponentInfo{de.k3b.android.intentintercept/uk.co.ashtonbrsc.intentexplode.StartupActivity}"
-        drawable="intentintercept" />
-    <item
-        component="ComponentInfo{com.kunzisoft.keyboard.switcher/com.kunzisoft.keyboard.switcher.settings.PreferenceActivity}"
-        drawable="keyboardswitcher" />
-    <item
-        component="ComponentInfo{com.EthanHeming.NeuralNetworkSimulator/com.EthanHeming.NeuralNetworkSimulator.MainActivity}"
-        drawable="neuralnetworks" />
-    <item
-        component="ComponentInfo{de.devmil.paperlaunch/de.devmil.paperlaunch.MainActivity}"
-        drawable="paperlaunch" />
-    <item
-        component="ComponentInfo{org.retroshare.android.qml_app/org.retroshare.android.qml_app.RetroShareQmlActivity}"
-        drawable="retroshare" />
-    <item
-        component="ComponentInfo{org.servDroid.web/org.servDroid.ui.activity.StartActivity}"
-        drawable="servdroid" />
-    <item
-        component="ComponentInfo{org.ea.sqrl/org.ea.sqrl.activites.SimplifiedActivity}"
-        drawable="sqrl" />
-    <item
-        component="ComponentInfo{com.farmerbb.taskbar/com.farmerbb.taskbar.MainActivity}"
-        drawable="taskbar" />
-    <item
-        component="ComponentInfo{org.segin.ttleditor/org.segin.ttleditor.TTLEditor}"
-        drawable="ttleditor" />
-    <item
-        component="ComponentInfo{com.jarsilio.android.waveup/com.jarsilio.android.waveup.MainActivity}"
-        drawable="waveup" />
-    <item
-        component="ComponentInfo{de.antonarnold.android.xoverrideheadphonejackdetection/de.antonarnold.android.xoverrideheadphonejackdetection.MainActivity}"
-        drawable="xjackoverride" />
-    <item
-        component="ComponentInfo{eu.faircode.xlua/eu.faircode.xlua.ActivityMain}"
-        drawable="xprivacylua" />
 
-
-    <!-- 3.1.0 -->
-    <item
-        component="ComponentInfo{it.feio.android.omninotes.foss/it.feio.android.omninotes.MainActivity}"
-        drawable="omninotes" />
-    <item
-        component="ComponentInfo{com.thirtydegreesray.openhub/com.thirtydegreesray.openhub.ui.activity.SplashActivity}"
-        drawable="openhub" />
-    <item
-        component="ComponentInfo{org.billthefarmer.editor/org.billthefarmer.editor.Editor}"
-        drawable="editor" />
-    <item
-        component="ComponentInfo{org.y20k.trackbook/org.y20k.trackbook.MainActivity}"
-        drawable="trackbook" />
-    <item
-        component="ComponentInfo{net.codechunk.speedofsound/net.codechunk.speedofsound.SpeedActivity}"
-        drawable="speedofsound" />
-    <item
-        component="ComponentInfo{free.rm.skytube.oss/free.rm.skytube.gui.activities.MainActivity}"
-        drawable="skytube" />
-    <item
-        component="ComponentInfo{ru.gelin.android.browser.open/ru.gelin.android.browser.open.MainActivity}"
-        drawable="openinbrowser" />
-    <item
-        component="ComponentInfo{co.copperhead.noise/org.thoughtcrime.securesms.RoutingActivity}"
-        drawable="noise" />
-    <item
-        component="ComponentInfo{net.gsantner.markor/net.gsantner.markor.activity.MainActivity}"
-        drawable="markor" />
-    <item
-        component="ComponentInfo{com.dynamicg.homebuttonlauncher/com.dynamicg.homebuttonlauncher.MainActivityOpen}"
-        drawable="homelauncher" />
-    <item
-        component="ComponentInfo{io.github.froodyapp/io.github.froodyapp.activity.MainActivity}"
-        drawable="froody" />
-    <item
-        component="ComponentInfo{ryey.easer/ryey.easer.core.ui.MainActivity}"
-        drawable="easer" />
-    <item
-        component="ComponentInfo{io.github.lonamiwebs.klooni/io.github.lonamiwebs.klooni.AndroidLauncher}"
-        drawable="klooni" />
-    <item
-        component="ComponentInfo{com.genonbeta.TrebleShot/com.genonbeta.TrebleShot.activity.TrebleShotActivity}"
-        drawable="trebleshot" />
-    <item
-        component="ComponentInfo{com.genonbeta.TrebleShot/com.genonbeta.TrebleShot.activity.HomeActivity}"
-        drawable="trebleshot" />
-    <item
-        component="ComponentInfo{de.tobiasbielefeld.brickgames/de.tobiasbielefeld.brickgames.ui.Main}"
-        drawable="brickgames" />
-    <item
-        component="ComponentInfo{de.pinyto.exalteddicer/de.pinyto.exalteddicer.MainActivity}"
-        drawable="exalteddicer" />
-    <item
-        component="ComponentInfo{app.librenews.io.librenews/app.librenews.io.librenews.views.MainFlashActivity}"
-        drawable="librenews" />
-    <item
-        component="ComponentInfo{fr.gouv.etalab.mastodon/fr.gouv.etalab.mastodon.activities.SplashActivity}"
-        drawable="mastalab" />
-    <item
-        component="ComponentInfo{com.antoniotari.reactiveampacheapp/com.antoniotari.reactiveampacheapp.ui.activities.SplashActivity}"
-        drawable="powerampache" />
-    <item
-        component="ComponentInfo{com.vlath.keyboard/com.vlath.keyboard.Main}"
-        drawable="behekeyboard" />
-    <item
-        component="ComponentInfo{cx.ring/cx.ring.launch.LaunchActivity}"
-        drawable="ring" />
-    <item
-        component="ComponentInfo{com.iven.musicplayergo/com.iven.musicplayergo.MainActivity}"
-        drawable="musicplayergo" />
-    <item
-        component="ComponentInfo{com.duckduckgo.mobile.android/com.duckduckgo.app.launch.LaunchActivity}"
-        drawable="duckduckgo" />
-    <item
-        component="ComponentInfo{menion.android.whereyougo/menion.android.whereyougo.gui.activity.MainActivity}"
-        drawable="whereyougo" />
-    <item
-        component="ComponentInfo{de.ph1b.audiobook/.features.coldStart.SplashActivity}"
-        drawable="voice" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.camera/com.simplemobiletools.camera.activities.SplashActivity}"
-        drawable="simplecamera" />
-    <item
-        component="ComponentInfo{com.simplemobiletools.camera/com.simplemobiletools.camera.activities.SplashActivity.Orange}"
-        drawable="simplecamera" />
-    <item
-        component="ComponentInfo{io.gitlab.allenb1.todolist/.TaskActivity}"
-        drawable="taskeeper" />
-    <item
-        component="ComponentInfo{com.cityzen.cityzen/com.cityzen.cityzen.Activities.SplashScreenActivity}"
-        drawable="cityzen" />
-    <item
-        component="ComponentInfo{io.github.hidroh.materialistic/io.github.hidroh.materialistic.LauncherActivity}"
-        drawable="hn" />
-    <item
-        component="ComponentInfo{com.orpheusdroid.screenrecorder/com.orpheusdroid.screenrecorder.MainActivity}"
-        drawable="screencam" />
-    <item
-        component="ComponentInfo{org.bitbatzen.wlanscanner/org.bitbatzen.wlanscanner.MainActivity}"
-        drawable="wlanscanner" />
-    <item
-        component="ComponentInfo{atm.nasaimages/.main.MainActivity}"
-        drawable="nasaimages" />
-    <item
-        component="ComponentInfo{com.gitlab.kreikenbaum.suntime/.SunTimeActivity}"
-        drawable="suntime" />
-    <item
-        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.directions.DirectionsActivity}"
-        drawable="oeffidirections" />
-    <item
-        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.plans.PlansPickerActivity}"
-        drawable="oeffiplans" />
-    <item
-        component="ComponentInfo{de.schildbach.oeffi/de.schildbach.oeffi.stations.StationsActivity}"
-        drawable="oeffistations" />
-    <item
-        component="ComponentInfo{com.dkanada.icecons/com.dkanada.icecons.activities.MainActivity}"
-        drawable="frost" />
-    <item
-        component="ComponentInfo{org.openhab.habdroid/org.openhab.habdroid.ui.OpenHABMainActivity}"
-        drawable="openhab" />
-    <item
-        component="ComponentInfo{org.openhab.habdroid.beta/.ui.OpenHABMainActivity}"
-        drawable="openhab" />
-    <item
-        component="ComponentInfo{org.thosp.yourlocalweather/.MainActivity}"
-        drawable="localweather" />
-    <item
-        component="ComponentInfo{ryey.easer/.core.ui.MainActivity}"
-        drawable="easer" />
-    <item
-        component="ComponentInfo{com.dragons.aurora/.activities.AuroraActivity}"
-        drawable="aurorastore" />
-    <item
-        component="ComponentInfo{com.tmendes.birthdaydroid/.MainActivity}"
-        drawable="birthdaydroid" />
-    <item
-        component="ComponentInfo{de.baumann.browser.Ninja/de.baumann.browser.Activity.BrowserActivity}"
-        drawable="fossbrowser" />
-    <item
-        component="ComponentInfo{com.github.axet.maps/com.mapswithme.maps.SplashActivity}"
-        drawable="maps" />
-    <item
-        component="ComponentInfo{com.github.axet.maps/com.mapswithme.maps.DownloadResourcesActivity}"
-        drawable="maps" />
-    <item
-        component="ComponentInfo{com.cgogolin.penandpdf/PenAndPDFActivity}"
-        drawable="penandpdf" />
-    <item
-        component="ComponentInfo{de.grobox.transportr/de.grobox.transportr.map.MapActivity}"
-        drawable="transportr" />
-    <item
-        component="ComponentInfo{com.x8bit.bitwarden/md5b95ad25b85f158431f24aa9fc17a1c1e.SplashActivity}"
-        drawable="bitwarden" />
-    <item
-        component="ComponentInfo{taco.apkmirror/.activities.MainActivity}"
-        drawable="apkmirror" />
-    <item
-        component="ComponentInfo{project.budgetwatch/project.budgetwatch.MainActivity}"
-        drawable="budgetwatch" />
-    <item
-        component="ComponentInfo{trikita.talalarmo/trikita.talalarmo.MainActivity}"
-        drawable="talalarmo" />
-    <item
-        component="ComponentInfo{apps.jizzu.simpletodo/apps.jizzu.simpletodo.activity.MainActivity}"
-        drawable="simpletodo" />
+    <!-- 4.0.7 < [] --> <!-- PUT NEWEST ADDITIONS AFTER THIS LINE-->
 
 
     <!-- Nova Launcher specific -->
diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml
index 4d90bd5ad4b233a71dff4414b6c8071fa86c202b..f87b5e56392bb3c7164d6a35750b388083912e66 100644
--- a/app/src/main/res/xml/drawable.xml
+++ b/app/src/main/res/xml/drawable.xml
@@ -4,8 +4,8 @@
 <item drawable="aard" />
 <item drawable="aat" />
 <item drawable="abcore" />
-<item drawable="acaldav" />
 <item drawable="acal" />
+    <item drawable="acaldav" />
 <item drawable="activitylauncher" />
 <item drawable="adaway" />
 <item drawable="addi" />
@@ -14,8 +14,8 @@
 <item drawable="agit" />
 <item drawable="aizoban" />
 <item drawable="alarm" />
+    <item drawable="alogcat" />
 <item drawable="alogcatroot" />
-<item drawable="alogcat" />
 <item drawable="altcoin" />
 <item drawable="amaze" />
 <item drawable="ametro" />
@@ -53,8 +53,8 @@
 <item drawable="atomic" />
 <item drawable="audiofx" />
 <item drawable="aurdroid" />
+    <item drawable="aurora" />
 <item drawable="aurorastore" />
-<item drawable="aurora" />
 <item drawable="authenticator" />
 <item drawable="autoairplanemode" />
 <item drawable="autostarts" />
@@ -92,8 +92,8 @@
 <item drawable="bronylivewallpaper" />
 <item drawable="brouter" />
 <item drawable="browser" />
-<item drawable="bubblecomics" />
 <item drawable="bubble" />
+    <item drawable="bubblecomics" />
 <item drawable="budget" />
 <item drawable="budgetwatch" />
 <item drawable="bugreport" />
@@ -101,12 +101,12 @@
 <item drawable="bvnc" />
 <item drawable="cachecleaner" />
 <item drawable="cadroid" />
-<item drawable="calculator2" />
 <item drawable="calculator" />
+    <item drawable="calculator2" />
 <item drawable="caldavsync" />
+    <item drawable="calendar" />
 <item drawable="calendarie" />
 <item drawable="calendarnotifications" />
-<item drawable="calendar" />
 <item drawable="calendarwidget" />
 <item drawable="calendula" />
 <item drawable="callerid" />
@@ -164,10 +164,10 @@
 <item drawable="crocodilenote" />
 <item drawable="crosswords" />
 <item drawable="csipsimple" />
+    <item drawable="csploit" />
 <item drawable="csploit2" />
-<item drawable="csploit" />
+    <item drawable="cupsprint" />
 <item drawable="cupsprintservice" />
-<item drawable="cupsprint" />
 <item drawable="currencyconverter" />
 <item drawable="cythara" />
 <item drawable="dashclock" />
@@ -209,8 +209,8 @@
 <item drawable="drumon" />
 <item drawable="dspmanager" />
 <item drawable="dsub" />
-<item drawable="duckduckgo2" />
 <item drawable="duckduckgo" />
+    <item drawable="duckduckgo2" />
 <item drawable="dumbphoneassistant" />
 <item drawable="dvfont" />
 <item drawable="easer" />
@@ -218,8 +218,8 @@
 <item drawable="easytoken" />
 <item drawable="easyxkcd" />
 <item drawable="eddymalou" />
-<item drawable="editor920" />
 <item drawable="editor" />
+    <item drawable="editor920" />
 <item drawable="edslite" />
 <item drawable="effalerts" />
 <item drawable="electrum" />
@@ -250,12 +250,12 @@
 <item drawable="ffreddit" />
 <item drawable="ffupdater" />
 <item drawable="fileexplorer" />
+    <item drawable="filemanager" />
 <item drawable="filemanagerpro" />
 <item drawable="filemanagersc" />
-<item drawable="filemanager" />
 <item drawable="findmyphone" />
+    <item drawable="firefox" />
 <item drawable="firefoxfocus" />
-<item drawable="firefox" />
 <item drawable="firewall" />
 <item drawable="floatingstickies" />
 <item drawable="flym" />
@@ -283,8 +283,8 @@
 <item drawable="getbackgps" />
 <item drawable="ghostcommander" />
 <item drawable="gigaget" />
-<item drawable="github2" />
 <item drawable="github" />
+    <item drawable="github2" />
 <item drawable="gitlab" />
 <item drawable="gloomydungeons" />
 <item drawable="gltron" />
@@ -390,8 +390,8 @@
 <item drawable="malp" />
 <item drawable="manman" />
 <item drawable="manyverse" />
-<item drawable="mapsme" />
 <item drawable="maps" />
+    <item drawable="mapsme" />
 <item drawable="marblemaps" />
 <item drawable="markdownview" />
 <item drawable="markers" />
@@ -413,12 +413,12 @@
 <item drawable="micromath" />
 <item drawable="midisheetmusic" />
 <item drawable="mifare" />
+    <item drawable="mimanganu" />
 <item drawable="minetest" />
 <item drawable="minilens" />
 <item drawable="miniopenwlanmap" />
 <item drawable="ministro" />
 <item drawable="minivector" />
-<item drawable="minumanga" />
 <item drawable="mirakel" />
 <item drawable="miros" />
 <item drawable="mitzuli" />
@@ -434,10 +434,10 @@
 <item drawable="mtgfamiliar" />
 <item drawable="multirommgr" />
 <item drawable="mupdf" />
+    <item drawable="music" />
 <item drawable="musicplayergo" />
-<item drawable="music" />
+    <item drawable="mustard" />
 <item drawable="mustardmod" />
-<item drawable="mustard" />
 <item drawable="muzei" />
 <item drawable="myapplist" />
 <item drawable="mybanq" />
@@ -461,8 +461,8 @@
 <item drawable="neuralnetworks" />
 <item drawable="newpipe" />
 <item drawable="newsblur" />
-<item drawable="nextclouddev" />
 <item drawable="nextcloud" />
+    <item drawable="nextclouddev" />
 <item drawable="nextcloudtalk" />
 <item drawable="nhbooks" />
 <item drawable="nicecompass" />
@@ -510,8 +510,8 @@
 <item drawable="openobservatory" />
 <item drawable="openredmine" />
 <item drawable="opentraining" />
-<item drawable="openvpnsettings" />
 <item drawable="openvpn" />
+    <item drawable="openvpnsettings" />
 <item drawable="openwlanmap" />
 <item drawable="opesudoku" />
 <item drawable="orbot" />
@@ -526,14 +526,14 @@
 <item drawable="osmtracker" />
 <item drawable="osmuploader" />
 <item drawable="otaupdate" />
-<item drawable="otpauth" />
 <item drawable="otp" />
+    <item drawable="otpauth" />
 <item drawable="overchan" />
+    <item drawable="owncloud" />
 <item drawable="owncloudbeta" />
 <item drawable="owncloudnews" />
 <item drawable="owncloudnotes" />
 <item drawable="owncloudsms" />
-<item drawable="owncloud" />
 <item drawable="packetsender" />
 <item drawable="packlist" />
 <item drawable="paddletennis" />
@@ -544,8 +544,8 @@
 <item drawable="passwdsafe" />
 <item drawable="pdfcreator" />
 <item drawable="pdfreader" />
+    <item drawable="pedometer" />
 <item drawable="pedometer2" />
-<item drawable="pedometer" />
 <item drawable="penandpdf" />
 <item drawable="performancecontrol" />
 <item drawable="periodical" />
@@ -575,8 +575,8 @@
 <item drawable="pwdhash" />
 <item drawable="pwdstore" />
 <item drawable="pyload" />
-<item drawable="qksmspink" />
 <item drawable="qksms" />
+    <item drawable="qksmspink" />
 <item drawable="qrscanner" />
 <item drawable="qrstream" />
 <item drawable="quake1" />
@@ -607,7 +607,6 @@
 <item drawable="revolution" />
 <item drawable="rgbtool" />
 <item drawable="ringdroid" />
-<item drawable="ring" />
 <item drawable="riot" />
 <item drawable="ripple" />
 <item drawable="rmaps" />
@@ -638,8 +637,8 @@
 <item drawable="secrecy" />
 <item drawable="secscanqr" />
 <item drawable="secusodame" />
-<item drawable="secusodicegame" />
 <item drawable="secusodice" />
+    <item drawable="secusodicegame" />
 <item drawable="secusoludo" />
 <item drawable="secusomemory" />
 <item drawable="secusonotes" />
@@ -662,8 +661,8 @@
 <item drawable="seriesguide" />
 <item drawable="servdroid" />
 <item drawable="servestream" />
+    <item drawable="settings" />
 <item drawable="settings2" />
-<item drawable="settings" />
 <item drawable="sfen" />
 <item drawable="sgit" />
 <item drawable="shadereditor" />
@@ -675,8 +674,8 @@
 <item drawable="shoppinglist" />
 <item drawable="sicmuplayer" />
 <item drawable="sieben" />
-<item drawable="signalgenerator" />
 <item drawable="signal" />
+    <item drawable="signalgenerator" />
 <item drawable="sigspoof" />
 <item drawable="silentnight" />
 <item drawable="simplealarm" />
@@ -708,16 +707,16 @@
 <item drawable="slimfacebook" />
 <item drawable="smarterwifimanager" />
 <item drawable="smartnavi" />
+    <item drawable="sms" />
 <item drawable="sms2" />
 <item drawable="smsbackup" />
 <item drawable="smsscheduler" />
 <item drawable="smssecure" />
-<item drawable="sms" />
 <item drawable="snooperstopper" />
 <item drawable="snoopsnitch" />
 <item drawable="sokoban" />
-<item drawable="solitairecg" />
 <item drawable="solitaire" />
+    <item drawable="solitairecg" />
 <item drawable="soundrecorder" />
 <item drawable="soundwaves" />
 <item drawable="sparserss" />
@@ -761,19 +760,19 @@
 <item drawable="tapandturn" />
 <item drawable="taskbar" />
 <item drawable="taskkeeper" />
-<item drawable="tasks2" />
 <item drawable="tasks" />
+    <item drawable="tasks2" />
 <item drawable="taskwarrior" />
 <item drawable="td" />
 <item drawable="teatimer" />
 <item drawable="telegram" />
 <item drawable="tempmonitor" />
+    <item drawable="terminal" />
 <item drawable="terminalemulator" />
-<item drawable="terminal" />
 <item drawable="terminightor" />
+    <item drawable="termux" />
 <item drawable="termuxboot" />
 <item drawable="termuxfloat" />
-<item drawable="termux" />
 <item drawable="testnet3" />
 <item drawable="tethercompanion" />
 <item drawable="textfiction" />
@@ -791,12 +790,12 @@
 <item drawable="toffeed" />
 <item drawable="togozip" />
 <item drawable="tomdroid" />
-<item drawable="torchlight" />
 <item drawable="torch" />
+    <item drawable="torchlight" />
 <item drawable="torrentclient" />
 <item drawable="traccar" />
-<item drawable="transdroidsearch" />
 <item drawable="transdroid" />
+    <item drawable="transdroidsearch" />
 <item drawable="transdrone" />
 <item drawable="transistor" />
 <item drawable="transportr" />
@@ -815,8 +814,8 @@
 <item drawable="tusky" />
 <item drawable="tutanota" />
 <item drawable="tuxemon" />
+    <item drawable="tuxpaint" />
 <item drawable="tuxpaintconfig" />
-<item drawable="tuxpaint" />
 <item drawable="tuxrider" />
 <item drawable="tvkill" />
 <item drawable="twidere" />
@@ -839,10 +838,10 @@
 <item drawable="vinyl" />
 <item drawable="visualbitcoin" />
 <item drawable="vlc" />
+    <item drawable="voice" />
 <item drawable="voicedialer" />
 <item drawable="voicerecorder" />
 <item drawable="voicesmith" />
-<item drawable="voice" />
 <item drawable="vudroid" />
 <item drawable="vxconnectbot" />
 <item drawable="wakeonlan" />
@@ -895,10 +894,10 @@
 <item drawable="xdafeedreader" />
 <item drawable="xjackoverride" />
 <item drawable="xkcdviewer" />
-<item drawable="xposeddownloader" />
 <item drawable="xposed" />
-<item drawable="xprivacylua" />
+    <item drawable="xposeddownloader" />
 <item drawable="xprivacy" />
+    <item drawable="xprivacylua" />
 <item drawable="xsdl" />
 <item drawable="xskat" />
 <item drawable="yaab" />
diff --git a/icons/minumanga.svg b/icons/mimanganu.svg
similarity index 100%
rename from icons/minumanga.svg
rename to icons/mimanganu.svg
diff --git a/process_wipsvg-xml.sh b/process_wipsvg-xml.sh
index 0c296f9201820d77f0dd83472770050238ab1261..bb3abbb38a87bb5b6208078a9dd2b68c0a1cd6aa 100755
--- a/process_wipsvg-xml.sh
+++ b/process_wipsvg-xml.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# rastear desde todo/wip
+# get from todo/wip
 for SVG in todo/wip/*.svg
 do
 N=$(basename ${SVG} .svg)
@@ -20,7 +20,7 @@ cp ${SVG} ${SVG}.tmp
 	mv ${SVG} icons
 done
 
-# "xml" crea los correspondientes values/iconpack.xml y xml/drawable.xml
+# "xml" create corresponding "values/iconpack.xml" and "xml/drawable.xml"
 SVGDIR="icons/"
 EXPORT="app/src/main/res"
 ICPACK_PRE='<item>'
diff --git a/icons/ring.svg b/todo/ring.svg
similarity index 100%
rename from icons/ring.svg
rename to todo/ring.svg