Merge pull request #605 from ImranR98/dev

Bugfix for GitHub appId extraction (#604)
Bugfix for GitHub appId extraction (#604 )
2025-07-13 13:26:43 +02:00 · 2023-06-02 23:05:37 -04:00 · 2023-06-02 23:04:07 -04:00 · 2023-06-02 21:08:15 -04:00 · 2023-06-02 21:07:28 -04:00 · 2023-06-02 21:03:45 -04:00
57 changed files with 5025 additions and 2852 deletions
--- a/README.md
+++ b/README.md
@ -15,9 +15,11 @@ Currently supported App sources:
 - [Mullvad](https://mullvad.net/en/)
 - [Signal](https://signal.org/)
 - [SourceForge](https://sourceforge.net/)
+- [SourceHut](https://git.sr.ht/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
+- [APKPure](https://apkpure.com/)
 - Third Party F-Droid Repos
-  - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
+- Jenkins Jobs
 - [Steam](https://store.steampowered.com/mobile)
 - [Telegram App](https://telegram.org)
 - [VLC](https://www.videolan.org/vlc/download-android.html)
@ -35,7 +37,6 @@ Currently supported App sources:
     height="80">](https://apt.izzysoft.de/fdroid/index/apk/dev.imranr.obtainium)

 ## Limitations
- App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.
 - Auto (unattended) updates are unsupported due to a lack of any capable Flutter plugin.
 - For some sources, data is gathered using Web scraping and can easily break due to changes in website design. In such cases, more reliable methods may be unavailable.

--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -25,6 +25,11 @@
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+            <intent-filter>
+                <action
+                    android:name="com.android_package_installer.content.SESSION_API_PACKAGE_INSTALLED"
+                    android:exported="false"/>
+            </intent-filter>
        </activity>
        <!-- Don't delete the meta-data below.
             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
@ -46,9 +51,18 @@
                <action android:name="android.intent.action.BOOT_COMPLETED" />
            </intent-filter>
        </receiver>
+        <provider
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="dev.imranr.obtainium"
+        android:grantUriPermissions="true">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_paths"/>
+        </provider>
    </application>
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/main/res/xml/file_paths.xml
+++ b/android/app/src/main/res/xml/file_paths.xml
@ -2,4 +2,5 @@
 <paths>
    <external-path path="Android/data/dev.imranr.obtainium/" name="files_root" />
    <external-path path="." name="external_storage_root" />
+    <external-path name="external_files" path="."/>
 </paths>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -26,6 +26,6 @@ subprojects {
    project.evaluationDependsOn(':app')
 }

-task clean(type: Delete) {
+tasks.register("clean", Delete) {
    delete rootProject.buildDir
 }
--- a/assets/ca/lets-encrypt-r3.pem
+++ b/assets/ca/lets-encrypt-r3.pem
@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
--- a/assets/graphics/icon.png
+++ b/assets/graphics/icon.png
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@ -20,7 +20,6 @@
    "githubPATLabel": "GitHub Personal Access Token (Erhöht das Ratenlimit)",
    "githubPATHint": "PAT muss in diesem Format sein: Benutzername:Token",
    "githubPATFormat": "Benutzername:Token",
-    "githubPATLinkText": "Über GitHub PATs",
    "includePrereleases": "Vorabversionen einbeziehen",
    "fallbackToOlderReleases": "Fallback auf ältere Versionen",
    "filterReleaseTitlesByRegEx": "Release-Titel nach regulärem Ausdruck\nfiltern",
@ -71,7 +70,7 @@
    "updateX": "Aktualisiere {}",
    "installX": "Installiere {}",
    "markXTrackOnlyAsUpdated": "Markiere {}\n(Nur Nachverfolgen)\nals aktualisiert",
-    "changeX": "Ändern {}",
+    "changeX": "Ändere {}",
    "installUpdateApps": "Apps installieren/aktualisieren",
    "installUpdateSelectedApps": "Ausgewählte Apps installieren/aktualisieren",
    "markXSelectedAppsAsUpdated": "Markiere {} ausgewählte Apps als aktuell?",
@ -122,11 +121,12 @@
    "followSystem": "System folgen",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Verwende Pure Black Dark Theme",
    "appSortBy": "App sortieren nach",
    "authorName": "Autor/Name",
    "nameAuthor": "Name/Autor",
    "asAdded": "Wie hinzugefügt",
-    "appSortOrder": "App Sortierung nach",
+    "appSortOrder": "App sortieren nach",
    "ascending": "Aufsteigend",
    "descending": "Absteigend",
    "bgUpdateCheckInterval": "Prüfintervall für Hintergrundaktualisierung",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "Letzte Aktualisierungsprüfung: {}",
    "remove": "Entfernen",
    "yesMarkUpdated": "Ja, als aktualisiert markieren",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "App ID oder Name",
+    "appId": "App ID",
    "appWithIdOrNameNotFound": "Es wurde keine App mit dieser ID oder diesem Namen gefunden",
    "reposHaveMultipleApps": "Repos können mehrere Apps enthalten",
    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
@ -207,6 +208,7 @@
    "addCategory": "Kategorie hinzufügen",
    "label": "Bezeichnung",
    "language": "Sprache",
+    "copiedToClipboard": "In die Zwischenablage kopiert",
    "storagePermissionDenied": "Speicherberechtigung verweigert",
    "selectedCategorizeWarning": "Dadurch werden alle bestehenden Kategorieeinstellungen für die ausgewählten Apps ersetzt.",
    "filterAPKsByRegEx": "APKs nach regulärem Ausdruck filtern",
@ -217,12 +219,24 @@
    "releaseDateAsVersionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert, aber ein Veröffentlichungsdatum verfügbar ist.",
    "changes": "Änderungen",
    "releaseDate": "Veröffentlichungsdatum",
-    "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
+    "importFromURLsInFile": "Importieren von URLs aus Datei (z. B. OPML)",
    "versionDetection": "Versionserkennung",
    "standardVersionDetection": "Standardversionserkennung",
+    "groupByCategory": "Nach Kategorie gruppieren",
+    "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
+    "overrideSource": "Quelle überschreiben",
+    "dontShowAgain": "Nicht noch einmal zeigen",
+    "dontShowTrackOnlyWarnings": "Warnung für 'Nur Nachverfolgen' nicht anzeigen",
+    "dontShowAPKOriginWarnings": "Warnung für APK-Herkunft nicht anzeigen",
+    "moveNonInstalledAppsToBottom": "Nicht installierte Apps ans Ende der Apps Ansicht verschieben",
+    "gitlabPATLabel": "GitLab Personal Access Token (Aktiviert Suche)",
+    "about": "Über",
+    "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)",
+    "checkOnStart": "Überprüfe einmalig beim Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "App entfernen?",
-        "other": "App entfernen?"
+        "other": "Apps entfernen?"
    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
@ -246,7 +260,7 @@
    },
    "minute": {
        "one": "{} Minute",
-        "other": "{} Minutes"
+        "other": "{} Minuten"
    },
    "hour": {
        "one": "{} Stunde",
@ -268,4 +282,4 @@
        "one": "{} und 1 weitere Anwendung wurden aktualisiert.",
        "other": "{} und {} weitere Anwendungen wurden aktualisiert."
    }
-}
+}
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@ -20,7 +20,6 @@
    "githubPATLabel": "GitHub Personal Access Token (Increases Rate Limit)",
    "githubPATHint": "PAT must be in this format: username:token",
    "githubPATFormat": "username:token",
-    "githubPATLinkText": "About GitHub PATs",
    "includePrereleases": "Include prereleases",
    "fallbackToOlderReleases": "Fallback to older releases",
    "filterReleaseTitlesByRegEx": "Filter Release Titles by Regular Expression",
@ -122,6 +121,7 @@
    "followSystem": "Follow System",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use Pure Black Dark Theme",
    "appSortBy": "App Sort By",
    "authorName": "Author/Name",
    "nameAuthor": "Name/Author",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "Last Update Check: {}",
    "remove": "Remove",
    "yesMarkUpdated": "Yes, Mark as Updated",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "App ID or Name",
+    "appId": "App ID",
    "appWithIdOrNameNotFound": "No App was found with that ID or Name",
    "reposHaveMultipleApps": "Repos may contain multiple Apps",
    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
@ -207,6 +208,7 @@
    "addCategory": "Add Category",
    "label": "Label",
    "language": "Language",
+    "copiedToClipboard": "Copied to Clipboard",
    "storagePermissionDenied": "Storage permission denied",
    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@ -220,6 +222,18 @@
    "importFromURLsInFile": "Import from URLs in File (like OPML)",
    "versionDetection": "Version Detection",
    "standardVersionDetection": "Standard version detection",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show 'Track-Only' Warnings",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
+    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "about": "About",
+    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "Remove App?",
        "other": "Remove Apps?"
@ -268,4 +282,4 @@
        "one": "{} and 1 more app were updated.",
        "other": "{} and {} more apps were updated."
    }
-}
+}
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@ -0,0 +1,285 @@
+{
+    "invalidURLForSource": "URL de la aplicación {} no válida",
+    "noReleaseFound": "No se ha podido encontrar una versión válida",
+    "noVersionFound": "No se ha podido determinar la versión de la publicación",
+    "urlMatchesNoSource": "La URL no coincide con ninguna fuente conocida",
+    "cantInstallOlderVersion": "No se puede instalar una versión previa de la aplicación",
+    "appIdMismatch": "La ID del paquete descargado no coincide con la ID de la aplicación instalada",
+    "functionNotImplemented": "Esta clase no ha implementado esta función",
+    "placeholder": "Espacio reservado",
+    "someErrors": "Han ocurrido algunos errores",
+    "unexpectedError": "Error Inesperado",
+    "ok": "Correcto",
+    "and": "y",
+    "startedBgUpdateTask": "Empezada la tarea de comprobación de actualizaciones en segundo plano",
+    "bgUpdateIgnoreAfterIs": "El parámetro ignoreAfter de la actualización en segundo plano es  {}",
+    "startedActualBGUpdateCheck": "Ha comenzado la comprobación de actualizaciones en segundo plano",
+    "bgUpdateTaskFinished": "Ha finalizado la comprobación de actualizaciones en segundo plano",
+    "firstRun": "Esta es la primera ejecución de Obtainium",
+    "settingUpdateCheckIntervalTo": "Cambiando intervalo de actualización a {}",
+    "githubPATLabel": "Token de Acceso Personal de GitHub (Reduce tiempos de espera)",
+    "githubPATHint": "El TAP debe tener este formato: nombre_de_usuario:token",
+    "githubPATFormat": "nombre_de_usuario:token",
+    "includePrereleases": "Incluir versiones preliminares",
+    "fallbackToOlderReleases": "Retorceder a versiones previas",
+    "filterReleaseTitlesByRegEx": "Filtra Títulos de Versiones mediantes Expresiones Regulares",
+    "invalidRegEx": "Expresión regular inválida",
+    "noDescription": "Sin descripción",
+    "cancel": "Cancelar",
+    "continue": "Continuar",
+    "requiredInBrackets": "(Requerido)",
+    "dropdownNoOptsError": "ERROR: EL DESPLEGABLE DEBE TENER AL MENOS UNA OPCIÓN",
+    "colour": "Color",
+    "githubStarredRepos": "Repositorios favoritos de GitHub",
+    "uname": "Nombre de usuario",
+    "wrongArgNum": "Número de argumentos provistos inválido",
+    "xIsTrackOnly": "{} es de 'Solo Seguimiento'",
+    "source": "Origen",
+    "app": "Aplicación",
+    "appsFromSourceAreTrackOnly": "Las aplicaciones de este origen son de 'Solo Seguimiento'.",
+    "youPickedTrackOnly": "Debes seleccionar la opción de 'Solo Seguimiento'.",
+    "trackOnlyAppDescription": "Se monitorizará la aplicación en busca de actualizaciones, pero Obtainium no será capaz de descargarla o acutalizarla.",
+    "cancelled": "Cancelado",
+    "appAlreadyAdded": "Aplicación ya añadida",
+    "alreadyUpToDateQuestion": "¿Aplicación ya actualizada?",
+    "addApp": "Añadir Aplicación",
+    "appSourceURL": "URL de Origen de la Aplicación",
+    "error": "Error",
+    "add": "Añadir",
+    "searchSomeSourcesLabel": "Buscar (Solo Algunas Fuentes)",
+    "search": "Buscar",
+    "additionalOptsFor": "Opciones Adicionales para {}",
+    "supportedSourcesBelow": "Fuentes Soportadas:",
+    "trackOnlyInBrackets": "(Solo Seguimiento)",
+    "searchableInBrackets": "(Soporta Búsquedas)",
+    "appsString": "Aplicaciones",
+    "noApps": "Sin Aplicaciones",
+    "noAppsForFilter": "Sin Aplicaciones para Filtrar",
+    "byX": "Por {}",
+    "percentProgress": "Progreso: {}%",
+    "pleaseWait": "Por favor, espere",
+    "updateAvailable": "Actualización Disponible",
+    "estimateInBracketsShort": "(Aprox.)",
+    "notInstalled": "No Instalado",
+    "estimateInBrackets": "(Aproximado)",
+    "selectAll": "Seleccionar Todo",
+    "deselectN": "Deseleccionar {}",
+    "xWillBeRemovedButRemainInstalled": "{} será borrada de Obtainium pero continuará instalada en el dispositivo.",
+    "removeSelectedAppsQuestion": "¿Borrar aplicaciones seleccionadas?",
+    "removeSelectedApps": "Borrar Aplicaciones Seleccionadas",
+    "updateX": "Actualizar {}",
+    "installX": "Instalar {}",
+    "markXTrackOnlyAsUpdated": "Marcar {}\n(Solo Seguimient)\ncomo Actualizada",
+    "changeX": "Cambiar {}",
+    "installUpdateApps": "Instalar/Actualizar Aplicaciones",
+    "installUpdateSelectedApps": "Instalar/Actualizar Aplicaciones Seleccionadas",
+    "markXSelectedAppsAsUpdated": "¿Marcar {} Aplicaciones Seleccionadas como Actualizadas?",
+    "no": "No",
+    "yes": "Sí",
+    "markSelectedAppsUpdated": "Marcar Aplicaciones Seleccionadas como Actualizadas",
+    "pinToTop": "Fijar arriba",
+    "unpinFromTop": "Desfijar de arriba",
+    "resetInstallStatusForSelectedAppsQuestion": "¿Restuarar Estado de Instalación para las Aplicaciones Seleccionadas?",
+    "installStatusOfXWillBeResetExplanation": "El estado de instalación de las aplicaciones seleccionadas será restaurado.\n\nEsto puede ser de utilidad cuando la versión de la aplicación mostrada en Obtainium es incorrecta por actualizaciones fallidas u otros motivos.",
+    "shareSelectedAppURLs": "Compartir URLs de las Aplicaciones Seleccionadas",
+    "resetInstallStatus": "Restaurar Estado de Instalación",
+    "more": "Más",
+    "removeOutdatedFilter": "Elimiar Filtro de Aplicaciones Desactualizado",
+    "showOutdatedOnly": "Mostrar solo Aplicaciones Desactualizadas",
+    "filter": "Filtrar",
+    "filterActive": "Filtrar *",
+    "filterApps": "Filtrar Actualizaciones",
+    "appName": "Nombre de la Aplicación",
+    "author": "Autor",
+    "upToDateApps": "Aplicaciones Actualizadas",
+    "nonInstalledApps": "Aplicaciones No Instaladas",
+    "importExport": "Importar/Exportar",
+    "settings": "Ajustes",
+    "exportedTo": "Exportado a {}",
+    "obtainiumExport": "Exportar Obtainium",
+    "invalidInput": "Input incorrecto",
+    "importedX": "Importado {}",
+    "obtainiumImport": "Importar Obtainium",
+    "importFromURLList": "Importar desde lista de URLs",
+    "searchQuery": "Consulta de Búsqueda",
+    "appURLList": "Lista de URLs de Aplicaciones",
+    "line": "Línea",
+    "searchX": "Buscar {}",
+    "noResults": "Resultados no encontrados",
+    "importX": "Importar {}",
+    "importedAppsIdDisclaimer": "Las Aplicaciones Importadas pueden mostrarse incorrectamente como \"No Instalada\".\nPara arreglar esto, reinstálalas a través de Obtainium.\nEsto no debería afectar a los datos de las aplicaciones.\n\nSolo afecta a las URLs y a los métodos de importación mediante terceros.",
+    "importErrors": "Import Errors",
+    "importedXOfYApps": "{} de {} Aplicaciones importadas.",
+    "followingURLsHadErrors": "Las siguientes URLs tuvieron problemas:",
+    "okay": "Correcto",
+    "selectURL": "Seleccionar URL",
+    "selectURLs": "Seleccionar URLs",
+    "pick": "Escoger",
+    "theme": "Tema",
+    "dark": "Oscuro",
+    "light": "Claro",
+    "followSystem": "Seguir al Sistema",
+    "obtainium": "Obtainium",
+    "materialYou": "Material You",
+    "useBlackTheme": "Usar tema oscuro con negros puros",
+    "appSortBy": "Ordenar Aplicaciones Por",
+    "authorName": "Autor/Nombre",
+    "nameAuthor": "Nombre/Autor",
+    "asAdded": "Según se Añadieron",
+    "appSortOrder": "Orden de Clasificación de Aplicaciones",
+    "ascending": "Ascendente",
+    "descending": "Descendente",
+    "bgUpdateCheckInterval": "Intervalo de Comprobación de Actualizaciones en Segundo Plano",
+    "neverManualOnly": "Nunca - Solo Manual",
+    "appearance": "Apariencia",
+    "showWebInAppView": "Mostrar Vista de la Web de Origen",
+    "pinUpdates": "Fijar Actualizaciones en la Parte Superior de la Vista de Aplicaciones",
+    "updates": "Actualizaciones",
+    "sourceSpecific": "Fuente Específica",
+    "appSource": "Fuente de la Aplicación",
+    "noLogs": "Sin Logs",
+    "appLogs": "Logs de la Aplicación",
+    "close": "Cerrar",
+    "share": "Compartir",
+    "appNotFound": "Aplicación no encontrada",
+    "obtainiumExportHyphenatedLowercase": "obtainium-export",
+    "pickAnAPK": "Elige una APK",
+    "appHasMoreThanOnePackage": "{} tiene más de un paquete:",
+    "deviceSupportsXArch": "Tu dispositivo soporta las siguientes arquitecturas de procesador: {}.",
+    "deviceSupportsFollowingArchs": "Tu dispositivo soporta las siguientes arquitecturas de procesador:",
+    "warning": "Aviso",
+    "sourceIsXButPackageFromYPrompt": "La fuente de la aplicación es '{}' pero el paquete de la actualización viene de '{}'. ¿Desea continuar?",
+    "updatesAvailable": "Actualizaciones Disponibles",
+    "updatesAvailableNotifDescription": "Notifica al usuario de que hay actualizaciones para una o más aplicaciones monitorizadas por Obtainium",
+    "noNewUpdates": "No hay nuevas actualizaciones.",
+    "xHasAnUpdate": "{} tiene una actualización.",
+    "appsUpdated": "Aplicaciones Actualizadas",
+    "appsUpdatedNotifDescription": "Notifica al usuario de que una o más aplicaciones han sido actualizadas en segundo plano",
+    "xWasUpdatedToY": "{} ha sido actualizada a {}.",
+    "errorCheckingUpdates": "Error Buscando Actualizaciones",
+    "errorCheckingUpdatesNotifDescription": "Una notificación que muestra cuándo la comprobación de actualizaciones en segundo plano falla",
+    "appsRemoved": "Aplicaciones Eliminadas",
+    "appsRemovedNotifDescription": "Notifica al usuario que una o más aplicaciones fueron eliminadas por problemas al cargarlas",
+    "xWasRemovedDueToErrorY": "{} ha sido eliminada por: {}",
+    "completeAppInstallation": "Instalación Completa de la Aplicación",
+    "obtainiumMustBeOpenToInstallApps": "Obtainium debe estar abierta para instalar aplicaciones",
+    "completeAppInstallationNotifDescription": "Pide al usuario volver a Obtainium para teminar de instalar una aplicación",
+    "checkingForUpdates": "Buscando Actualizaciones",
+    "checkingForUpdatesNotifDescription": "Notificación temporal que aparece al buscar actualizaciones",
+    "pleaseAllowInstallPerm": "Por favor, permite a Obtainium instalar aplicaciones",
+    "trackOnly": "Solo Seguimiento",
+    "errorWithHttpStatusCode": "Error {}",
+    "versionCorrectionDisabled": "Corrección de versiones desactivada (el plugin parece no funcionar)",
+    "unknown": "Desconocido",
+    "none": "Ninguno",
+    "never": "Nunca",
+    "latestVersionX": "Última Versión: {}",
+    "installedVersionX": "Versión Instalada: {}",
+    "lastUpdateCheckX": "Última Comprobación: {}",
+    "remove": "Eliminar",
+    "yesMarkUpdated": "Sí, Marcar como Actualizada",
+    "fdroid": "Repositorio oficial de F-Droid",
+    "appIdOrName": "ID o Nombre de la Aplicación",
+    "appId": "ID de la Aplicación",
+    "appWithIdOrNameNotFound": "No se han encontrado aplicaciones con esa ID o nombre",
+    "reposHaveMultipleApps": "Los repositorios pueden contener varias aplicaciones",
+    "fdroidThirdPartyRepo": "Rpositorios de terceros de F-Droid",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
+    "install": "Instalar",
+    "markInstalled": "Marcar como Instalda",
+    "update": "Actualizar",
+    "markUpdated": "Marcar como Actualizada",
+    "additionalOptions": "Opciones Adicionales",
+    "disableVersionDetection": "Descativar Detección de Versiones",
+    "noVersionDetectionExplanation": "Esta opción solo se debe usar en aplicaciones en las que la deteción de versiones pueda no funcionar correctamente.",
+    "downloadingX": "Descargando {}",
+    "downloadNotifDescription": "Notifica al usuario de progreso de descarga de una aplicación",
+    "noAPKFound": "APK no encontrada",
+    "noVersionDetection": "Sin detección de versiones",
+    "categorize": "Catogorizar",
+    "categories": "Categorías",
+    "category": "Categoría",
+    "noCategory": "Sin Categoría",
+    "noCategories": "Sin Categorías",
+    "deleteCategoriesQuestion": "¿Borrar Categorías?",
+    "categoryDeleteWarning": "Todas las aplicaciones en las categorías borradas serán margadas como 'Sin Categoría'.",
+    "addCategory": "Añadir Categoría",
+    "label": "Nombre",
+    "language": "Idioma",
+    "copiedToClipboard": "Copiado al Portapapeles",
+    "storagePermissionDenied": "Permiso de Almacenamiento rechazado",
+    "selectedCategorizeWarning": "Esto reemplazará cualquier ajuste de categoría para las aplicaicones seleccionadas.",
+    "filterAPKsByRegEx": "Filtrar APKs mediante Expresiones Regulares",
+    "removeFromObtainium": "Eliminar de Obtainium",
+    "uninstallFromDevice": "Desinstalar del Dispositivo",
+    "onlyWorksWithNonVersionDetectApps": "Solo funciona para aplicaciones con la detección de versiones desactivada.",
+    "releaseDateAsVersion": "Usar Fecha de Publicación como Versión",
+    "releaseDateAsVersionExplanation": "Esta opción solo se debería usar con aplicaciones en las que la detección de versiones no funciona pero hay disponible una fecha de publicación.",
+    "changes": "Cambios",
+    "releaseDate": "Fecha de Publicación",
+    "importFromURLsInFile": "Importar de URls en un Archivo (como OPML)",
+    "versionDetection": "Detección de Versiones",
+    "standardVersionDetection": "Detección de versiones estándar",
+    "groupByCategory": "Agrupar por Categoría",
+    "autoApkFilterByArch": "Tratar de filtrar las APKs mediante arquitecturas de procesador si es posible",
+    "overrideSource": "Sobrescribir Fuente",
+    "dontShowAgain": "No mostrar de nuevo",
+    "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'",
+    "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks",
+    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
+    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "about": "About",
+    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeAppQuestion": {
+        "one": "¿Eliminar Aplicación?",
+        "other": "¿Eliminar Aplicaciones?"
+    },
+    "tooManyRequestsTryAgainInMinutes": {
+        "one": "Muchas peticiones (limitado) - prueba de nuevo en {} minuto",
+        "other": "Muchas peticiones (limitado) - prueba de nuevo en {} minutos"
+    },
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "La comprobación de actualizaciones en segundo plano se ha encontrado un {}, se volverá a probar en {} minuto",
+        "other": "La comprobación de actualizaciones en segundo plano se ha encontrado un {}, se volverá a probar en {} minutos"
+    },
+    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
+        "one": "La comprobación de actualizaciones en segundo plano ha encontrado {} actualización - se notificará al usuario si es necesario",
+        "other": "La comprobación de actualizaciones en segundo plano ha encontrado {} actualizaciones - se notificará al usuario si es necesario"
+    },
+    "apps": {
+        "one": "{} Aplicación",
+        "other": "{} Aplicaciones"
+    },
+    "url": {
+        "one": "{} URL",
+        "other": "{} URLs"
+    },
+    "minute": {
+        "one": "{} Minuto",
+        "other": "{} Minutos"
+    },
+    "hour": {
+        "one": "{} Hora",
+        "other": "{} Horas"
+    },
+    "day": {
+        "one": "{} Día",
+        "other": "{} Días"
+    },
+    "clearedNLogsBeforeXAfterY": {
+        "one": "Borrado {n} log (previo a = {before}, posterior a = {after})",
+        "other": "Borrados {n} logs (previos a = {before}, posteriores a = {after})"
+    },
+    "xAndNMoreUpdatesAvailable": {
+        "one": "{} y 1 aplicación más tiene actualizaciones.",
+        "other": "{} y {} aplicaciones más tiene actualizaciones."
+    },
+    "xAndNMoreUpdatesInstalled": {
+        "one": "{} y 1 aplicación más han sido actualizadas.",
+        "other": "{} y {} aplicaciones más han sido actualizadas."
+    }
+}
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@ -20,7 +20,6 @@
    "githubPATLabel": "توکن دسترسی شخصی گیت هاب(محدودیت نرخ را افزایش میدهد)",
    "githubPATHint": "PAT باید در این قالب باشد: username:token",
    "githubPATFormat": "username:token",
-    "githubPATLinkText": "درباره گیتهاب PATs",
    "includePrereleases": "شامل نسخه های اولیه",
    "fallbackToOlderReleases": "بازگشت به نسخه های قدیمی تر",
    "filterReleaseTitlesByRegEx": "عناوین انتشار را با بیان منظم فیلتر کنید",
@ -122,6 +121,7 @@
    "followSystem": "هماهنگ با سیستم",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "استفاده از تم تیره سیاه خالص",
    "appSortBy": "مرتب سازی برنامه بر اساس",
    "authorName": "سازنده/اسم",
    "nameAuthor": "اسم/سازنده",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "بررسی آخرین به‌روزرسانی: {}",
    "remove": "حذف",
    "yesMarkUpdated": "بله، علامت گذاری به عنوان به روز شده",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "شناسه یا نام برنامه",
+    "appId": "App ID",
    "appWithIdOrNameNotFound": "هیچ برنامه ای با آن شناسه یا نام یافت نشد",
    "reposHaveMultipleApps": "مخازن ممکن است شامل چندین برنامه باشد",
    "fdroidThirdPartyRepo": "مخازن شخص ثالث F-Droid",
@ -207,6 +208,7 @@
    "addCategory": "اضافه کردن دسته",
    "label": "برچسب",
    "language": "زبان",
+    "copiedToClipboard": "در کلیپ بورد کپی شد",
    "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
    "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
    "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@ -220,6 +222,18 @@
    "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
    "versionDetection": "تشخیص نسخه",
    "standardVersionDetection": "تشخیص نسخه استاندارد",
+    "groupByCategory": "گروه بر اساس دسته",
+    "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
+    "overrideSource": "نادیده گرفتن منبع",
+    "dontShowAgain": "دوباره این را نشان نده",
+    "dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید",
+    "dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید",
+    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
+    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "about": "About",
+    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@ -20,7 +20,6 @@
    "githubPATLabel": "Jeton d'Accès Personnel GitHub (Augmente la limite de débit)",
    "githubPATHint": "Le JAP doit être dans ce format : username:token",
    "githubPATFormat": "username:token",
-    "githubPATLinkText": "À propos des JAP GitHub",
    "includePrereleases": "Inclure les avant-premières",
    "fallbackToOlderReleases": "Retour aux anciennes versions",
    "filterReleaseTitlesByRegEx": "Filtrer les titres de version par expression régulière",
@ -122,6 +121,7 @@
    "followSystem": "Suivre le système",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use Pure Black Dark Theme",
    "appSortBy": "Applications triées par",
    "authorName": "Auteur/Nom",
    "nameAuthor": "Nom/Auteur",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "Vérification de la dernière mise à jour : {}",
    "remove": "Retirer",
    "yesMarkUpdated": "Oui, marquer comme mis à jour",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "ID ou nom de l'application",
+    "appId": "ID de l'application",
    "appWithIdOrNameNotFound": "Aucune application n'a été trouvée avec cet identifiant ou ce nom",
    "reposHaveMultipleApps": "Les dépôts peuvent contenir plusieurs applications",
    "fdroidThirdPartyRepo": "Dépôt tiers F-Droid",
@ -207,6 +208,7 @@
    "addCategory": "Ajouter une catégorie",
    "label": "Étiquette",
    "language": "Langue",
+    "copiedToClipboard": "Copied to Clipboard",
    "storagePermissionDenied": "Autorisation de stockage refusée",
    "selectedCategorizeWarning": "Cela remplacera tous les paramètres de catégorie existants pour les applications sélectionnées.",
    "filterAPKsByRegEx": "Filtrer les APK par expression régulière",
@ -220,6 +222,18 @@
    "importFromURLsInFile": "Importer à partir d'URL dans un fichier (comme OPML)",
    "versionDetection": "Détection des versions",
    "standardVersionDetection": "Détection de version standard",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
+    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "about": "About",
+    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "Supprimer l'application ?",
        "other": "Supprimer les applications ?"
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@ -20,7 +20,6 @@
    "githubPATLabel": "GitHub személyes hozzáférési token (megnöveli a díjkorlátot)",
    "githubPATHint": "A PAT-nak a következő formátumban kell lennie: felhasználónév:token",
    "githubPATFormat": "felhasználónév:token",
-    "githubPATLinkText": "A GitHub PAT-okról",
    "includePrereleases": "Tartalmazza az előzetes kiadásokat",
    "fallbackToOlderReleases": "Visszatérés a régebbi kiadásokhoz",
    "filterReleaseTitlesByRegEx": "A kiadás címeinek szűrése reguláris kifejezéssel",
@ -122,6 +121,7 @@
    "followSystem": "Rendszer szerint",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Használjon tiszta fekete sötét témát",
    "appSortBy": "App rendezés...",
    "authorName": "Szerző/Név",
    "nameAuthor": "Név/Szerző",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "Frissítés ellenőrizve: {}",
    "remove": "Eltávolítás",
    "yesMarkUpdated": "Igen, megjelölés frissítettként",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "App ID vagy név",
+    "appId": "App ID",
    "appWithIdOrNameNotFound": "Nem található app ezzel az azonosítóval vagy névvel",
    "reposHaveMultipleApps": "A repók több alkalmazást is tartalmazhatnak",
    "fdroidThirdPartyRepo": "F-Droid Harmadik-fél Repo",
@ -206,6 +207,7 @@
    "addCategory": "Új kategória",
    "label": "Címke",
    "language": "Nyelv",
+    "copiedToClipboard": "Másolva a vágólapra",
    "storagePermissionDenied": "Tárhely engedély megtagadva",
    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
    "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
@ -219,6 +221,18 @@
    "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
    "versionDetection": "Verzió érzékelés",
    "standardVersionDetection": "Alapért. verzió érzékelés",
+    "groupByCategory": "Csoportosítás Kategória alapján",
+    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
+    "overrideSource": "Forrás felülbírálása",
+    "dontShowAgain": "Ne mutassa ezt újra",
+    "dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést",
+    "dontShowAPKOriginWarnings": "Ne jelenítsen meg az APK eredetére vonatkozó figyelmeztetéseket",
+    "moveNonInstalledAppsToBottom": "Helyezze át a nem telepített appokat az App nézet aljára",
+    "gitlabPATLabel": "GitLab Personal Access Token (Engedélyezi a Keresést)",
+    "about": "Rólunk",
+    "requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)",
+    "checkOnStart": "Egyszer az indításkor",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "Eltávolítja az alkalmazást?",
        "other": "Eltávolítja az alkalmazást?"
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@ -20,7 +20,6 @@
    "githubPATLabel": "GitHub Personal Access Token (diminuisce limite di traffico)",
    "githubPATHint": "PAT deve seguire questo formato: username:token",
    "githubPATFormat": "username:token",
-    "githubPATLinkText": "Informazioni su GitHub PAT",
    "includePrereleases": "Includi prerelease",
    "fallbackToOlderReleases": "Ripiega su release precedenti",
    "filterReleaseTitlesByRegEx": "Filtra release con espressioni regolari",
@ -122,6 +121,7 @@
    "followSystem": "Segui sistema",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use Pure Black Dark Theme",
    "appSortBy": "App ordinate per",
    "authorName": "Autore/Nome",
    "nameAuthor": "Nome/Autore",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}",
    "remove": "Rimuovi",
    "yesMarkUpdated": "Sì, contrassegna come aggiornato",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "ID o nome dell'App",
+    "appId": "ID dell'App",
    "appWithIdOrNameNotFound": "Non è stata trovata alcuna App con quell'ID o nome",
    "reposHaveMultipleApps": "I repository possono contenere più App",
    "fdroidThirdPartyRepo": "Repository F-Droid di terze parti",
@ -207,6 +208,7 @@
    "addCategory": "Aggiungi categoria",
    "label": "Etichetta",
    "language": "Lingua",
+    "copiedToClipboard": "Copiato negli appunti",
    "storagePermissionDenied": "Accesso ai file non autorizzato",
    "selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
    "filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
@ -220,6 +222,18 @@
    "importFromURLsInFile": "Importa da URL in file (come OPML)",
    "versionDetection": "Rilevamento di versione",
    "standardVersionDetection": "Rilevamento di versione standard",
+    "groupByCategory": "Raggruppa per categoria",
+    "autoApkFilterByArch": "Tenta di filtrare gli APK in base all'architettura della CPU, se possibile",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
+    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "about": "About",
+    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "Rimuovere l'App?",
        "other": "Rimuovere le App?"
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@ -20,7 +20,6 @@
    "githubPATLabel": "GitHub パーソナルアクセストークン (レート制限の引き上げ)",
    "githubPATHint": "PATは次の形式でなければなりません: ユーザー名:トークン",
    "githubPATFormat": "ユーザー名:トークン",
-    "githubPATLinkText": "GitHub PATsについて",
    "includePrereleases": "プレリリースを含む",
    "fallbackToOlderReleases": "旧リリースへのフォールバック",
    "filterReleaseTitlesByRegEx": "正規表現でリリースタイトルを絞り込む",
@ -122,6 +121,7 @@
    "followSystem": "システムに従う",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "ピュアブラックダークテーマを使用する",
    "appSortBy": "アプリの並び方",
    "authorName": "作者名/アプリ名",
    "nameAuthor": "アプリ名/作者名",
@ -178,8 +178,9 @@
    "lastUpdateCheckX": "最終アップデート確認: {}",
    "remove": "削除",
    "yesMarkUpdated": "はい、アップデート済みとしてマークします",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
    "appIdOrName": "アプリのIDまたは名前",
+    "appId": "App ID",
    "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
    "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
    "fdroidThirdPartyRepo": "F-Droid サードパーティリポジトリ",
@ -207,6 +208,7 @@
    "addCategory": "カテゴリを追加",
    "label": "ラベル",
    "language": "言語",
+    "copiedToClipboard": "クリップボードにコピーしました",
    "storagePermissionDenied": "ストレージ権限が拒否されました",
    "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
    "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@ -220,6 +222,18 @@
    "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
    "versionDetection": "バージョン検出",
    "standardVersionDetection": "標準のバージョン検出",
+    "groupByCategory": "カテゴリ別にグループ化する",
+    "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
+    "overrideSource": "ソースの上書き",
+    "dontShowAgain": "二度と表示しない",
+    "dontShowTrackOnlyWarnings": "「追跡のみ」の警告を表示しない",
+    "dontShowAPKOriginWarnings": "APK Originの警告を表示しない",
+    "moveNonInstalledAppsToBottom": "未インストールのアプリをアプリ一覧の下部に移動させる",
+    "gitlabPATLabel": "GitLab パーソナルアクセストークン (検索を有効化する)",
+    "about": "概要",
+    "requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)",
+    "checkOnStart": "Check Once on Start",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
        "one": "アプリを削除しますか？",
        "other": "アプリを削除しますか？"
@ -268,4 +282,4 @@
        "one": "{} とさらに {} 個のアプリがアップデートされました",
        "other": "{} とさらに {} 個のアプリがアップデートされました"
    }
-}
+}
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@ -0,0 +1,285 @@
+{
+    "noDescription": "Brak opisu",
+    "no": "Nie",
+    "okay": "Okej",
+    "appId": "ID aplikacji",
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} min.",
+        "other": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} min."
+    },
+    "invalidURLForSource": "Nieprawidłowy adres URL aplikacji {}",
+    "noReleaseFound": "Nie można znaleźć odpowiedniego wydania",
+    "noVersionFound": "Nie można określić wersji wydania",
+    "urlMatchesNoSource": "Adres URL nie pasuje do znanego źródła",
+    "cantInstallOlderVersion": "Nie można zainstalować starszej wersji aplikacji",
+    "appIdMismatch": "Pobrany identyfikator pakietu nie pasuje do istniejącego identyfikatora aplikacji",
+    "functionNotImplemented": "Ta klasa nie zaimplementowała tej funkcji",
+    "placeholder": "Placeholder",
+    "someErrors": "Wystąpiły pewne błędy",
+    "unexpectedError": "Nieoczekiwany błąd",
+    "ok": "Okej",
+    "and": "i",
+    "startedBgUpdateTask": "Rozpoczęto zadanie sprawdzania aktualizacji w tle",
+    "bgUpdateIgnoreAfterIs": "Parametr ignoreAfter aktualizacji w tle to {}",
+    "startedActualBGUpdateCheck": "Rozpoczęto sprawdzanie aktualizacji w tle",
+    "bgUpdateTaskFinished": "Zakończono zadanie sprawdzania aktualizacji w tle",
+    "firstRun": "Jest to pierwsze uruchomienie Obtainium",
+    "settingUpdateCheckIntervalTo": "Ustawianie interwału aktualizacji na {}",
+    "githubPATLabel": "Osobisty Token Dostępu GitHub (zwiększa limit zapytań)",
+    "githubPATHint": "Wymagany format OTD: użytkownik:token",
+    "githubPATFormat": "użytkownik:token",
+    "includePrereleases": "Uwzględnij wersje wstępne",
+    "fallbackToOlderReleases": "Powracaj do starszych wersji",
+    "filterReleaseTitlesByRegEx": "Filtruj tytuły wydań wg. wyrażeń regularnych",
+    "invalidRegEx": "Nieprawidłowe wyrażenie regularne",
+    "cancel": "Anuluj",
+    "continue": "Kontynuuj",
+    "requiredInBrackets": "(Wymagane)",
+    "dropdownNoOptsError": "BŁĄD: LISTA ROZWIJANA MUSI MIEĆ CO NAJMNIEJ JEDNĄ OPCJĘ",
+    "colour": "Kolor",
+    "githubStarredRepos": "Repozytoria GitHub oznaczone gwiazdką",
+    "uname": "Nazwa użytkownika",
+    "wrongArgNum": "Nieprawidłowa liczba podanych argumentów",
+    "xIsTrackOnly": "{} jest tylko obserwowana",
+    "source": "Źródło",
+    "app": "Aplikacja",
+    "appsFromSourceAreTrackOnly": "Aplikacje z tego źródła są „Obserwowane”.",
+    "youPickedTrackOnly": "Wybrano opcję „Tylko obserwuj”.",
+    "trackOnlyAppDescription": "Aplikacja będzie obserwowana pod kątem aktualizacji, ale Obtainium nie będzie w stanie jej pobrać ani zainstalować.",
+    "cancelled": "Anulowano",
+    "appAlreadyAdded": "Aplikacja już została dodana",
+    "alreadyUpToDateQuestion": "Aplikacja jest już aktualna?",
+    "addApp": "Dodaj apkę",
+    "appSourceURL": "Adres URL źródła aplikacji",
+    "error": "Błąd",
+    "add": "Dodaj",
+    "searchSomeSourcesLabel": "Szukaj (tylko niektóre źródła)",
+    "search": "Szukaj",
+    "additionalOptsFor": "Dodatkowe opcje dla {}",
+    "supportedSourcesBelow": "Obsługiwane źródła:",
+    "trackOnlyInBrackets": "(tylko obserwowane)",
+    "searchableInBrackets": "(Wyszukiwalne)",
+    "appsString": "Aplikacje",
+    "noApps": "Brak aplikacji",
+    "noAppsForFilter": "Brak aplikacji dla filtra",
+    "byX": "Autorstwa {}",
+    "percentProgress": "Postęp: {}%",
+    "pleaseWait": "Proszę czekać",
+    "updateAvailable": "Dostępna aktualizacja",
+    "estimateInBracketsShort": "(Szac.)",
+    "notInstalled": "Nie zainstalowano",
+    "estimateInBrackets": "(Szacunkowo)",
+    "selectAll": "Zaznacz wszystkie",
+    "deselectN": "Odznacz {}",
+    "xWillBeRemovedButRemainInstalled": "{} zostanie usunięty z Obtainium, ale pozostanie zainstalowany na urządzeniu.",
+    "removeSelectedAppsQuestion": "Usunąć wybrane aplikacje?",
+    "removeSelectedApps": "Usuń wybrane aplikacje",
+    "updateX": "Zaktualizuj {}",
+    "installX": "Zainstaluj {}",
+    "markXTrackOnlyAsUpdated": "Oznacz {}\n(Tylko obserwowana)\njako zaktualizowaną",
+    "changeX": "Zmień {}",
+    "installUpdateApps": "Instaluj/aktualizuj aplikacje",
+    "installUpdateSelectedApps": "Zainstaluj/zaktualizuj wybrane aplikacje",
+    "markXSelectedAppsAsUpdated": "Oznaczyć {} wybranych aplikacji jako zaktualizowane?",
+    "yes": "Tak",
+    "markSelectedAppsUpdated": "Oznacz wybrane aplikacje jako zaktualizowane",
+    "pinToTop": "Przypnij",
+    "unpinFromTop": "Odepnij",
+    "resetInstallStatusForSelectedAppsQuestion": "Zresetować status instalacji dla wybranych aplikacji?",
+    "installStatusOfXWillBeResetExplanation": "Stan instalacji wybranych aplikacji zostanie zresetowany.\n\nMoże być to pomocne, gdy wersja aplikacji wyświetlana w Obtainium jest nieprawidłowa z powodu nieudanych aktualizacji lub innych problemów.",
+    "shareSelectedAppURLs": "Udostępnij wybrane adresy URL aplikacji",
+    "resetInstallStatus": "Zresetuj stan instalacji",
+    "more": "Więcej",
+    "removeOutdatedFilter": "Usuń filtr nieaktualnych aplikacji",
+    "showOutdatedOnly": "Pokaż tylko nieaktualne aplikacje",
+    "filter": "FIltr",
+    "filterActive": "Filtruj *",
+    "filterApps": "Filtruj aplikacje",
+    "appName": "Nazwa aplikacji",
+    "author": "Autor",
+    "upToDateApps": "Aktualne aplikacje",
+    "nonInstalledApps": "Niezainstalowane aplikacje",
+    "importExport": "Import/Eksport",
+    "settings": "Ustawienia",
+    "exportedTo": "Wyeksportowano do {}",
+    "obtainiumExport": "Eksportuj Obtainium",
+    "invalidInput": "Nieprawidłowe wprowadzenie",
+    "importedX": "Zaimportowano {}",
+    "obtainiumImport": "Import Obtainium",
+    "importFromURLList": "Importuj z listy adresów URL",
+    "searchQuery": "Wyszukiwane zapytanie",
+    "appURLList": "Lista adresów URL aplikacji",
+    "line": "Linia",
+    "searchX": "Przeszukaj {}",
+    "noResults": "Nie znaleziono wyników",
+    "importX": "Importuj {}",
+    "importedAppsIdDisclaimer": "Zaimportowane aplikacje mogą być wyświetlane jako „Niezainstalowane”.\nAby to naprawić, zainstaluj je ponownie za pomocą Obtainium.\nNie powinno to mieć wpływu na dane aplikacji.\n\nDotyczy tylko adresów URL i metod importu innych aplikacji.",
+    "importErrors": "Błędy importowania",
+    "importedXOfYApps": "Zaimportowano {} z {} aplikacji.",
+    "followingURLsHadErrors": "Następujące adresy URL zawierały błędy:",
+    "selectURL": "Wybierz adres URL",
+    "selectURLs": "Wybierz adresy URL",
+    "pick": "Wybierz",
+    "theme": "Motyw",
+    "dark": "Ciemny",
+    "light": "Jasny",
+    "followSystem": "Zgodny z systemem",
+    "obtainium": "Obtainium",
+    "materialYou": "Material You",
+    "useBlackTheme": "Użyj czarnego motywu",
+    "appSortBy": "Sortuj aplikacje według",
+    "authorName": "Autor/Nazwa",
+    "nameAuthor": "Nazwa/Autor",
+    "asAdded": "Dodania",
+    "appSortOrder": "Kolejność sortowania aplikacji",
+    "ascending": "Rosnąco",
+    "descending": "Malejąco",
+    "bgUpdateCheckInterval": "Częstotliwość sprawdzania aktualizacji w tle",
+    "neverManualOnly": "Nigdy - tylko ręcznie",
+    "appearance": "Wygląd",
+    "showWebInAppView": "Pokaż stronę źródłową w widoku aplikacji",
+    "pinUpdates": "Przypnij aktualizacje na górze widoku aplikacji",
+    "updates": "Aktualizacje",
+    "sourceSpecific": "Zależnie od źródła",
+    "appSource": "Źródło aplikacji",
+    "noLogs": "Brak logów",
+    "appLogs": "Logi aplikacji",
+    "close": "Zamknij",
+    "share": "Udostępnij",
+    "appNotFound": "Nie znaleziono aplikacji",
+    "obtainiumExportHyphenatedLowercase": "obtainium-eksport",
+    "pickAnAPK": "Wybierz plik APK",
+    "appHasMoreThanOnePackage": "{} ma więcej niż jeden pakiet:",
+    "deviceSupportsXArch": "Urządzenie obsługuje architekturę procesora {}.",
+    "deviceSupportsFollowingArchs": "Urządzenie obsługuje następujące architektury procesora:",
+    "warning": "Uwaga",
+    "sourceIsXButPackageFromYPrompt": "Źródłem aplikacji jest '{}', ale pakiet wydania pochodzi z '{}'. Kontynuować?",
+    "updatesAvailable": "Dostępne aktualizacje",
+    "updatesAvailableNotifDescription": "Powiadamia użytkownika o dostępności aktualizacji dla jednej lub więcej aplikacji obserwowanych przez Obtainium",
+    "noNewUpdates": "Brak nowych aktualizacji.",
+    "xHasAnUpdate": "{} ma aktualizację.",
+    "appsUpdated": "Zaktualizowane aplikacje",
+    "appsUpdatedNotifDescription": "Powiadamia użytkownika, gdy jedna lub więcej aplikacji zostało zaktualizowanych w tle",
+    "xWasUpdatedToY": "{} zaktualizowano do {}.",
+    "errorCheckingUpdates": "Sprawdzanie błędów aktualizacji",
+    "errorCheckingUpdatesNotifDescription": "Powiadomienie wyświetlane, gdy sprawdzanie aktualizacji w tle nie powiedzie się",
+    "appsRemoved": "Usunięte aplikacje",
+    "appsRemovedNotifDescription": "Powiadamia użytkownika, gdy jedna lub więcej aplikacji zostało usuniętych z powodu błędów wczytywania",
+    "xWasRemovedDueToErrorY": "Usunięto {} z powodu błędu: {}",
+    "completeAppInstallation": "Ukończenie instalacji aplikacji",
+    "obtainiumMustBeOpenToInstallApps": "Aby zainstalować aplikacje, Obtainium musi być otwarte",
+    "completeAppInstallationNotifDescription": "Prosi użytkownika o powrót do Obtainium w celu dokończenia instalacji aplikacji",
+    "checkingForUpdates": "Sprawdzanie aktualizacji",
+    "checkingForUpdatesNotifDescription": "Tymczasowe powiadomienie pojawiające się podczas sprawdzania aktualizacji",
+    "pleaseAllowInstallPerm": "Pozwól Obtainium instalować aplikacje",
+    "trackOnly": "Tylko obserwuj",
+    "errorWithHttpStatusCode": "Błąd {}",
+    "versionCorrectionDisabled": "Korekta wersji wyłączona (wtyczka wydaje się nie działać)",
+    "unknown": "Nieznane",
+    "none": "Brak",
+    "never": "Nigdy",
+    "latestVersionX": "Najnowsza wersja: {}",
+    "installedVersionX": "Zainstalowana wersja: {}",
+    "lastUpdateCheckX": "Ostatnio sprawdzono: {}",
+    "remove": "Usuń",
+    "yesMarkUpdated": "Tak, oznacz jako zaktualizowane",
+    "fdroid": "Oficjalny F-Droid",
+    "appIdOrName": "ID aplikacji lub nazwa",
+    "appWithIdOrNameNotFound": "Nie znaleziono aplikacji o tym identyfikatorze lub nazwie",
+    "reposHaveMultipleApps": "Repozytoria mogą zawierać wiele aplikacji",
+    "fdroidThirdPartyRepo": "Zewnętrzne repo F-Droid",
+    "steam": "Steam",
+    "steamMobile": "Mobilny Steam",
+    "steamChat": "Steam Chat",
+    "install": "Instaluj",
+    "markInstalled": "Oznacz jako zainstalowane",
+    "update": "Zaktualizuj",
+    "markUpdated": "Oznacz jako zaktualizowane",
+    "additionalOptions": "Dodatkowe opcje",
+    "disableVersionDetection": "Wyłącz wykrywanie wersji",
+    "noVersionDetectionExplanation": "Opcja ta powinna być używana tylko w przypadku aplikacji, w których wykrywanie wersji nie działa poprawnie.",
+    "downloadingX": "Pobieranie {}",
+    "downloadNotifDescription": "Powiadamia użytkownika o postępach w pobieraniu aplikacji",
+    "noAPKFound": "Nie znaleziono pakietu APK",
+    "noVersionDetection": "Bez wykrywania wersji",
+    "categorize": "Kategoryzuj",
+    "categories": "Kategorie",
+    "category": "Kategoria",
+    "noCategory": "Bez kategorii",
+    "noCategories": "Brak kategorii",
+    "deleteCategoriesQuestion": "Usunąć kategorie?",
+    "categoryDeleteWarning": "Wszystkie aplikacje w usuniętych kategoriach zostaną ustawione jako nieskategoryzowane.",
+    "addCategory": "Dodaj kategorię",
+    "label": "Etykieta",
+    "language": "Język",
+    "copiedToClipboard": "Skopiowano do schowka",
+    "storagePermissionDenied": "Odmówiono zezwolenia dostępu do pamięci",
+    "selectedCategorizeWarning": "Spowoduje to zastąpienie wszystkich istniejących ustawień kategorii dla wybranych aplikacji.",
+    "filterAPKsByRegEx": "Filtruj pliki APK według wyrażeń regularnych",
+    "removeFromObtainium": "Usuń z Obtainium",
+    "uninstallFromDevice": "Odinstaluj z urządzenia",
+    "onlyWorksWithNonVersionDetectApps": "Działa tylko w przypadku aplikacji z wyłączonym wykrywaniem wersji.",
+    "releaseDateAsVersion": "Użyj daty wydania jako wersji",
+    "releaseDateAsVersionExplanation": "Opcja ta powinna być używana tylko w przypadku aplikacji, w których wykrywanie wersji nie działa poprawnie, ale dostępna jest data wydania.",
+    "changes": "Zmiany",
+    "releaseDate": "Data wydania",
+    "importFromURLsInFile": "Importuj z adresów URL w pliku (typu OPML)",
+    "versionDetection": "Wykrywanie wersji",
+    "standardVersionDetection": "Standardowe wykrywanie wersji",
+    "groupByCategory": "Grupuj według kategorii",
+    "autoApkFilterByArch": "Spróbuj filtrować pliki APK według architektury procesora, jeśli to możliwe",
+    "overrideSource": "Nadpisz źródło",
+    "dontShowAgain": "Nie pokazuj tego ponownie",
+    "dontShowTrackOnlyWarnings": "Nie wyświetlaj ostrzeżeń „Tylko obserwowana”",
+    "dontShowAPKOriginWarnings": "Nie pokazuj ostrzeżeń o pochodzeniu APK",
+    "moveNonInstalledAppsToBottom": "Przenieś niezainstalowane aplikacje na dół widoku aplikacji",
+    "gitlabPATLabel": "Osobisty Token Dostępu GitLab (umożliwia wyszukiwanie)",
+    "about": "Więcej informacji",
+    "requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)",
+    "checkOnStart": "Sprawdź raz przy starcie",
+    "tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego",
+    "removeAppQuestion": {
+        "one": "Usunąć aplikację?",
+        "other": "Usunąć aplikacje?"
+    },
+    "tooManyRequestsTryAgainInMinutes": {
+        "one": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} min.",
+        "other": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} min."
+    },
+    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
+        "one": "Podczas sprawdzania aktualizacji w tle znaleziono {} aktualizację - w razie potrzeby użytkownik zostanie o tym powiadomiony",
+        "other": "Podczas sprawdzania aktualizacji w tle znaleziono {} akt. - w razie potrzeby użytkownik zostanie o tym powiadomiony"
+    },
+    "apps": {
+        "one": "{} aplik.",
+        "other": "{} aplik."
+    },
+    "url": {
+        "one": "{} adres URL",
+        "other": "{} adr. URL"
+    },
+    "minute": {
+        "one": "{} min.",
+        "other": "{} min."
+    },
+    "hour": {
+        "one": "{} godz.",
+        "other": "{} godz."
+    },
+    "day": {
+        "one": "{} dzień",
+        "other": "{} dni"
+    },
+    "clearedNLogsBeforeXAfterY": {
+        "one": "Wyczyszczono {n} log (przed = {before}, po = {after})",
+        "other": "Wyczyszczono logi: {n} (przed = {before}, po = {after})"
+    },
+    "xAndNMoreUpdatesAvailable": {
+        "one": "{} i jeszcze 1 aplikacja mają aktualizacje.",
+        "other": "{} i {} aplik. otrzymało aktualizacje."
+    },
+    "xAndNMoreUpdatesInstalled": {
+        "one": "Zaktualizowano {} i jeszcze 1 aplikację.",
+        "other": "Zaktualizowano {} i {} aplik."
+    }
+}
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@ -1,106 +1,104 @@
 {
-    "invalidURLForSource": "不是一个有效的 {} URL",
-    "noReleaseFound": "找不到合适的更新",
-    "noVersionFound": "无法确定更新版本",
-    "urlMatchesNoSource": "URL 与已知来源不符",
-    "cantInstallOlderVersion": "无法安装旧版应用程序",
-    "appIdMismatch": "下载的软件包名与现有的应用程序包名不一致",
-    "functionNotImplemented": "该类没有实现此功能",
+    "invalidURLForSource": "无效的 {} URL",
+    "noReleaseFound": "找不到合适的发行版",
+    "noVersionFound": "无法确定发行版本号",
+    "urlMatchesNoSource": "URL 与已知的来源不符",
+    "cantInstallOlderVersion": "无法安装旧版本的应用",
+    "appIdMismatch": "所下载 APK 的应用 ID 与现有应用不一致",
+    "functionNotImplemented": "该类未实现此功能",
    "placeholder": "占位符",
    "someErrors": "出现了一些错误",
    "unexpectedError": "意外错误",
    "ok": "好的",
    "and": "和",
-    "startedBgUpdateTask": "开始后台检查更新任务",
-    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
-    "startedActualBGUpdateCheck": "后台检查更新已开始",
-    "bgUpdateTaskFinished": "后台检查更新已完成",
-    "firstRun": "这是你第一次运行 Obtainium",
-    "settingUpdateCheckIntervalTo": "设置检查更新间隔为 {}",
-    "githubPATLabel": "GitHub 个人访问令牌 (提高 API 限制)",
-    "githubPATHint": "个人访问令牌必须为: username:token 形式",
+    "startedBgUpdateTask": "后台更新检查任务已启动",
+    "bgUpdateIgnoreAfterIs": "后台更新检查间隔为 {}",
+    "startedActualBGUpdateCheck": "开始后台更新检查",
+    "bgUpdateTaskFinished": "后台更新检查任务已完成",
+    "firstRun": "这是 Obtainium 首次启动",
+    "settingUpdateCheckIntervalTo": "更新检查间隔设置为 {}",
+    "githubPATLabel": "GitHub 个人访问令牌（提升 API 请求限额）",
+    "githubPATHint": "个人访问令牌必须为“username:token”的格式",
    "githubPATFormat": "username:token",
-    "githubPATLinkText": "关于 GitHub 个人访问令牌",
-    "includePrereleases": "包含预发布版",
-    "fallbackToOlderReleases": "回退到旧版",
-    "filterReleaseTitlesByRegEx": "使用正则以过滤发布标题",
-    "invalidRegEx": "表达式无效",
+    "includePrereleases": "包含预发行版",
+    "fallbackToOlderReleases": "将旧发行版作为备选",
+    "filterReleaseTitlesByRegEx": "使用正则表达式筛选发行标题",
+    "invalidRegEx": "无效的正则表达式",
    "noDescription": "无描述",
    "cancel": "取消",
    "continue": "继续",
-    "requiredInBrackets": "(必须)",
-    "dropdownNoOptsError": "错误：下拉菜单必须至少有一个选项",
-    "colour": "颜色",
+    "requiredInBrackets": "（必填）",
+    "dropdownNoOptsError": "错误：下拉菜单必须包含至少一个选项",
+    "colour": "配色",
    "githubStarredRepos": "GitHub 已星标仓库",
    "uname": "用户名",
-    "wrongArgNum": "提供了错误的参数数量",
-    "xIsTrackOnly": "{} 仅追踪",
-    "source": "源码",
-    "app": "应用程序",
-    "appsFromSourceAreTrackOnly": "来自此来源的应用为仅追踪",
-    "youPickedTrackOnly": "你已选择仅追踪选项",
-    "trackOnlyAppDescription": "该应用程序将被跟踪更新，但 Obtainium 无法下载或安装它",
+    "wrongArgNum": "参数数量错误",
+    "xIsTrackOnly": "{}为“仅追踪”模式",
+    "source": "源代码",
+    "app": "应用",
+    "appsFromSourceAreTrackOnly": "此来源的应用为“仅追踪”模式。",
+    "youPickedTrackOnly": "您选择了“仅追踪”。",
+    "trackOnlyAppDescription": "该应用的更新会被追踪，但 Obtainium 无法下载或安装它。",
    "cancelled": "已取消",
-    "appAlreadyAdded": "此应用程序已被添加",
-    "alreadyUpToDateQuestion": "应用已是最新？",
+    "appAlreadyAdded": "此应用已经添加",
+    "alreadyUpToDateQuestion": "应用是否已经为最新版本？",
    "addApp": "添加应用",
-    "appSourceURL": "应用来源 URL",
+    "appSourceURL": "来源 URL",
    "error": "错误",
    "add": "添加",
-    "searchSomeSourcesLabel": "搜索 (仅部分来源)",
+    "searchSomeSourcesLabel": "搜索（仅部分来源）",
    "search": "搜索",
    "additionalOptsFor": "{} 的更多选项",
-    "supportedSourcesBelow": "受支持的来源:",
+    "supportedSourcesBelow": "支持的来源：",
    "trackOnlyInBrackets": "(仅追踪)",
-    "searchableInBrackets": "(可被搜索)",
-    "appsString": "应用程序",
-    "noApps": "无应用程序",
-    "noAppsForFilter": "没有应用可被过滤",
-    "byX": "来自 {}",
-    "percentProgress": "进度: {}%",
-    "pleaseWait": "请等待...",
+    "searchableInBrackets": "(可搜索)",
+    "appsString": "应用列表",
+    "noApps": "无应用",
+    "noAppsForFilter": "没有符合条件的应用",
+    "byX": "作者：{}",
+    "percentProgress": "进度：{}%",
+    "pleaseWait": "请稍候",
    "updateAvailable": "更新可用",
-    "estimateInBracketsShort": "(预计.)",
+    "estimateInBracketsShort": "(推测)",
    "notInstalled": "未安装",
-    "estimateInBrackets": "(预计)",
+    "estimateInBrackets": "(推测)",
    "selectAll": "全选",
    "deselectN": "取消选择 {}",
-    "xWillBeRemovedButRemainInstalled": "{} 将被从 Obtainium 中删除，但仍安装在设备上。",
-    "removeSelectedAppsQuestion": "删除已选择的应用程序吗？",
-    "removeSelectedApps": "删除已选择的应用程序",
+    "xWillBeRemovedButRemainInstalled": "{} 将从 Obtainium 中删除，但仍安装在您的设备中。",
+    "removeSelectedAppsQuestion": "是否删除选中的应用？",
+    "removeSelectedApps": "删除选中的应用",
    "updateX": "更新 {}",
    "installX": "安装 {}",
-    "markXTrackOnlyAsUpdated": "将仅追踪编辑为已更新",
+    "markXTrackOnlyAsUpdated": "将 {}\n（仅追踪）\n标记为已更新",
    "changeX": "更改 {}",
-    "installUpdateApps": "安装/更新应用程序",
-    "installUpdateSelectedApps": "安装/更新已选择的应用程序",
-    "onlyAppliesToInstalledAndOutdatedApps": "'只适用于已安装但已过时的应用程序",
-    "markXSelectedAppsAsUpdated": "将已选择的 {} 个应用程序标记为已更新？",
-    "no": "不要",
-    "yes": "好的",
-    "markSelectedAppsUpdated": "标记已选择的应用程序为已更新",
+    "installUpdateApps": "安装/更新应用",
+    "installUpdateSelectedApps": "安装/更新选中的应用",
+    "markXSelectedAppsAsUpdated": "是否将选中的 {} 个应用标记为已更新？",
+    "no": "否",
+    "yes": "是",
+    "markSelectedAppsUpdated": "将选中的应用标记为已更新",
    "pinToTop": "置顶",
    "unpinFromTop": "取消置顶",
-    "resetInstallStatusForSelectedAppsQuestion": "为已选择的应用程序重置安装状态吗？",
-    "installStatusOfXWillBeResetExplanation": "当 Obtainium 中显示的应用程序版本由于更新失败或其他问题而不正确时，这将有助于重置任何选定应用程序的安装状态。",
-    "shareSelectedAppURLs": "分享已选择的应用程序 URL",
+    "resetInstallStatusForSelectedAppsQuestion": "是否重置选中应用的安装状态？",
+    "installStatusOfXWillBeResetExplanation": "选中应用的安装状态将会被重置。\n\n当更新安装失败或其他问题导致 Obtainium 中的应用版本显示错误时，可以尝试通过此方法解决。",
+    "shareSelectedAppURLs": "分享选中应用的 URL",
    "resetInstallStatus": "重置安装状态",
    "more": "更多",
-    "removeOutdatedFilter": "删除过时的应用程序过滤器",
-    "showOutdatedOnly": "只显示过时的应用程序",
-    "filter": "过滤器",
-    "filterActive": "过滤器 *",
-    "filterApps": "过滤应用",
+    "removeOutdatedFilter": "删除失效的应用筛选",
+    "showOutdatedOnly": "只显示待更新应用",
+    "filter": "筛选",
+    "filterActive": "筛选 *",
+    "filterApps": "筛选应用",
    "appName": "应用名称",
    "author": "作者",
-    "upToDateApps": "已更新的应用程序",
-    "nonInstalledApps": "未安装的应用程序",
+    "upToDateApps": "无需更新的应用",
+    "nonInstalledApps": "未安装的应用",
    "importExport": "导入/导出",
    "settings": "设置",
-    "exportedTo": "导出到 {}",
+    "exportedTo": "已导出至 {}",
    "obtainiumExport": "Obtainium 导出",
-    "invalidInput": "无效输入",
-    "importedX": "已导出到 {}",
+    "invalidInput": "无效的输入",
+    "importedX": "已导入 {}",
    "obtainiumImport": "Obtainium 导入",
    "importFromURLList": "从 URL 列表导入",
    "searchQuery": "搜索查询",
@ -109,13 +107,13 @@
    "searchX": "搜索 {}",
    "noResults": "无结果",
    "importX": "导入 {}",
-    "importedAppsIdDisclaimer": "导入的应用程序可能显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
+    "importedAppsIdDisclaimer": "导入的应用可能错误地显示为“未安装”。\n请通过 Obtainium 重新安装这些应用来解决此问题。",
    "importErrors": "导入错误",
-    "importedXOfYApps": "{} 中的 {} 个应用已导入",
-    "followingURLsHadErrors": "以下 URL 有错误：",
+    "importedXOfYApps": "已导入 {} 中的 {} 个应用。",
+    "followingURLsHadErrors": "下列 URL 存在错误：",
    "okay": "好的",
-    "selectURL": "已选择的 URL",
-    "selectURLs": "已选择的 URL",
+    "selectURL": "选择 URL",
+    "selectURLs": "选择 URL",
    "pick": "选择",
    "theme": "主题",
    "dark": "深色",
@ -123,67 +121,69 @@
    "followSystem": "跟随系统",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
-    "appSortBy": "排列方式",
-    "authorName": "作者 / 名字",
-    "nameAuthor": "名字 / 作者",
-    "asAdded": "添加顺序",
-    "appSortOrder": "排列顺序",
+    "useBlackTheme": "使用纯黑深色主题",
+    "appSortBy": "排序依据",
+    "authorName": "作者 / 应用名称",
+    "nameAuthor": "应用名称 / 作者",
+    "asAdded": "添加次序",
+    "appSortOrder": "顺序",
    "ascending": "升序",
    "descending": "降序",
    "bgUpdateCheckInterval": "后台更新检查间隔",
    "neverManualOnly": "手动",
    "appearance": "外观",
-    "showWebInAppView": "在应用来源页显示网页",
-    "pinUpdates": "需更新的应用置顶",
-    "updates": "检查间隔",
-    "sourceSpecific": "Github 访问令牌",
+    "showWebInAppView": "在应用详情页显示来源网页",
+    "pinUpdates": "将待更新应用置顶",
+    "updates": "更新",
+    "sourceSpecific": "来源相关",
    "appSource": "源代码",
    "noLogs": "无日志",
-    "appLogs": "应用日志",
+    "appLogs": "日志",
    "close": "关闭",
    "share": "分享",
    "appNotFound": "未找到应用",
-    "obtainiumExportHyphenatedLowercase": "obtainium-导出",
-    "pickAnAPK": "选择一个安装包",
+    "obtainiumExportHyphenatedLowercase": "obtainium-export",
+    "pickAnAPK": "选择一个 APK 文件",
    "appHasMoreThanOnePackage": "{} 有多个架构可用：",
-    "deviceSupportsXArch": "你的设备支持 {} 架构",
-    "deviceSupportsFollowingArchs": "你的设备支持以下架构:",
+    "deviceSupportsXArch": "您的设备支持 {} 架构。",
+    "deviceSupportsFollowingArchs": "您的设备支持下列架构：",
    "warning": "警告",
-    "sourceIsXButPackageFromYPrompt": "此应用来源是 '{}' 但更新包来自 '{}'。 继续吗？",
+    "sourceIsXButPackageFromYPrompt": "此应用的来源是“{}”，但 APK 文件来自“{}”。是否继续？",
    "updatesAvailable": "更新可用",
-    "updatesAvailableNotifDescription": "通知 Obtainium 所跟踪应用程序的更新",
-    "noNewUpdates": "你的应用已是最新。",
-    "xHasAnUpdate": "{} 有更新啦",
+    "updatesAvailableNotifDescription": "Obtainium 追踪的应用有更新时发出通知",
+    "noNewUpdates": "全部应用已是最新。",
+    "xHasAnUpdate": "{} 可以更新了。",
    "appsUpdated": "应用已更新",
-    "appsUpdatedNotifDescription": "通知在后台安装应用程序的更新",
-    "xWasUpdatedToY": "{} 已更新到 {}.",
+    "appsUpdatedNotifDescription": "当应用在后台安装更新时发出通知",
+    "xWasUpdatedToY": "{} 已更新至 {}。",
    "errorCheckingUpdates": "检查更新出错",
-    "errorCheckingUpdatesNotifDescription": "当后台更新检查失败时显示的通知",
+    "errorCheckingUpdatesNotifDescription": "当后台检查更新失败时显示的通知",
    "appsRemoved": "应用已删除",
-    "appsRemovedNotifDescription": "通知由于加载应用程序时出错而被删除",
-    "xWasRemovedDueToErrorY": "{} 已因以下错误被删除： {}",
+    "appsRemovedNotifDescription": "当应用因加载出错而被删除时发出通知",
+    "xWasRemovedDueToErrorY": "{} 由于以下错误被删除：{}",
    "completeAppInstallation": "完成应用安装",
-    "obtainiumMustBeOpenToInstallApps": "Obtainium 需要被启动以安装更新",
-    "completeAppInstallationNotifDescription": "需要返回 Obtainium，以完成应用程序的安装。",
-    "checkingForUpdates": "检查更新中",
-    "checkingForUpdatesNotifDescription": "检查更新时出现的瞬时通知",
-    "pleaseAllowInstallPerm": "请允许 Obtainium 安装应用程序",
+    "obtainiumMustBeOpenToInstallApps": "必须启动 Obtainium 才能安装应用",
+    "completeAppInstallationNotifDescription": "提示返回 Obtainium 以完成应用的安装",
+    "checkingForUpdates": "正在检查更新",
+    "checkingForUpdatesNotifDescription": "检查更新时短暂显示的通知",
+    "pleaseAllowInstallPerm": "请授予 Obtainium 安装应用的权限",
    "trackOnly": "仅追踪",
    "errorWithHttpStatusCode": "错误 {}",
-    "versionCorrectionDisabled": "禁用版本更正（插件似乎未起作用）",
+    "versionCorrectionDisabled": "禁用版本号更正（插件似乎未起作用）",
    "unknown": "未知",
    "none": "无",
-    "never": "从不",
-    "latestVersionX": "最新: {}",
-    "installedVersionX": "已安装: {}",
-    "lastUpdateCheckX": "最后检查: {}",
+    "never": "从未",
+    "latestVersionX": "最新版本：{}",
+    "installedVersionX": "当前版本：{}",
+    "lastUpdateCheckX": "上次更新检查：{}",
    "remove": "删除",
-    "yesMarkUpdated": "'是的，标为已更新",
-    "fdroid": "F-Droid",
+    "yesMarkUpdated": "是，标记为已更新",
+    "fdroid": "F-Droid 官方存储库",
    "appIdOrName": "应用 ID 或名称",
-    "appWithIdOrNameNotFound": "没有发现具有此 ID 或名称的应用",
-    "reposHaveMultipleApps": "来源可能包含多个应用",
-    "fdroidThirdPartyRepo": "F-Droid 第三方源",
+    "appId": "App ID",
+    "appWithIdOrNameNotFound": "未找到符合此 ID 或名称的应用",
+    "reposHaveMultipleApps": "存储库中可能包含多个应用",
+    "fdroidThirdPartyRepo": "F-Droid 第三方存储库",
    "steam": "Steam",
    "steamMobile": "Steam Mobile",
    "steamChat": "Steam Chat",
@ -192,49 +192,63 @@
    "update": "更新",
    "markUpdated": "标记为已更新",
    "additionalOptions": "附加选项",
-    "disableVersionDetection": "关闭版本检测",
-    "noVersionDetectionExplanation": "此选项应只用于版本检测不能工作的应用程序",
-    "downloadingX": "下载中 {}",
-    "downloadNotifDescription": "通知用户下载进度",
-    "noAPKFound": "未找到安装包",
-    "noVersionDetection": "无版本检测",
-    "categorize": "归档",
-    "categories": "归档",
+    "disableVersionDetection": "禁用版本检测",
+    "noVersionDetectionExplanation": "此选项应该仅用于无法进行版本检测的应用。",
+    "downloadingX": "正在下载{}",
+    "downloadNotifDescription": "提示应用的下载进度",
+    "noAPKFound": "未找到 APK 文件",
+    "noVersionDetection": "禁用版本检测",
+    "categorize": "分类",
+    "categories": "类别",
    "category": "类别",
    "noCategory": "无类别",
    "noCategories": "无类别",
-    "deleteCategoriesQuestion": "删除所有类别？",
-    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
+    "deleteCategoriesQuestion": "是否删除选中的类别？",
+    "categoryDeleteWarning": "被删除类别下的应用将恢复为未分类状态。",
    "addCategory": "添加类别",
    "label": "标签",
    "language": "语言",
-    "storagePermissionDenied": "存储权限已被拒绝",
-    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
-    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
-    "removeFromObtainium": "Remove from Obtainium",
-    "uninstallFromDevice": "Uninstall from Device",
-    "releaseDateAsVersion": "Use Release Date as Version",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
-    "changes": "Changes",
-    "releaseDate": "Release Date",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
-    "versionDetection": "Version Detection",
-    "standardVersionDetection": "Standard version detection",
+    "copiedToClipboard": "已复制至剪贴板",
+    "storagePermissionDenied": "已拒绝授予存储权限",
+    "selectedCategorizeWarning": "这将覆盖选中应用当前的类别设置。",
+    "filterAPKsByRegEx": "使用正则表达式筛选 APK 文件",
+    "removeFromObtainium": "从 Obtainium 中删除",
+    "uninstallFromDevice": "从设备中卸载",
+    "onlyWorksWithNonVersionDetectApps": "仅适用于禁用版本检测的应用。",
+    "releaseDateAsVersion": "将发行日期作为版本号",
+    "releaseDateAsVersionExplanation": "此选项应该仅用于无法进行版本检测但能够获取发行日期的应用。",
+    "changes": "更新日志",
+    "releaseDate": "发行日期",
+    "importFromURLsInFile": "从文件中的 URL 导入（如 OPML）",
+    "versionDetection": "版本检测",
+    "standardVersionDetection": "常规版本检测",
+    "groupByCategory": "按类别分组显示",
+    "autoApkFilterByArch": "如果可能，尝试按设备支持的 CPU 架构筛选 APK 文件",
+    "overrideSource": "覆盖来源",
+    "dontShowAgain": "不再显示",
+    "dontShowTrackOnlyWarnings": "不显示“仅追踪”模式警告",
+    "dontShowAPKOriginWarnings": "不显示 APK 文件来源警告",
+    "moveNonInstalledAppsToBottom": "将未安装应用置底",
+    "gitlabPATLabel": "GitLab 个人访问令牌（用于搜索）",
+    "about": "相关文档",
+    "requiresCredentialsInSettings": "此功能需要额外的凭据（在“设置”中添加）",
+    "checkOnStart": "启动时进行一次检查",
+    "tryInferAppIdFromCode": "Try inferring App ID from source code",
    "removeAppQuestion": {
-        "one": "删除应用？",
-        "other": "删除应用？"
+        "one": "是否删除应用？",
+        "other": "是否删除应用？"
    },
    "tooManyRequestsTryAgainInMinutes": {
-        "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
-        "other": "请求过多 (API 限制) - 在 {} 分钟后重试"
+        "one": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试",
+        "other": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试"
    },
    "bgUpdateGotErrorRetryInMinutes": {
-        "one": "后台更新检查遇到了 {} 问题, 将在 {} 分钟后重试",
-        "other": "后台更新检查遇到了 {} 问题, 将在 {} 分钟后重试"
+        "one": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试",
+        "other": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试"
    },
    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "后台更新检查找到了 {} 个更新 - 将通知用户",
-        "other": "后台更新检查找到了 {} 个更新 - 将通知用户"
+        "one": "后台检查发现 {} 个应用更新 - 如有需要将发出通知",
+        "other": "后台检查发现 {} 个应用更新 - 如有需要将发出通知"
    },
    "apps": {
        "one": "{} 个应用",
@ -257,15 +271,15 @@
        "other": "{} 天"
    },
    "clearedNLogsBeforeXAfterY": {
-        "one": "清除了 {n} 个日志 (清除前 = {before}, 清除后 = {after})",
-        "other": "清除了 {n} 个日志 (清除前 = {before}, 清除后 = {after})"
+        "one": "清除了 {n} 个日志（{before} 之前，{after} 之后）",
+        "other": "清除了 {n} 个日志（{before} 之前，{after} 之后）"
    },
    "xAndNMoreUpdatesAvailable": {
-        "one": "{} 和 {} 更多应用已被更新",
-        "other": "{} 和 {} 更多应用已被更新"
+        "one": "{} 和另外 1 个应用可以更新了。",
+        "other": "{} 和另外 {} 个应用可以更新了。"
    },
    "xAndNMoreUpdatesInstalled": {
-        "one": "{} 和 {} 更多应用已被安装",
-        "other": "{} 和 {} 更多应用已被安装"
+        "one": "{} 和另外 1 个应用已更新。",
+        "other": "{} 和另外 {} 个应用已更新。"
    }
-}
+}
--- a/lib/app_sources/apkcombo.dart
+++ b/lib/app_sources/apkcombo.dart
@ -0,0 +1,114 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class APKCombo extends AppSource {
+  APKCombo() {
+    host = 'apkcombo.com';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    var match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
+
+  @override
+  Map<String, String> get requestHeaders => {
+        "User-Agent": "curl/8.0.1",
+        "Accept": "*/*",
+        "Connection": "keep-alive",
+        "Host": "$host"
+      };
+
+  Future<List<MapEntry<String, String>>> getApkUrls(String standardUrl) async {
+    var res = await sourceRequest('$standardUrl/download/apk');
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var html = parse(res.body);
+    return html
+        .querySelectorAll('#variants-tab > div > ul > li')
+        .map((e) {
+          String? arch = e
+              .querySelector('code')
+              ?.text
+              .trim()
+              .replaceAll(',', '')
+              .replaceAll(':', '-')
+              .replaceAll(' ', '-');
+          return e.querySelectorAll('a').map((e) {
+            String? url = e.attributes['href'];
+            if (url != null &&
+                !Uri.parse(url).path.toLowerCase().endsWith('.apk')) {
+              url = null;
+            }
+            String verCode =
+                e.querySelector('.info .header .vercode')?.text.trim() ?? '';
+            return MapEntry<String, String>(
+                arch != null ? '$arch-$verCode.apk' : '', url ?? '');
+          }).toList();
+        })
+        .reduce((value, element) => [...value, ...element])
+        .where((element) => element.value.isNotEmpty)
+        .toList();
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    var freshURLs = await getApkUrls(standardUrl);
+    var path2Match = Uri.parse(apkUrl).path;
+    for (var url in freshURLs) {
+      if (Uri.parse(url.value).path == path2Match) {
+        return url.value;
+      }
+    }
+    throw NoAPKError();
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String appId = (await tryInferringAppId(standardUrl))!;
+    var preres = await sourceRequest(standardUrl);
+    if (preres.statusCode != 200) {
+      throw getObtainiumHttpError(preres);
+    }
+    var res = parse(preres.body);
+    String? version = res.querySelector('div.version')?.text.trim();
+    if (version == null) {
+      throw NoVersionError();
+    }
+    String appName = res.querySelector('div.app_name')?.text.trim() ?? appId;
+    String author = res.querySelector('div.author')?.text.trim() ?? appName;
+    List<String> infoArray = res
+        .querySelectorAll('div.information-table > .item > div.value')
+        .map((e) => e.text.trim())
+        .toList();
+    DateTime? releaseDate;
+    if (infoArray.length >= 2) {
+      try {
+        releaseDate = DateFormat('MMMM d, yyyy').parse(infoArray[1]);
+      } catch (e) {
+        // ignore
+      }
+    }
+    return APKDetails(
+        version, await getApkUrls(standardUrl), AppNames(author, appName),
+        releaseDate: releaseDate);
+  }
+}
--- a/lib/app_sources/apkmirror.dart
+++ b/lib/app_sources/apkmirror.dart
@ -31,7 +31,7 @@ class APKMirror extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -57,7 +57,7 @@ class APKMirror extends AppSource {
                true
            ? additionalSettings['filterReleaseTitlesByRegEx']
            : null;
-    Response res = await get(Uri.parse('$standardUrl/feed'));
+    Response res = await sourceRequest('$standardUrl/feed');
    if (res.statusCode == 200) {
      var items = parse(res.body).querySelectorAll('item');
      dynamic targetRelease;
--- a/lib/app_sources/apkpure.dart
+++ b/lib/app_sources/apkpure.dart
@ -0,0 +1,77 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class APKPure extends AppSource {
+  APKPure() {
+    host = 'apkpure.com';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegExB = RegExp('^https?://m.$host/+[^/]+/+[^/]+');
+    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
+    if (match != null) {
+      url = 'https://$host/${Uri.parse(url).path}';
+    }
+    RegExp standardUrlRegExA = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String appId = (await tryInferringAppId(standardUrl))!;
+    String host = Uri.parse(standardUrl).host;
+    var res = await sourceRequest('$standardUrl/download');
+    if (res.statusCode == 200) {
+      var html = parse(res.body);
+      String? version = html.querySelector('span.info-sdk span')?.text.trim();
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? dateString =
+          html.querySelector('span.info-other span.date')?.text.trim();
+      DateTime? releaseDate;
+      try {
+        releaseDate = dateString != null
+            ? DateFormat('MMM dd, yyyy').parse(dateString)
+            : null;
+        releaseDate = dateString != null && releaseDate == null
+            ? DateFormat('MMMM dd, yyyy').parse(dateString)
+            : null;
+      } catch (err) {
+        // ignore
+      }
+      String type = html.querySelector('a.info-tag')?.text.trim() ?? 'APK';
+      List<MapEntry<String, String>> apkUrls = [
+        MapEntry('$appId.apk', 'https://d.$host/b/$type/$appId?version=latest')
+      ];
+      String author = html
+              .querySelector('span.info-sdk')
+              ?.text
+              .trim()
+              .substring(version.length + 4) ??
+          Uri.parse(standardUrl).pathSegments.reversed.last;
+      String appName =
+          html.querySelector('h1.info-title')?.text.trim() ?? appId;
+      return APKDetails(version, apkUrls, AppNames(author, appName),
+          releaseDate: releaseDate);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
--- a/lib/app_sources/codeberg.dart
+++ b/lib/app_sources/codeberg.dart
@ -1,6 +1,5 @@
-import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -35,8 +34,10 @@ class Codeberg extends AppSource {
    canSearch = true;
  }

+  var gh = GitHub();
+
  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -54,78 +55,10 @@ class Codeberg extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'] == true;
-    bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'] == true;
-    String? regexFilter =
-        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
-                    ?.isNotEmpty ==
-                true
-            ? additionalSettings['filterReleaseTitlesByRegEx']
-            : null;
-    Response res = await get(Uri.parse(
-        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
-    if (res.statusCode == 200) {
-      var releases = jsonDecode(res.body) as List<dynamic>;
-
-      List<String> getReleaseAPKUrls(dynamic release) =>
-          (release['assets'] as List<dynamic>?)
-              ?.map((e) {
-                return e['name'] != null && e['browser_download_url'] != null
-                    ? MapEntry(e['name'] as String,
-                        e['browser_download_url'] as String)
-                    : const MapEntry('', '');
-              })
-              .where((element) => element.key.toLowerCase().endsWith('.apk'))
-              .map((e) => e.value)
-              .toList() ??
-          [];
-
-      dynamic targetRelease;
-
-      for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
-        if (!includePrereleases && releases[i]['prerelease'] == true) {
-          continue;
-        }
-        if (releases[i]['draft'] == true) {
-          // Draft releases not supported
-        }
-        var nameToFilter = releases[i]['name'] as String?;
-        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
-          // Some leave titles empty so tag is used
-          nameToFilter = releases[i]['tag_name'] as String;
-        }
-        if (regexFilter != null &&
-            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
-          continue;
-        }
-        var apkUrls = getReleaseAPKUrls(releases[i]);
-        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
-          continue;
-        }
-        targetRelease = releases[i];
-        targetRelease['apkUrls'] = apkUrls;
-        break;
-      }
-      if (targetRelease == null) {
-        throw NoReleasesError();
-      }
-      String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl),
-          releaseDate: releaseDate,
-          changeLog: changeLog.isEmpty ? null : changeLog);
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+    return await gh.getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
+        (bool useTagUrl) async {
+      return 'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
+    }, null);
  }

  AppNames getAppNames(String standardUrl) {
@ -135,21 +68,10 @@ class Codeberg extends AppSource {
  }

  @override
-  Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
-        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
-    if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['data'] as List<dynamic>)) {
-        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
-        });
-      }
-      return urlsWithDescriptions;
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+  Future<Map<String, List<String>>> search(String query) async {
+    return gh.searchCommon(
+        query,
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
+        'data');
  }
 }
--- a/lib/app_sources/fdroid.dart
+++ b/lib/app_sources/fdroid.dart
@ -1,6 +1,7 @@
 import 'dart:convert';

 import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -9,15 +10,17 @@ class FDroid extends AppSource {
  FDroid() {
    host = 'f-droid.org';
    name = tr('fdroid');
+    canSearch = true;
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegExB =
        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
    if (match != null) {
-      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
    }
    RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
    match = standardUrlRegExA.firstMatch(url.toLowerCase());
@ -28,8 +31,8 @@ class FDroid extends AppSource {
  }

  @override
-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
    return Uri.parse(standardUrl).pathSegments.last;
  }

@ -48,7 +51,7 @@ class FDroid extends AppSource {
          .where((element) => element['versionName'] == latestVersion)
          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
          .toList();
-      return APKDetails(latestVersion, apkUrls,
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
          AppNames(name, Uri.parse(standardUrl).pathSegments.last));
    } else {
      throw getObtainiumHttpError(res);
@ -60,10 +63,40 @@ class FDroid extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    String? appId = tryInferringAppId(standardUrl);
+    String? appId = await tryInferringAppId(standardUrl);
+    String host = Uri.parse(standardUrl).host;
    return getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
-        'https://f-droid.org/repo/$appId',
+        await sourceRequest('https://$host/api/v1/packages/$appId'),
+        'https://$host/repo/$appId',
        standardUrl);
  }
+
+  @override
+  Future<Map<String, List<String>>> search(String query) async {
+    Response res = await sourceRequest(
+        'https://search.$host/?q=${Uri.encodeQueryComponent(query)}');
+    if (res.statusCode == 200) {
+      Map<String, List<String>> urlsWithDescriptions = {};
+      parse(res.body).querySelectorAll('.package-header').forEach((e) {
+        String? url = e.attributes['href'];
+        if (url != null) {
+          try {
+            standardizeUrl(url);
+          } catch (e) {
+            url = null;
+          }
+        }
+        if (url != null) {
+          urlsWithDescriptions[url] = [
+            e.querySelector('.package-name')?.text.trim() ?? '',
+            e.querySelector('.package-summary')?.text.trim() ??
+                tr('noDescription')
+          ];
+        }
+      });
+      return urlsWithDescriptions;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
 }
--- a/lib/app_sources/fdroidrepo.dart
+++ b/lib/app_sources/fdroidrepo.dart
@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
-import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -19,17 +18,6 @@ class FDroidRepo extends AppSource {
    ];
  }

-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegExp =
-        RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)');
-    RegExpMatch? match = standardUrlRegExp.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw InvalidURLError(name);
-    }
-    return url.substring(0, match.end);
-  }
-
  @override
  Future<APKDetails> getLatestAPKDetails(
    String standardUrl,
@ -39,7 +27,7 @@ class FDroidRepo extends AppSource {
    if (appIdOrName == null) {
      throw NoReleasesError();
    }
-    var res = await get(Uri.parse('$standardUrl/index.xml'));
+    var res = await sourceRequest('$standardUrl/index.xml');
    if (res.statusCode == 200) {
      var body = parse(res.body);
      var foundApps = body.querySelectorAll('application').where((element) {
@ -80,7 +68,8 @@ class FDroidRepo extends AppSource {
              element.querySelector('apkname') != null)
          .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
          .toList();
-      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName),
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
+          AppNames(authorName, appName),
          releaseDate: releaseDate);
    } else {
      throw getObtainiumHttpError(res);
--- a/lib/app_sources/github.dart
+++ b/lib/app_sources/github.dart
@ -2,8 +2,11 @@ import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@ -11,6 +14,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 class GitHub extends AppSource {
  GitHub() {
    host = 'github.com';
+    appIdInferIsOptional = true;

    additionalSourceSpecificSettingFormItems = [
      GeneratedFormTextField('github-creds',
@ -34,7 +38,7 @@ class GitHub extends AppSource {
          hint: tr('githubPATFormat'),
          belowWidgets: [
            const SizedBox(
-              height: 8,
+              height: 4,
            ),
            GestureDetector(
                onTap: () {
@ -43,10 +47,13 @@ class GitHub extends AppSource {
                      mode: LaunchMode.externalApplication);
                },
                child: Text(
-                  tr('githubPATLinkText'),
+                  tr('about'),
                  style: const TextStyle(
                      decoration: TextDecoration.underline, fontSize: 12),
-                ))
+                )),
+            const SizedBox(
+              height: 4,
+            ),
          ])
    ];

@ -75,7 +82,53 @@ class GitHub extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    const possibleBuildGradleLocations = [
+      '/app/build.gradle',
+      'android/app/build.gradle',
+      'src/app/build.gradle'
+    ];
+    for (var path in possibleBuildGradleLocations) {
+      try {
+        var res = await sourceRequest(
+            '${await convertStandardUrlToAPIUrl(standardUrl)}/contents/$path');
+        if (res.statusCode == 200) {
+          try {
+            var body = jsonDecode(res.body);
+            var trimmedLines = utf8
+                .decode(base64
+                    .decode(body['content'].toString().split('\n').join('')))
+                .split('\n')
+                .map((e) => e.trim());
+            var appId = trimmedLines
+                .where((l) => l.startsWith('applicationId "'))
+                .first
+                .split('"')[1];
+            if (appId.startsWith('\${') && appId.endsWith('}')) {
+              appId = trimmedLines
+                  .where((l) => l.startsWith(
+                      'def ${appId.substring(2, appId.length - 1)}'))
+                  .first
+                  .split('"')[1];
+            }
+            if (appId.isNotEmpty) {
+              return appId;
+            }
+          } catch (err) {
+            LogsProvider().add(
+                'Error parsing build.gradle from ${res.request!.url.toString()}: ${err.toString()}');
+          }
+        }
+      } catch (err) {
+        // Ignore - ID will be extracted from the APK
+      }
+    }
+    return null;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -92,15 +145,19 @@ class GitHub extends AppSource {
    return creds != null && creds.isNotEmpty ? '$creds@' : '';
  }

+  Future<String> getAPIHost() async =>
+      'https://${await getCredentialPrefixIfAny()}api.$host';
+
+  Future<String> convertStandardUrlToAPIUrl(String standardUrl) async =>
+      '${await getAPIHost()}/repos${standardUrl.substring('https://$host'.length)}';
+
  @override
  String? changeLogPageFromStandardUrl(String standardUrl) =>
      '$standardUrl/releases';

-  @override
-  Future<APKDetails> getLatestAPKDetails(
-    String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
+  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
+      String standardUrl, Map<String, dynamic> additionalSettings,
+      {Function(Response)? onHttpErrorCode}) async {
    bool includePrereleases = additionalSettings['includePrereleases'] == true;
    bool fallbackToOlderReleases =
        additionalSettings['fallbackToOlderReleases'] == true;
@ -110,27 +167,63 @@ class GitHub extends AppSource {
                true
            ? additionalSettings['filterReleaseTitlesByRegEx']
            : null;
-    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
+    Response res = await sourceRequest(requestUrl);
    if (res.statusCode == 200) {
      var releases = jsonDecode(res.body) as List<dynamic>;

-      List<String> getReleaseAPKUrls(dynamic release) =>
+      List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
          (release['assets'] as List<dynamic>?)
              ?.map((e) {
-                return e['browser_download_url'] != null
-                    ? e['browser_download_url'] as String
-                    : '';
+                return e['name'] != null && e['browser_download_url'] != null
+                    ? MapEntry(e['name'] as String,
+                        e['browser_download_url'] as String)
+                    : const MapEntry('', '');
              })
-              .where((element) => element.toLowerCase().endsWith('.apk'))
+              .where((element) => element.key.toLowerCase().endsWith('.apk'))
              .toList() ??
          [];

+      DateTime? getReleaseDateFromRelease(dynamic rel) =>
+          rel?['published_at'] != null
+              ? DateTime.parse(rel['published_at'])
+              : null;
+      releases.sort((a, b) {
+        // See #478 and #534
+        if (a == b) {
+          return 0;
+        } else if (a == null) {
+          return -1;
+        } else if (b == null) {
+          return 1;
+        } else {
+          var nameA = a['tag_name'] ?? a['name'];
+          var nameB = b['tag_name'] ?? b['name'];
+          var stdFormats = findStandardFormatsForVersion(nameA, true)
+              .intersection(findStandardFormatsForVersion(nameB, true));
+          if (stdFormats.isNotEmpty) {
+            var reg = RegExp(stdFormats.first);
+            var matchA = reg.firstMatch(nameA);
+            var matchB = reg.firstMatch(nameB);
+            return compareAlphaNumeric(
+                (nameA as String).substring(matchA!.start, matchA.end),
+                (nameB as String).substring(matchB!.start, matchB.end));
+          } else {
+            return getReleaseDateFromRelease(a)!
+                .compareTo(getReleaseDateFromRelease(b)!);
+          }
+        }
+      });
+      releases = releases.reversed.toList();
      dynamic targetRelease;
-
+      var prerrelsSkipped = 0;
      for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
+        if (!fallbackToOlderReleases && i > prerrelsSkipped) break;
        if (!includePrereleases && releases[i]['prerelease'] == true) {
+          prerrelsSkipped++;
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
          continue;
        }
        var nameToFilter = releases[i]['name'] as String?;
@ -153,50 +246,101 @@ class GitHub extends AppSource {
      if (targetRelease == null) {
        throw NoReleasesError();
      }
-      String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
+      String? version = targetRelease['tag_name'] ?? targetRelease['name'];
+      DateTime? releaseDate = getReleaseDateFromRelease(targetRelease);
      if (version == null) {
        throw NoVersionError();
      }
      var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
          getAppNames(standardUrl),
          releaseDate: releaseDate,
          changeLog: changeLog.isEmpty ? null : changeLog);
    } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
      throw getObtainiumHttpError(res);
    }
  }

+  getLatestAPKDetailsCommon2(
+      String standardUrl,
+      Map<String, dynamic> additionalSettings,
+      Future<String> Function(bool) reqUrlGenerator,
+      dynamic Function(Response)? onHttpErrorCode) async {
+    try {
+      return await getLatestAPKDetailsCommon(
+          await reqUrlGenerator(false), standardUrl, additionalSettings,
+          onHttpErrorCode: onHttpErrorCode);
+    } catch (err) {
+      if (err is NoReleasesError && additionalSettings['trackOnly'] == true) {
+        return await getLatestAPKDetailsCommon(
+            await reqUrlGenerator(true), standardUrl, additionalSettings,
+            onHttpErrorCode: onHttpErrorCode);
+      } else {
+        rethrow;
+      }
+    }
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    return await getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
+        (bool useTagUrl) async {
+      return '${await convertStandardUrlToAPIUrl(standardUrl)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
+    }, (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
  AppNames getAppNames(String standardUrl) {
    String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
    List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
    return AppNames(names[0], names[1]);
  }

-  @override
-  Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
+  Future<Map<String, List<String>>> searchCommon(
+      String query, String requestUrl, String rootProp,
+      {Function(Response)? onHttpErrorCode}) async {
+    Response res = await sourceRequest(requestUrl);
    if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
+      Map<String, List<String>> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
+          e['html_url'] as String: [
+            e['full_name'] as String,
+            ((e['archived'] == true ? '[ARCHIVED] ' : '') +
+                (e['description'] != null
+                    ? e['description'] as String
+                    : tr('noDescription')))
+          ]
        });
      }
      return urlsWithDescriptions;
    } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
      throw getObtainiumHttpError(res);
    }
  }

+  @override
+  Future<Map<String, List<String>>> search(String query) async {
+    return searchCommon(
+        query,
+        '${await getAPIHost()}/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+        'items', onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
  rateLimitErrorCheck(Response res) {
    if (res.headers['x-ratelimit-remaining'] == '0') {
      throw RateLimitError(
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@ -1,16 +1,57 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 class GitLab extends AppSource {
  GitLab() {
    host = 'gitlab.com';
+    canSearch = true;
+
+    additionalSourceSpecificSettingFormItems = [
+      GeneratedFormTextField('gitlab-creds',
+          label: tr('gitlabPATLabel'),
+          password: true,
+          required: false,
+          belowWidgets: [
+            const SizedBox(
+              height: 4,
+            ),
+            GestureDetector(
+                onTap: () {
+                  launchUrlString(
+                      'https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token',
+                      mode: LaunchMode.externalApplication);
+                },
+                child: Text(
+                  tr('about'),
+                  style: const TextStyle(
+                      decoration: TextDecoration.underline, fontSize: 12),
+                )),
+            const SizedBox(
+              height: 4,
+            )
+          ])
+    ];
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -19,6 +60,37 @@ class GitLab extends AppSource {
    return url.substring(0, match.end);
  }

+  Future<String?> getPATIfAny() async {
+    SettingsProvider settingsProvider = SettingsProvider();
+    await settingsProvider.initializeSettings();
+    String? creds = settingsProvider
+        .getSettingString(additionalSourceSpecificSettingFormItems[0].key);
+    return creds != null && creds.isNotEmpty ? creds : null;
+  }
+
+  @override
+  Future<Map<String, List<String>>> search(String query) async {
+    String? PAT = await getPATIfAny();
+    if (PAT == null) {
+      throw CredsNeededError(name);
+    }
+    var url =
+        'https://$host/api/v4/search?private_token=$PAT&scope=projects&search=${Uri.encodeQueryComponent(query)}';
+    var res = await sourceRequest(url);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var json = jsonDecode(res.body) as List<dynamic>;
+    Map<String, List<String>> results = {};
+    for (var element in json) {
+      results['https://$host/${element['path_with_namespace']}'] = [
+        element['name_with_namespace'],
+        element['description'] ?? tr('noDescription')
+      ];
+    }
+    return results;
+  }
+
  @override
  String? changeLogPageFromStandardUrl(String standardUrl) =>
      '$standardUrl/-/releases';
@ -28,40 +100,58 @@ class GitLab extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    Response res = await sourceRequest('$standardUrl/-/tags?format=atom');
    if (res.statusCode == 200) {
      var standardUri = Uri.parse(standardUrl);
      var parsedHtml = parse(res.body);
-      var entry = parsedHtml.querySelector('entry');
-      var entryContent =
-          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
-      var apkUrls = [
-        ...getLinksFromParsedHTML(
-            entryContent,
-            RegExp(
-                '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
-                  return '\\${x[0]}';
-                })}/uploads/[^/]+/[^/]+\\.apk\$',
-                caseSensitive: false),
-            standardUri.origin),
-        // GitLab releases may contain links to externally hosted APKs
-        ...getLinksFromParsedHTML(entryContent,
-                RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
-            .where((element) => Uri.parse(element).host != '')
-            .toList()
-      ];
+      var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
+        var entryContent = parse(
+            parseFragment(entry.querySelector('content')!.innerHtml).text);
+        var apkUrls = [
+          ...getLinksFromParsedHTML(
+              entryContent,
+              RegExp(
+                  '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
+                    return '\\${x[0]}';
+                  })}/uploads/[^/]+/[^/]+\\.apk\$',
+                  caseSensitive: false),
+              standardUri.origin),
+          // GitLab releases may contain links to externally hosted APKs
+          ...getLinksFromParsedHTML(entryContent,
+                  RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
+              .where((element) => Uri.parse(element).host != '')
+              .toList()
+        ];

-      var entryId = entry?.querySelector('id')?.innerHtml;
-      var version =
-          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
-      var releaseDateString = entry?.querySelector('updated')?.innerHtml;
-      DateTime? releaseDate =
-          releaseDateString != null ? DateTime.parse(releaseDateString) : null;
-      if (version == null) {
-        throw NoVersionError();
+        var entryId = entry.querySelector('id')?.innerHtml;
+        var version =
+            entryId == null ? null : Uri.parse(entryId).pathSegments.last;
+        var releaseDateString = entry.querySelector('updated')?.innerHtml;
+        DateTime? releaseDate = releaseDateString != null
+            ? DateTime.parse(releaseDateString)
+            : null;
+        if (version == null) {
+          throw NoVersionError();
+        }
+        return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+            GitHub().getAppNames(standardUrl),
+            releaseDate: releaseDate);
+      });
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
      }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
-          releaseDate: releaseDate);
+      if (fallbackToOlderReleases) {
+        if (additionalSettings['trackOnly'] != true) {
+          apkDetailsList =
+              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+        }
+        if (apkDetailsList.isEmpty) {
+          throw NoReleasesError();
+        }
+      }
+      return apkDetailsList.first;
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/html.dart
+++ b/lib/app_sources/html.dart
@ -4,9 +4,96 @@ import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';

+String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
+  try {
+    Uri.parse(ambiguousUrl).origin;
+    return ambiguousUrl;
+  } catch (err) {
+    // is relative
+  }
+  var currPathSegments = referenceAbsoluteUrl.path
+      .split('/')
+      .where((element) => element.trim().isNotEmpty)
+      .toList();
+  if (ambiguousUrl.startsWith('/') || currPathSegments.isEmpty) {
+    return '${referenceAbsoluteUrl.origin}/$ambiguousUrl';
+  } else if (ambiguousUrl.split('/').length == 1) {
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
+  } else {
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$ambiguousUrl';
+  }
+}
+
+int compareAlphaNumeric(String a, String b) {
+  List<String> aParts = _splitAlphaNumeric(a);
+  List<String> bParts = _splitAlphaNumeric(b);
+
+  for (int i = 0; i < aParts.length && i < bParts.length; i++) {
+    String aPart = aParts[i];
+    String bPart = bParts[i];
+
+    bool aIsNumber = _isNumeric(aPart);
+    bool bIsNumber = _isNumeric(bPart);
+
+    if (aIsNumber && bIsNumber) {
+      int aNumber = int.parse(aPart);
+      int bNumber = int.parse(bPart);
+      int cmp = aNumber.compareTo(bNumber);
+      if (cmp != 0) {
+        return cmp;
+      }
+    } else if (!aIsNumber && !bIsNumber) {
+      int cmp = aPart.compareTo(bPart);
+      if (cmp != 0) {
+        return cmp;
+      }
+    } else {
+      // Alphanumeric strings come before numeric strings
+      return aIsNumber ? 1 : -1;
+    }
+  }
+
+  return aParts.length.compareTo(bParts.length);
+}
+
+List<String> _splitAlphaNumeric(String s) {
+  List<String> parts = [];
+  StringBuffer sb = StringBuffer();
+
+  bool isNumeric = _isNumeric(s[0]);
+  sb.write(s[0]);
+
+  for (int i = 1; i < s.length; i++) {
+    bool currentIsNumeric = _isNumeric(s[i]);
+    if (currentIsNumeric == isNumeric) {
+      sb.write(s[i]);
+    } else {
+      parts.add(sb.toString());
+      sb.clear();
+      sb.write(s[i]);
+      isNumeric = currentIsNumeric;
+    }
+  }
+
+  parts.add(sb.toString());
+
+  return parts;
+}
+
+bool _isNumeric(String s) {
+  return s.codeUnitAt(0) >= 48 && s.codeUnitAt(0) <= 57;
+}
+
 class HTML extends AppSource {
  @override
-  String standardizeURL(String url) {
+  // TODO: implement requestHeaders choice, hardcoded for now
+  Map<String, String>? get requestHeaders => {
+        "User-Agent":
+            "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"
+      };
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
    return url;
  }

@ -16,14 +103,16 @@ class HTML extends AppSource {
    Map<String, dynamic> additionalSettings,
  ) async {
    var uri = Uri.parse(standardUrl);
-    Response res = await get(uri);
+    Response res = await sourceRequest(standardUrl);
    if (res.statusCode == 200) {
      List<String> links = parse(res.body)
          .querySelectorAll('a')
          .map((element) => element.attributes['href'] ?? '')
-          .where((element) => element.toLowerCase().endsWith('.apk'))
+          .where((element) =>
+              Uri.parse(element).path.toLowerCase().endsWith('.apk'))
          .toList();
-      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      links.sort(
+          (a, b) => compareAlphaNumeric(a.split('/').last, b.split('/').last));
      if (additionalSettings['apkFilterRegEx'] != null) {
        var reg = RegExp(additionalSettings['apkFilterRegEx']);
        links = links.where((element) => reg.hasMatch(element)).toList();
@ -34,15 +123,10 @@ class HTML extends AppSource {
      var rel = links.last;
      var apkName = rel.split('/').last;
      var version = apkName.substring(0, apkName.length - 4);
-      List<String> apkUrls = [rel]
-          .map((e) => e.toLowerCase().startsWith('http://') ||
-                  e.toLowerCase().startsWith('https://')
-              ? e
-              : e.startsWith('/')
-                  ? '${uri.origin}/$e'
-                  : '${uri.origin}/${uri.path}/$e')
-          .toList();
-      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+      List<String> apkUrls =
+          [rel].map((e) => ensureAbsoluteUrl(e, uri)).toList();
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/izzyondroid.dart
+++ b/lib/app_sources/izzyondroid.dart
@ -1,4 +1,3 @@
-import 'package:http/http.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -9,7 +8,7 @@ class IzzyOnDroid extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -19,8 +18,8 @@ class IzzyOnDroid extends AppSource {
  }

  @override
-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
    return FDroid().tryInferringAppId(standardUrl);
  }

@ -29,10 +28,10 @@ class IzzyOnDroid extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    String? appId = tryInferringAppId(standardUrl);
+    String? appId = await tryInferringAppId(standardUrl);
    return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(
-            Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
+        await sourceRequest(
+            'https://apt.izzysoft.de/fdroid/api/v1/packages/$appId'),
        'https://android.izzysoft.de/frepo/$appId',
        standardUrl);
  }
--- a/lib/app_sources/jenkins.dart
+++ b/lib/app_sources/jenkins.dart
@ -0,0 +1,66 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Jenkins extends AppSource {
+  Jenkins() {
+    overrideVersionDetectionFormDefault('releaseDateAsVersion', true);
+  }
+
+  String trimJobUrl(String url) {
+    RegExp standardUrlRegEx = RegExp('.*/job/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url);
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/-/releases';
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    standardUrl = trimJobUrl(standardUrl);
+    Response res =
+        await sourceRequest('$standardUrl/lastSuccessfulBuild/api/json');
+    if (res.statusCode == 200) {
+      var json = jsonDecode(res.body);
+      var releaseDate = json['timestamp'] == null
+          ? null
+          : DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int);
+      var version =
+          json['number'] == null ? null : (json['number'] as int).toString();
+      if (version == null) {
+        throw NoVersionError();
+      }
+      var apkUrls = (json['artifacts'] as List<dynamic>)
+          .map((e) {
+            var path = (e['relativePath'] as String?);
+            if (path != null && path.isNotEmpty) {
+              path = '$standardUrl/lastSuccessfulBuild/artifact/$path';
+            }
+            return path == null
+                ? const MapEntry<String, String>('', '')
+                : MapEntry<String, String>(
+                    (e['fileName'] ?? e['relativePath']) as String, path);
+          })
+          .where((url) =>
+              url.value.isNotEmpty && url.key.toLowerCase().endsWith('.apk'))
+          .toList();
+      return APKDetails(
+          version,
+          apkUrls,
+          releaseDate: releaseDate,
+          AppNames(Uri.parse(standardUrl).host, standardUrl.split('/').last));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
--- a/lib/app_sources/mullvad.dart
+++ b/lib/app_sources/mullvad.dart
@ -1,5 +1,6 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';

@ -9,7 +10,7 @@ class Mullvad extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -27,21 +28,39 @@ class Mullvad extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
+    Response res = await sourceRequest('$standardUrl/en/download/android');
    if (res.statusCode == 200) {
-      var version = parse(res.body)
-          .querySelector('p.subtitle.is-6')
-          ?.querySelector('a')
-          ?.attributes['href']
-          ?.split('/')
-          .last;
-      if (version == null) {
+      var versions = parse(res.body)
+          .querySelectorAll('p')
+          .map((e) => e.innerHtml)
+          .where((p) => p.contains('Latest version: '))
+          .map((e) {
+            var match = RegExp('[0-9]+(\\.[0-9]+)*').firstMatch(e);
+            if (match == null) {
+              return '';
+            } else {
+              return e.substring(match.start, match.end);
+            }
+          })
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (versions.isEmpty) {
        throw NoVersionError();
      }
+      String? changeLog;
+      try {
+        changeLog = (await GitHub().getLatestAPKDetails(
+                'https://github.com/mullvad/mullvadvpn-app',
+                {'fallbackToOlderReleases': true}))
+            .changeLog;
+      } catch (e) {
+        // Ignore
+      }
      return APKDetails(
-          version,
-          ['https://mullvad.net/download/app/apk/latest'],
-          AppNames(name, 'Mullvad-VPN'));
+          versions[0],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
+          AppNames(name, 'Mullvad-VPN'),
+          changeLog: changeLog);
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/neutroncode.dart
+++ b/lib/app_sources/neutroncode.dart
@ -9,7 +9,7 @@ class NeutronCode extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
    if (match == null) {
@ -78,7 +78,7 @@ class NeutronCode extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse(standardUrl));
+    Response res = await sourceRequest(standardUrl);
    if (res.statusCode == 200) {
      var http = parse(res.body);
      var name = http.querySelector('.pd-title')?.innerHtml;
@ -98,7 +98,7 @@ class NeutronCode extends AppSource {
          ? (customDateParse(dateStringOriginal))
          : null;
      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
-      return APKDetails(version, [apkUrl],
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
          changeLog: changeLogElements.isNotEmpty
--- a/lib/app_sources/signal.dart
+++ b/lib/app_sources/signal.dart
@ -9,7 +9,7 @@ class Signal extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    return 'https://$host';
  }

@ -19,7 +19,7 @@ class Signal extends AppSource {
    Map<String, dynamic> additionalSettings,
  ) async {
    Response res =
-        await get(Uri.parse('https://updates.$host/android/latest.json'));
+        await sourceRequest('https://updates.$host/android/latest.json');
    if (res.statusCode == 200) {
      var json = jsonDecode(res.body);
      String? apkUrl = json['url'];
@ -28,7 +28,8 @@ class Signal extends AppSource {
      if (version == null) {
        throw NoVersionError();
      }
-      return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/sourceforge.dart
+++ b/lib/app_sources/sourceforge.dart
@ -9,9 +9,15 @@ class SourceForge extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegExB = RegExp('^https?://$host/p/[^/]+');
+    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
+    if (match != null) {
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/projects/${url.substring(Uri.parse(url.substring(0, match.end)).host.length + '/projects/'.length + 1)}';
+    }
+    RegExp standardUrlRegExA = RegExp('^https?://$host/projects/[^/]+');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
    if (match == null) {
      throw InvalidURLError(name);
    }
@ -23,7 +29,7 @@ class SourceForge extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
+    Response res = await sourceRequest('$standardUrl/rss?path=/');
    if (res.statusCode == 200) {
      var parsedHtml = parse(res.body);
      var allDownloadLinks =
@ -31,7 +37,8 @@ class SourceForge extends AppSource {
      getVersion(String url) {
        try {
          var tokens = url.split('/');
-          return tokens[tokens.length - 3];
+          var fi = tokens.indexOf('files');
+          return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
        } catch (e) {
          return null;
        }
@ -50,7 +57,7 @@ class SourceForge extends AppSource {
              .toList();
      return APKDetails(
          version,
-          apkUrlList,
+          getApkUrlsFromUrls(apkUrlList),
          AppNames(
              name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
    } else {
--- a/lib/app_sources/sourcehut.dart
+++ b/lib/app_sources/sourcehut.dart
@ -0,0 +1,107 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';
+
+class SourceHut extends AppSource {
+  SourceHut() {
+    host = 'git.sr.ht';
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => standardUrl;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Uri standardUri = Uri.parse(standardUrl);
+    String appName = standardUri.pathSegments.last;
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    Response res = await sourceRequest('$standardUrl/refs/rss.xml');
+    if (res.statusCode == 200) {
+      var parsedHtml = parse(res.body);
+      List<APKDetails> apkDetailsList = [];
+      int ind = 0;
+
+      for (var entry in parsedHtml.querySelectorAll('item').sublist(0, 6)) {
+        // Limit 5 for speed
+        if (!fallbackToOlderReleases && ind > 0) {
+          break;
+        }
+        String? version = entry.querySelector('title')?.text.trim();
+        if (version == null) {
+          throw NoVersionError();
+        }
+        String? releaseDateString = entry.querySelector('pubDate')?.innerHtml;
+        String releasePage = '$standardUrl/refs/$version';
+        DateTime? releaseDate;
+        try {
+          releaseDate = releaseDateString != null
+              ? DateFormat('E, dd MMM yyyy HH:mm:ss Z').parse(releaseDateString)
+              : null;
+          releaseDate = releaseDateString != null
+              ? DateFormat('EEE, dd MMM yyyy HH:mm:ss Z')
+                  .parse(releaseDateString)
+              : null;
+        } catch (e) {
+          // ignore
+        }
+        var res2 = await sourceRequest(releasePage);
+        List<MapEntry<String, String>> apkUrls = [];
+        if (res2.statusCode == 200) {
+          apkUrls = getApkUrlsFromUrls(parse(res2.body)
+              .querySelectorAll('a')
+              .map((e) => e.attributes['href'] ?? '')
+              .where((e) => e.toLowerCase().endsWith('.apk'))
+              .map((e) => ensureAbsoluteUrl(e, standardUri))
+              .toList());
+        }
+        apkDetailsList.add(APKDetails(
+            version,
+            apkUrls,
+            AppNames(entry.querySelector('author')?.innerHtml.trim() ?? appName,
+                appName),
+            releaseDate: releaseDate));
+        ind++;
+      }
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
+      }
+      if (fallbackToOlderReleases) {
+        if (additionalSettings['trackOnly'] != true) {
+          apkDetailsList =
+              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+        }
+        if (apkDetailsList.isEmpty) {
+          throw NoReleasesError();
+        }
+      }
+      return apkDetailsList.first;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
--- a/lib/app_sources/steammobile.dart
+++ b/lib/app_sources/steammobile.dart
@ -20,7 +20,7 @@ class SteamMobile extends AppSource {
  final apks = {'steam': tr('steamMobile'), 'steam-chat-app': tr('steamChat')};

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    return 'https://$host';
  }

@ -29,7 +29,7 @@ class SteamMobile extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('https://$host/mobile'));
+    Response res = await sourceRequest('https://$host/mobile');
    if (res.statusCode == 200) {
      var apkNamePrefix = additionalSettings['app'] as String?;
      if (apkNamePrefix == null) {
@ -53,7 +53,8 @@ class SteamMobile extends AppSource {
      var version = links[0].substring(
          versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4);
      var apkUrls = [links[0]];
-      return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
+      return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+          AppNames(name, apks[apkNamePrefix]!));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/telegramapp.dart
+++ b/lib/app_sources/telegramapp.dart
@ -11,7 +11,7 @@ class TelegramApp extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    return 'https://$host';
  }

@ -20,7 +20,7 @@ class TelegramApp extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('https://t.me/s/TAndroidAPK'));
+    Response res = await sourceRequest('https://t.me/s/TAndroidAPK');
    if (res.statusCode == 200) {
      var http = parse(res.body);
      var messages =
@ -32,7 +32,8 @@ class TelegramApp extends AppSource {
        throw NoVersionError();
      }
      String? apkUrl = 'https://telegram.org/dl/android/apk';
-      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames('Telegram', 'Telegram'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/vlc.dart
+++ b/lib/app_sources/vlc.dart
@ -1,6 +1,5 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';

@ -10,7 +9,7 @@ class VLC extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    return 'https://$host';
  }

@ -19,8 +18,8 @@ class VLC extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(
-        Uri.parse('https://www.videolan.org/vlc/download-android.html'));
+    Response res = await sourceRequest(
+        'https://www.videolan.org/vlc/download-android.html');
    if (res.statusCode == 200) {
      var dwUrlBase = 'get.videolan.org/vlc-android';
      var dwLinks = parse(res.body)
@ -38,7 +37,7 @@ class VLC extends AppSource {
        throw NoVersionError();
      }
      String? targetUrl = 'https://$dwUrlBase/$version/';
-      Response res2 = await get(Uri.parse(targetUrl));
+      Response res2 = await sourceRequest(targetUrl);
      String mirrorDwBase =
          'https://plug-mirror.rcac.purdue.edu/vlc/vlc-android/$version/';
      List<String> apkUrls = [];
@ -54,7 +53,8 @@ class VLC extends AppSource {
        throw getObtainiumHttpError(res2);
      }

-      return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/whatsapp.dart
+++ b/lib/app_sources/whatsapp.dart
@ -9,26 +9,26 @@ class WhatsApp extends AppSource {
  }

  @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
    return 'https://$host';
  }

  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
-    Response res = await get(Uri.parse('https://www.whatsapp.com/android'));
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    Response res = await sourceRequest('https://www.whatsapp.com/android');
    if (res.statusCode == 200) {
      var targetLinks = parse(res.body)
          .querySelectorAll('a')
-          .map((e) => e.attributes['href'])
-          .where((e) => e != null)
+          .map((e) => e.attributes['href'] ?? '')
+          .where((e) => e.isNotEmpty)
          .where((e) =>
-              e!.contains('scontent.whatsapp.net') &&
-              e.contains('WhatsApp.apk'))
+              e.contains('content.whatsapp.net') && e.contains('WhatsApp.apk'))
          .toList();
      if (targetLinks.isEmpty) {
        throw NoAPKError();
      }
-      return targetLinks[0]!;
+      return targetLinks[0];
    } else {
      throw getObtainiumHttpError(res);
    }
@ -39,7 +39,7 @@ class WhatsApp extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    Response res = await get(Uri.parse('https://www.whatsapp.com/android'));
+    Response res = await sourceRequest('https://www.whatsapp.com/android');
    if (res.statusCode == 200) {
      var targetElements = parse(res.body)
          .querySelectorAll('p')
@ -64,9 +64,9 @@ class WhatsApp extends AppSource {
          vLines[0].substring(versionMatch.start, versionMatch.end);
      return APKDetails(
          version,
-          [
+          getApkUrlsFromUrls([
            'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
-          ],
+          ]),
          AppNames('Meta', 'WhatsApp'));
    } else {
      throw getObtainiumHttpError(res);
--- a/lib/components/generated_form.dart
+++ b/lib/components/generated_form.dart
@ -48,6 +48,7 @@ class GeneratedFormTextField extends GeneratedFormItem {

 class GeneratedFormDropdown extends GeneratedFormItem {
  late List<MapEntry<String, String>>? opts;
+  List<String>? disabledOptKeys;

  GeneratedFormDropdown(
    String key,
@ -55,6 +56,7 @@ class GeneratedFormDropdown extends GeneratedFormItem {
    String label = 'Input',
    List<Widget> belowWidgets = const [],
    String defaultValue = '',
+    this.disabledOptKeys,
    List<String? Function(String? value)> additionalValidators = const [],
  }) : super(key,
            label: label,
@ -225,10 +227,15 @@ class _GeneratedFormState extends State<GeneratedForm> {
          return DropdownButtonFormField(
              decoration: InputDecoration(labelText: formItem.label),
              value: values[formItem.key],
-              items: formItem.opts!
-                  .map((e2) =>
-                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
-                  .toList(),
+              items: formItem.opts!.map((e2) {
+                var enabled =
+                    formItem.disabledOptKeys?.contains(e2.key) != true;
+                return DropdownMenuItem(
+                    value: e2.key,
+                    enabled: enabled,
+                    child: Opacity(
+                        opacity: enabled ? 1 : 0.5, child: Text(e2.value)));
+              }).toList(),
              onChanged: (value) {
                setState(() {
                  values[formItem.key] = value ?? formItem.opts!.first.key;
@ -260,7 +267,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
          formInputs[r][e] = Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
-              Text(widget.items[r][e].label),
+              Flexible(child: Text(widget.items[r][e].label)),
+              const SizedBox(
+                width: 8,
+              ),
              Switch(
                  value: values[widget.items[r][e].key],
                  onChanged: (value) {
--- a/lib/custom_errors.dart
+++ b/lib/custom_errors.dart
@ -1,3 +1,4 @@
+import 'package:android_package_installer/android_package_installer.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/providers/logs_provider.dart';
@ -24,6 +25,11 @@ class InvalidURLError extends ObtainiumError {
      : super(tr('invalidURLForSource', args: [sourceName]));
 }

+class CredsNeededError extends ObtainiumError {
+  CredsNeededError(String sourceName)
+      : super(tr('requiresCredentialsInSettings', args: [sourceName]));
+}
+
 class NoReleasesError extends ObtainiumError {
  NoReleasesError() : super(tr('noReleaseFound'));
 }
@ -44,6 +50,11 @@ class DowngradeError extends ObtainiumError {
  DowngradeError() : super(tr('cantInstallOlderVersion'));
 }

+class InstallError extends ObtainiumError {
+  InstallError(int code)
+      : super(PackageInstallerStatus.byCode(code).name.substring(7));
+}
+
 class IDChangedError extends ObtainiumError {
  IDChangedError() : super(tr('appIdMismatch'));
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -21,21 +21,23 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.11.14';
+const String currentVersion = '0.13.8';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

 const int bgUpdateCheckAlarmId = 666;

-const supportedLocales = [
-  Locale('en'),
-  Locale('zh'),
-  Locale('it'),
-  Locale('ja'),
-  Locale('hu'),
-  Locale('de'),
-  Locale('fa'),
-  Locale('fr')
+List<MapEntry<Locale, String>> supportedLocales = const [
+  MapEntry(Locale('en'), 'English'),
+  MapEntry(Locale('zh'), '汉语'),
+  MapEntry(Locale('it'), 'Italiano'),
+  MapEntry(Locale('ja'), '日本語'),
+  MapEntry(Locale('hu'), 'Magyar'),
+  MapEntry(Locale('de'), 'Deutsch'),
+  MapEntry(Locale('fa'), 'فارسی'),
+  MapEntry(Locale('fr'), 'Français'),
+  MapEntry(Locale('es'), 'Español'),
+  MapEntry(Locale('pl'), 'Polski'),
 ];
 const fallbackLocale = Locale('en');
 const localeDir = 'assets/translations';
@ -52,7 +54,7 @@ Future<void> loadTranslations() async {
    saveLocale: true,
    forceLocale: forceLocale != null ? Locale(forceLocale) : null,
    fallbackLocale: fallbackLocale,
-    supportedLocales: supportedLocales,
+    supportedLocales: supportedLocales.map((e) => e.key).toList(),
    assetLoader: const RootBundleAssetLoader(),
    useOnlyLangCode: true,
    useFallbackTranslations: true,
@ -147,6 +149,14 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
+  try {
+    ByteData data =
+        await PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem');
+    SecurityContext.defaultContext
+        .setTrustedCertificatesBytes(data.buffer.asUint8List());
+  } catch (e) {
+    // Already added, do nothing (see #375)
+  }
  await EasyLocalization.ensureInitialized();
  if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) {
    SystemChrome.setSystemUIOverlayStyle(
@ -163,7 +173,7 @@ void main() async {
      Provider(create: (context) => LogsProvider())
    ],
    child: EasyLocalization(
-        supportedLocales: supportedLocales,
+        supportedLocales: supportedLocales.map((e) => e.key).toList(),
        path: localeDir,
        fallbackLocale: fallbackLocale,
        useOnlyLangCode: true,
@ -213,7 +223,7 @@ class _ObtainiumState extends State<Obtainium> {
        ], onlyIfExists: false);
      }
      if (!supportedLocales
-              .map((e) => e.languageCode)
+              .map((e) => e.key.languageCode)
              .contains(context.locale.languageCode) ||
          settingsProvider.forcedLocale == null &&
              context.deviceLocale.languageCode !=
@ -255,6 +265,14 @@ class _ObtainiumState extends State<Obtainium> {
        darkColorScheme = ColorScheme.fromSeed(
            seedColor: defaultThemeColour, brightness: Brightness.dark);
      }
+
+      // set the background and surface colors to pure black in the amoled theme
+      if (settingsProvider.useBlackTheme) {
+        darkColorScheme = darkColorScheme
+            .copyWith(background: Colors.black, surface: Colors.black)
+            .harmonized();
+      }
+
      return MaterialApp(
          title: 'Obtainium',
          localizationsDelegates: context.localizationDelegates,
--- a/lib/mass_app_sources/githubstars.dart
+++ b/lib/mass_app_sources/githubstars.dart
@ -13,17 +13,20 @@ class GitHubStars implements MassAppUrlSource {
  @override
  late List<String> requiredArgs = [tr('uname')];

-  Future<Map<String, String>> getOnePageOfUserStarredUrlsWithDescriptions(
+  Future<Map<String, List<String>>> getOnePageOfUserStarredUrlsWithDescriptions(
      String username, int page) async {
    Response res = await get(Uri.parse(
        'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
    if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
+      Map<String, List<String>> urlsWithDescriptions = {};
      for (var e in (jsonDecode(res.body) as List<dynamic>)) {
        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
+          e['html_url'] as String: [
+            e['full_name'] as String,
+            e['description'] != null
+                ? e['description'] as String
+                : tr('noDescription')
+          ]
        });
      }
      return urlsWithDescriptions;
@ -35,11 +38,12 @@ class GitHubStars implements MassAppUrlSource {
  }

  @override
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args) async {
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(
+      List<String> args) async {
    if (args.length != requiredArgs.length) {
      throw ObtainiumError(tr('wrongArgNum'));
    }
-    Map<String, String> urlsWithDescriptions = {};
+    Map<String, List<String>> urlsWithDescriptions = {};
    var page = 1;
    while (true) {
      var pageUrls =
--- a/lib/pages/add_app.dart
+++ b/lib/pages/add_app.dart
@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
@ -28,15 +29,17 @@ class _AddAppPageState extends State<AddAppPage> {

  String userInput = '';
  String searchQuery = '';
+  String? pickedSourceOverride;
  AppSource? pickedSource;
  Map<String, dynamic> additionalSettings = {};
  bool additionalSettingsValid = true;
+  bool inferAppIdIfOptional = true;
  List<String> pickedCategories = [];
  int searchnum = 0;
+  SourceProvider sourceProvider = SourceProvider();

  @override
  Widget build(BuildContext context) {
-    SourceProvider sourceProvider = SourceProvider();
    AppsProvider appsProvider = context.read<AppsProvider>();

    bool doingSomething = gettingAppInfo || searching;
@ -49,8 +52,25 @@ class _AddAppPageState extends State<AddAppPage> {
          if (isSearch) {
            searchnum++;
          }
-          var source = valid ? sourceProvider.getSource(userInput) : null;
-          if (pickedSource.runtimeType != source.runtimeType) {
+          var prevHost = pickedSource?.host;
+          try {
+            var naturalSource =
+                valid ? sourceProvider.getSource(userInput) : null;
+            if (naturalSource != null &&
+                naturalSource.runtimeType.toString() !=
+                    HTML().runtimeType.toString()) {
+              // If input has changed to match a regular source, reset the override
+              pickedSourceOverride = null;
+            }
+          } catch (e) {
+            // ignore
+          }
+          var source = valid
+              ? sourceProvider.getSource(userInput,
+                  overrideSource: pickedSourceOverride)
+              : null;
+          if (pickedSource.runtimeType != source.runtimeType ||
+              (prevHost != null && prevHost != source?.host)) {
            pickedSource = source;
            additionalSettings = source != null
                ? getDefaultValuesFromFormItems(
@ -59,75 +79,78 @@ class _AddAppPageState extends State<AddAppPage> {
            additionalSettingsValid = source != null
                ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
                : true;
+            inferAppIdIfOptional = true;
          }
        });
      }
    }

+    Future<bool> getTrackOnlyConfirmationIfNeeded(
+        bool userPickedTrackOnly, SettingsProvider settingsProvider,
+        {bool ignoreHideSetting = false}) async {
+      var useTrackOnly = userPickedTrackOnly || pickedSource!.enforceTrackOnly;
+      if (useTrackOnly &&
+          (!settingsProvider.hideTrackOnlyWarning || ignoreHideSetting)) {
+        // ignore: use_build_context_synchronously
+        var values = await showDialog(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                initValid: true,
+                title: tr('xIsTrackOnly', args: [
+                  pickedSource!.enforceTrackOnly ? tr('source') : tr('app')
+                ]),
+                items: [
+                  [GeneratedFormSwitch('hide', label: tr('dontShowAgain'))]
+                ],
+                message:
+                    '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
+              );
+            });
+        if (values != null) {
+          settingsProvider.hideTrackOnlyWarning = values['hide'] == true;
+        }
+        return useTrackOnly && values != null;
+      } else {
+        return true;
+      }
+    }
+
+    getReleaseDateAsVersionConfirmationIfNeeded(
+        bool userPickedTrackOnly) async {
+      return (!(additionalSettings['versionDetection'] ==
+              'releaseDateAsVersion' &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return GeneratedFormModal(
+                      title: tr('releaseDateAsVersion'),
+                      items: const [],
+                      message: tr('releaseDateAsVersionExplanation'),
+                    );
+                  }) ==
+              null));
+    }
+
    addApp({bool resetUserInputAfter = false}) async {
      setState(() {
        gettingAppInfo = true;
      });
-      var settingsProvider = context.read<SettingsProvider>();
-      () async {
+      try {
+        var settingsProvider = context.read<SettingsProvider>();
        var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var cont = true;
-        if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
-            // ignore: use_build_context_synchronously
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('xIsTrackOnly', args: [
-                          pickedSource!.enforceTrackOnly
-                              ? tr('source')
-                              : tr('app')
-                        ]),
-                        items: const [],
-                        message:
-                            '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
-            // ignore: use_build_context_synchronously
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('releaseDateAsVersion'),
-                        items: const [],
-                        message: tr('releaseDateAsVersionExplanation'),
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (additionalSettings['versionDetection'] == 'noVersionDetection' &&
-            // ignore: use_build_context_synchronously
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('disableVersionDetection'),
-                        items: const [],
-                        message: tr('noVersionDetectionExplanation'),
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (cont) {
-          HapticFeedback.selectionClick();
+        App? app;
+        if ((await getTrackOnlyConfirmationIfNeeded(
+                userPickedTrackOnly, settingsProvider)) &&
+            (await getReleaseDateAsVersionConfirmationIfNeeded(
+                userPickedTrackOnly))) {
          var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
-          App app = await sourceProvider.getApp(
+          app = await sourceProvider.getApp(
              pickedSource!, userInput, additionalSettings,
-              trackOnlyOverride: trackOnly);
-          if (!trackOnly) {
-            await settingsProvider.getInstallPermission();
-          }
+              trackOnlyOverride: trackOnly,
+              overrideSource: pickedSourceOverride,
+              inferAppIdIfOptional: inferAppIdIfOptional);
          // Only download the APK here if you need to for the package ID
          if (sourceProvider.isTempId(app) &&
              app.additionalSettings['trackOnly'] != true) {
@ -136,275 +159,358 @@ class _AddAppPageState extends State<AddAppPage> {
            if (apkUrl == null) {
              throw ObtainiumError(tr('cancelled'));
            }
-            app.preferredApkIndex = app.apkUrls.indexOf(apkUrl);
+            app.preferredApkIndex =
+                app.apkUrls.map((e) => e.value).toList().indexOf(apkUrl.value);
            // ignore: use_build_context_synchronously
-            var downloadedApk = await appsProvider.downloadApp(
+            var downloadedArtifact = await appsProvider.downloadApp(
                app, globalNavigatorKey.currentContext);
-            app.id = downloadedApk.appId;
+            DownloadedApk? downloadedFile;
+            DownloadedXApkDir? downloadedDir;
+            if (downloadedArtifact is DownloadedApk) {
+              downloadedFile = downloadedArtifact;
+            } else {
+              downloadedDir = downloadedArtifact as DownloadedXApkDir;
+            }
+            app.id = downloadedFile?.appId ?? downloadedDir!.appId;
          }
          if (appsProvider.apps.containsKey(app.id)) {
            throw ObtainiumError(tr('appAlreadyAdded'));
          }
-          if (app.additionalSettings['trackOnly'] == true) {
+          if (app.additionalSettings['trackOnly'] == true ||
+              app.additionalSettings['versionDetection'] !=
+                  'standardVersionDetection') {
            app.installedVersion = app.latestVersion;
          }
          app.categories = pickedCategories;
          await appsProvider.saveApps([app], onlyIfExists: false);
-
-          return app;
        }
-      }()
-          .then((app) {
        if (app != null) {
          Navigator.push(globalNavigatorKey.currentContext ?? context,
-              MaterialPageRoute(builder: (context) => AppPage(appId: app.id)));
+              MaterialPageRoute(builder: (context) => AppPage(appId: app!.id)));
        }
-      }).catchError((e) {
+      } catch (e) {
        showError(e, context);
-      }).whenComplete(() {
+      } finally {
        setState(() {
          gettingAppInfo = false;
          if (resetUserInputAfter) {
            changeUserInput('', false, true);
          }
        });
-      });
+      }
    }

+    Widget getUrlInputRow() => Row(
+          children: [
+            Expanded(
+                child: GeneratedForm(
+                    key: Key(searchnum.toString()),
+                    items: [
+                      [
+                        GeneratedFormTextField('appSourceURL',
+                            label: tr('appSourceURL'),
+                            defaultValue: userInput,
+                            additionalValidators: [
+                              (value) {
+                                try {
+                                  sourceProvider
+                                      .getSource(value ?? '',
+                                          overrideSource: pickedSourceOverride)
+                                      .standardizeUrl(value ?? '');
+                                } catch (e) {
+                                  return e is String
+                                      ? e
+                                      : e is ObtainiumError
+                                          ? e.toString()
+                                          : tr('error');
+                                }
+                                return null;
+                              }
+                            ])
+                      ]
+                    ],
+                    onValueChanges: (values, valid, isBuilding) {
+                      changeUserInput(
+                          values['appSourceURL']!, valid, isBuilding);
+                    })),
+            const SizedBox(
+              width: 16,
+            ),
+            gettingAppInfo
+                ? const CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: doingSomething ||
+                            pickedSource == null ||
+                            (pickedSource!.combinedAppSpecificSettingFormItems
+                                    .isNotEmpty &&
+                                !additionalSettingsValid)
+                        ? null
+                        : () {
+                            HapticFeedback.selectionClick();
+                            addApp();
+                          },
+                    child: Text(tr('add')))
+          ],
+        );
+
+    runSearch() async {
+      setState(() {
+        searching = true;
+      });
+      try {
+        var results = await Future.wait(
+            sourceProvider.sources.where((e) => e.canSearch).map((e) async {
+          try {
+            return await e.search(searchQuery);
+          } catch (err) {
+            if (err is! CredsNeededError) {
+              rethrow;
+            } else {
+              return <String, List<String>>{};
+            }
+          }
+        }));
+
+        // .then((results) async {
+        // Interleave results instead of simple reduce
+        Map<String, List<String>> res = {};
+        var si = 0;
+        var done = false;
+        while (!done) {
+          done = true;
+          for (var r in results) {
+            if (r.length > si) {
+              done = false;
+              res.addEntries([r.entries.elementAt(si)]);
+            }
+          }
+          si++;
+        }
+        if (res.isEmpty) {
+          throw ObtainiumError(tr('noResults'));
+        }
+        List<String>? selectedUrls = res.isEmpty
+            ? []
+            // ignore: use_build_context_synchronously
+            : await showDialog<List<String>?>(
+                context: context,
+                builder: (BuildContext ctx) {
+                  return UrlSelectionModal(
+                    urlsWithDescriptions: res,
+                    selectedByDefault: false,
+                    onlyOneSelectionAllowed: true,
+                  );
+                });
+        if (selectedUrls != null && selectedUrls.isNotEmpty) {
+          changeUserInput(selectedUrls[0], true, false, isSearch: true);
+        }
+      } catch (e) {
+        showError(e, context);
+      } finally {
+        setState(() {
+          searching = false;
+        });
+      }
+    }
+
+    Widget getHTMLSourceOverrideDropdown() => Column(children: [
+          Row(
+            children: [
+              Expanded(
+                  child: GeneratedForm(
+                items: [
+                  [
+                    GeneratedFormDropdown(
+                        'overrideSource',
+                        defaultValue: HTML().runtimeType.toString(),
+                        [
+                          ...sourceProvider.sources.map(
+                              (s) => MapEntry(s.runtimeType.toString(), s.name))
+                        ],
+                        label: tr('overrideSource'))
+                  ]
+                ],
+                onValueChanges: (values, valid, isBuilding) {
+                  fn() {
+                    pickedSourceOverride = (values['overrideSource'] == null ||
+                            values['overrideSource'] == '')
+                        ? null
+                        : values['overrideSource'];
+                  }
+
+                  if (!isBuilding) {
+                    setState(() {
+                      fn();
+                    });
+                  } else {
+                    fn();
+                  }
+                  changeUserInput(userInput, valid, isBuilding);
+                },
+              ))
+            ],
+          ),
+          const SizedBox(
+            height: 16,
+          )
+        ]);
+
+    bool shouldShowSearchBar() =>
+        sourceProvider.sources.where((e) => e.canSearch).isNotEmpty &&
+        pickedSource == null &&
+        userInput.isEmpty;
+
+    Widget getSearchBarRow() => Row(
+          children: [
+            Expanded(
+              child: GeneratedForm(
+                  items: [
+                    [
+                      GeneratedFormTextField('searchSomeSources',
+                          label: tr('searchSomeSourcesLabel'), required: false),
+                    ]
+                  ],
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (values.isNotEmpty && valid && !isBuilding) {
+                      setState(() {
+                        searchQuery = values['searchSomeSources']!.trim();
+                      });
+                    }
+                  }),
+            ),
+            const SizedBox(
+              width: 16,
+            ),
+            searching
+                ? const CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: searchQuery.isEmpty || doingSomething
+                        ? null
+                        : () {
+                            runSearch();
+                          },
+                    child: Text(tr('search')))
+          ],
+        );
+
+    Widget getAdditionalOptsCol() => Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(
+              height: 16,
+            ),
+            Text(
+                tr('additionalOptsFor',
+                    args: [pickedSource?.name ?? tr('source')]),
+                style: TextStyle(
+                    color: Theme.of(context).colorScheme.primary,
+                    fontWeight: FontWeight.bold)),
+            const SizedBox(
+              height: 16,
+            ),
+            GeneratedForm(
+                key: Key(pickedSource.runtimeType.toString()),
+                items: pickedSource!.combinedAppSpecificSettingFormItems,
+                onValueChanges: (values, valid, isBuilding) {
+                  if (!isBuilding) {
+                    setState(() {
+                      additionalSettings = values;
+                      additionalSettingsValid = valid;
+                    });
+                  }
+                }),
+            Column(
+              children: [
+                const SizedBox(
+                  height: 16,
+                ),
+                CategoryEditorSelector(
+                    alignment: WrapAlignment.start,
+                    onSelected: (categories) {
+                      pickedCategories = categories;
+                    }),
+              ],
+            ),
+            if (pickedSource != null && pickedSource!.appIdInferIsOptional)
+              GeneratedForm(
+                  key: const Key('inferAppIdIfOptional'),
+                  items: [
+                    [
+                      GeneratedFormSwitch('inferAppIdIfOptional',
+                          label: tr('tryInferAppIdFromCode'),
+                          defaultValue: inferAppIdIfOptional)
+                    ]
+                  ],
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (!isBuilding) {
+                      setState(() {
+                        inferAppIdIfOptional = values['inferAppIdIfOptional'];
+                      });
+                    }
+                  }),
+          ],
+        );
+
+    Widget getSourcesListWidget() => Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const SizedBox(
+                height: 48,
+              ),
+              Text(
+                tr('supportedSourcesBelow'),
+              ),
+              const SizedBox(
+                height: 8,
+              ),
+              ...sourceProvider.sources
+                  .map((e) => GestureDetector(
+                      onTap: e.host != null
+                          ? () {
+                              launchUrlString('https://${e.host}',
+                                  mode: LaunchMode.externalApplication);
+                            }
+                          : null,
+                      child: Text(
+                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
+                        style: TextStyle(
+                            decoration: e.host != null
+                                ? TextDecoration.underline
+                                : TextDecoration.none,
+                            fontStyle: FontStyle.italic),
+                      )))
+                  .toList()
+            ]);
+
    return Scaffold(
        backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
          CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
            child: Padding(
                padding: const EdgeInsets.all(16),
                child: Column(
+                    mainAxisSize: MainAxisSize.min,
                    crossAxisAlignment: CrossAxisAlignment.stretch,
                    children: [
-                      Row(
-                        children: [
-                          Expanded(
-                              child: GeneratedForm(
-                                  key: Key(searchnum.toString()),
-                                  items: [
-                                    [
-                                      GeneratedFormTextField('appSourceURL',
-                                          label: tr('appSourceURL'),
-                                          defaultValue: userInput,
-                                          additionalValidators: [
-                                            (value) {
-                                              try {
-                                                sourceProvider
-                                                    .getSource(value ?? '')
-                                                    .standardizeURL(
-                                                        preStandardizeUrl(
-                                                            value ?? ''));
-                                              } catch (e) {
-                                                return e is String
-                                                    ? e
-                                                    : e is ObtainiumError
-                                                        ? e.toString()
-                                                        : tr('error');
-                                              }
-                                              return null;
-                                            }
-                                          ])
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    changeUserInput(values['appSourceURL']!,
-                                        valid, isBuilding);
-                                  })),
-                          const SizedBox(
-                            width: 16,
-                          ),
-                          gettingAppInfo
-                              ? const CircularProgressIndicator()
-                              : ElevatedButton(
-                                  onPressed: doingSomething ||
-                                          pickedSource == null ||
-                                          (pickedSource!
-                                                  .combinedAppSpecificSettingFormItems
-                                                  .isNotEmpty &&
-                                              !additionalSettingsValid)
-                                      ? null
-                                      : addApp,
-                                  child: Text(tr('add')))
-                        ],
+                      getUrlInputRow(),
+                      const SizedBox(
+                        height: 16,
+                      ),
+                      if (pickedSourceOverride != null ||
+                          (pickedSource != null &&
+                              pickedSource.runtimeType.toString() ==
+                                  HTML().runtimeType.toString()))
+                        getHTMLSourceOverrideDropdown(),
+                      if (shouldShowSearchBar()) getSearchBarRow(),
+                      const SizedBox(
+                        height: 16,
                      ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        const SizedBox(
-                          height: 16,
-                        ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        Row(
-                          children: [
-                            Expanded(
-                              child: GeneratedForm(
-                                  items: [
-                                    [
-                                      GeneratedFormTextField(
-                                          'searchSomeSources',
-                                          label: tr('searchSomeSourcesLabel'),
-                                          required: false),
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty &&
-                                        valid &&
-                                        !isBuilding) {
-                                      setState(() {
-                                        searchQuery =
-                                            values['searchSomeSources']!.trim();
-                                      });
-                                    }
-                                  }),
-                            ),
-                            const SizedBox(
-                              width: 16,
-                            ),
-                            ElevatedButton(
-                                onPressed: searchQuery.isEmpty || doingSomething
-                                    ? null
-                                    : () {
-                                        setState(() {
-                                          searching = true;
-                                        });
-                                        Future.wait(sourceProvider.sources
-                                                .where((e) => e.canSearch)
-                                                .map((e) =>
-                                                    e.search(searchQuery)))
-                                            .then((results) async {
-                                          // Interleave results instead of simple reduce
-                                          Map<String, String> res = {};
-                                          var si = 0;
-                                          var done = false;
-                                          while (!done) {
-                                            done = true;
-                                            for (var r in results) {
-                                              if (r.length > si) {
-                                                done = false;
-                                                res.addEntries(
-                                                    [r.entries.elementAt(si)]);
-                                              }
-                                            }
-                                            si++;
-                                          }
-                                          List<String>? selectedUrls = res
-                                                  .isEmpty
-                                              ? []
-                                              : await showDialog<List<String>?>(
-                                                  context: context,
-                                                  builder: (BuildContext ctx) {
-                                                    return UrlSelectionModal(
-                                                      urlsWithDescriptions: res,
-                                                      selectedByDefault: false,
-                                                      onlyOneSelectionAllowed:
-                                                          true,
-                                                    );
-                                                  });
-                                          if (selectedUrls != null &&
-                                              selectedUrls.isNotEmpty) {
-                                            changeUserInput(
-                                                selectedUrls[0], true, false,
-                                                isSearch: true);
-                                          }
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        }).whenComplete(() {
-                                          setState(() {
-                                            searching = false;
-                                          });
-                                        });
-                                      },
-                                child: Text(tr('search')))
-                          ],
-                        ),
                      if (pickedSource != null)
-                        Column(
-                          crossAxisAlignment: CrossAxisAlignment.stretch,
-                          children: [
-                            const Divider(
-                              height: 64,
-                            ),
-                            Text(
-                                tr('additionalOptsFor',
-                                    args: [pickedSource?.name ?? tr('source')]),
-                                style: TextStyle(
-                                    color:
-                                        Theme.of(context).colorScheme.primary)),
-                            const SizedBox(
-                              height: 16,
-                            ),
-                            GeneratedForm(
-                                key: Key(pickedSource.runtimeType.toString()),
-                                items: pickedSource!
-                                    .combinedAppSpecificSettingFormItems,
-                                onValueChanges: (values, valid, isBuilding) {
-                                  if (!isBuilding) {
-                                    setState(() {
-                                      additionalSettings = values;
-                                      additionalSettingsValid = valid;
-                                    });
-                                  }
-                                }),
-                            Column(
-                              children: [
-                                const SizedBox(
-                                  height: 16,
-                                ),
-                                CategoryEditorSelector(
-                                    alignment: WrapAlignment.start,
-                                    onSelected: (categories) {
-                                      pickedCategories = categories;
-                                    }),
-                              ],
-                            ),
-                          ],
-                        )
+                        getAdditionalOptsCol()
                      else
-                        Expanded(
-                            child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                              const SizedBox(
-                                height: 48,
-                              ),
-                              Text(
-                                tr('supportedSourcesBelow'),
-                              ),
-                              const SizedBox(
-                                height: 8,
-                              ),
-                              ...sourceProvider.sources
-                                  .map((e) => GestureDetector(
-                                      onTap: e.host != null
-                                          ? () {
-                                              launchUrlString(
-                                                  'https://${e.host}',
-                                                  mode: LaunchMode
-                                                      .externalApplication);
-                                            }
-                                          : null,
-                                      child: Text(
-                                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
-                                        style: TextStyle(
-                                            decoration: e.host != null
-                                                ? TextDecoration.underline
-                                                : TextDecoration.none,
-                                            fontStyle: FontStyle.italic),
-                                      )))
-                                  .toList()
-                            ])),
+                        getSourcesListWidget(),
                      const SizedBox(
                        height: 8,
                      ),
--- a/lib/pages/app.dart
+++ b/lib/pages/app.dart
@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
@ -31,409 +32,442 @@ class _AppPageState extends State<AppPage> {
    getUpdate(String id) {
      appsProvider.checkUpdate(id).catchError((e) {
        showError(e, context);
+        return null;
      });
    }

+    bool areDownloadsRunning = appsProvider.areDownloadsRunning();
+
    var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
-    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
+    AppInMemory? app = appsProvider.apps[widget.appId]?.deepCopy();
+    var source = app != null
+        ? sourceProvider.getSource(app.app.url,
+            overrideSource: app.app.overrideSource)
+        : null;
+    if (!areDownloadsRunning && prevApp == null && app != null) {
      prevApp = app;
      getUpdate(app.app.id);
    }
    var trackOnly = app?.app.additionalSettings['trackOnly'] == true;

-    var infoColumn = Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        GestureDetector(
-            onTap: () {
-              if (app?.app.url != null) {
-                launchUrlString(app?.app.url ?? '',
-                    mode: LaunchMode.externalApplication);
-              }
-            },
-            child: Text(
-              app?.app.url ?? '',
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                  decoration: TextDecoration.underline,
-                  fontStyle: FontStyle.italic,
-                  fontSize: 12),
-            )),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        Text(
-          '${tr('installedVersionX', args: [
-                app?.app.installedVersion ?? tr('none')
-              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                  tr('app')
-                ])}' : ''}',
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('lastUpdateCheckX', args: [
-            app?.app.lastUpdateCheck == null
-                ? tr('never')
-                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-          ]),
-          textAlign: TextAlign.center,
-          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
-        ),
-        const SizedBox(
-          height: 48,
-        ),
-        CategoryEditorSelector(
-            alignment: WrapAlignment.center,
-            preselected:
-                app?.app.categories != null ? app!.app.categories.toSet() : {},
-            onSelected: (categories) {
-              if (app != null) {
-                app.app.categories = categories;
-                appsProvider.saveApps([app.app]);
-              }
-            }),
-      ],
-    );
+    bool isVersionDetectionStandard =
+        app?.app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection';

-    var fullInfoColumn = Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        const SizedBox(height: 125),
-        app?.installedInfo != null
-            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-                Image.memory(
-                  app!.installedInfo!.icon!,
-                  height: 150,
-                  gaplessPlayback: true,
-                )
-              ])
-            : Container(),
-        const SizedBox(
-          height: 25,
-        ),
-        Text(
-          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.displayLarge,
-        ),
-        Text(
-          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.headlineMedium,
-        ),
-        const SizedBox(
-          height: 8,
-        ),
-        Text(
-          app?.app.id ?? '',
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.labelSmall,
-        ),
-        app?.app.releaseDate == null
-            ? const SizedBox.shrink()
-            : Text(
-                app!.app.releaseDate.toString(),
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.labelSmall,
+    getInfoColumn() => Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            GestureDetector(
+                onTap: () {
+                  if (app?.app.url != null) {
+                    launchUrlString(app?.app.url ?? '',
+                        mode: LaunchMode.externalApplication);
+                  }
+                },
+                onLongPress: () {
+                  Clipboard.setData(ClipboardData(text: app?.app.url ?? ''));
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                    content: Text(tr('copiedToClipboard')),
+                  ));
+                },
+                child: Text(
+                  app?.app.url ?? '',
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(
+                      decoration: TextDecoration.underline,
+                      fontStyle: FontStyle.italic,
+                      fontSize: 12),
+                )),
+            const SizedBox(
+              height: 32,
+            ),
+            Text(
+              tr('latestVersionX',
+                  args: [app?.app.latestVersion ?? tr('unknown')]),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyLarge,
+            ),
+            Text(
+              '${tr('installedVersionX', args: [
+                    app?.app.installedVersion ?? tr('none')
+                  ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
+                      tr('app')
+                    ])}' : ''}',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyLarge,
+            ),
+            if (app?.app.installedVersion != null &&
+                !isVersionDetectionStandard)
+              Column(
+                children: [
+                  const SizedBox(
+                    height: 4,
+                  ),
+                  Text(
+                    tr('noVersionDetection'),
+                    style: Theme.of(context).textTheme.labelSmall,
+                  )
+                ],
              ),
-        const SizedBox(
-          height: 32,
-        ),
-        infoColumn,
-        const SizedBox(height: 150)
-      ],
-    );
+            const SizedBox(
+              height: 32,
+            ),
+            Text(
+              tr('lastUpdateCheckX', args: [
+                app?.app.lastUpdateCheck == null
+                    ? tr('never')
+                    : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+              ]),
+              textAlign: TextAlign.center,
+              style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+            ),
+            const SizedBox(
+              height: 48,
+            ),
+            CategoryEditorSelector(
+                alignment: WrapAlignment.center,
+                preselected: app?.app.categories != null
+                    ? app!.app.categories.toSet()
+                    : {},
+                onSelected: (categories) {
+                  if (app != null) {
+                    app.app.categories = categories;
+                    appsProvider.saveApps([app.app]);
+                  }
+                }),
+          ],
+        );
+
+    getFullInfoColumn() => Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 125),
+            app?.installedInfo != null
+                ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                    Image.memory(
+                      app!.installedInfo!.icon!,
+                      height: 150,
+                      gaplessPlayback: true,
+                    )
+                  ])
+                : Container(),
+            const SizedBox(
+              height: 25,
+            ),
+            Text(
+              app?.name ?? tr('app'),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.displayLarge,
+            ),
+            Text(
+              tr('byX', args: [app?.app.author ?? tr('unknown')]),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.headlineMedium,
+            ),
+            const SizedBox(
+              height: 8,
+            ),
+            Text(
+              app?.app.id ?? '',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.labelSmall,
+            ),
+            app?.app.releaseDate == null
+                ? const SizedBox.shrink()
+                : Text(
+                    app!.app.releaseDate.toString(),
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.labelSmall,
+                  ),
+            const SizedBox(
+              height: 32,
+            ),
+            getInfoColumn(),
+            const SizedBox(height: 150)
+          ],
+        );
+
+    getAppWebView() => app != null
+        ? WebViewWidget(
+            controller: WebViewController()
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setBackgroundColor(Theme.of(context).colorScheme.background)
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setNavigationDelegate(
+                NavigationDelegate(
+                  onWebResourceError: (WebResourceError error) {
+                    if (error.isForMainFrame == true) {
+                      showError(
+                          ObtainiumError(error.description, unexpected: true),
+                          context);
+                    }
+                  },
+                ),
+              )
+              ..loadRequest(Uri.parse(app.app.url)))
+        : Container();
+
+    showMarkUpdatedDialog() {
+      return showDialog(
+          context: context,
+          builder: (BuildContext ctx) {
+            return AlertDialog(
+              title: Text(tr('alreadyUpToDateQuestion')),
+              actions: [
+                TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('no'))),
+                TextButton(
+                    onPressed: () {
+                      HapticFeedback.selectionClick();
+                      var updatedApp = app?.app;
+                      if (updatedApp != null) {
+                        updatedApp.installedVersion = updatedApp.latestVersion;
+                        appsProvider.saveApps([updatedApp]);
+                      }
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('yesMarkUpdated')))
+              ],
+            );
+          });
+    }
+
+    showAdditionalOptionsDialog() async {
+      return await showDialog<Map<String, dynamic>?>(
+          context: context,
+          builder: (BuildContext ctx) {
+            var items =
+                (source?.combinedAppSpecificSettingFormItems ?? []).map((row) {
+              row = row.map((e) {
+                if (app?.app.additionalSettings[e.key] != null) {
+                  e.defaultValue = app?.app.additionalSettings[e.key];
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            items = items.map((row) {
+              row = row.map((e) {
+                if (e.key == 'versionDetection' && e is GeneratedFormDropdown) {
+                  e.disabledOptKeys ??= [];
+                  if (app?.app.installedVersion != null &&
+                      app?.app.additionalSettings['versionDetection'] !=
+                          'releaseDateAsVersion' &&
+                      !appsProvider.isVersionDetectionPossible(app)) {
+                    e.disabledOptKeys!.add('standardVersionDetection');
+                  }
+                  if (app?.app.releaseDate == null) {
+                    e.disabledOptKeys!.add('releaseDateAsVersion');
+                  }
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            return GeneratedFormModal(
+                title: tr('additionalOptions'), items: items);
+          });
+    }
+
+    handleAdditionalOptionChanges(Map<String, dynamic>? values) {
+      if (app != null && values != null) {
+        Map<String, dynamic> originalSettings = app.app.additionalSettings;
+        app.app.additionalSettings = values;
+        if (source?.enforceTrackOnly == true) {
+          app.app.additionalSettings['trackOnly'] = true;
+          // ignore: use_build_context_synchronously
+          showError(tr('appsFromSourceAreTrackOnly'), context);
+        }
+        if (app.app.additionalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          if (originalSettings['versionDetection'] != 'releaseDateAsVersion') {
+            if (app.app.releaseDate != null) {
+              bool isUpdated =
+                  app.app.installedVersion == app.app.latestVersion;
+              app.app.latestVersion =
+                  app.app.releaseDate!.microsecondsSinceEpoch.toString();
+              if (isUpdated) {
+                app.app.installedVersion = app.app.latestVersion;
+              }
+            }
+          }
+        } else if (originalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          app.app.installedVersion =
+              app.installedInfo?.versionName ?? app.app.installedVersion;
+        }
+        appsProvider.saveApps([app.app]).then((value) {
+          getUpdate(app.app.id);
+        });
+      }
+    }
+
+    getResetInstallStatusButton() => TextButton(
+        onPressed: app?.app == null
+            ? null
+            : () {
+                app!.app.installedVersion = null;
+                appsProvider.saveApps([app.app]);
+              },
+        child: Text(
+          tr('resetInstallStatus'),
+          textAlign: TextAlign.center,
+        ));
+
+    getInstallOrUpdateButton() => TextButton(
+        onPressed: (app?.app.installedVersion == null ||
+                    app?.app.installedVersion != app?.app.latestVersion) &&
+                !areDownloadsRunning
+            ? () async {
+                try {
+                  HapticFeedback.heavyImpact();
+                  var res = await appsProvider.downloadAndInstallLatestApps(
+                      [app!.app.id], globalNavigatorKey.currentContext);
+                  if (res.isNotEmpty && mounted) {
+                    Navigator.of(context).pop();
+                  }
+                } catch (e) {
+                  showError(e, context);
+                }
+              }
+            : null,
+        child: Text(app?.app.installedVersion == null
+            ? !trackOnly
+                ? tr('install')
+                : tr('markInstalled')
+            : !trackOnly
+                ? tr('update')
+                : tr('markUpdated')));
+
+    getBottomSheetMenu() => Padding(
+        padding:
+            EdgeInsets.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.bottom),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+                padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
+                child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      if (app?.app.installedVersion != null &&
+                          app?.app.installedVersion != app?.app.latestVersion &&
+                          !isVersionDetectionStandard &&
+                          !trackOnly)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : showMarkUpdatedDialog,
+                            tooltip: tr('markUpdated'),
+                            icon: const Icon(Icons.done)),
+                      if (source != null &&
+                          source.combinedAppSpecificSettingFormItems.isNotEmpty)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : () async {
+                                    var values =
+                                        await showAdditionalOptionsDialog();
+                                    handleAdditionalOptionChanges(values);
+                                  },
+                            tooltip: tr('additionalOptions'),
+                            icon: const Icon(Icons.edit)),
+                      if (app != null && app.installedInfo != null)
+                        IconButton(
+                          onPressed: () {
+                            appsProvider.openAppSettings(app.app.id);
+                          },
+                          icon: const Icon(Icons.settings),
+                          tooltip: tr('settings'),
+                        ),
+                      if (app != null && settingsProvider.showAppWebpage)
+                        IconButton(
+                            onPressed: () {
+                              showDialog(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return AlertDialog(
+                                      scrollable: true,
+                                      content: getInfoColumn(),
+                                      title: Text(
+                                          '${app.name} ${tr('byX', args: [
+                                            app.app.author
+                                          ])}'),
+                                      actions: [
+                                        TextButton(
+                                            onPressed: () {
+                                              Navigator.of(context).pop();
+                                            },
+                                            child: Text(tr('continue')))
+                                      ],
+                                    );
+                                  });
+                            },
+                            icon: const Icon(Icons.more_horiz),
+                            tooltip: tr('more')),
+                      const SizedBox(width: 16.0),
+                      Expanded(
+                          child: (!isVersionDetectionStandard || trackOnly) &&
+                                  app?.app.installedVersion != null &&
+                                  app?.app.installedVersion ==
+                                      app?.app.latestVersion
+                              ? getResetInstallStatusButton()
+                              : getInstallOrUpdateButton()),
+                      const SizedBox(width: 16.0),
+                      Expanded(
+                          child: TextButton(
+                        onPressed: app?.downloadProgress != null
+                            ? null
+                            : () {
+                                appsProvider.removeAppsWithModal(
+                                    context, [app!.app]).then((value) {
+                                  if (value == true) {
+                                    Navigator.of(context).pop();
+                                  }
+                                });
+                              },
+                        style: TextButton.styleFrom(
+                            foregroundColor:
+                                Theme.of(context).colorScheme.error,
+                            surfaceTintColor:
+                                Theme.of(context).colorScheme.error),
+                        child: Text(tr('remove')),
+                      )),
+                    ])),
+            if (app?.downloadProgress != null)
+              Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
+                  child: LinearProgressIndicator(
+                      value: app!.downloadProgress! >= 0
+                          ? app.downloadProgress! / 100
+                          : null))
+          ],
+        ));

    return Scaffold(
-      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      body: RefreshIndicator(
-          child: settingsProvider.showAppWebpage
-              ? app != null
-                  ? WebViewWidget(
-                      controller: WebViewController()
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
-                        ..setBackgroundColor(
-                            Theme.of(context).colorScheme.background)
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
-                        ..setNavigationDelegate(
-                          NavigationDelegate(
-                            onWebResourceError: (WebResourceError error) {
-                              if (error.isForMainFrame == true) {
-                                showError(
-                                    ObtainiumError(error.description,
-                                        unexpected: true),
-                                    context);
-                              }
-                            },
-                          ),
-                        )
-                        ..loadRequest(Uri.parse(app.app.url)))
-                  : Container()
-              : CustomScrollView(
-                  slivers: [
-                    SliverToBoxAdapter(
-                        child: Column(children: [fullInfoColumn])),
-                  ],
-                ),
-          onRefresh: () async {
-            if (app != null) {
-              getUpdate(app.app.id);
-            }
-          }),
-      bottomSheet: Padding(
-          padding: EdgeInsets.fromLTRB(
-              0, 0, 0, MediaQuery.of(context).padding.bottom),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
-                  child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      children: [
-                        if (app?.app.additionalSettings['versionDetection'] !=
-                                'standardVersionDetection' &&
-                            !trackOnly &&
-                            app?.app.installedVersion != null &&
-                            app?.app.installedVersion != app?.app.latestVersion)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            return AlertDialog(
-                                              title: Text(tr(
-                                                  'alreadyUpToDateQuestion')),
-                                              actions: [
-                                                TextButton(
-                                                    onPressed: () {
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(tr('no'))),
-                                                TextButton(
-                                                    onPressed: () {
-                                                      HapticFeedback
-                                                          .selectionClick();
-                                                      var updatedApp = app?.app;
-                                                      if (updatedApp != null) {
-                                                        updatedApp
-                                                                .installedVersion =
-                                                            updatedApp
-                                                                .latestVersion;
-                                                        appsProvider.saveApps(
-                                                            [updatedApp]);
-                                                      }
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(
-                                                        tr('yesMarkUpdated')))
-                                              ],
-                                            );
-                                          });
-                                    },
-                              tooltip: tr('markUpdated'),
-                              icon: const Icon(Icons.done)),
-                        if (source != null &&
-                            source
-                                .combinedAppSpecificSettingFormItems.isNotEmpty)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog<Map<String, dynamic>?>(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            var items = source
-                                                .combinedAppSpecificSettingFormItems
-                                                .map((row) {
-                                              row.map((e) {
-                                                if (app?.app.additionalSettings[
-                                                        e.key] !=
-                                                    null) {
-                                                  e.defaultValue = app?.app
-                                                          .additionalSettings[
-                                                      e.key];
-                                                }
-                                                return e;
-                                              }).toList();
-                                              return row;
-                                            }).toList();
-                                            return GeneratedFormModal(
-                                              title: tr('additionalOptions'),
-                                              items: items,
-                                            );
-                                          }).then((values) {
-                                        if (app != null && values != null) {
-                                          Map<String, dynamic>
-                                              originalSettings =
-                                              app.app.additionalSettings;
-                                          app.app.additionalSettings = values;
-                                          if (source.enforceTrackOnly) {
-                                            app.app.additionalSettings[
-                                                'trackOnly'] = true;
-                                            showError(
-                                                tr('appsFromSourceAreTrackOnly'),
-                                                context);
-                                          }
-                                          if (app.app.additionalSettings[
-                                                  'versionDetection'] ==
-                                              'releaseDateAsVersion') {
-                                            if (originalSettings[
-                                                    'versionDetection'] !=
-                                                'releaseDateAsVersion') {
-                                              if (app.app.releaseDate != null) {
-                                                bool isUpdated =
-                                                    app.app.installedVersion ==
-                                                        app.app.latestVersion;
-                                                app.app.latestVersion = app
-                                                    .app
-                                                    .releaseDate!
-                                                    .microsecondsSinceEpoch
-                                                    .toString();
-                                                if (isUpdated) {
-                                                  app.app.installedVersion =
-                                                      app.app.latestVersion;
-                                                }
-                                              }
-                                            }
-                                          } else if (originalSettings[
-                                                  'versionDetection'] ==
-                                              'releaseDateAsVersion') {
-                                            app.app.installedVersion = app
-                                                    .installedInfo
-                                                    ?.versionName ??
-                                                app.app.installedVersion;
-                                          }
-                                          appsProvider.saveApps([app.app]).then(
-                                              (value) {
-                                            getUpdate(app.app.id);
-                                          });
-                                        }
-                                      });
-                                    },
-                              tooltip: tr('additionalOptions'),
-                              icon: const Icon(Icons.edit)),
-                        if (app != null && app.installedInfo != null)
-                          IconButton(
-                            onPressed: () {
-                              appsProvider.openAppSettings(app.app.id);
-                            },
-                            icon: const Icon(Icons.settings),
-                            tooltip: tr('settings'),
-                          ),
-                        if (app != null && settingsProvider.showAppWebpage)
-                          IconButton(
-                              onPressed: () {
-                                showDialog(
-                                    context: context,
-                                    builder: (BuildContext ctx) {
-                                      return AlertDialog(
-                                        scrollable: true,
-                                        content: infoColumn,
-                                        title: Text(
-                                            '${app.app.name} ${tr('byX', args: [
-                                              app.app.author
-                                            ])}'),
-                                        actions: [
-                                          TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: Text(tr('continue')))
-                                        ],
-                                      );
-                                    });
-                              },
-                              icon: const Icon(Icons.more_horiz),
-                              tooltip: tr('more')),
-                        const SizedBox(width: 16.0),
-                        Expanded(
-                            child: TextButton(
-                                onPressed: (app?.app.installedVersion == null ||
-                                            app?.app.installedVersion !=
-                                                app?.app.latestVersion) &&
-                                        !appsProvider.areDownloadsRunning()
-                                    ? () {
-                                        HapticFeedback.heavyImpact();
-                                        () async {
-                                          if (app?.app.additionalSettings[
-                                                  'trackOnly'] !=
-                                              true) {
-                                            await settingsProvider
-                                                .getInstallPermission();
-                                          }
-                                        }()
-                                            .then((value) {
-                                          appsProvider
-                                              .downloadAndInstallLatestApps(
-                                                  [app!.app.id],
-                                                  globalNavigatorKey
-                                                      .currentContext).then(
-                                                  (res) {
-                                            if (res.isNotEmpty && mounted) {
-                                              Navigator.of(context).pop();
-                                            }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          });
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        });
-                                      }
-                                    : null,
-                                child: Text(app?.app.installedVersion == null
-                                    ? !trackOnly
-                                        ? tr('install')
-                                        : tr('markInstalled')
-                                    : !trackOnly
-                                        ? tr('update')
-                                        : tr('markUpdated')))),
-                        const SizedBox(width: 16.0),
-                        Expanded(
-                            child: TextButton(
-                          onPressed: app?.downloadProgress != null
-                              ? null
-                              : () {
-                                  appsProvider.removeAppsWithModal(
-                                      context, [app!.app]).then((value) {
-                                    if (value == true) {
-                                      Navigator.of(context).pop();
-                                    }
-                                  });
-                                },
-                          style: TextButton.styleFrom(
-                              foregroundColor:
-                                  Theme.of(context).colorScheme.error,
-                              surfaceTintColor:
-                                  Theme.of(context).colorScheme.error),
-                          child: Text(tr('remove')),
-                        )),
-                      ])),
-              if (app?.downloadProgress != null)
-                Padding(
-                    padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
-                    child: LinearProgressIndicator(
-                        value: app!.downloadProgress! / 100))
-            ],
-          )),
-    );
+        appBar: settingsProvider.showAppWebpage ? AppBar() : null,
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: RefreshIndicator(
+            child: settingsProvider.showAppWebpage
+                ? getAppWebView()
+                : CustomScrollView(
+                    slivers: [
+                      SliverToBoxAdapter(
+                          child: Column(children: [getFullInfoColumn()])),
+                    ],
+                  ),
+            onRefresh: () async {
+              if (app != null) {
+                getUpdate(app.app.id);
+              }
+            }),
+        bottomSheet: getBottomSheetMenu());
  }
 }
--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@ -6,6 +6,8 @@ import 'package:obtainium/pages/add_app.dart';
 import 'package:obtainium/pages/apps.dart';
 import 'package:obtainium/pages/import_export.dart';
 import 'package:obtainium/pages/settings.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:provider/provider.dart';

 class HomePage extends StatefulWidget {
  const HomePage({super.key});
@ -24,6 +26,8 @@ class NavigationPageItem {

 class _HomePageState extends State<HomePage> {
  List<int> selectedIndexHistory = [];
+  int prevAppCount = -1;
+  bool prevIsLoading = true;

  List<NavigationPageItem> pages = [
    NavigationPageItem(tr('appsString'), Icons.apps,
@ -36,6 +40,41 @@ class _HomePageState extends State<HomePage> {

  @override
  Widget build(BuildContext context) {
+    AppsProvider appsProvider = context.watch<AppsProvider>();
+
+    switchToPage(int index) async {
+      if (index == 0) {
+        while ((pages[0].widget.key as GlobalKey<AppsPageState>).currentState !=
+            null) {
+          // Avoid duplicate GlobalKey error
+          await Future.delayed(const Duration(microseconds: 1));
+        }
+        setState(() {
+          selectedIndexHistory.clear();
+        });
+      } else if (selectedIndexHistory.isEmpty ||
+          (selectedIndexHistory.isNotEmpty &&
+              selectedIndexHistory.last != index)) {
+        setState(() {
+          int existingInd = selectedIndexHistory.indexOf(index);
+          if (existingInd >= 0) {
+            selectedIndexHistory.removeAt(existingInd);
+          }
+          selectedIndexHistory.add(index);
+        });
+      }
+    }
+
+    if (!prevIsLoading &&
+        prevAppCount >= 0 &&
+        appsProvider.apps.length > prevAppCount &&
+        selectedIndexHistory.isNotEmpty &&
+        selectedIndexHistory.last == 1) {
+      switchToPage(0);
+    }
+    prevAppCount = appsProvider.apps.length;
+    prevIsLoading = appsProvider.loadingApps;
+
    return WillPopScope(
        child: Scaffold(
          backgroundColor: Theme.of(context).colorScheme.surface,
@ -65,27 +104,7 @@ class _HomePageState extends State<HomePage> {
                .toList(),
            onDestinationSelected: (int index) async {
              HapticFeedback.selectionClick();
-              if (index == 0) {
-                while ((pages[0].widget.key as GlobalKey<AppsPageState>)
-                        .currentState !=
-                    null) {
-                  // Avoid duplicate GlobalKey error
-                  await Future.delayed(const Duration(microseconds: 1));
-                }
-                setState(() {
-                  selectedIndexHistory.clear();
-                });
-              } else if (selectedIndexHistory.isEmpty ||
-                  (selectedIndexHistory.isNotEmpty &&
-                      selectedIndexHistory.last != index)) {
-                setState(() {
-                  int existingInd = selectedIndexHistory.indexOf(index);
-                  if (existingInd >= 0) {
-                    selectedIndexHistory.removeAt(existingInd);
-                  }
-                  selectedIndexHistory.add(index);
-                });
-              }
+              await switchToPage(index);
            },
            selectedIndex:
                selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,
--- a/lib/pages/import_export.dart
+++ b/lib/pages/import_export.dart
@ -30,6 +30,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
    SourceProvider sourceProvider = SourceProvider();
    var appsProvider = context.read<AppsProvider>();
    var settingsProvider = context.read<SettingsProvider>();
+
    var outlineButtonStyle = ButtonStyle(
      shape: MaterialStateProperty.all(
        StadiumBorder(
@ -101,6 +102,193 @@ class _ImportExportPageState extends State<ImportExportPage> {
      });
    }

+    runObtainiumExport() {
+      HapticFeedback.selectionClick();
+      appsProvider.exportApps().then((String path) {
+        showError(tr('exportedTo', args: [path]), context);
+      }).catchError((e) {
+        showError(e, context);
+      });
+    }
+
+    runObtainiumImport() {
+      HapticFeedback.selectionClick();
+      FilePicker.platform.pickFiles().then((result) {
+        setState(() {
+          importInProgress = true;
+        });
+        if (result != null) {
+          String data = File(result.files.single.path!).readAsStringSync();
+          try {
+            jsonDecode(data);
+          } catch (e) {
+            throw ObtainiumError(tr('invalidInput'));
+          }
+          appsProvider.importApps(data).then((value) {
+            var cats = settingsProvider.categories;
+            appsProvider.apps.forEach((key, value) {
+              for (var c in value.app.categories) {
+                if (!cats.containsKey(c)) {
+                  cats[c] = generateRandomLightColor().value;
+                }
+              }
+            });
+            appsProvider.addMissingCategories(settingsProvider);
+            showError(tr('importedX', args: [plural('apps', value)]), context);
+          });
+        } else {
+          // User canceled the picker
+        }
+      }).catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runUrlImport() {
+      FilePicker.platform.pickFiles().then((result) {
+        if (result != null) {
+          urlListImport(
+              overrideInitValid: true,
+              initValue: RegExp('https?://[^"]+')
+                  .allMatches(
+                      File(result.files.single.path!).readAsStringSync())
+                  .map((e) => e.input.substring(e.start, e.end))
+                  .toSet()
+                  .toList()
+                  .where((url) {
+                try {
+                  sourceProvider.getSource(url);
+                  return true;
+                } catch (e) {
+                  return false;
+                }
+              }).join('\n'));
+        }
+      });
+    }
+
+    runSourceSearch(AppSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('searchX', args: [source.name]),
+                items: [
+                  [
+                    GeneratedFormTextField('searchQuery',
+                        label: tr('searchQuery'))
+                  ]
+                ],
+              );
+            });
+        if (values != null &&
+            (values['searchQuery'] as String?)?.isNotEmpty == true) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions =
+              await source.search(values['searchQuery'] as String);
+          if (urlsWithDescriptions.isNotEmpty) {
+            var selectedUrls =
+                // ignore: use_build_context_synchronously
+                await showDialog<List<String>?>(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions,
+                        selectedByDefault: false,
+                      );
+                    });
+            if (selectedUrls != null && selectedUrls.isNotEmpty) {
+              var errors = await appsProvider.addAppsByURL(selectedUrls);
+              if (errors.isEmpty) {
+                // ignore: use_build_context_synchronously
+                showError(
+                    tr('importedX', args: [plural('app', selectedUrls.length)]),
+                    context);
+              } else {
+                // ignore: use_build_context_synchronously
+                showDialog(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return ImportErrorDialog(
+                          urlsLength: selectedUrls.length, errors: errors);
+                    });
+              }
+            }
+          } else {
+            throw ObtainiumError(tr('noResults'));
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runMassSourceImport(MassAppUrlSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('importX', args: [source.name]),
+                items: source.requiredArgs
+                    .map((e) => [GeneratedFormTextField(e, label: e)])
+                    .toList(),
+              );
+            });
+        if (values != null) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions = await source.getUrlsWithDescriptions(
+              values.values.map((e) => e.toString()).toList());
+          var selectedUrls =
+              // ignore: use_build_context_synchronously
+              await showDialog<List<String>?>(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions);
+                  });
+          if (selectedUrls != null) {
+            var errors = await appsProvider.addAppsByURL(selectedUrls);
+            if (errors.isEmpty) {
+              // ignore: use_build_context_synchronously
+              showError(
+                  tr('importedX', args: [plural('app', selectedUrls.length)]),
+                  context);
+            } else {
+              // ignore: use_build_context_synchronously
+              showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return ImportErrorDialog(
+                        urlsLength: selectedUrls.length, errors: errors);
+                  });
+            }
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
    return Scaffold(
        backgroundColor: Theme.of(context).colorScheme.surface,
        body: CustomScrollView(slivers: <Widget>[
@ -120,18 +308,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                  onPressed: appsProvider.apps.isEmpty ||
                                          importInProgress
                                      ? null
-                                      : () {
-                                          HapticFeedback.selectionClick();
-                                          appsProvider
-                                              .exportApps()
-                                              .then((String path) {
-                                            showError(
-                                                tr('exportedTo', args: [path]),
-                                                context);
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          });
-                                        },
+                                      : runObtainiumExport,
                                  child: Text(tr('obtainiumExport')))),
                          const SizedBox(
                            width: 16,
@ -141,65 +318,13 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                  style: outlineButtonStyle,
                                  onPressed: importInProgress
                                      ? null
-                                      : () {
-                                          HapticFeedback.selectionClick();
-                                          FilePicker.platform
-                                              .pickFiles()
-                                              .then((result) {
-                                            setState(() {
-                                              importInProgress = true;
-                                            });
-                                            if (result != null) {
-                                              String data = File(
-                                                      result.files.single.path!)
-                                                  .readAsStringSync();
-                                              try {
-                                                jsonDecode(data);
-                                              } catch (e) {
-                                                throw ObtainiumError(
-                                                    tr('invalidInput'));
-                                              }
-                                              appsProvider
-                                                  .importApps(data)
-                                                  .then((value) {
-                                                var cats =
-                                                    settingsProvider.categories;
-                                                appsProvider.apps
-                                                    .forEach((key, value) {
-                                                  for (var c
-                                                      in value.app.categories) {
-                                                    if (!cats.containsKey(c)) {
-                                                      cats[c] =
-                                                          generateRandomLightColor()
-                                                              .value;
-                                                    }
-                                                  }
-                                                });
-                                                settingsProvider.categories =
-                                                    cats;
-                                                showError(
-                                                    tr('importedX', args: [
-                                                      plural('apps', value)
-                                                    ]),
-                                                    context);
-                                              });
-                                            } else {
-                                              // User canceled the picker
-                                            }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          }).whenComplete(() {
-                                            setState(() {
-                                              importInProgress = false;
-                                            });
-                                          });
-                                        },
+                                      : runObtainiumImport,
                                  child: Text(tr('obtainiumImport'))))
                        ],
                      ),
                      if (importInProgress)
-                        Column(
-                          children: const [
+                        const Column(
+                          children: [
                            SizedBox(
                              height: 14,
                            ),
@ -216,49 +341,15 @@ class _ImportExportPageState extends State<ImportExportPage> {
                              height: 32,
                            ),
                            TextButton(
-                                onPressed: importInProgress
-                                    ? null
-                                    : () {
-                                        urlListImport();
-                                      },
+                                onPressed:
+                                    importInProgress ? null : urlListImport,
                                child: Text(
                                  tr('importFromURLList'),
                                )),
                            const SizedBox(height: 8),
                            TextButton(
-                                onPressed: importInProgress
-                                    ? null
-                                    : () {
-                                        FilePicker.platform
-                                            .pickFiles()
-                                            .then((result) {
-                                          if (result != null) {
-                                            urlListImport(
-                                                overrideInitValid: true,
-                                                initValue:
-                                                    RegExp('https?://[^"]+')
-                                                        .allMatches(File(result
-                                                                .files
-                                                                .single
-                                                                .path!)
-                                                            .readAsStringSync())
-                                                        .map((e) =>
-                                                            e.input.substring(
-                                                                e.start, e.end))
-                                                        .toSet()
-                                                        .toList()
-                                                        .where((url) {
-                                                  try {
-                                                    sourceProvider
-                                                        .getSource(url);
-                                                    return true;
-                                                  } catch (e) {
-                                                    return false;
-                                                  }
-                                                }).join('\n'));
-                                          }
-                                        });
-                                      },
+                                onPressed:
+                                    importInProgress ? null : runUrlImport,
                                child: Text(
                                  tr('importFromURLsInFile'),
                                )),
@ -275,106 +366,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                        onPressed: importInProgress
                                            ? null
                                            : () {
-                                                () async {
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('searchX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items: [
-                                                            [
-                                                              GeneratedFormTextField(
-                                                                  'searchQuery',
-                                                                  label: tr(
-                                                                      'searchQuery'))
-                                                            ]
-                                                          ],
-                                                        );
-                                                      });
-                                                  if (values != null &&
-                                                      (values['searchQuery']
-                                                                  as String?)
-                                                              ?.isNotEmpty ==
-                                                          true) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source.search(
-                                                            values['searchQuery']
-                                                                as String);
-                                                    if (urlsWithDescriptions
-                                                        .isNotEmpty) {
-                                                      var selectedUrls =
-                                                          // ignore: use_build_context_synchronously
-                                                          await showDialog<
-                                                                  List<
-                                                                      String>?>(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions,
-                                                                  selectedByDefault:
-                                                                      false,
-                                                                );
-                                                              });
-                                                      if (selectedUrls !=
-                                                              null &&
-                                                          selectedUrls
-                                                              .isNotEmpty) {
-                                                        var errors =
-                                                            await appsProvider
-                                                                .addAppsByURL(
-                                                                    selectedUrls);
-                                                        if (errors.isEmpty) {
-                                                          // ignore: use_build_context_synchronously
-                                                          showError(
-                                                              tr('importedX',
-                                                                  args: [
-                                                                    plural(
-                                                                        'app',
-                                                                        selectedUrls
-                                                                            .length)
-                                                                  ]),
-                                                              context);
-                                                        } else {
-                                                          // ignore: use_build_context_synchronously
-                                                          showDialog(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return ImportErrorDialog(
-                                                                    urlsLength:
-                                                                        selectedUrls
-                                                                            .length,
-                                                                    errors:
-                                                                        errors);
-                                                              });
-                                                        }
-                                                      }
-                                                    } else {
-                                                      throw ObtainiumError(
-                                                          tr('noResults'));
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
+                                                runSourceSearch(source);
                                              },
                                        child: Text(
                                            tr('searchX', args: [source.name])))
@ -390,93 +382,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                        onPressed: importInProgress
                                            ? null
                                            : () {
-                                                () async {
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('importX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items:
-                                                              source
-                                                                  .requiredArgs
-                                                                  .map(
-                                                                      (e) => [
-                                                                            GeneratedFormTextField(e,
-                                                                                label: e)
-                                                                          ])
-                                                                  .toList(),
-                                                        );
-                                                      });
-                                                  if (values != null) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source
-                                                            .getUrlsWithDescriptions(
-                                                                values.values
-                                                                    .map((e) =>
-                                                                        e.toString())
-                                                                    .toList());
-                                                    var selectedUrls =
-                                                        // ignore: use_build_context_synchronously
-                                                        await showDialog<
-                                                                List<String>?>(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions);
-                                                            });
-                                                    if (selectedUrls != null) {
-                                                      var errors =
-                                                          await appsProvider
-                                                              .addAppsByURL(
-                                                                  selectedUrls);
-                                                      if (errors.isEmpty) {
-                                                        // ignore: use_build_context_synchronously
-                                                        showError(
-                                                            tr('importedX',
-                                                                args: [
-                                                                  plural(
-                                                                      'app',
-                                                                      selectedUrls
-                                                                          .length)
-                                                                ]),
-                                                            context);
-                                                      } else {
-                                                        // ignore: use_build_context_synchronously
-                                                        showDialog(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return ImportErrorDialog(
-                                                                  urlsLength:
-                                                                      selectedUrls
-                                                                          .length,
-                                                                  errors:
-                                                                      errors);
-                                                            });
-                                                      }
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
+                                                runMassSourceImport(source);
                                              },
                                        child: Text(
                                            tr('importX', args: [source.name])))
@ -564,7 +470,7 @@ class UrlSelectionModal extends StatefulWidget {
      this.selectedByDefault = true,
      this.onlyOneSelectionAllowed = false});

-  Map<String, String> urlsWithDescriptions;
+  Map<String, List<String>> urlsWithDescriptions;
  bool selectedByDefault;
  bool onlyOneSelectionAllowed;

@ -573,7 +479,7 @@ class UrlSelectionModal extends StatefulWidget {
 }

 class _UrlSelectionModalState extends State<UrlSelectionModal> {
-  Map<MapEntry<String, String>, bool> urlWithDescriptionSelections = {};
+  Map<MapEntry<String, List<String>>, bool> urlWithDescriptionSelections = {};
  @override
  void initState() {
    super.initState();
@ -600,7 +506,7 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
          widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
      content: Column(children: [
        ...urlWithDescriptionSelections.keys.map((urlWithD) {
-          select(bool? value) {
+          selectThis(bool? value) {
            setState(() {
              value ??= false;
              if (value! && widget.onlyOneSelectionAllowed) {
@ -611,11 +517,68 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
            });
          }

-          return Row(children: [
+          var urlLink = GestureDetector(
+              onTap: () {
+                launchUrlString(urlWithD.key,
+                    mode: LaunchMode.externalApplication);
+              },
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    urlWithD.value[0],
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline,
+                        fontWeight: FontWeight.bold),
+                    textAlign: TextAlign.start,
+                  ),
+                  Text(
+                    Uri.parse(urlWithD.key).host,
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline, fontSize: 12),
+                  )
+                ],
+              ));
+
+          var descriptionText = Text(
+            urlWithD.value[1].length > 128
+                ? '${urlWithD.value[1].substring(0, 128)}...'
+                : urlWithD.value[1],
+            style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+          );
+
+          var selectedUrlsWithDs = urlWithDescriptionSelections.entries
+              .where((e) => e.value)
+              .toList();
+
+          var singleSelectTile = ListTile(
+            title: urlLink,
+            subtitle: GestureDetector(
+              onTap: () {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+              child: descriptionText,
+            ),
+            leading: Radio<String>(
+              value: urlWithD.key,
+              groupValue: selectedUrlsWithDs.isEmpty
+                  ? null
+                  : selectedUrlsWithDs.first.key.key,
+              onChanged: (value) {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+            ),
+          );
+
+          var multiSelectTile = Row(children: [
            Checkbox(
                value: urlWithDescriptionSelections[urlWithD],
                onChanged: (value) {
-                  select(value);
+                  selectThis(value);
                }),
            const SizedBox(
              width: 8,
@ -628,28 +591,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                const SizedBox(
                  height: 8,
                ),
-                GestureDetector(
-                    onTap: () {
-                      launchUrlString(urlWithD.key,
-                          mode: LaunchMode.externalApplication);
-                    },
-                    child: Text(
-                      Uri.parse(urlWithD.key).path.substring(1),
-                      style:
-                          const TextStyle(decoration: TextDecoration.underline),
-                      textAlign: TextAlign.start,
-                    )),
+                urlLink,
                GestureDetector(
                  onTap: () {
-                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
+                    selectThis(
+                        !(urlWithDescriptionSelections[urlWithD] ?? false));
                  },
-                  child: Text(
-                    urlWithD.value.length > 128
-                        ? '${urlWithD.value.substring(0, 128)}...'
-                        : urlWithD.value,
-                    style: const TextStyle(
-                        fontStyle: FontStyle.italic, fontSize: 12),
-                  ),
+                  child: descriptionText,
                ),
                const SizedBox(
                  height: 8,
@ -657,6 +605,10 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
              ],
            ))
          ]);
+
+          return widget.onlyOneSelectionAllowed
+              ? singleSelectTile
+              : multiSelectTile;
        })
      ]),
      actions: [
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@ -6,6 +6,7 @@ import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -143,8 +144,8 @@ class _SettingsPageState extends State<SettingsPage> {
            child: Text(tr('followSystem')),
          ),
          ...supportedLocales.map((e) => DropdownMenuItem(
-                value: e.toLanguageTag(),
-                child: Text(e.toLanguageTag().toUpperCase()),
+                value: e.key.toLanguageTag(),
+                child: Text(e.value),
              ))
        ],
        onChanged: (value) {
@ -204,6 +205,10 @@ class _SettingsPageState extends State<SettingsPage> {
      height: 16,
    );

+    const height32 = SizedBox(
+      height: 32,
+    );
+
    return Scaffold(
        backgroundColor: Theme.of(context).colorScheme.surface,
        body: CustomScrollView(slivers: <Widget>[
@ -216,13 +221,53 @@ class _SettingsPageState extends State<SettingsPage> {
                      : Column(
                          crossAxisAlignment: CrossAxisAlignment.start,
                          children: [
+                            Text(
+                              tr('updates'),
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            intervalDropdown,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('checkOnStart'))),
+                                Switch(
+                                    value: settingsProvider.checkOnStart,
+                                    onChanged: (value) {
+                                      settingsProvider.checkOnStart = value;
+                                    })
+                              ],
+                            ),
+                            height32,
+                            Text(
+                              tr('sourceSpecific'),
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            ...sourceSpecificFields,
+                            height32,
                            Text(
                              tr('appearance'),
                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
                                  color: Theme.of(context).colorScheme.primary),
                            ),
                            themeDropdown,
                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('useBlackTheme'))),
+                                Switch(
+                                    value: settingsProvider.useBlackTheme,
+                                    onChanged: (value) {
+                                      settingsProvider.useBlackTheme = value;
+                                    })
+                              ],
+                            ),
                            colourDropdown,
                            height16,
                            Row(
@ -242,7 +287,7 @@ class _SettingsPageState extends State<SettingsPage> {
                            Row(
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                              children: [
-                                Text(tr('showWebInAppView')),
+                                Flexible(child: Text(tr('showWebInAppView'))),
                                Switch(
                                    value: settingsProvider.showAppWebpage,
                                    onChanged: (value) {
@ -254,7 +299,7 @@ class _SettingsPageState extends State<SettingsPage> {
                            Row(
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                              children: [
-                                Text(tr('pinUpdates')),
+                                Flexible(child: Text(tr('pinUpdates'))),
                                Switch(
                                    value: settingsProvider.pinUpdates,
                                    onChanged: (value) {
@ -262,31 +307,69 @@ class _SettingsPageState extends State<SettingsPage> {
                                    })
                              ],
                            ),
-                            const Divider(
-                              height: 16,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(
+                                        tr('moveNonInstalledAppsToBottom'))),
+                                Switch(
+                                    value: settingsProvider.buryNonInstalled,
+                                    onChanged: (value) {
+                                      settingsProvider.buryNonInstalled = value;
+                                    })
+                              ],
                            ),
                            height16,
-                            Text(
-                              tr('updates'),
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.primary),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('groupByCategory'))),
+                                Switch(
+                                    value: settingsProvider.groupByCategory,
+                                    onChanged: (value) {
+                                      settingsProvider.groupByCategory = value;
+                                    })
+                              ],
                            ),
-                            intervalDropdown,
-                            const Divider(
-                              height: 48,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('dontShowTrackOnlyWarnings'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideTrackOnlyWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideTrackOnlyWarning =
+                                          value;
+                                    })
+                              ],
                            ),
-                            Text(
-                              tr('sourceSpecific'),
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.primary),
-                            ),
-                            ...sourceSpecificFields,
-                            const Divider(
-                              height: 48,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('dontShowAPKOriginWarnings'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideAPKOriginWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideAPKOriginWarning =
+                                          value;
+                                    })
+                              ],
                            ),
+                            height32,
                            Text(
                              tr('categories'),
                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
                                  color: Theme.of(context).colorScheme.primary),
                            ),
                            height16,
@ -432,6 +515,7 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
  @override
  Widget build(BuildContext context) {
    var settingsProvider = context.watch<SettingsProvider>();
+    var appsProvider = context.watch<AppsProvider>();
    storedValues = settingsProvider.categories.map((key, value) => MapEntry(
        key,
        MapEntry(value,
@ -455,8 +539,9 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
          if (!isBuilding) {
            storedValues =
                values['categories'] as Map<String, MapEntry<int, bool>>;
-            settingsProvider.categories =
-                storedValues.map((key, value) => MapEntry(key, value.key));
+            settingsProvider.setCategories(
+                storedValues.map((key, value) => MapEntry(key, value.key)),
+                appsProvider: appsProvider);
            if (widget.onSelected != null) {
              widget.onSelected!(storedValues.keys
                  .where((k) => storedValues[k]!.value)
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@ -6,11 +6,11 @@ import 'dart:convert';
 import 'dart:io';

 import 'package:android_intent_plus/flag.dart';
+import 'package:android_package_installer/android_package_installer.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:install_plugin_v2/install_plugin_v2.dart';
 import 'package:installed_apps/app_info.dart';
 import 'package:installed_apps/installed_apps.dart';
 import 'package:obtainium/components/generated_form.dart';
@ -27,6 +27,7 @@ import 'package:flutter_fgbg/flutter_fgbg.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
 import 'package:android_intent_plus/android_intent.dart';
+import 'package:archive/archive.dart';

 class AppInMemory {
  late App app;
@ -34,6 +35,10 @@ class AppInMemory {
  AppInfo? installedInfo;

  AppInMemory(this.app, this.downloadProgress, this.installedInfo);
+  AppInMemory deepCopy() =>
+      AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
+
+  String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
 }

 class DownloadedApk {
@ -42,6 +47,13 @@ class DownloadedApk {
  DownloadedApk(this.appId, this.file);
 }

+class DownloadedXApkDir {
+  String appId;
+  File file;
+  Directory extracted;
+  DownloadedXApkDir(this.appId, this.file, this.extracted);
+}
+
 List<String> generateStandardVersionRegExStrings() {
  // TODO: Look into RegEx for non-Latin characters / non-Arabic numerals
  var basics = [
@ -73,6 +85,18 @@ List<String> generateStandardVersionRegExStrings() {
 List<String> standardVersionRegExStrings =
    generateStandardVersionRegExStrings();

+Set<String> findStandardFormatsForVersion(String version, bool strict) {
+  // If !strict, even a substring match is valid
+  Set<String> results = {};
+  for (var pattern in standardVersionRegExStrings) {
+    if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
+        .hasMatch(version)) {
+      results.add(pattern);
+    }
+  }
+  return results;
+}
+
 class AppsProvider with ChangeNotifier {
  // In memory App state (should always be kept in sync with local storage versions)
  Map<String, AppInMemory> apps = {};
@ -84,39 +108,65 @@ class AppsProvider with ChangeNotifier {
  bool isForeground = true;
  late Stream<FGBGType>? foregroundStream;
  late StreamSubscription<FGBGType>? foregroundSubscription;
+  late Directory APKDir;
+
+  Iterable<AppInMemory> getAppValues() => apps.values.map((a) => a.deepCopy());

  AppsProvider() {
    // Subscribe to changes in the app foreground status
    foregroundStream = FGBGEvents.stream.asBroadcastStream();
    foregroundSubscription = foregroundStream?.listen((event) async {
      isForeground = event == FGBGType.foreground;
-      if (isForeground) await loadApps();
+      if (isForeground) await refreshInstallStatuses();
    });
    () async {
+      var cacheDirs = await getExternalCacheDirectories();
+      if (cacheDirs?.isNotEmpty ?? false) {
+        APKDir = cacheDirs!.first;
+      } else {
+        APKDir =
+            Directory('${(await getExternalStorageDirectory())!.path}/apks');
+        if (!APKDir.existsSync()) {
+          APKDir.createSync();
+        }
+      }
      // Load Apps into memory (in background, this is done later instead of in the constructor)
      await loadApps();
-      // Delete existing APKs
-      (await getExternalStorageDirectory())
-          ?.listSync()
+      // Delete any partial APKs
+      var cutoff = DateTime.now().subtract(const Duration(days: 7));
+      APKDir.listSync()
          .where((element) =>
-              element.path.endsWith('.apk') ||
-              element.path.endsWith('.apk.part'))
-          .forEach((apk) {
-        apk.delete();
+              element.path.endsWith('.part') ||
+              element.statSync().modified.isBefore(cutoff))
+          .forEach((partialApk) {
+        partialApk.delete(recursive: true);
      });
    }();
  }

-  downloadFile(String url, String fileName, Function? onProgress,
-      {bool useExisting = true}) async {
-    var destDir = (await getExternalStorageDirectory())!.path;
-    StreamedResponse response =
-        await Client().send(Request('GET', Uri.parse(url)));
-    File downloadedFile = File('$destDir/$fileName');
+  Future<File> downloadFile(
+      String url, String fileNameNoExt, Function? onProgress,
+      {bool useExisting = true, Map<String, String>? headers}) async {
+    var destDir = APKDir.path;
+    var req = Request('GET', Uri.parse(url));
+    if (headers != null) {
+      req.headers.addAll(headers);
+    }
+    var client = Client();
+    StreamedResponse response = await client.send(req);
+    String ext =
+        response.headers['content-disposition']?.split('.').last ?? 'apk';
+    if (ext.endsWith('"') || ext.endsWith("other")) {
+      ext = ext.substring(0, ext.length - 1);
+    }
+    if (url.toLowerCase().endsWith('.apk') && ext != 'apk') {
+      ext = 'apk';
+    }
+    File downloadedFile = File('$destDir/$fileNameNoExt.$ext');
    if (!(downloadedFile.existsSync() && useExisting)) {
      File tempDownloadedFile = File('${downloadedFile.path}.part');
      if (tempDownloadedFile.existsSync()) {
-        tempDownloadedFile.deleteSync();
+        tempDownloadedFile.deleteSync(recursive: true);
      }
      var length = response.contentLength;
      var received = 0;
@ -136,70 +186,106 @@ class AppsProvider with ChangeNotifier {
        onProgress(progress);
      }
      if (response.statusCode != 200) {
-        tempDownloadedFile.deleteSync();
+        tempDownloadedFile.deleteSync(recursive: true);
        throw response.reasonPhrase ?? tr('unexpectedError');
      }
      tempDownloadedFile.renameSync(downloadedFile.path);
+    } else {
+      client.close();
    }
    return downloadedFile;
  }

-  Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
+  Future<File> handleAPKIDChange(App app, PackageArchiveInfo newInfo,
+      File downloadedFile, String downloadUrl) async {
+    // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
+    // The former case should be handled (give the App its real ID), the latter is a security issue
+    if (app.id != newInfo.packageName) {
+      var isTempId = SourceProvider().isTempId(app);
+      if (apps[app.id] != null && !isTempId) {
+        throw IDChangedError();
+      }
+      var originalAppId = app.id;
+      app.id = newInfo.packageName;
+      downloadedFile = downloadedFile.renameSync(
+          '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
+      if (apps[originalAppId] != null) {
+        await removeApps([originalAppId]);
+        await saveApps([app], onlyIfExists: !isTempId);
+      }
+    }
+    return downloadedFile;
+  }
+
+  Future<Object> downloadApp(App app, BuildContext? context) async {
    NotificationsProvider? notificationsProvider =
        context?.read<NotificationsProvider>();
-    var notifId = DownloadNotification(app.name, 0).id;
+    var notifId = DownloadNotification(app.finalName, 0).id;
    if (apps[app.id] != null) {
      apps[app.id]!.downloadProgress = 0;
      notifyListeners();
    }
    try {
-      var fileName =
-          '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
-      String downloadUrl = await SourceProvider()
-          .getSource(app.url)
-          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
-      var notif = DownloadNotification(app.name, 100);
+      AppSource source = SourceProvider()
+          .getSource(app.url, overrideSource: app.overrideSource);
+      String downloadUrl = await source.apkUrlPrefetchModifier(
+          app.apkUrls[app.preferredApkIndex].value, app.url);
+      var notif = DownloadNotification(app.finalName, 100);
      notificationsProvider?.cancel(notif.id);
      int? prevProg;
-      File downloadedFile =
-          await downloadFile(downloadUrl, fileName, (double? progress) {
+      var fileNameNoExt = '${app.id}-${downloadUrl.hashCode}';
+      var downloadedFile = await downloadFile(downloadUrl, fileNameNoExt,
+          headers: source.requestHeaders, (double? progress) {
        int? prog = progress?.ceil();
        if (apps[app.id] != null) {
          apps[app.id]!.downloadProgress = progress;
          notifyListeners();
        }
-        notif = DownloadNotification(app.name, prog ?? 100);
+        notif = DownloadNotification(app.finalName, prog ?? 100);
        if (prog != null && prevProg != prog) {
          notificationsProvider?.notify(notif);
        }
        prevProg = prog;
      });
-      // Delete older versions of the APK if any
+      // Set to 90 for remaining steps, will make null in 'finally'
+      if (apps[app.id] != null) {
+        apps[app.id]!.downloadProgress = -1;
+        notifyListeners();
+        notif = DownloadNotification(app.finalName, -1);
+        notificationsProvider?.notify(notif);
+      }
+      PackageArchiveInfo? newInfo;
+      var isAPK = downloadedFile.path.toLowerCase().endsWith('.apk');
+      Directory? xapkDir;
+      if (isAPK) {
+        newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
+      } else {
+        // Assume XAPK
+        String xapkDirPath = '${downloadedFile.path}-dir';
+        unzipFile(downloadedFile.path, '${downloadedFile.path}-dir');
+        xapkDir = Directory(xapkDirPath);
+        var apks = xapkDir
+            .listSync()
+            .where((e) => e.path.toLowerCase().endsWith('.apk'))
+            .toList();
+        newInfo = await PackageArchiveInfo.fromPath(apks.first.path);
+      }
+      downloadedFile =
+          await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
+      // Delete older versions of the file if any
      for (var file in downloadedFile.parent.listSync()) {
        var fn = file.path.split('/').last;
        if (fn.startsWith('${app.id}-') &&
-            fn.endsWith('.apk') &&
-            fn != fileName) {
-          file.delete();
+            FileSystemEntity.isFileSync(file.path) &&
+            file.path != downloadedFile.path) {
+          file.delete(recursive: true);
        }
      }
-      // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
-      // The former case should be handled (give the App its real ID), the latter is a security issue
-      var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
-      if (app.id != newInfo.packageName) {
-        if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
-          throw IDChangedError();
-        }
-        var originalAppId = app.id;
-        app.id = newInfo.packageName;
-        downloadedFile = downloadedFile.renameSync(
-            '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
-        if (apps[originalAppId] != null) {
-          await removeApps([originalAppId]);
-          await saveApps([app]);
-        }
+      if (isAPK) {
+        return DownloadedApk(app.id, downloadedFile);
+      } else {
+        return DownloadedXApkDir(app.id, downloadedFile, xapkDir!);
      }
-      return DownloadedApk(app.id, downloadedFile);
    } finally {
      notificationsProvider?.cancel(notifId);
      if (apps[app.id] != null) {
@ -246,11 +332,44 @@ class AppsProvider with ChangeNotifier {
    }
  }

-  // Unfortunately this 'await' does not actually wait for the APK to finish installing
-  // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
-  // If appropriate criteria are met, the update (never a fresh install) happens silently  in the background
-  // But even then, we don't know if it actually succeeded
-  Future<void> installApk(DownloadedApk file) async {
+  void unzipFile(String filePath, String destinationPath) {
+    final bytes = File(filePath).readAsBytesSync();
+    final archive = ZipDecoder().decodeBytes(bytes);
+
+    for (final file in archive) {
+      final filename = '$destinationPath/${file.name}';
+      if (file.isFile) {
+        final data = file.content as List<int>;
+        File(filename)
+          ..createSync(recursive: true)
+          ..writeAsBytesSync(data);
+      } else {
+        Directory(filename).create(recursive: true);
+      }
+    }
+  }
+
+  Future<void> installXApkDir(DownloadedXApkDir dir,
+      {bool silent = false}) async {
+    try {
+      var somethingInstalled = false;
+      for (var apk in dir.extracted
+          .listSync()
+          .where((f) => f is File && f.path.toLowerCase().endsWith('.apk'))) {
+        somethingInstalled = somethingInstalled ||
+            await installApk(DownloadedApk(dir.appId, apk as File),
+                silent: silent);
+      }
+      if (somethingInstalled) {
+        dir.file.delete(recursive: true);
+      }
+    } finally {
+      dir.extracted.delete(recursive: true);
+    }
+  }
+
+  Future<bool> installApk(DownloadedApk file, {bool silent = false}) async {
+    // TODO: Use 'silent' when/if ever possible
    var newInfo = await PackageArchiveInfo.fromPath(file.file.path);
    AppInfo? appInfo;
    try {
@ -263,16 +382,19 @@ class AppsProvider with ChangeNotifier {
        !(await canDowngradeApps())) {
      throw DowngradeError();
    }
-    await InstallPlugin.installApk(file.file.path, obtainiumId);
-    if (file.appId == obtainiumId) {
-      // Obtainium prompt should be lowest
-      await Future.delayed(const Duration(milliseconds: 500));
+    int? code =
+        await AndroidPackageInstaller.installApk(apkFilePath: file.file.path);
+    bool installed = false;
+    if (code != null && code != 0 && code != 3) {
+      throw InstallError(code);
+    } else if (code == 0) {
+      installed = true;
+      apps[file.appId]!.app.installedVersion =
+          apps[file.appId]!.app.latestVersion;
+      file.file.delete(recursive: true);
    }
-    apps[file.appId]!.app.installedVersion =
-        apps[file.appId]!.app.latestVersion;
-    // Don't correct install status as installation may not be done yet
-    await saveApps([apps[file.appId]!.app],
-        attemptToCorrectInstallStatus: false);
+    await saveApps([apps[file.appId]!.app]);
+    return installed;
  }

  void uninstallApp(String appId) async {
@ -284,9 +406,11 @@ class AppsProvider with ChangeNotifier {
    await intent.launch();
  }

-  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
+  Future<MapEntry<String, String>?> confirmApkUrl(
+      App app, BuildContext? context) async {
    // If the App has more than one APK, the user should pick one (if context provided)
-    String? apkUrl = app.apkUrls[app.preferredApkIndex];
+    MapEntry<String, String>? apkUrl =
+        app.apkUrls[app.preferredApkIndex >= 0 ? app.preferredApkIndex : 0];
    // get device supported architecture
    List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;

@ -309,16 +433,19 @@ class AppsProvider with ChangeNotifier {

    // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
    if (apkUrl != null &&
-        getHost(apkUrl) != getHost(app.url) &&
+        getHost(apkUrl.value) != getHost(app.url) &&
        context != null) {
      // ignore: use_build_context_synchronously
-      if (await showDialog(
-              context: context,
-              builder: (BuildContext ctx) {
-                return APKOriginWarningDialog(
-                    sourceUrl: app.url, apkUrl: apkUrl!);
-              }) !=
-          true) {
+      var settingsProvider = context.read<SettingsProvider>();
+      if (!(settingsProvider.hideAPKOriginWarning) &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return APKOriginWarningDialog(
+                        sourceUrl: app.url, apkUrl: apkUrl!.value);
+                  }) !=
+              true) {
        apkUrl = null;
      }
    }
@ -331,7 +458,8 @@ class AppsProvider with ChangeNotifier {
  // If user input is needed and the App is in the background, a notification is sent to get the user's attention
  // Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
  Future<List<String>> downloadAndInstallLatestApps(
-      List<String> appIds, BuildContext? context) async {
+      List<String> appIds, BuildContext? context,
+      {SettingsProvider? settingsProvider}) async {
    List<String> appsToInstall = [];
    List<String> trackOnlyAppsToUpdate = [];
    // For all specified Apps, filter out those for which:
@ -341,14 +469,19 @@ class AppsProvider with ChangeNotifier {
      if (apps[id] == null) {
        throw ObtainiumError(tr('appNotFound'));
      }
-      String? apkUrl;
+      MapEntry<String, String>? apkUrl;
      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
      if (!trackOnly) {
        apkUrl = await confirmApkUrl(apps[id]!.app, context);
      }
      if (apkUrl != null) {
-        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
-        if (urlInd != apps[id]!.app.preferredApkIndex) {
+        int urlInd = apps[id]!
+            .app
+            .apkUrls
+            .map((e) => e.value)
+            .toList()
+            .indexOf(apkUrl.value);
+        if (urlInd >= 0 && urlInd != apps[id]!.app.preferredApkIndex) {
          apps[id]!.app.preferredApkIndex = urlInd;
          await saveApps([apps[id]!.app]);
        }
@ -366,71 +499,62 @@ class AppsProvider with ChangeNotifier {
      a.installedVersion = a.latestVersion;
      return a;
    }).toList());
-    // Download APKs for all Apps to be installed
+
+    // Prepare to download+install Apps
    MultiAppMultiError errors = MultiAppMultiError();
-    List<DownloadedApk?> downloadedFiles =
-        await Future.wait(appsToInstall.map((id) async {
+    List<String> installedIds = [];
+
+    // Move Obtainium to the end of the line (let all other apps update first)
+    String? temp;
+    appsToInstall.removeWhere((element) {
+      bool res = element == obtainiumId || element == obtainiumTempId;
+      if (res) {
+        temp = element;
+      }
+      return res;
+    });
+    if (temp != null) {
+      appsToInstall = [...appsToInstall, temp!];
+    }
+
+    for (var id in appsToInstall) {
      try {
-        return await downloadApp(apps[id]!.app, context);
+        // ignore: use_build_context_synchronously
+        var downloadedArtifact = await downloadApp(apps[id]!.app, context);
+        DownloadedApk? downloadedFile;
+        DownloadedXApkDir? downloadedDir;
+        if (downloadedArtifact is DownloadedApk) {
+          downloadedFile = downloadedArtifact;
+        } else {
+          downloadedDir = downloadedArtifact as DownloadedXApkDir;
+        }
+        bool willBeSilent = await canInstallSilently(
+            apps[downloadedFile?.appId ?? downloadedDir!.appId]!.app);
+        willBeSilent = false; // TODO: Remove this when silent updates work
+        if (!(await settingsProvider?.getInstallPermission(enforce: false) ??
+            true)) {
+          throw ObtainiumError(tr('cancelled'));
+        }
+        if (!willBeSilent && context != null) {
+          // ignore: use_build_context_synchronously
+          await waitForUserToReturnToForeground(context);
+        }
+        apps[id]?.downloadProgress = -1;
+        notifyListeners();
+        try {
+          if (downloadedFile != null) {
+            await installApk(downloadedFile, silent: willBeSilent);
+          } else {
+            await installXApkDir(downloadedDir!, silent: willBeSilent);
+          }
+        } finally {
+          apps[id]?.downloadProgress = null;
+          notifyListeners();
+        }
+        installedIds.add(id);
      } catch (e) {
        errors.add(id, e.toString());
      }
-      return null;
-    }));
-    downloadedFiles =
-        downloadedFiles.where((element) => element != null).toList();
-    // Separate the Apps to install into silent and regular lists
-    List<DownloadedApk> silentUpdates = [];
-    List<DownloadedApk> regularInstalls = [];
-    for (var f in downloadedFiles) {
-      bool willBeSilent = await canInstallSilently(apps[f!.appId]!.app);
-      if (willBeSilent) {
-        silentUpdates.add(f);
-      } else {
-        regularInstalls.add(f);
-      }
-    }
-
-    // Move everything to the regular install list (since silent updates don't currently work)
-    // TODO: Remove this when silent updates work
-    regularInstalls.addAll(silentUpdates);
-
-    // If Obtainium is being installed, it should be the last one
-    List<DownloadedApk> moveObtainiumToStart(List<DownloadedApk> items) {
-      DownloadedApk? temp;
-      items.removeWhere((element) {
-        bool res =
-            element.appId == obtainiumId || element.appId == obtainiumTempId;
-        if (res) {
-          temp = element;
-        }
-        return res;
-      });
-      if (temp != null) {
-        items = [temp!, ...items];
-      }
-      return items;
-    }
-
-    silentUpdates = moveObtainiumToStart(silentUpdates);
-    regularInstalls = moveObtainiumToStart(regularInstalls);
-
-    // // Install silent updates (uncomment when it works - TODO)
-    // for (var u in silentUpdates) {
-    //   await installApk(u, silent: true); // Would need to add silent option
-    // }
-
-    // Do regular installs
-    if (regularInstalls.isNotEmpty && context != null) {
-      // ignore: use_build_context_synchronously
-      await waitForUserToReturnToForeground(context);
-      for (var i in regularInstalls) {
-        try {
-          await installApk(i);
-        } catch (e) {
-          errors.add(i.appId, e.toString());
-        }
-      }
    }

    if (errors.content.isNotEmpty) {
@ -439,7 +563,7 @@ class AppsProvider with ChangeNotifier {

    NotificationsProvider().cancel(UpdateNotification([]).id);

-    return downloadedFiles.map((e) => e!.appId).toList();
+    return installedIds;
  }

  Future<Directory> getAppsDir() async {
@ -472,94 +596,117 @@ class AppsProvider with ChangeNotifier {
    return res;
  }

-  // If the App says it is installed but installedInfo is null, set it to not installed
-  // If there is any other mismatch between installedInfo and installedVersion, try reconciling them intelligently
-  // If that fails, just set it to the actual version string (all we can do at that point)
-  // Don't save changes, just return the object if changes were made (else null)
+  bool isVersionDetectionPossible(AppInMemory? app) {
+    return app?.app.additionalSettings['trackOnly'] != true &&
+        app?.app.additionalSettings['versionDetection'] !=
+            'releaseDateAsVersion' &&
+        app?.installedInfo?.versionName != null &&
+        app?.app.installedVersion != null &&
+        reconcileVersionDifferences(
+                app!.installedInfo!.versionName!, app.app.installedVersion!) !=
+            null;
+  }
+
+  // Given an App and it's on-device info...
+  // Reconcile unexpected differences between its reported installed version, real installed version, and reported latest version
  App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
    var modded = false;
    var trackOnly = app.additionalSettings['trackOnly'] == true;
    var noVersionDetection = app.additionalSettings['versionDetection'] !=
        'standardVersionDetection';
+    // FIRST, COMPARE THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE ONE IS NULL
    if (installedInfo == null && app.installedVersion != null && !trackOnly) {
+      // App says it's installed but isn't really (and isn't track only) - set to not installed
      app.installedVersion = null;
      modded = true;
    } else if (installedInfo?.versionName != null &&
        app.installedVersion == null) {
+      // App says it's not installed but really is - set to installed and use real package versionName
      app.installedVersion = installedInfo!.versionName;
      modded = true;
-    } else if (installedInfo?.versionName != null &&
+    }
+    // SECOND, RECONCILE DIFFERENCES BETWEEN THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE NEITHER IS NULL
+    if (installedInfo?.versionName != null &&
        installedInfo!.versionName != app.installedVersion &&
        !noVersionDetection) {
-      String? correctedInstalledVersion = reconcileRealAndInternalVersions(
+      // App's reported version and real version don't match (and it uses standard version detection)
+      // If they share a standard format (and are still different under it), update the reported version accordingly
+      var correctedInstalledVersion = reconcileVersionDifferences(
          installedInfo.versionName!, app.installedVersion!);
-      if (correctedInstalledVersion != null) {
-        app.installedVersion = correctedInstalledVersion;
+      if (correctedInstalledVersion?.key == false) {
+        app.installedVersion = correctedInstalledVersion!.value;
        modded = true;
      }
    }
+    // THIRD, RECONCILE THE APP'S REPORTED INSTALLED AND LATEST VERSIONS
    if (app.installedVersion != null &&
        app.installedVersion != app.latestVersion &&
        !noVersionDetection) {
-      app.installedVersion = reconcileRealAndInternalVersions(
-              app.installedVersion!, app.latestVersion,
-              matchMode: true) ??
-          app.installedVersion;
+      // App's reported installed and latest versions don't match (and it uses standard version detection)
+      // If they share a standard format, make sure the App's reported installed version uses that format
+      var correctedInstalledVersion =
+          reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+      if (correctedInstalledVersion?.key == true) {
+        app.installedVersion = correctedInstalledVersion!.value;
+        modded = true;
+      }
+    }
+    // FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED
+    if (installedInfo != null &&
+        app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection' &&
+        !isVersionDetectionPossible(AppInMemory(app, null, installedInfo))) {
+      app.additionalSettings['versionDetection'] = 'noVersionDetection';
+      logs.add('Could not reconcile version formats for: ${app.id}');
      modded = true;
    }
+    // if (app.installedVersion != null &&
+    //     app.additionalSettings['versionDetection'] ==
+    //         'standardVersionDetection') {
+    //   var correctedInstalledVersion =
+    //       reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+    //   if (correctedInstalledVersion == null) {
+    //     app.additionalSettings['versionDetection'] = 'noVersionDetection';
+    //     logs.add('Could not reconcile version formats for: ${app.id}');
+    //     modded = true;
+    //   }
+    // }
+
    return modded ? app : null;
  }

-  String? reconcileRealAndInternalVersions(
-      String realVersion, String internalVersion,
-      {bool matchMode = false}) {
-    // 1. If one or both of these can't be converted to a "standard" format, return null (leave as is)
-    // 2. If both have a "standard" format under which they are equal, return null (leave as is)
-    // 3. If both have a "standard" format in common but are unequal, return realVersion (this means it was changed externally)
-    // If in matchMode, the outcomes of rules 2 and 3 are reversed, and the "real" version is not matched strictly
-    // Matchmode to be used when comparing internal install version and internal latest version
-
-    bool doStringsMatchUnderRegEx(
-        String pattern, String value1, String value2) {
-      var r = RegExp(pattern);
-      var m1 = r.firstMatch(value1);
-      var m2 = r.firstMatch(value2);
-      return m1 != null && m2 != null
-          ? value1.substring(m1.start, m1.end) ==
-              value2.substring(m2.start, m2.end)
-          : false;
-    }
-
-    Set<String> findStandardFormatsForVersion(String version, bool strict) {
-      Set<String> results = {};
-      for (var pattern in standardVersionRegExStrings) {
-        if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
-            .hasMatch(version)) {
-          results.add(pattern);
-        }
-      }
-      return results;
-    }
-
-    var realStandardVersionFormats =
-        findStandardFormatsForVersion(realVersion, true);
-    var internalStandardVersionFormats =
-        findStandardFormatsForVersion(internalVersion, false);
+  MapEntry<bool, String>? reconcileVersionDifferences(
+      String templateVersion, String comparisonVersion) {
+    // Returns null if the versions don't share a common standard format
+    // Returns <true, comparisonVersion> if they share a common format and are equal
+    // Returns <false, templateVersion> if they share a common format but are not equal
+    // templateVersion must fully match a standard format, while comparisonVersion can have a substring match
+    var templateVersionFormats =
+        findStandardFormatsForVersion(templateVersion, true);
+    var comparisonVersionFormats =
+        findStandardFormatsForVersion(comparisonVersion, false);
    var commonStandardFormats =
-        realStandardVersionFormats.intersection(internalStandardVersionFormats);
+        templateVersionFormats.intersection(comparisonVersionFormats);
    if (commonStandardFormats.isEmpty) {
-      return null; // Incompatible; no "enhanced detection"
+      return null;
    }
    for (String pattern in commonStandardFormats) {
-      if (doStringsMatchUnderRegEx(pattern, internalVersion, realVersion)) {
-        return matchMode
-            ? internalVersion
-            : null; // Enhanced detection says no change
+      if (doStringsMatchUnderRegEx(
+          pattern, comparisonVersion, templateVersion)) {
+        return MapEntry(true, comparisonVersion);
      }
    }
-    return matchMode
-        ? null
-        : realVersion; // Enhanced detection says something changed
+    return MapEntry(false, templateVersion);
+  }
+
+  bool doStringsMatchUnderRegEx(String pattern, String value1, String value2) {
+    var r = RegExp(pattern);
+    var m1 = r.firstMatch(value1);
+    var m2 = r.firstMatch(value2);
+    return m1 != null && m2 != null
+        ? value1.substring(m1.start, m1.end) ==
+            value2.substring(m2.start, m2.end)
+        : false;
  }

  Future<void> loadApps() async {
@ -568,41 +715,30 @@ class AppsProvider with ChangeNotifier {
    }
    loadingApps = true;
    notifyListeners();
-    List<App> newApps = (await getAppsDir())
-        .listSync()
-        .where((item) => item.path.toLowerCase().endsWith('.json'))
-        .map((e) {
-          try {
-            return App.fromJson(jsonDecode(File(e.path).readAsStringSync()));
-          } catch (err) {
-            if (err is FormatException) {
-              logs.add('Corrupt JSON when loading App (will be ignored): $e');
-              e.renameSync('${e.path}.corrupt');
-              return App(
-                  '', '', '', '', '', '', [], 0, {}, DateTime.now(), false);
-            } else {
-              rethrow;
-            }
-          }
-        })
-        .where((element) => element.id.isNotEmpty)
-        .toList();
-    var idsToDelete = apps.values
-        .map((e) => e.app.id)
-        .toSet()
-        .difference(newApps.map((e) => e.id).toSet());
-    for (var id in idsToDelete) {
-      apps.remove(id);
-    }
    var sp = SourceProvider();
    List<List<String>> errors = [];
-    for (int i = 0; i < newApps.length; i++) {
-      var info = await getInstalledInfo(newApps[i].id);
+    List<FileSystemEntity> newApps = (await getAppsDir())
+        .listSync()
+        .where((item) => item.path.toLowerCase().endsWith('.json'))
+        .toList();
+    for (var e in newApps) {
      try {
-        sp.getSource(newApps[i].url);
-        apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
-      } catch (e) {
-        errors.add([newApps[i].id, newApps[i].name, e.toString()]);
+        var app = App.fromJson(jsonDecode(File(e.path).readAsStringSync()));
+        try {
+          var info = await getInstalledInfo(app.id);
+          sp.getSource(app.url, overrideSource: app.overrideSource);
+          apps[app.id] = AppInMemory(app, null, info);
+          notifyListeners();
+        } catch (e) {
+          errors.add([app.id, app.finalName, e.toString()]);
+        }
+      } catch (err) {
+        if (err is FormatException) {
+          logs.add('Corrupt JSON when loading App (will be ignored): $e');
+          e.renameSync('${e.path}.corrupt');
+        } else {
+          rethrow;
+        }
      }
    }
    if (errors.isNotEmpty) {
@ -612,6 +748,10 @@ class AppsProvider with ChangeNotifier {
    }
    loadingApps = false;
    notifyListeners();
+    refreshInstallStatuses();
+  }
+
+  Future<void> refreshInstallStatuses() async {
    if (await doesInstalledAppsPluginWork()) {
      List<App> modifiedApps = [];
      for (var app in apps.values) {
@ -632,7 +772,8 @@ class AppsProvider with ChangeNotifier {
      bool onlyIfExists = true}) async {
    attemptToCorrectInstallStatus =
        attemptToCorrectInstallStatus && (await doesInstalledAppsPluginWork());
-    for (var app in apps) {
+    for (var a in apps) {
+      var app = a.deepCopy();
      AppInfo? info = await getInstalledInfo(app.id);
      app.name = info?.name ?? app.name;
      if (attemptToCorrectInstallStatus) {
@ -654,11 +795,18 @@ class AppsProvider with ChangeNotifier {
  }

  Future<void> removeApps(List<String> appIds) async {
+    var apkFiles = APKDir.listSync();
    for (var appId in appIds) {
      File file = File('${(await getAppsDir()).path}/$appId.json');
      if (file.existsSync()) {
-        file.deleteSync();
+        file.deleteSync(recursive: true);
      }
+      apkFiles
+          .where(
+              (element) => element.path.split('/').last.startsWith('$appId-'))
+          .forEach((element) {
+        element.delete(recursive: true);
+      });
      if (apps.containsKey(appId)) {
        apps.remove(appId);
      }
@ -669,8 +817,11 @@ class AppsProvider with ChangeNotifier {
  }

  Future<bool> removeAppsWithModal(BuildContext context, List<App> apps) async {
-    var showUninstallOption =
-        apps.where((a) => a.installedVersion != null).isNotEmpty;
+    var showUninstallOption = apps
+        .where((a) =>
+            a.installedVersion != null &&
+            a.additionalSettings['trackOnly'] != true)
+        .isNotEmpty;
    var values = await showDialog(
        context: context,
        builder: (BuildContext ctx) {
@ -719,11 +870,24 @@ class AppsProvider with ChangeNotifier {
    await intent.launch();
  }

+  addMissingCategories(SettingsProvider settingsProvider) {
+    var cats = settingsProvider.categories;
+    apps.forEach((key, value) {
+      for (var c in value.app.categories) {
+        if (!cats.containsKey(c)) {
+          cats[c] = generateRandomLightColor().value;
+        }
+      }
+    });
+    settingsProvider.setCategories(cats, appsProvider: this);
+  }
+
  Future<App?> checkUpdate(String appId) async {
    App? currentApp = apps[appId]!.app;
    SourceProvider sourceProvider = SourceProvider();
    App newApp = await sourceProvider.getApp(
-        sourceProvider.getSource(currentApp.url),
+        sourceProvider.getSource(currentApp.url,
+            overrideSource: currentApp.overrideSource),
        currentApp.url,
        currentApp.additionalSettings,
        currentApp: currentApp);
@ -798,12 +962,6 @@ class AppsProvider with ChangeNotifier {
  }

  Future<String> exportApps() async {
-    Directory? exportDir = Directory('/storage/emulated/0/Download');
-    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
-    if (!exportDir.existsSync()) {
-      exportDir = await getExternalStorageDirectory();
-      path = exportDir!.path;
-    }
    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
      if (await Permission.storage.isDenied) {
        await Permission.storage.request();
@ -812,6 +970,18 @@ class AppsProvider with ChangeNotifier {
        throw ObtainiumError(tr('storagePermissionDenied'));
      }
    }
+    Directory? exportDir = Directory('/storage/emulated/0/Download');
+    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
+    var downloadsAccessible = false;
+    try {
+      downloadsAccessible = exportDir.existsSync();
+    } catch (e) {
+      logs.add('Error accessing Downloads (will use fallback): $e');
+    }
+    if (!downloadsAccessible) {
+      exportDir = await getExternalStorageDirectory();
+      path = exportDir!.path;
+    }
    File export = File(
        '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json');
    export.writeAsStringSync(
@ -844,7 +1014,7 @@ class AppsProvider with ChangeNotifier {

  Future<List<List<String>>> addAppsByURL(List<String> urls) async {
    List<dynamic> results = await SourceProvider().getAppsByURLNaive(urls,
-        ignoreUrls: apps.values.map((e) => e.app.url).toList());
+        alreadyAddedUrls: apps.values.map((e) => e.app.url).toList());
    List<App> pps = results[0];
    Map<String, dynamic> errorsMap = results[1];
    for (var app in pps) {
@ -864,7 +1034,7 @@ class APKPicker extends StatefulWidget {
  const APKPicker({super.key, required this.app, this.initVal, this.archs});

  final App app;
-  final String? initVal;
+  final MapEntry<String, String>? initVal;
  final List<String>? archs;

  @override
@ -872,7 +1042,7 @@ class APKPicker extends StatefulWidget {
 }

 class _APKPickerState extends State<APKPicker> {
-  String? apkUrl;
+  MapEntry<String, String>? apkUrl;

  @override
  Widget build(BuildContext context) {
@ -881,19 +1051,17 @@ class _APKPickerState extends State<APKPicker> {
      scrollable: true,
      title: Text(tr('pickAnAPK')),
      content: Column(children: [
-        Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])),
+        Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
        const SizedBox(height: 16),
        ...widget.app.apkUrls.map(
          (u) => RadioListTile<String>(
-              title: Text(Uri.parse(u)
-                  .pathSegments
-                  .where((element) => element.isNotEmpty)
-                  .last),
-              value: u,
-              groupValue: apkUrl,
+              title: Text(u.key),
+              value: u.value,
+              groupValue: apkUrl!.value,
              onChanged: (String? val) {
                setState(() {
-                  apkUrl = val;
+                  apkUrl =
+                      widget.app.apkUrls.where((e) => e.value == val).first;
                });
              }),
        ),
--- a/lib/providers/notifications_provider.dart
+++ b/lib/providers/notifications_provider.dart
@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
    message = updates.isEmpty
        ? tr('noNewUpdates')
        : updates.length == 1
-            ? tr('xHasAnUpdate', args: [updates[0].name])
+            ? tr('xHasAnUpdate', args: [updates[0].finalName])
            : plural('xAndNMoreUpdatesAvailable', updates.length - 1,
-                args: [updates[0].name, (updates.length - 1).toString()]);
+                args: [updates[0].finalName, (updates.length - 1).toString()]);
  }
 }

@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
            tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
    message = updates.length == 1
        ? tr('xWasUpdatedToY',
-            args: [updates[0].name, updates[0].latestVersion])
+            args: [updates[0].finalName, updates[0].latestVersion])
        : plural('xAndNMoreUpdatesInstalled', updates.length - 1,
-            args: [updates[0].name, (updates.length - 1).toString()]);
+            args: [updates[0].finalName, (updates.length - 1).toString()]);
  }
 }

@ -167,7 +167,8 @@ class NotificationsProvider {
                progress: progPercent ?? 0,
                maxProgress: 100,
                showProgress: progPercent != null,
-                onlyAlertOnce: onlyAlertOnce)));
+                onlyAlertOnce: onlyAlertOnce,
+                indeterminate: progPercent != null && progPercent < 0)));
  }

  Future<void> notify(ObtainiumNotification notif,
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@ -7,6 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';

@ -33,6 +35,7 @@ List<int> updateIntervals = [15, 30, 60, 120, 180, 360, 720, 1440, 4320, 0]

 class SettingsProvider with ChangeNotifier {
  SharedPreferences? prefs;
+  bool justStarted = true;

  String sourceUrl = 'https://github.com/ImranR98/Obtainium';

@ -62,6 +65,15 @@ class SettingsProvider with ChangeNotifier {
    notifyListeners();
  }

+  bool get useBlackTheme {
+    return prefs?.getBool('useBlackTheme') ?? false;
+  }
+
+  set useBlackTheme(bool useBlackTheme) {
+    prefs?.setBool('useBlackTheme', useBlackTheme);
+    notifyListeners();
+  }
+
  int get updateInterval {
    var min = prefs?.getInt('updateInterval') ?? 360;
    if (!updateIntervals.contains(min)) {
@ -81,6 +93,15 @@ class SettingsProvider with ChangeNotifier {
    notifyListeners();
  }

+  bool get checkOnStart {
+    return prefs?.getBool('checkOnStart') ?? false;
+  }
+
+  set checkOnStart(bool checkOnStart) {
+    prefs?.setBool('checkOnStart', checkOnStart);
+    notifyListeners();
+  }
+
  SortColumnSettings get sortColumn {
    return SortColumnSettings.values[
        prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
@ -109,16 +130,28 @@ class SettingsProvider with ChangeNotifier {
    return result;
  }

-  Future<void> getInstallPermission() async {
+  bool checkJustStarted() {
+    if (justStarted) {
+      justStarted = false;
+      return true;
+    }
+    return false;
+  }
+
+  Future<bool> getInstallPermission({bool enforce = false}) async {
    while (!(await Permission.requestInstallPackages.isGranted)) {
      // Explicit request as InstallPlugin request sometimes bugged
      Fluttertoast.showToast(
          msg: tr('pleaseAllowInstallPerm'), toastLength: Toast.LENGTH_LONG);
      if ((await Permission.requestInstallPackages.request()) ==
          PermissionStatus.granted) {
-        break;
+        return true;
+      }
+      if (!enforce) {
+        return false;
      }
    }
+    return true;
  }

  bool get showAppWebpage {
@ -139,6 +172,42 @@ class SettingsProvider with ChangeNotifier {
    notifyListeners();
  }

+  bool get buryNonInstalled {
+    return prefs?.getBool('buryNonInstalled') ?? false;
+  }
+
+  set buryNonInstalled(bool show) {
+    prefs?.setBool('buryNonInstalled', show);
+    notifyListeners();
+  }
+
+  bool get groupByCategory {
+    return prefs?.getBool('groupByCategory') ?? false;
+  }
+
+  set groupByCategory(bool show) {
+    prefs?.setBool('groupByCategory', show);
+    notifyListeners();
+  }
+
+  bool get hideTrackOnlyWarning {
+    return prefs?.getBool('hideTrackOnlyWarning') ?? false;
+  }
+
+  set hideTrackOnlyWarning(bool show) {
+    prefs?.setBool('hideTrackOnlyWarning', show);
+    notifyListeners();
+  }
+
+  bool get hideAPKOriginWarning {
+    return prefs?.getBool('hideAPKOriginWarning') ?? false;
+  }
+
+  set hideAPKOriginWarning(bool show) {
+    prefs?.setBool('hideAPKOriginWarning', show);
+    notifyListeners();
+  }
+
  String? getSettingString(String settingId) {
    return prefs?.getString(settingId);
  }
@ -151,7 +220,22 @@ class SettingsProvider with ChangeNotifier {
  Map<String, int> get categories =>
      Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));

-  set categories(Map<String, int> cats) {
+  void setCategories(Map<String, int> cats, {AppsProvider? appsProvider}) {
+    if (appsProvider != null) {
+      List<App> changedApps = appsProvider
+          .getAppValues()
+          .map((a) {
+            var n1 = a.app.categories.length;
+            a.app.categories.removeWhere((c) => !cats.keys.contains(c));
+            return n1 > a.app.categories.length ? a.app : null;
+          })
+          .where((element) => element != null)
+          .map((e) => e as App)
+          .toList();
+      if (changedApps.isNotEmpty) {
+        appsProvider.saveApps(changedApps);
+      }
+    }
    prefs?.setString('categories', jsonEncode(cats));
    notifyListeners();
  }
@ -159,7 +243,7 @@ class SettingsProvider with ChangeNotifier {
  String? get forcedLocale {
    var fl = prefs?.getString('forcedLocale');
    return supportedLocales
-            .where((element) => element.toLanguageTag() == fl)
+            .where((element) => element.key.toLanguageTag() == fl)
            .isNotEmpty
        ? fl
        : null;
@ -169,7 +253,7 @@ class SettingsProvider with ChangeNotifier {
    if (fl == null) {
      prefs?.remove('forcedLocale');
    } else if (supportedLocales
-        .where((element) => element.toLanguageTag() == fl)
+        .where((element) => element.key.toLanguageTag() == fl)
        .isNotEmpty) {
      prefs?.setString('forcedLocale', fl);
    }
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@ -3,10 +3,12 @@

 import 'dart:convert';

+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:obtainium/app_sources/apkpure.dart';
 import 'package:obtainium/app_sources/codeberg.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
@ -14,14 +16,15 @@ import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/app_sources/jenkins.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/neutroncode.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
+import 'package:obtainium/app_sources/sourcehut.dart';
 import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/app_sources/telegramapp.dart';
 import 'package:obtainium/app_sources/vlc.dart';
-import 'package:obtainium/app_sources/whatsapp.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@ -35,7 +38,7 @@ class AppNames {

 class APKDetails {
  late String version;
-  late List<String> apkUrls;
+  late List<MapEntry<String, String>> apkUrls;
  late AppNames names;
  late DateTime? releaseDate;
  late String? changeLog;
@ -44,6 +47,106 @@ class APKDetails {
      {this.releaseDate, this.changeLog});
 }

+stringMapListTo2DList(List<MapEntry<String, String>> mapList) =>
+    mapList.map((e) => [e.key, e.value]).toList();
+
+assumed2DlistToStringMapList(List<dynamic> arr) =>
+    arr.map((e) => MapEntry(e[0] as String, e[1] as String)).toList();
+
+// App JSON schema has changed multiple times over the many versions of Obtainium
+// This function takes an App JSON and modifies it if needed to conform to the latest (current) version
+appJSONCompatibilityModifiers(Map<String, dynamic> json) {
+  var source = SourceProvider()
+      .getSource(json['url'], overrideSource: json['overrideSource']);
+  var formItems = source.combinedAppSpecificSettingFormItems
+      .reduce((value, element) => [...value, ...element]);
+  Map<String, dynamic> additionalSettings =
+      getDefaultValuesFromFormItems([formItems]);
+  if (json['additionalSettings'] != null) {
+    additionalSettings.addEntries(
+        Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
+            .entries);
+  }
+  // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
+  if (json['additionalData'] != null) {
+    List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
+    temp.asMap().forEach((i, value) {
+      if (i < formItems.length) {
+        if (formItems[i] is GeneratedFormSwitch) {
+          additionalSettings[formItems[i].key] = value == 'true';
+        } else {
+          additionalSettings[formItems[i].key] = value;
+        }
+      }
+    });
+    additionalSettings['trackOnly'] =
+        json['trackOnly'] == 'true' || json['trackOnly'] == true;
+    additionalSettings['noVersionDetection'] =
+        json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
+  }
+  // Convert bool style version detection options to dropdown style
+  if (additionalSettings['noVersionDetection'] == true) {
+    additionalSettings['versionDetection'] = 'noVersionDetection';
+    if (additionalSettings['releaseDateAsVersion'] == true) {
+      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+    if (additionalSettings['noVersionDetection'] != null) {
+      additionalSettings.remove('noVersionDetection');
+    }
+    if (additionalSettings['releaseDateAsVersion'] != null) {
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+  }
+  // Ensure additionalSettings are correctly typed
+  for (var item in formItems) {
+    if (additionalSettings[item.key] != null) {
+      additionalSettings[item.key] =
+          item.ensureType(additionalSettings[item.key]);
+    }
+  }
+  int preferredApkIndex =
+      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int;
+  if (preferredApkIndex < 0) {
+    preferredApkIndex = 0;
+  }
+  json['preferredApkIndex'] = preferredApkIndex;
+  // apkUrls can either be old list or new named list apkUrls
+  List<MapEntry<String, String>> apkUrls = [];
+  if (json['apkUrls'] != null) {
+    var apkUrlJson = jsonDecode(json['apkUrls']);
+    try {
+      apkUrls = getApkUrlsFromUrls(List<String>.from(apkUrlJson));
+    } catch (e) {
+      apkUrls = assumed2DlistToStringMapList(List<dynamic>.from(apkUrlJson));
+      apkUrls = List<dynamic>.from(apkUrlJson)
+          .map((e) => MapEntry(e[0] as String, e[1] as String))
+          .toList();
+    }
+    json['apkUrls'] = jsonEncode(stringMapListTo2DList(apkUrls));
+  }
+  // Arch based APK filter option should be disabled if it previously did not exist
+  if (additionalSettings['autoApkFilterByArch'] == null) {
+    additionalSettings['autoApkFilterByArch'] = false;
+  }
+  json['additionalSettings'] = jsonEncode(additionalSettings);
+  // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
+  // This allows us to reverse the changes made for issue #418 (support cloudflare.f-droid)
+  // While not causing problems for existing apps from that source that were added in a previous version
+  var overrideSourceWasUndefined = !json.keys.contains('overrideSource');
+  if ((json['url'] as String).startsWith('https://cloudflare.f-droid.org')) {
+    json['overrideSource'] = FDroid().runtimeType.toString();
+  } else if (overrideSourceWasUndefined) {
+    // Similar to above, but for third-party F-Droid repos
+    RegExpMatch? match = RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)')
+        .firstMatch(json['url'] as String);
+    if (match != null) {
+      json['overrideSource'] = FDroidRepo().runtimeType.toString();
+    }
+  }
+  return json;
+}
+
 class App {
  late String id;
  late String url;
@ -51,7 +154,7 @@ class App {
  late String name;
  String? installedVersion;
  late String latestVersion;
-  List<String> apkUrls = [];
+  List<MapEntry<String, String>> apkUrls = [];
  late int preferredApkIndex;
  late Map<String, dynamic> additionalSettings;
  late DateTime? lastUpdateCheck;
@ -59,6 +162,7 @@ class App {
  List<String> categories;
  late DateTime? releaseDate;
  late String? changeLog;
+  late String? overrideSource;
  App(
      this.id,
      this.url,
@ -73,68 +177,42 @@ class App {
      this.pinned,
      {this.categories = const [],
      this.releaseDate,
-      this.changeLog});
+      this.changeLog,
+      this.overrideSource});

  @override
  String toString() {
    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
  }

+  String? get overrideName =>
+      additionalSettings['appName']?.toString().trim().isNotEmpty == true
+          ? additionalSettings['appName']
+          : null;
+
+  String get finalName {
+    return overrideName ?? name;
+  }
+
+  App deepCopy() => App(
+      id,
+      url,
+      author,
+      name,
+      installedVersion,
+      latestVersion,
+      apkUrls,
+      preferredApkIndex,
+      Map.from(additionalSettings),
+      lastUpdateCheck,
+      pinned,
+      categories: categories,
+      changeLog: changeLog,
+      releaseDate: releaseDate,
+      overrideSource: overrideSource);
+
  factory App.fromJson(Map<String, dynamic> json) {
-    var source = SourceProvider().getSource(json['url']);
-    var formItems = source.combinedAppSpecificSettingFormItems
-        .reduce((value, element) => [...value, ...element]);
-    Map<String, dynamic> additionalSettings =
-        getDefaultValuesFromFormItems([formItems]);
-    if (json['additionalSettings'] != null) {
-      additionalSettings.addEntries(
-          Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
-              .entries);
-    }
-    // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
-    if (json['additionalData'] != null) {
-      List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
-      temp.asMap().forEach((i, value) {
-        if (i < formItems.length) {
-          if (formItems[i] is GeneratedFormSwitch) {
-            additionalSettings[formItems[i].key] = value == 'true';
-          } else {
-            additionalSettings[formItems[i].key] = value;
-          }
-        }
-      });
-      additionalSettings['trackOnly'] =
-          json['trackOnly'] == 'true' || json['trackOnly'] == true;
-      additionalSettings['noVersionDetection'] =
-          json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
-    }
-    // Convert bool style version detection options to dropdown style
-    if (additionalSettings['noVersionDetection'] == true) {
-      additionalSettings['versionDetection'] = 'noVersionDetection';
-    }
-    if (additionalSettings['releaseDateAsVersion'] == true) {
-      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
-      additionalSettings.remove('releaseDateAsVersion');
-    }
-    if (additionalSettings['noVersionDetection'] != null) {
-      additionalSettings.remove('noVersionDetection');
-    }
-    if (additionalSettings['releaseDateAsVersion'] != null) {
-      additionalSettings.remove('releaseDateAsVersion');
-    }
-    // Ensure additionalSettings are correctly typed
-    for (var item in formItems) {
-      if (additionalSettings[item.key] != null) {
-        additionalSettings[item.key] =
-            item.ensureType(additionalSettings[item.key]);
-      }
-    }
-    int preferredApkIndex = json['preferredApkIndex'] == null
-        ? 0
-        : json['preferredApkIndex'] as int;
-    if (preferredApkIndex < 0) {
-      preferredApkIndex = 0;
-    }
+    json = appJSONCompatibilityModifiers(json);
    return App(
        json['id'] as String,
        json['url'] as String,
@ -144,11 +222,9 @@ class App {
            ? null
            : json['installedVersion'] as String,
        json['latestVersion'] as String,
-        json['apkUrls'] == null
-            ? []
-            : List<String>.from(jsonDecode(json['apkUrls'])),
-        preferredApkIndex,
-        additionalSettings,
+        assumed2DlistToStringMapList(jsonDecode(json['apkUrls'])),
+        json['preferredApkIndex'] as int,
+        jsonDecode(json['additionalSettings']) as Map<String, dynamic>,
        json['lastUpdateCheck'] == null
            ? null
            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
@ -164,7 +240,8 @@ class App {
            ? null
            : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
        changeLog:
-            json['changeLog'] == null ? null : json['changeLog'] as String);
+            json['changeLog'] == null ? null : json['changeLog'] as String,
+        overrideSource: json['overrideSource']);
  }

  Map<String, dynamic> toJson() => {
@ -174,14 +251,15 @@ class App {
        'name': name,
        'installedVersion': installedVersion,
        'latestVersion': latestVersion,
-        'apkUrls': jsonEncode(apkUrls),
+        'apkUrls': jsonEncode(stringMapListTo2DList(apkUrls)),
        'preferredApkIndex': preferredApkIndex,
        'additionalSettings': jsonEncode(additionalSettings),
        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
        'pinned': pinned,
        'categories': categories,
        'releaseDate': releaseDate?.microsecondsSinceEpoch,
-        'changeLog': changeLog
+        'changeLog': changeLog,
+        'overrideSource': overrideSource
      };
 }

@ -226,17 +304,62 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
      .reduce((value, element) => [...value, ...element]));
 }

-class AppSource {
+List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
+    urls.map((e) {
+      var segments = e.split('/').where((el) => el.trim().isNotEmpty);
+      var apkSegs = segments.where((s) => s.toLowerCase().endsWith('.apk'));
+      return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
+    }).toList();
+
+abstract class AppSource {
  String? host;
+  bool hostChanged = false;
  late String name;
  bool enforceTrackOnly = false;
  bool changeLogIfAnyIsMarkDown = true;
+  bool appIdInferIsOptional = false;

  AppSource() {
    name = runtimeType.toString();
  }

-  String standardizeURL(String url) {
+  overrideVersionDetectionFormDefault(String vd, bool disableStandard) {
+    additionalAppSpecificSourceAgnosticSettingFormItems =
+        additionalAppSpecificSourceAgnosticSettingFormItems.map((e) {
+      return e.map((e2) {
+        if (e2.key == 'versionDetection') {
+          var item = e2 as GeneratedFormDropdown;
+          item.defaultValue = vd;
+          if (disableStandard) {
+            item.disabledOptKeys = ['standardVersionDetection'];
+          }
+        }
+        return e2;
+      }).toList();
+    }).toList();
+  }
+
+  String standardizeUrl(String url) {
+    url = preStandardizeUrl(url);
+    if (!hostChanged) {
+      url = sourceSpecificStandardizeURL(url);
+    }
+    return url;
+  }
+
+  Map<String, String>? get requestHeaders => null;
+
+  Future<Response> sourceRequest(String url) async {
+    if (requestHeaders != null) {
+      var req = Request('GET', Uri.parse(url));
+      req.headers.addAll(requestHeaders!);
+      return Response.fromStream(await Client().send(req));
+    } else {
+      return get(Uri.parse(url));
+    }
+  }
+
+  String sourceSpecificStandardizeURL(String url) {
    throw NotImplementedError();
  }

@ -250,7 +373,7 @@ class AppSource {
      [];

  // Some additional data may be needed for Apps regardless of Source
-  final List<List<GeneratedFormItem>>
+  List<List<GeneratedFormItem>>
      additionalAppSpecificSourceAgnosticSettingFormItems = [
    [
      GeneratedFormSwitch(
@ -279,7 +402,12 @@ class AppSource {
              return regExValidator(value);
            }
          ])
-    ]
+    ],
+    [
+      GeneratedFormSwitch('autoApkFilterByArch',
+          label: tr('autoApkFilterByArch'), defaultValue: true)
+    ],
+    [GeneratedFormTextField('appName', label: tr('appName'), required: false)]
  ];

  // Previous 2 variables combined into one at runtime for convenient usage
@ -297,17 +425,18 @@ class AppSource {
    return null;
  }

-  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
    return apkUrl;
  }

  bool canSearch = false;
-  Future<Map<String, String>> search(String query) {
+  Future<Map<String, List<String>>> search(String query) {
    throw NotImplementedError();
  }

-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
    return null;
  }
 }
@ -320,7 +449,7 @@ ObtainiumError getObtainiumHttpError(Response res) {
 abstract class MassAppUrlSource {
  late String name;
  late List<String> requiredArgs;
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(List<String> args);
 }

 regExValidator(String? value) {
@ -337,33 +466,48 @@ regExValidator(String? value) {

 class SourceProvider {
  // Add more source classes here so they are available via the service
-  List<AppSource> sources = [
-    GitHub(),
-    GitLab(),
-    Codeberg(),
-    FDroid(),
-    IzzyOnDroid(),
-    FDroidRepo(),
-    SourceForge(),
-    APKMirror(),
-    Mullvad(),
-    Signal(),
-    VLC(),
-    // WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
-    TelegramApp(),
-    SteamMobile(),
-    NeutronCode(),
-    HTML() // This should ALWAYS be the last option as they are tried in order
-  ];
+  List<AppSource> get sources => [
+        GitHub(),
+        GitLab(),
+        Codeberg(),
+        FDroid(),
+        IzzyOnDroid(),
+        FDroidRepo(),
+        Jenkins(),
+        SourceForge(),
+        SourceHut(),
+        APKMirror(),
+        APKPure(),
+        // APKCombo(), // Can't get past their scraping blocking yet (get 403 Forbidden)
+        Mullvad(),
+        Signal(),
+        VLC(),
+        // WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
+        TelegramApp(),
+        SteamMobile(),
+        NeutronCode(),
+        HTML() // This should ALWAYS be the last option as they are tried in order
+      ];

  // Add more mass url source classes here so they are available via the service
  List<MassAppUrlSource> massUrlSources = [GitHubStars()];

-  AppSource getSource(String url) {
+  AppSource getSource(String url, {String? overrideSource}) {
    url = preStandardizeUrl(url);
+    if (overrideSource != null) {
+      var srcs =
+          sources.where((e) => e.runtimeType.toString() == overrideSource);
+      if (srcs.isEmpty) {
+        throw UnsupportedURLError();
+      }
+      var res = srcs.first;
+      res.host = Uri.parse(url).host;
+      res.hostChanged = true;
+      return srcs.first;
+    }
    AppSource? source;
    for (var s in sources.where((element) => element.host != null)) {
-      if (url.contains('://${s.host}')) {
+      if (RegExp('://${s.host}(/|\\z)?').hasMatch(url)) {
        source = s;
        break;
      }
@ -371,7 +515,7 @@ class SourceProvider {
    if (source == null) {
      for (var s in sources.where((element) => element.host == null)) {
        try {
-          s.standardizeURL(url);
+          s.sourceSpecificStandardizeURL(url);
          source = s;
          break;
        } catch (e) {
@ -407,12 +551,15 @@ class SourceProvider {

  Future<App> getApp(
      AppSource source, String url, Map<String, dynamic> additionalSettings,
-      {App? currentApp, bool trackOnlyOverride = false}) async {
+      {App? currentApp,
+      bool trackOnlyOverride = false,
+      String? overrideSource,
+      bool inferAppIdIfOptional = false}) async {
    if (trackOnlyOverride || source.enforceTrackOnly) {
      additionalSettings['trackOnly'] = true;
    }
    var trackOnly = additionalSettings['trackOnly'] == true;
-    String standardUrl = source.standardizeURL(preStandardizeUrl(url));
+    String standardUrl = source.standardizeUrl(url);
    APKDetails apk =
        await source.getLatestAPKDetails(standardUrl, additionalSettings);
    if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
@ -422,24 +569,40 @@ class SourceProvider {
    if (additionalSettings['apkFilterRegEx'] != null) {
      var reg = RegExp(additionalSettings['apkFilterRegEx']);
      apk.apkUrls =
-          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
    }
    if (apk.apkUrls.isEmpty && !trackOnly) {
      throw NoAPKError();
    }
+    if (apk.apkUrls.length > 1 &&
+        additionalSettings['autoApkFilterByArch'] == true) {
+      var abis = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+      for (var abi in abis) {
+        var urls2 = apk.apkUrls
+            .where((element) => RegExp('.*$abi.*').hasMatch(element.key))
+            .toList();
+        if (urls2.isNotEmpty && urls2.length < apk.apkUrls.length) {
+          apk.apkUrls = urls2;
+          break;
+        }
+      }
+    }
    String apkVersion = apk.version.replaceAll('/', '-');
-    var name = currentApp?.name.trim() ??
-        apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
+    var name = currentApp != null ? currentApp.name.trim() : '';
+    name = name.isNotEmpty
+        ? name
+        : apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
    return App(
        currentApp?.id ??
-            source.tryInferringAppId(standardUrl,
-                additionalSettings: additionalSettings) ??
+            ((!source.appIdInferIsOptional ||
+                    (source.appIdInferIsOptional && inferAppIdIfOptional))
+                ? await source.tryInferringAppId(standardUrl,
+                    additionalSettings: additionalSettings)
+                : null) ??
            generateTempID(standardUrl, additionalSettings),
        standardUrl,
        apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
-        name.trim().isNotEmpty
-            ? name
-            : apk.names.name[0].toUpperCase() + apk.names.name.substring(1),
+        name,
        currentApp?.installedVersion,
        apkVersion,
        apk.apkUrls,
@ -449,16 +612,20 @@ class SourceProvider {
        currentApp?.pinned ?? false,
        categories: currentApp?.categories ?? const [],
        releaseDate: apk.releaseDate,
-        changeLog: apk.changeLog);
+        changeLog: apk.changeLog,
+        overrideSource: overrideSource ?? currentApp?.overrideSource);
  }

  // Returns errors in [results, errors] instead of throwing them
  Future<List<dynamic>> getAppsByURLNaive(List<String> urls,
-      {List<String> ignoreUrls = const []}) async {
+      {List<String> alreadyAddedUrls = const []}) async {
    List<App> apps = [];
    Map<String, dynamic> errors = {};
-    for (var url in urls.where((element) => !ignoreUrls.contains(element))) {
+    for (var url in urls) {
      try {
+        if (alreadyAddedUrls.contains(url)) {
+          throw ObtainiumError(tr('appAlreadyAdded'));
+        }
        var source = getSource(url);
        apps.add(await getApp(
            source,
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,18 +5,27 @@ packages:
    dependency: "direct main"
    description:
      name: android_alarm_manager_plus
-      sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2"
+      sha256: "80f963d47cb7ab0818144c7b0668aea4c038f9cb8626626e89a4ea77375defb7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "3.0.1"
  android_intent_plus:
    dependency: "direct main"
    description:
      name: android_intent_plus
-      sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af"
+      sha256: "2c87d8330ba5deef5fe20e77f4d178190b3b24531dce08368030ab4be40a9d4e"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.6"
+    version: "4.0.1"
+  android_package_installer:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: main
+      resolved-ref: f09c79eee5be3c60b04760143eb954a13fdd07f1
+      url: "https://github.com/ImranR98/android_package_installer"
+    source: git
+    version: "0.0.1"
  animations:
    dependency: "direct main"
    description:
@ -25,22 +34,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.7"
+  archive:
+    dependency: "direct main"
+    description:
+      name: archive
+      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.7"
  args:
    dependency: transitive
    description:
      name: args
-      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
+      sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  async:
    dependency: transitive
    description:
      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
  boolean_selector:
    dependency: transitive
    description:
@ -53,10 +70,26 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
  clock:
    dependency: transitive
    description:
@ -69,10 +102,18 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
  cross_file:
    dependency: transitive
    description:
@ -85,18 +126,18 @@ packages:
    dependency: transitive
    description:
      name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  csslib:
    dependency: transitive
    description:
      name: csslib
-      sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
+      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.2"
+    version: "0.17.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -117,10 +158,10 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
+      sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.0"
+    version: "9.0.2"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
@ -133,18 +174,18 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b
+      sha256: "74dff1435a695887ca64899b8990004f8d1232b0e84bfc4faa1fdda7c6f57cc1"
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.2"
+    version: "1.6.5"
  easy_localization:
    dependency: "direct main"
    description:
      name: easy_localization
-      sha256: "6a2e99fa0bfe5765bf4c6ca9b137d5de2c75593007178c5e4cd2ae985f870080"
+      sha256: "30ebf25448ffe169e0bd9bc4b5da94faa8398967a2ad2ca09f438be8b6953645"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  easy_logger:
    dependency: transitive
    description:
@ -165,10 +206,10 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
  file:
    dependency: transitive
    description:
@ -181,10 +222,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013
+      sha256: "9d6e95ec73abbd31ec54d0e0df8a961017e165aba1395e462e5b31ea0c165daf"
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.6"
+    version: "5.3.1"
  flutter:
    dependency: "direct main"
    description: flutter
@ -198,6 +239,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.2.2"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.1"
  flutter_lints:
    dependency: "direct dev"
    description:
@ -210,26 +259,26 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: "293995f94e120c8afce768981bd1fa9c5d6de67c547568e3b42ae2defdcbb4a0"
+      sha256: "812791d43ccfc1b443a0d39fa02a206fc228c597e28ff9337e09e3ca8d370391"
      url: "https://pub.dev"
    source: hosted
-    version: "13.0.0"
+    version: "14.1.1"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
-      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
+      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0+1"
+    version: "4.0.0+1"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
-      sha256: "5ec1feac5f7f7d9266759488bc5f76416152baba9aa1b26fe572246caa00d1ab"
+      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.0"
+    version: "7.0.0+1"
  flutter_localizations:
    dependency: transitive
    description: flutter
@ -239,18 +288,18 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_markdown
-      sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f"
+      sha256: dc6d5258653f6857135b32896ccda7f7af0c54dcec832495ad6835154c6c77c0
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.14"
+    version: "0.6.15"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.15"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -265,26 +314,26 @@ packages:
    dependency: "direct main"
    description:
      name: fluttertoast
-      sha256: "2f9c4d3f4836421f7067a28f8939814597b27614e021da9d63e5d3fb6e212d25"
+      sha256: "474f7d506230897a3cd28c965ec21c5328ae5605fc9c400cd330e9e9d6ac175c"
      url: "https://pub.dev"
    source: hosted
-    version: "8.2.1"
+    version: "8.2.2"
  html:
    dependency: "direct main"
    description:
      name: html
-      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
+      sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8"
      url: "https://pub.dev"
    source: hosted
-    version: "0.15.2"
+    version: "0.15.3"
  http:
    dependency: "direct main"
    description:
      name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "4c3f04bfb64d3efd508d06b41b825542f08122d30bda4933fb95c069d22a4fa3"
      url: "https://pub.dev"
    source: hosted
-    version: "0.13.5"
+    version: "1.0.0"
  http_parser:
    dependency: transitive
    description:
@ -293,14 +342,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.0.2"
-  install_plugin_v2:
-    dependency: "direct main"
+  image:
+    dependency: transitive
    description:
-      name: install_plugin_v2
-      sha256: d6b014637e7a53839e9c5a254f9fd9bb8866392c6db1f16184ce17818cc2d979
+      name: image
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0"
+    version: "4.0.17"
  installed_apps:
    dependency: "direct main"
    description:
@ -313,42 +362,50 @@ packages:
    dependency: transitive
    description:
      name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
  js:
    dependency: transitive
    description:
      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.8.1"
  lints:
    dependency: transitive
    description:
      name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "2.1.1"
  markdown:
    dependency: transitive
    description:
      name: markdown
-      sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b
+      sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.1"
+    version: "7.1.0"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
  material_color_utilities:
    dependency: transitive
    description:
@ -361,10 +418,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
  mime:
    dependency: transitive
    description:
@ -401,42 +458,42 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
  path_provider:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
+      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.13"
+    version: "2.0.15"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
+      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.24"
+    version: "2.0.27"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059"
+      sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.0"
+    version: "2.2.3"
  path_provider_linux:
    dependency: transitive
    description:
      name: path_provider_linux
-      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
+      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.10"
+    version: "2.1.11"
  path_provider_platform_interface:
    dependency: transitive
    description:
@ -449,10 +506,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
  permission_handler:
    dependency: "direct main"
    description:
@ -465,18 +522,18 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: "8028362b40c4a45298f1cbfccd227c8dd6caf0e27088a69f2ba2ab15464159e2"
+      sha256: d8cc6a62ded6d0f49c6eac337e080b066ee3bce4d405bd9439a61e1f1927bfe8
      url: "https://pub.dev"
    source: hosted
-    version: "10.2.0"
+    version: "10.2.1"
  permission_handler_apple:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163"
+      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
      url: "https://pub.dev"
    source: hosted
-    version: "9.0.7"
+    version: "9.0.8"
  permission_handler_platform_interface:
    dependency: transitive
    description:
@ -497,10 +554,10 @@ packages:
    dependency: transitive
    description:
      name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
      url: "https://pub.dev"
    source: hosted
-    version: "5.1.0"
+    version: "5.4.0"
  platform:
    dependency: transitive
    description:
@ -517,6 +574,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.4"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.7.3"
  process:
    dependency: transitive
    description:
@ -537,74 +602,74 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.1"
+    version: "7.0.2"
  share_plus_platform_interface:
    dependency: transitive
    description:
      name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
+      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  shared_preferences:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
+      sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.18"
+    version: "2.1.1"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
+      sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.17"
+    version: "2.1.4"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
+      sha256: e014107bb79d6d3297196f4f2d0db54b5d1f85b8ea8ff63b8e8b391a02700feb
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.2.2"
  shared_preferences_linux:
    dependency: transitive
    description:
      name: shared_preferences_linux
-      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
+      sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
  shared_preferences_platform_interface:
    dependency: transitive
    description:
      name: shared_preferences_platform_interface
-      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
+      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
  shared_preferences_web:
    dependency: transitive
    description:
      name: shared_preferences_web
-      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
+      sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
  shared_preferences_windows:
    dependency: transitive
    description:
      name: shared_preferences_windows
-      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
+      sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
  sky_engine:
    dependency: transitive
    description: flutter
@ -622,18 +687,18 @@ packages:
    dependency: "direct main"
    description:
      name: sqflite
-      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
+      sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.6"
+    version: "2.2.8+4"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
+      sha256: e77abf6ff961d69dfef41daccbb66b51e9983cdd5cb35bf30733598057401555
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.3"
+    version: "2.4.5"
  stack_trace:
    dependency: transitive
    description:
@ -662,10 +727,10 @@ packages:
    dependency: transitive
    description:
      name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
  term_glyph:
    dependency: transitive
    description:
@ -678,66 +743,66 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
  timezone:
    dependency: transitive
    description:
      name: timezone
-      sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964"
+      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.1"
+    version: "0.9.2"
  typed_data:
    dependency: transitive
    description:
      name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
  url_launcher:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
+      sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.10"
+    version: "6.1.11"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1"
+      sha256: eed4e6a1164aa9794409325c3b707ff424d4d1c2a785e7db67f8bbda00e36e51
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.25"
+    version: "6.0.35"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
+      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@ -750,18 +815,18 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
+      sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.16"
+    version: "2.0.17"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
+      sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  uuid:
    dependency: transitive
    description:
@ -782,58 +847,74 @@ packages:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: "47663d51a9061451aa3880a214ee9a65dcbb933b77bc44388e194279ab3ccaf6"
+      sha256: "5604dac1178680a34fbe4a08c7b69ec42cca6601dc300009ec9ff69bef284cc2"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.7"
+    version: "4.2.1"
  webview_flutter_android:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: "34f83c2f0f64c75ad75c77a2ccfc8d2e531afbe8ad41af1fd787d6d33336aa90"
+      sha256: "57a22c86065375c1598b57224f92d6008141be0c877c64100de8bfb6f71083d8"
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.3"
+    version: "3.7.1"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
+      sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.3.1"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: ab12479f7a0cf112b9420c36aaf206a1ca47cd60cd42de74a4be2e97a697587b
+      sha256: "6bbc6ade302b842999b27cbaa7171241c273deea8a9c73f92ceb3d811c767de2"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.4.4"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.3"
+    version: "4.1.4"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "1c52f994bdccb77103a6231ad4ea331a244dbcef5d1f37d8462f713143b0bfae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0+3"
+    version: "1.0.0"
  xml:
    dependency: transitive
    description:
      name: xml
-      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.2"
+    version: "6.3.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
 sdks:
-  dart: ">=2.18.2 <3.0.0"
+  dart: ">=3.0.0 <4.0.0"
  flutter: ">=3.4.0-17.0.pre"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.11.14+135 # When changing this, update the tag in main() accordingly
+version: 0.13.8+172 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=2.18.2 <3.0.0'
@ -38,9 +38,9 @@ dependencies:
  cupertino_icons: ^1.0.5
  path_provider: ^2.0.11
  flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^13.0.0
+  flutter_local_notifications: ^14.0.0+1
  provider: ^6.0.3
-  http: ^0.13.5
+  http: ^1.0.0
  webview_flutter: ^4.0.0
  dynamic_color: ^1.5.4
  html: ^0.15.0
@ -48,23 +48,28 @@ dependencies:
  url_launcher: ^6.1.5
  permission_handler: ^10.0.0
  fluttertoast: ^8.0.9
-  device_info_plus: ^8.0.0
-  file_picker: ^5.1.0
+  device_info_plus: ^9.0.0
+  file_picker: ^5.2.10
  animations: ^2.0.4
-  install_plugin_v2: ^1.0.0
-  share_plus: ^6.0.1
+  android_package_installer:
+    git:
+      url: https://github.com/ImranR98/android_package_installer
+      ref: main
+  share_plus: ^7.0.0
  installed_apps: ^1.3.1
  package_archive_info: ^0.1.0
-  android_alarm_manager_plus: ^2.1.0
+  android_alarm_manager_plus: ^3.0.0
  sqflite: ^2.2.0+3
  easy_localization: ^3.0.1
-  android_intent_plus: ^3.1.5
+  android_intent_plus: ^4.0.0
  flutter_markdown: ^0.6.14
+  archive: ^3.3.7


 dev_dependencies:
  flutter_test:
    sdk: flutter
+  flutter_launcher_icons: ^0.13.1

  # The "flutter_lints" package below contains a set of recommended lints to
  # encourage good coding practices. The lint set provided by the package is
@ -73,6 +78,10 @@ dev_dependencies:
  # rules and activating additional ones.
  flutter_lints: ^2.0.1

+flutter_launcher_icons:
+  android: "ic_launcher"
+  image_path: "assets/graphics/icon.png"
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

@ -92,6 +101,7 @@ flutter:
  assets:
    - assets/translations/
    - assets/graphics/
+    - assets/ca/

  # An image asset can refer to one or more resolution-specific "variants", see
  # https://flutter.dev/assets-and-images/#resolution-aware