diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index c1209291a..7b0990bcf 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
diff --git a/.github/workflows/quality-check.yml b/.github/workflows/quality-check.yml
index 80bc4a5ca..7265b74c5 100644
--- a/.github/workflows/quality-check.yml
+++ b/.github/workflows/quality-check.yml
@@ -23,7 +23,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Get Flutter packages
         run: scripts/pub_get_all.sh
@@ -59,17 +59,17 @@ jobs:
       # Building relies on the Android Gradle plugin,
       # which requires a modern Java version (not the default one).
       - name: Set up JDK for Android Gradle plugin
-        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: 'temurin'
           java-version: '21'
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -83,6 +83,6 @@ jobs:
           ./flutterw build apk --profile -t lib/main_play.dart --flavor play
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 461911e04..6c51209fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,13 +23,13 @@ jobs:
       # Building relies on the Android Gradle plugin,
       # which requires a modern Java version (not the default one).
       - name: Set up JDK for Android Gradle plugin
-        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: 'temurin'
           java-version: '21'
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Get Flutter packages
         run: scripts/pub_get_all.sh
@@ -80,7 +80,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload app bundle
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
         with:
           name: appbundle
           path: outputs/app-play-release.aab
@@ -96,7 +96,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Get appbundle from artifacts
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index a71b2294a..7bbfaa3a0 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           persist-credentials: false
 
@@ -63,7 +63,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
         with:
           name: SARIF file
           path: results.sarif
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           sarif_file: results.sarif
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 752ec0678..8c44780f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
+## <a id="v1.11.14"></a>[v1.11.14] - 2024-10-09
+
+### Added
+
+- Map: OpenTopoMap raster layer
+- Map: OSM Liberty vector layer (hosted by OSM Americana)
+- Interoperability: receiving `geo:` URI generally opens map page at location
+- Interoperability: receiving `geo:` URI when editing item location fills in coordinates
+- Map basic app shortcut
+- Enterprise: support for work profile switching from the drawer
+- Settings: hidden path filters are merged with others and can be toggled
+
+### Removed
+
+- `Safe mode` basic app shortcut
+
+### Fixed
+
+- hanging when cataloguing some JPEG MPF images
+- Apple HDR image detection
+
 ## <a id="v1.11.13"></a>[v1.11.13] - 2024-09-17
 
 ### Added
@@ -1126,6 +1147,7 @@ All notable changes to this project will be documented in this file.
 
 - app launching on some devices
 - corrupting motion photo exif editing (e.g. rotation)
+- accessing files in `Download` directory when not using reference case
 
 ## [v1.4.9] - 2021-08-20
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index d4f4380d2..f9925ff6f 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -36,3 +36,8 @@ linter:
     prefer_single_quotes: true
     sort_child_properties_last: true
     unawaited_futures: true
+
+    # `const` related, included
+    prefer_const_constructors: true
+    prefer_const_literals_to_create_immutables: true
+    prefer_const_declarations: true
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 897c3c32d..2bf34a887 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -10,18 +10,6 @@ plugins {
 
 def packageName = "deckers.thibault.aves"
 
-// Flutter properties
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-
 // Keys
 
 def keystoreProperties = new Properties()
@@ -53,22 +41,12 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
 
-    lint {
-        checkAllWarnings true
-        warningsAsErrors true
-        disable 'InvalidPackage'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     defaultConfig {
         applicationId packageName
         minSdk flutter.minSdkVersion
         targetSdk 35
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        versionCode flutter.versionCode
+        versionName flutter.versionName
         manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "<NONE>"]
         multiDexEnabled true
     }
@@ -189,7 +167,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.5'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.6'
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 229782b9d..2cc029d5d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -39,6 +39,10 @@
     <uses-permission
         android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING"
         tools:ignore="SystemPermissionTypo" />
+    <!-- to switch between regular and work profiles -->
+    <uses-permission
+        android:name="android.permission.INTERACT_ACROSS_PROFILES"
+        tools:ignore="ProtectedPermissions" />
     <!-- TODO TLAD still needed to fetch map tiles / reverse geocoding / else ? check in release mode -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- from Android 12 (API 31), users can optionally grant access to the media management special permission -->
@@ -179,6 +183,13 @@
                 <data android:scheme="content" />
                 <data android:scheme="file" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="geo" />
+            </intent-filter>
             <!--
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
index 1d9844578..ea584b537 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -1,6 +1,7 @@
 package deckers.thibault.aves
 
 import android.annotation.SuppressLint
+import android.app.KeyguardManager
 import android.app.SearchManager
 import android.appwidget.AppWidgetManager
 import android.content.ClipData
@@ -23,6 +24,7 @@ import deckers.thibault.aves.channel.AvesByteSendingMethodCodec
 import deckers.thibault.aves.channel.calls.AccessibilityHandler
 import deckers.thibault.aves.channel.calls.AnalysisHandler
 import deckers.thibault.aves.channel.calls.AppAdapterHandler
+import deckers.thibault.aves.channel.calls.AppProfileHandler
 import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
 import deckers.thibault.aves.channel.calls.DebugHandler
 import deckers.thibault.aves.channel.calls.DeviceHandler
@@ -142,6 +144,7 @@ open class MainActivity : FlutterFragmentActivity() {
         MethodChannel(messenger, MetadataEditHandler.CHANNEL).setMethodCallHandler(MetadataEditHandler(this))
         MethodChannel(messenger, WallpaperHandler.CHANNEL).setMethodCallHandler(WallpaperHandler(this))
         // - need Activity
+        MethodChannel(messenger, AppProfileHandler.CHANNEL).setMethodCallHandler(AppProfileHandler(this))
         MethodChannel(messenger, WindowHandler.CHANNEL).setMethodCallHandler(ActivityWindowHandler(this))
 
         // result streaming: dart -> platform ->->-> dart
@@ -293,14 +296,11 @@ open class MainActivity : FlutterFragmentActivity() {
     open fun extractIntentData(intent: Intent?): FieldMap {
         when (val action = intent?.action) {
             Intent.ACTION_MAIN -> {
-                val fields = HashMap<String, Any?>()
-                if (intent.getBooleanExtra(EXTRA_KEY_SAFE_MODE, false)) {
-                    fields[INTENT_DATA_KEY_SAFE_MODE] = true
-                }
-                fields[INTENT_DATA_KEY_PAGE] = intent.getStringExtra(EXTRA_KEY_PAGE)
-                fields[INTENT_DATA_KEY_FILTERS] = extractFiltersFromIntent(intent)
-                fields[INTENT_DATA_KEY_EXPLORER_PATH] = intent.getStringExtra(EXTRA_KEY_EXPLORER_PATH)
-                return fields
+                return hashMapOf(
+                    INTENT_DATA_KEY_PAGE to intent.getStringExtra(EXTRA_KEY_PAGE),
+                    INTENT_DATA_KEY_FILTERS to extractFiltersFromIntent(intent),
+                    INTENT_DATA_KEY_EXPLORER_PATH to intent.getStringExtra(EXTRA_KEY_EXPLORER_PATH),
+                )
             }
 
             Intent.ACTION_VIEW,
@@ -310,6 +310,13 @@ open class MainActivity : FlutterFragmentActivity() {
             "com.android.camera.action.REVIEW",
             "com.android.camera.action.SPLIT_SCREEN_REVIEW" -> {
                 (intent.data ?: intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM))?.let { uri ->
+                    if (uri.scheme == "geo") {
+                        return hashMapOf(
+                            INTENT_DATA_KEY_ACTION to INTENT_ACTION_VIEW_GEO,
+                            INTENT_DATA_KEY_URI to uri.toString(),
+                        )
+                    }
+
                     // MIME type is optional
                     val type = intent.type ?: intent.resolveType(this)
                     val fields = hashMapOf<String, Any?>(
@@ -318,7 +325,7 @@ open class MainActivity : FlutterFragmentActivity() {
                         INTENT_DATA_KEY_URI to uri.toString(),
                     )
 
-                    val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as android.app.KeyguardManager
+                    val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
                     val isLocked = keyguardManager.isKeyguardLocked
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
                         setShowWhenLocked(isLocked)
@@ -427,7 +434,7 @@ open class MainActivity : FlutterFragmentActivity() {
         val pickedUris = call.argument<List<String>>("uris")
         try {
             if (!pickedUris.isNullOrEmpty()) {
-                val toUri = { uriString: String -> AppAdapterHandler.getShareableUri(this, Uri.parse(uriString)) }
+                val toUri = { uriString: String -> AppAdapterHandler.getShareableUri(this@MainActivity, Uri.parse(uriString)) }
                 val intent = Intent().apply {
                     val firstUri = toUri(pickedUris.first())
                     if (pickedUris.size == 1) {
@@ -445,7 +452,8 @@ open class MainActivity : FlutterFragmentActivity() {
             } else {
                 setResult(RESULT_CANCELED)
             }
-            finish()
+            // move code triggering `Binder` call off the main thread
+            defaultScope.launch { finish() }
         } catch (e: Exception) {
             if (e is TransactionTooLargeException || e.cause is TransactionTooLargeException) {
                 result.error("submitPickedItems-large", "transaction too large with ${pickedUris?.size} URIs", e)
@@ -481,30 +489,30 @@ open class MainActivity : FlutterFragmentActivity() {
             .setIcon(IconCompat.createWithResource(this, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_search else R.drawable.ic_shortcut_search))
             .setIntent(
                 Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
-                    .putExtra(EXTRA_KEY_PAGE, "/search")
+                    .putExtra(EXTRA_KEY_PAGE, SEARCH_PAGE_ROUTE_NAME)
             )
             .build()
 
-        val videos = ShortcutInfoCompat.Builder(this, "videos")
-            .setShortLabel(getString(R.string.videos_shortcut_short_label))
-            .setIcon(IconCompat.createWithResource(this, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_movie else R.drawable.ic_shortcut_movie))
+        val map = ShortcutInfoCompat.Builder(this, "map")
+            .setShortLabel(getString(R.string.map_shortcut_short_label))
+            .setIcon(IconCompat.createWithResource(this, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_map else R.drawable.ic_shortcut_map))
             .setIntent(
                 Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
-                    .putExtra(EXTRA_KEY_PAGE, "/collection")
-                    .putExtra("filters", arrayOf("{\"type\":\"mime\",\"mime\":\"video/*\"}"))
+                    .putExtra(EXTRA_KEY_PAGE, MAP_PAGE_ROUTE_NAME)
             )
             .build()
 
-        val safeMode = ShortcutInfoCompat.Builder(this, "safeMode")
-            .setShortLabel(getString(R.string.safe_mode_shortcut_short_label))
-            .setIcon(IconCompat.createWithResource(this, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_safe_mode else R.drawable.ic_shortcut_safe_mode))
+        val videos = ShortcutInfoCompat.Builder(this, "videos")
+            .setShortLabel(getString(R.string.videos_shortcut_short_label))
+            .setIcon(IconCompat.createWithResource(this, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_movie else R.drawable.ic_shortcut_movie))
             .setIntent(
                 Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
-                    .putExtra(EXTRA_KEY_SAFE_MODE, true)
+                    .putExtra(EXTRA_KEY_PAGE, COLLECTION_PAGE_ROUTE_NAME)
+                    .putExtra("filters", arrayOf("{\"type\":\"mime\",\"mime\":\"video/*\"}"))
             )
             .build()
 
-        val shortcutInfoList = listOf(videos, search, safeMode)
+        val shortcutInfoList = listOf(videos, search, map)
         ShortcutManagerCompat.setDynamicShortcuts(this, shortcutInfoList)
         Log.i(LOG_TAG, "set shortcuts: ${shortcutInfoList.joinToString(", ") { v -> v.id }}")
     }
@@ -534,6 +542,7 @@ open class MainActivity : FlutterFragmentActivity() {
         const val INTENT_ACTION_SEARCH = "search"
         const val INTENT_ACTION_SET_WALLPAPER = "set_wallpaper"
         const val INTENT_ACTION_VIEW = "view"
+        const val INTENT_ACTION_VIEW_GEO = "view_geo"
         const val INTENT_ACTION_WIDGET_OPEN = "widget_open"
         const val INTENT_ACTION_WIDGET_SETTINGS = "widget_settings"
 
@@ -545,7 +554,6 @@ open class MainActivity : FlutterFragmentActivity() {
         const val INTENT_DATA_KEY_MIME_TYPE = "mimeType"
         const val INTENT_DATA_KEY_PAGE = "page"
         const val INTENT_DATA_KEY_QUERY = "query"
-        const val INTENT_DATA_KEY_SAFE_MODE = "safeMode"
         const val INTENT_DATA_KEY_SECURE_URIS = "secureUris"
         const val INTENT_DATA_KEY_URI = "uri"
         const val INTENT_DATA_KEY_WIDGET_ID = "widgetId"
@@ -554,9 +562,13 @@ open class MainActivity : FlutterFragmentActivity() {
         const val EXTRA_KEY_EXPLORER_PATH = "explorerPath"
         const val EXTRA_KEY_FILTERS_ARRAY = "filters"
         const val EXTRA_KEY_FILTERS_STRING = "filtersString"
-        const val EXTRA_KEY_SAFE_MODE = "safeMode"
         const val EXTRA_KEY_WIDGET_ID = "widgetId"
 
+        // dart page routes
+        const val COLLECTION_PAGE_ROUTE_NAME = "/collection"
+        const val MAP_PAGE_ROUTE_NAME = "/map"
+        const val SEARCH_PAGE_ROUTE_NAME = "/search"
+
         // request code to pending runnable
         val pendingStorageAccessResultHandlers = ConcurrentHashMap<Int, PendingStorageAccessResultHandler>()
 
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
index 1abc8cb32..65c3f38a3 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
@@ -1,6 +1,10 @@
 package deckers.thibault.aves.channel.calls
 
-import android.content.*
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.res.Configuration
 import android.content.res.Resources
@@ -42,7 +46,8 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.util.*
+import java.util.Locale
+import java.util.UUID
 import kotlin.math.roundToInt
 
 class AppAdapterHandler(private val context: Context) : MethodCallHandler {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppProfileHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppProfileHandler.kt
new file mode 100644
index 000000000..41682c0bf
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppProfileHandler.kt
@@ -0,0 +1,97 @@
+package deckers.thibault.aves.channel.calls
+
+import android.app.Activity
+import android.content.Context
+import android.content.pm.CrossProfileApps
+import android.os.Build
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+
+class AppProfileHandler(private val activity: Activity) : MethodCallHandler {
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "canInteractAcrossProfiles" -> safe(call, result, ::canInteractAcrossProfiles)
+            "canRequestInteractAcrossProfiles" -> safe(call, result, ::canRequestInteractAcrossProfiles)
+            "requestInteractAcrossProfiles" -> safe(call, result, ::requestInteractAcrossProfiles)
+            "switchProfile" -> safe(call, result, ::switchProfile)
+            "getProfileSwitchingLabel" -> safe(call, result, ::getProfileSwitchingLabel)
+            "getTargetUserProfiles" -> safe(call, result, ::getTargetUserProfiles)
+            else -> result.notImplemented()
+        }
+    }
+
+    private fun canInteractAcrossProfiles(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            result.success(false)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        result.success(crossProfileApps.canInteractAcrossProfiles())
+    }
+
+    private fun canRequestInteractAcrossProfiles(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            result.success(false)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        result.success(crossProfileApps.canRequestInteractAcrossProfiles())
+    }
+
+    private fun requestInteractAcrossProfiles(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            result.success(false)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        val intent = crossProfileApps.createRequestInteractAcrossProfilesIntent()
+        val started = activity.startActivity(intent)
+
+        result.success(started)
+    }
+
+    private fun switchProfile(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            result.success(false)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        val userHandles = crossProfileApps.targetUserProfiles
+        crossProfileApps.startMainActivity(activity.componentName, userHandles.first())
+        result.success(null)
+    }
+
+    private fun getProfileSwitchingLabel(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            result.success(null)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        val userHandles = crossProfileApps.targetUserProfiles
+        val label = if (userHandles.isEmpty()) "" else crossProfileApps.getProfileSwitchingLabel(userHandles.first())
+
+        result.success(label)
+    }
+
+    private fun getTargetUserProfiles(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            result.success(false)
+            return
+        }
+
+        val crossProfileApps = activity.getSystemService(Context.CROSS_PROFILE_APPS_SERVICE) as CrossProfileApps
+        val userProfiles = crossProfileApps.targetUserProfiles.map { it.toString() }.toList()
+        result.success(userProfiles)
+    }
+
+    companion object {
+        const val CHANNEL = "deckers.thibault/aves/app_profile"
+    }
+}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt
index 16b40c40f..d1db4d173 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt
@@ -6,7 +6,6 @@ import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.os.Build
 import android.util.Log
-import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 import com.adobe.internal.xmp.XMPException
 import com.adobe.internal.xmp.XMPMeta
 import com.adobe.internal.xmp.XMPMetaFactory
@@ -20,7 +19,6 @@ import com.drew.metadata.exif.ExifDirectoryBase
 import com.drew.metadata.exif.ExifIFD0Directory
 import com.drew.metadata.exif.ExifSubIFDDirectory
 import com.drew.metadata.exif.GpsDirectory
-import com.drew.metadata.exif.makernotes.AppleMakernoteDirectory
 import com.drew.metadata.file.FileTypeDirectory
 import com.drew.metadata.gif.GifAnimationDirectory
 import com.drew.metadata.iptc.IptcDirectory
@@ -108,6 +106,7 @@ import java.text.ParseException
 import java.util.Locale
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
+import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 
 class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
     private val ioScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
@@ -164,9 +163,11 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
             }
             // remove this stat as it is not actual XMP data
             dirMap.remove(XmpDirectory().getTagName(XmpDirectory.TAG_XMP_VALUE_COUNT))
-            // add schema prefixes for namespace resolution
-            val prefixes = XMPMetaFactory.getSchemaRegistry().prefixes
-            dirMap["schemaRegistryPrefixes"] = JSONObject(prefixes).toString()
+            if (dirMap.isNotEmpty()) {
+                // add schema prefixes for namespace resolution
+                val prefixes = XMPMetaFactory.getSchemaRegistry().prefixes
+                dirMap["schemaRegistryPrefixes"] = JSONObject(prefixes).toString()
+            }
         }
 
         val mp4UuidDirCount = HashMap<String, Int>()
@@ -660,7 +661,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
                     if (metadata.getDirectoriesOfType(MpEntryDirectory::class.java).count { !it.entry.isThumbnail } > 1) {
                         flags = flags or MASK_IS_MULTIPAGE
 
-                        if (hasAppleHdrGainMap(uri, sizeBytes, metadata)) {
+                        if (hasAppleHdrGainMap(uri, sizeBytes)) {
                             flags = flags or MASK_IS_HDR
                         }
                     }
@@ -789,9 +790,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
         metadataMap[KEY_FLAGS] = flags
     }
 
-    private fun hasAppleHdrGainMap(uri: Uri, sizeBytes: Long?, primaryMetadata: com.drew.metadata.Metadata): Boolean {
-        if (!primaryMetadata.containsDirectoryOfType(AppleMakernoteDirectory::class.java)) return false
-
+    private fun hasAppleHdrGainMap(uri: Uri, sizeBytes: Long?): Boolean {
         val mpEntries = MultiPage.getJpegMpfEntries(context, uri, sizeBytes) ?: return false
         mpEntries.filter { it.type == MpEntry.TYPE_UNDEFINED }.forEach { mpEntry ->
             var dataOffset = mpEntry.dataOffset
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
index 713f10ceb..d87f6076f 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
@@ -21,15 +21,11 @@ class MediaStoreStreamHandler(private val context: Context, arguments: Any?) : E
 
     private var knownEntries: Map<Long?, Int?>? = null
     private var directory: String? = null
-    private var safe: Boolean = false
 
     init {
         if (arguments is Map<*, *>) {
             knownEntries = (arguments["knownEntries"] as? Map<*, *>?)?.map { (it.key as Number?)?.toLong() to it.value as Int? }?.toMap()
             directory = arguments["directory"] as String?
-            // do not use kotlin.collections `getOrDefault` as it crashes on API <24
-            // and there is no warning from Android Studio
-            safe = arguments["safe"] as Boolean? ?: false
         }
     }
 
@@ -63,7 +59,7 @@ class MediaStoreStreamHandler(private val context: Context, arguments: Any?) : E
     }
 
     private fun fetchAll() {
-        MediaStoreImageProvider().fetchAll(context, knownEntries ?: emptyMap(), directory, safe) { success(it) }
+        MediaStoreImageProvider().fetchAll(context, knownEntries ?: emptyMap(), directory) { success(it) }
         endOfStream()
     }
 
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Metadata.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Metadata.kt
index d97314915..f2070c4f3 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Metadata.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Metadata.kt
@@ -2,8 +2,9 @@ package deckers.thibault.aves.metadata
 
 import android.content.Context
 import android.net.Uri
-import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
+import android.util.Log
 import deckers.thibault.aves.utils.FileUtils.transferFrom
+import deckers.thibault.aves.utils.LogUtils
 import deckers.thibault.aves.utils.MimeTypes
 import deckers.thibault.aves.utils.StorageUtils
 import java.io.File
@@ -14,8 +15,11 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 import java.util.regex.Pattern
+import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 
 object Metadata {
+    private val LOG_TAG = LogUtils.createTag<Metadata>()
+
     const val IPTC_MARKER_BYTE: Byte = 0x1c
 
     // Pattern to extract latitude & longitude from a video location tag (cf ISO 6709)
@@ -135,29 +139,42 @@ object Metadata {
 
     private fun getSafeUri(context: Context, uri: Uri, mimeType: String, sizeBytes: Long?): Uri {
         // formats known to yield OOM for large files
-        return if ((MimeTypes.isImage(mimeType) || mimeType == MimeTypes.MP4)) {
-            if (isDangerouslyLarge(sizeBytes)) {
-                // make a preview from the beginning of the file,
-                // hoping the metadata is accessible in the copied chunk
-                var previewFile = previewFiles[uri]
-                if (previewFile == null) {
-                    previewFile = createPreviewFile(context, uri)
-                    previewFiles[uri] = previewFile
+        return when (mimeType) {
+            // formats known to yield OOM for large files
+            MimeTypes.DNG,
+            MimeTypes.DNG_ADOBE,
+            MimeTypes.HEIC,
+            MimeTypes.HEIF,
+            MimeTypes.MP4,
+            MimeTypes.PSD_VND,
+            MimeTypes.PSD_X,
+            MimeTypes.TIFF ->
+                if (isDangerouslyLarge(sizeBytes)) {
+                    Log.d(LOG_TAG, "Dangerously large file with uri=$uri, mimeType=$mimeType, size=$sizeBytes")
+                    // make a preview from the beginning of the file,
+                    // hoping the metadata is accessible in the copied chunk
+                    var previewFile = previewFiles[uri]
+                    if (previewFile == null) {
+                        previewFile = createPreviewFile(context, uri)
+                        previewFiles[uri] = previewFile
+                    }
+                    Uri.fromFile(previewFile)
+                } else {
+                    // small enough to be safe as it is
+                    uri
                 }
-                Uri.fromFile(previewFile)
-            } else {
-                // small enough to be safe as it is
+
+            else ->
+                // *probably* safe
                 uri
-            }
-        } else {
-            // *probably* safe
-            uri
         }
     }
 
     fun createPreviewFile(context: Context, uri: Uri): File {
+        val size = PREVIEW_SIZE
+        Log.d(LOG_TAG, "create preview of size=$size for uri=$uri")
         return StorageUtils.createTempFile(context).apply {
-            transferFrom(StorageUtils.openInputStream(context, uri), PREVIEW_SIZE)
+            transferFrom(StorageUtils.openInputStream(context, uri), size)
         }
     }
 
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt
index 7aea03e08..5aec4ed9c 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt
@@ -9,7 +9,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.ParcelFileDescriptor
 import android.util.Log
-import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 import com.adobe.internal.xmp.XMPMeta
 import com.drew.imaging.jpeg.JpegSegmentType
 import com.drew.metadata.exif.ExifDirectoryBase
@@ -30,6 +29,8 @@ import deckers.thibault.aves.utils.StorageUtils
 import deckers.thibault.aves.utils.indexOfBytes
 import org.beyka.tiffbitmapfactory.TiffBitmapFactory
 import java.io.DataInputStream
+import java.io.EOFException
+import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 
 object MultiPage {
     private val LOG_TAG = LogUtils.createTag<MultiPage>()
@@ -136,21 +137,31 @@ object MultiPage {
     // starts after `[APP2 marker (1 byte)] [segment size (2 bytes)] [MPF marker (4 bytes)]`
     fun getJpegMpfBaseOffset(context: Context, uri: Uri, sizeBytes: Long?): Int? {
         val mimeType = MimeTypes.JPEG
+        val endMarker = 0xFF
         val app2Marker = JpegSegmentType.APP2.byteValue
         val mpfMarker = "MPF".toByteArray() + 0x00
 
         try {
             Metadata.openSafeInputStream(context, uri, mimeType, sizeBytes)?.use { input ->
                 var offset = 0
+                val marker = ByteArray(4)
                 while (true) {
-                    do {
-                        val b = input.read().toByte()
+                    // look for APP2 marker (0xFFE2)
+                    var found = false
+                    while (!found) {
+                        var i = input.read()
+                        if (i == -1) throw EOFException()
                         offset++
-                    } while (b != app2Marker)
+                        if (i == endMarker) {
+                            i = input.read()
+                            if (i == -1) throw EOFException()
+                            offset++
+                            found = i.toByte() == app2Marker
+                        }
+                    }
                     // skip 2 bytes for segment size
                     input.skip(2)
                     offset += 2
-                    val marker = ByteArray(4)
                     input.read(marker, 0, marker.size)
                     offset += 4
                     if (marker.contentEquals(mpfMarker)) {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
index 1be7e4236..37c49accd 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.media.MediaMetadataRetriever
 import android.net.Uri
-import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 import com.drew.metadata.avi.AviDirectory
 import com.drew.metadata.exif.ExifIFD0Directory
 import com.drew.metadata.jpeg.JpegDirectory
@@ -29,6 +28,7 @@ import deckers.thibault.aves.utils.StorageUtils
 import deckers.thibault.aves.utils.UriUtils.tryParseId
 import org.beyka.tiffbitmapfactory.TiffBitmapFactory
 import java.io.IOException
+import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
 
 class SourceEntry {
     private val origin: Int
@@ -116,8 +116,8 @@ class SourceEntry {
     // metadata retrieval
     // expects entry with: uri, mimeType
     // finds: width, height, orientation/rotation, date, title, duration
-    fun fillPreCatalogMetadata(context: Context, safe: Boolean): SourceEntry {
-        if (isSvg || safe) return this
+    fun fillPreCatalogMetadata(context: Context): SourceEntry {
+        if (isSvg) return this
         if (isVideo) {
             fillVideoByMediaMetadataRetriever(context)
             if (isSized && hasDuration) return this
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
index c145737e4..60940ee4f 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
@@ -53,7 +53,7 @@ internal class FileImageProvider : ImageProvider() {
                 return
             }
         }
-        entry.fillPreCatalogMetadata(context, safe = false)
+        entry.fillPreCatalogMetadata(context)
 
         if (allowUnsized || entry.isSized || entry.isSvg || entry.isVideo) {
             callback.onSuccess(entry.toMap())
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
index 39cd9858f..f05e6991f 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
@@ -12,6 +12,7 @@ import android.graphics.BitmapFactory
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
+import android.os.Environment
 import android.provider.MediaStore
 import android.util.Log
 import androidx.annotation.RequiresApi
@@ -51,10 +52,9 @@ class MediaStoreImageProvider : ImageProvider() {
         context: Context,
         knownEntries: Map<Long?, Int?>,
         directory: String?,
-        safe: Boolean,
         handleNewEntry: NewEntryHandler,
     ) {
-        Log.d(LOG_TAG, "fetching all media store items for ${knownEntries.size} known entries, directory=$directory safe=$safe")
+        Log.d(LOG_TAG, "fetching all media store items for ${knownEntries.size} known entries, directory=$directory")
         val isModified = fun(contentId: Long, dateModifiedSecs: Int): Boolean {
             val knownDate = knownEntries[contentId]
             return knownDate == null || knownDate < dateModifiedSecs
@@ -84,8 +84,8 @@ class MediaStoreImageProvider : ImageProvider() {
         } else {
             handleNew = handleNewEntry
         }
-        fetchFrom(context, isModified, handleNew, IMAGE_CONTENT_URI, IMAGE_PROJECTION, selection, selectionArgs, safe = safe)
-        fetchFrom(context, isModified, handleNew, VIDEO_CONTENT_URI, VIDEO_PROJECTION, selection, selectionArgs, safe = safe)
+        fetchFrom(context, isModified, handleNew, IMAGE_CONTENT_URI, IMAGE_PROJECTION, selection, selectionArgs)
+        fetchFrom(context, isModified, handleNew, VIDEO_CONTENT_URI, VIDEO_PROJECTION, selection, selectionArgs)
     }
 
     // the provided URI can point to the wrong media collection,
@@ -208,7 +208,6 @@ class MediaStoreImageProvider : ImageProvider() {
         selection: String? = null,
         selectionArgs: Array<String>? = null,
         fileMimeType: String? = null,
-        safe: Boolean = false,
     ): Boolean {
         var found = false
         val orderBy = "${MediaStore.MediaColumns.DATE_MODIFIED} DESC"
@@ -302,7 +301,7 @@ class MediaStoreImageProvider : ImageProvider() {
                                 // missing some attributes such as width, height, orientation.
                                 // Also, the reported size of raw images is inconsistent across devices
                                 // and Android versions (sometimes the raw size, sometimes the decoded size).
-                                val entry = SourceEntry(entryMap).fillPreCatalogMetadata(context, safe)
+                                val entry = SourceEntry(entryMap).fillPreCatalogMetadata(context)
                                 entryMap = entry.toMap()
                             }
 
@@ -454,10 +453,8 @@ class MediaStoreImageProvider : ImageProvider() {
                 effectiveTargetDir = targetDir
                 targetDirDocFile = StorageUtils.createDirectoryDocIfAbsent(activity, targetDir)
                 if (!File(targetDir).exists()) {
-                    val downloadDirPath = StorageUtils.getDownloadDirPath(activity, targetDir)
-                    val isDownloadSubdir = downloadDirPath != null && targetDir.startsWith(downloadDirPath)
                     // download subdirectories can be created later by Media Store insertion
-                    if (!isDownloadSubdir) {
+                    if (!isDownloadSubdir(activity, targetDir)) {
                         callback.onFailure(Exception("failed to create directory at path=$targetDir"))
                         return
                     }
@@ -627,9 +624,7 @@ class MediaStoreImageProvider : ImageProvider() {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            val downloadDirPath = StorageUtils.getDownloadDirPath(activity, targetDir)
-            val isDownloadSubdir = downloadDirPath != null && targetDir.startsWith(downloadDirPath)
-            if (isDownloadSubdir) {
+            if (isDownloadSubdir(activity, targetDir)) {
                 return insertByMediaStore(
                     activity = activity,
                     targetDir = targetDir,
@@ -649,6 +644,13 @@ class MediaStoreImageProvider : ImageProvider() {
         )
     }
 
+    private fun isDownloadSubdir(context: Context, dir: String): Boolean {
+        val volumePath = StorageUtils.getVolumePath(context, dir) ?: return false
+        val downloadDirPath = ensureTrailingSeparator(File(volumePath, Environment.DIRECTORY_DOWNLOADS).path)
+        // effective download path may have a different case
+        return dir.lowercase().startsWith(downloadDirPath.lowercase())
+    }
+
     private fun insertByFile(
         targetDir: String,
         targetFileName: String,
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/UnknownContentProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/UnknownContentProvider.kt
index 8c8e29ddf..ffcc2400f 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/UnknownContentProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/UnknownContentProvider.kt
@@ -70,7 +70,7 @@ open class UnknownContentProvider : ImageProvider() {
             return
         }
 
-        val entry = SourceEntry(fields).fillPreCatalogMetadata(context, safe = false)
+        val entry = SourceEntry(fields).fillPreCatalogMetadata(context)
         if (allowUnsized || entry.isSized || entry.isSvg || entry.isVideo) {
             callback.onSuccess(entry.toMap())
         } else {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
index c240a5df2..e024acd72 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
@@ -17,8 +17,8 @@ object MimeTypes {
     private const val ICO = "image/x-icon"
     const val JPEG = "image/jpeg"
     const val PNG = "image/png"
-    private const val PSD_VND = "image/vnd.adobe.photoshop"
-    private const val PSD_X = "image/x-photoshop"
+    const val PSD_VND = "image/vnd.adobe.photoshop"
+    const val PSD_X = "image/x-photoshop"
     const val TIFF = "image/tiff"
     private const val WBMP = "image/vnd.wap.wbmp"
     const val WEBP = "image/webp"
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
index 1636543a9..496c898ee 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
@@ -17,6 +17,7 @@ import deckers.thibault.aves.PendingStorageAccessResultHandler
 import deckers.thibault.aves.model.FieldMap
 import deckers.thibault.aves.utils.StorageUtils.PathSegments
 import java.io.File
+import java.util.Locale
 import java.util.concurrent.CompletableFuture
 
 object PermissionManager {
@@ -86,6 +87,7 @@ object PermissionManager {
     fun getInaccessibleDirectories(context: Context, dirPaths: List<String>): List<Map<String, String>> {
         val concreteDirPaths = dirPaths.filter { it != StorageUtils.TRASH_PATH_PLACEHOLDER }
         val accessibleDirs = getAccessibleDirs(context)
+        val restrictedPrimaryDirectoriesLower = getRestrictedPrimaryDirectories().map { it.lowercase(Locale.ROOT) }
 
         // find set of inaccessible directories for each volume
         val dirsPerVolume = HashMap<String, MutableSet<String>>()
@@ -101,7 +103,7 @@ object PermissionManager {
                         if (relativeDir != null) {
                             val dirSegments = relativeDir.split(File.separator).takeWhile { it.isNotEmpty() }
                             val primaryDir = dirSegments.firstOrNull()
-                            if (getRestrictedPrimaryDirectories().contains(primaryDir) && dirSegments.size > 1) {
+                            if (dirSegments.size > 1 && restrictedPrimaryDirectoriesLower.contains(primaryDir?.lowercase(Locale.ROOT))) {
                                 // request secondary directory (if any) for restricted primary directory
                                 val dir = dirSegments.take(2).joinToString(File.separator)
                                 // only register directories that exist on storage, so they can be selected for access grant
@@ -140,10 +142,11 @@ object PermissionManager {
 
     fun canInsertByMediaStore(directories: List<FieldMap>): Boolean {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val insertionDirsLower = MEDIA_STORE_INSERTION_PRIMARY_DIRS.map { it.lowercase(Locale.ROOT) }
             directories.all {
                 val relativeDir = it["relativeDir"] as String
                 val segments = relativeDir.split(File.separator)
-                segments.isNotEmpty() && MEDIA_STORE_INSERTION_PRIMARY_DIRS.contains(segments.first())
+                segments.isNotEmpty() && insertionDirsLower.contains(segments.first().lowercase(Locale.ROOT))
             }
         } else {
             true
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
index d7d4a6011..93f64ccef 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
@@ -120,10 +120,6 @@ object StorageUtils {
         return getVolumePaths(context).firstOrNull { anyPath.startsWith(it) }
     }
 
-    fun getDownloadDirPath(context: Context, anyPath: String): String? {
-        return getVolumePath(context, anyPath)?.let { volumePath -> ensureTrailingSeparator(File(volumePath, Environment.DIRECTORY_DOWNLOADS).path) }
-    }
-
     private fun getPathStepIterator(context: Context, anyPath: String, root: String?): Iterator<String?>? {
         val rootLength = (root ?: getVolumePath(context, anyPath))?.length ?: return null
 
diff --git a/android/app/src/main/res/drawable-v26/ic_shortcut_safe_mode_foreground.xml b/android/app/src/main/res/drawable-v26/ic_shortcut_safe_mode_foreground.xml
deleted file mode 100644
index fe957d665..000000000
--- a/android/app/src/main/res/drawable-v26/ic_shortcut_safe_mode_foreground.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:tint="@color/ic_shortcut_foreground"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:scaleX="1.7226"
-        android:scaleY="1.7226"
-        android:translateX="33.3288"
-        android:translateY="33.3288">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM19.46,9.12l-2.78,1.15c-0.51,-1.36 -1.58,-2.44 -2.95,-2.94l1.15,-2.78C16.98,5.35 18.65,7.02 19.46,9.12zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15zM9.13,4.54l1.17,2.78c-1.38,0.5 -2.47,1.59 -2.98,2.97L4.54,9.13C5.35,7.02 7.02,5.35 9.13,4.54zM4.54,14.87l2.78,-1.15c0.51,1.38 1.59,2.46 2.97,2.96l-1.17,2.78C7.02,18.65 5.35,16.98 4.54,14.87zM14.88,19.46l-1.15,-2.78c1.37,-0.51 2.45,-1.59 2.95,-2.97l2.78,1.17C18.65,16.98 16.98,18.65 14.88,19.46z" />
-    </group>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_shortcut_map.xml b/android/app/src/main/res/drawable/ic_shortcut_map.xml
new file mode 100644
index 000000000..7dc10d15f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_shortcut_map.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/ic_shortcut_background"
+        android:pathData="M0,24 A1,1 0 1,1 48,24 A1,1 0 1,1 0,24" />
+    <group
+        android:translateX="12"
+        android:translateY="12">
+        <path
+            android:fillColor="@color/ic_shortcut_foreground"
+            android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" />
+    </group>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_shortcut_map_foreground.xml b/android/app/src/main/res/drawable/ic_shortcut_map_foreground.xml
new file mode 100644
index 000000000..d450c31dc
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_shortcut_map_foreground.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:tint="@color/ic_shortcut_foreground"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group
+        android:scaleX="1.7226"
+        android:scaleY="1.7226"
+        android:translateX="33.3288"
+        android:translateY="33.3288">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" />
+    </group>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_shortcut_safe_mode.xml b/android/app/src/main/res/drawable/ic_shortcut_safe_mode.xml
deleted file mode 100644
index dc918373c..000000000
--- a/android/app/src/main/res/drawable/ic_shortcut_safe_mode.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-    <path
-        android:fillColor="@color/ic_shortcut_background"
-        android:pathData="M0,24 A1,1 0 1,1 48,24 A1,1 0 1,1 0,24" />
-    <group
-        android:translateX="12"
-        android:translateY="12">
-        <path
-            android:fillColor="@color/ic_shortcut_foreground"
-            android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM19.46,9.12l-2.78,1.15c-0.51,-1.36 -1.58,-2.44 -2.95,-2.94l1.15,-2.78C16.98,5.35 18.65,7.02 19.46,9.12zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15zM9.13,4.54l1.17,2.78c-1.38,0.5 -2.47,1.59 -2.98,2.97L4.54,9.13C5.35,7.02 7.02,5.35 9.13,4.54zM4.54,14.87l2.78,-1.15c0.51,1.38 1.59,2.46 2.97,2.96l-1.17,2.78C7.02,18.65 5.35,16.98 4.54,14.87zM14.88,19.46l-1.15,-2.78c1.37,-0.51 2.45,-1.59 2.95,-2.97l2.78,1.17C18.65,16.98 16.98,18.65 14.88,19.46z" />
-    </group>
-</vector>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_safe_mode.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_map.xml
similarity index 70%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_safe_mode.xml
rename to android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_map.xml
index 40f9ff006..2857b4908 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_safe_mode.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_shortcut_background" />
-    <foreground android:drawable="@drawable/ic_shortcut_safe_mode_foreground" />
+    <foreground android:drawable="@drawable/ic_shortcut_map_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index dd308de11..958d8d391 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -7,6 +7,5 @@
     <string name="analysis_channel_name">فحص الوسائط</string>
     <string name="analysis_notification_default_title">يتم فحص الوسائط</string>
     <string name="analysis_notification_action_stop">إيقاف</string>
-    <string name="safe_mode_shortcut_short_label">الوضع الآمن</string>
     <string name="app_name">Aves</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 5d51f2ea8..cf307df7a 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -6,7 +6,6 @@
     <string name="analysis_notification_default_title">Сканаванне носьбітаў</string>
     <string name="app_name">Aves</string>
     <string name="app_widget_label">Фотарамка</string>
-    <string name="safe_mode_shortcut_short_label">Бяспечны рэжым</string>
     <string name="search_shortcut_short_label">Пошук</string>
     <string name="analysis_notification_action_stop">Стоп</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml
index fe117a80d..936f4ce17 100644
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_action_stop">থামান</string>
     <string name="app_name">আভেস</string>
     <string name="app_widget_label">ছবির ফ্রেম</string>
-    <string name="safe_mode_shortcut_short_label">নিরাপদ মোড</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index bab547c5c..6fca66146 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">Aves</string>
     <string name="app_widget_label">Marc de foto</string>
     <string name="wallpaper">Fons de pantalla</string>
-    <string name="safe_mode_shortcut_short_label">Mode segur</string>
     <string name="search_shortcut_short_label">Buscar</string>
     <string name="videos_shortcut_short_label">Vídeos</string>
     <string name="analysis_channel_name">Exploració de mitjans</string>
diff --git a/android/app/src/main/res/values-ckb/strings.xml b/android/app/src/main/res/values-ckb/strings.xml
index 96a542f80..bb0681dcf 100644
--- a/android/app/src/main/res/values-ckb/strings.xml
+++ b/android/app/src/main/res/values-ckb/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">گەڕان لە پەڕگە</string>
     <string name="analysis_notification_default_title">لە پەڕگەکان دەگەڕێت</string>
     <string name="analysis_notification_action_stop">وەستاندن</string>
-    <string name="safe_mode_shortcut_short_label">دۆخی پارێزراو</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 556ce9d94..0c4e432fe 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_default_title">Prohledávání médií</string>
     <string name="analysis_notification_action_stop">Zastavit</string>
     <string name="app_widget_label">Fotorámeček</string>
-    <string name="safe_mode_shortcut_short_label">Bezpečný režim</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 4bc58abd4..27341f39b 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -7,6 +7,5 @@
     <string name="analysis_notification_default_title">Scanner medier</string>
     <string name="analysis_notification_action_stop">Stop</string>
     <string name="app_name">Aves</string>
-    <string name="safe_mode_shortcut_short_label">Sikker tilstand</string>
     <string name="search_shortcut_short_label">Søg</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 67f33df47..f2f20076c 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Analyse von Medien</string>
     <string name="analysis_notification_default_title">Medien scannen</string>
     <string name="analysis_notification_action_stop">Abbrechen</string>
-    <string name="safe_mode_shortcut_short_label">Sicherer Modus</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 6a15053be..0e29952cc 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Σάρωση πολυμέσων</string>
     <string name="analysis_notification_default_title">Σάρωση στοιχείων</string>
     <string name="analysis_notification_action_stop">Διακοπή</string>
-    <string name="safe_mode_shortcut_short_label">Ασφαλής κατάσταση λειτουργίας</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 960d77cba..6cc0b2852 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_channel_name">Explorar medios</string>
     <string name="analysis_notification_default_title">Explorando medios</string>
     <string name="analysis_notification_action_stop">Anular</string>
-    <string name="safe_mode_shortcut_short_label">Modo seguro</string>
+    <string name="map_shortcut_short_label">Mapa</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 732dd1c98..c8e57d8ef 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_notification_action_stop">Gelditu</string>
     <string name="analysis_notification_default_title">Media eskaneatzen</string>
     <string name="app_name">Aves</string>
-    <string name="safe_mode_shortcut_short_label">Modu segurua</string>
+    <string name="map_shortcut_short_label">Mapa</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 965816bb8..e69a7f2b5 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_action_stop">توقف کردن</string>
     <string name="app_widget_label">قاب عکس</string>
     <string name="app_name">Aves</string>
-    <string name="safe_mode_shortcut_short_label">حالت امن</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 806975148..27295a07f 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -4,7 +4,6 @@
     <string name="app_widget_label">Valokuvakehys</string>
     <string name="analysis_notification_default_title">Mediaan skannataan</string>
     <string name="videos_shortcut_short_label">Videot</string>
-    <string name="safe_mode_shortcut_short_label">Turva tila</string>
     <string name="wallpaper">Taustakuva</string>
     <string name="app_name">Aves</string>
     <string name="analysis_channel_name">Median skannaus</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index fa821f4ea..159a98429 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_channel_name">Analyse des images</string>
     <string name="analysis_notification_default_title">Analyse des images</string>
     <string name="analysis_notification_action_stop">Annuler</string>
-    <string name="safe_mode_shortcut_short_label">Mode sans échec</string>
+    <string name="map_shortcut_short_label">Carte</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 5a8f5920a..0447c8eb1 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">मीडिया जाँचे</string>
     <string name="app_name">ऐवीज</string>
     <string name="videos_shortcut_short_label">वीडियो</string>
-    <string name="safe_mode_shortcut_short_label">सेफ मोड</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 4475c608f..cc2ef43f5 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -6,7 +6,7 @@
     <string name="videos_shortcut_short_label">Videók</string>
     <string name="analysis_notification_action_stop">Állj</string>
     <string name="app_widget_label">Fotó keret</string>
-    <string name="safe_mode_shortcut_short_label">Biztonsági üzemmód</string>
     <string name="analysis_channel_name">Tartalom keresése</string>
     <string name="analysis_notification_default_title">Média beolvasása</string>
+    <string name="map_shortcut_short_label">Térkép</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-id/strings.xml b/android/app/src/main/res/values-id/strings.xml
index 29fc0d54c..421cf304c 100644
--- a/android/app/src/main/res/values-id/strings.xml
+++ b/android/app/src/main/res/values-id/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Pindai media</string>
     <string name="analysis_notification_default_title">Memindai media</string>
     <string name="analysis_notification_action_stop">Berhenti</string>
-    <string name="safe_mode_shortcut_short_label">Mode aman</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 5087337fe..4d8e1be1f 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -4,7 +4,6 @@
     <string name="app_widget_label">Myndarammi</string>
     <string name="analysis_notification_default_title">Skanna myndefni</string>
     <string name="videos_shortcut_short_label">Myndskeið</string>
-    <string name="safe_mode_shortcut_short_label">Öruggur hamur</string>
     <string name="wallpaper">Bakgrunnur</string>
     <string name="app_name">Aves</string>
     <string name="analysis_channel_name">Skönnun myndefnis</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index ac62cd864..4d3bc899d 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Scansione media</string>
     <string name="analysis_notification_default_title">Scansione in corso</string>
     <string name="analysis_notification_action_stop">Annulla</string>
-    <string name="safe_mode_shortcut_short_label">Modalità provvisoria</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index d5f7e4ed4..78d3fec7d 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">メディアスキャン</string>
     <string name="analysis_notification_default_title">メディアをスキャン中</string>
     <string name="analysis_notification_action_stop">停止</string>
-    <string name="safe_mode_shortcut_short_label">セーフモード</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-kn/strings.xml b/android/app/src/main/res/values-kn/strings.xml
index 49b7a9e0c..2d54ecbf4 100644
--- a/android/app/src/main/res/values-kn/strings.xml
+++ b/android/app/src/main/res/values-kn/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">Aves</string>
     <string name="app_widget_label">ಫೋಟೋ ಫ್ರೇಮ್</string>
     <string name="wallpaper">ವಾಲ್ಪೇಪರ್</string>
-    <string name="safe_mode_shortcut_short_label">ಸುರಕ್ಷಿತ ಮೋಡ್</string>
     <string name="videos_shortcut_short_label">ವೀಡಿಯೊಗಳು</string>
     <string name="analysis_channel_name">ಮೀಡಿಯಾ ಸ್ಕ್ಯಾನ್</string>
     <string name="analysis_notification_default_title">ಮೀಡಿಯಾ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 9f19c1398..207fcdace 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_channel_name">미디어 분석</string>
     <string name="analysis_notification_default_title">미디어 분석</string>
     <string name="analysis_notification_action_stop">취소</string>
-    <string name="safe_mode_shortcut_short_label">안전 모드</string>
+    <string name="map_shortcut_short_label">지도</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index 14f06b878..dfacebf6d 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">Aves</string>
     <string name="app_widget_label">ရုပ်ပုံဘောင်</string>
     <string name="wallpaper">နောက်ခံ ရုပ်ပုံ</string>
-    <string name="safe_mode_shortcut_short_label">လုံခြုံရေးလုပ်ဆောင်ချက်</string>
     <string name="analysis_channel_name">မီဒီယာ စကင်</string>
     <string name="search_shortcut_short_label">ရှာရန်</string>
     <string name="videos_shortcut_short_label">ဗီဒီယိုများ</string>
diff --git a/android/app/src/main/res/values-nb-rNO/strings.xml b/android/app/src/main/res/values-nb-rNO/strings.xml
index f9ec90655..fd061b6da 100644
--- a/android/app/src/main/res/values-nb-rNO/strings.xml
+++ b/android/app/src/main/res/values-nb-rNO/strings.xml
@@ -8,5 +8,4 @@
     <string name="wallpaper">Bakgrunnsbilde</string>
     <string name="search_shortcut_short_label">Søk</string>
     <string name="analysis_notification_action_stop">Stopp</string>
-    <string name="safe_mode_shortcut_short_label">Trygt modus</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 46db9f734..103f47131 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_channel_name">Media indexeren</string>
     <string name="analysis_notification_default_title">Media indexeren</string>
     <string name="analysis_notification_action_stop">Stoppen</string>
-    <string name="safe_mode_shortcut_short_label">Veilige modus</string>
+    <string name="map_shortcut_short_label">Kaart</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index f88e6931e..1cc7a698f 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -8,5 +8,5 @@
     <string name="analysis_notification_action_stop">Zatrzymaj</string>
     <string name="app_name">Aves</string>
     <string name="wallpaper">Tapeta</string>
-    <string name="safe_mode_shortcut_short_label">Tryb bezpieczny</string>
+    <string name="map_shortcut_short_label">Mapa</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index b21d75da7..0e887b1bb 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Digitalização de mídia</string>
     <string name="analysis_notification_default_title">Digitalizando mídia</string>
     <string name="analysis_notification_action_stop">Pare</string>
-    <string name="safe_mode_shortcut_short_label">Modo seguro</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index e498222a8..fb90d08a9 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_default_title">Scanarea suporturilor</string>
     <string name="analysis_notification_action_stop">Stop</string>
     <string name="search_shortcut_short_label">Căutare</string>
-    <string name="safe_mode_shortcut_short_label">Modul de siguranță</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index a0e991e96..58e9cc54c 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Сканировать медия</string>
     <string name="analysis_notification_default_title">Сканирование медиа</string>
     <string name="analysis_notification_action_stop">Стоп</string>
-    <string name="safe_mode_shortcut_short_label">Безопасный режим</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 1385c6feb..9a8ac434a 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_action_stop">Zastaviť</string>
     <string name="analysis_channel_name">Skenovanie médií</string>
     <string name="analysis_notification_default_title">Skenovanie média</string>
-    <string name="safe_mode_shortcut_short_label">Bezpečný režim</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-sl/strings.xml b/android/app/src/main/res/values-sl/strings.xml
index e599b09c8..dd0bce100 100644
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="app_widget_label">Okvir za sliko</string>
     <string name="app_name">Aves</string>
-    <string name="safe_mode_shortcut_short_label">Varni način</string>
     <string name="videos_shortcut_short_label">Videoposnetki</string>
     <string name="wallpaper">Ozadje</string>
     <string name="search_shortcut_short_label">Iskanje</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index e38ef13d0..b03879de1 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="app_widget_label">Okvir Slike</string>
     <string name="wallpaper">Pozadina</string>
-    <string name="safe_mode_shortcut_short_label">Siguran režim</string>
     <string name="videos_shortcut_short_label">Snimci</string>
     <string name="analysis_channel_name">Pretraga medija</string>
     <string name="analysis_notification_default_title">Skeniranje medija</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 4028beeb8..fb447efd1 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -3,10 +3,10 @@
     <string name="app_name">Aves</string>
     <string name="app_widget_label">Fotoram</string>
     <string name="wallpaper">Bakgrund</string>
-    <string name="safe_mode_shortcut_short_label">Felsäkert läge</string>
     <string name="videos_shortcut_short_label">Videor</string>
     <string name="analysis_channel_name">Media scanning</string>
     <string name="analysis_notification_default_title">Scannar media</string>
     <string name="analysis_notification_action_stop">Stopp</string>
     <string name="search_shortcut_short_label">Sök</string>
+    <string name="map_shortcut_short_label">Karta</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 85fa22f09..e516cc30b 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">Medya tarama</string>
     <string name="analysis_notification_default_title">Medya taranıyor</string>
     <string name="analysis_notification_action_stop">Durdur</string>
-    <string name="safe_mode_shortcut_short_label">Güvenli mod</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 71b3f03aa..5d33f2d3b 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_notification_action_stop">Стоп</string>
     <string name="app_widget_label">Фоторамка</string>
     <string name="analysis_notification_default_title">Сканування медіа</string>
-    <string name="safe_mode_shortcut_short_label">Безпечний режим</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 0a9af9cbe..367ab8dc2 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -4,7 +4,6 @@
     <string name="app_widget_label">Khung Ảnh</string>
     <string name="analysis_notification_default_title">Đang quét phương tiện</string>
     <string name="videos_shortcut_short_label">Video</string>
-    <string name="safe_mode_shortcut_short_label">Chế độ an toàn</string>
     <string name="wallpaper">Hình nền</string>
     <string name="app_name">Aves</string>
     <string name="analysis_channel_name">Quét phương tiện</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 5dc2ec792..7de20ea26 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -8,5 +8,4 @@
     <string name="search_shortcut_short_label">搜尋</string>
     <string name="analysis_channel_name">媒體掃描</string>
     <string name="analysis_notification_action_stop">停止</string>
-    <string name="safe_mode_shortcut_short_label">安全模式</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index a83bd3e49..c7b9b7185 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -8,5 +8,4 @@
     <string name="analysis_channel_name">媒体扫描</string>
     <string name="analysis_notification_default_title">正在扫描媒体</string>
     <string name="analysis_notification_action_stop">停止</string>
-    <string name="safe_mode_shortcut_short_label">安全模式</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index e77df79e1..286ae6172 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Aves</string>
     <string name="app_widget_label">Photo Frame</string>
     <string name="wallpaper">Wallpaper</string>
-    <string name="safe_mode_shortcut_short_label">Safe mode</string>
+    <string name="map_shortcut_short_label">Map</string>
     <string name="search_shortcut_short_label">Search</string>
     <string name="videos_shortcut_short_label">Videos</string>
     <string name="analysis_channel_name">Media scan</string>
diff --git a/android/settings.gradle b/android/settings.gradle
index b62954086..e262ed8f1 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
 
     settings.ext.kotlin_version = '1.9.24'
     settings.ext.ksp_version = "$kotlin_version-1.0.20"
-    settings.ext.agp_version = '8.6.0'
+    settings.ext.agp_version = '8.6.1'
 
     includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt
deleted file mode 100644
index d8b37d15e..000000000
--- a/fastlane/metadata/android/en-US/changelogs/124.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.5:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12401.txt b/fastlane/metadata/android/en-US/changelogs/12401.txt
deleted file mode 100644
index d8b37d15e..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12401.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.5:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/125.txt b/fastlane/metadata/android/en-US/changelogs/125.txt
deleted file mode 100644
index 3ab2a9554..000000000
--- a/fastlane/metadata/android/en-US/changelogs/125.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.6:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12501.txt b/fastlane/metadata/android/en-US/changelogs/12501.txt
deleted file mode 100644
index 3ab2a9554..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12501.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.6:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/126.txt b/fastlane/metadata/android/en-US/changelogs/126.txt
deleted file mode 100644
index d1ba36473..000000000
--- a/fastlane/metadata/android/en-US/changelogs/126.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.7:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12601.txt b/fastlane/metadata/android/en-US/changelogs/12601.txt
deleted file mode 100644
index d1ba36473..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12601.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.7:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/127.txt b/fastlane/metadata/android/en-US/changelogs/127.txt
deleted file mode 100644
index eb8a20e22..000000000
--- a/fastlane/metadata/android/en-US/changelogs/127.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.8:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12701.txt b/fastlane/metadata/android/en-US/changelogs/12701.txt
deleted file mode 100644
index eb8a20e22..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12701.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-In v1.11.8:
-- explore your collection with the... explorer
-- convert your motion photos to stills in bulk
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/128.txt b/fastlane/metadata/android/en-US/changelogs/128.txt
deleted file mode 100644
index 1b597dbb2..000000000
--- a/fastlane/metadata/android/en-US/changelogs/128.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-In v1.11.9:
-- peruse more options to tag or move via quick actions
-- read long descriptions right from the overlay
-- sort videos by duration
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12801.txt b/fastlane/metadata/android/en-US/changelogs/12801.txt
deleted file mode 100644
index 1b597dbb2..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12801.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-In v1.11.9:
-- peruse more options to tag or move via quick actions
-- read long descriptions right from the overlay
-- sort videos by duration
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/129.txt b/fastlane/metadata/android/en-US/changelogs/129.txt
deleted file mode 100644
index 9443d2b15..000000000
--- a/fastlane/metadata/android/en-US/changelogs/129.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-In v1.11.10:
-- enjoy the app in Swedish
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/12901.txt b/fastlane/metadata/android/en-US/changelogs/12901.txt
deleted file mode 100644
index 9443d2b15..000000000
--- a/fastlane/metadata/android/en-US/changelogs/12901.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-In v1.11.10:
-- enjoy the app in Swedish
-Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/133.txt b/fastlane/metadata/android/en-US/changelogs/133.txt
new file mode 100644
index 000000000..c3e79cc42
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/133.txt
@@ -0,0 +1,4 @@
+In v1.11.14:
+- enjoy new map layers
+- share "geo" addresses to Aves and see your collection in that area
+Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/13301.txt b/fastlane/metadata/android/en-US/changelogs/13301.txt
new file mode 100644
index 000000000..c3e79cc42
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13301.txt
@@ -0,0 +1,4 @@
+In v1.11.14:
+- enjoy new map layers
+- share "geo" addresses to Aves and see your collection in that area
+Full changelog available on GitHub
\ No newline at end of file
diff --git a/lib/geo/uri.dart b/lib/geo/uri.dart
new file mode 100644
index 000000000..5374bc9cd
--- /dev/null
+++ b/lib/geo/uri.dart
@@ -0,0 +1,26 @@
+import 'package:latlong2/latlong.dart';
+
+// e.g. `geo:44.4361283,26.1027248?z=4.0(Bucharest)`
+// cf https://en.wikipedia.org/wiki/Geo_URI_scheme
+// cf https://developer.android.com/guide/components/intents-common#ViewMap
+(LatLng, double?)? parseGeoUri(String? uri) {
+  if (uri != null) {
+    final geoUri = Uri.tryParse(uri);
+    if (geoUri != null) {
+      final coordinates = geoUri.path.split(',');
+      if (coordinates.length == 2) {
+        final lat = double.tryParse(coordinates[0]);
+        final lon = double.tryParse(coordinates[1]);
+        if (lat != null && lon != null) {
+          double? zoom;
+          final zoomString = geoUri.queryParameters['z'];
+          if (zoomString != null) {
+            zoom = double.tryParse(zoomString);
+          }
+          return (LatLng(lat, lon), zoom);
+        }
+      }
+    }
+  }
+  return null;
+}
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 9d9230fe7..b59897d27 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -127,7 +127,7 @@
   "@settingsEnableBinSubtitle": {},
   "viewerInfoPageTitle": "معلومات",
   "@viewerInfoPageTitle": {},
-  "mapAttributionStamen": "بيانات الخريطة © [OpenStreetMap](https://www.openstreetmap.org/copyright) المساهمين • البلاط بواسطة [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "البلاط بواسطة [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "widgetOpenPageViewer": "افتح العارض",
   "@widgetOpenPageViewer": {},
@@ -533,8 +533,6 @@
   "@albumGroupTier": {},
   "aboutBugReportInstruction": "تقرير على GitHub مع السجلات ومعلومات النظام",
   "@aboutBugReportInstruction": {},
-  "addPathTooltip": "أضف المسار",
-  "@addPathTooltip": {},
   "videoActionCaptureFrame": "التقاط الإطار",
   "@videoActionCaptureFrame": {},
   "patternDialogEnter": "أدخل النمط",
@@ -873,8 +871,6 @@
   "@drawerCollectionMotionPhotos": {},
   "settingsDefault": "افتراضي",
   "@settingsDefault": {},
-  "settingsHiddenItemsTabFilters": "المرشحات المخفية",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsSlideshowAnimatedZoomEffect": "تأثير التكبير المتحرك",
   "@settingsSlideshowAnimatedZoomEffect": {},
   "viewerActionSettings": "الإعدادات",
@@ -1059,7 +1055,7 @@
   "@entryInfoActionEditTags": {},
   "collectionActionHideTitleSearch": "إخفاء مرشح العنوان",
   "@collectionActionHideTitleSearch": {},
-  "mapAttributionOsmHot": "بيانات الخريطة © [OpenStreetMap](https://www.openstreetmap.org/copyright) المساهمين • البلاط بواسطة [HOT](https://www.hotosm.org/) • استضافة بواسطة [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "البلاط بواسطة [HOT](https://www.hotosm.org/) • استضافة بواسطة [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "settingsNavigationDrawerTile": "قائمة تنقل",
   "@settingsNavigationDrawerTile": {},
@@ -1073,8 +1069,6 @@
   "@keepScreenOnViewerOnly": {},
   "durationDialogHours": "ساعات",
   "@durationDialogHours": {},
-  "settingsHiddenPathsBanner": "لن تظهر الصور ومقاطع الفيديو الموجودة في هذه المجلدات، أو أي من مجلداتها الفرعية في مجموعتك.",
-  "@settingsHiddenPathsBanner": {},
   "settingsKeepScreenOnDialogTitle": "ابقاء الشَاشة قيد التشغيل",
   "@settingsKeepScreenOnDialogTitle": {},
   "wallpaperTargetHome": "الشاشة الرئيسية",
@@ -1475,8 +1469,6 @@
   "@settingsThemeColorHighlights": {},
   "appPickDialogTitle": "اختر التطبيق",
   "@appPickDialogTitle": {},
-  "settingsHiddenItemsTabPaths": "المسارات المخفية",
-  "@settingsHiddenItemsTabPaths": {},
   "viewerInfoSearchSuggestionRights": "الحقوق",
   "@viewerInfoSearchSuggestionRights": {},
   "mapPointNorthUpTooltip": "نقطة الشمال لأعلى",
@@ -1548,5 +1540,9 @@
   "sortOrderLongestFirst": "الأطول أولاً",
   "@sortOrderLongestFirst": {},
   "sortByDuration": "حسب المدة",
-  "@sortByDuration": {}
+  "@sortByDuration": {},
+  "mapStyleOpenTopoMap": "الخريطة الطبوغرافية المفتوحة",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOsmData": "بيانات الخريطة © [OpenStreetMap](https://www.openstreetmap.org/copyright) المساهمين",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_be.arb b/lib/l10n/app_be.arb
index 4ef9cd11e..fdb22ec83 100644
--- a/lib/l10n/app_be.arb
+++ b/lib/l10n/app_be.arb
@@ -541,7 +541,7 @@
   "@viewerInfoViewXmlLinkText": {},
   "viewerInfoOpenLinkText": "Адкрыць",
   "@viewerInfoOpenLinkText": {},
-  "mapAttributionStamen": "Даныя карты © [OpenStreetMap](https://www.openstreetmap.org/copyright) удзельнікі • Пліткі ад [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Пліткі ад [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "mapPointNorthUpTooltip": "Пакажыце поўнач уверх",
   "@mapPointNorthUpTooltip": {},
@@ -637,7 +637,7 @@
   "@filePickerDoNotShowHiddenFiles": {},
   "viewerInfoOpenEmbeddedFailureFeedback": "Не ўдалося атрымаць убудаваныя даныя",
   "@viewerInfoOpenEmbeddedFailureFeedback": {},
-  "mapAttributionOsmHot": "Даныя карты © [OpenStreetMap](https://www.openstreetmap.org/copyright) удзельнікі • Пліткі ад [HOT](https://www.hotosm.org/) • Арганізаваны [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Пліткі ад [HOT](https://www.hotosm.org/) • Арганізаваны [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "viewerInfoLabelSize": "Памер",
   "@viewerInfoLabelSize": {},
@@ -1283,8 +1283,6 @@
   },
   "settingsVideoGestureDoubleTapTogglePlay": "Двойчы націсніце, каб прайграць/прыпыніць",
   "@settingsVideoGestureDoubleTapTogglePlay": {},
-  "addPathTooltip": "Дадаць шлях",
-  "@addPathTooltip": {},
   "settingsEnableBin": "Выкарыстоўваць сметніцу",
   "@settingsEnableBin": {},
   "collectionMoveSuccessFeedback": "{count, plural, =1{Перамяшчаны 1 элемент} few{Перамяшчаны {count} элементы} other{Перамяшчаны {count} элементаў}}",
@@ -1353,8 +1351,6 @@
   "@settingsVideoBackgroundMode": {},
   "settingsAllowInstalledAppAccess": "Дазволіць доступ да інвентара праграм",
   "@settingsAllowInstalledAppAccess": {},
-  "settingsHiddenItemsTabFilters": "Схаваныя фільтры",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsSlideshowAnimatedZoomEffect": "Аніміраваны эфект маштабавання",
   "@settingsSlideshowAnimatedZoomEffect": {},
   "settingsViewerOverlayPageTitle": "Навязванне",
@@ -1383,8 +1379,6 @@
   "@settingsNavigationDrawerTile": {},
   "settingsHiddenItemsPageTitle": "Схаваныя элементы",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenPathsBanner": "Фатаграфіі і відэа ў гэтых тэчках або ў любой з іх укладзеных тэчках не будуць адлюстроўвацца ў вашай калекцыі.",
-  "@settingsHiddenPathsBanner": {},
   "settingsViewerShowOverlayOnOpening": "Паказаць на адкрыцці",
   "@settingsViewerShowOverlayOnOpening": {},
   "settingsViewerShowShootingDetails": "Паказаць дэталі здымкі",
@@ -1473,8 +1467,6 @@
   "@settingsSubtitleThemeTextSize": {},
   "settingsCollectionQuickActionTabBrowsing": "Прагляд",
   "@settingsCollectionQuickActionTabBrowsing": {},
-  "settingsHiddenItemsTabPaths": "Схаваныя шляхі",
-  "@settingsHiddenItemsTabPaths": {},
   "collectionDeleteFailureFeedback": "{count, plural, =1{Не атрымалася выдаліць 1 элемент} few{Не атрымалася выдаліць {count} элементы} other{Не атрымалася выдаліць {count} элементаў}}",
   "@collectionDeleteFailureFeedback": {
     "placeholders": {
@@ -1548,5 +1540,11 @@
   "selectStorageVolumeDialogTitle": "Выбраць сховішча",
   "@selectStorageVolumeDialogTitle": {},
   "setHomeCustom": "Па-свойму",
-  "@setHomeCustom": {}
+  "@setHomeCustom": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Пліткі ад [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Даныя карты © [OpenStreetMap](https://www.openstreetmap.org/copyright) удзельнікі",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
index a588f254f..057b0c748 100644
--- a/lib/l10n/app_ca.arb
+++ b/lib/l10n/app_ca.arb
@@ -1167,12 +1167,8 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Elements Amagats",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtres Amagats",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Les fotos i els vídeos que coincideixin amb filtres amagats no apareixeran a la teva coŀlecció.",
   "@settingsHiddenFiltersBanner": {},
-  "addPathTooltip": "Afegeix ruta",
-  "@addPathTooltip": {},
   "settingsStorageAccessBanner": "Alguns directoris requereixen permís explícit per modificar-hi fitxers. Podeu revisar aquí els directoris als quals heu donat accés anteriorment.",
   "@settingsStorageAccessBanner": {},
   "settingsStorageAccessEmpty": "Cap permís d’accés",
@@ -1289,7 +1285,7 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Apuntar el nord cap amunt",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionStamen": "Dades de mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuïdors • Rajoles per [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Rajoles per [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Veure a la pàgina de mapa",
   "@openMapPageTooltip": {},
@@ -1351,10 +1347,6 @@
   "@settingsAllowInstalledAppAccessSubtitle": {},
   "settingsHiddenFiltersEmpty": "Cap filtre amagat",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Rutes Amagades",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Les fotos i vídeos d’aquestes carpetes, o a les seves subcarpetes, no apareixeran a la teva coŀlecció.",
-  "@settingsHiddenPathsBanner": {},
   "settingsStorageAccessTile": "Accés d’emmagatzematge",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Accés d’Emmagatzematge",
@@ -1451,7 +1443,7 @@
   "@appExportCovers": {},
   "appExportFavourites": "Preferits",
   "@appExportFavourites": {},
-  "mapAttributionOsmHot": "Dades de mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuïdors • Rajoles de [HOT](https://www.hotosm.org/) • Allotjat a [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Rajoles de [HOT](https://www.hotosm.org/) • Allotjat a [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "viewerInfoSearchSuggestionDescription": "Descripció",
   "@viewerInfoSearchSuggestionDescription": {},
@@ -1520,5 +1512,7 @@
     }
   },
   "chipActionShowCollection": "Mostrar a Coŀlecció",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Dades de mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuïdors",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
index 23d4f5ccd..f8e370116 100644
--- a/lib/l10n/app_cs.arb
+++ b/lib/l10n/app_cs.arb
@@ -771,16 +771,8 @@
   "@settingsHiddenItemsPageTitle": {},
   "settingsHiddenFiltersBanner": "Fotografie a videa odpovídající filtrům skrytých položek nebudou zobrazeny ve vaši sbírce.",
   "@settingsHiddenFiltersBanner": {},
-  "settingsHiddenItemsTabFilters": "Filtry položek",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersEmpty": "Žádné filtry skrytých položek",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Filtry umístění",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Fotografie a videa v těchto adresářích a jejich podsložkách nebudou zobrazeny ve vaši sbírce.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Přidat umístění",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Přístup k úložišti",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Přístup k úložišti",
@@ -911,7 +903,7 @@
   "@wallpaperUseScrollEffect": {},
   "tagEditorPageTitle": "Upravit štítky",
   "@tagEditorPageTitle": {},
-  "mapAttributionOsmHot": "Mapová data © [OpenStreetMap](https://www.openstreetmap.org/copyright) přispěvatelé • Dlaždice z [HOT](https://www.hotosm.org/) • Hostováno na [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Dlaždice z [HOT](https://www.hotosm.org/) • Hostováno na [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "viewerInfoSearchSuggestionRights": "Práva",
   "@viewerInfoSearchSuggestionRights": {},
@@ -1343,7 +1335,7 @@
   "@tagEditorPageNewTagFieldLabel": {},
   "tagEditorSectionRecent": "Nedávné",
   "@tagEditorSectionRecent": {},
-  "mapAttributionStamen": "Mapová data © [OpenStreetMap](https://www.openstreetmap.org/copyright) přispěvatelé • Dlaždice z [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Dlaždice z [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "panoramaDisableSensorControl": "Zakázat ovládání senzorem",
   "@panoramaDisableSensorControl": {},
@@ -1528,5 +1520,7 @@
   "videoActionABRepeat": "Opakování A-B",
   "@videoActionABRepeat": {},
   "chipActionShowCollection": "Zobrazit ve sbírce",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Mapová data © [OpenStreetMap](https://www.openstreetmap.org/copyright) přispěvatelé",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 4eade1b4a..abbae4e53 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -955,18 +955,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Versteckte Elemente",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Versteckte Filter",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Fotos und Videos, die versteckten Filtern entsprechen, werden nicht in Ihrer Sammlung angezeigt.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Keine versteckten Filter",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Verborgene Pfade",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Fotos und Videos, die sich in diesen Ordnern oder in einem ihrer Unterordner befinden, werden nicht in Ihrer Sammlung angezeigt.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Pfad hinzufügen",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Speicherzugriff",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Speicherzugriff",
@@ -1081,9 +1073,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Richtung Norden aufwärts",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Kartendaten © [OpenStreetMap](https://www.openstreetmap.org/copyright) Mitwirkende • Kacheln von [HOT](https://www.hotosm.org/) • Gehostet von [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Kacheln von [HOT](https://www.hotosm.org/) • Gehostet von [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Kartendaten © [OpenStreetMap](https://www.openstreetmap.org/copyright) Mitwirkende • Kacheln von [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Kacheln von [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Auf der Karte anzeigen",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,7 @@
   "chipActionGoToExplorerPage": "Im Explorer anzeigen",
   "@chipActionGoToExplorerPage": {},
   "explorerPageTitle": "Explorer",
-  "@explorerPageTitle": {}
+  "@explorerPageTitle": {},
+  "mapAttributionOsmData": "Kartendaten © [OpenStreetMap](https://www.openstreetmap.org/copyright) Mitwirkende",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_el.arb b/lib/l10n/app_el.arb
index e3e590850..987c39666 100644
--- a/lib/l10n/app_el.arb
+++ b/lib/l10n/app_el.arb
@@ -955,18 +955,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Κρυφα Στοιχεια",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Κρυφά φίλτρα",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Οι φωτογραφίες και τα βίντεο που είναι κρυφά δεν θα εμφανίζονται στη συλλογή σας.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Χωρίς κρυφά φίλτρα",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Κρυφές διαδρομές",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Οι φωτογραφίες και τα βίντεο σε αυτούς τους φακέλους ή σε οποιονδήποτε από τους υποφακέλους τους, δεν θα εμφανίζονται στη συλλογή σας.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Προσθήκη διαδρομής",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Πρόσβαση στον χώρο αποθήκευσης",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Προσβαση στον Χωρο Αποθηκευσης",
@@ -1081,10 +1073,6 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Εμφάνιση του βορρά στην κορυφή",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Map data © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [HOT](https://www.hotosm.org/) • Hosted by [OSM France](https://openstreetmap.fr/)",
-  "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Map data © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
   "openMapPageTooltip": "Προβολή στη σελίδα του χάρτη",
   "@openMapPageTooltip": {},
   "mapEmptyRegion": "Δεν υπάρχουν εικόνες σε αυτήν την περιοχή",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index bc217fb55..d3f890e78 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -238,6 +238,8 @@
   "mapStyleGoogleNormal": "Google Maps",
   "mapStyleGoogleHybrid": "Google Maps (Hybrid)",
   "mapStyleGoogleTerrain": "Google Maps (Terrain)",
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "mapStyleOpenTopoMap": "OpenTopoMap",
   "mapStyleOsmHot": "Humanitarian OSM",
   "mapStyleStamenWatercolor": "Stamen Watercolor",
 
@@ -944,14 +946,9 @@
   "settingsHiddenItemsTile": "Hidden items",
   "settingsHiddenItemsPageTitle": "Hidden Items",
 
-  "settingsHiddenItemsTabFilters": "Hidden Filters",
   "settingsHiddenFiltersBanner": "Photos and videos matching hidden filters will not appear in your collection.",
   "settingsHiddenFiltersEmpty": "No hidden filters",
 
-  "settingsHiddenItemsTabPaths": "Hidden Paths",
-  "settingsHiddenPathsBanner": "Photos and videos in these folders, or any of their subfolders, will not appear in your collection.",
-  "addPathTooltip": "Add path",
-
   "settingsStorageAccessTile": "Storage access",
   "settingsStorageAccessPageTitle": "Storage Access",
   "settingsStorageAccessBanner": "Some directories require an explicit access grant to modify files in them. You can review here directories to which you previously gave access.",
@@ -1032,8 +1029,11 @@
   "mapZoomInTooltip": "Zoom in",
   "mapZoomOutTooltip": "Zoom out",
   "mapPointNorthUpTooltip": "Point north up",
-  "mapAttributionOsmHot": "Map data © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [HOT](https://www.hotosm.org/) • Hosted by [OSM France](https://openstreetmap.fr/)",
-  "mapAttributionStamen": "Map data © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionOsmData": "Map data © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors",
+  "mapAttributionOsmLiberty": "Tiles by [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Hosted by [OSM Americana](https://tile.ourmap.us)",
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Tiles by [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "mapAttributionOsmHot": "Tiles by [HOT](https://www.hotosm.org/) • Hosted by [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionStamen": "Tiles by [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "openMapPageTooltip": "View on Map page",
   "mapEmptyRegion": "No images in this region",
 
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 21a83d5bf..8567db5ab 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -905,18 +905,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Elementos ocultos",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtros",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Fotos y videos que concuerden con los filtros no aparecerán en su colección.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Sin filtros",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Ubicaciones ocultas",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Fotos y videos que se encuentren en estos directorios y cualquiera de sus subdirectorios no aparecerán en su colección.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Añadir ubicación",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Acceso al almacenamiento",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Acceso al almacenamiento",
@@ -1025,9 +1017,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Apuntar el Norte hacia arriba",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Datos de mapas © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuidores • Teselas por [HOT](https://www.hotosm.org/) • Alojado por [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Mosaicos por [HOT](https://www.hotosm.org/) • Alojado por [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Datos de mapas © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuidores • Teselas por [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Mosaicos por [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Ver en página del mapa",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,15 @@
   "sortOrderShortestFirst": "El más corto primero",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "El más largo primero",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Mosaicos por [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Datos de mapas © [OpenStreetMap](https://www.openstreetmap.org/copyright) contribuidores",
+  "@mapAttributionOsmData": {},
+  "mapAttributionOsmLiberty": "Mosaicos por [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Alojado por [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {}
 }
diff --git a/lib/l10n/app_eu.arb b/lib/l10n/app_eu.arb
index e3309950a..d69479c8e 100644
--- a/lib/l10n/app_eu.arb
+++ b/lib/l10n/app_eu.arb
@@ -273,20 +273,10 @@
   "@videoLoopModeShortOnly": {},
   "videoControlsPlaySeek": "Erreproduzitu eta aurrera edo atzera egin",
   "@videoControlsPlaySeek": {},
-  "mapStyleGoogleNormal": "Google Maps",
-  "@mapStyleGoogleNormal": {},
   "nameConflictStrategySkip": "Jauzi",
   "@nameConflictStrategySkip": {},
   "videoControlsNone": "Bat ere ez",
   "@videoControlsNone": {},
-  "mapStyleGoogleHybrid": "Google Maps (higikorra)",
-  "@mapStyleGoogleHybrid": {},
-  "mapStyleGoogleTerrain": "Google Maps (lurra)",
-  "@mapStyleGoogleTerrain": {},
-  "mapStyleOsmHot": "OSM humanitarioa",
-  "@mapStyleOsmHot": {},
-  "mapStyleStamenWatercolor": "Stamen Watercolor (akuarela)",
-  "@mapStyleStamenWatercolor": {},
   "keepScreenOnNever": "Inoiz",
   "@keepScreenOnNever": {},
   "nameConflictStrategyReplace": "Ordezkatu",
@@ -1109,8 +1099,6 @@
   "@settingsHiddenItemsPageTitle": {},
   "settingsHiddenFiltersBanner": "Iragazkiekin bat datozen argazki eta bideoak ez dira zure bilduman agertuko.",
   "@settingsHiddenFiltersBanner": {},
-  "settingsHiddenItemsTabPaths": "Ezkutuko bideak",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsHiddenFiltersEmpty": "Ezkutuko iragazkirik ez",
   "@settingsHiddenFiltersEmpty": {},
   "settingsStorageAccessTile": "Biltegiratzerako sarrera",
@@ -1185,12 +1173,6 @@
   "@settingsAllowInstalledAppAccessSubtitle": {},
   "settingsEnableBinSubtitle": "Mantendu ezabatutako elementuak 30 egunez",
   "@settingsEnableBinSubtitle": {},
-  "settingsHiddenItemsTabFilters": "Ezkutuko iragazkiak",
-  "@settingsHiddenItemsTabFilters": {},
-  "settingsHiddenPathsBanner": "Karpeta hauetako argazki eta bideoak, hauen azpikarpetak barne, ez dira zure bilduman agertuko.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Gehitu bidea",
-  "@addPathTooltip": {},
   "settingsStorageAccessPageTitle": "Biltegiratzerako sarrera",
   "@settingsStorageAccessPageTitle": {},
   "settingsStorageAccessEmpty": "Baimenik ez",
@@ -1339,10 +1321,6 @@
   "@settingsWidgetDisplayedItem": {},
   "tagEditorPageNewTagFieldLabel": "Etiketa berria",
   "@tagEditorPageNewTagFieldLabel": {},
-  "mapAttributionStamen": "Maparen datuak © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Teselak: [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
-  "mapAttributionOsmHot": "Maparen datuak © [OpenStreetMap](https://www.openstreetmap.org/copyright) laguntzaileak • Teselak: [HOT](https://www.hotosm.org/) • Ostalaria: [OSM France](https://openstreetmap.fr/)",
-  "@mapAttributionOsmHot": {},
   "filePickerNoItems": "Elementurik ez",
   "@filePickerNoItems": {},
   "viewerInfoSearchFieldLabel": "Bilatu metadatuak",
@@ -1532,5 +1510,45 @@
   "videoRepeatActionSetEnd": "Ezarri amaiera",
   "@videoRepeatActionSetEnd": {},
   "chipActionShowCollection": "Erakutsi bilduman",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "sortByDuration": "Iraupenaren arabera",
+  "@sortByDuration": {},
+  "sortOrderShortestFirst": "Laburrena lehenik",
+  "@sortOrderShortestFirst": {},
+  "sortOrderLongestFirst": "Luzeena lehenik",
+  "@sortOrderLongestFirst": {},
+  "mapStyleGoogleNormal": "Google Maps",
+  "@mapStyleGoogleNormal": {},
+  "mapStyleGoogleHybrid": "Google Maps (higikorra)",
+  "@mapStyleGoogleHybrid": {},
+  "mapStyleGoogleTerrain": "Google Maps (lurra)",
+  "@mapStyleGoogleTerrain": {},
+  "mapStyleOsmHot": "OSM humanitarioa",
+  "@mapStyleOsmHot": {},
+  "mapStyleStamenWatercolor": "Stamen Watercolor (akuarela)",
+  "@mapStyleStamenWatercolor": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmData": "Maparen datuak © [OpenStreetMap](https://www.openstreetmap.org/copyright)-en laguntzaileak",
+  "@mapAttributionOsmData": {},
+  "mapAttributionStamen": "Lauzak: [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "@mapAttributionStamen": {},
+  "mapAttributionOsmHot": "Lauzak: [HOT](https://www.hotosm.org/) • Ostalaria: [OSM France](https://openstreetmap.fr/)",
+  "@mapAttributionOsmHot": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Lauzak: [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmLiberty": "Lauzak: [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Ostalaria: [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "explorerActionSelectStorageVolume": "Hautatu biltegia",
+  "@explorerActionSelectStorageVolume": {},
+  "selectStorageVolumeDialogTitle": "Hautatu biltegia",
+  "@selectStorageVolumeDialogTitle": {},
+  "explorerPageTitle": "Arakatzailea",
+  "@explorerPageTitle": {},
+  "setHomeCustom": "Pertsonalizatua",
+  "@setHomeCustom": {},
+  "chipActionGoToExplorerPage": "Erakutsi arakatzailean",
+  "@chipActionGoToExplorerPage": {}
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index a101850a3..d3b38f5ef 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -1265,8 +1265,6 @@
   "@settingsVideoControlsTile": {},
   "settingsVideoButtonsTile": "دکمه ها",
   "@settingsVideoButtonsTile": {},
-  "addPathTooltip": "افزودن مسیر",
-  "@addPathTooltip": {},
   "passwordDialogConfirm": "تایید گذرواژه",
   "@passwordDialogConfirm": {},
   "renameProcessorCounter": "شمارنده",
@@ -1317,8 +1315,6 @@
   "@settingsViewerQuickActionEditorBanner": {},
   "settingsSlideshowRepeat": "تکرار",
   "@settingsSlideshowRepeat": {},
-  "settingsHiddenItemsTabPaths": "مسیر های پنهان",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsTimeToTakeActionTile": "زمان اقدام",
   "@settingsTimeToTakeActionTile": {},
   "settingsLanguagePageTitle": "زبان",
@@ -1405,8 +1401,6 @@
   "@settingsCoordinateFormatTile": {},
   "collectionActionShowTitleSearch": "نمایش پالایش عنوان",
   "@collectionActionShowTitleSearch": {},
-  "settingsHiddenItemsTabFilters": "پالایش های پنهان",
-  "@settingsHiddenItemsTabFilters": {},
   "openMapPageTooltip": "نمایش در صفحه نقشه",
   "@openMapPageTooltip": {},
   "viewerInfoLabelPath": "مسیر",
@@ -1459,8 +1453,6 @@
   "@settingsDisablingBinWarningDialogMessage": {},
   "settingsAllowInstalledAppAccessSubtitle": "برای بهبود نمایش آلبوم بهره‌وری میشود",
   "@settingsAllowInstalledAppAccessSubtitle": {},
-  "settingsHiddenPathsBanner": "تصاویر و ویدیوهای موجود در این پوشه‌ها یا هر یک از زیرپوشه‌های آن‌ها در مجموعه شما دیده نمی‌شوند.",
-  "@settingsHiddenPathsBanner": {},
   "settingsStorageAccessBanner": "برخی پوشه ها برای اصلاح پرونپه های موجود در آنها به یک مجوز دسترسی نیاز دارند. در اینجا می توانید پوشه هایی را که قبلاً به آنها دسترسی داشته اید، مرور کنید.",
   "@settingsStorageAccessBanner": {},
   "collectionMoveFailureFeedback": "{count, plural, =1{هدایت ۱ مورد ناموفق بود} other{هدایت {count} مورد ناموفق بود}}",
@@ -1509,9 +1501,9 @@
   "@settingsVideoGestureVerticalDragBrightnessVolume": {},
   "mapEmptyRegion": "تصویری در این ناحیه وجود ندارد",
   "@mapEmptyRegion": {},
-  "mapAttributionOsmHot": "داده‌های نقشه © [OpenStreetMap](https:www.openstreetmap.orgcopyright) مشارکت‌کنندگان • کاشی ها توسط [HOT](https:www.hotosm.org) • میزبانی شده به دست [OSM France](https:openstreetmap.fr)",
+  "mapAttributionOsmHot": "کاشی ها توسط [HOT](https:www.hotosm.org) • میزبانی شده به دست [OSM France](https:openstreetmap.fr)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "داده‌های نقشه © [OpenStreetMap](https:www.openstreetmap.org/copyright) مشارکت‌کنندگان • کاشی ها بدست [Stamen Design](https:stamen.com)، [CC BY 3.0](https:creativecommons.orglicensesby3.0)",
+  "mapAttributionStamen": "کاشی ها بدست [Stamen Design](https:stamen.com)، [CC BY 3.0](https:creativecommons.orglicensesby3.0)",
   "@mapAttributionStamen": {},
   "addShortcutButtonLabel": "افزودن",
   "@addShortcutButtonLabel": {},
@@ -1532,5 +1524,7 @@
     }
   },
   "chipActionShowCollection": "نمایش در مجموعه",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "داده‌های نقشه © [OpenStreetMap](https:www.openstreetmap.org/copyright) مشارکت‌کنندگان",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index a7b67fe3f..c6602e0ae 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -959,18 +959,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Éléments masqués",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtres masqués",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Les images et vidéos correspondantes aux filtres masqués n’apparaîtront pas dans votre collection.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Aucun filtre masqué",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Chemins masqués",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Les images et vidéos dans ces dossiers, ou leurs sous-dossiers, n’apparaîtront pas dans votre collection.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Ajouter un chemin",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Accès au stockage",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Accès au stockage",
@@ -1085,9 +1077,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Placer le nord en haut",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Données © les contributeurs d’[OpenStreetMap](https://www.openstreetmap.org/copyright) • Fond de carte par [HOT](https://www.hotosm.org/) • Hébergé par [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Fond de carte par [HOT](https://www.hotosm.org/) • Hébergé par [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Données © les contributeurs d’[OpenStreetMap](https://www.openstreetmap.org/copyright) • Fond de carte par [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Fond de carte par [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Ouvrir la page Carte",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,15 @@
   "sortOrderShortestFirst": "Plus courts d’abord",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "Plus longs d’abord",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmLiberty": "Fond de carte par [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Hébergé par [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Fond de carte par [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Données © les contributeurs d’[OpenStreetMap](https://www.openstreetmap.org/copyright)",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb
index d34a5e814..b6534f246 100644
--- a/lib/l10n/app_hu.arb
+++ b/lib/l10n/app_hu.arb
@@ -491,8 +491,6 @@
   "@settingsVideoAutoPlay": {},
   "settingsVideoPageTitle": "Videó beállítások",
   "@settingsVideoPageTitle": {},
-  "settingsHiddenItemsTabPaths": "Rejtett helyek",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsHiddenItemsPageTitle": "Rejtett elemek",
   "@settingsHiddenItemsPageTitle": {},
   "settingsHiddenItemsTile": "Rejtett elemek",
@@ -715,13 +713,13 @@
   "@sortByAlbumFileName": {},
   "sortByRating": "Értékelés",
   "@sortByRating": {},
-  "sortOrderNewestFirst": "Legújabb legelől",
+  "sortOrderNewestFirst": "Legújabb legelöl",
   "@sortOrderNewestFirst": {},
-  "sortOrderOldestFirst": "Legrégebbi legelől",
+  "sortOrderOldestFirst": "Legrégebbi legelöl",
   "@sortOrderOldestFirst": {},
-  "sortOrderLargestFirst": "Legnagyobb legelől",
+  "sortOrderLargestFirst": "Legnagyobb legelöl",
   "@sortOrderLargestFirst": {},
-  "sortOrderSmallestFirst": "Legkisebb legelől",
+  "sortOrderSmallestFirst": "Legkisebb legelöl",
   "@sortOrderSmallestFirst": {},
   "albumGroupType": "Típus szerint",
   "@albumGroupType": {},
@@ -1114,9 +1112,9 @@
       "count": {}
     }
   },
-  "sortOrderHighestFirst": "Legmagasabb legelől",
+  "sortOrderHighestFirst": "Legmagasabb legelöl",
   "@sortOrderHighestFirst": {},
-  "sortOrderLowestFirst": "Legalacsonyabb legelől",
+  "sortOrderLowestFirst": "Legalacsonyabb legelöl",
   "@sortOrderLowestFirst": {},
   "albumGroupNone": "Nincs csoportositás",
   "@albumGroupNone": {},
@@ -1278,12 +1276,8 @@
   "@settingsEnableBinSubtitle": {},
   "settingsAllowMediaManagement": "Média kezelés engedélyezése",
   "@settingsAllowMediaManagement": {},
-  "settingsHiddenItemsTabFilters": "Rejtett szűrők",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersEmpty": "Nincsenek rejtett szűrők",
   "@settingsHiddenFiltersEmpty": {},
-  "addPathTooltip": "Hely hozzáadása",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Tárhely hozzáférés",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Tárhely hozzáférés",
@@ -1419,8 +1413,6 @@
   "@settingsAllowInstalledAppAccessSubtitle": {},
   "settingsAllowInstalledAppAccess": "Hozzáférés engedélyezése az app leltárhoz",
   "@settingsAllowInstalledAppAccess": {},
-  "settingsHiddenPathsBanner": "Képek és videók ezekből a mappákból és ezek almappáikból nem jelennek meg a gyűjteményedben.",
-  "@settingsHiddenPathsBanner": {},
   "settingsHiddenFiltersBanner": "A rejtett szűrőknek megfelelő képek és videók nem jelennek meg a gyűjteményében.",
   "@settingsHiddenFiltersBanner": {},
   "settingsTimeToTakeActionTile": "Ideje cselekedni",
@@ -1429,10 +1421,6 @@
   "@settingsAccessibilityShowPinchGestureAlternatives": {},
   "settingsStorageAccessBanner": "Egyes könyvtárak kifejezett hozzáférési engedélyt igényelnek a benne lévő fájlok módosításához. Itt áttekintheted a könyvtárakat, amelyekhez korábban hozzáférést adtál.",
   "@settingsStorageAccessBanner": {},
-  "mapAttributionOsmHot": "Térképadatok © [OpenStreetMap](https://www.openstreetmap.org/copyright) közreműködők • [HOT](https://www.hotosm.org/) csempék • [OSM France](https://openstreetmap.fr/) kiszolgáló",
-  "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Térképadatok © [OpenStreetMap](https://www.openstreetmap.org/copyright) közreműködők • [Stamen Design](https://stamen.com) csempék, [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
   "viewerInfoSearchEmpty": "Nincs egyező kulcs",
   "@viewerInfoSearchEmpty": {},
   "viewerInfoSearchSuggestionRights": "Jogok",
@@ -1528,5 +1516,39 @@
   "videoRepeatActionSetEnd": "Végpont beállítása",
   "@videoRepeatActionSetEnd": {},
   "chipActionShowCollection": "Megjelenítés a gyűjteményekben",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "sortByDuration": "Hossz szerint",
+  "@sortByDuration": {},
+  "explorerActionSelectStorageVolume": "Tároló kiválasztása",
+  "@explorerActionSelectStorageVolume": {},
+  "setHomeCustom": "Egyéni",
+  "@setHomeCustom": {},
+  "sortOrderShortestFirst": "Legrövidebb legelöl",
+  "@sortOrderShortestFirst": {},
+  "explorerPageTitle": "Böngésző",
+  "@explorerPageTitle": {},
+  "sortOrderLongestFirst": "Leghosszabb legelöl",
+  "@sortOrderLongestFirst": {},
+  "selectStorageVolumeDialogTitle": "Tároló Kiválasztása",
+  "@selectStorageVolumeDialogTitle": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmData": "Térképadatok © [OpenStreetMap](https://www.openstreetmap.org/copyright) közreműködők",
+  "@mapAttributionOsmData": {},
+  "mapAttributionOsmHot": "Csempék: [HOT](https://www.hotosm.org/) • Kiszolgálja: [OSM France](https://openstreetmap.fr/)",
+  "@mapAttributionOsmHot": {},
+  "mapAttributionStamen": "Csempék: [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "@mapAttributionStamen": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Csempék: [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmLiberty": "Csempék: [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Kiszolgálja: [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "renameProcessorHash": "Hash-kulcs",
+  "@renameProcessorHash": {},
+  "settingsForceWesternArabicNumeralsTile": "Arab számok használata",
+  "@settingsForceWesternArabicNumeralsTile": {},
+  "chipActionGoToExplorerPage": "Mutatás a böngészőben",
+  "@chipActionGoToExplorerPage": {}
 }
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index b92171255..bbbb43724 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -935,18 +935,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Benda Tersembunyi",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filter Tersembunyi",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Foto dan video filter tersembunyi yang cocok tidak akan muncul di koleksi Anda.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Tidak ada filter tersembunyi",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Jalan Tersembunyi",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Foto dan video di folder ini, atau subfoldernya, tidak akan muncul di koleksi Anda.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Tambahkan jalan",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Akses penyimpanan",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Akses Penyimpanan",
@@ -1057,9 +1049,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Arahkan ke utara ke atas",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Data peta © [OpenStreetMap](https://www.openstreetmap.org/copyright) kontributor • Tile oleh [HOT](https://www.hotosm.org/) • Diselenggarakan oleh [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Tile oleh [HOT](https://www.hotosm.org/) • Diselenggarakan oleh [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Data peta © [OpenStreetMap](https://www.openstreetmap.org/copyright) kontributor • Tile oleh [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Tile oleh [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Lihat di halaman Peta",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,7 @@
   "sortOrderShortestFirst": "Yang terpendek dulu",
   "@sortOrderShortestFirst": {},
   "chipActionGoToExplorerPage": "Tampilkan di Explorer",
-  "@chipActionGoToExplorerPage": {}
+  "@chipActionGoToExplorerPage": {},
+  "mapAttributionOsmData": "Data peta © [OpenStreetMap](https://www.openstreetmap.org/copyright) kontributor",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_is.arb b/lib/l10n/app_is.arb
index 2d93d709e..991b394c4 100644
--- a/lib/l10n/app_is.arb
+++ b/lib/l10n/app_is.arb
@@ -17,7 +17,7 @@
   "@settingsEnableBinSubtitle": {},
   "viewerInfoPageTitle": "Upplýsingar",
   "@viewerInfoPageTitle": {},
-  "mapAttributionStamen": "Kortagögn frá © [OpenStreetMap](https://www.openstreetmap.org/copyright) þátttakendum • Kortatíglar frá [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Kortatíglar frá [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "widgetOpenPageViewer": "Opna skoðara",
   "@widgetOpenPageViewer": {},
@@ -453,8 +453,6 @@
   "@albumGroupTier": {},
   "aboutBugReportInstruction": "Tilkynna á GitHub með atvikaskrám og kerfisupplýsingum",
   "@aboutBugReportInstruction": {},
-  "addPathTooltip": "Bæta við slóð",
-  "@addPathTooltip": {},
   "filePickerUseThisFolder": "Nota þessa möppu",
   "@filePickerUseThisFolder": {},
   "videoActionCaptureFrame": "Taka ramma",
@@ -768,8 +766,6 @@
   "@drawerCollectionMotionPhotos": {},
   "settingsDefault": "Sjálfgefið",
   "@settingsDefault": {},
-  "settingsHiddenItemsTabFilters": "Felusíur",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsSlideshowAnimatedZoomEffect": "Aðdráttur með hreyfingu",
   "@settingsSlideshowAnimatedZoomEffect": {},
   "viewerActionSettings": "Stillingar",
@@ -948,7 +944,7 @@
   "@entryInfoActionEditTags": {},
   "collectionActionHideTitleSearch": "Fela titilsíu",
   "@collectionActionHideTitleSearch": {},
-  "mapAttributionOsmHot": "Kortagögn frá © [OpenStreetMap](https://www.openstreetmap.org/copyright) þátttakendum • Kortatíglar frá [HOT](https://www.hotosm.org/) • Hýst af [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Kortatíglar frá [HOT](https://www.hotosm.org/) • Hýst af [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "settingsNavigationDrawerTile": "Leiðsagnarval",
   "@settingsNavigationDrawerTile": {},
@@ -960,8 +956,6 @@
   "@settingsHiddenItemsPageTitle": {},
   "durationDialogHours": "Klukkustundir",
   "@durationDialogHours": {},
-  "settingsHiddenPathsBanner": "Myndir og myndskeið í þessum möppum, eða undirmöppum þeirra, munu ekki birtast í safninu þínu.",
-  "@settingsHiddenPathsBanner": {},
   "settingsKeepScreenOnDialogTitle": "Halda skjá í gangi",
   "@settingsKeepScreenOnDialogTitle": {},
   "wallpaperTargetHome": "Upphafsskjár",
@@ -1376,8 +1370,6 @@
   "@appPickDialogTitle": {},
   "cancelTooltip": "Hætta við",
   "@cancelTooltip": {},
-  "settingsHiddenItemsTabPaths": "Faldar slóðir",
-  "@settingsHiddenItemsTabPaths": {},
   "viewerInfoSearchSuggestionRights": "Réttindi",
   "@viewerInfoSearchSuggestionRights": {},
   "mapPointNorthUpTooltip": "Norður beint upp",
@@ -1532,5 +1524,7 @@
   "videoRepeatActionSetEnd": "Stilla endi",
   "@videoRepeatActionSetEnd": {},
   "chipActionShowCollection": "Sýna í safni",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Kortagögn frá © [OpenStreetMap](https://www.openstreetmap.org/copyright) þátttakendum",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 31fc83f96..57aacabfd 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -955,18 +955,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Elementi nascosti",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtri nascosti",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Le foto e i video che corrispondono ai filtri nascosti non appariranno nella tua collezione.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Nessun filtro nascosto",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Percorsi nascosti",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Le foto e i video in queste cartelle, o in qualsiasi loro sottocartella, non appariranno nella tua collezione.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Aggiungi percorso",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Accesso a tutti i file",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Accesso a tutti i file",
@@ -1081,9 +1073,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Punta a nord verso l’alto",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Dati della mappa © collaboratori di [OpenStreetMap](https://www.openstreetmap.org/copyright) • Titoli di [HOT](https://www.hotosm.org/) • Ospitato da [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Titoli di [HOT](https://www.hotosm.org/) • Ospitato da [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Dati della mappa © collaboratori di [OpenStreetMap](https://www.openstreetmap.org/copyright) • Titoli di [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Titoli di [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Visualizza sulla pagina della mappa",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,7 @@
   "setHomeCustom": "Personalizzato",
   "@setHomeCustom": {},
   "chipActionGoToExplorerPage": "Mostra nell'Esploratore",
-  "@chipActionGoToExplorerPage": {}
+  "@chipActionGoToExplorerPage": {},
+  "mapAttributionOsmData": "Dati della mappa © collaboratori di [OpenStreetMap](https://www.openstreetmap.org/copyright)",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 4ca541b53..574fbca5b 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -903,18 +903,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "非表示アイテム",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "非表示フィルター",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "非表示のフィルターに一致する写真と動画は、コレクションに表示されません。",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "非表示フィルターがありません",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "非表示パス",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "これらのフォルダまたはそのサブフォルダにある写真と動画は、コレクションに表示されません。",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "パスを追加",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "ストレージへのアクセス",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "ストレージへのアクセス",
@@ -1023,10 +1015,6 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "北が上になるように表示",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "地図データ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [HOT](https://www.hotosm.org/) • Hosted by [OSM France](https://openstreetmap.fr/)",
-  "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "地図データ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
   "openMapPageTooltip": "地図ページで表示",
   "@openMapPageTooltip": {},
   "mapEmptyRegion": "この地域の画像はありません",
@@ -1376,5 +1364,7 @@
   "chipActionGoToExplorerPage": "エクスプローラーで表示",
   "@chipActionGoToExplorerPage": {},
   "filterLocatedLabel": "位置情報あり",
-  "@filterLocatedLabel": {}
+  "@filterLocatedLabel": {},
+  "mapAttributionOsmData": "地図データ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index f1925fcfd..b424a0834 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -959,18 +959,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "숨겨진 항목",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "숨겨진 필터",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "이 필터에 맞는 사진과 동영상이 숨겨지고 있으며 이 앱에서 보여지지 않을 것입니다.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "숨겨진 필터가 없습니다",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "숨겨진 경로",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "이 경로에 있는 사진과 동영상이 숨겨지고 있으며 이 앱에서 보여지지 않을 것입니다.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "경로 추가",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "저장공간 접근",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "저장공간 접근",
@@ -1085,9 +1077,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "북쪽을 위로 가리키기",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "지도 데이터 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 기여자 • 타일 [HOT](https://www.hotosm.org/) • 호스팅 [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "타일 [HOT](https://www.hotosm.org/) • 호스팅 [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "지도 데이터 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 기여자 • 타일 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "타일 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "지도 페이지에서 보기",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,15 @@
   "sortOrderShortestFirst": "짧은 순",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "긴 순",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | 타일 [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "지도 데이터 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 기여자",
+  "@mapAttributionOsmData": {},
+  "mapAttributionOsmLiberty": "타일 [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • 호스팅 [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {}
 }
diff --git a/lib/l10n/app_lt.arb b/lib/l10n/app_lt.arb
index 7f7c7317f..320552585 100644
--- a/lib/l10n/app_lt.arb
+++ b/lib/l10n/app_lt.arb
@@ -731,18 +731,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Paslėpti elementai",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Paslėpti filtrai",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Nuotraukos ir vaizdo įrašai, atitinkantys paslėptus filtrus, nebus rodomi jūsų kolekcijoje.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Nėra paslėptų filtrų",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Paslėpti keliai",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Nuotraukos ir vaizdo įrašai šiuose aplankuose ar jų pakatalogiuose nebus rodomi jūsų kolekcijoje.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Pridėti kelią",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Prieiga prie saugyklos",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Prieiga prie saugyklos",
@@ -1255,7 +1247,7 @@
   "@viewerInfoLabelDescription": {},
   "mapPointNorthUpTooltip": "Centruoti pagal šiaurę",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Žemėlapio duomenys © [OpenStreetMap](https://www.openstreetmap.org/copyright) bendraautoriai • Sluoksniai [HOT](https://www.hotosm.org/) • Priegloba [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Sluoksniai [HOT](https://www.hotosm.org/) • Priegloba [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "mapEmptyRegion": "Šiame regione paveikslėlių nėra",
   "@mapEmptyRegion": {},
@@ -1317,7 +1309,7 @@
   "@settingsThumbnailShowLocationIcon": {},
   "tagPlaceholderCountry": "Šalis",
   "@tagPlaceholderCountry": {},
-  "mapAttributionStamen": "Žemėlapio duomenys © [OpenStreetMap](https://www.openstreetmap.org/copyright) bendradarbiai • Sluoksniai [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Sluoksniai [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "tagPlaceholderPlace": "Vieta",
   "@tagPlaceholderPlace": {},
@@ -1338,5 +1330,7 @@
   "entryInfoActionRemoveLocation": "Pašalinti vietą",
   "@entryInfoActionRemoveLocation": {},
   "chipActionShowCollection": "Rodyti kolekcijoje",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Žemėlapio duomenys © [OpenStreetMap](https://www.openstreetmap.org/copyright) bendradarbiai",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_my.arb b/lib/l10n/app_my.arb
index 27f6bd09f..6dd6f843d 100644
--- a/lib/l10n/app_my.arb
+++ b/lib/l10n/app_my.arb
@@ -1157,8 +1157,6 @@
   "@settingsSlideshowFillScreen": {},
   "settingsVideoGestureDoubleTapTogglePlay": "နှစ်ချက်ထိလျှင် ဖွင့်ကြည့်/ရပ်ရန်",
   "@settingsVideoGestureDoubleTapTogglePlay": {},
-  "addPathTooltip": "ပတ်လမ်းကြောင်းထည့်မည်",
-  "@addPathTooltip": {},
   "settingsEnableBin": "ပြန်သုံးအမှိုက်ပုံးကို သုံးရန်",
   "@settingsEnableBin": {},
   "settingsSubtitleThemeTextAlignmentLeft": "ဘယ်ဘက်",
@@ -1219,8 +1217,6 @@
   "@settingsVideoPlaybackPageTitle": {},
   "settingsHiddenItemsPageTitle": "ဝှက်ထားသည့်ပုံများ",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenPathsBanner": "ဒီ folder တွေနဲ့ သူတို့ရဲ့ folder အခွဲတွေထဲက ဓာတ်ပုံနဲ့ ဗီဒီယိုတွေဟာ စုစည်းမှုထဲမှာ ပေါ်မှာမဟုတ်ပါ။",
-  "@settingsHiddenPathsBanner": {},
   "settingsViewerShowOverlayOnOpening": "အဖွင့်တွင် ပြရန်",
   "@settingsViewerShowOverlayOnOpening": {},
   "settingsViewerShowShootingDetails": "ရိုက်ကူးမှုအသေးစိတ်ကို ပြရန်",
@@ -1281,8 +1277,6 @@
   "@settingsSubtitleThemeTextSize": {},
   "settingsCollectionQuickActionTabBrowsing": "ရှာဖွေကြည့်ရှုရာမှာ",
   "@settingsCollectionQuickActionTabBrowsing": {},
-  "settingsHiddenItemsTabPaths": "ဝှက်ထားသည့် ဖိုင်ပတ်လမ်းကြောင်းများ",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsVideoButtonsTile": "ခလုတ်",
   "@settingsVideoButtonsTile": {},
   "settingsSubtitleThemeSample": "ဒါက ဥပမာပြတာပါ။",
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
index afe7f4c81..6b6ad73ce 100644
--- a/lib/l10n/app_nb.arb
+++ b/lib/l10n/app_nb.arb
@@ -852,8 +852,6 @@
   "@settingsSubtitleThemeTextAlignmentCenter": {},
   "settingsVideoControlsPageTitle": "Kontroller",
   "@settingsVideoControlsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Skjulte filtre",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsThemeEnableDynamicColor": "Dynamisk farge",
   "@settingsThemeEnableDynamicColor": {},
   "mapZoomOutTooltip": "Forminsk",
@@ -976,7 +974,7 @@
   "@viewerErrorUnknown": {},
   "viewerInfoBackToViewerTooltip": "Tilbake til visning",
   "@viewerInfoBackToViewerTooltip": {},
-  "mapAttributionOsmHot": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-bidragsyterne • Flis av [HOT](https://www.hotosm.org) • Vertstjent av [OSM France](https://openstreetmap.fr)",
+  "mapAttributionOsmHot": "Flis av [HOT](https://www.hotosm.org) • Vertstjent av [OSM France](https://openstreetmap.fr)",
   "@mapAttributionOsmHot": {},
   "panoramaEnableSensorControl": "Skru på sensorstyring",
   "@panoramaEnableSensorControl": {},
@@ -1195,10 +1193,6 @@
   "@settingsSubtitleThemeTextPositionTile": {},
   "settingsHiddenFiltersEmpty": "Ingen skjulte filtre",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Skjulte stier",
-  "@settingsHiddenItemsTabPaths": {},
-  "addPathTooltip": "Legg til sti",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Lagringstilgang",
   "@settingsStorageAccessTile": {},
   "settingsWidgetDisplayedItem": "Vist element",
@@ -1217,7 +1211,7 @@
   "@coordinateFormatDms": {},
   "settingsCollectionBrowsingQuickActionEditorBanner": "Trykk og hold for å flytte knapper og velge hvilke handlinger som skal vises ved utforskning av elementer.",
   "@settingsCollectionBrowsingQuickActionEditorBanner": {},
-  "mapAttributionStamen": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-bidragsytere • Flis av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Flis av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "moveUndatedConfirmationDialogMessage": "Lagre elementdatoer før fortsettelse?",
   "@moveUndatedConfirmationDialogMessage": {},
@@ -1273,8 +1267,6 @@
   "@settingsSubtitleThemeTextPositionDialogTitle": {},
   "wallpaperUseScrollEffect": "Bruk rulleeffekt på hjemmeskjerm",
   "@wallpaperUseScrollEffect": {},
-  "settingsHiddenPathsBanner": "Bilder og videoer i disse mappene og deres undermapper vil ikke vises i samlingen din.",
-  "@settingsHiddenPathsBanner": {},
   "storageAccessDialogMessage": "Velg {directory} for «{volume}» i neste skjerm for å gi dette programmet tilgang til det.",
   "@storageAccessDialogMessage": {
     "placeholders": {
@@ -1467,7 +1459,7 @@
   "@settingsVideoBackgroundModeDialogTitle": {},
   "tagEditorDiscardDialogMessage": "Forkast endringer?",
   "@tagEditorDiscardDialogMessage": {},
-  "tagPlaceholderState": "Delstat",
+  "tagPlaceholderState": "Tilstand",
   "@tagPlaceholderState": {},
   "chipActionShowCountryStates": "Vis tilstander",
   "@chipActionShowCountryStates": {},
@@ -1476,5 +1468,7 @@
   "vaultLockTypePattern": "Mønster",
   "@vaultLockTypePattern": {},
   "chipActionShowCollection": "Vis i samling",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-bidragsyterne",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index e49349f14..f39770a5c 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -949,18 +949,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Verborgen Items",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Verborgen Filters",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Foto’s en video’s die overeenkomen met verborgen filters, worden niet weergegeven in je verzameling.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Geen verborgen filters",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Verborgen paden",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Foto’s en video’s in deze mappen en onderliggende mappen, verschijnen niet in je verzameling.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Pad toevoegen",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Toegang tot opslag",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Toegang tot opslag",
@@ -1075,9 +1067,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Noorden boven",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Kaartgegevens © [OpenStreetMap](https://www.openstreetmap.org/copyright) bijdragers • Tegels door [HOT](https://www.hotosm.org/) • Gehost door [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Tegels door [HOT](https://www.hotosm.org/) • Gehost door [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Kaartgegevens © [OpenStreetMap](https://www.openstreetmap.org/copyright) bijdragers • Tegels door [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Tegels door [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Op kaartpagina tonen",
   "@openMapPageTooltip": {},
@@ -1392,5 +1384,15 @@
   "sortOrderShortestFirst": "Kortste eerst",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "Langste eerst",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmLiberty": "Symbolen van [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Aangeboden door [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Tegels van [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Kaartgegevens © [OpenStreetMap](https://www.openstreetmap.org/copyright) bijdragers",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_nn.arb b/lib/l10n/app_nn.arb
index 4ee36dab5..61d158406 100644
--- a/lib/l10n/app_nn.arb
+++ b/lib/l10n/app_nn.arb
@@ -881,8 +881,6 @@
   "@settingsNavigationDrawerBanner": {},
   "settingsEnableBinSubtitle": "Sparar på sletta ting i 30 dagar",
   "@settingsEnableBinSubtitle": {},
-  "settingsHiddenItemsTabPaths": "Skjulte mapper",
-  "@settingsHiddenItemsTabPaths": {},
   "statsTopStatesSectionTitle": "Topplandsdelar",
   "@statsTopStatesSectionTitle": {},
   "chipActionCreateVault": "Kvelv",
@@ -1023,8 +1021,6 @@
   "@settingsSubtitleThemeTextPositionDialogTitle": {},
   "settingsSubtitleThemeTextSize": "Tekststorleik",
   "@settingsSubtitleThemeTextSize": {},
-  "settingsHiddenPathsBanner": "Bilete og videoar i desse mappene, og undermappene deiras, vert ikkje viste i samlinga di.",
-  "@settingsHiddenPathsBanner": {},
   "settingsAccessibilitySectionTitle": "Tilgjenge",
   "@settingsAccessibilitySectionTitle": {},
   "settingsStorageAccessRevokeTooltip": "Fråta",
@@ -1243,8 +1239,6 @@
   "@binPageTitle": {},
   "searchCollectionFieldHint": "Søk i samlinga",
   "@searchCollectionFieldHint": {},
-  "addPathTooltip": "Legg til mappe",
-  "@addPathTooltip": {},
   "settingsTimeToTakeActionTile": "Tid for å gjera",
   "@settingsTimeToTakeActionTile": {},
   "searchStatesSectionTitle": "Landsdelar",
@@ -1413,9 +1407,9 @@
       "count": {}
     }
   },
-  "mapAttributionOsmHot": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-medverkarar • Fliser av [HOT](https://www.hotosm.org/) • Hust av [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Fliser av [HOT](https://www.hotosm.org/) • Hust av [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-medverkarar • Fliser av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Fliser av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "columnCount": "{count, plural, =1{{count} kolonne} other{{count} kolonnar}}",
   "@columnCount": {
@@ -1442,5 +1436,7 @@
   "settingsNavigationSectionTitle": "Finn fram",
   "@settingsNavigationSectionTitle": {},
   "chipActionShowCollection": "Vis i Samling",
-  "@chipActionShowCollection": {}
+  "@chipActionShowCollection": {},
+  "mapAttributionOsmData": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright)-medverkarar",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 60a9c651c..a37a1d5ae 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -999,8 +999,6 @@
   "@settingsAllowErrorReporting": {},
   "settingsSaveSearchHistory": "Zapisz historię wyszukiwania",
   "@settingsSaveSearchHistory": {},
-  "settingsHiddenItemsTabPaths": "Ukryte ścieżki",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsStorageAccessTile": "Dostęp do pamięci masowej",
   "@settingsStorageAccessTile": {},
   "settingsRemoveAnimationsTile": "Usuń animacje",
@@ -1031,7 +1029,7 @@
   "@viewerInfoLabelPath": {},
   "mapZoomInTooltip": "Powiększ",
   "@mapZoomInTooltip": {},
-  "mapAttributionStamen": "Dane mapy © [OpenStreetMap](https://www.openstreetmap.org/copyright) współtwórcy • Kafelki od [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Kafelki od [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "filePickerUseThisFolder": "Użyj tego katalogu",
   "@filePickerUseThisFolder": {},
@@ -1221,10 +1219,6 @@
   "@settingsSubtitleThemeTextOpacity": {},
   "settingsUnitSystemTile": "Jednostki",
   "@settingsUnitSystemTile": {},
-  "addPathTooltip": "Dodaj ścieżkę",
-  "@addPathTooltip": {},
-  "settingsHiddenPathsBanner": "Zdjęcia i wideo w tych katalogach, ani w żadnym z ich podkatalogów nie pojawią się w kolekcji.",
-  "@settingsHiddenPathsBanner": {},
   "viewerInfoLabelOwner": "Właściciel",
   "@viewerInfoLabelOwner": {},
   "viewerInfoSearchFieldLabel": "Wyszukaj metadane",
@@ -1283,8 +1277,6 @@
   "@settingsViewerShowInformationSubtitle": {},
   "filePickerShowHiddenFiles": "Pokaż ukryte pliki",
   "@filePickerShowHiddenFiles": {},
-  "settingsHiddenItemsTabFilters": "Ukryte filtry",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsThemeBrightnessTile": "Motyw",
   "@settingsThemeBrightnessTile": {},
   "tagPlaceholderPlace": "Miejsce",
@@ -1325,7 +1317,7 @@
   "@viewerInfoLabelCoordinates": {},
   "viewerInfoUnknown": "Nieznany",
   "@viewerInfoUnknown": {},
-  "mapAttributionOsmHot": "Dane mapy © [OpenStreetMap](https://www.openstreetmap.org/copyright) współtwórcy • Kafelki od [HOT](https://www.hotosm.org/) • Obsługiwany przez: [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Kafelki od [HOT](https://www.hotosm.org/) • Obsługiwany przez: [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "mapPointNorthUpTooltip": "Północ u góry",
   "@mapPointNorthUpTooltip": {},
@@ -1548,5 +1540,15 @@
   "sortOrderShortestFirst": "Najkrótsze najpierw",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "Najdłuższe najpierw",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "Otwórz TopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmLiberty": "Płytki od [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Obsługiwane przez [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Kafelki od [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Dane mapy © [OpenStreetMap](https://www.openstreetmap.org/copyright) współtwórcy",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 2dd8f7bb3..c582cccb5 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -955,18 +955,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Itens ocultos",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtros ocultos",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Fotos e vídeos que correspondem a filtros ocultos não aparecerão em sua coleção.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Sem filtros ocultos",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Caminhos Ocultos",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Fotos e vídeos nessas pastas, ou em qualquer uma de suas subpastas, não aparecerão em sua coleção.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Adicionar caminho",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Acesso ao armazenamento",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Acesso ao armazenamento",
@@ -1081,9 +1073,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Aponte para o norte para cima",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Dados do mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) colaboradores • Blocos por [HOT](https://www.hotosm.org/) • Hospedado por [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Blocos por [HOT](https://www.hotosm.org/) • Hospedado por [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Dados do mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) colaboradores • Blocos por [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Blocos por [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Visualizar na página do mapa",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,7 @@
   "selectStorageVolumeDialogTitle": "Selecione o Armazenamento",
   "@selectStorageVolumeDialogTitle": {},
   "setHomeCustom": "Personalizada",
-  "@setHomeCustom": {}
+  "@setHomeCustom": {},
+  "mapAttributionOsmData": "Dados do mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) colaboradores",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_ro.arb b/lib/l10n/app_ro.arb
index 66fba4a2b..91f029a15 100644
--- a/lib/l10n/app_ro.arb
+++ b/lib/l10n/app_ro.arb
@@ -1023,10 +1023,6 @@
   "@settingsSlideshowFillScreen": {},
   "settingsHiddenFiltersBanner": "Fotografiile și videoclipurile care corespund filtrelor ascunse nu vor apărea în colecție.",
   "@settingsHiddenFiltersBanner": {},
-  "settingsHiddenItemsTabPaths": "Căi ascunse",
-  "@settingsHiddenItemsTabPaths": {},
-  "addPathTooltip": "Adăugare cale",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Acces la stocare",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessEmpty": "Fără acordări de acces",
@@ -1145,8 +1141,6 @@
   "@settingsSlideshowAnimatedZoomEffect": {},
   "settingsSlideshowShuffle": "Amestecare",
   "@settingsSlideshowShuffle": {},
-  "settingsHiddenPathsBanner": "Fotografiile și videoclipurile din aceste dosare sau oricare dintre subdosarele lor nu vor apărea în colecție.",
-  "@settingsHiddenPathsBanner": {},
   "settingsEnableBin": "Utilizare coș de reciclare",
   "@settingsEnableBin": {},
   "settingsStorageAccessPageTitle": "Acces la stocare",
@@ -1181,9 +1175,9 @@
   "@settingsScreenSaverPageTitle": {},
   "settingsWidgetPageTitle": "Ramă foto",
   "@settingsWidgetPageTitle": {},
-  "mapAttributionStamen": "Datele hărții © [OpenStreetMap](https://www.openstreetmap.org/copyright) • Plăci de la [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Plăci de la [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
-  "mapAttributionOsmHot": "Datele hărții © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributori • Plăci de la [HOT](https://www.hotosm.org/) • Găzduit de [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Plăci de la [HOT](https://www.hotosm.org/) • Găzduit de [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "filePickerNoItems": "Fără articole",
   "@filePickerNoItems": {},
@@ -1275,8 +1269,6 @@
   "@settingsVideoAutoPlay": {},
   "settingsHiddenItemsPageTitle": "Articole ascunse",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Filtre ascunse",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsTimeToTakeActionTile": "Timpul pentru acțiune",
   "@settingsTimeToTakeActionTile": {},
   "settingsDisplaySectionTitle": "Afișare",
@@ -1548,5 +1540,7 @@
   "chipActionGoToExplorerPage": "Afișare în Explorer",
   "@chipActionGoToExplorerPage": {},
   "explorerPageTitle": "Explorer",
-  "@explorerPageTitle": {}
+  "@explorerPageTitle": {},
+  "mapAttributionOsmData": "Datele hărții © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributori",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 5e6222825..76766e645 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -955,18 +955,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Скрытые объекты",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Скрытые фильтры",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Фотографии и видео, соответствующие скрытым фильтрам, не появятся в вашей коллекции.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Нет скрытых фильтров",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Скрытые каталоги",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Фотографии и видео в этих каталогах или любых их вложенных каталогах не будут отображаться в вашей коллекции.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Добавить каталог",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Доступ к хранилищу",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Доступ к хранилищу",
@@ -1081,9 +1073,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Повернуть на север",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Данные карты © [OpenStreetMap](https://www.openstreetmap.org/copyright) помощники • Плитки [HOT](https://www.hotosm.org/) • Размещена на [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Плитки [HOT](https://www.hotosm.org/) • Размещена на [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Данные карты © [OpenStreetMap](https://www.openstreetmap.org/copyright) помощники • Плитки [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Плитки [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Просмотреть на странице карты",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,11 @@
   "setHomeCustom": "По своему",
   "@setHomeCustom": {},
   "sortOrderShortestFirst": "Сначала самый короткий",
-  "@sortOrderShortestFirst": {}
+  "@sortOrderShortestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Плитки от [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Данные карты © [openstreetmap](https://www.openstreetmap.org/copyright) участники",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index 28b9a8512..e512e0adb 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -1209,7 +1209,7 @@
   "@settingsEnableBinSubtitle": {},
   "viewerInfoPageTitle": "Informácie",
   "@viewerInfoPageTitle": {},
-  "mapAttributionStamen": "Dáta máp © [OpenStreetMap](https://www.openstreetmap.org/copyright) prispievatelia • [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "[Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "wallpaperUseScrollEffect": "Používanie efektu posúvania na domovskej obrazovke",
   "@wallpaperUseScrollEffect": {},
@@ -1291,8 +1291,6 @@
   "@settingsVideoGestureDoubleTapTogglePlay": {},
   "settingsWidgetDisplayedItem": "Zobrazená položka",
   "@settingsWidgetDisplayedItem": {},
-  "addPathTooltip": "Pridať cestu",
-  "@addPathTooltip": {},
   "settingsEnableBin": "Používanie odpadkového koša",
   "@settingsEnableBin": {},
   "settingsSubtitleThemeTextAlignmentLeft": "Vľavo",
@@ -1351,8 +1349,6 @@
   "@settingsVideoBackgroundMode": {},
   "settingsAllowInstalledAppAccess": "Povolenie prístupu k inventáru aplikácií",
   "@settingsAllowInstalledAppAccess": {},
-  "settingsHiddenItemsTabFilters": "Skryté filtre",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsSlideshowAnimatedZoomEffect": "Animovaný efekt priblíženia",
   "@settingsSlideshowAnimatedZoomEffect": {},
   "settingsDisplayRefreshRateModeTile": "Obnovovacia frekvencia displeja",
@@ -1389,12 +1385,10 @@
   "@viewerInfoLabelUri": {},
   "mapZoomOutTooltip": "Oddialiť",
   "@mapZoomOutTooltip": {},
-  "mapAttributionOsmHot": "Údaje máp © [OpenStreetMap](https://www.openstreetmap.org/copyright) prispievatelia • [HOT](https://www.hotosm.org/) • Hosťuje [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "[HOT](https://www.hotosm.org/) • Hosťuje [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "settingsHiddenItemsPageTitle": "Skryté položky",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenPathsBanner": "Fotografie a videá v týchto priečinkoch ani v žiadnom z ich podpriečinkov sa nezobrazia vo vašej kolekcii.",
-  "@settingsHiddenPathsBanner": {},
   "settingsViewerShowOverlayOnOpening": "Zobraziť pri otvorení",
   "@settingsViewerShowOverlayOnOpening": {},
   "settingsAccessibilityShowPinchGestureAlternatives": "Zobrazenie alternatív viacdotykových gest",
@@ -1493,8 +1487,6 @@
   "@settingsSubtitleThemeTextSize": {},
   "settingsThemeColorHighlights": "Farebné zvýraznenia",
   "@settingsThemeColorHighlights": {},
-  "settingsHiddenItemsTabPaths": "Skryté cesty",
-  "@settingsHiddenItemsTabPaths": {},
   "viewerInfoSearchSuggestionRights": "Práva",
   "@viewerInfoSearchSuggestionRights": {},
   "mapPointNorthUpTooltip": "Nastaviť sever nahor",
@@ -1532,5 +1524,25 @@
   "stopTooltip": "Zastaviť",
   "@stopTooltip": {},
   "renameProcessorHash": "Hash",
-  "@renameProcessorHash": {}
+  "@renameProcessorHash": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "sortByDuration": "Trvanie",
+  "@sortByDuration": {},
+  "sortOrderShortestFirst": "Najkratší prvý",
+  "@sortOrderShortestFirst": {},
+  "sortOrderLongestFirst": "Najdlhšie prvý",
+  "@sortOrderLongestFirst": {},
+  "explorerActionSelectStorageVolume": "Vyberte skladovanie",
+  "@explorerActionSelectStorageVolume": {},
+  "selectStorageVolumeDialogTitle": "Vyberte uloženie",
+  "@selectStorageVolumeDialogTitle": {},
+  "setHomeCustom": "Vlastné",
+  "@setHomeCustom": {},
+  "chipActionGoToExplorerPage": "Zobraziť v Explorer",
+  "@chipActionGoToExplorerPage": {},
+  "explorerPageTitle": "Prieskumník",
+  "@explorerPageTitle": {},
+  "mapAttributionOsmData": "Údaje máp © [OpenStreetMap](https://www.openstreetmap.org/copyright) prispievatelia",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb
index 2d2a9b92f..5ff46b075 100644
--- a/lib/l10n/app_sv.arb
+++ b/lib/l10n/app_sv.arb
@@ -895,7 +895,7 @@
   "@chipActionGoToExplorerPage": {},
   "videoRepeatActionSetEnd": "Ange slut",
   "@videoRepeatActionSetEnd": {},
-  "moveUndatedConfirmationDialogMessage": "Registrera datum på filerna innan vi går vidare?",
+  "moveUndatedConfirmationDialogMessage": "Registrera datum för filerna innan vi går vidare?",
   "@moveUndatedConfirmationDialogMessage": {},
   "renameProcessorHash": "Hash",
   "@renameProcessorHash": {},
@@ -923,7 +923,7 @@
   "@aboutLicensesDartPackagesSectionTitle": {},
   "collectionActionShowTitleSearch": "Visa titelfilter",
   "@collectionActionShowTitleSearch": {},
-  "binEntriesConfirmationDialogMessage": "{count, plural, =1{Flytta denna fil tillpapperskorgen?} other{Flytta dessa {count} filer till papperskorgen?}}",
+  "binEntriesConfirmationDialogMessage": "{count, plural, =1{Flytta denna fil till papperskorgen?} other{Flytta dessa {count} filer till papperskorgen?}}",
   "@binEntriesConfirmationDialogMessage": {
     "placeholders": {
       "count": {
@@ -941,7 +941,7 @@
   "@aboutLicensesFlutterPackagesSectionTitle": {},
   "editEntryDialogTargetFieldsHeader": "Fällt att modifiera",
   "@editEntryDialogTargetFieldsHeader": {},
-  "deleteSingleAlbumConfirmationDialogMessage": "{count, plural, =1{Ta bort detta album samt filen som den innehåller?} other{Ta bort detta album och de {count} filer som den innehåller?}}",
+  "deleteSingleAlbumConfirmationDialogMessage": "{count, plural, =1{Ta bort detta album samt det objektet som den innehåller?} other{Ta bort detta album och de {count} objekt som den innehåller?}}",
   "@deleteSingleAlbumConfirmationDialogMessage": {
     "placeholders": {
       "count": {
@@ -949,7 +949,7 @@
       }
     }
   },
-  "deleteMultiAlbumConfirmationDialogMessage": "{count, plural, =1{Ta bort dessa album samt den fil som dem innehåller?} other{Ta bort dessa album samt de {count} filer som dem innehåller?}}",
+  "deleteMultiAlbumConfirmationDialogMessage": "{count, plural, =1{Ta bort dessa album samt det objekt som de innehåller?} other{Ta bort dessa album samt de {count} objekt som de innehåller?}}",
   "@deleteMultiAlbumConfirmationDialogMessage": {
     "placeholders": {
       "count": {
@@ -1117,10 +1117,6 @@
   "@settingsThumbnailShowTagIcon": {},
   "settingsThumbnailShowFavouriteIcon": "Visa favoritikon",
   "@settingsThumbnailShowFavouriteIcon": {},
-  "settingsHiddenItemsTabPaths": "Dolda kataloger",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Foton och filmer i dessa kataloger, samt i alla underkataloger till dessa, kommer inte att visas i din samling.",
-  "@settingsHiddenPathsBanner": {},
   "settingsDisplayRefreshRateModeDialogTitle": "Uppdateringshastighet",
   "@settingsDisplayRefreshRateModeDialogTitle": {},
   "settingsLanguageTile": "Språk",
@@ -1463,12 +1459,8 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Gömda Objekt",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Gömda Filter",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersEmpty": "Inga dolda filter",
   "@settingsHiddenFiltersEmpty": {},
-  "addPathTooltip": "Lägg till sökväg",
-  "@addPathTooltip": {},
   "settingsRemoveAnimationsTile": "Inaktivera animationer",
   "@settingsRemoveAnimationsTile": {},
   "settingsTimeToTakeActionTile": "Tid innan åtgärd vidtages",
@@ -1559,9 +1551,9 @@
   "@mapStyleDialogTitle": {},
   "mapStyleTooltip": "Välj stil på karta",
   "@mapStyleTooltip": {},
-  "mapAttributionOsmHot": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright) bidragsgivare • Brickor av [HOT](https://www.hotosm.org/) • Tillhandahållen av [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Brickor av [HOT](https://www.hotosm.org/) • Tillhandahållen av [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright) bidragsgivare • Brickor av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Brickor av [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "tagEditorSectionPlaceholders": "Platshållare",
   "@tagEditorSectionPlaceholders": {},
@@ -1569,6 +1561,16 @@
   "@tagEditorDiscardDialogMessage": {},
   "tagPlaceholderCountry": "Land",
   "@tagPlaceholderCountry": {},
-  "tagPlaceholderState": "Stat",
-  "@tagPlaceholderState": {}
+  "tagPlaceholderState": "Delstat",
+  "@tagPlaceholderState": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmLiberty": "Brickor av [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Tillhandahållen av [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Brickor av [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright) bidragsgivare",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 67513441a..5857ccc49 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -857,18 +857,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Gizli Öğeler",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Gizli Filtreler",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Gizli filtrelerle eşleşen fotoğraflar ve videolar koleksiyonunuzda görünmeyecektir.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Gizli filtre yok",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Gizli Yollar",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "Bu klasörlerdeki veya alt klasörlerindeki fotoğraflar ve videolar koleksiyonunuzda görünmeyecektir.",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "Yol ekle",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Depolama erişimi",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Depolama Erişimi",
@@ -971,10 +963,6 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Kuzeyi göster",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "Harita verileri © [OpenStreetMap](https://www.openstreetmap.org/copyright) katkıda bulunanlar • Kutucuklar [HOT](https://www.hotosm.org/) tarafından hazırlanmıştır • [OSM France](https://openstreetmap.fr/) tarafından barındırılmaktadır",
-  "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "Harita verileri © [OpenStreetMap](https://www.openstreetmap.org/copyright) katkıda bulunanlar • Döşemeler [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
   "openMapPageTooltip": "Harita sayfasında görüntüle",
   "@openMapPageTooltip": {},
   "mapEmptyRegion": "Bu bölgede resim yok",
@@ -1390,5 +1378,19 @@
   "sortOrderShortestFirst": "Önce en kısa",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "Önce en uzun",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapAttributionOsmHot": "Döşemeler [HOT](https://www.hotosm.org/) • Barındıran [OSM France](https://openstreetmap.fr/)",
+  "@mapAttributionOsmHot": {},
+  "mapAttributionStamen": "Döşemeler [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "@mapAttributionStamen": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Döşemeler [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmLiberty": "Döşemeler [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Barındıran [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {},
+  "mapAttributionOsmData": "Harita verileri © [OpenStreetMap](https://www.openstreetmap.org/copyright) katkıda bulunanlar",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index c3f6b246f..ec55d158a 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1051,16 +1051,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "Приховані елементи",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "Приховані фільтри",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "Фотографії та відео, що відповідають прихованим фільтрам, не з'являться у вашій колекції.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "Немає прихованих фільтрів",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "Приховані шляхи",
-  "@settingsHiddenItemsTabPaths": {},
-  "addPathTooltip": "Додати шлях",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "Доступ до сховища",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "Доступ до сховища",
@@ -1161,7 +1155,7 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "Повернути на північ",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionStamen": "Картографічні дані © [OpenStreetMap](https://www.openstreetmap.org/copyright) помічники • Плитки [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "Плитки [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "Переглянути на карті",
   "@openMapPageTooltip": {},
@@ -1317,8 +1311,6 @@
   "@settingsAllowInstalledAppAccess": {},
   "settingsEnableBinSubtitle": "Зберігає видалені елементи протягом 30 днів",
   "@settingsEnableBinSubtitle": {},
-  "settingsHiddenPathsBanner": "Фотографії та відео в цих теках, або будь-яких їх підтеках, не з'являться у вашій колекції.",
-  "@settingsHiddenPathsBanner": {},
   "settingsThemeBrightnessDialogTitle": "Тема",
   "@settingsThemeBrightnessDialogTitle": {},
   "settingsLanguagePageTitle": "Мова",
@@ -1337,7 +1329,7 @@
   "@settingsScreenSaverPageTitle": {},
   "settingsWidgetDisplayedItem": "Відображаємий елемент",
   "@settingsWidgetDisplayedItem": {},
-  "mapAttributionOsmHot": "Картографічні дані © [OpenStreetMap](https://www.openstreetmap.org/copyright) помічники • Плитки [HOT](https://www.hotosm.org/) • Розміщена на [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "Плитки [HOT](https://www.hotosm.org/) • Розміщена на [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
   "settingsAccessibilityShowPinchGestureAlternatives": "Показувати альтернативи мультисенсорним жестам",
   "@settingsAccessibilityShowPinchGestureAlternatives": {},
@@ -1548,5 +1540,7 @@
   "sortOrderShortestFirst": "Спершу найкоротше",
   "@sortOrderShortestFirst": {},
   "sortOrderLongestFirst": "Спершу найдовше",
-  "@sortOrderLongestFirst": {}
+  "@sortOrderLongestFirst": {},
+  "mapAttributionOsmData": "Картографічні дані © [OpenStreetMap](https://www.openstreetmap.org/copyright) помічники",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
index d3626446f..fbdf4200b 100644
--- a/lib/l10n/app_vi.arb
+++ b/lib/l10n/app_vi.arb
@@ -227,8 +227,6 @@
   "@settingsEnableBinSubtitle": {},
   "viewerInfoPageTitle": "Thông tin",
   "@viewerInfoPageTitle": {},
-  "mapAttributionStamen": "Dữ liệu bản đồ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
-  "@mapAttributionStamen": {},
   "widgetOpenPageViewer": "Mở chế độ xem",
   "@widgetOpenPageViewer": {},
   "setCoverDialogLatest": "Mục mới nhất",
@@ -629,8 +627,6 @@
   "@albumGroupTier": {},
   "aboutBugReportInstruction": "Báo cáo trên GitHub với nhật ký và thông tin hệ thống",
   "@aboutBugReportInstruction": {},
-  "addPathTooltip": "Thêm đường dẫn",
-  "@addPathTooltip": {},
   "filePickerUseThisFolder": "Dùng thư mục này",
   "@filePickerUseThisFolder": {},
   "patternDialogEnter": "Nhập mẫu",
@@ -939,8 +935,6 @@
   "@drawerCollectionMotionPhotos": {},
   "settingsDefault": "Mặc định",
   "@settingsDefault": {},
-  "settingsHiddenItemsTabFilters": "Bộ lọc ẩn",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsSlideshowAnimatedZoomEffect": "Hiệu ứng phóng to",
   "@settingsSlideshowAnimatedZoomEffect": {},
   "placePageTitle": "Địa điểm",
@@ -1101,8 +1095,6 @@
   "@mapZoomOutTooltip": {},
   "collectionActionHideTitleSearch": "Ẩn tên filter",
   "@collectionActionHideTitleSearch": {},
-  "mapAttributionOsmHot": "Dữ liệu bản đồ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors • Tiles by [HOT](https://www.hotosm.org/) • Hosted by [OSM France](https://openstreetmap.fr/)",
-  "@mapAttributionOsmHot": {},
   "settingsNavigationDrawerTile": "Menu điều hướng",
   "@settingsNavigationDrawerTile": {},
   "drawerCollectionAnimated": "Hoạt ảnh",
@@ -1115,8 +1107,6 @@
   "@keepScreenOnViewerOnly": {},
   "durationDialogHours": "Giờ",
   "@durationDialogHours": {},
-  "settingsHiddenPathsBanner": "Ảnh và video trong các thư mục này hoặc bất kỳ thư mục con nào của chúng sẽ không xuất hiện trong bộ sưu tập của bạn.",
-  "@settingsHiddenPathsBanner": {},
   "settingsKeepScreenOnDialogTitle": "Giữ màn hình luôn bật",
   "@settingsKeepScreenOnDialogTitle": {},
   "wallpaperTargetHome": "Màn hình chính",
@@ -1475,8 +1465,6 @@
   "@settingsThemeColorHighlights": {},
   "appPickDialogTitle": "Chọn ứng dụng",
   "@appPickDialogTitle": {},
-  "settingsHiddenItemsTabPaths": "Đường dẫn mục ẩn",
-  "@settingsHiddenItemsTabPaths": {},
   "viewerInfoSearchSuggestionRights": "Luật",
   "@viewerInfoSearchSuggestionRights": {},
   "mapPointNorthUpTooltip": "Hướng về phía bắc",
@@ -1533,12 +1521,34 @@
   "@settingsForceWesternArabicNumeralsTile": {},
   "chipActionShowCollection": "Hiển thị trong Bộ sưu tập",
   "@chipActionShowCollection": {},
-  "selectStorageVolumeDialogTitle": "Chọn dung lượng",
+  "selectStorageVolumeDialogTitle": "Chọn bộ nhớ",
   "@selectStorageVolumeDialogTitle": {},
   "explorerActionSelectStorageVolume": "Chọn dung lượng",
   "@explorerActionSelectStorageVolume": {},
   "chipActionGoToExplorerPage": "Hiển thị ở Explorer",
   "@chipActionGoToExplorerPage": {},
-  "explorerPageTitle": "Explorer",
-  "@explorerPageTitle": {}
+  "explorerPageTitle": "Khám phá",
+  "@explorerPageTitle": {},
+  "mapAttributionOsmData": "Dữ liệu bản đồ © [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors",
+  "@mapAttributionOsmData": {},
+  "setHomeCustom": "Tùy chỉnh",
+  "@setHomeCustom": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Cung cấp bởi [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmHot": "Cung cấp bởi [HOT](https://www.hotosm.org/) • Lưu trữ bởi [OSM France](https://openstreetmap.fr/)",
+  "@mapAttributionOsmHot": {},
+  "mapAttributionStamen": "Cung cấp bởi [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "@mapAttributionStamen": {},
+  "mapStyleOsmLiberty": "OSM Liberty",
+  "@mapStyleOsmLiberty": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "sortByDuration": "Theo thời lượng",
+  "@sortByDuration": {},
+  "sortOrderShortestFirst": "Ngắn nhất trước",
+  "@sortOrderShortestFirst": {},
+  "sortOrderLongestFirst": "Dài nhất trước",
+  "@sortOrderLongestFirst": {},
+  "mapAttributionOsmLiberty": "Cung cấp bởi [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Được lưu trữ bởi [OSM Americana](https://tile.ourmap.us)",
+  "@mapAttributionOsmLiberty": {}
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 444d67bc2..bedeeccb5 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -947,18 +947,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "隐藏项",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "隐藏过滤器",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "匹配隐藏过滤器的照片和视频将不会出现在你的媒体集中",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "无隐藏过滤器",
   "@settingsHiddenFiltersEmpty": {},
-  "settingsHiddenItemsTabPaths": "隐藏路径",
-  "@settingsHiddenItemsTabPaths": {},
-  "settingsHiddenPathsBanner": "以下文件夹及其子文件夹中的照片和视频将不会出现在你的媒体集中",
-  "@settingsHiddenPathsBanner": {},
-  "addPathTooltip": "添加路径",
-  "@addPathTooltip": {},
   "settingsStorageAccessTile": "存储访问",
   "@settingsStorageAccessTile": {},
   "settingsStorageAccessPageTitle": "存储访问",
@@ -1073,9 +1065,9 @@
   "@mapZoomOutTooltip": {},
   "mapPointNorthUpTooltip": "上北下南",
   "@mapPointNorthUpTooltip": {},
-  "mapAttributionOsmHot": "地图数据由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 贡献 • 绘制于 [HOT](https://www.hotosm.org/) • 主办方 [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "绘制于 [HOT](https://www.hotosm.org/) • 主办方 [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "地图数据由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 贡献 • 绘制于 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "绘制于 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "在地图页面上查看",
   "@openMapPageTooltip": {},
@@ -1390,5 +1382,11 @@
   "sortOrderLongestFirst": "先长后短",
   "@sortOrderLongestFirst": {},
   "sortOrderShortestFirst": "先短后长",
-  "@sortOrderShortestFirst": {}
+  "@sortOrderShortestFirst": {},
+  "mapStyleOpenTopoMap": "OpenTopoMap",
+  "@mapStyleOpenTopoMap": {},
+  "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | 图块由 [OpenTopoMap](https://opentopomap.org/)提供，[CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+  "@mapAttributionOpenTopoMap": {},
+  "mapAttributionOsmData": "地图数据由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 贡献",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index 490b5e76a..e63949190 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -819,14 +819,10 @@
   "@settingsHiddenItemsTile": {},
   "settingsHiddenItemsPageTitle": "隱藏項目",
   "@settingsHiddenItemsPageTitle": {},
-  "settingsHiddenItemsTabFilters": "隱藏過濾器",
-  "@settingsHiddenItemsTabFilters": {},
   "settingsHiddenFiltersBanner": "符合過濾器的相片和影片將不會顯示在你的收藏品中.",
   "@settingsHiddenFiltersBanner": {},
   "settingsHiddenFiltersEmpty": "沒有隱藏過濾器",
   "@settingsHiddenFiltersEmpty": {},
-  "addPathTooltip": "新增路徑",
-  "@addPathTooltip": {},
   "settingsStorageAccessEmpty": "沒有存取權限",
   "@settingsStorageAccessEmpty": {},
   "settingsAccessibilitySectionTitle": "無障礙",
@@ -1229,14 +1225,10 @@
   "@settingsSubtitleThemeTextAlignmentDialogTitle": {},
   "settingsSubtitleThemeTextPositionTile": "文字位置",
   "@settingsSubtitleThemeTextPositionTile": {},
-  "settingsHiddenItemsTabPaths": "隱藏路徑",
-  "@settingsHiddenItemsTabPaths": {},
   "settingsSubtitleThemeTextPositionDialogTitle": "文字位置",
   "@settingsSubtitleThemeTextPositionDialogTitle": {},
   "settingsSubtitleThemeTextSize": "文字大小",
   "@settingsSubtitleThemeTextSize": {},
-  "settingsHiddenPathsBanner": "相片和影片在這些目錄, 或任何他們的子目錄, 將不會顯示在收藏品中.",
-  "@settingsHiddenPathsBanner": {},
   "settingsAllowInstalledAppAccessSubtitle": "用於改進相簿顯示",
   "@settingsAllowInstalledAppAccessSubtitle": {},
   "viewerInfoLabelPath": "路徑",
@@ -1271,9 +1263,9 @@
   "@viewerErrorUnknown": {},
   "viewerInfoLabelDate": "日期",
   "@viewerInfoLabelDate": {},
-  "mapAttributionOsmHot": "地圖資料由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 貢獻 • 繪製於 [HOT](https://www.hotosm.org/) • 主辦方 [OSM France](https://openstreetmap.fr/)",
+  "mapAttributionOsmHot": "繪製於 [HOT](https://www.hotosm.org/) • 主辦方 [OSM France](https://openstreetmap.fr/)",
   "@mapAttributionOsmHot": {},
-  "mapAttributionStamen": "地圖資料由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 貢獻 • 繪製於 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
+  "mapAttributionStamen": "繪製於 [Stamen Design](https://stamen.com), [CC BY 3.0](https://creativecommons.org/licenses/by/3.0)",
   "@mapAttributionStamen": {},
   "openMapPageTooltip": "在地圖頁面上檢視",
   "@openMapPageTooltip": {},
@@ -1536,5 +1528,7 @@
   "explorerPageTitle": "檔案總管",
   "@explorerPageTitle": {},
   "chipActionGoToExplorerPage": "在檔案總管裡顯示",
-  "@chipActionGoToExplorerPage": {}
+  "@chipActionGoToExplorerPage": {},
+  "mapAttributionOsmData": "地圖資料由 © [OpenStreetMap](https://www.openstreetmap.org/copyright) 貢獻",
+  "@mapAttributionOsmData": {}
 }
diff --git a/lib/model/app/contributors.dart b/lib/model/app/contributors.dart
index 887be085c..82d89088c 100644
--- a/lib/model/app/contributors.dart
+++ b/lib/model/app/contributors.dart
@@ -101,6 +101,8 @@ class Contributors {
     Contributor('Scorza9999', 'oliva.scorza@gmail.com'),
     Contributor('Taufan', 'taufanxxx@gmail.com'),
     Contributor('Leo Aaua Felix', 'g00g7el@gmail.com'),
+    Contributor('-J-', 'heyj0e@tuta.io'),
+    Contributor('bittin1ddc447d824349b2', 'bittin@reimu.nl'),
     // Contributor('Alvi Khan', 'aveenalvi@gmail.com'), // Bengali
     // Contributor('Htet Oo Hlaing', 'htetoh2006@outlook.com'), // Burmese
     // Contributor('Khant', 'khant@users.noreply.hosted.weblate.org'), // Burmese
diff --git a/lib/model/app/dependencies.dart b/lib/model/app/dependencies.dart
index 6492429e6..d09b2b933 100644
--- a/lib/model/app/dependencies.dart
+++ b/lib/model/app/dependencies.dart
@@ -284,6 +284,16 @@ class Dependencies {
       license: mit,
       sourceUrl: 'https://github.com/Milad-Akarie/smooth_page_indicator',
     ),
+    Dependency(
+      name: 'Vector Map Tiles',
+      license: bsd3,
+      sourceUrl: 'https://github.com/greensopinion/flutter-vector-map-tiles',
+    ),
+    Dependency(
+      name: 'Vector Tile Renderer',
+      license: bsd3,
+      sourceUrl: 'https://github.com/greensopinion/dart-vector-tile-renderer',
+    ),
   ];
 
   static const List<Dependency> dartPackages = [
@@ -328,6 +338,11 @@ class Dependencies {
       license: mit,
       sourceUrl: 'https://github.com/fluttercommunity/get_it',
     ),
+    Dependency(
+      name: 'HTTP',
+      license: bsd3,
+      sourceUrl: 'https://github.com/dart-lang/http',
+    ),
     Dependency(
       name: 'Intl',
       license: bsd3,
diff --git a/lib/model/app/intent.dart b/lib/model/app/intent.dart
index da8f1dca5..ee4985b0e 100644
--- a/lib/model/app/intent.dart
+++ b/lib/model/app/intent.dart
@@ -7,6 +7,7 @@ class IntentActions {
   static const search = 'search';
   static const setWallpaper = 'set_wallpaper';
   static const view = 'view';
+  static const viewGeo = 'view_geo';
   static const widgetOpen = 'widget_open';
   static const widgetSettings = 'widget_settings';
 }
@@ -20,7 +21,6 @@ class IntentDataKeys {
   static const mimeType = 'mimeType';
   static const page = 'page';
   static const query = 'query';
-  static const safeMode = 'safeMode';
   static const secureUris = 'secureUris';
   static const uri = 'uri';
   static const widgetId = 'widgetId';
diff --git a/lib/model/settings/enums/map_style.dart b/lib/model/settings/enums/map_style.dart
index a10231bfa..a172459e6 100644
--- a/lib/model/settings/enums/map_style.dart
+++ b/lib/model/settings/enums/map_style.dart
@@ -14,11 +14,12 @@ extension ExtraEntryMapStyle on EntryMapStyle {
 
   bool get needMobileService {
     switch (this) {
-      case EntryMapStyle.osmHot:
-      case EntryMapStyle.stamenWatercolor:
-        return false;
-      default:
+      case EntryMapStyle.googleNormal:
+      case EntryMapStyle.googleHybrid:
+      case EntryMapStyle.googleTerrain:
         return true;
+      default:
+        return false;
     }
   }
 }
diff --git a/lib/model/source/collection_source.dart b/lib/model/source/collection_source.dart
index 0b318dc15..54650baa3 100644
--- a/lib/model/source/collection_source.dart
+++ b/lib/model/source/collection_source.dart
@@ -31,7 +31,7 @@ import 'package:collection/collection.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/foundation.dart';
 
-enum SourceInitializationState { none, directory, full }
+enum SourceScope { none, album, full }
 
 mixin SourceBase {
   EventBus get eventBus;
@@ -93,7 +93,7 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
     _rawEntries.forEach((v) => v.dispose());
   }
 
-  set safeMode(bool enabled);
+  set canAnalyze(bool enabled);
 
   final EventBus _eventBus = EventBus();
 
@@ -427,13 +427,12 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
     eventBus.fire(EntryMovedEvent(MoveType.move, movedEntries));
   }
 
-  SourceInitializationState get initState => SourceInitializationState.none;
+  SourceScope get scope => SourceScope.none;
 
   Future<void> init({
     AnalysisController? analysisController,
-    String? directory,
+    AlbumFilter? albumFilter,
     bool loadTopEntriesFirst = false,
-    bool canAnalyze = true,
   });
 
   Future<Set<String>> refreshUris(Set<String> changedUris, {AnalysisController? analysisController});
@@ -518,13 +517,13 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
 
   // monitoring
 
-  bool _monitoring = true;
+  bool _canRefresh = true;
 
-  void pauseMonitoring() => _monitoring = false;
+  void pauseMonitoring() => _canRefresh = false;
 
-  void resumeMonitoring() => _monitoring = true;
+  void resumeMonitoring() => _canRefresh = true;
 
-  bool get isMonitoring => _monitoring;
+  bool get canRefresh => _canRefresh;
 
   // filter summary
 
diff --git a/lib/model/source/media_store_source.dart b/lib/model/source/media_store_source.dart
index 90711077e..4b3f12e08 100644
--- a/lib/model/source/media_store_source.dart
+++ b/lib/model/source/media_store_source.dart
@@ -21,36 +21,34 @@ class MediaStoreSource extends CollectionSource {
   final Debouncer _changeDebouncer = Debouncer(delay: ADurations.mediaContentChangeDebounceDelay);
   final Set<String> _changedUris = {};
   int? _lastGeneration;
-  SourceInitializationState _initState = SourceInitializationState.none;
-  bool _safeMode = false;
+  SourceScope _scope = SourceScope.none;
+  bool _canAnalyze = true;
 
   @override
-  set safeMode(bool enabled) => _safeMode = enabled;
+  set canAnalyze(bool enabled) => _canAnalyze = enabled;
 
   @override
-  SourceInitializationState get initState => _initState;
+  SourceScope get scope => _scope;
 
   @override
   Future<void> init({
     AnalysisController? analysisController,
-    String? directory,
+    AlbumFilter? albumFilter,
     bool loadTopEntriesFirst = false,
-    bool canAnalyze = true,
   }) async {
-    await reportService.log('$runtimeType init directory=$directory');
-    if (_initState == SourceInitializationState.none) {
+    await reportService.log('$runtimeType init album=${albumFilter?.album}');
+    if (_scope == SourceScope.none) {
       await _loadEssentials();
     }
-    if (_initState != SourceInitializationState.full) {
-      _initState = directory != null ? SourceInitializationState.directory : SourceInitializationState.full;
+    if (_scope != SourceScope.full) {
+      _scope = albumFilter != null ? SourceScope.album : SourceScope.full;
     }
     addDirectories(albums: settings.pinnedFilters.whereType<AlbumFilter>().map((v) => v.album).toSet());
     await updateGeneration();
     unawaited(_loadEntries(
       analysisController: analysisController,
-      directory: directory,
+      directory: albumFilter?.album,
       loadTopEntriesFirst: loadTopEntriesFirst,
-      canAnalyze: canAnalyze && !_safeMode,
     ));
   }
 
@@ -80,7 +78,6 @@ class MediaStoreSource extends CollectionSource {
     AnalysisController? analysisController,
     String? directory,
     required bool loadTopEntriesFirst,
-    required bool canAnalyze,
   }) async {
     unawaited(reportService.log('$runtimeType load start'));
     final stopwatch = Stopwatch()..start();
@@ -158,6 +155,12 @@ class MediaStoreSource extends CollectionSource {
       knownDateByContentId[contentId] = 0;
     });
 
+    if (!_canAnalyze) {
+      // it can discover new entries only if it can analyze them
+      state = SourceState.ready;
+      return;
+    }
+
     // items to add to the collection
     final newEntries = <AvesEntry>{};
 
@@ -169,7 +172,7 @@ class MediaStoreSource extends CollectionSource {
 
     // fetch new & modified entries
     debugPrint('$runtimeType load ${stopwatch.elapsed} fetch new entries');
-    mediaStoreService.getEntries(_safeMode, knownDateByContentId, directory: directory).listen(
+    mediaStoreService.getEntries(knownDateByContentId, directory: directory).listen(
       (entry) {
         // when discovering modified entry with known content ID,
         // reuse known entry ID to overwrite it while preserving favourites, etc.
@@ -210,11 +213,7 @@ class MediaStoreSource extends CollectionSource {
         if (analysisIds != null) {
           analysisEntries = visibleEntries.where((entry) => analysisIds.contains(entry.id)).toSet();
         }
-        if (canAnalyze) {
-          await analyze(analysisController, entries: analysisEntries);
-        } else {
-          state = SourceState.ready;
-        }
+        await analyze(analysisController, entries: analysisEntries);
 
         // the home page may not reflect the current derived filters
         // as the initial addition of entries is silent,
@@ -234,7 +233,7 @@ class MediaStoreSource extends CollectionSource {
   // sometimes yields an entry with its temporary path: `/data/sec/camera/!@#$%^..._temp.jpg`
   @override
   Future<Set<String>> refreshUris(Set<String> changedUris, {AnalysisController? analysisController}) async {
-    if (_initState == SourceInitializationState.none || !isMonitoring || !isReady) return changedUris;
+    if (_scope == SourceScope.none || !canRefresh || !isReady) return changedUris;
 
     state = SourceState.loading;
 
@@ -272,7 +271,8 @@ class MediaStoreSource extends CollectionSource {
           if (volume != null) {
             if (existingEntry != null) {
               entriesToRefresh.add(existingEntry);
-            } else {
+            } else if (_canAnalyze) {
+              // it can discover new entries only if it can analyze them
               sourceEntry.id = localMediaDb.nextId;
               newEntries.add(sourceEntry);
             }
diff --git a/lib/services/app_profile_service.dart b/lib/services/app_profile_service.dart
new file mode 100644
index 000000000..c3b9fe711
--- /dev/null
+++ b/lib/services/app_profile_service.dart
@@ -0,0 +1,89 @@
+import 'dart:async';
+
+import 'package:aves/services/common/services.dart';
+import 'package:flutter/services.dart';
+
+abstract class AppProfileService {
+  Future<bool> canInteractAcrossProfiles();
+
+  Future<bool> canRequestInteractAcrossProfiles();
+
+  Future<bool> requestInteractAcrossProfiles();
+
+  Future<String> getProfileSwitchingLabel();
+
+  Future<void> switchProfile();
+
+  Future<List<String>> getTargetUserProfiles();
+}
+
+class PlatformAppProfileService implements AppProfileService {
+  static const _platform = MethodChannel('deckers.thibault/aves/app_profile');
+
+  @override
+  Future<bool> canInteractAcrossProfiles() async {
+    try {
+      final result = await _platform.invokeMethod('canInteractAcrossProfiles');
+      if (result != null) return result as bool;
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return false;
+  }
+
+  @override
+  Future<bool> canRequestInteractAcrossProfiles() async {
+    try {
+      final result = await _platform.invokeMethod('canRequestInteractAcrossProfiles');
+      if (result != null) return result as bool;
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return false;
+  }
+
+  @override
+  Future<bool> requestInteractAcrossProfiles() async {
+    try {
+      final result = await _platform.invokeMethod('requestInteractAcrossProfiles');
+      if (result != null) return result as bool;
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return false;
+  }
+
+  @override
+  Future<void> switchProfile() async {
+    try {
+      await _platform.invokeMethod('switchProfile');
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return;
+  }
+
+  @override
+  Future<String> getProfileSwitchingLabel() async {
+    try {
+      final result = await _platform.invokeMethod('getProfileSwitchingLabel');
+      return result as String;
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return '';
+  }
+
+  @override
+  Future<List<String>> getTargetUserProfiles() async {
+    try {
+      final result = await _platform.invokeMethod('getTargetUserProfiles');
+      if (result != null) {
+        return (result as List).cast<String>();
+      }
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return [];
+  }
+}
diff --git a/lib/services/common/services.dart b/lib/services/common/services.dart
index e66851f7d..465f2b471 100644
--- a/lib/services/common/services.dart
+++ b/lib/services/common/services.dart
@@ -2,6 +2,7 @@ import 'package:aves/model/availability.dart';
 import 'package:aves/model/db/db.dart';
 import 'package:aves/model/db/db_sqflite.dart';
 import 'package:aves/model/settings/store_shared_pref.dart';
+import 'package:aves/services/app_profile_service.dart';
 import 'package:aves/services/app_service.dart';
 import 'package:aves/services/device_service.dart';
 import 'package:aves/services/media/embedded_data_service.dart';
@@ -37,6 +38,7 @@ final AvesVideoControllerFactory videoControllerFactory = getIt<AvesVideoControl
 final AvesVideoMetadataFetcher videoMetadataFetcher = getIt<AvesVideoMetadataFetcher>();
 
 final AppService appService = getIt<AppService>();
+final AppProfileService appProfileService = getIt<AppProfileService>();
 final DeviceService deviceService = getIt<DeviceService>();
 final EmbeddedDataService embeddedDataService = getIt<EmbeddedDataService>();
 final MediaEditService mediaEditService = getIt<MediaEditService>();
@@ -59,6 +61,7 @@ void initPlatformServices() {
   getIt.registerLazySingleton<AvesVideoMetadataFetcher>(FfmpegVideoMetadataFetcher.new);
 
   getIt.registerLazySingleton<AppService>(PlatformAppService.new);
+  getIt.registerLazySingleton<AppProfileService>(PlatformAppProfileService.new);
   getIt.registerLazySingleton<DeviceService>(PlatformDeviceService.new);
   getIt.registerLazySingleton<EmbeddedDataService>(PlatformEmbeddedDataService.new);
   getIt.registerLazySingleton<MediaEditService>(PlatformMediaEditService.new);
diff --git a/lib/services/media/media_store_service.dart b/lib/services/media/media_store_service.dart
index 3e1e8511a..cbc07ea80 100644
--- a/lib/services/media/media_store_service.dart
+++ b/lib/services/media/media_store_service.dart
@@ -15,7 +15,7 @@ abstract class MediaStoreService {
   Future<int?> getGeneration();
 
   // knownEntries: map of contentId -> dateModifiedSecs
-  Stream<AvesEntry> getEntries(bool safe, Map<int?, int?> knownEntries, {String? directory});
+  Stream<AvesEntry> getEntries(Map<int?, int?> knownEntries, {String? directory});
 
   // returns media URI
   Future<Uri?> scanFile(String path, String mimeType);
@@ -77,13 +77,12 @@ class PlatformMediaStoreService implements MediaStoreService {
   }
 
   @override
-  Stream<AvesEntry> getEntries(bool safe, Map<int?, int?> knownEntries, {String? directory}) {
+  Stream<AvesEntry> getEntries(Map<int?, int?> knownEntries, {String? directory}) {
     try {
       return _stream
           .receiveBroadcastStream(<String, dynamic>{
             'knownEntries': knownEntries,
             'directory': directory,
-            'safe': safe,
           })
           .where((event) => event is Map)
           .map((event) => AvesEntry.fromMap(event as Map));
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
index 78ac5cf97..c97206cda 100644
--- a/lib/services/storage_service.dart
+++ b/lib/services/storage_service.dart
@@ -24,7 +24,9 @@ abstract class StorageService {
 
   Future<Set<VolumeRelativeDirectory>> getInaccessibleDirectories(Iterable<String> dirPaths);
 
-  Future<Set<VolumeRelativeDirectory>> getRestrictedDirectories();
+  // returns directories with restricted access,
+  // with the relative part in lowercase, for case-insensitive comparison
+  Future<Set<VolumeRelativeDirectory>> getRestrictedDirectoriesLowerCase();
 
   Future<void> revokeDirectoryAccess(String path);
 
@@ -155,11 +157,17 @@ class PlatformStorageService implements StorageService {
   }
 
   @override
-  Future<Set<VolumeRelativeDirectory>> getRestrictedDirectories() async {
+  Future<Set<VolumeRelativeDirectory>> getRestrictedDirectoriesLowerCase() async {
     try {
       final result = await _platform.invokeMethod('getRestrictedDirectories');
       if (result != null) {
-        return (result as List).cast<Map>().map(VolumeRelativeDirectory.fromMap).toSet();
+        return (result as List)
+            .cast<Map>()
+            .map(VolumeRelativeDirectory.fromMap)
+            .map((dir) => dir.copyWith(
+                  relativeDir: dir.relativeDir.toLowerCase(),
+                ))
+            .toSet();
       }
     } on PlatformException catch (e, stack) {
       await reportService.recordError(e, stack);
@@ -176,7 +184,6 @@ class PlatformStorageService implements StorageService {
     } on PlatformException catch (e, stack) {
       await reportService.recordError(e, stack);
     }
-    return;
   }
 
   // returns number of deleted directories
diff --git a/lib/utils/android_file_utils.dart b/lib/utils/android_file_utils.dart
index 327485eeb..b11f2f1d7 100644
--- a/lib/utils/android_file_utils.dart
+++ b/lib/utils/android_file_utils.dart
@@ -48,7 +48,8 @@ class AndroidFileUtils {
     primaryStorage = storageVolumes.firstWhereOrNull((volume) => volume.isPrimary)?.path ?? separator;
     // standard
     dcimPath = pContext.join(primaryStorage, 'DCIM');
-    downloadPath = pContext.join(primaryStorage, 'Download');
+    // effective download path may have a different case
+    downloadPath = pContext.join(primaryStorage, 'Download').toLowerCase();
     moviesPath = pContext.join(primaryStorage, 'Movies');
     picturesPath = pContext.join(primaryStorage, 'Pictures');
     avesVideoCapturesPath = pContext.join(dcimPath, 'Video Captures');
@@ -78,7 +79,7 @@ class AndroidFileUtils {
 
   bool isVideoCapturesPath(String path) => videoCapturesPaths.contains(path);
 
-  bool isDownloadPath(String path) => path == downloadPath;
+  bool isDownloadPath(String path) => path.toLowerCase() == downloadPath;
 
   StorageVolume? getStorageVolume(String? path) {
     if (path == null) return null;
diff --git a/lib/view/src/actions/explorer.dart b/lib/view/src/actions/explorer.dart
index 9b5272637..b23c8fc55 100644
--- a/lib/view/src/actions/explorer.dart
+++ b/lib/view/src/actions/explorer.dart
@@ -9,6 +9,7 @@ extension ExtraExplorerActionView on ExplorerAction {
     return switch (this) {
       ExplorerAction.addShortcut => l10n.collectionActionAddShortcut,
       ExplorerAction.setHome => l10n.collectionActionSetHome,
+      ExplorerAction.hide => l10n.chipActionHide,
       ExplorerAction.stats => l10n.menuActionStats,
     };
   }
@@ -19,6 +20,7 @@ extension ExtraExplorerActionView on ExplorerAction {
     return switch (this) {
       ExplorerAction.addShortcut => AIcons.addShortcut,
       ExplorerAction.setHome => AIcons.home,
+      ExplorerAction.hide => AIcons.hide,
       ExplorerAction.stats => AIcons.stats,
     };
   }
diff --git a/lib/view/src/settings/enums.dart b/lib/view/src/settings/enums.dart
index 12f15e10c..64c41c1d5 100644
--- a/lib/view/src/settings/enums.dart
+++ b/lib/view/src/settings/enums.dart
@@ -68,6 +68,8 @@ extension ExtraEntryMapStyleView on EntryMapStyle {
       EntryMapStyle.googleNormal => l10n.mapStyleGoogleNormal,
       EntryMapStyle.googleHybrid => l10n.mapStyleGoogleHybrid,
       EntryMapStyle.googleTerrain => l10n.mapStyleGoogleTerrain,
+      EntryMapStyle.osmLiberty => l10n.mapStyleOsmLiberty,
+      EntryMapStyle.openTopoMap => l10n.mapStyleOpenTopoMap,
       EntryMapStyle.osmHot => l10n.mapStyleOsmHot,
       EntryMapStyle.stamenWatercolor => l10n.mapStyleStamenWatercolor,
     };
diff --git a/lib/widget_common.dart b/lib/widget_common.dart
index 73d9b81f6..f9b357c85 100644
--- a/lib/widget_common.dart
+++ b/lib/widget_common.dart
@@ -96,7 +96,8 @@ Future<AvesEntry?> _getWidgetEntry(int widgetId, bool reuseEntry) async {
       readyCompleter.complete();
     }
   });
-  await source.init(canAnalyze: false);
+  source.canAnalyze = false;
+  await source.init();
   await readyCompleter.future;
 
   final entries = CollectionLens(source: source, filters: filters).sortedEntries;
diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 4af3dbb6d..c0c6903c9 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -3,7 +3,9 @@ import 'dart:math';
 
 import 'package:aves/app_flavor.dart';
 import 'package:aves/app_mode.dart';
+import 'package:aves/geo/uri.dart';
 import 'package:aves/l10n/l10n.dart';
+import 'package:aves/model/app/intent.dart';
 import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/filters/recent.dart';
@@ -33,6 +35,7 @@ import 'package:aves/widgets/common/providers/durations_provider.dart';
 import 'package:aves/widgets/common/providers/highlight_info_provider.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/common/providers/viewer_entry_provider.dart';
+import 'package:aves/widgets/dialogs/entry_editors/edit_location_dialog.dart';
 import 'package:aves/widgets/home_page.dart';
 import 'package:aves/widgets/navigation/tv_page_transitions.dart';
 import 'package:aves/widgets/navigation/tv_rail.dart';
@@ -42,11 +45,13 @@ import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:equatable/equatable.dart';
+import 'package:event_bus/event_bus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localization_nn/flutter_localization_nn.dart';
 import 'package:intl/intl.dart';
+import 'package:latlong2/latlong.dart';
 import 'package:overlay_support/overlay_support.dart';
 import 'package:provider/provider.dart';
 import 'package:screen_brightness/screen_brightness.dart';
@@ -72,6 +77,7 @@ class AvesApp extends StatefulWidget {
     'or', // Odia
     'sat', // Santali
     'sl', // Slovenian
+    'sr', // Serbian
     'th', // Thai
   }.map(Locale.new).toSet();
   static final List<Locale> supportedLocales = AppLocalizations.supportedLocales.where((v) => !_unsupportedLocales.contains(v)).toList();
@@ -88,6 +94,8 @@ class AvesApp extends StatefulWidget {
 
   static ScreenBrightness? get screenBrightness => _AvesAppState._screenBrightness;
 
+  static EventBus get intentEventBus => _AvesAppState._intentEventBus;
+
   const AvesApp({
     super.key,
     required this.flavor,
@@ -159,7 +167,7 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
   final MediaStoreSource _mediaStoreSource = MediaStoreSource();
   Size? _screenSize;
 
-  final ValueNotifier<PageTransitionsBuilder> _pageTransitionsBuilderNotifier = ValueNotifier(defaultPageTransitionsBuilder);
+  final ValueNotifier<PageTransitionsBuilder> _pageTransitionsBuilderNotifier = ValueNotifier(_defaultPageTransitionsBuilder);
   final ValueNotifier<TvMediaQueryModifier?> _tvMediaQueryModifierNotifier = ValueNotifier(null);
   final ValueNotifier<AppMode> _appModeNotifier = ValueNotifier(AppMode.initialization);
 
@@ -176,10 +184,11 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
   // - `OpenUpwardsPageTransitionsBuilder` on Pie / API 28
   // - `ZoomPageTransitionsBuilder` on Android 10 / API 29 and above (default in Flutter v3.22.0)
   // - `PredictiveBackPageTransitionsBuilder` for Android 15 / API 35 intra-app predictive back
-  static const defaultPageTransitionsBuilder = FadeUpwardsPageTransitionsBuilder();
+  static const _defaultPageTransitionsBuilder = FadeUpwardsPageTransitionsBuilder();
   static final GlobalKey<NavigatorState> _navigatorKey = GlobalKey(debugLabel: 'app-navigator');
   static ScreenBrightness? _screenBrightness;
   static bool _exitedMainByPop = false;
+  static final EventBus _intentEventBus = EventBus();
 
   @override
   void initState() {
@@ -534,7 +543,7 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
         await windowService.requestOrientation(Orientation.landscape);
       }
     } else {
-      _pageTransitionsBuilderNotifier.value = defaultPageTransitionsBuilder;
+      _pageTransitionsBuilderNotifier.value = _defaultPageTransitionsBuilder;
       _tvMediaQueryModifierNotifier.value = null;
       await windowService.requestOrientation(null);
     }
@@ -627,6 +636,17 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
         ]);
   }
 
+  // at this level `ModalRoute.of(context)` is null,
+  // so we use the global navigator as a workaround
+  String? getCurrentRouteName() {
+    String? currentRoute;
+    _navigatorKey.currentState?.popUntil((route) {
+      currentRoute = route.settings.name;
+      return true;
+    });
+    return currentRoute;
+  }
+
   void _onNewIntent(Map? intentData) {
     reportService.log('New intent data=$intentData');
 
@@ -641,6 +661,20 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
       }
     }
 
+    if (intentData != null) {
+      final intentAction = intentData[IntentDataKeys.action] as String?;
+      if (intentAction == IntentActions.viewGeo) {
+        final locationZoom = parseGeoUri(intentData[IntentDataKeys.uri] as String?);
+        if (locationZoom != null && getCurrentRouteName() == EditEntryLocationDialog.routeName) {
+          // do not push a new route but pass the provided location to the dialog
+          final location = locationZoom.$1;
+          debugPrint('Use received location $location for input');
+          _intentEventBus.fire(LocationReceivedEvent(location));
+          return;
+        }
+      }
+    }
+
     _navigatorKey.currentState!.pushReplacement(DirectMaterialPageRoute(
       settings: const RouteSettings(name: HomePage.routeName),
       builder: (_) => _getFirstPage(intentData: intentData),
@@ -649,7 +683,7 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
 
   Future<void> _onAnalysisCompletion() async {
     debugPrint('Analysis completed');
-    if (_mediaStoreSource.initState != SourceInitializationState.none) {
+    if (_mediaStoreSource.scope != SourceScope.none) {
       await _mediaStoreSource.loadCatalogMetadata();
       await _mediaStoreSource.loadAddresses();
       _mediaStoreSource.updateDerivedFilters();
@@ -688,3 +722,9 @@ class AvesScrollBehavior extends MaterialScrollBehavior {
 }
 
 typedef TvMediaQueryModifier = MediaQueryData Function(MediaQueryData);
+
+class LocationReceivedEvent {
+  final LatLng location;
+
+  const LocationReceivedEvent(this.location);
+}
diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart
index 9f5be53ee..352d61a93 100644
--- a/lib/widgets/collection/collection_grid.dart
+++ b/lib/widgets/collection/collection_grid.dart
@@ -248,7 +248,8 @@ class _CollectionGridContentState extends State<_CollectionGridContent> {
 
   Future<void> _goToViewer(CollectionLens collection, AvesEntry entry) async {
     // track viewer entry for dynamic hero placeholder
-    WidgetsBinding.instance.addPostFrameCallback((_) => context.read<ViewerEntryNotifier>().value = entry);
+    final viewerEntryNotifier = context.read<ViewerEntryNotifier>();
+    WidgetsBinding.instance.addPostFrameCallback((_) => viewerEntryNotifier.value = entry);
 
     final selection = context.read<Selection<AvesEntry>>();
     await Navigator.maybeOf(context)?.push(
@@ -284,7 +285,7 @@ class _CollectionGridContentState extends State<_CollectionGridContent> {
       // TODO TLAD fix timing when transition is incomplete, e.g. when going back while going to the viewer
       await Future.delayed(ADurations.pageTransitionExact * timeDilation);
     }
-    context.read<ViewerEntryNotifier>().value = null;
+    viewerEntryNotifier.value = null;
   }
 }
 
diff --git a/lib/widgets/common/action_mixins/permission_aware.dart b/lib/widgets/common/action_mixins/permission_aware.dart
index 9faa72730..aea14b4a6 100644
--- a/lib/widgets/common/action_mixins/permission_aware.dart
+++ b/lib/widgets/common/action_mixins/permission_aware.dart
@@ -17,18 +17,25 @@ mixin PermissionAwareMixin {
   }
 
   Future<bool> checkStoragePermissionForAlbums(BuildContext context, Set<String> storageDirs, {Set<AvesEntry>? entries}) async {
-    final restrictedDirs = await storageService.getRestrictedDirectories();
+    final restrictedDirsLowerCase = await storageService.getRestrictedDirectoriesLowerCase();
     while (true) {
       final dirs = await storageService.getInaccessibleDirectories(storageDirs);
 
-      final restrictedInaccessibleDirs = dirs.where(restrictedDirs.contains).toSet();
+      final restrictedInaccessibleDirs = dirs
+          .map((dir) => dir.copyWith(
+                relativeDir: dir.relativeDir.toLowerCase(),
+              ))
+          .where(restrictedDirsLowerCase.contains)
+          .toSet();
       if (restrictedInaccessibleDirs.isNotEmpty) {
         if (entries != null && await storageService.canRequestMediaFileBulkAccess()) {
           // request media file access for items in restricted directories
           final uris = <String>[], mimeTypes = <String>[];
           entries.where((entry) {
-            final dir = entry.directory;
-            return dir != null && restrictedInaccessibleDirs.contains(androidFileUtils.relativeDirectoryFromPath(dir));
+            final dirPath = entry.directory;
+            if (dirPath == null) return false;
+            final dir = androidFileUtils.relativeDirectoryFromPath(dirPath);
+            return restrictedInaccessibleDirs.contains(dir?.copyWith(relativeDir: dir.relativeDir.toLowerCase()));
           }).forEach((entry) {
             uris.add(entry.uri);
             mimeTypes.add(entry.mimeType);
diff --git a/lib/widgets/common/grid/header.dart b/lib/widgets/common/grid/header.dart
index 0b60f13c0..6d30a9352 100644
--- a/lib/widgets/common/grid/header.dart
+++ b/lib/widgets/common/grid/header.dart
@@ -25,7 +25,10 @@ class SectionHeader<T> extends StatelessWidget {
     this.selectable = true,
   });
 
-  static const leadingSize = Size(48, 32);
+  static const leadingSize = Size.square(32);
+  static const widgetSpanAlignmentMargin = EdgeInsetsDirectional.only(bottom: 4);
+  static final leadingMargin = const EdgeInsetsDirectional.only(end: 8) + widgetSpanAlignmentMargin;
+  static final trailingMargin = const EdgeInsetsDirectional.only(start: 8) + widgetSpanAlignmentMargin;
   static const margin = EdgeInsets.symmetric(vertical: 0, horizontal: 8);
   static const padding = EdgeInsets.symmetric(vertical: 16, horizontal: 8);
   static const widgetSpanAlignment = PlaceholderAlignment.middle;
@@ -68,9 +71,9 @@ class SectionHeader<T> extends StatelessWidget {
                     sectionKey: sectionKey,
                     browsingBuilder: leading != null
                         ? (context) => Container(
-                              padding: const EdgeInsetsDirectional.only(end: 8),
                               width: leadingSize.width,
                               height: leadingSize.height,
+                              margin: leadingMargin,
                               child: leading,
                             )
                         : null,
@@ -86,7 +89,7 @@ class SectionHeader<T> extends StatelessWidget {
                 WidgetSpan(
                   alignment: widgetSpanAlignment,
                   child: Container(
-                    padding: const EdgeInsetsDirectional.only(start: 8, bottom: 2),
+                    margin: trailingMargin,
                     child: trailing,
                   ),
                 ),
@@ -226,7 +229,7 @@ class _SectionSelectableLeading<T> extends StatelessWidget {
     );
   }
 
-  Widget _buildBrowsing(BuildContext context) => browsingBuilder?.call(context) ?? SizedBox(height: SectionHeader.leadingSize.height);
+  Widget _buildBrowsing(BuildContext context) => browsingBuilder?.call(context) ?? SizedBox(height: SectionHeader.leadingSize.height + SectionHeader.widgetSpanAlignmentMargin.vertical);
 }
 
 class _SectionSelectingLeading<T> extends StatelessWidget {
@@ -258,21 +261,21 @@ class _SectionSelectingLeading<T> extends StatelessWidget {
         data: TooltipTheme.of(context).copyWith(
           preferBelow: false,
         ),
-        child: Padding(
-          padding: const EdgeInsetsDirectional.only(end: 8, bottom: 6),
+        child: Container(
+          width: SectionHeader.leadingSize.width,
+          height: SectionHeader.leadingSize.height,
+          margin: SectionHeader.leadingMargin,
           child: Theme(
             data: Theme.of(context).copyWith(
               materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
             ),
             child: IconButton(
               iconSize: 26,
-              visualDensity: const VisualDensity(horizontal: VisualDensity.minimumDensity, vertical: VisualDensity.minimumDensity),
-              padding: const EdgeInsets.symmetric(horizontal: 7),
               onPressed: onPressed,
               tooltip: isSelected ? context.l10n.collectionDeselectSectionTooltip : context.l10n.collectionSelectSectionTooltip,
-              constraints: BoxConstraints(
-                minHeight: SectionHeader.leadingSize.height,
-                minWidth: SectionHeader.leadingSize.width,
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all<EdgeInsetsGeometry>(EdgeInsets.zero),
+                minimumSize: WidgetStateProperty.all<Size>(SectionHeader.leadingSize),
               ),
               icon: Icon(isSelected ? AIcons.selected : AIcons.unselected),
             ),
diff --git a/lib/widgets/common/map/attribution.dart b/lib/widgets/common/map/attribution.dart
index e050d8a99..067623085 100644
--- a/lib/widgets/common/map/attribution.dart
+++ b/lib/widgets/common/map/attribution.dart
@@ -1,3 +1,4 @@
+import 'package:aves/theme/text.dart';
 import 'package:aves/widgets/aves_app.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
@@ -15,22 +16,27 @@ class Attribution extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l10n = context.l10n;
     switch (style) {
+      case EntryMapStyle.osmLiberty:
+        return _buildOsmAttributionMarkdown(context, l10n.mapAttributionOsmLiberty);
+      case EntryMapStyle.openTopoMap:
+        return _buildOsmAttributionMarkdown(context, l10n.mapAttributionOpenTopoMap);
       case EntryMapStyle.osmHot:
-        return _buildAttributionMarkdown(context, context.l10n.mapAttributionOsmHot);
+        return _buildOsmAttributionMarkdown(context, l10n.mapAttributionOsmHot);
       case EntryMapStyle.stamenWatercolor:
-        return _buildAttributionMarkdown(context, context.l10n.mapAttributionStamen);
+        return _buildOsmAttributionMarkdown(context, l10n.mapAttributionStamen);
       default:
         return const SizedBox();
     }
   }
 
-  Widget _buildAttributionMarkdown(BuildContext context, String data) {
+  Widget _buildOsmAttributionMarkdown(BuildContext context, String data) {
     final theme = Theme.of(context);
     return Padding(
       padding: const EdgeInsets.only(top: 4),
       child: MarkdownBody(
-        data: data,
+        data: '${context.l10n.mapAttributionOsmData}${AText.separator}$data',
         selectable: true,
         styleSheet: MarkdownStyleSheet(
           a: TextStyle(color: theme.colorScheme.primary),
diff --git a/lib/widgets/common/map/buttons/panel.dart b/lib/widgets/common/map/buttons/panel.dart
index f329bbb6d..29340beb9 100644
--- a/lib/widgets/common/map/buttons/panel.dart
+++ b/lib/widgets/common/map/buttons/panel.dart
@@ -10,6 +10,7 @@ import 'package:aves/widgets/common/map/map_action_delegate.dart';
 import 'package:aves_map/aves_map.dart';
 import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
 
@@ -42,6 +43,12 @@ class MapButtonPanel extends StatelessWidget {
             tooltip: MaterialLocalizations.of(context).backButtonTooltip,
           );
         }
+      case MapNavigationButton.close:
+        navigationButton = MapOverlayButton(
+          icon: const CloseButtonIcon(),
+          onPressed: SystemNavigator.pop,
+          tooltip: MaterialLocalizations.of(context).closeButtonTooltip,
+        );
       case MapNavigationButton.map:
         if (openMapPage != null) {
           navigationButton = MapOverlayButton(
diff --git a/lib/widgets/common/map/geo_map.dart b/lib/widgets/common/map/geo_map.dart
index 402d69ade..5e21bbaeb 100644
--- a/lib/widgets/common/map/geo_map.dart
+++ b/lib/widgets/common/map/geo_map.dart
@@ -7,6 +7,7 @@ import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/entry/sort.dart';
 import 'package:aves/model/settings/enums/map_style.dart';
 import 'package:aves/model/settings/settings.dart';
+import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/ref/poi.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
@@ -32,10 +33,11 @@ import 'package:provider/provider.dart';
 
 class GeoMap extends StatefulWidget {
   final AvesMapController? controller;
-  final Listenable? collectionListenable;
-  final List<AvesEntry> entries;
+  final CollectionLens? collection;
+  final List<AvesEntry>? entries;
   final Size availableSize;
   final LatLng? initialCenter;
+  final double? initialZoom;
   final ValueNotifier<bool> isAnimatingNotifier;
   final ValueNotifier<LatLng?>? dotLocationNotifier;
   final ValueNotifier<double>? overlayOpacityNotifier;
@@ -58,10 +60,11 @@ class GeoMap extends StatefulWidget {
   const GeoMap({
     super.key,
     this.controller,
-    this.collectionListenable,
-    required this.entries,
+    this.collection,
+    this.entries,
     required this.availableSize,
     this.initialCenter,
+    this.initialZoom,
     required this.isAnimatingNotifier,
     this.dotLocationNotifier,
     this.overlayOpacityNotifier,
@@ -71,7 +74,7 @@ class GeoMap extends StatefulWidget {
     this.onMarkerTap,
     this.onMarkerLongPress,
     this.openMapPage,
-  });
+  }) : assert(collection != null || entries != null);
 
   @override
   State<GeoMap> createState() => _GeoMapState();
@@ -90,7 +93,7 @@ class _GeoMapState extends State<GeoMap> {
   Fluster<GeoEntry<AvesEntry>>? _slowMarkerCluster;
   final AChangeNotifier _clusterChangeNotifier = AChangeNotifier();
 
-  List<AvesEntry> get entries => widget.entries;
+  List<AvesEntry> get entries => widget.collection?.sortedEntries ?? widget.entries ?? [];
 
   // cap initial zoom to avoid a zoom change
   // when toggling overlay on Google map initial state
@@ -119,7 +122,7 @@ class _GeoMapState extends State<GeoMap> {
   }
 
   void _registerWidget(GeoMap widget) {
-    widget.collectionListenable?.addListener(_onCollectionChanged);
+    widget.collection?.addListener(_onCollectionChanged);
     final controller = widget.controller;
     if (controller != null) {
       _subscriptions.add(controller.markerLocationChanges.listen((event) => _onCollectionChanged()));
@@ -127,7 +130,7 @@ class _GeoMapState extends State<GeoMap> {
   }
 
   void _unregisterWidget(GeoMap widget) {
-    widget.collectionListenable?.removeListener(_onCollectionChanged);
+    widget.collection?.removeListener(_onCollectionChanged);
     _subscriptions
       ..forEach((sub) => sub.cancel())
       ..clear();
@@ -185,6 +188,8 @@ class _GeoMapState extends State<GeoMap> {
                 onMarkerTap: _onMarkerTap,
                 onMarkerLongPress: onMarkerLongPress,
               );
+            case EntryMapStyle.osmLiberty:
+            case EntryMapStyle.openTopoMap:
             case EntryMapStyle.osmHot:
             case EntryMapStyle.stamenWatercolor:
               child = EntryLeafletMap<AvesEntry>(
@@ -311,6 +316,8 @@ class _GeoMapState extends State<GeoMap> {
         );
       }
     }
+
+    final initialZoom = widget.initialZoom ?? settings.infoMapZoom;
     if (bounds == null) {
       LatLng? centerToSave;
       final initialCenter = widget.initialCenter;
@@ -318,7 +325,7 @@ class _GeoMapState extends State<GeoMap> {
         // fit map for specified center and user zoom
         bounds = ZoomedBounds.fromPoints(
           points: {initialCenter},
-          collocationZoom: settings.infoMapZoom,
+          collocationZoom: initialZoom,
         );
         centerToSave = initialCenter;
       } else {
@@ -343,7 +350,7 @@ class _GeoMapState extends State<GeoMap> {
       }
       bounds = ZoomedBounds.fromPoints(
         points: {center},
-        collocationZoom: settings.infoMapZoom,
+        collocationZoom: initialZoom,
       );
     }
 
diff --git a/lib/widgets/common/map/leaflet/map.dart b/lib/widgets/common/map/leaflet/map.dart
index cca10254c..96f775e2b 100644
--- a/lib/widgets/common/map/leaflet/map.dart
+++ b/lib/widgets/common/map/leaflet/map.dart
@@ -198,6 +198,10 @@ class _EntryLeafletMapState<T> extends State<EntryLeafletMap<T>> with TickerProv
 
   Widget _buildMapLayer() {
     switch (widget.style) {
+      case EntryMapStyle.osmLiberty:
+        return const OsmLibertyLayer();
+      case EntryMapStyle.openTopoMap:
+        return const OpenTopoMapLayer();
       case EntryMapStyle.osmHot:
         return const OSMHotLayer();
       case EntryMapStyle.stamenWatercolor:
diff --git a/lib/widgets/common/map/leaflet/tile_layers.dart b/lib/widgets/common/map/leaflet/tile_layers.dart
index 9fa2e26df..417947ff8 100644
--- a/lib/widgets/common/map/leaflet/tile_layers.dart
+++ b/lib/widgets/common/map/leaflet/tile_layers.dart
@@ -1,6 +1,23 @@
 import 'package:aves/model/device.dart';
+import 'package:aves/widgets/common/map/leaflet/vector_style_reader_extra.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:vector_map_tiles/vector_map_tiles.dart';
+import 'package:vector_tile_renderer/vector_tile_renderer.dart' as vtr;
+
+class OpenTopoMapLayer extends StatelessWidget {
+  const OpenTopoMapLayer({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return TileLayer(
+      urlTemplate: 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
+      subdomains: const ['a', 'b', 'c'],
+      retinaMode: MediaQuery.devicePixelRatioOf(context) > 1,
+      userAgentPackageName: device.userAgent,
+    );
+  }
+}
 
 class OSMHotLayer extends StatelessWidget {
   const OSMHotLayer({super.key});
@@ -23,9 +40,85 @@ class StamenWatercolorLayer extends StatelessWidget {
   Widget build(BuildContext context) {
     return TileLayer(
       urlTemplate: 'https://watercolormaps.collection.cooperhewitt.org/tile/watercolor/{z}/{x}/{y}.jpg',
-      subdomains: const ['a', 'b', 'c', 'd'],
       retinaMode: MediaQuery.devicePixelRatioOf(context) > 1,
       userAgentPackageName: device.userAgent,
     );
   }
 }
+
+class OsmLibertyLayer extends StatefulWidget {
+  const OsmLibertyLayer({super.key});
+
+  @override
+  State<OsmLibertyLayer> createState() => _OsmLibertyLayerState();
+}
+
+class _OsmLibertyLayerState extends State<OsmLibertyLayer> {
+  late final Future<TileProviders> _tileProviderFuture;
+  late final Future<Style> _styleFuture;
+
+  static const _openMapTileProviderSource = 'openmaptiles';
+
+  // `Americana` provides tiles, but it uses layer syntax that is not supported by the vector tile renderer.
+  // Full style is at 'https://americanamap.org/style.json' but it is heavy (1.0 MB, mostly for the layers).
+  static const _americanaTileProviderUri = 'https://tile.ourmap.us/data/v3.json';
+
+  // `OSM Liberty` is well supported by the vector tile renderer, but it requires an API key for the tiles.
+  static const _osmLibertyStyleUri = 'https://maputnik.github.io/osm-liberty/style.json';
+
+  // as of 2024/09/25,
+  // Americana provider JSON:     39.4 kB
+  // OSM Liberty style JSON:      48.3 kB
+  // OSM Liberty sprites JSON 1x: 16.6 kB
+  // OSM Liberty sprites  PNG 1x: 30.4 kB
+  // OSM Liberty sprites JSON 2x: 16.6 kB
+  // OSM Liberty sprites  PNG 2x: 82.5 kB
+  // -> total overhead:          233.8 kB
+
+  @override
+  void initState() {
+    super.initState();
+
+    _tileProviderFuture = StyleReaderExtra.readProviderByName(
+      {
+        _openMapTileProviderSource: {
+          'url': _americanaTileProviderUri,
+          'type': 'vector',
+        }
+      },
+    ).then(TileProviders.new);
+
+    _styleFuture = StyleReader(
+      uri: _osmLibertyStyleUri,
+      logger: const vtr.Logger.console(),
+    ).readExtra(skipSources: true);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<TileProviders>(
+      future: _tileProviderFuture,
+      builder: (context, tileProviderSnapshot) {
+        return FutureBuilder<Style>(
+          future: _styleFuture,
+          builder: (context, styleSnapshot) {
+            if (tileProviderSnapshot.hasError) return Text(tileProviderSnapshot.error.toString());
+            if (styleSnapshot.hasError) return Text(styleSnapshot.error.toString());
+
+            final tileProviders = tileProviderSnapshot.data;
+            final style = styleSnapshot.data;
+            if (tileProviders == null || style == null) return const SizedBox();
+
+            return VectorTileLayer(
+              tileProviders: tileProviders,
+              theme: style.theme,
+              sprites: style.sprites,
+              // `vector` is higher quality and follows map orientation, but it is slower
+              layerMode: VectorTileLayerMode.raster,
+            );
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/widgets/common/map/leaflet/vector_style_reader_extra.dart b/lib/widgets/common/map/leaflet/vector_style_reader_extra.dart
new file mode 100644
index 000000000..4f7649b0e
--- /dev/null
+++ b/lib/widgets/common/map/leaflet/vector_style_reader_extra.dart
@@ -0,0 +1,113 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:vector_map_tiles/vector_map_tiles.dart';
+import 'package:vector_tile_renderer/vector_tile_renderer.dart';
+
+extension StyleReaderExtra on StyleReader {
+  Future<Style> readExtra({required bool skipSources}) async {
+    final styleText = await _httpGet(uri);
+    final style = await compute(jsonDecode, styleText);
+    if (style is! Map<String, dynamic>) {
+      throw _invalidStyle(uri);
+    }
+    final sources = style['sources'] as Map<String, dynamic>;
+    final Map<String, VectorTileProvider> providerByName = skipSources ? {} : await readProviderByName(sources);
+    final name = style['name'] as String?;
+
+    final center = style['center'];
+    LatLng? centerPoint;
+    if (center is List && center.length == 2) {
+      centerPoint = LatLng((center[1] as num).toDouble(), (center[0] as num).toDouble());
+    }
+
+    double? zoom = (style['zoom'] as num?)?.toDouble();
+    if (zoom != null && zoom < 2) {
+      zoom = null;
+      centerPoint = null;
+    }
+
+    final spriteUri = style['sprite'];
+    SpriteStyle? sprites;
+    if (spriteUri is String && spriteUri.trim().isNotEmpty) {
+      final spriteUris = [
+        _SpriteUri(json: '$spriteUri@2x.json?secure', image: '$spriteUri@2x.png?secure'),
+        _SpriteUri(json: '$spriteUri.json?secure', image: '$spriteUri.png?secure'),
+      ];
+      for (final spriteUri in spriteUris) {
+        dynamic spritesJson;
+        try {
+          final spritesJsonText = await _httpGet(spriteUri.json);
+          spritesJson = await compute(jsonDecode, spritesJsonText);
+        } catch (e) {
+          logger.log(() => 'error reading sprite uri: ${spriteUri.json}');
+          continue;
+        }
+        sprites = SpriteStyle(atlasProvider: () => _loadBinary(spriteUri.image), index: SpriteIndexReader(logger: logger).read(spritesJson));
+        break;
+      }
+    }
+    return Style(theme: ThemeReader(logger: logger).read(style), providers: TileProviders(providerByName), sprites: sprites, name: name, center: centerPoint, zoom: zoom);
+  }
+
+  static Future<Map<String, VectorTileProvider>> readProviderByName(Map<String, dynamic> sources) async {
+    final providers = <String, VectorTileProvider>{};
+    final sourceEntries = sources.entries.toList();
+    for (final entry in sourceEntries) {
+      final type = TileProviderType.values.where((e) => e.name == entry.value['type']).firstOrNull;
+      if (type == null) continue;
+      dynamic source;
+      var entryUrl = entry.value['url'] as String?;
+      if (entryUrl != null) {
+        final sourceUrl = entryUrl;
+        source = await compute(jsonDecode, await _httpGet(sourceUrl));
+        if (source is! Map) {
+          throw _invalidStyle(sourceUrl);
+        }
+      } else {
+        source = entry.value;
+      }
+      final entryTiles = source['tiles'];
+      final maxzoom = source['maxzoom'] as int? ?? 14;
+      final minzoom = source['minzoom'] as int? ?? 1;
+      if (entryTiles is List && entryTiles.isNotEmpty) {
+        final tileUri = entryTiles[0] as String;
+        final tileUrl = tileUri;
+        providers[entry.key] = NetworkVectorTileProvider(type: type, urlTemplate: tileUrl, maximumZoom: maxzoom, minimumZoom: minzoom);
+      }
+    }
+    if (providers.isEmpty) {
+      throw 'Unexpected response';
+    }
+    return providers;
+  }
+
+  static String _invalidStyle(String url) => 'Uri does not appear to be a valid style: $url';
+
+  static Future<String> _httpGet(String url) async {
+    final response = await get(Uri.parse(url));
+    if (response.statusCode == 200) {
+      return response.body;
+    } else {
+      throw 'HTTP ${response.statusCode}: ${response.body}';
+    }
+  }
+
+  static Future<Uint8List> _loadBinary(String url) async {
+    final response = await get(Uri.parse(url));
+    if (response.statusCode == 200) {
+      return response.bodyBytes;
+    } else {
+      throw 'HTTP ${response.statusCode}: ${response.body}';
+    }
+  }
+}
+
+class _SpriteUri {
+  final String json;
+  final String image;
+
+  const _SpriteUri({required this.json, required this.image});
+}
diff --git a/lib/widgets/common/search/page.dart b/lib/widgets/common/search/page.dart
index 59990c644..7f218e62e 100644
--- a/lib/widgets/common/search/page.dart
+++ b/lib/widgets/common/search/page.dart
@@ -55,7 +55,6 @@ class _SearchPageState extends State<SearchPage> {
     _unregisterWidget(widget);
     widget.animation.removeStatusListener(_onAnimationStatusChanged);
     _searchFieldFocusNode.dispose();
-    widget.delegate.dispose();
     super.dispose();
   }
 
diff --git a/lib/widgets/common/search/route.dart b/lib/widgets/common/search/route.dart
index 6813b6892..e69a1b8cc 100644
--- a/lib/widgets/common/search/route.dart
+++ b/lib/widgets/common/search/route.dart
@@ -21,6 +21,14 @@ class SearchPageRoute<T> extends PageRoute<T> {
     delegate.route = this;
   }
 
+  @override
+  void dispose() {
+    // `delegate` is always created by the caller at route creation time,
+    // so it should always be disposed when the route is disposed
+    delegate.dispose();
+    super.dispose();
+  }
+
   final AvesSearchDelegate delegate;
 
   @override
diff --git a/lib/widgets/debug/app_debug_page.dart b/lib/widgets/debug/app_debug_page.dart
index 79e7259a1..004d4193f 100644
--- a/lib/widgets/debug/app_debug_page.dart
+++ b/lib/widgets/debug/app_debug_page.dart
@@ -12,19 +12,19 @@ import 'package:aves/widgets/common/basic/popup/menu_row.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/behaviour/pop/scope.dart';
 import 'package:aves/widgets/common/behaviour/pop/tv_navigation.dart';
-import 'package:aves/widgets/debug/android_apps.dart';
-import 'package:aves/widgets/debug/android_codecs.dart';
-import 'package:aves/widgets/debug/android_dirs.dart';
 import 'package:aves/widgets/debug/app_debug_action.dart';
 import 'package:aves/widgets/debug/cache.dart';
+import 'package:aves/widgets/debug/capabilities.dart';
 import 'package:aves/widgets/debug/colors.dart';
 import 'package:aves/widgets/debug/database.dart';
-import 'package:aves/widgets/debug/device.dart';
 import 'package:aves/widgets/debug/general.dart';
 import 'package:aves/widgets/debug/media_store_scan_dialog.dart';
+import 'package:aves/widgets/debug/os_apps.dart';
+import 'package:aves/widgets/debug/os_codecs.dart';
+import 'package:aves/widgets/debug/os_paths.dart';
+import 'package:aves/widgets/debug/os_storage.dart';
 import 'package:aves/widgets/debug/report.dart';
 import 'package:aves/widgets/debug/settings.dart';
-import 'package:aves/widgets/debug/storage.dart';
 import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
@@ -73,16 +73,16 @@ class AppDebugPage extends StatelessWidget {
               padding: const EdgeInsets.all(8),
               children: const [
                 DebugGeneralSection(),
-                DebugAndroidAppSection(),
-                DebugAndroidCodecSection(),
-                DebugAndroidDirSection(),
                 DebugCacheSection(),
+                DebugCapabilitiesSection(),
                 DebugColorSection(),
                 DebugAppDatabaseSection(),
-                DebugDeviceSection(),
                 DebugErrorReportingSection(),
                 DebugSettingsSection(),
-                DebugStorageSection(),
+                DebugOSAppSection(),
+                DebugOSCodecSection(),
+                DebugOSPathSection(),
+                DebugOSStorageSection(),
               ],
             ),
           ),
diff --git a/lib/widgets/debug/capabilities.dart b/lib/widgets/debug/capabilities.dart
new file mode 100644
index 000000000..d8d7c9261
--- /dev/null
+++ b/lib/widgets/debug/capabilities.dart
@@ -0,0 +1,133 @@
+import 'package:aves/model/device.dart';
+import 'package:aves/services/common/services.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/highlight_title.dart';
+import 'package:aves/widgets/viewer/info/common.dart';
+import 'package:flutter/material.dart';
+
+class DebugCapabilitiesSection extends StatefulWidget {
+  const DebugCapabilitiesSection({super.key});
+
+  @override
+  State<DebugCapabilitiesSection> createState() => _DebugCapabilitiesSectionState();
+}
+
+class _DebugCapabilitiesSectionState extends State<DebugCapabilitiesSection> with AutomaticKeepAliveClientMixin {
+  late final Future<List<dynamic>> _appFuture, _windowFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _appFuture = Future.wait([
+      appProfileService.canInteractAcrossProfiles(),
+      appProfileService.canRequestInteractAcrossProfiles(),
+      appProfileService.getTargetUserProfiles(),
+    ]);
+    _windowFuture = Future.wait([
+      windowService.isCutoutAware(),
+      windowService.isRotationLocked(),
+      windowService.supportsHdr(),
+    ]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return AvesExpansionTile(
+      title: 'Capabilities',
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const HighlightTitle(title: 'Device'),
+              InfoRowGroup(
+                info: {
+                  'canAuthenticateUser': '${device.canAuthenticateUser}',
+                  'canPinShortcut': '${device.canPinShortcut}',
+                  'canRenderFlagEmojis': '${device.canRenderFlagEmojis}',
+                  'canRenderSubdivisionFlagEmojis': '${device.canRenderSubdivisionFlagEmojis}',
+                  'canRequestManageMedia': '${device.canRequestManageMedia}',
+                  'canSetLockScreenWallpaper': '${device.canSetLockScreenWallpaper}',
+                  'hasGeocoder': '${device.hasGeocoder}',
+                  'isDynamicColorAvailable': '${device.isDynamicColorAvailable}',
+                  'isTelevision': '${device.isTelevision}',
+                  'showPinShortcutFeedback': '${device.showPinShortcutFeedback}',
+                  'supportEdgeToEdgeUIMode': '${device.supportEdgeToEdgeUIMode}',
+                  'supportPictureInPicture': '${device.supportPictureInPicture}',
+                },
+              ),
+            ],
+          ),
+        ),
+        FutureBuilder<List<dynamic>>(
+          future: _windowFuture,
+          builder: (context, snapshot) {
+            final data = snapshot.data;
+            if (data == null) {
+              return const SizedBox();
+            }
+            final [
+              bool isCutoutAware,
+              bool isRotationLocked,
+              bool supportsHdr,
+            ] = data;
+
+            return Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 8),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const HighlightTitle(title: 'Window'),
+                  InfoRowGroup(
+                    info: {
+                      'isCutoutAware': '$isCutoutAware',
+                      'isRotationLocked': '$isRotationLocked',
+                      'supportsHdr': '$supportsHdr',
+                    },
+                  ),
+                ],
+              ),
+            );
+          },
+        ),
+        FutureBuilder<List<dynamic>>(
+          future: _appFuture,
+          builder: (context, snapshot) {
+            final data = snapshot.data;
+            if (data == null) {
+              return const SizedBox();
+            }
+            final [
+              bool canInteractAcrossProfiles,
+              bool canRequestInteractAcrossProfiles,
+              List<String> targetUserProfiles,
+            ] = data;
+
+            return Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 8),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const HighlightTitle(title: 'App'),
+                  InfoRowGroup(
+                    info: {
+                      'userAgent': device.userAgent,
+                      'canInteractAcrossProfiles': '$canInteractAcrossProfiles',
+                      'canRequestInteractAcrossProfiles': '$canRequestInteractAcrossProfiles',
+                      'targetUserProfiles': '$targetUserProfiles',
+                    },
+                  ),
+                ],
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
diff --git a/lib/widgets/debug/device.dart b/lib/widgets/debug/device.dart
deleted file mode 100644
index 6a758660a..000000000
--- a/lib/widgets/debug/device.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'package:aves/model/device.dart';
-import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
-import 'package:aves/widgets/viewer/info/common.dart';
-import 'package:flutter/material.dart';
-
-class DebugDeviceSection extends StatefulWidget {
-  const DebugDeviceSection({super.key});
-
-  @override
-  State<DebugDeviceSection> createState() => _DebugDeviceSectionState();
-}
-
-class _DebugDeviceSectionState extends State<DebugDeviceSection> with AutomaticKeepAliveClientMixin {
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return AvesExpansionTile(
-      title: 'Device',
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(left: 8, right: 8, bottom: 8),
-          child: InfoRowGroup(
-            info: {
-              'packageName': device.packageName,
-              'packageVersion': device.packageVersion,
-              'userAgent': device.userAgent,
-              'canAuthenticateUser': '${device.canAuthenticateUser}',
-              'canPinShortcut': '${device.canPinShortcut}',
-              'canRenderFlagEmojis': '${device.canRenderFlagEmojis}',
-              'canRenderSubdivisionFlagEmojis': '${device.canRenderSubdivisionFlagEmojis}',
-              'canRequestManageMedia': '${device.canRequestManageMedia}',
-              'canSetLockScreenWallpaper': '${device.canSetLockScreenWallpaper}',
-              'hasGeocoder': '${device.hasGeocoder}',
-              'isDynamicColorAvailable': '${device.isDynamicColorAvailable}',
-              'isTelevision': '${device.isTelevision}',
-              'showPinShortcutFeedback': '${device.showPinShortcutFeedback}',
-              'supportEdgeToEdgeUIMode': '${device.supportEdgeToEdgeUIMode}',
-              'supportPictureInPicture': '${device.supportPictureInPicture}',
-            },
-          ),
-        ),
-      ],
-    );
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-}
diff --git a/lib/widgets/debug/android_apps.dart b/lib/widgets/debug/os_apps.dart
similarity index 93%
rename from lib/widgets/debug/android_apps.dart
rename to lib/widgets/debug/os_apps.dart
index 101b18c08..d8250a4d8 100644
--- a/lib/widgets/debug/android_apps.dart
+++ b/lib/widgets/debug/os_apps.dart
@@ -7,14 +7,14 @@ import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
-class DebugAndroidAppSection extends StatefulWidget {
-  const DebugAndroidAppSection({super.key});
+class DebugOSAppSection extends StatefulWidget {
+  const DebugOSAppSection({super.key});
 
   @override
-  State<DebugAndroidAppSection> createState() => _DebugAndroidAppSectionState();
+  State<DebugOSAppSection> createState() => _DebugOSAppSectionState();
 }
 
-class _DebugAndroidAppSectionState extends State<DebugAndroidAppSection> with AutomaticKeepAliveClientMixin {
+class _DebugOSAppSectionState extends State<DebugOSAppSection> with AutomaticKeepAliveClientMixin {
   late Future<Set<Package>> _loader;
   final ValueNotifier<String> _queryNotifier = ValueNotifier('');
 
@@ -37,7 +37,7 @@ class _DebugAndroidAppSectionState extends State<DebugAndroidAppSection> with Au
     super.build(context);
 
     return AvesExpansionTile(
-      title: 'Android Apps',
+      title: 'OS Apps',
       children: [
         Padding(
           padding: const EdgeInsets.only(left: 8, right: 8, bottom: 8),
diff --git a/lib/widgets/debug/android_codecs.dart b/lib/widgets/debug/os_codecs.dart
similarity index 90%
rename from lib/widgets/debug/android_codecs.dart
rename to lib/widgets/debug/os_codecs.dart
index dfdfe169a..e1a4cf99f 100644
--- a/lib/widgets/debug/android_codecs.dart
+++ b/lib/widgets/debug/os_codecs.dart
@@ -6,14 +6,14 @@ import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
-class DebugAndroidCodecSection extends StatefulWidget {
-  const DebugAndroidCodecSection({super.key});
+class DebugOSCodecSection extends StatefulWidget {
+  const DebugOSCodecSection({super.key});
 
   @override
-  State<DebugAndroidCodecSection> createState() => _DebugAndroidCodecSectionState();
+  State<DebugOSCodecSection> createState() => _DebugOSCodecSectionState();
 }
 
-class _DebugAndroidCodecSectionState extends State<DebugAndroidCodecSection> with AutomaticKeepAliveClientMixin {
+class _DebugOSCodecSectionState extends State<DebugOSCodecSection> with AutomaticKeepAliveClientMixin {
   late Future<List<Map>> _loader;
   final ValueNotifier<String> _queryNotifier = ValueNotifier('');
 
@@ -34,7 +34,7 @@ class _DebugAndroidCodecSectionState extends State<DebugAndroidCodecSection> wit
     super.build(context);
 
     return AvesExpansionTile(
-      title: 'Android Codecs',
+      title: 'OS Codecs',
       children: [
         Padding(
           padding: const EdgeInsets.only(left: 8, right: 8, bottom: 8),
diff --git a/lib/widgets/debug/android_dirs.dart b/lib/widgets/debug/os_paths.dart
similarity index 78%
rename from lib/widgets/debug/android_dirs.dart
rename to lib/widgets/debug/os_paths.dart
index d4abc67ae..1b1734a08 100644
--- a/lib/widgets/debug/android_dirs.dart
+++ b/lib/widgets/debug/os_paths.dart
@@ -5,14 +5,14 @@ import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:flutter/material.dart';
 
-class DebugAndroidDirSection extends StatefulWidget {
-  const DebugAndroidDirSection({super.key});
+class DebugOSPathSection extends StatefulWidget {
+  const DebugOSPathSection({super.key});
 
   @override
-  State<DebugAndroidDirSection> createState() => _DebugAndroidDirSectionState();
+  State<DebugOSPathSection> createState() => _DebugOSPathSectionState();
 }
 
-class _DebugAndroidDirSectionState extends State<DebugAndroidDirSection> with AutomaticKeepAliveClientMixin {
+class _DebugOSPathSectionState extends State<DebugOSPathSection> with AutomaticKeepAliveClientMixin {
   late Future<Map> _loader;
 
   @override
@@ -26,7 +26,7 @@ class _DebugAndroidDirSectionState extends State<DebugAndroidDirSection> with Au
     super.build(context);
 
     return AvesExpansionTile(
-      title: 'Android Dirs',
+      title: 'OS Paths',
       children: [
         Padding(
           padding: const EdgeInsets.only(left: 8, right: 8, bottom: 8),
diff --git a/lib/widgets/debug/storage.dart b/lib/widgets/debug/os_storage.dart
similarity index 84%
rename from lib/widgets/debug/storage.dart
rename to lib/widgets/debug/os_storage.dart
index 4b0c49e77..5765e513c 100644
--- a/lib/widgets/debug/storage.dart
+++ b/lib/widgets/debug/os_storage.dart
@@ -7,14 +7,14 @@ import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:flutter/material.dart';
 
-class DebugStorageSection extends StatefulWidget {
-  const DebugStorageSection({super.key});
+class DebugOSStorageSection extends StatefulWidget {
+  const DebugOSStorageSection({super.key});
 
   @override
-  State<DebugStorageSection> createState() => _DebugStorageSectionState();
+  State<DebugOSStorageSection> createState() => _DebugOSStorageSectionState();
 }
 
-class _DebugStorageSectionState extends State<DebugStorageSection> with AutomaticKeepAliveClientMixin {
+class _DebugOSStorageSectionState extends State<DebugOSStorageSection> with AutomaticKeepAliveClientMixin {
   final Map<String, int?> _freeSpaceByVolume = {};
 
   @override
@@ -31,7 +31,7 @@ class _DebugStorageSectionState extends State<DebugStorageSection> with Automati
     super.build(context);
 
     return AvesExpansionTile(
-      title: 'Storage Volumes',
+      title: 'OS Storage',
       children: [
         ...androidFileUtils.storageVolumes.expand((v) {
           final freeSpace = _freeSpaceByVolume[v.path];
diff --git a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
index 39e98aae9..a15329c15 100644
--- a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/entry/extensions/metadata_edition.dart';
@@ -10,6 +12,7 @@ import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/theme/themes.dart';
 import 'package:aves/view/view.dart';
+import 'package:aves/widgets/aves_app.dart';
 import 'package:aves/widgets/common/basic/text_dropdown_button.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/fx/transitions.dart';
@@ -42,6 +45,7 @@ class EditEntryLocationDialog extends StatefulWidget {
 }
 
 class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
+  final List<StreamSubscription> _subscriptions = [];
   LocationEditAction _action = LocationEditAction.chooseOnMap;
   LatLng? _mapCoordinates;
   late AvesEntry _copyItemSource;
@@ -56,6 +60,7 @@ class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
     _initMapCoordinates();
     _initCopyItem();
     _initCustom();
+    AvesApp.intentEventBus.on<LocationReceivedEvent>().listen((event) => _setCustomLocation(event.location));
   }
 
   void _initMapCoordinates() {
@@ -82,6 +87,9 @@ class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
 
   @override
   void dispose() {
+    _subscriptions
+      ..forEach((sub) => sub.cancel())
+      ..clear();
     _latitudeController.dispose();
     _longitudeController.dispose();
     _isValidNotifier.dispose();
@@ -151,8 +159,6 @@ class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
   }
 
   Widget _buildChooseOnMapContent(BuildContext context) {
-    final l10n = context.l10n;
-
     return Padding(
       padding: const EdgeInsetsDirectional.only(start: 16, end: 8),
       child: Row(
@@ -162,13 +168,21 @@ class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
           IconButton(
             icon: const Icon(AIcons.map),
             onPressed: _pickLocation,
-            tooltip: l10n.editEntryLocationDialogChooseOnMap,
+            tooltip: context.l10n.editEntryLocationDialogChooseOnMap,
           ),
         ],
       ),
     );
   }
 
+  void _setCustomLocation(LatLng latLng) {
+    _latitudeController.text = coordinateFormatter.format(latLng.latitude);
+    _longitudeController.text = coordinateFormatter.format(latLng.longitude);
+    _action = LocationEditAction.setCustom;
+    _validate();
+    setState(() {});
+  }
+
   CollectionLens? _createPickCollection() {
     final baseCollection = widget.collection;
     return baseCollection != null
diff --git a/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart
index 7f2eec78a..75f001ad9 100644
--- a/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart
+++ b/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart
@@ -35,9 +35,10 @@ Future<String?> pickAlbum({
   required MoveType? moveType,
 }) async {
   final source = context.read<CollectionSource>();
-  if (source.initState != SourceInitializationState.full) {
+  if (source.scope != SourceScope.full) {
     await reportService.log('Complete source initialization to pick album');
     // source may not be fully initialized in view mode
+    source.canAnalyze = true;
     await source.init();
   }
   final filter = await Navigator.maybeOf(context)?.push(
diff --git a/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart
index 281da792b..3d1c821b5 100644
--- a/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart
+++ b/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart
@@ -135,8 +135,7 @@ class _ContentState extends State<_Content> with SingleTickerProviderStateMixin
       navigationButton: MapNavigationButton.back,
       child: GeoMap(
         controller: _mapController,
-        collectionListenable: openingCollection,
-        entries: openingCollection?.sortedEntries ?? [],
+        collection: openingCollection,
         availableSize: MediaQuery.sizeOf(context),
         initialCenter: widget.initialLocation,
         isAnimatingNotifier: _isPageAnimatingNotifier,
diff --git a/lib/widgets/explorer/app_bar.dart b/lib/widgets/explorer/app_bar.dart
index 804af6a45..5a9985f1e 100644
--- a/lib/widgets/explorer/app_bar.dart
+++ b/lib/widgets/explorer/app_bar.dart
@@ -117,6 +117,7 @@ class _ExplorerAppBarState extends State<ExplorerAppBar> with WidgetsBindingObse
           return [
             ExplorerAction.addShortcut,
             ExplorerAction.setHome,
+            ExplorerAction.hide,
             null,
             ExplorerAction.stats,
           ].map<PopupMenuEntry<ExplorerAction>>((v) {
diff --git a/lib/widgets/explorer/explorer_action_delegate.dart b/lib/widgets/explorer/explorer_action_delegate.dart
index fc7932c63..eb98352e5 100644
--- a/lib/widgets/explorer/explorer_action_delegate.dart
+++ b/lib/widgets/explorer/explorer_action_delegate.dart
@@ -9,6 +9,7 @@ import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/dialogs/add_shortcut_dialog.dart';
+import 'package:aves/widgets/filter_grids/common/action_delegates/chip.dart';
 import 'package:aves/widgets/stats/stats_page.dart';
 import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
@@ -30,6 +31,7 @@ class ExplorerActionDelegate with FeedbackMixin {
         return isMain && device.canPinShortcut;
       case ExplorerAction.setHome:
         return isMain && !useTvLayout;
+      case ExplorerAction.hide:
       case ExplorerAction.stats:
         return isMain;
     }
@@ -39,6 +41,7 @@ class ExplorerActionDelegate with FeedbackMixin {
     switch (action) {
       case ExplorerAction.addShortcut:
       case ExplorerAction.setHome:
+      case ExplorerAction.hide:
       case ExplorerAction.stats:
         return true;
     }
@@ -51,14 +54,17 @@ class ExplorerActionDelegate with FeedbackMixin {
         _addShortcut(context);
       case ExplorerAction.setHome:
         _setHome(context);
+      case ExplorerAction.hide:
+        _hide(context);
       case ExplorerAction.stats:
         _goToStats(context);
     }
   }
 
+  PathFilter _getPathFilter() => PathFilter(directory.dirPath);
+
   Future<void> _addShortcut(BuildContext context) async {
-    final path = directory.dirPath;
-    final filter = PathFilter(path);
+    final filter = _getPathFilter();
     final defaultName = filter.getLabel(context);
     final collection = CollectionLens(
       source: context.read<CollectionSource>(),
@@ -78,7 +84,7 @@ class ExplorerActionDelegate with FeedbackMixin {
     final (coverEntry, name) = result;
     if (name.isEmpty) return;
 
-    await appService.pinToHomeScreen(name, coverEntry, explorerPath: path);
+    await appService.pinToHomeScreen(name, coverEntry, explorerPath: filter.path);
     if (!device.showPinShortcutFeedback) {
       showFeedback(context, FeedbackType.info, context.l10n.genericSuccessFeedback);
     }
@@ -89,12 +95,14 @@ class ExplorerActionDelegate with FeedbackMixin {
     showFeedback(context, FeedbackType.info, context.l10n.genericSuccessFeedback);
   }
 
+  void _hide(BuildContext context) {
+    ChipActionDelegate().onActionSelected(context, _getPathFilter(), ChipAction.hide);
+  }
+
   void _goToStats(BuildContext context) {
-    final path = directory.dirPath;
-    final filter = PathFilter(path);
     final collection = CollectionLens(
       source: context.read<CollectionSource>(),
-      filters: {filter},
+      filters: {_getPathFilter()},
     );
 
     Navigator.maybeOf(context)?.push(
diff --git a/lib/widgets/filter_grids/common/action_delegates/album_set.dart b/lib/widgets/filter_grids/common/action_delegates/album_set.dart
index 967750ae3..12b6a72b0 100644
--- a/lib/widgets/filter_grids/common/action_delegates/album_set.dart
+++ b/lib/widgets/filter_grids/common/action_delegates/album_set.dart
@@ -386,8 +386,8 @@ class AlbumChipSetActionDelegate extends ChipSetActionDelegate<AlbumFilter> with
 
       // check whether renaming is possible given OS restrictions,
       // before asking to input a new name
-      final restrictedDirs = await storageService.getRestrictedDirectories();
-      if (restrictedDirs.contains(dir)) {
+      final restrictedDirsLowerCase = await storageService.getRestrictedDirectoriesLowerCase();
+      if (restrictedDirsLowerCase.contains(dir.copyWith(relativeDir: dir.relativeDir.toLowerCase()))) {
         await showRestrictedDirectoryDialog(context, dir);
         return;
       }
diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart
index 8b22f2669..8bbe51b26 100644
--- a/lib/widgets/home_page.dart
+++ b/lib/widgets/home_page.dart
@@ -1,13 +1,15 @@
 import 'dart:async';
 
 import 'package:aves/app_mode.dart';
+import 'package:aves/geo/uri.dart';
+import 'package:aves/model/app/intent.dart';
 import 'package:aves/model/app/permissions.dart';
 import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/catalog.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/app/intent.dart';
+import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/settings/enums/home_page.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
@@ -29,6 +31,7 @@ import 'package:aves/widgets/editor/entry_editor_page.dart';
 import 'package:aves/widgets/explorer/explorer_page.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
+import 'package:aves/widgets/map/map_page.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
 import 'package:aves/widgets/settings/home_widget_settings_page.dart';
 import 'package:aves/widgets/settings/screen_saver_settings_page.dart';
@@ -38,6 +41,7 @@ import 'package:aves/widgets/wallpaper_page.dart';
 import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 
@@ -62,12 +66,14 @@ class _HomePageState extends State<HomePage> {
   String? _initialRouteName, _initialSearchQuery;
   Set<CollectionFilter>? _initialFilters;
   String? _initialExplorerPath;
+  (LatLng, double?)? _initialLocationZoom;
   List<String>? _secureUris;
 
   static const allowedShortcutRoutes = [
     AlbumListPage.routeName,
     CollectionPage.routeName,
     ExplorerPage.routeName,
+    MapPage.routeName,
     SearchPage.routeName,
   ];
 
@@ -92,7 +98,6 @@ class _HomePageState extends State<HomePage> {
     var appMode = AppMode.main;
     var error = false;
     final intentData = widget.intentData ?? await IntentService.getIntentData();
-    final safeMode = (intentData[IntentDataKeys.safeMode] as bool?) ?? false;
     final intentAction = intentData[IntentDataKeys.action] as String?;
     _initialFilters = null;
     _initialExplorerPath = null;
@@ -118,6 +123,17 @@ class _HomePageState extends State<HomePage> {
         case IntentActions.view:
           appMode = AppMode.view;
           _secureUris = (intentData[IntentDataKeys.secureUris] as List?)?.cast<String>();
+        case IntentActions.viewGeo:
+          error = true;
+          if (intentUri != null) {
+            final locationZoom = parseGeoUri(intentUri);
+            if (locationZoom != null) {
+              _initialRouteName = MapPage.routeName;
+              _initialLocationZoom = locationZoom;
+              error = false;
+            }
+          }
+          break;
         case IntentActions.edit:
           appMode = AppMode.edit;
         case IntentActions.setWallpaper:
@@ -197,7 +213,6 @@ class _HomePageState extends State<HomePage> {
 
     context.read<ValueNotifier<AppMode>>().value = appMode;
     unawaited(reportService.setCustomKey('app_mode', appMode.toString()));
-    debugPrint('Storage check complete in ${stopwatch.elapsed.inMilliseconds}ms');
 
     switch (appMode) {
       case AppMode.main:
@@ -207,19 +222,16 @@ class _HomePageState extends State<HomePage> {
         unawaited(GlobalSearch.registerCallback());
         unawaited(AnalysisService.registerCallback());
         final source = context.read<CollectionSource>();
-        source.safeMode = safeMode;
-        if (source.initState != SourceInitializationState.full) {
-          await reportService.log('Initialize source (init state=${source.initState.name}) to start app with mode=$appMode');
-          await source.init(
-            loadTopEntriesFirst: settings.homePage == HomePageSetting.collection && settings.homeCustomCollection.isEmpty,
-          );
+        if (source.scope != SourceScope.full) {
+          await reportService.log('Initialize source (init state=${source.scope.name}) to start app with mode=$appMode');
+          final loadTopEntriesFirst = settings.homePage == HomePageSetting.collection && settings.homeCustomCollection.isEmpty;
+          await source.init(loadTopEntriesFirst: loadTopEntriesFirst);
         }
       case AppMode.screenSaver:
-        final source = context.read<CollectionSource>();
         await reportService.log('Initialize source to start screen saver');
-        await source.init(
-          canAnalyze: false,
-        );
+        final source = context.read<CollectionSource>();
+        source.canAnalyze = false;
+        await source.init();
       case AppMode.view:
         if (_isViewerSourceable(_viewerEntry) && _secureUris == null) {
           final directory = _viewerEntry?.directory;
@@ -227,10 +239,8 @@ class _HomePageState extends State<HomePage> {
             unawaited(AnalysisService.registerCallback());
             await reportService.log('Initialize source to view item in directory $directory');
             final source = context.read<CollectionSource>();
-            await source.init(
-              directory: directory,
-              canAnalyze: false,
-            );
+            source.canAnalyze = false;
+            await source.init(albumFilter: AlbumFilter(directory, null));
           }
         } else {
           await _initViewerEssentials();
@@ -242,6 +252,8 @@ class _HomePageState extends State<HomePage> {
         break;
     }
 
+    debugPrint('Home setup complete in ${stopwatch.elapsed.inMilliseconds}ms');
+
     // `pushReplacement` is not enough in some edge cases
     // e.g. when opening the viewer in `view` mode should replace a viewer in `main` mode
     unawaited(Navigator.maybeOf(context)?.pushAndRemoveUntil(
@@ -293,7 +305,7 @@ class _HomePageState extends State<HomePage> {
         CollectionLens? collection;
 
         final source = context.read<CollectionSource>();
-        if (source.initState != SourceInitializationState.none) {
+        if (source.scope != SourceScope.none) {
           final album = viewerEntry.directory;
           if (album != null) {
             // wait for collection to pass the `loading` state
@@ -361,6 +373,18 @@ class _HomePageState extends State<HomePage> {
         return buildRoute((context) => const AlbumListPage());
       case TagListPage.routeName:
         return buildRoute((context) => const TagListPage());
+      case MapPage.routeName:
+        return buildRoute((context) {
+          final mapCollection = CollectionLens(
+            source: source,
+            filters: {LocationFilter.located},
+          );
+          return MapPage(
+            collection: mapCollection,
+            initialLocation: _initialLocationZoom?.$1,
+            initialZoom: _initialLocationZoom?.$2,
+          );
+        });
       case ExplorerPage.routeName:
         final path = _initialExplorerPath ?? settings.homeCustomExplorerPath;
         return buildRoute((context) => ExplorerPage(path: path));
diff --git a/lib/widgets/map/map_page.dart b/lib/widgets/map/map_page.dart
index 28259110a..382314cac 100644
--- a/lib/widgets/map/map_page.dart
+++ b/lib/widgets/map/map_page.dart
@@ -43,15 +43,19 @@ import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
 
 class MapPage extends StatelessWidget {
-  static const routeName = '/collection/map';
+  static const routeName = '/map';
 
   final CollectionLens collection;
+  final LatLng? initialLocation;
+  final double? initialZoom;
   final AvesEntry? initialEntry;
   final MappedGeoTiff? overlayEntry;
 
   const MapPage({
     super.key,
     required this.collection,
+    this.initialLocation,
+    this.initialZoom,
     this.initialEntry,
     this.overlayEntry,
   });
@@ -70,6 +74,8 @@ class MapPage extends StatelessWidget {
           bottom: true,
           child: _Content(
             collection: collection,
+            initialLocation: initialLocation,
+            initialZoom: initialZoom,
             initialEntry: initialEntry,
             overlayEntry: overlayEntry,
           ),
@@ -81,11 +87,15 @@ class MapPage extends StatelessWidget {
 
 class _Content extends StatefulWidget {
   final CollectionLens collection;
+  final LatLng? initialLocation;
+  final double? initialZoom;
   final AvesEntry? initialEntry;
   final MappedGeoTiff? overlayEntry;
 
   const _Content({
     required this.collection,
+    this.initialLocation,
+    this.initialZoom,
     this.initialEntry,
     this.overlayEntry,
   });
@@ -252,19 +262,20 @@ class _ContentState extends State<_Content> with SingleTickerProviderStateMixin
   }
 
   Widget _buildMap() {
+    final canPop = Navigator.maybeOf(context)?.canPop() == true;
     Widget child = MapTheme(
       interactive: true,
       showCoordinateFilter: true,
-      navigationButton: MapNavigationButton.back,
+      navigationButton: canPop ? MapNavigationButton.back : MapNavigationButton.close,
       scale: _overlayScale,
       child: GeoMap(
         // key is expected by test driver
         key: const Key('map_view'),
         controller: _mapController,
-        collectionListenable: openingCollection,
-        entries: openingCollection.sortedEntries,
+        collection: openingCollection,
         availableSize: MediaQuery.sizeOf(context),
-        initialCenter: widget.initialEntry?.latLng ?? widget.overlayEntry?.center,
+        initialCenter: widget.initialLocation ?? widget.initialEntry?.latLng ?? widget.overlayEntry?.center,
+        initialZoom: widget.initialZoom,
         isAnimatingNotifier: _isPageAnimatingNotifier,
         dotLocationNotifier: _dotLocationNotifier,
         overlayOpacityNotifier: _overlayOpacityNotifier,
diff --git a/lib/widgets/navigation/drawer/app_drawer.dart b/lib/widgets/navigation/drawer/app_drawer.dart
index 3bc6ad387..b00591e6d 100644
--- a/lib/widgets/navigation/drawer/app_drawer.dart
+++ b/lib/widgets/navigation/drawer/app_drawer.dart
@@ -8,6 +8,7 @@ import 'package:aves/model/source/location/country.dart';
 import 'package:aves/model/source/location/place.dart';
 import 'package:aves/model/source/tag.dart';
 import 'package:aves/ref/locales.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
@@ -56,13 +57,50 @@ class AppDrawer extends StatefulWidget {
   }
 }
 
-class _AppDrawerState extends State<AppDrawer> {
+class _AppDrawerState extends State<AppDrawer> with WidgetsBindingObserver {
   // using the default controller conflicts
   // with bottom nav bar primary scroll monitoring
   final ScrollController _scrollController = ScrollController();
+  late Future<List<dynamic>> _profileSwitchFuture;
+  bool _profileSwitchPermissionRequested = false;
 
   CollectionLens? get currentCollection => widget.currentCollection;
 
+  @override
+  void initState() {
+    super.initState();
+    _initProfileSwitchFuture();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    switch (state) {
+      case AppLifecycleState.resumed:
+        if (_profileSwitchPermissionRequested) {
+          _profileSwitchPermissionRequested = false;
+          _initProfileSwitchFuture();
+          setState(() {});
+        }
+      default:
+        break;
+    }
+  }
+
+  void _initProfileSwitchFuture() {
+    _profileSwitchFuture = Future.wait([
+      appProfileService.canRequestInteractAcrossProfiles(),
+      appProfileService.canInteractAcrossProfiles(),
+      appProfileService.getProfileSwitchingLabel(),
+    ]);
+  }
+
   @override
   Widget build(BuildContext context) {
     final drawerItems = <Widget>[
@@ -133,44 +171,44 @@ class _AppDrawerState extends State<AppDrawer> {
       color: colorScheme.primary,
       child: SafeArea(
         bottom: false,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            const SizedBox(height: 6),
-            Align(
-              alignment: AlignmentDirectional.centerStart,
-              child: Wrap(
-                spacing: 16,
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  const AvesLogo(size: 48),
-                  OutlinedText(
-                    textSpans: [
-                      TextSpan(
-                        text: l10n.appName,
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 38,
-                          fontWeight: FontWeight.w300,
-                          letterSpacing: canHaveLetterSpacing(context.locale) ? 1 : 0,
-                          fontFeatures: const [FontFeature.enable('smcp')],
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
+        child: OutlinedButtonTheme(
+          data: OutlinedButtonThemeData(
+            style: ButtonStyle(
+              foregroundColor: WidgetStateProperty.all<Color>(onPrimary),
+              overlayColor: WidgetStateProperty.all<Color>(onPrimary.withOpacity(.12)),
+              side: WidgetStateProperty.all<BorderSide>(BorderSide(width: 1, color: onPrimary.withOpacity(.24))),
             ),
-            const SizedBox(height: 8),
-            OutlinedButtonTheme(
-              data: OutlinedButtonThemeData(
-                style: ButtonStyle(
-                  foregroundColor: WidgetStateProperty.all<Color>(onPrimary),
-                  overlayColor: WidgetStateProperty.all<Color>(onPrimary.withOpacity(.12)),
-                  side: WidgetStateProperty.all<BorderSide>(BorderSide(width: 1, color: onPrimary.withOpacity(.24))),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SizedBox(height: 6),
+              Align(
+                alignment: AlignmentDirectional.centerStart,
+                child: Wrap(
+                  spacing: 16,
+                  crossAxisAlignment: WrapCrossAlignment.center,
+                  children: [
+                    const AvesLogo(size: 48),
+                    OutlinedText(
+                      textSpans: [
+                        TextSpan(
+                          text: l10n.appName,
+                          style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 38,
+                            fontWeight: FontWeight.w300,
+                            letterSpacing: canHaveLetterSpacing(context.locale) ? 1 : 0,
+                            fontFeatures: const [FontFeature.enable('smcp')],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
                 ),
               ),
-              child: Wrap(
+              const SizedBox(height: 8),
+              Wrap(
                 spacing: 8,
                 children: [
                   OutlinedButton.icon(
@@ -191,9 +229,34 @@ class _AppDrawerState extends State<AppDrawer> {
                   ),
                 ],
               ),
-            ),
-            const SizedBox(height: 8),
-          ],
+              FutureBuilder<List<dynamic>>(
+                future: _profileSwitchFuture,
+                builder: (context, snapshot) {
+                  final flags = snapshot.data;
+                  if (flags == null) return const SizedBox();
+
+                  final [
+                    bool canRequestInteractAcrossProfiles,
+                    bool canSwitchProfile,
+                    String profileSwitchingLabel,
+                  ] = flags;
+                  if ((!canRequestInteractAcrossProfiles && !canSwitchProfile) || profileSwitchingLabel.isEmpty) return const SizedBox();
+
+                  return OutlinedButton(
+                    onPressed: () async {
+                      if (canSwitchProfile) {
+                        await appProfileService.switchProfile();
+                      } else {
+                        _profileSwitchPermissionRequested = await appProfileService.requestInteractAcrossProfiles();
+                      }
+                    },
+                    child: Text(profileSwitchingLabel),
+                  );
+                },
+              ),
+              const SizedBox(height: 8),
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/widgets/settings/privacy/hidden_items_page.dart b/lib/widgets/settings/privacy/hidden_items_page.dart
index 35b8762d1..9337f62c0 100644
--- a/lib/widgets/settings/privacy/hidden_items_page.dart
+++ b/lib/widgets/settings/privacy/hidden_items_page.dart
@@ -1,17 +1,12 @@
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/filters/path.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/basic/font_size_icon_theme.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
-import 'package:aves/widgets/common/identity/buttons/outlined_button.dart';
 import 'package:aves/widgets/common/identity/empty.dart';
-import 'package:aves/widgets/settings/privacy/file_picker/file_picker_page.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';
 
 class HiddenItemsPage extends StatelessWidget {
@@ -22,178 +17,87 @@ class HiddenItemsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    final tabs = <(Tab, Widget)>[
-      (
-        Tab(text: l10n.settingsHiddenItemsTabFilters),
-        const _HiddenFilters(),
+    return AvesScaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: !settings.useTvLayout,
+        title: Text(l10n.settingsHiddenItemsPageTitle),
       ),
-      (
-        Tab(text: l10n.settingsHiddenItemsTabPaths),
-        const _HiddenPaths(),
-      ),
-    ];
-
-    return DefaultTabController(
-      length: tabs.length,
-      child: AvesScaffold(
-        appBar: AppBar(
-          automaticallyImplyLeading: !settings.useTvLayout,
-          title: Text(l10n.settingsHiddenItemsPageTitle),
-          bottom: TabBar(
-            tabs: tabs.map((t) => t.$1).toList(),
-          ),
-        ),
-        body: SafeArea(
-          child: TabBarView(
-            children: tabs.map((t) => t.$2).toList(),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _HiddenFilters extends StatelessWidget {
-  const _HiddenFilters();
-
-  @override
-  Widget build(BuildContext context) {
-    bool filterPredicate(CollectionFilter v) => v is! PathFilter;
-    return Selector<Settings, Set<CollectionFilter>>(
-      selector: (context, s) => settings.hiddenFilters.where(filterPredicate).toSet(),
-      builder: (context, activatedHiddenFilters, child) {
-        return Selector<Settings, Set<CollectionFilter>>(
-          selector: (context, s) => settings.deactivatedHiddenFilters.where(filterPredicate).toSet(),
-          builder: (context, deactivatedHiddenFilters, child) {
-            final allHiddenFilters = {
-              ...activatedHiddenFilters,
-              ...deactivatedHiddenFilters,
-            };
-            if (allHiddenFilters.isEmpty) {
-              return Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  _Banner(bannerText: context.l10n.settingsHiddenFiltersBanner),
-                  const Divider(height: 0),
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.all(8),
-                      child: EmptyContent(
-                        icon: AIcons.hide,
-                        text: context.l10n.settingsHiddenFiltersEmpty,
-                      ),
-                    ),
-                  ),
-                ],
-              );
-            }
-
-            final filterList = allHiddenFilters.toList()..sort();
-            return ListView(
-              children: [
-                _Banner(bannerText: context.l10n.settingsHiddenFiltersBanner),
-                const Divider(height: 0),
-                const SizedBox(height: 8),
-                ...filterList.map((filter) {
-                  void onRemove(CollectionFilter filter) => settings.changeFilterVisibility({filter}, true);
-                  return Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-                    child: Row(
-                      children: [
-                        Expanded(
-                          child: LayoutBuilder(
-                            builder: (context, constraints) {
-                              return Row(
-                                children: [
-                                  AvesFilterChip(
-                                    filter: filter,
-                                    maxWidth: constraints.maxWidth,
-                                    onTap: onRemove,
-                                    onRemove: onRemove,
-                                    onLongPress: null,
-                                  ),
-                                  const Spacer(),
-                                ],
-                              );
-                            },
+      body: SafeArea(
+        child: Selector<Settings, Set<CollectionFilter>>(
+          selector: (context, s) => settings.hiddenFilters.toSet(),
+          builder: (context, activatedHiddenFilters, child) {
+            return Selector<Settings, Set<CollectionFilter>>(
+              selector: (context, s) => settings.deactivatedHiddenFilters.toSet(),
+              builder: (context, deactivatedHiddenFilters, child) {
+                final allHiddenFilters = {
+                  ...activatedHiddenFilters,
+                  ...deactivatedHiddenFilters,
+                };
+                if (allHiddenFilters.isEmpty) {
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      _Banner(bannerText: context.l10n.settingsHiddenFiltersBanner),
+                      const Divider(height: 0),
+                      Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.all(8),
+                          child: EmptyContent(
+                            icon: AIcons.hide,
+                            text: context.l10n.settingsHiddenFiltersEmpty,
                           ),
                         ),
-                        const SizedBox(width: 8),
-                        Switch(
-                          value: activatedHiddenFilters.contains(filter),
-                          onChanged: (v) => settings.activateHiddenFilter(filter, v),
-                        ),
-                      ],
-                    ),
+                      ),
+                    ],
                   );
-                }),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}
-
-class _HiddenPaths extends StatelessWidget {
-  const _HiddenPaths();
+                }
 
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Settings, Set<PathFilter>>(
-      selector: (context, s) => {
-        ...settings.hiddenFilters,
-        ...settings.deactivatedHiddenFilters,
-      }.whereType<PathFilter>().toSet(),
-      builder: (context, hiddenPaths, child) {
-        final pathList = hiddenPaths.toList()..sort();
-        return Column(
-          children: [
-            _Banner(bannerText: context.l10n.settingsHiddenPathsBanner),
-            const Divider(height: 0),
-            Flexible(
-              child: ListView(
-                shrinkWrap: true,
-                children: [
-                  ...pathList.map((pathFilter) {
-                    void onPressed() => settings.changeFilterVisibility({pathFilter}, true);
-                    return ListTile(
-                      title: Text(pathFilter.path),
-                      dense: true,
-                      trailing: IconButton(
-                        icon: const Icon(AIcons.clear),
-                        onPressed: onPressed,
-                        tooltip: context.l10n.actionRemove,
-                      ),
-                      onTap: settings.useTvLayout ? onPressed : null,
-                    );
-                  }),
-                ],
-              ),
-            ),
-            const Divider(height: 0),
-            const SizedBox(height: 8),
-            AvesOutlinedButton(
-              icon: const Icon(AIcons.add),
-              label: context.l10n.addPathTooltip,
-              onPressed: () async {
-                final path = await Navigator.maybeOf(context)?.push(
-                  MaterialPageRoute<String>(
-                    settings: const RouteSettings(name: FilePickerPage.routeName),
-                    builder: (context) => const FilePickerPage(),
-                  ),
+                final filterList = allHiddenFilters.toList()..sort();
+                return ListView(
+                  children: [
+                    _Banner(bannerText: context.l10n.settingsHiddenFiltersBanner),
+                    const Divider(height: 0),
+                    const SizedBox(height: 8),
+                    ...filterList.map((filter) {
+                      void onRemove(CollectionFilter filter) => settings.changeFilterVisibility({filter}, true);
+                      return Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+                        child: Row(
+                          children: [
+                            Expanded(
+                              child: LayoutBuilder(
+                                builder: (context, constraints) {
+                                  return Row(
+                                    children: [
+                                      AvesFilterChip(
+                                        filter: filter,
+                                        maxWidth: constraints.maxWidth,
+                                        onTap: onRemove,
+                                        onRemove: onRemove,
+                                        onLongPress: null,
+                                      ),
+                                      const Spacer(),
+                                    ],
+                                  );
+                                },
+                              ),
+                            ),
+                            const SizedBox(width: 8),
+                            Switch(
+                              value: activatedHiddenFilters.contains(filter),
+                              onChanged: (v) => settings.activateHiddenFilter(filter, v),
+                            ),
+                          ],
+                        ),
+                      );
+                    }),
+                  ],
                 );
-                // wait for the dialog to hide as applying the change may block the UI
-                await Future.delayed(ADurations.pageTransitionLoose * timeDilation);
-                if (path != null && path.isNotEmpty) {
-                  settings.changeFilterVisibility({PathFilter(path)}, false);
-                }
               },
-            ),
-          ],
-        );
-      },
+            );
+          },
+        ),
+      ),
     );
   }
 }
diff --git a/lib/widgets/viewer/action/entry_action_delegate.dart b/lib/widgets/viewer/action/entry_action_delegate.dart
index 76fdb546f..ed0fb320c 100644
--- a/lib/widgets/viewer/action/entry_action_delegate.dart
+++ b/lib/widgets/viewer/action/entry_action_delegate.dart
@@ -437,7 +437,7 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix
       showFeedback(context, FeedbackType.warn, l10n.genericFailureFeedback);
     } else {
       final source = context.read<CollectionSource>();
-      if (source.initState != SourceInitializationState.none) {
+      if (source.scope != SourceScope.none) {
         await source.removeEntries({targetEntry.uri}, includeTrash: true);
       }
       EntryDeletedNotification({targetEntry}).dispatch(context);
diff --git a/lib/widgets/viewer/info/info_page.dart b/lib/widgets/viewer/info/info_page.dart
index e4e94f46d..8e123b58b 100644
--- a/lib/widgets/viewer/info/info_page.dart
+++ b/lib/widgets/viewer/info/info_page.dart
@@ -277,6 +277,7 @@ class _InfoPageContentState extends State<_InfoPageContent> {
 
   void _onActionDelegateEvent(ActionEvent<EntryAction> event) {
     Future.delayed(ADurations.dialogTransitionLoose).then((_) {
+      if (!mounted) return;
       if (event is ActionStartedEvent) {
         _isEditingMetadataNotifier.value = event.action;
       } else if (event is ActionEndedEvent) {
diff --git a/lib/widgets/viewer/overlay/video/progress_bar.dart b/lib/widgets/viewer/overlay/video/progress_bar.dart
index 1c71ad503..3d746c3e0 100644
--- a/lib/widgets/viewer/overlay/video/progress_bar.dart
+++ b/lib/widgets/viewer/overlay/video/progress_bar.dart
@@ -10,6 +10,7 @@ import 'package:aves/widgets/common/extensions/theme.dart';
 import 'package:aves/widgets/common/fx/blurred.dart';
 import 'package:aves/widgets/common/fx/borders.dart';
 import 'package:aves_video/aves_video.dart';
+import 'package:decorated_icon/decorated_icon.dart';
 import 'package:flutter/material.dart';
 
 class VideoProgressBar extends StatefulWidget {
@@ -44,12 +45,6 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
   Widget build(BuildContext context) {
     final blurred = settings.enableBlurEffect;
     final theme = Theme.of(context);
-    final textStyle = TextStyle(
-      shadows: theme.isDark ? AStyles.embossShadows : null,
-    );
-    const strutStyle = StrutStyle(
-      forceStrutHeight: true,
-    );
     return SizeTransition(
       sizeFactor: widget.scale,
       child: BlurredRRect.all(
@@ -106,18 +101,10 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
                                       builder: (context, snapshot) {
                                         // do not use stream snapshot because it is obsolete when switching between videos
                                         final position = controller?.currentPosition.floor() ?? 0;
-                                        return Text(
-                                          formatFriendlyDuration(Duration(milliseconds: position)),
-                                          style: textStyle,
-                                          strutStyle: strutStyle,
-                                        );
+                                        return _buildText(formatFriendlyDuration(Duration(milliseconds: position)));
                                       }),
                                   const Spacer(),
-                                  Text(
-                                    formatFriendlyDuration(Duration(milliseconds: controller?.duration ?? 0)),
-                                    style: textStyle,
-                                    strutStyle: strutStyle,
-                                  ),
+                                  _buildText(formatFriendlyDuration(Duration(milliseconds: controller?.duration ?? 0))),
                                 ],
                               ),
                               ClipRRect(
@@ -132,7 +119,7 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
                                         if (!progress.isFinite) progress = 0.0;
                                         return LinearProgressIndicator(
                                           value: progress,
-                                          backgroundColor: Theme.of(context).colorScheme.onSurface.withOpacity(.2),
+                                          backgroundColor: theme.colorScheme.onSurface.withOpacity(.2),
                                         );
                                       }),
                                 ),
@@ -141,12 +128,8 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
                                 children: [
                                   _buildSpeedIndicator(),
                                   _buildMuteIndicator(),
-                                  Text(
-                                    // fake text below to match the height of the text above and center the whole thing
-                                    '',
-                                    style: textStyle,
-                                    strutStyle: strutStyle,
-                                  ),
+                                  // fake text below to match the height of the text above and center the whole thing
+                                  _buildText(''),
                                 ],
                               ),
                             ],
@@ -164,6 +147,18 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
     );
   }
 
+  Widget _buildText(String text) {
+    return Text(
+      text,
+      style: TextStyle(
+        shadows: Theme.of(context).isDark ? AStyles.embossShadows : null,
+      ),
+      strutStyle: const StrutStyle(
+        forceStrutHeight: true,
+      ),
+    );
+  }
+
   Widget _buildABRepeatMark(BuildContext context, int? position) {
     if (controller == null || position == null) return const SizedBox();
     return Positioned(
@@ -185,7 +180,7 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
           return speed != 1
               ? Padding(
                   padding: const EdgeInsetsDirectional.only(end: 8),
-                  child: Text('x$speed'),
+                  child: _buildText('x$speed'),
                 )
               : const SizedBox();
         },
@@ -199,9 +194,10 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
           return isMuted
               ? Padding(
                   padding: const EdgeInsetsDirectional.only(end: 8),
-                  child: Icon(
+                  child: DecoratedIcon(
                     AIcons.mute,
                     size: textScaler.scale(16),
+                    shadows: Theme.of(context).isDark ? AStyles.embossShadows : null,
                   ),
                 )
               : const SizedBox();
diff --git a/plugins/aves_magnifier/lib/aves_magnifier.dart b/plugins/aves_magnifier/lib/aves_magnifier.dart
index 7a387be0a..80a5d7150 100644
--- a/plugins/aves_magnifier/lib/aves_magnifier.dart
+++ b/plugins/aves_magnifier/lib/aves_magnifier.dart
@@ -1,5 +1,3 @@
-library aves_magnifier;
-
 export 'src/controller/controller.dart';
 export 'src/controller/state.dart';
 export 'src/core/core.dart';
diff --git a/plugins/aves_magnifier/pubspec.lock b/plugins/aves_magnifier/pubspec.lock
index 49a802af7..e6dcaa66d 100644
--- a/plugins/aves_magnifier/pubspec.lock
+++ b/plugins/aves_magnifier/pubspec.lock
@@ -41,18 +41,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_map/lib/aves_map.dart b/plugins/aves_map/lib/aves_map.dart
index 3de25590d..20989166e 100644
--- a/plugins/aves_map/lib/aves_map.dart
+++ b/plugins/aves_map/lib/aves_map.dart
@@ -1,5 +1,3 @@
-library aves_map;
-
 export 'src/controller.dart';
 export 'src/geo_entry.dart';
 export 'src/geo_utils.dart';
diff --git a/plugins/aves_map/lib/src/style.dart b/plugins/aves_map/lib/src/style.dart
index 70b36f828..3732592a9 100644
--- a/plugins/aves_map/lib/src/style.dart
+++ b/plugins/aves_map/lib/src/style.dart
@@ -1,10 +1,16 @@
+// OSM raster tile providers: https://wiki.openstreetmap.org/wiki/Raster_tile_providers
+// OSM vector tile providers: https://wiki.openstreetmap.org/wiki/Vector_tiles#Providers
+// Leaflet providers preview: https://leaflet-extras.github.io/leaflet-providers/preview/
+// OpenMapTiles styles: https://openmaptiles.org/styles/
 enum EntryMapStyle {
   // Google
   googleNormal,
   googleHybrid,
   googleTerrain,
-  // Leaflet
-  // browse providers at https://leaflet-extras.github.io/leaflet-providers/preview/
+  // Vector (OpenMapTiles)
+  osmLiberty,
+  // Raster (Leaflet)
+  openTopoMap,
   osmHot,
   stamenWatercolor,
 }
diff --git a/plugins/aves_map/lib/src/theme.dart b/plugins/aves_map/lib/src/theme.dart
index b05e60ad1..dd188c8a2 100644
--- a/plugins/aves_map/lib/src/theme.dart
+++ b/plugins/aves_map/lib/src/theme.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-enum MapNavigationButton { back, map, none }
+enum MapNavigationButton { back, close, map, none }
 
 class MapThemeData {
   final bool interactive, showCoordinateFilter;
diff --git a/plugins/aves_map/pubspec.lock b/plugins/aves_map/pubspec.lock
index 0e7ea4667..b9059010f 100644
--- a/plugins/aves_map/pubspec.lock
+++ b/plugins/aves_map/pubspec.lock
@@ -81,10 +81,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_map:
     dependency: "direct main"
     description:
@@ -129,10 +129,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lists:
     dependency: transitive
     description:
@@ -270,10 +270,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   wkt_parser:
     dependency: transitive
     description:
diff --git a/plugins/aves_model/lib/aves_model.dart b/plugins/aves_model/lib/aves_model.dart
index 94e32722e..5ed3e681e 100644
--- a/plugins/aves_model/lib/aves_model.dart
+++ b/plugins/aves_model/lib/aves_model.dart
@@ -1,5 +1,3 @@
-library aves_model;
-
 export 'src/actions/chip.dart';
 export 'src/actions/chip_set.dart';
 export 'src/actions/entry.dart';
diff --git a/plugins/aves_model/lib/src/actions/explorer.dart b/plugins/aves_model/lib/src/actions/explorer.dart
index 5d33f4fa7..58d595bb7 100644
--- a/plugins/aves_model/lib/src/actions/explorer.dart
+++ b/plugins/aves_model/lib/src/actions/explorer.dart
@@ -1,5 +1,6 @@
 enum ExplorerAction {
   addShortcut,
   setHome,
+  hide,
   stats,
 }
diff --git a/plugins/aves_model/lib/src/storage/relative_dir.dart b/plugins/aves_model/lib/src/storage/relative_dir.dart
index 393178f25..b7c84a0ca 100644
--- a/plugins/aves_model/lib/src/storage/relative_dir.dart
+++ b/plugins/aves_model/lib/src/storage/relative_dir.dart
@@ -26,4 +26,14 @@ class VolumeRelativeDirectory extends Equatable {
         'volumePath': volumePath,
         'relativeDir': relativeDir,
       };
+
+  VolumeRelativeDirectory copyWith({
+    String? volumePath,
+    String? relativeDir,
+  }) {
+    return VolumeRelativeDirectory(
+      volumePath: volumePath ?? this.volumePath,
+      relativeDir: relativeDir ?? this.relativeDir,
+    );
+  }
 }
diff --git a/plugins/aves_model/pubspec.lock b/plugins/aves_model/pubspec.lock
index aa79241b7..e7e5e2a72 100644
--- a/plugins/aves_model/pubspec.lock
+++ b/plugins/aves_model/pubspec.lock
@@ -34,18 +34,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_platform_meta/pubspec.lock b/plugins/aves_platform_meta/pubspec.lock
index f6c43ab3f..b061d14d7 100644
--- a/plugins/aves_platform_meta/pubspec.lock
+++ b/plugins/aves_platform_meta/pubspec.lock
@@ -26,18 +26,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_report/lib/aves_report.dart b/plugins/aves_report/lib/aves_report.dart
index 765e5efc0..4d3a3fc5c 100644
--- a/plugins/aves_report/lib/aves_report.dart
+++ b/plugins/aves_report/lib/aves_report.dart
@@ -1,5 +1,3 @@
-library aves_report;
-
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:stack_trace/stack_trace.dart';
diff --git a/plugins/aves_report/pubspec.lock b/plugins/aves_report/pubspec.lock
index db84b1151..12a214ea8 100644
--- a/plugins/aves_report/pubspec.lock
+++ b/plugins/aves_report/pubspec.lock
@@ -26,18 +26,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
@@ -71,10 +71,10 @@ packages:
     dependency: "direct main"
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   vector_math:
     dependency: transitive
     description:
diff --git a/plugins/aves_report_console/lib/aves_report_platform.dart b/plugins/aves_report_console/lib/aves_report_platform.dart
index 8cc4f1f81..e57e70f85 100644
--- a/plugins/aves_report_console/lib/aves_report_platform.dart
+++ b/plugins/aves_report_console/lib/aves_report_platform.dart
@@ -1,5 +1,3 @@
-library aves_report_platform;
-
 import 'package:aves_report/aves_report.dart';
 import 'package:flutter/foundation.dart';
 
diff --git a/plugins/aves_report_console/pubspec.lock b/plugins/aves_report_console/pubspec.lock
index 098029261..1071d0024 100644
--- a/plugins/aves_report_console/pubspec.lock
+++ b/plugins/aves_report_console/pubspec.lock
@@ -33,18 +33,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
@@ -78,10 +78,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   vector_math:
     dependency: transitive
     description:
diff --git a/plugins/aves_report_crashlytics/lib/aves_report_platform.dart b/plugins/aves_report_crashlytics/lib/aves_report_platform.dart
index d779a2b97..1bcd7f567 100644
--- a/plugins/aves_report_crashlytics/lib/aves_report_platform.dart
+++ b/plugins/aves_report_crashlytics/lib/aves_report_platform.dart
@@ -1,5 +1,3 @@
-library aves_report_platform;
-
 import 'dart:async';
 
 import 'package:aves_report/aves_report.dart';
diff --git a/plugins/aves_report_crashlytics/pubspec.lock b/plugins/aves_report_crashlytics/pubspec.lock
index 2a15e3bc9..8f976b0c4 100644
--- a/plugins/aves_report_crashlytics/pubspec.lock
+++ b/plugins/aves_report_crashlytics/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: ddc6f775260b89176d329dee26f88b9469ef46aa3228ff6a0b91caf2b2989692
+      sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.42"
+    version: "1.3.44"
   async:
     dependency: transitive
     description:
@@ -68,42 +68,42 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "40921de9795fbf5887ed5c0adfdf4972d5a8d7ae7e1b2bb98dea39bc02626a88"
+      sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.6.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: f7d7180c7f99babd4b4c517754d41a09a4943a0f7a69b65c894ca5c68ba66315
+      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.3.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: f4ee170441ca141c5f9ee5ad8737daba3ee9c8e7efb6902aee90b4fbd178ce25
+      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.0"
+    version: "2.18.1"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: c4fdbb14ba6f36794f89dc27fb5c759c9cc67ecbaeb079edc4dba515bbf9f555
+      sha256: "6899800fff1af819955aef740f18c4c8600f8b952a2a1ea97bc0872ebb257387"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.1.3"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "891d6f7ba4b93672d0e1265f27b6a9dccd56ba2cc30ce6496586b32d1d8770ac"
+      sha256: "97c47b0a1779a3d4118416a3f0c6c564cc59ad89095e899893204d4b2ad08f4c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.42"
+    version: "3.6.44"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -113,10 +113,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_test:
     dependency: transitive
     description: flutter
@@ -155,10 +155,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   matcher:
     dependency: transitive
     description:
@@ -272,10 +272,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
 sdks:
   dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.22.0"
diff --git a/plugins/aves_screen_state/android/build.gradle b/plugins/aves_screen_state/android/build.gradle
index 5a8da97e1..d9c4eebad 100644
--- a/plugins/aves_screen_state/android/build.gradle
+++ b/plugins/aves_screen_state/android/build.gradle
@@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
 buildscript {
     ext {
         kotlin_version = '1.9.24'
-        agp_version = '8.6.0'
+        agp_version = '8.6.1'
     }
 
     repositories {
diff --git a/plugins/aves_screen_state/pubspec.lock b/plugins/aves_screen_state/pubspec.lock
index f6c43ab3f..b061d14d7 100644
--- a/plugins/aves_screen_state/pubspec.lock
+++ b/plugins/aves_screen_state/pubspec.lock
@@ -26,18 +26,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_services/lib/aves_services.dart b/plugins/aves_services/lib/aves_services.dart
index 2778ffb89..5fa5b9381 100644
--- a/plugins/aves_services/lib/aves_services.dart
+++ b/plugins/aves_services/lib/aves_services.dart
@@ -1,5 +1,3 @@
-library aves_services;
-
 import 'package:aves_map/aves_map.dart';
 import 'package:flutter/widgets.dart';
 import 'package:latlong2/latlong.dart';
diff --git a/plugins/aves_services/pubspec.lock b/plugins/aves_services/pubspec.lock
index 498f23607..00427b67b 100644
--- a/plugins/aves_services/pubspec.lock
+++ b/plugins/aves_services/pubspec.lock
@@ -88,10 +88,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_map:
     dependency: transitive
     description:
@@ -136,10 +136,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lists:
     dependency: transitive
     description:
@@ -277,10 +277,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   wkt_parser:
     dependency: transitive
     description:
diff --git a/plugins/aves_services_google/lib/aves_services_platform.dart b/plugins/aves_services_google/lib/aves_services_platform.dart
index 4d0ac6ab5..23a5ddbfe 100644
--- a/plugins/aves_services_google/lib/aves_services_platform.dart
+++ b/plugins/aves_services_google/lib/aves_services_platform.dart
@@ -1,5 +1,3 @@
-library aves_services_platform;
-
 import 'package:aves_map/aves_map.dart';
 import 'package:aves_services/aves_services.dart';
 import 'package:aves_services_platform/src/map.dart';
diff --git a/plugins/aves_services_google/pubspec.lock b/plugins/aves_services_google/pubspec.lock
index 075eceea5..f61433ca1 100644
--- a/plugins/aves_services_google/pubspec.lock
+++ b/plugins/aves_services_google/pubspec.lock
@@ -121,10 +121,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fluster:
     dependency: transitive
     description:
@@ -142,10 +142,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_map:
     dependency: transitive
     description:
@@ -158,10 +158,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda"
+      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.23"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -195,10 +195,10 @@ packages:
     dependency: transitive
     description:
       name: google_maps
-      sha256: "463b38e5a92a05cde41220a11fd5eef3847031fef3e8cf295ac76ec453246907"
+      sha256: "4d6e199c561ca06792c964fa24b2bac7197bf4b401c2e1d23e345e5f9939f531"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.1"
   google_maps_flutter:
     dependency: "direct main"
     description:
@@ -211,10 +211,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_maps_flutter_android
-      sha256: "36e75af1d0bd4c7391eacdaedf9ca7632c5b9709c5ec618b04489b79ea2b3f82"
+      sha256: a591ff8d0816436e6a4d9f32bbdf10ebb30bb26f72f6db2a51ddb2426ff7d9ec
       url: "https://pub.dev"
     source: hosted
-    version: "2.14.6"
+    version: "2.14.8"
   google_maps_flutter_ios:
     dependency: transitive
     description:
@@ -227,10 +227,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_maps_flutter_platform_interface
-      sha256: "099874463dc4c9bff04fe4b2b8cf7284d2455c2deead8f9a59a87e1b9f028c69"
+      sha256: a951981c22d790848efb9f114f81794945bc5c06bc566238a419a92f110af6cb
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.2"
+    version: "2.9.5"
   google_maps_flutter_web:
     dependency: transitive
     description:
@@ -283,10 +283,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lists:
     dependency: transitive
     description:
@@ -448,26 +448,26 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.5.5"
   win32_registry:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.4"
+    version: "1.1.5"
   wkt_parser:
     dependency: transitive
     description:
@@ -478,4 +478,4 @@ packages:
     version: "2.0.0"
 sdks:
   dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.22.0"
+  flutter: ">=3.24.0"
diff --git a/plugins/aves_services_none/lib/aves_services_platform.dart b/plugins/aves_services_none/lib/aves_services_platform.dart
index 59164c5f3..f7069f805 100644
--- a/plugins/aves_services_none/lib/aves_services_platform.dart
+++ b/plugins/aves_services_none/lib/aves_services_platform.dart
@@ -1,5 +1,3 @@
-library aves_services_platform;
-
 import 'package:aves_map/aves_map.dart';
 import 'package:aves_services/aves_services.dart';
 import 'package:flutter/widgets.dart';
diff --git a/plugins/aves_services_none/pubspec.lock b/plugins/aves_services_none/pubspec.lock
index 4aaf105a3..89c52d2fc 100644
--- a/plugins/aves_services_none/pubspec.lock
+++ b/plugins/aves_services_none/pubspec.lock
@@ -95,10 +95,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_map:
     dependency: transitive
     description:
@@ -143,10 +143,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lists:
     dependency: transitive
     description:
@@ -284,10 +284,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   wkt_parser:
     dependency: transitive
     description:
diff --git a/plugins/aves_ui/lib/aves_ui.dart b/plugins/aves_ui/lib/aves_ui.dart
index 53b2945dc..148314ac6 100644
--- a/plugins/aves_ui/lib/aves_ui.dart
+++ b/plugins/aves_ui/lib/aves_ui.dart
@@ -1,3 +1 @@
-library aves_ui;
-
 export 'src/dot.dart';
diff --git a/plugins/aves_ui/pubspec.lock b/plugins/aves_ui/pubspec.lock
index dc6c403f2..fa81f5efc 100644
--- a/plugins/aves_ui/pubspec.lock
+++ b/plugins/aves_ui/pubspec.lock
@@ -26,18 +26,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_utils/lib/aves_utils.dart b/plugins/aves_utils/lib/aves_utils.dart
index 153778df2..0058969c4 100644
--- a/plugins/aves_utils/lib/aves_utils.dart
+++ b/plugins/aves_utils/lib/aves_utils.dart
@@ -1,5 +1,3 @@
-library aves_utils;
-
 export 'src/colors.dart';
 export 'src/listenable.dart';
 export 'src/optional_event_channel.dart';
diff --git a/plugins/aves_utils/pubspec.lock b/plugins/aves_utils/pubspec.lock
index 045df08f7..422ab73ee 100644
--- a/plugins/aves_utils/pubspec.lock
+++ b/plugins/aves_utils/pubspec.lock
@@ -26,18 +26,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_video/lib/aves_video.dart b/plugins/aves_video/lib/aves_video.dart
index be95bca35..8fca1cc0e 100644
--- a/plugins/aves_video/lib/aves_video.dart
+++ b/plugins/aves_video/lib/aves_video.dart
@@ -1,5 +1,3 @@
-library aves_video;
-
 export 'src/ab_repeat.dart';
 export 'src/controller.dart';
 export 'src/metadata.dart';
diff --git a/plugins/aves_video/pubspec.lock b/plugins/aves_video/pubspec.lock
index 678b686ce..4f186ec74 100644
--- a/plugins/aves_video/pubspec.lock
+++ b/plugins/aves_video/pubspec.lock
@@ -48,18 +48,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_video_ffmpeg/lib/aves_video_ffmpeg.dart b/plugins/aves_video_ffmpeg/lib/aves_video_ffmpeg.dart
index 3ca8aa3ca..66ba486fe 100644
--- a/plugins/aves_video_ffmpeg/lib/aves_video_ffmpeg.dart
+++ b/plugins/aves_video_ffmpeg/lib/aves_video_ffmpeg.dart
@@ -1,3 +1 @@
-library aves_video_ffmpeg;
-
 export 'src/metadata.dart';
diff --git a/plugins/aves_video_ffmpeg/pubspec.lock b/plugins/aves_video_ffmpeg/pubspec.lock
index 9ad53a0a8..fe7b46b57 100644
--- a/plugins/aves_video_ffmpeg/pubspec.lock
+++ b/plugins/aves_video_ffmpeg/pubspec.lock
@@ -72,18 +72,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
diff --git a/plugins/aves_video_mpv/lib/aves_video_mpv.dart b/plugins/aves_video_mpv/lib/aves_video_mpv.dart
index 7fb338e98..40a67aa2e 100644
--- a/plugins/aves_video_mpv/lib/aves_video_mpv.dart
+++ b/plugins/aves_video_mpv/lib/aves_video_mpv.dart
@@ -1,4 +1,2 @@
-library aves_video_mpv;
-
 export 'src/controller.dart';
 export 'src/factory.dart';
diff --git a/plugins/aves_video_mpv/pubspec.lock b/plugins/aves_video_mpv/pubspec.lock
index 9f7bea01c..47b08e192 100644
--- a/plugins/aves_video_mpv/pubspec.lock
+++ b/plugins/aves_video_mpv/pubspec.lock
@@ -119,10 +119,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -164,10 +164,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   material_color_utilities:
     dependency: transitive
     description:
@@ -345,10 +345,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255
+      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.3.0+3"
   term_glyph:
     dependency: transitive
     description:
@@ -385,10 +385,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.5.1"
   vector_math:
     dependency: transitive
     description:
@@ -425,18 +425,18 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.5.5"
   xml:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index b401315a3..f2531dd8a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: ddc6f775260b89176d329dee26f88b9469ef46aa3228ff6a0b91caf2b2989692
+      sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.42"
+    version: "1.3.44"
   _macros:
     dependency: transitive
     description: dart
@@ -343,10 +343,18 @@ packages:
     dependency: "direct main"
     description:
       name: event_bus
-      sha256: "44baa799834f4c803921873e7446a2add0f3efa45e101a054b1f0ab9b95f8edc"
+      sha256: "1a55e97923769c286d295240048fc180e7b0768902c3c2e869fe059aafa15304"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
+  executor_lib:
+    dependency: transitive
+    description:
+      name: executor_lib
+      sha256: "544889daa5726462657dab6410b75f2f8e3a77479d85b307a25c346e243bc38e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   expansion_tile_card:
     dependency: "direct main"
     description:
@@ -401,42 +409,42 @@ packages:
     dependency: transitive
     description:
       name: firebase_core
-      sha256: "40921de9795fbf5887ed5c0adfdf4972d5a8d7ae7e1b2bb98dea39bc02626a88"
+      sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.6.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: f7d7180c7f99babd4b4c517754d41a09a4943a0f7a69b65c894ca5c68ba66315
+      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.3.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: f4ee170441ca141c5f9ee5ad8737daba3ee9c8e7efb6902aee90b4fbd178ce25
+      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.0"
+    version: "2.18.1"
   firebase_crashlytics:
     dependency: transitive
     description:
       name: firebase_crashlytics
-      sha256: c4fdbb14ba6f36794f89dc27fb5c759c9cc67ecbaeb079edc4dba515bbf9f555
+      sha256: "6899800fff1af819955aef740f18c4c8600f8b952a2a1ea97bc0872ebb257387"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.1.3"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "891d6f7ba4b93672d0e1265f27b6a9dccd56ba2cc30ce6496586b32d1d8770ac"
+      sha256: "97c47b0a1779a3d4118416a3f0c6c564cc59ad89095e899893204d4b2ad08f4c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.42"
+    version: "3.6.44"
   fixnum:
     dependency: transitive
     description:
@@ -449,18 +457,18 @@ packages:
     dependency: "direct main"
     description:
       name: flex_color_picker
-      sha256: "809af4ec82ede3b140ed0219b97d548de99e47aa4b99b14a10f705a2dbbcba5e"
+      sha256: "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79"
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.1"
+    version: "3.6.0"
   flex_seed_scheme:
     dependency: transitive
     description:
       name: flex_seed_scheme
-      sha256: "7d97ba5c20f0e5cb1e3e2c17c865e1f797d129de31fc1f75d2dcce9470d6373c"
+      sha256: "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.1"
   floating:
     dependency: "direct main"
     description:
@@ -515,10 +523,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_localization_nn:
     dependency: "direct main"
     description:
@@ -545,18 +553,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7
+      sha256: e17575ca576a34b46c58c91f9948891117a1bd97815d2e661813c7f90c647a78
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3+1"
+    version: "0.7.3+2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda"
+      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.23"
   flutter_staggered_animations:
     dependency: "direct main"
     description:
@@ -592,10 +600,10 @@ packages:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1
+      sha256: ff97e5e7b2e82e63c82f5658c6ba2605ea831f0f7489b0d2fb255d817ec4eb5e
       url: "https://pub.dev"
     source: hosted
-    version: "7.7.0"
+    version: "8.0.0"
   glob:
     dependency: transitive
     description:
@@ -632,10 +640,10 @@ packages:
     dependency: transitive
     description:
       name: google_maps
-      sha256: "463b38e5a92a05cde41220a11fd5eef3847031fef3e8cf295ac76ec453246907"
+      sha256: "4d6e199c561ca06792c964fa24b2bac7197bf4b401c2e1d23e345e5f9939f531"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.1"
   google_maps_flutter:
     dependency: transitive
     description:
@@ -648,10 +656,10 @@ packages:
     dependency: transitive
     description:
       name: google_maps_flutter_android
-      sha256: "36e75af1d0bd4c7391eacdaedf9ca7632c5b9709c5ec618b04489b79ea2b3f82"
+      sha256: a591ff8d0816436e6a4d9f32bbdf10ebb30bb26f72f6db2a51ddb2426ff7d9ec
       url: "https://pub.dev"
     source: hosted
-    version: "2.14.6"
+    version: "2.14.8"
   google_maps_flutter_ios:
     dependency: transitive
     description:
@@ -664,10 +672,10 @@ packages:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface
-      sha256: "099874463dc4c9bff04fe4b2b8cf7284d2455c2deead8f9a59a87e1b9f028c69"
+      sha256: a951981c22d790848efb9f114f81794945bc5c06bc566238a419a92f110af6cb
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.2"
+    version: "2.9.5"
   google_maps_flutter_web:
     dependency: transitive
     description:
@@ -693,7 +701,7 @@ packages:
     source: hosted
     version: "0.15.4"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
@@ -784,10 +792,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   lists:
     dependency: transitive
     description:
@@ -808,18 +816,18 @@ packages:
     dependency: transitive
     description:
       name: local_auth_android
-      sha256: e9a3c321e94359a552b1bdd0f98f79885f2b3e27234d270f9bef5cd82b29340c
+      sha256: "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.44"
+    version: "1.0.46"
   local_auth_darwin:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71"
+      sha256: "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   local_auth_platform_interface:
     dependency: transitive
     description:
@@ -944,10 +952,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
   motion_sensors:
     dependency: transitive
     description:
@@ -1062,6 +1070,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.12"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1218,10 +1250,10 @@ packages:
     dependency: "direct main"
     description:
       name: printing
-      sha256: de1889f30b34029fc46e5de6a9841498850b23d32942a9ee810ca36b0cb1b234
+      sha256: b576764370c920b510cedf3eac7dc199d6d4af34336d608e97546392c0113362
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.2"
+    version: "5.13.3"
   process:
     dependency: transitive
     description:
@@ -1238,6 +1270,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  protobuf:
+    dependency: transitive
+    description:
+      name: protobuf
+      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -1338,18 +1378,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1463,18 +1503,42 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
+      sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3+1"
+    version: "2.4.0"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
+      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+2"
+    version: "2.5.4+5"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1-1"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   stack_trace:
     dependency: "direct main"
     description:
@@ -1528,10 +1592,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255
+      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.3.0+3"
   term_glyph:
     dependency: transitive
     description:
@@ -1608,18 +1672,18 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab
+      sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.10"
+    version: "6.3.12"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1640,10 +1704,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1672,10 +1736,18 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.1"
+  vector_map_tiles:
+    dependency: "direct main"
+    description:
+      name: vector_map_tiles
+      sha256: "4dc9243195c1a49c7be82cc1caed0d300242bb94381752af5f6868d9d1404e25"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "8.0.0"
   vector_math:
     dependency: "direct main"
     description:
@@ -1684,6 +1756,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vector_tile:
+    dependency: transitive
+    description:
+      name: vector_tile
+      sha256: "3adb04426f3aebefce56f3fdf8ab2e23cc9f7d5b06ff8ca33ae87e3a1e441874"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  vector_tile_renderer:
+    dependency: "direct main"
+    description:
+      name: vector_tile_renderer
+      sha256: b58fa02b472ced87de00de2b4d5837576239bddb21b562481f25bde39bd117ae
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -1728,10 +1816,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   web_socket:
     dependency: transitive
     description:
@@ -1768,18 +1856,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.5.5"
   win32_registry:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.4"
+    version: "1.1.5"
   wkt_parser:
     dependency: transitive
     description:
@@ -1792,10 +1880,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   xml:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a0fd8ce63..2b70a9021 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ repository: https://github.com/deckerst/aves
 # - play changelog:   /whatsnew/whatsnew-en-US
 # - izzy changelog:   /fastlane/metadata/android/en-US/changelogs/XXX01.txt
 # - libre changelog:  /fastlane/metadata/android/en-US/changelogs/XXX.txt
-version: 1.11.13+132
+version: 1.11.14+133
 publish_to: none
 
 environment:
@@ -78,6 +78,7 @@ dependencies:
   flutter_markdown:
   flutter_staggered_animations:
   get_it:
+  http:
   intl:
   latlong2:
   leak_tracker:
@@ -111,7 +112,9 @@ dependencies:
       url: https://github.com/deckerst/aves_streams_channel.git
   transparent_image:
   url_launcher:
+  vector_map_tiles:
   vector_math:
+  vector_tile_renderer:
   volume_controller:
   xml:
 
diff --git a/test/fake/media_store_service.dart b/test/fake/media_store_service.dart
index 81e8e08a9..d3037b39b 100644
--- a/test/fake/media_store_service.dart
+++ b/test/fake/media_store_service.dart
@@ -33,7 +33,7 @@ class FakeMediaStoreService extends Fake implements MediaStoreService {
   }
 
   @override
-  Stream<AvesEntry> getEntries(bool safe, Map<int?, int?> knownEntries, {String? directory}) => Stream.fromIterable(entries);
+  Stream<AvesEntry> getEntries(Map<int?, int?> knownEntries, {String? directory}) => Stream.fromIterable(entries);
 
   static var _lastId = 1;
 
diff --git a/test/model/collection_source_test.dart b/test/model/collection_source_test.dart
index 90fd30089..2c21c62c9 100644
--- a/test/model/collection_source_test.dart
+++ b/test/model/collection_source_test.dart
@@ -109,7 +109,7 @@ void main() {
     final source = MediaStoreSource();
     unawaited(source.init());
     await Future.delayed(const Duration(milliseconds: 10));
-    expect(source.initState, SourceInitializationState.full);
+    expect(source.scope, SourceScope.full);
     await source.refreshUris({refreshEntry.uri});
 
     await Future.delayed(const Duration(seconds: 1));
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index c0c7c4762..c3e79cc42 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1,3 +1,4 @@
-In v1.11.13:
-- review photos from the lock screen
+In v1.11.14:
+- enjoy new map layers
+- share "geo" addresses to Aves and see your collection in that area
 Full changelog available on GitHub
\ No newline at end of file