diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e913bc8cf..cee48345e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,11 +69,39 @@
             android:name=".crash.CrashActivity"
             android:exported="false" />
 
+
         <activity
-            android:name=".ui.main.DeepLinkActivity"
+            android:name=".ui.main.DeepLinkAnimeActivity"
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/action_global_search"
+            android:label="@string/action_global_anime_search"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="eu.kanade.tachiyomi.ANIMESEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
+
+        <activity
+            android:name=".ui.main.DeepLinkMangaActivity"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/action_global_manga_search"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
diff --git a/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt b/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
index 31ad332ee..7a5312801 100644
--- a/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
@@ -1,6 +1,8 @@
 package eu.kanade.domain.base
 
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import eu.kanade.tachiyomi.core.preference.PreferenceStore
 import eu.kanade.tachiyomi.core.preference.getEnum
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
@@ -26,4 +28,6 @@ class BasePreferences(
 
     // acra is disabled
     fun acraEnabled() = preferenceStore.getBoolean("acra.enable", false)
+
+    fun deviceHasPip() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
 }
diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt
index f57bdf62d..d5ea26fd6 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt
@@ -158,7 +158,7 @@ private fun AnimeExtensionDetails(
         when {
             extension.isUnofficial ->
                 item {
-                    WarningBanner(R.string.unofficial_extension_message)
+                    WarningBanner(R.string.unofficial_anime_extension_message)
                 }
             extension.isObsolete ->
                 item {
diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
index 23d7d0705..2ed02ec86 100644
--- a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
@@ -30,12 +30,12 @@ fun TabbedScreen(
     @StringRes titleRes: Int?,
     tabs: List<TabContent>,
     startIndex: Int? = null,
-    searchQuery: String? = null,
-    onChangeSearchQuery: (String?) -> Unit = {},
+    mangaSearchQuery: String? = null,
+    onChangeMangaSearchQuery: (String?) -> Unit = {},
     state: PagerState = rememberPagerState(),
     scrollable: Boolean = false,
-    searchQueryAnime: String? = null,
-    onChangeSearchQueryAnime: (String?) -> Unit = {},
+    animeSearchQuery: String? = null,
+    onChangeAnimeSearchQuery: (String?) -> Unit = {},
 ) {
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -53,13 +53,13 @@ fun TabbedScreen(
                 val searchEnabled = tab.searchEnabled
 
                 val actualQuery = when (state.currentPage % 2) {
-                    1 -> searchQuery // History and Browse
-                    else -> searchQueryAnime
+                    1 -> mangaSearchQuery // History and Browse
+                    else -> animeSearchQuery
                 }
 
                 val actualOnChange = when (state.currentPage % 2) {
-                    1 -> onChangeSearchQuery // History and Browse
-                    else -> onChangeSearchQueryAnime
+                    1 -> onChangeMangaSearchQuery // History and Browse
+                    else -> onChangeAnimeSearchQuery
                 }
 
                 SearchToolbar(
diff --git a/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt
index b8722d365..f479c76a7 100644
--- a/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt
@@ -20,6 +20,7 @@ import java.util.Date
 fun AnimeHistoryScreen(
     state: AnimeHistoryState,
     contentPadding: PaddingValues,
+    searchQuery: String? = null,
     snackbarHostState: SnackbarHostState,
     onClickCover: (animeId: Long) -> Unit,
     onClickResume: (animeId: Long, episodeId: Long) -> Unit,
@@ -32,7 +33,7 @@ fun AnimeHistoryScreen(
             if (it == null) {
                 LoadingScreen(modifier = Modifier.padding(contentPadding))
             } else if (it.isEmpty()) {
-                val msg = if (!state.searchQuery.isNullOrEmpty()) {
+                val msg = if (!searchQuery.isNullOrEmpty()) {
                     R.string.no_results_found
                 } else {
                     R.string.information_no_recent_anime
diff --git a/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt
index 14ec46b27..c8eca6d9f 100644
--- a/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt
@@ -19,6 +19,7 @@ import java.util.Date
 fun MangaHistoryScreen(
     state: HistoryState,
     contentPadding: PaddingValues,
+    searchQuery: String? = null,
     snackbarHostState: SnackbarHostState,
     onClickCover: (mangaId: Long) -> Unit,
     onClickResume: (mangaId: Long, chapterId: Long) -> Unit,
@@ -31,7 +32,7 @@ fun MangaHistoryScreen(
             if (it == null) {
                 LoadingScreen(modifier = Modifier.padding(contentPadding))
             } else if (it.isEmpty()) {
-                val msg = if (!state.searchQuery.isNullOrEmpty()) {
+                val msg = if (!searchQuery.isNullOrEmpty()) {
                     R.string.no_results_found
                 } else {
                     R.string.information_no_recent_manga
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt
index 8db6d17ba..8ce678436 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt
@@ -100,7 +100,7 @@ class ClearDatabaseScreen : Screen {
                 Scaffold(
                     topBar = { scrollBehavior ->
                         AppBar(
-                            title = stringResource(R.string.pref_clear_database),
+                            title = stringResource(R.string.pref_clear_manga_database),
                             navigateUp = navigator::pop,
                             actions = {
                                 if (s.items.isNotEmpty()) {
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
index f767728c2..a4ca27535 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
@@ -205,8 +205,8 @@ object SettingsAdvancedScreen : SearchableSettings {
                     },
                 ),
                 Preference.PreferenceItem.TextPreference(
-                    title = stringResource(R.string.pref_clear_database),
-                    subtitle = stringResource(R.string.pref_clear_database_summary),
+                    title = stringResource(R.string.pref_clear_manga_database),
+                    subtitle = stringResource(R.string.pref_clear_manga_database_summary),
                     onClick = { navigator.push(ClearDatabaseScreen()) },
                 ),
                 Preference.PreferenceItem.TextPreference(
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
index 7f98ade71..632bbf0fc 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
@@ -51,7 +51,7 @@ object SettingsBrowseScreen : SearchableSettings {
                     ),
                     Preference.PreferenceItem.SwitchPreference(
                         pref = sourcePreferences.searchPinnedMangaSourcesOnly(),
-                        title = stringResource(R.string.pref_search_pinned_sources_only),
+                        title = stringResource(R.string.pref_search_pinned_manga_sources_only),
                     ),
                 ),
             ),
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
index 97ee8d619..8bf3d4d50 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
@@ -200,7 +200,7 @@ object SettingsDownloadScreen : SearchableSettings {
     ): Preference.PreferenceItem.MultiSelectListPreference {
         return Preference.PreferenceItem.MultiSelectListPreference(
             pref = downloadPreferences.removeExcludeCategories(),
-            title = stringResource(R.string.pref_remove_exclude_categories),
+            title = stringResource(R.string.pref_remove_exclude_categories_manga),
             entries = categories().associate { it.id.toString() to it.visualName },
         )
     }
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
index 6cca63e34..48080730a 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
@@ -197,7 +197,7 @@ object SettingsLibraryScreen : SearchableSettings {
                 ),
                 Preference.PreferenceItem.ListPreference(
                     pref = libraryPreferences.defaultMangaCategory(),
-                    title = stringResource(R.string.default_category),
+                    title = stringResource(R.string.default_manga_category),
                     subtitle = selectedCategory?.visualName ?: stringResource(R.string.default_category_summary),
                     entries = mangaIds.zip(mangaLabels).toMap(),
                 ),
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
index e7760581c..6f569bd3e 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
@@ -1,7 +1,6 @@
 package eu.kanade.presentation.more.settings.screen
 
 import android.content.pm.ActivityInfo
-import android.content.pm.PackageManager
 import android.os.Build
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Box
@@ -42,8 +41,9 @@ object SettingsPlayerScreen : SearchableSettings {
     override fun getPreferences(): List<Preference> {
         val playerPreferences = remember { Injekt.get<PlayerPreferences>() }
         val basePreferences = remember { Injekt.get<BasePreferences>() }
+        val deviceSupportsPip = basePreferences.deviceHasPip()
 
-        return listOf(
+        return listOfNotNull(
             Preference.PreferenceItem.ListPreference(
                 pref = playerPreferences.progressPreference(),
                 title = stringResource(R.string.pref_progress_mark_as_seen),
@@ -61,13 +61,74 @@ object SettingsPlayerScreen : SearchableSettings {
                 pref = playerPreferences.preserveWatchingPosition(),
                 title = stringResource(R.string.pref_preserve_watching_position),
             ),
+            getInternalPlayerGroup(playerPreferences = playerPreferences),
+            getVolumeAndBrightnessGroup(playerPreferences = playerPreferences),
             getOrientationGroup(playerPreferences = playerPreferences),
-            getInternalPlayerGroup(playerPreferences = playerPreferences, basePreferences = basePreferences),
-            getAniskipGroup(playerPreferences = playerPreferences),
+            getSeekingGroup(playerPreferences = playerPreferences),
+            if (deviceSupportsPip) getPipGroup(playerPreferences = playerPreferences) else null,
             getExternalPlayerGroup(playerPreferences = playerPreferences, basePreferences = basePreferences),
         )
     }
 
+    @Composable
+    private fun getInternalPlayerGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
+        val scope = rememberCoroutineScope()
+        val playerFullscreen = playerPreferences.playerFullscreen()
+        val playerHideControls = playerPreferences.hideControls()
+        val mpvConf = playerPreferences.mpvConf()
+
+        return Preference.PreferenceGroup(
+            title = stringResource(R.string.pref_category_internal_player),
+            preferenceItems = listOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = playerFullscreen,
+                    title = stringResource(R.string.pref_player_fullscreen),
+                    enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P,
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = playerHideControls,
+                    title = stringResource(R.string.pref_player_hide_controls),
+                ),
+                Preference.PreferenceItem.MultiLineEditTextPreference(
+                    pref = mpvConf,
+                    title = stringResource(R.string.pref_mpv_conf),
+                    subtitle = mpvConf.asState(scope).value
+                        .lines().take(2)
+                        .joinToString(
+                            separator = "\n",
+                            postfix = if (mpvConf.asState(scope).value.lines().size > 2) "\n..." else "",
+                        ),
+
+                ),
+            ),
+        )
+    }
+
+    @Composable
+    private fun getVolumeAndBrightnessGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
+        val enableVolumeBrightnessGestures = playerPreferences.gestureVolumeBrightness()
+        val rememberPlayerBrightness = playerPreferences.rememberPlayerBrightness()
+        val rememberPlayerVolume = playerPreferences.rememberPlayerVolume()
+
+        return Preference.PreferenceGroup(
+            title = stringResource(R.string.pref_category_volume_brightness),
+            preferenceItems = listOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = enableVolumeBrightnessGestures,
+                    title = stringResource(R.string.enable_volume_brightness_gestures),
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = rememberPlayerBrightness,
+                    title = stringResource(R.string.pref_remember_brightness),
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = rememberPlayerVolume,
+                    title = stringResource(R.string.pref_remember_volume),
+                ),
+            ),
+        )
+    }
+
     @Composable
     private fun getOrientationGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
         val defaultPlayerOrientationType = playerPreferences.defaultPlayerOrientationType()
@@ -118,21 +179,12 @@ object SettingsPlayerScreen : SearchableSettings {
     }
 
     @Composable
-    private fun getInternalPlayerGroup(playerPreferences: PlayerPreferences, basePreferences: BasePreferences): Preference.PreferenceGroup {
+    private fun getSeekingGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
         val scope = rememberCoroutineScope()
+        val enableHorizontalSeekGesture = playerPreferences.gestureHorizontalSeek()
         val defaultSkipIntroLength by playerPreferences.defaultIntroLength().stateIn(scope).collectAsState()
         val skipLengthPreference = playerPreferences.skipLengthPreference()
         val playerSmoothSeek = playerPreferences.playerSmoothSeek()
-        val playerFullscreen = playerPreferences.playerFullscreen()
-        val playerHideControls = playerPreferences.hideControls()
-        val pipEpisodeToasts = playerPreferences.pipEpisodeToasts()
-        val pipOnExit = playerPreferences.pipOnExit()
-        val rememberPlayerBrightness = playerPreferences.rememberPlayerBrightness()
-        val rememberPlayerVolume = playerPreferences.rememberPlayerVolume()
-        val mpvConf = playerPreferences.mpvConf()
-
-        val deviceHasPip = basePreferences.context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) &&
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 
         var showDialog by rememberSaveable { mutableStateOf(false) }
         if (showDialog) {
@@ -146,9 +198,21 @@ object SettingsPlayerScreen : SearchableSettings {
             )
         }
 
+        // Aniskip
+        val enableAniSkip = playerPreferences.aniSkipEnabled()
+        val enableAutoAniSkip = playerPreferences.autoSkipAniSkip()
+        val enableNetflixAniSkip = playerPreferences.enableNetflixStyleAniSkip()
+        val waitingTimeAniSkip = playerPreferences.waitingTimeAniSkip()
+
+        val isAniSkipEnabled by enableAniSkip.collectAsState()
+
         return Preference.PreferenceGroup(
-            title = stringResource(R.string.pref_category_internal_player),
+            title = stringResource(R.string.pref_category_player_seeking),
             preferenceItems = listOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = enableHorizontalSeekGesture,
+                    title = stringResource(R.string.enable_horizontal_seek_gesture),
+                ),
                 Preference.PreferenceItem.TextPreference(
                     title = stringResource(R.string.pref_default_intro_length),
                     subtitle = "${defaultSkipIntroLength}s",
@@ -170,60 +234,9 @@ object SettingsPlayerScreen : SearchableSettings {
                     title = stringResource(R.string.pref_player_smooth_seek),
                     subtitle = stringResource(R.string.pref_player_smooth_seek_summary),
                 ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = playerFullscreen,
-                    title = stringResource(R.string.pref_player_fullscreen),
-                    enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P,
+                Preference.PreferenceItem.InfoPreference(
+                    title = stringResource(R.string.pref_category_player_aniskip_info),
                 ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = playerHideControls,
-                    title = stringResource(R.string.pref_player_hide_controls),
-                ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = pipEpisodeToasts,
-                    title = stringResource(R.string.pref_pip_episode_toasts),
-                    enabled = deviceHasPip,
-                ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = pipOnExit,
-                    title = stringResource(R.string.pref_pip_on_exit),
-                    enabled = deviceHasPip,
-                ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = rememberPlayerBrightness,
-                    title = stringResource(R.string.pref_remember_brightness),
-                ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = rememberPlayerVolume,
-                    title = stringResource(R.string.pref_remember_volume),
-                ),
-                Preference.PreferenceItem.MultiLineEditTextPreference(
-                    pref = mpvConf,
-                    title = stringResource(R.string.pref_mpv_conf),
-                    subtitle = mpvConf.asState(scope).value
-                        .lines().take(2)
-                        .joinToString(
-                            separator = "\n",
-                            postfix = if (mpvConf.asState(scope).value.lines().size > 2) "\n..." else "",
-                        ),
-
-                ),
-            ),
-        )
-    }
-
-    @Composable
-    private fun getAniskipGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
-        val enableAniSkip = playerPreferences.aniSkipEnabled()
-        val enableAutoAniSkip = playerPreferences.autoSkipAniSkip()
-        val enableNetflixAniSkip = playerPreferences.enableNetflixStyleAniSkip()
-        val waitingTimeAniSkip = playerPreferences.waitingTimeAniSkip()
-
-        val isAniSkipEnabled by enableAniSkip.collectAsState()
-
-        return Preference.PreferenceGroup(
-            title = stringResource(R.string.pref_category_player_aniskip),
-            preferenceItems = listOf(
                 Preference.PreferenceItem.SwitchPreference(
                     pref = enableAniSkip,
                     title = stringResource(R.string.pref_enable_aniskip),
@@ -249,6 +262,36 @@ object SettingsPlayerScreen : SearchableSettings {
                         9 to stringResource(R.string.pref_waiting_time_aniskip_9),
                         10 to stringResource(R.string.pref_waiting_time_aniskip_10),
                     ),
+                    enabled = isAniSkipEnabled,
+                ),
+            ),
+        )
+    }
+
+    @Composable
+    private fun getPipGroup(playerPreferences: PlayerPreferences): Preference.PreferenceGroup {
+        val enablePip = playerPreferences.enablePip()
+        val pipEpisodeToasts = playerPreferences.pipEpisodeToasts()
+        val pipOnExit = playerPreferences.pipOnExit()
+
+        val isPipEnabled by enablePip.collectAsState()
+
+        return Preference.PreferenceGroup(
+            title = stringResource(R.string.pref_category_pip),
+            preferenceItems = listOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = enablePip,
+                    title = stringResource(R.string.pref_enable_pip),
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = pipEpisodeToasts,
+                    title = stringResource(R.string.pref_pip_episode_toasts),
+                    enabled = isPipEnabled,
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = pipOnExit,
+                    title = stringResource(R.string.pref_pip_on_exit),
+                    enabled = isPipEnabled,
                 ),
             ),
         )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadCache.kt
index 0678c3447..04b1bdaf2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadCache.kt
@@ -101,9 +101,23 @@ class AnimeDownloadCache(
         episodeScanlator: String?,
         animeTitle: String,
         sourceId: Long,
+        skipCache: Boolean,
     ): Boolean {
-        val source = sourceManager.getOrStub(sourceId)
-        return provider.findEpisodeDir(episodeName, episodeScanlator, animeTitle, source) != null
+        if (skipCache) {
+            val source = sourceManager.getOrStub(sourceId)
+            return provider.findEpisodeDir(episodeName, episodeScanlator, animeTitle, source) != null
+        }
+
+        renewCache()
+
+        val sourceDir = rootDownloadsDir.sourceDirs[sourceId]
+        if (sourceDir != null) {
+            val animeDir = sourceDir.animeDirs[provider.getAnimeDirName(animeTitle)]
+            if (animeDir != null) {
+                return provider.getValidEpisodeDirNames(episodeName, episodeScanlator).any { it in animeDir.episodeDirs }
+            }
+        }
+        return false
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadManager.kt
index 82df9d5cd..d0406243d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadManager.kt
@@ -202,14 +202,16 @@ class AnimeDownloadManager(
      * @param episodeScanlator scanlator of the episode to query
      * @param animeTitle the title of the anime to query.
      * @param sourceId the id of the source of the episode.
+     * @param skipCache whether to skip the directory cache and check in the filesystem.
      */
     fun isEpisodeDownloaded(
         episodeName: String,
         episodeScanlator: String?,
         animeTitle: String,
         sourceId: Long,
+        skipCache: Boolean = false,
     ): Boolean {
-        return cache.isEpisodeDownloaded(episodeName, episodeScanlator, animeTitle, sourceId)
+        return cache.isEpisodeDownloaded(episodeName, episodeScanlator, animeTitle, sourceId, skipCache)
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadNotifier.kt
index eba90a080..812b58d11 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadNotifier.kt
@@ -92,10 +92,11 @@ internal class AnimeDownloadNotifier(private val context: Context) {
                 )
             }
 
-            val downloadingProgressText = context.getString(
-                R.string.episode_downloading_progress,
-                download.progress,
-            )
+            val downloadingProgressText = if (download.totalProgress == 0) {
+                context.getString(R.string.update_check_notification_download_in_progress)
+            } else {
+                context.getString(R.string.episode_downloading_progress, download.progress)
+            }
 
             if (preferences.hideNotificationContent().get()) {
                 setContentTitle(downloadingProgressText)
@@ -103,12 +104,15 @@ internal class AnimeDownloadNotifier(private val context: Context) {
             } else {
                 val title = download.anime.title.chop(15)
                 val quotedTitle = Pattern.quote(title)
-                val chapter = download.episode.name.replaceFirst("$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), "")
-                setContentTitle("$title - $chapter".chop(30))
+                val episode = download.episode.name.replaceFirst("$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), "")
+                setContentTitle("$title - $episode".chop(30))
                 setContentText(downloadingProgressText)
             }
-
-            setProgress(100, download.progress, false)
+            if (download.totalProgress == 0) {
+                setProgress(100, download.progress, true)
+            } else {
+                setProgress(100, download.progress, false)
+            }
             setOngoing(true)
 
             show(Notifications.ID_DOWNLOAD_EPISODE_PROGRESS)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
index 897835805..4f8c04f97 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
@@ -64,10 +64,10 @@ data class BrowseTab(
                 migrateMangaSourceTab(),
             ),
             startIndex = 2.takeIf { toExtensions },
-            searchQuery = mangaExtensionsQuery,
-            onChangeSearchQuery = mangaExtensionsScreenModel::search,
-            searchQueryAnime = animeExtensionsQuery,
-            onChangeSearchQueryAnime = animeExtensionsScreenModel::search,
+            mangaSearchQuery = mangaExtensionsQuery,
+            onChangeMangaSearchQuery = mangaExtensionsScreenModel::search,
+            animeSearchQuery = animeExtensionsQuery,
+            onChangeAnimeSearchQuery = animeExtensionsScreenModel::search,
             scrollable = true,
         )
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadHolder.kt
index 1fdc643c8..40e771595 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadHolder.kt
@@ -60,14 +60,23 @@ class AnimeDownloadHolder(private val view: View, val adapter: AnimeDownloadAdap
         if (binding.downloadProgress.max == 1) {
             binding.downloadProgress.max = 100
         }
-        binding.downloadProgress.setProgressCompat(download.totalProgress, true)
+        if (download.totalProgress == 0) {
+            binding.downloadProgress.isIndeterminate = true
+        } else {
+            binding.downloadProgress.isIndeterminate = false
+            binding.downloadProgress.setProgressCompat(download.totalProgress, true)
+        }
     }
 
     /**
      * Updates the text field of the number of downloaded pages.
      */
     fun notifyDownloadedPages() {
-        binding.downloadProgressText.text = view.context.getString(R.string.episode_download_progress, download.progress)
+        binding.downloadProgressText.text = if (download.totalProgress == 0) {
+            view.context.getString(R.string.update_check_notification_download_in_progress)
+        } else {
+            view.context.getString(R.string.episode_download_progress, download.progress)
+        }
     }
 
     override fun onItemReleased(position: Int) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt
index 44929cad1..18cef597d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt
@@ -5,6 +5,8 @@ import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter
 import androidx.compose.animation.graphics.vector.AnimatedImageVector
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import cafe.adriel.voyager.core.model.rememberScreenModel
@@ -47,9 +49,11 @@ data class HistoriesTab(
     override fun Content() {
         val context = LocalContext.current
         // Hoisted for history tab's search bar
-        val historyScreenModel = rememberScreenModel { MangaHistoryScreenModel() }
+        val mangaHistoryScreenModel = rememberScreenModel { MangaHistoryScreenModel() }
+        val mangaSearchQuery by mangaHistoryScreenModel.query.collectAsState()
 
         val animeHistoryScreenModel = rememberScreenModel { AnimeHistoryScreenModel() }
+        val animeSearchQuery by animeHistoryScreenModel.query.collectAsState()
 
         TabbedScreen(
             titleRes = R.string.label_recent_manga,
@@ -57,10 +61,10 @@ data class HistoriesTab(
                 animeHistoryTab(context, fromMore),
                 mangaHistoryTab(context, fromMore),
             ),
-            searchQuery = historyScreenModel.getSearchQuery,
-            onChangeSearchQuery = historyScreenModel::updateSearchQuery,
-            searchQueryAnime = animeHistoryScreenModel.getSearchQuery,
-            onChangeSearchQueryAnime = animeHistoryScreenModel::updateSearchQuery,
+            mangaSearchQuery = mangaSearchQuery,
+            onChangeMangaSearchQuery = mangaHistoryScreenModel::search,
+            animeSearchQuery = animeSearchQuery,
+            onChangeAnimeSearchQuery = animeHistoryScreenModel::search,
         )
 
         LaunchedEffect(Unit) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt
index 3ec7ce80e..f1b7d24c2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt
@@ -17,9 +17,12 @@ import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
@@ -39,21 +42,28 @@ class AnimeHistoryScreenModel(
     private val _events: Channel<Event> = Channel(Channel.UNLIMITED)
     val events: Flow<Event> = _events.receiveAsFlow()
 
+    private val _query: MutableStateFlow<String?> = MutableStateFlow(null)
+    val query: StateFlow<String?> = _query.asStateFlow()
+
     init {
         coroutineScope.launch {
-            state.map { it.searchQuery }
-                .distinctUntilChanged()
-                .flatMapLatest { query ->
-                    getHistory.subscribe(query ?: "")
-                        .distinctUntilChanged()
-                        .catch { error ->
-                            logcat(LogPriority.ERROR, error)
-                            _events.send(Event.InternalError)
-                        }
-                        .map { it.toAnimeHistoryUiModels() }
-                        .flowOn(Dispatchers.IO)
-                }
-                .collect { newList -> mutableState.update { it.copy(list = newList) } }
+            _query.collectLatest { query ->
+                getHistory.subscribe(query ?: "")
+                    .distinctUntilChanged()
+                    .catch { error ->
+                        logcat(LogPriority.ERROR, error)
+                        _events.send(Event.InternalError)
+                    }
+                    .map { it.toAnimeHistoryUiModels() }
+                    .flowOn(Dispatchers.IO)
+                    .collect { newList -> mutableState.update { it.copy(list = newList) } }
+            }
+        }
+    }
+
+    fun search(query: String?) {
+        coroutineScope.launchIO {
+            _query.emit(query)
         }
     }
 
@@ -105,12 +115,6 @@ class AnimeHistoryScreenModel(
         }
     }
 
-    val getSearchQuery = mutableState.value.searchQuery
-
-    fun updateSearchQuery(query: String?) {
-        mutableState.update { it.copy(searchQuery = query) }
-    }
-
     fun setDialog(dialog: Dialog?) {
         mutableState.update { it.copy(dialog = dialog) }
     }
@@ -129,7 +133,6 @@ class AnimeHistoryScreenModel(
 
 @Immutable
 data class AnimeHistoryState(
-    val searchQuery: String? = null,
     val list: List<AnimeHistoryUiModel>? = null,
     val dialog: AnimeHistoryScreenModel.Dialog? = null,
 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryTab.kt
index 92b393fdd..b52d8cc41 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryTab.kt
@@ -42,6 +42,7 @@ fun Screen.animeHistoryTab(
     val navigator = LocalNavigator.currentOrThrow
     val screenModel = rememberScreenModel { AnimeHistoryScreenModel() }
     val state by screenModel.state.collectAsState()
+    val searchQuery by screenModel.query.collectAsState()
 
     suspend fun openEpisode(context: Context, episode: Episode?) {
         val playerPreferences: PlayerPreferences by injectLazy()
@@ -67,6 +68,7 @@ fun Screen.animeHistoryTab(
             AnimeHistoryScreen(
                 state = state,
                 contentPadding = contentPadding,
+                searchQuery = searchQuery,
                 snackbarHostState = snackbarHostState,
                 onClickCover = { navigator.push(AnimeScreen(it)) },
                 onClickResume = screenModel::getNextEpisodeForAnime,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt
index f7b6c5864..1b052249c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt
@@ -17,9 +17,12 @@ import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
@@ -39,21 +42,28 @@ class MangaHistoryScreenModel(
     private val _events: Channel<Event> = Channel(Channel.UNLIMITED)
     val events: Flow<Event> = _events.receiveAsFlow()
 
+    private val _query: MutableStateFlow<String?> = MutableStateFlow(null)
+    val query: StateFlow<String?> = _query.asStateFlow()
+
     init {
         coroutineScope.launch {
-            state.map { it.searchQuery }
-                .distinctUntilChanged()
-                .flatMapLatest { query ->
-                    getHistory.subscribe(query ?: "")
-                        .distinctUntilChanged()
-                        .catch { error ->
-                            logcat(LogPriority.ERROR, error)
-                            _events.send(Event.InternalError)
-                        }
-                        .map { it.toHistoryUiModels() }
-                        .flowOn(Dispatchers.IO)
-                }
-                .collect { newList -> mutableState.update { it.copy(list = newList) } }
+            _query.collectLatest { query ->
+                getHistory.subscribe(query ?: "")
+                    .distinctUntilChanged()
+                    .catch { error ->
+                        logcat(LogPriority.ERROR, error)
+                        _events.send(Event.InternalError)
+                    }
+                    .map { it.toHistoryUiModels() }
+                    .flowOn(Dispatchers.IO)
+                    .collect { newList -> mutableState.update { it.copy(list = newList) } }
+            }
+        }
+    }
+
+    fun search(query: String?) {
+        coroutineScope.launchIO {
+            _query.emit(query)
         }
     }
 
@@ -105,12 +115,6 @@ class MangaHistoryScreenModel(
         }
     }
 
-    val getSearchQuery = mutableState.value.searchQuery
-
-    fun updateSearchQuery(query: String?) {
-        mutableState.update { it.copy(searchQuery = query) }
-    }
-
     fun setDialog(dialog: Dialog?) {
         mutableState.update { it.copy(dialog = dialog) }
     }
@@ -129,7 +133,6 @@ class MangaHistoryScreenModel(
 
 @Immutable
 data class HistoryState(
-    val searchQuery: String? = null,
     val list: List<MangaHistoryUiModel>? = null,
     val dialog: MangaHistoryScreenModel.Dialog? = null,
 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryTab.kt
index 8eef8e152..5aaddbeda 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryTab.kt
@@ -39,6 +39,7 @@ fun Screen.mangaHistoryTab(
     val navigator = LocalNavigator.currentOrThrow
     val screenModel = rememberScreenModel { MangaHistoryScreenModel() }
     val state by screenModel.state.collectAsState()
+    val searchQuery by screenModel.query.collectAsState()
 
     suspend fun openChapter(context: Context, chapter: Chapter?) {
         if (chapter != null) {
@@ -58,6 +59,7 @@ fun Screen.mangaHistoryTab(
             MangaHistoryScreen(
                 state = state,
                 contentPadding = contentPadding,
+                searchQuery = searchQuery,
                 snackbarHostState = snackbarHostState,
                 onClickCover = { navigator.push(MangaScreen(it)) },
                 onClickResume = screenModel::getNextChapterForManga,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsSheet.kt
index 51595fb5d..6d72b3faa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsSheet.kt
@@ -353,7 +353,7 @@ class MangaLibrarySettingsSheet(
         inner class BadgeGroup : Group {
             private val downloadBadge = Item.CheckboxGroup(R.string.action_display_download_badge, this)
             private val unreadBadge = Item.CheckboxGroup(R.string.action_display_unread_badge, this)
-            private val localBadge = Item.CheckboxGroup(R.string.action_display_local_badge, this)
+            private val localBadge = Item.CheckboxGroup(R.string.action_display_local_badge_manga, this)
             private val languageBadge = Item.CheckboxGroup(R.string.action_display_language_badge, this)
 
             override val header = Item.Header(R.string.badges_header)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkAnimeActivity.kt
similarity index 91%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkActivity.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkAnimeActivity.kt
index 1e381c09a..d9e7e4798 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkAnimeActivity.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 
-class DeepLinkActivity : Activity() {
+class DeepLinkAnimeActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkMangaActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkMangaActivity.kt
new file mode 100644
index 000000000..db2dc12c2
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkMangaActivity.kt
@@ -0,0 +1,19 @@
+package eu.kanade.tachiyomi.ui.main
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+
+class DeepLinkMangaActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        intent.apply {
+            flags = flags or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+            setClass(applicationContext, MainActivity::class.java)
+        }
+        startActivity(intent)
+        finish()
+    }
+}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index de85c66c2..68f0a2ed8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -76,6 +76,7 @@ import eu.kanade.tachiyomi.data.updater.AppUpdateResult
 import eu.kanade.tachiyomi.data.updater.RELEASE_URL
 import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.browse.anime.source.browse.BrowseAnimeSourceScreen
+import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.GlobalAnimeSearchScreen
 import eu.kanade.tachiyomi.ui.browse.manga.source.browse.BrowseMangaSourceScreen
 import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.GlobalMangaSearchScreen
 import eu.kanade.tachiyomi.ui.entries.anime.AnimeScreen
@@ -492,7 +493,7 @@ class MainActivity : BaseActivity() {
                 if (query != null && query.isNotEmpty()) {
                     val filter = intent.getStringExtra(INTENT_SEARCH_FILTER) ?: ""
                     navigator.popUntilRoot()
-                    navigator.push(GlobalMangaSearchScreen(query, filter))
+                    navigator.push(GlobalAnimeSearchScreen(query, filter))
                 }
             }
             else -> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/EpisodeLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/EpisodeLoader.kt
index 6d471507a..9136a171f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/EpisodeLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/EpisodeLoader.kt
@@ -22,7 +22,7 @@ class EpisodeLoader {
 
         fun getLinks(episode: Episode, anime: Anime, source: AnimeSource): Observable<List<Video>> {
             val downloadManager: AnimeDownloadManager = Injekt.get()
-            val isDownloaded = downloadManager.isEpisodeDownloaded(episode.name, episode.scanlator, anime.title, anime.source)
+            val isDownloaded = downloadManager.isEpisodeDownloaded(episode.name, episode.scanlator, anime.title, anime.source, skipCache = true)
             return when {
                 isDownloaded -> isDownloaded(episode, anime, source, downloadManager)
                 source is AnimeHttpSource -> isHttp(episode, source)
@@ -33,7 +33,7 @@ class EpisodeLoader {
 
         fun isDownloaded(episode: Episode, anime: Anime): Boolean {
             val downloadManager: AnimeDownloadManager = Injekt.get()
-            return downloadManager.isEpisodeDownloaded(episode.name, episode.scanlator, anime.title, anime.source)
+            return downloadManager.isEpisodeDownloaded(episode.name, episode.scanlator, anime.title, anime.source, skipCache = true)
         }
 
         fun getLink(episode: Episode, anime: Anime, source: AnimeSource): Observable<Video?> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt
index 3320e5e4b..a0d0347f6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt
@@ -79,6 +79,7 @@ class ExternalIntents {
                     episode.scanlator,
                     anime.title,
                     anime.source,
+                    skipCache = true,
                 )
             }
             if (isOnDevice && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && uri.scheme != "content") {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
index 6efc41dd0..0191cfd54 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
@@ -9,7 +9,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Color
@@ -46,6 +45,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import eu.kanade.domain.base.BasePreferences
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
@@ -76,7 +76,8 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import logcat.LogPriority
-import uy.kohesive.injekt.injectLazy
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.io.File
 import java.io.InputStream
 import kotlin.math.abs
@@ -97,9 +98,9 @@ class PlayerActivity :
         }
     }
 
-    private val playerPreferences: PlayerPreferences by injectLazy()
+    private val playerPreferences: PlayerPreferences = Injekt.get()
 
-    private val networkPreferences: NetworkPreferences by injectLazy()
+    private val networkPreferences: NetworkPreferences = Injekt.get()
 
     val viewModel by viewModels<PlayerViewModel>()
 
@@ -121,7 +122,8 @@ class PlayerActivity :
 
     private var isInPipMode: Boolean = false
     private var isPipStarted: Boolean = false
-    internal var deviceSupportsPip: Boolean = false
+    internal val isPipSupportedAndEnabled: Boolean
+        get() = Injekt.get<BasePreferences>().deviceHasPip() && playerPreferences.enablePip().get()
 
     internal var isDoubleTapSeeking: Boolean = false
 
@@ -308,8 +310,6 @@ class PlayerActivity :
         Utils.copyAssets(this)
         super.onCreate(savedInstanceState)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) deviceSupportsPip = packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-
         binding = PlayerActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
         this@PlayerActivity.requestedOrientation = playerPreferences.defaultPlayerOrientationType().get()
@@ -511,7 +511,7 @@ class PlayerActivity :
             }
             setupGestures()
             setViewMode()
-            if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) player.paused?.let { updatePictureInPictureActions(!it) }
+            if (isPipSupportedAndEnabled) player.paused?.let { updatePictureInPictureActions(!it) }
         }
     }
 
@@ -1205,7 +1205,7 @@ class PlayerActivity :
     }
 
     private fun updatePlaybackStatus(paused: Boolean) {
-        if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPipMode) updatePictureInPictureActions(!paused)
+        if (isPipSupportedAndEnabled && isInPipMode) updatePictureInPictureActions(!paused)
         val r = if (paused) R.drawable.ic_play_arrow_72dp else R.drawable.ic_pause_72dp
         playerControls.binding.playBtn.setImageResource(r)
 
@@ -1233,7 +1233,7 @@ class PlayerActivity :
     @Suppress("DEPRECATION")
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
-        if (deviceSupportsPip) {
+        if (isPipSupportedAndEnabled) {
             if (player.paused == false && playerPreferences.pipOnExit().get()) {
                 startPiP()
             } else {
@@ -1256,7 +1256,7 @@ class PlayerActivity :
         if (!playerIsDestroyed) {
             player.paused = true
         }
-        if (deviceSupportsPip && isInPipMode && powerManager.isInteractive) {
+        if (isPipSupportedAndEnabled && isInPipMode && powerManager.isInteractive) {
             finishAndRemoveTask()
         }
 
@@ -1266,7 +1266,7 @@ class PlayerActivity :
     override fun onResume() {
         super.onResume()
         setVisibilities()
-        if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPipMode) player.paused?.let { updatePictureInPictureActions(!it) }
+        if (isPipSupportedAndEnabled && isInPipMode) player.paused?.let { updatePictureInPictureActions(!it) }
     }
 
     @Suppress("DEPRECATION")
@@ -1317,7 +1317,7 @@ class PlayerActivity :
     @Suppress("DEPRECATION")
     fun startPiP() {
         if (isInPipMode) return
-        if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (isPipSupportedAndEnabled) {
             isPipStarted = true
             playerControls.hideControls(true)
             player.paused?.let { updatePictureInPictureActions(!it) }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
index a0c652de4..13c3e2721 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
@@ -158,7 +158,7 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
 
         binding.pipBtn.setOnClickListener { activity.startPiP() }
 
-        binding.pipBtn.isVisible = !playerPreferences.pipOnExit().get() && activity.deviceSupportsPip
+        binding.pipBtn.isVisible = !playerPreferences.pipOnExit().get() && activity.isPipSupportedAndEnabled
 
         binding.controlsSkipIntroBtn.setOnLongClickListener { skipIntroLengthDialog(); true }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
index 3153668f1..a945202e1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
@@ -8,6 +8,8 @@ class PlayerPreferences(
 ) {
     fun preserveWatchingPosition() = preferenceStore.getBoolean("pref_preserve_watching_position", false)
 
+    fun enablePip() = preferenceStore.getBoolean("pref_enable_pip", true)
+
     fun pipEpisodeToasts() = preferenceStore.getBoolean("pref_pip_episode_toasts", true)
 
     fun pipOnExit() = preferenceStore.getBoolean("pref_pip_on_exit", false)
diff --git a/app/src/main/res/layout/player_options_sheet.xml b/app/src/main/res/layout/player_options_sheet.xml
index 5c1c6b9a7..25368d08c 100644
--- a/app/src/main/res/layout/player_options_sheet.xml
+++ b/app/src/main/res/layout/player_options_sheet.xml
@@ -82,7 +82,7 @@
             android:layout_height="56dp"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:text="@string/toggle_volume_brightness_gestures"
+            android:text="@string/enable_volume_brightness_gestures"
             android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -91,7 +91,7 @@
             android:layout_height="56dp"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:text="@string/toggle_horizontal_seek_gesture"
+            android:text="@string/enable_horizontal_seek_gesture"
             android:textColor="?android:attr/textColorSecondary" />
 
         <!-- Stats preferences -->
diff --git a/i18n/src/main/res/values-am/strings-aniyomi.xml b/i18n/src/main/res/values-am/strings-aniyomi.xml
index 08772b386..d878431bc 100644
--- a/i18n/src/main/res/values-am/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-am/strings-aniyomi.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="manga_categories">የማንጋ ምድቦች</string>
     <string name="unlock_app">ታቺዮሚን ይክፈቱ</string>
-    <string name="default_category">ነባሪ ምድብ</string>
+    <string name="default_manga_category">ነባሪ ምድብ</string>
     <string name="untrusted_extension_message">ይህ ቅጥያ ባልታመነ የእውቅና ማረጋገጫ ተፈርሟል እና አልነቃም።
 \n
 \nተንኮል አዘል ቅጥያ በአኒዮሚ ውስጥ የተከማቸውን ማንኛውንም የሚስጥር ማስረጃዎችን በማንበብ ወይም ያልተፈለገ ስራ ሊፈጽም ይችላል ፡፡
diff --git a/i18n/src/main/res/values-ar/strings-aniyomi.xml b/i18n/src/main/res/values-ar/strings-aniyomi.xml
index 05a2104bf..d8a131424 100644
--- a/i18n/src/main/res/values-ar/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ar/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">افتح Aniyomi</string>
     <string name="action_sort_last_manga_update">آخر تحديث للمانجا</string>
     <string name="action_show_manga">عرض المانجا</string>
-    <string name="action_display_local_badge">المانجا المحلية</string>
+    <string name="action_display_local_badge_manga">المانجا المحلية</string>
     <string name="pref_update_only_completely_read">مع فصل (فصول) غير مقروءة / حلقة (حلقات) غير مشاهدة</string>
     <string name="pref_library_update_show_tab_badge">إظهار عدد الغير مقروء/ الغير مشاهد على أيقونة التحديثات</string>
-    <string name="default_category">فئة المانغا الإفتراضية</string>
+    <string name="default_manga_category">فئة المانغا الإفتراضية</string>
     <string name="pref_manga_library_update_categories_details">المانجا في الفئات المستبعدة لن يتم تحديثها حتى وإن كانت أيضا في الفئات المضمنة.</string>
     <string name="untrusted_extension_message">هذه اﻹضافة موقعة بشهادة غير موثوق بها ولم يتم تفعيلها.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">بعد وضع علامة \"مقروءة\" يدوياً</string>
     <string name="pref_remove_after_read">الحذف تلقائيا بعد القراءة</string>
     <string name="pref_remove_bookmarked_chapters">حذف الفصول ذات العلامة المرجعية</string>
-    <string name="pref_remove_exclude_categories">فئات المستثناة</string>
+    <string name="pref_remove_exclude_categories_manga">فئات المستثناة</string>
     <string name="pref_auto_update_manga_sync">تحديث تقدّم الفصول بعد القراءة</string>
     <string name="pref_clear_chapter_cache">مسح الذاكرة المؤقتة للفصول</string>
     <string name="pref_auto_clear_chapter_cache">تنظيف ملفات التخزين المؤقت عند إغلاق التطبيق</string>
-    <string name="pref_clear_database">تنظيف قاعدة البيانات</string>
-    <string name="pref_clear_database_summary">حذف سجل المانجا التي لم يتم حفظها في مكتبتك</string>
+    <string name="pref_clear_manga_database">تنظيف قاعدة البيانات</string>
+    <string name="pref_clear_manga_database_summary">حذف سجل المانجا التي لم يتم حفظها في مكتبتك</string>
     <string name="clear_database_confirmation">هل أنت متأكد؟ الفصول المقروءة ومستوى التقدم للمانجا الغير الموجودة في مكتبتك سيتم فقده</string>
     <string name="pref_refresh_library_tracking_summary">تحديث الحالة، والتقييم، وآخر فصل: عن طريق خدمات التتبع</string>
     <string name="pref_incognito_mode_summary">إيقاف سجل القراءة</string>
@@ -81,7 +81,7 @@
     <string name="action_screen_fit">وضع \"ملاءمة الشاشة\"</string>
     <string name="pref_category_external_downloader">برنامج التحميل الخارجي</string>
     <string name="pref_bottom_nav_style">نمط شريط التنقل السفلي</string>
-    <string name="pref_category_player_aniskip">إعدادات AniSkip</string>
+    <string name="pref_category_player_aniskip_info">إعدادات AniSkip</string>
     <string name="local_anime_source">مصادر الأنمي المحلية</string>
     <string name="pref_external_player_preference">تفضيل مشغل الوسائط الخارجي</string>
     <string name="used_cache_both">مستخدم بواسطة الأنمي: %1$s، مستخدم بواسطة المانغا: %2$s</string>
@@ -120,7 +120,6 @@
     <string name="delete_downloads_for_anime">حذف الحلقات المحملة؟</string>
     <string name="action_play_internally">تشغيل داخليا</string>
     <string name="action_sort_latest_episode">أحدث حلقة</string>
-    <string name="pref_remove_exclude_categories_prefix">مانغا:</string>
     <string name="no_next_episode">الحلقة التالية غير موجودة!</string>
     <string name="rotation_sensor_portrait">المستشعر الرأسي</string>
     <string name="share_screenshot_info">%1$s: %2$s، %3$s</string>
@@ -211,8 +210,8 @@
     <string name="stats_page_3">الصفحة 3</string>
     <string name="toggle_stats">تبديل الإحصائيات</string>
     <string name="stats_header">عرض الإحصائيات</string>
-    <string name="toggle_horizontal_seek_gesture">تبديل إيماءة البحث الأفقية</string>
-    <string name="toggle_volume_brightness_gestures">تفعيل إيماءات الصوت والسطوع</string>
+    <string name="enable_horizontal_seek_gesture">تبديل إيماءة البحث الأفقية</string>
+    <string name="enable_volume_brightness_gestures">تفعيل إيماءات الصوت والسطوع</string>
     <string name="screenshot_header">خد لقطة للشاشة</string>
     <string name="episode_progress_no_total">التقدم: %1$s</string>
     <string name="dialog_with_checkbox_remove_description_anime">سيؤدي ذلك إلى إزالة تاريخ مشاهدة هذه الحلقة. هل أنت متأكد؟</string>
diff --git a/i18n/src/main/res/values-b+es+419/strings-aniyomi.xml b/i18n/src/main/res/values-b+es+419/strings-aniyomi.xml
index 7b4f68f58..ddd071aed 100644
--- a/i18n/src/main/res/values-b+es+419/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-b+es+419/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Desbloquear Aniyomi</string>
     <string name="action_sort_last_manga_update">Última actualización de manga</string>
     <string name="action_show_manga">Mostrar manga</string>
-    <string name="action_display_local_badge">Mangas locales</string>
+    <string name="action_display_local_badge_manga">Mangas locales</string>
     <string name="pref_update_only_completely_read">Con capitulo(s) sin leer</string>
     <string name="pref_library_update_show_tab_badge">Mostrar número de no leidos en el icono de actualización</string>
-    <string name="default_category">Categoría por defecto</string>
+    <string name="default_manga_category">Categoría por defecto</string>
     <string name="pref_manga_library_update_categories_details">Los manga en las categorías excluidas no se actualizarán aún cuando estén en las categorías incluidas.</string>
     <string name="untrusted_extension_message">Esta extensión fue firmada por una fuente no certificada y no fue activada.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Después de marcar como leído manualmente</string>
     <string name="pref_remove_after_read">Borrar automáticamente después de leer</string>
     <string name="pref_remove_bookmarked_chapters">Permitir el borrado de capítulos en favoritos</string>
-    <string name="pref_remove_exclude_categories">Categorías excluidas</string>
+    <string name="pref_remove_exclude_categories_manga">Categorías excluidas</string>
     <string name="pref_auto_update_manga_sync">Actualizar el progreso después de leer</string>
     <string name="pref_clear_chapter_cache">Borrar caché de los capítulos</string>
     <string name="pref_auto_clear_chapter_cache">Borrar la caché de capítulos al cerrar la aplicación</string>
-    <string name="pref_clear_database">Borrar base de datos</string>
-    <string name="pref_clear_database_summary">Borrar el historial de mangas que no están guardados en la biblioteca</string>
+    <string name="pref_clear_manga_database">Borrar base de datos</string>
+    <string name="pref_clear_manga_database_summary">Borrar el historial de mangas que no están guardados en la biblioteca</string>
     <string name="clear_database_confirmation">¿Estas seguro\? Los capítulos leídos y el progreso de los mangas que no estén en la biblioteca se perderán</string>
     <string name="pref_refresh_library_tracking_summary">Actualizar estado, puntuación y último capítulo leído en los servicios de seguimiento</string>
     <string name="pref_incognito_mode_summary">Pausar historial de lectura</string>
diff --git a/i18n/src/main/res/values-be/strings-aniyomi.xml b/i18n/src/main/res/values-be/strings-aniyomi.xml
index ba88043dc..2e57d4ec7 100644
--- a/i18n/src/main/res/values-be/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-be/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Разблакіраваць Aniyomi</string>
     <string name="action_sort_last_manga_update">Апошняе абнаўленне мангі</string>
     <string name="action_show_manga">Паказаць мангу</string>
-    <string name="action_display_local_badge">Значкі лакальных</string>
+    <string name="action_display_local_badge_manga">Значкі лакальных</string>
     <string name="pref_update_only_completely_read">Ёсць непрачытаныя главы</string>
     <string name="pref_library_update_show_tab_badge">Паказваць непрачытаныя главы ў укладцы \"Абнаўленні\"</string>
-    <string name="default_category">Катэгорыя па змаўчанні</string>
+    <string name="default_manga_category">Катэгорыя па змаўчанні</string>
     <string name="pref_manga_library_update_categories_details">Манга ў выключаных катэгорыях не будзе абнаўляцца, нават калі яны таксама знаходзяцца ў уключаных катэгорыях.</string>
     <string name="untrusted_extension_message">Гэта пашырэнне было падпісана ненадзейным сертыфікатам і не было актывавана.
 \n
diff --git a/i18n/src/main/res/values-bg/strings-aniyomi.xml b/i18n/src/main/res/values-bg/strings-aniyomi.xml
index c67fc4ea8..c5e6c6203 100644
--- a/i18n/src/main/res/values-bg/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-bg/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Отключете Тачийоми</string>
     <string name="action_sort_last_manga_update">Последно обновяване</string>
     <string name="action_show_manga">Покажи манга</string>
-    <string name="action_display_local_badge">Локална манга</string>
+    <string name="action_display_local_badge_manga">Локална манга</string>
     <string name="pref_update_only_completely_read">С непрочетени глави</string>
     <string name="pref_library_update_show_tab_badge">Покажи броя на непрочетените в иконата за ъпдейти</string>
-    <string name="default_category">Категория по подразбиране</string>
+    <string name="default_manga_category">Категория по подразбиране</string>
     <string name="pref_manga_library_update_categories_details">Манга в изключените категории няма да бъде обновявана дори ако се намира във включените категории.</string>
     <string name="untrusted_extension_message">Следното разширение имаше непотвърден сертификат и не беше активирано.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">След маркиране като прочетено</string>
     <string name="pref_remove_after_read">След прочитане автоматично изтрийте</string>
     <string name="pref_remove_bookmarked_chapters">Позволи изтриване на отметнати глави</string>
-    <string name="pref_remove_exclude_categories">Изключени категории</string>
+    <string name="pref_remove_exclude_categories_manga">Изключени категории</string>
     <string name="pref_auto_update_manga_sync">Обнови прогреса след прочитане</string>
     <string name="pref_clear_chapter_cache">Изчисти кеша на главите</string>
     <string name="pref_auto_clear_chapter_cache">Изчистване на кеша на главата при затваряне на приложението</string>
-    <string name="pref_clear_database">Изчисти базата данни</string>
-    <string name="pref_clear_database_summary">Изтрий историята на манги, които не са запазени в библиотеката</string>
+    <string name="pref_clear_manga_database">Изчисти базата данни</string>
+    <string name="pref_clear_manga_database_summary">Изтрий историята на манги, които не са запазени в библиотеката</string>
     <string name="clear_database_confirmation">Сигурни ли сте\? Прочетените глави и напредъкът на манги, които не са в библиотеката Ви, ще бъдат изгубени</string>
     <string name="pref_refresh_library_tracking_summary">Обновява статус, оценка и последно прочетена глава от услугите за проследяване</string>
     <string name="pref_incognito_mode_summary">Не записва история, докато трае режимът</string>
diff --git a/i18n/src/main/res/values-bn/strings-aniyomi.xml b/i18n/src/main/res/values-bn/strings-aniyomi.xml
index 8a5929fa2..c7e6acda4 100644
--- a/i18n/src/main/res/values-bn/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-bn/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">তাচিওমি খুলুন</string>
     <string name="action_sort_last_manga_update">সর্বশেষ হালনাগাদ চেক</string>
     <string name="action_show_manga">মাঙ্গা দেখান</string>
-    <string name="action_display_local_badge">স্থানীয় মাঙ্গা</string>
+    <string name="action_display_local_badge_manga">স্থানীয় মাঙ্গা</string>
     <string name="pref_update_only_completely_read">অপঠিত অধ্যায়সহ</string>
     <string name="pref_library_update_show_tab_badge">অপঠিত গণনা আপডেট আইকন এ দেখাও</string>
-    <string name="default_category">সাধারণ বিভাগ</string>
+    <string name="default_manga_category">সাধারণ বিভাগ</string>
     <string name="pref_manga_library_update_categories_details">বাদ দেওয়া ক্যাটাগরিতে মঙ্গা আপডেট করা হবে না যদিও সেগুলি অন্তর্ভুক্ত ক্যাটাগরিতেও থাকে।</string>
     <string name="untrusted_extension_message">এই এক্সটেনশনটি একটি অবিশ্বস্ত সার্টিফিকেট দিয়ে স্বাক্ষরিত হয়েছিল এবং সক্রিয় করা হয়নি।
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">পঠিত হিসেবে চিহ্নিত করার পর</string>
     <string name="pref_remove_after_read">পড়ার পর স্বয়ংক্রিয়ভাবে</string>
     <string name="pref_remove_bookmarked_chapters">বুকমার্ক করা অধ্যায়গুলি মুছে ফেলার অনুমতি দিন</string>
-    <string name="pref_remove_exclude_categories">বর্জিত বিভাগ গুলি</string>
+    <string name="pref_remove_exclude_categories_manga">বর্জিত বিভাগ গুলি</string>
     <string name="pref_auto_update_manga_sync">পড়ার পরে অগ্রগতি আপডেট করুন</string>
     <string name="pref_clear_chapter_cache">অধ্যায়ের ক্যাচি পরিষ্কার করুন</string>
     <string name="pref_auto_clear_chapter_cache">অ্যাপ বন্দ্ধ করার সময় অধ্যায়ের ক্যাশে পরিষ্কার করুন</string>
-    <string name="pref_clear_database">ডাটাবেজ পরিষ্কার করুন</string>
-    <string name="pref_clear_database_summary">আপনার সংগ্রহশালাতে যেসব মাংগা সংরক্ষিত নেই সেগুলোর ইতিহাস মুছে ফেলুন</string>
+    <string name="pref_clear_manga_database">ডাটাবেজ পরিষ্কার করুন</string>
+    <string name="pref_clear_manga_database_summary">আপনার সংগ্রহশালাতে যেসব মাংগা সংরক্ষিত নেই সেগুলোর ইতিহাস মুছে ফেলুন</string>
     <string name="clear_database_confirmation">আপনি কি নিশ্চিত\? পঠিত অধ্যায় এবং সংগ্রহশালাতে অনুপস্থিত মাংগার অগ্রগতি মুছে যাবে</string>
     <string name="pref_refresh_library_tracking_summary">ট্র্যাকিং পরিষেবাগুলি অবস্থা, স্কোর এবং শেষ পড়া অধ্যায় হালনাগাদ করে</string>
     <string name="pref_incognito_mode_summary">পড়ার ইতিহাসে বিরতি দেয়</string>
diff --git a/i18n/src/main/res/values-ca/strings-aniyomi.xml b/i18n/src/main/res/values-ca/strings-aniyomi.xml
index 201b4f4e8..5da29a593 100644
--- a/i18n/src/main/res/values-ca/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ca/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Desbloca Aniyomi</string>
     <string name="action_sort_last_manga_update">Darrera comprovació d\'actualitzacions</string>
     <string name="action_show_manga">Mostra l\'element</string>
-    <string name="action_display_local_badge">Font local</string>
+    <string name="action_display_local_badge_manga">Font local</string>
     <string name="pref_update_only_completely_read">Amb capítols no llegits</string>
     <string name="pref_library_update_show_tab_badge">Mostra el comptador de no llegits a la icona d\'actualitzacions</string>
-    <string name="default_category">Categoria per defecte</string>
+    <string name="default_manga_category">Categoria per defecte</string>
     <string name="pref_manga_library_update_categories_details">Els elements de les categories excloses no s\'actualitzaran encara que també siguin a les categories incloses.</string>
     <string name="untrusted_extension_message">Aquesta extensió s\'ha signat amb un certificat que no és de confiança i no s\'ha activat.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Després de marcar com a llegit de manera manual</string>
     <string name="pref_remove_after_read">Suprimeix automàticament després de llegir</string>
     <string name="pref_remove_bookmarked_chapters">Permet la supressió dels capítols marcats</string>
-    <string name="pref_remove_exclude_categories">Categories excloses</string>
+    <string name="pref_remove_exclude_categories_manga">Categories excloses</string>
     <string name="pref_auto_update_manga_sync">Actualitza el progrés després de llegir</string>
     <string name="pref_clear_chapter_cache">Buida la memòria cau de capítols</string>
     <string name="pref_auto_clear_chapter_cache">Buida la memòria cau de capítols en tancar l\'aplicació</string>
-    <string name="pref_clear_database">Buida la base de dades</string>
-    <string name="pref_clear_database_summary">Suprimeix l\'historial dels elements que no siguin a la biblioteca</string>
+    <string name="pref_clear_manga_database">Buida la base de dades</string>
+    <string name="pref_clear_manga_database_summary">Suprimeix l\'historial dels elements que no siguin a la biblioteca</string>
     <string name="clear_database_confirmation">N\'esteu segur\? Es perdrà el progrés i els capítols llegits dels elements que no siguin a la biblioteca</string>
     <string name="pref_refresh_library_tracking_summary">Actualitza l\'estat, la puntuació i el darrer capítol llegit dels serveis de seguiment</string>
     <string name="pref_incognito_mode_summary">Pausa l\'historial de lectura</string>
diff --git a/i18n/src/main/res/values-ceb/strings-aniyomi.xml b/i18n/src/main/res/values-ceb/strings-aniyomi.xml
index 6082123a5..f952fbbc4 100644
--- a/i18n/src/main/res/values-ceb/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ceb/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">I-unlock ang Tachiyomi</string>
     <string name="action_sort_last_manga_update">Katapusan nga update sa manga</string>
     <string name="action_show_manga">Ipakita ang manga</string>
-    <string name="action_display_local_badge">Lokal nga manga</string>
+    <string name="action_display_local_badge_manga">Lokal nga manga</string>
     <string name="pref_update_only_completely_read">Uban sa wala pa mabasa nga (mga) kapitulo</string>
     <string name="pref_library_update_show_tab_badge">Ipakita ang wala pa mabasa nga ihap sa icon sa Updates</string>
-    <string name="default_category">Default nga kategorya</string>
+    <string name="default_manga_category">Default nga kategorya</string>
     <string name="pref_manga_library_update_categories_details">Ang manga sa wala iapil nga mga kategorya dili ma-update bisan kung naa usab sila sa mga gilakip nga kategorya.</string>
     <string name="untrusted_extension_message">Kini nga extension gipirmahan gamit ang dili kasaligan nga sertipiko ug wala gi-aktibo.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Human gimarkahan sa mano-mano ingon nabasa na</string>
     <string name="pref_remove_after_read">Human sa pagbasa awtomatikong tangtangon</string>
     <string name="pref_remove_bookmarked_chapters">Tugoti ang pagtangtang sa gimarkahan nga mga kapitulo</string>
-    <string name="pref_remove_exclude_categories">Wala iapil nga mga kategorya</string>
+    <string name="pref_remove_exclude_categories_manga">Wala iapil nga mga kategorya</string>
     <string name="pref_auto_update_manga_sync">Ang pag-uswag sa pag-update pagkahuman sa pagbasa</string>
     <string name="pref_clear_chapter_cache">Hawani ang cache sa kapitulo</string>
     <string name="pref_auto_clear_chapter_cache">Hawani ang cache sa kapitulo sa pagsira sa app</string>
-    <string name="pref_clear_database">Klaro nga database</string>
-    <string name="pref_clear_database_summary">I-delete ang history para sa manga nga wala ma-save sa imong library</string>
+    <string name="pref_clear_manga_database">Klaro nga database</string>
+    <string name="pref_clear_manga_database_summary">I-delete ang history para sa manga nga wala ma-save sa imong library</string>
     <string name="clear_database_confirmation">Sigurado ka\? Basaha ang mga kapitulo ug ang pag-uswag sa dili librarya nga manga mawala</string>
     <string name="pref_refresh_library_tracking_summary">Mga update sa status, score ug katapusang kapitulo nga gibasa gikan sa mga serbisyo sa pagsubay</string>
     <string name="pref_incognito_mode_summary">Paghunong sa pagbasa sa kasaysayan</string>
diff --git a/i18n/src/main/res/values-cs/strings-aniyomi.xml b/i18n/src/main/res/values-cs/strings-aniyomi.xml
index a1803a00b..2f6f6ebb5 100644
--- a/i18n/src/main/res/values-cs/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-cs/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Odemknout Aniyomi</string>
     <string name="action_sort_last_manga_update">Poslední kontrola aktualizace</string>
     <string name="action_show_manga">Zobrazit položku</string>
-    <string name="action_display_local_badge">Lokální zdroj</string>
+    <string name="action_display_local_badge_manga">Lokální zdroj</string>
     <string name="pref_update_only_completely_read">S nepřečtenými kapitolami</string>
     <string name="pref_library_update_show_tab_badge">Zobrazit počet nepřečtených kapitol na ikoně Aktualizace</string>
-    <string name="default_category">Výchozí kategorie mangy</string>
+    <string name="default_manga_category">Výchozí kategorie mangy</string>
     <string name="pref_manga_library_update_categories_details">Položky ve vynechaných kategoriích nebudou aktualizovány, i kdyby byly také v zahrnutých kategoriích.</string>
     <string name="untrusted_extension_message">Toto rozšíření bylo podepsané nedůvěryhodným certifikátem a nebylo aktivované.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Po ručním označení jako přečtené</string>
     <string name="pref_remove_after_read">Po přečtení automaticky smazat</string>
     <string name="pref_remove_bookmarked_chapters">Povolení mazání kapitol se záložkami</string>
-    <string name="pref_remove_exclude_categories">Vyloučené manga kategorie</string>
+    <string name="pref_remove_exclude_categories_manga">Vyloučené manga kategorie</string>
     <string name="pref_auto_update_manga_sync">Aktualizovat počet kapitol po přečtení</string>
     <string name="pref_clear_chapter_cache">Vymazat mezipaměť kapitol</string>
     <string name="pref_auto_clear_chapter_cache">Vymazat mezipaměť kapitol při zavření aplikace</string>
-    <string name="pref_clear_database">Vyčistit manga databázi</string>
-    <string name="pref_clear_database_summary">Smazat historii položek, které nejsou uloženy ve vaší knihovně</string>
+    <string name="pref_clear_manga_database">Vyčistit manga databázi</string>
+    <string name="pref_clear_manga_database_summary">Smazat historii položek, které nejsou uloženy ve vaší knihovně</string>
     <string name="clear_database_confirmation">Jste si jistí\? Přečtené kapitoly a postup v položkách mimo knihovnu budou ztraceny</string>
     <string name="pref_refresh_library_tracking_summary">Aktualizuje status, skóre a poslední přečtenou kapitolu ze sledovacích služeb</string>
     <string name="pref_incognito_mode_summary">Pozastaví historii čtení</string>
@@ -161,7 +161,6 @@
     <string name="pref_player_smooth_seek_summary">Pokud je zapnuté, vyhledávání nebude zaměřeno na klíčové snímky, což způsobuje pomalejší, ale přesnější vyhledávání</string>
     <string name="episode_not_found">Epizoda nenalezena</string>
     <string name="pref_remember_volume">Zapamatovat si naposledy použitou hlasitost a automaticky na ni přepnout</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_category_external_downloader">Externí stahovač</string>
     <string name="download_ahead_info_anime">Funguje pouze u záznamů v knihovně a pokud je již stažena aktuální a následující epizoda</string>
     <string name="pref_clear_anime_database">Vyčistit databázi anime</string>
@@ -191,8 +190,8 @@
     <string name="dialog_with_checkbox_reset_anime">Resetuje všechny epizody pro toto anime</string>
     <string name="screenshot_header">Udělat snímek obrazovky</string>
     <string name="screenshot_show_subs">Zobrazit titulky ve snímku obrazovky</string>
-    <string name="toggle_volume_brightness_gestures">Přepnutí gest pro hlasitost a jas</string>
-    <string name="toggle_horizontal_seek_gesture">Přepnutí gesta pro horizontální posun</string>
+    <string name="enable_volume_brightness_gestures">Přepnutí gest pro hlasitost a jas</string>
+    <string name="enable_horizontal_seek_gesture">Přepnutí gesta pro horizontální posun</string>
     <string name="stats_header">Zobrazit statistiky</string>
     <string name="toggle_stats">Přepnout statistiky</string>
     <string name="stats_page_1">Strana 1</string>
@@ -251,7 +250,7 @@
     <string name="player_aniskip_ed">Přeskočit konec</string>
     <string name="player_aniskip_mixedOp">Přeskočit smíšené úvodníky</string>
     <string name="player_aniskip_recap">Přeskočit rekapitulaci</string>
-    <string name="pref_category_player_aniskip">Nastavení AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Nastavení AniSkip</string>
     <string name="pref_enable_aniskip">Zapnout AniSkip</string>
     <string name="pref_waiting_time_aniskip">Časový limit tlačítka</string>
     <string name="pref_waiting_time_aniskip_5">5 sekund</string>
diff --git a/i18n/src/main/res/values-cv/strings-aniyomi.xml b/i18n/src/main/res/values-cv/strings-aniyomi.xml
index b4f0aaf5a..f9afd831b 100644
--- a/i18n/src/main/res/values-cv/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-cv/strings-aniyomi.xml
@@ -4,8 +4,8 @@
     <string name="unlock_app">Aniyomi уҫ</string>
     <string name="action_sort_last_manga_update">Юлашки ҫӗнетӗве тӗрӗслени</string>
     <string name="action_show_manga">Ҫырава кӑтарт</string>
-    <string name="action_display_local_badge">Вырӑнти ҫӑл куҫ</string>
-    <string name="default_category">Яланхилле пухмӑш</string>
+    <string name="action_display_local_badge_manga">Вырӑнти ҫӑл куҫ</string>
+    <string name="default_manga_category">Яланхилле пухмӑш</string>
     <string name="untrusted_extension_message">Ку хушмана шанчӑклӑ мар сертификатпа алӑ пуснӑ тата ӑна активламан.
 \n
 \nСиенлӗ хушма Tachiyomi-ри упранакан кирек мӗнле шут пӗлӗмсене шута илме е хӑй ирӗклӗ юма пурнӑҫлама пултарать.
@@ -17,8 +17,8 @@
     <string name="pref_remove_bookmarked_chapters">Картнӑ сыпӑксене катерт</string>
     <string name="pref_auto_update_manga_sync">Вуланӑ хыҫҫӑн сыпӑксен ӳсӗме ҫӗнет</string>
     <string name="pref_clear_chapter_cache">Сыпӑксен кешне тасат</string>
-    <string name="pref_clear_database">Пӗлӗмсен кӗлете тасат</string>
-    <string name="pref_clear_database_summary">Санӑн вулавӑшра упранман манкӑн вуланӑ кун-ҫулне катерт</string>
+    <string name="pref_clear_manga_database">Пӗлӗмсен кӗлете тасат</string>
+    <string name="pref_clear_manga_database_summary">Санӑн вулавӑшра упранман манкӑн вуланӑ кун-ҫулне катерт</string>
     <string name="clear_database_confirmation">Чӑнах катертесшӗн-и\? Вулавӑшри мар манкӑн вуланӑ сыпӑкӗсем тата вулав ӳсӗмӗ ҫухалӗ</string>
     <string name="pref_refresh_library_tracking_summary">Сӑнану сервиссенчен халне, шутне тата юлашки вуланӑ сыпӑка илсе ҫӗнет</string>
     <string name="pref_incognito_mode_summary">Вулани кун-ҫула чарса лартать</string>
diff --git a/i18n/src/main/res/values-da/strings-aniyomi.xml b/i18n/src/main/res/values-da/strings-aniyomi.xml
index 516f4896c..40505359b 100644
--- a/i18n/src/main/res/values-da/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-da/strings-aniyomi.xml
@@ -4,8 +4,8 @@
     <string name="unlock_app">Lås op for Tachiyomi</string>
     <string name="action_sort_last_manga_update">Nyeste manga opdateringer</string>
     <string name="action_show_manga">Vis manga</string>
-    <string name="action_display_local_badge">Lokale manga</string>
+    <string name="action_display_local_badge_manga">Lokale manga</string>
     <string name="pref_update_only_completely_read">Med ulæst kapitler</string>
-    <string name="default_category">Standard kategori</string>
+    <string name="default_manga_category">Standard kategori</string>
     <string name="pref_manga_library_update_categories_details">Manga i ekskluderede kategorier vil ikke blive opdateret selv hvis de også er i inkluderede kategorier.</string>
 </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-de/strings-aniyomi.xml b/i18n/src/main/res/values-de/strings-aniyomi.xml
index 6aa8e7803..fb7305d49 100644
--- a/i18n/src/main/res/values-de/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-de/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">Eintrag anzeigen</string>
     <string name="action_display_download_badge_anime">Heruntergeladene Folgen</string>
     <string name="action_display_unseen_badge">Ungesehene Folgen</string>
-    <string name="action_display_local_badge">Lokale Quelle</string>
+    <string name="action_display_local_badge_manga">Lokale Quelle</string>
     <string name="action_display_local_badge_anime">Lokale Animequelle</string>
     <string name="action_display_show_continue_reading_button">Fortsetzen-Knopf anzeigen</string>
     <string name="action_order_by_episode_number">Nach Folgennummer</string>
@@ -56,7 +56,7 @@
     <string name="pref_bottom_nav_style">Stil der unteren Navigation</string>
     <string name="pref_update_only_completely_read">Mit ungelesenen Kapiteln</string>
     <string name="pref_library_update_show_tab_badge">Anzahl von Ungelesenem auf dem „Neues“-Symbol anzeigen</string>
-    <string name="default_category">Standardkategorie</string>
+    <string name="default_manga_category">Standardkategorie</string>
     <string name="default_anime_category">Standard-Animekategorie</string>
     <string name="pref_manga_library_update_categories_details">Einträge in ausgeschlossenen Kategorien werden nicht aktualisiert, auch wenn sie in eingeschlossenen Kategorien vorhanden sind.</string>
     <string name="pref_anime_library_update_categories_details">Anime in ausgeschlossenen Kategorien werden nicht aktualisiert, auch wenn sie in eingeschlossenen Kategorien vorhanden sind.</string>
@@ -99,10 +99,8 @@
     <string name="pref_remove_after_marked_as_read">Nachdem manuell als gelesen markiert</string>
     <string name="pref_remove_after_read">Automatisch nach dem Lesen löschen</string>
     <string name="pref_remove_bookmarked_chapters">Erlauben, mit Lesezeichen versehene Kapitel zu löschen</string>
-    <string name="pref_remove_exclude_categories">Ausgeschlossene Kategorien</string>
+    <string name="pref_remove_exclude_categories_manga">Ausgeschlossene Kategorien</string>
     <string name="pref_remove_exclude_categories_anime">Ausgeschlossene Anime-Kategorien</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_category_external_downloader">Externer Downloader</string>
     <string name="pref_use_external_downloader">Immer externen Downloader zum Herunterladen von Anime benutzen</string>
     <string name="pref_external_downloader_selection">Bevorzugte Downloader-App</string>
@@ -119,9 +117,9 @@
     <string name="pref_clear_chapter_cache">Kapitel-Zwischenspeicher leeren</string>
     <string name="used_cache_both">Von Anime verwendet: %1$s, von Manga verwendet: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Kapitel-Zwischenspeicher beim Schließen der App löschen</string>
-    <string name="pref_clear_database">Datenbank leeren</string>
+    <string name="pref_clear_manga_database">Datenbank leeren</string>
     <string name="pref_clear_anime_database">Anime-Datenbank leeren</string>
-    <string name="pref_clear_database_summary">Verlauf für Einträge löschen, die nicht in deiner Bibliothek gespeichert sind</string>
+    <string name="pref_clear_manga_database_summary">Verlauf für Einträge löschen, die nicht in deiner Bibliothek gespeichert sind</string>
     <string name="pref_clear_anime_database_summary">Verlauf für Anime-Einträge löschen, die nicht in deiner Bibliothek gespeichert sind</string>
     <string name="clear_database_confirmation">Bist du dir sicher\? Die gelesenen Kapitel und Fortschritte von Einträgen, die nicht in deiner Bibliothek sind, werden gelöscht</string>
     <string name="pref_refresh_library_tracking_summary">Synchronisiert den Lesestatus, die Bewertung und das zuletzt gelesene Kapitel mit den angemeldeten Trackinganbietern</string>
@@ -171,8 +169,8 @@
     <string name="episode_progress_no_total">Fortschritt: %1$s</string>
     <string name="screenshot_header">Bildschirmfoto machen</string>
     <string name="screenshot_show_subs">Untertitel in Bildschirmfoto zeigen</string>
-    <string name="toggle_volume_brightness_gestures">Lautstärke- und Helligkeitsgesten aktivieren</string>
-    <string name="toggle_horizontal_seek_gesture">Horizontale Spul-Geste aktivieren</string>
+    <string name="enable_volume_brightness_gestures">Lautstärke- und Helligkeitsgesten aktivieren</string>
+    <string name="enable_horizontal_seek_gesture">Horizontale Spul-Geste aktivieren</string>
     <string name="stats_header">Statistiken anzeigen</string>
     <string name="toggle_stats">Statistiken aktivieren</string>
     <string name="stats_page">Statistik-Seite</string>
@@ -228,7 +226,7 @@
     <string name="player_aniskip_ed">Outro überspringen</string>
     <string name="player_aniskip_mixedOp">Gemischtes Intro überspringen</string>
     <string name="player_aniskip_recap">Zusammenfassung überspringen</string>
-    <string name="pref_category_player_aniskip">AniSkip-Einstellungen</string>
+    <string name="pref_category_player_aniskip_info">AniSkip-Einstellungen</string>
     <string name="pref_enable_aniskip">AniSkip aktivieren</string>
     <string name="pref_enable_auto_skip_ani_skip">Automatisches Überspringen aktivieren</string>
     <string name="pref_waiting_time_aniskip">Knopf-Wartezeit</string>
diff --git a/i18n/src/main/res/values-el/strings-aniyomi.xml b/i18n/src/main/res/values-el/strings-aniyomi.xml
index 81db61ed5..3bca00521 100644
--- a/i18n/src/main/res/values-el/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-el/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Ξεκλειδώστε το Aniyomi</string>
     <string name="action_sort_last_manga_update">Τελευταίος έλεγχος ενημέρωσης</string>
     <string name="action_show_manga">Εμφάνιση καταχώρισης</string>
-    <string name="action_display_local_badge">Τοπική πηγή</string>
+    <string name="action_display_local_badge_manga">Τοπική πηγή</string>
     <string name="pref_update_only_completely_read">Με αδιάβαστο(α) κεφάλαιο(α)</string>
     <string name="pref_library_update_show_tab_badge">Εμφάνιση του αριθμού των μη αναγνωσμένων στο εικονίδιο Ενημερώσεις</string>
-    <string name="default_category">Προεπιλεγμένη κατηγορία</string>
+    <string name="default_manga_category">Προεπιλεγμένη κατηγορία</string>
     <string name="pref_manga_library_update_categories_details">Οι καταχωρίσεις σε εξαιρούμενες κατηγορίες δε θα ενημερώνονται ακόμη και αν περιλαμβάνονται επίσης σε κατηγορίες που περιλαμβάνονται.</string>
     <string name="untrusted_extension_message">Αυτή η επέκταση υπογράφηκε με μη αξιόπιστο πιστοποιητικό και δεν ενεργοποιήθηκε.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Αφού επισημανθεί χειροκίνητα ως αναγνωσμένο</string>
     <string name="pref_remove_after_read">Αυτόματη διαγραφή μετά την ανάγνωση</string>
     <string name="pref_remove_bookmarked_chapters">Να επιτρέπεται η διαγραφή κεφαλαίων με σελιδοδείκτη</string>
-    <string name="pref_remove_exclude_categories">Εξαιρούμενες κατηγορίες</string>
+    <string name="pref_remove_exclude_categories_manga">Εξαιρούμενες κατηγορίες</string>
     <string name="pref_auto_update_manga_sync">Ενημέρωση προόδου μετά την ανάγνωση</string>
     <string name="pref_clear_chapter_cache">Καθάρισμα προσωρινής μνήμης κεφαλαίου</string>
     <string name="pref_auto_clear_chapter_cache">Εκκαθάριση της προσωρινής μνήμης κεφαλαίων στο κλείσιμο της εφαρμογής</string>
-    <string name="pref_clear_database">Καθαρισμός βάσης δεδομένων</string>
-    <string name="pref_clear_database_summary">Διαγραφή ιστορικού για καταχωρήσεις που δεν έχουν αποθηκευτεί στη βιβλιοθήκη σας</string>
+    <string name="pref_clear_manga_database">Καθαρισμός βάσης δεδομένων</string>
+    <string name="pref_clear_manga_database_summary">Διαγραφή ιστορικού για καταχωρήσεις που δεν έχουν αποθηκευτεί στη βιβλιοθήκη σας</string>
     <string name="clear_database_confirmation">Είστε σίγουροι; Τα διαβασμένα κεφάλαια και η πρόοδος των καταχωρήσεων εκτός βιβλιοθήκης θα χαθούν</string>
     <string name="pref_refresh_library_tracking_summary">Ενημερώνει κατάσταση, βαθμολογία και τελευταίο αναγνωσμένο κεφάλαιο από τις υπηρεσίες παρακολούθησης</string>
     <string name="pref_incognito_mode_summary">Παύει το ιστορικό ανάγνωσης</string>
diff --git a/i18n/src/main/res/values-eo/strings-aniyomi.xml b/i18n/src/main/res/values-eo/strings-aniyomi.xml
index ccc039c7c..57f9f9168 100644
--- a/i18n/src/main/res/values-eo/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-eo/strings-aniyomi.xml
@@ -2,12 +2,12 @@
 <resources>
     <string name="manga_categories">Kategorioj</string>
     <string name="unlock_app">Malŝlosi Aniyomi-n</string>
-    <string name="action_display_local_badge">Lokaj ŝildoj</string>
-    <string name="default_category">Defaŭlta kategorio</string>
+    <string name="action_display_local_badge_manga">Lokaj ŝildoj</string>
+    <string name="default_manga_category">Defaŭlta kategorio</string>
     <string name="pref_category_delete_chapters">Forigi ĉapitrojn</string>
     <string name="pref_remove_after_read">Aŭtomate post legado</string>
     <string name="pref_clear_chapter_cache">Viŝi kaŝmemoron de ĉapitroj</string>
-    <string name="pref_clear_database">Viŝi datumbazon</string>
+    <string name="pref_clear_manga_database">Viŝi datumbazon</string>
     <string name="manga_from_library">Mangao de biblioteko</string>
     <string name="snack_add_to_manga_library">Ĉu aldoni mangaon al biblioteko\?</string>
     <string name="download_error">Eraro</string>
diff --git a/i18n/src/main/res/values-es/strings-aniyomi.xml b/i18n/src/main/res/values-es/strings-aniyomi.xml
index f36356327..9d008b9ba 100644
--- a/i18n/src/main/res/values-es/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-es/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">Mostrar anime</string>
     <string name="action_display_download_badge_anime">Episodios descargados</string>
     <string name="action_display_unseen_badge">Episodios sin ver</string>
-    <string name="action_display_local_badge">Manga local</string>
+    <string name="action_display_local_badge_manga">Manga local</string>
     <string name="action_display_local_badge_anime">Anime local</string>
     <string name="action_display_show_continue_reading_button">Mostrar botón de continuar viendo/leyendo</string>
     <string name="action_order_by_episode_number">Por número de episodio</string>
@@ -56,7 +56,7 @@
     <string name="pref_bottom_nav_style">Estilo inferior de navegación</string>
     <string name="pref_update_only_completely_read">Con episodio(s) sin ver/capítulo(s) sin leer</string>
     <string name="pref_library_update_show_tab_badge">Mostrar capítulos no leídos en la pestaña actualizaciones</string>
-    <string name="default_category">Categoría predeterminada de manga</string>
+    <string name="default_manga_category">Categoría predeterminada de manga</string>
     <string name="default_anime_category">Categoría predeterminada de anime</string>
     <string name="pref_manga_library_update_categories_details">El manga de las categorías excluidas no se actualizará, ni siquiera si pertenece a alguna de las categorías que sí estén incluidas.</string>
     <string name="pref_anime_library_update_categories_details">El anime de las categorías excluidas no se actualizará, ni siquiera si pertenece a alguna de las categorías que sí estén incluidas.</string>
@@ -99,10 +99,8 @@
     <string name="pref_remove_after_marked_as_read">Tras marcarlos como leídos/vistos de forma manual</string>
     <string name="pref_remove_after_read">Después de leer/ver borrar automáticamente</string>
     <string name="pref_remove_bookmarked_chapters">Permitir el borrado de capítulos/episodios marcados como favoritos</string>
-    <string name="pref_remove_exclude_categories">Categorías excluidas de manga</string>
+    <string name="pref_remove_exclude_categories_manga">Categorías excluidas de manga</string>
     <string name="pref_remove_exclude_categories_anime">Categorías excluidas de anime</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_category_external_downloader">Descargador externo</string>
     <string name="pref_use_external_downloader">Siempre usar descargador externo para anime</string>
     <string name="pref_external_downloader_selection">Preferencia de app de descarga</string>
@@ -120,9 +118,9 @@
     <string name="pref_clear_chapter_cache">Vaciar la caché de capítulos y episodios</string>
     <string name="used_cache_both">Usado por anime: %1$s, usado por manga: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Borrar la caché de episodios/capítulos al cerrar la aplicación</string>
-    <string name="pref_clear_database">Borrar la base de datos de manga</string>
+    <string name="pref_clear_manga_database">Borrar la base de datos de manga</string>
     <string name="pref_clear_anime_database">Borrar la base de datos de anime</string>
-    <string name="pref_clear_database_summary">Borrar el historial del manga que no esté guardado en tu biblioteca</string>
+    <string name="pref_clear_manga_database_summary">Borrar el historial del manga que no esté guardado en tu biblioteca</string>
     <string name="pref_clear_anime_database_summary">Borrar el historial del anime que no esté guardado en tu biblioteca</string>
     <string name="clear_database_confirmation">¿Estás seguro\? Episodios y capítulos completados y progreso que no esté en la biblioteca se perderá</string>
     <string name="pref_refresh_library_tracking_summary">Actualiza estados, puntuaciones y últimos capítulos leídos desde tus servicios de seguimiento</string>
@@ -172,8 +170,8 @@
     <string name="episode_progress_no_total">Progreso: %1$s</string>
     <string name="screenshot_header">Hacer una captura de pantalla</string>
     <string name="screenshot_show_subs">Mostrar subtítulos en captura de pantalla</string>
-    <string name="toggle_volume_brightness_gestures">Gestos para cambiar el volumen y el brillo</string>
-    <string name="toggle_horizontal_seek_gesture">Alternar con el gesto de la búsqueda horizontal</string>
+    <string name="enable_volume_brightness_gestures">Gestos para cambiar el volumen y el brillo</string>
+    <string name="enable_horizontal_seek_gesture">Alternar con el gesto de la búsqueda horizontal</string>
     <string name="stats_header">Mostrar las estadísticas</string>
     <string name="toggle_stats">Alternar estadísticas</string>
     <string name="stats_page">Página de las estadísticas</string>
@@ -232,7 +230,7 @@
     <string name="player_aniskip_ed">Omitir el final</string>
     <string name="player_aniskip_mixedOp">Saltar introducción mixta</string>
     <string name="player_aniskip_recap">Saltar resumen</string>
-    <string name="pref_category_player_aniskip">Ajustes de AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Ajustes de AniSkip</string>
     <string name="pref_enable_aniskip">Activar AniSkip</string>
     <string name="pref_enable_auto_skip_ani_skip">Activar el salto automático</string>
     <string name="pref_waiting_time_aniskip">Tiempo de espera del botón</string>
diff --git a/i18n/src/main/res/values-eu/strings-aniyomi.xml b/i18n/src/main/res/values-eu/strings-aniyomi.xml
index 66d7833f9..e06b21447 100644
--- a/i18n/src/main/res/values-eu/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-eu/strings-aniyomi.xml
@@ -3,10 +3,10 @@
     <string name="manga_categories">Kategoriak</string>
     <string name="unlock_app">Desblokeatu Tachiyomi</string>
     <string name="action_show_manga">Manga erakutsi</string>
-    <string name="action_display_local_badge">Manga lokala</string>
+    <string name="action_display_local_badge_manga">Manga lokala</string>
     <string name="pref_update_only_completely_read">Irakurri gabeko kapituluak ditu</string>
     <string name="pref_library_update_show_tab_badge">Erakutsi irakurri gabekoen kopurua Eguneraketak ikonoan</string>
-    <string name="default_category">Kategoria lehentsia</string>
+    <string name="default_manga_category">Kategoria lehentsia</string>
     <string name="pref_manga_library_update_categories_details">Baztertutako kategorietako mangak ez dira eguneratuko, sarturiko kategorietan egon arren.</string>
     <string name="untrusted_extension_message">Luzapen hau fidagarria ez den ziurtagiri batekin sinatu zen eta ez zen aktibatu.
 \n
@@ -17,12 +17,12 @@
     <string name="pref_remove_after_marked_as_read">Irakurria bezala eskuz markatu ondoren</string>
     <string name="pref_remove_after_read">Irakurri ondoren automatikoki ezabatu</string>
     <string name="pref_remove_bookmarked_chapters">Baimendu laster-markadun kapituluak ezabatzea</string>
-    <string name="pref_remove_exclude_categories">Baztertutako kategoriak</string>
+    <string name="pref_remove_exclude_categories_manga">Baztertutako kategoriak</string>
     <string name="pref_auto_update_manga_sync">Eguneratu aurrerapena irakurri ondoren</string>
     <string name="pref_clear_chapter_cache">Garbitu kapituluen cachea</string>
     <string name="pref_auto_clear_chapter_cache">Garbitu kapituluen cachea aplikazioa ixtean</string>
-    <string name="pref_clear_database">Garbitu datu-basea</string>
-    <string name="pref_clear_database_summary">Ezabatu zure liburutegian gordeta ez dauden mangen historia</string>
+    <string name="pref_clear_manga_database">Garbitu datu-basea</string>
+    <string name="pref_clear_manga_database_summary">Ezabatu zure liburutegian gordeta ez dauden mangen historia</string>
     <string name="clear_database_confirmation">Ziur zaude\? Kapitulu iraurriak eta liburutegikoak ez diren manga-en aurrerapenak galduko dira</string>
     <string name="pref_refresh_library_tracking_summary">Egoera, puntuaketa eta azken kapitulu irakurria eguneratzen ditu jarraipen-zerbitzuetatik</string>
     <string name="pref_incognito_mode_summary">Irakurketa historia gelditu egiten du</string>
diff --git a/i18n/src/main/res/values-fa/strings-aniyomi.xml b/i18n/src/main/res/values-fa/strings-aniyomi.xml
index 44f1d681f..538753aab 100644
--- a/i18n/src/main/res/values-fa/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-fa/strings-aniyomi.xml
@@ -6,10 +6,10 @@
     <string name="unlock_app">بازکردن تاچی یومی</string>
     <string name="action_sort_last_manga_update">آخرین به‌روزرسانی مانگا</string>
     <string name="action_show_manga">نمایش مانگا</string>
-    <string name="action_display_local_badge">مانگای محلی</string>
+    <string name="action_display_local_badge_manga">مانگای محلی</string>
     <string name="pref_update_only_completely_read">با قسمت‌(های) خوانده‌نشده</string>
     <string name="pref_library_update_show_tab_badge">تعداد خوانده‌نشده را بر روی آیکون به‌روزرسانی نشان بده</string>
-    <string name="default_category">دسته بندی پیشفرض</string>
+    <string name="default_manga_category">دسته بندی پیشفرض</string>
     <string name="pref_manga_library_update_categories_details">مانگاهایی که در دسته‌بندی های حذف‌شده هستند، حتی اگر هم‌زمان در دسته‌بندی های مشمول باشند به‌روزرسانی نمی‌شوند.</string>
     <string name="untrusted_extension_message">این افزونه با یک گواهی نامطمئن امضا شده است و فعال نشده است.
 \n
@@ -20,11 +20,11 @@
     <string name="pref_remove_after_marked_as_read">بعد از آن‌هایی که به صورت دستی به عنوان خوانده‌شده علامت‌گذاری شده‌اند</string>
     <string name="pref_remove_after_read">بعد از خواندن به‌صورت خودکار پاک کن</string>
     <string name="pref_remove_bookmarked_chapters">اجازه‌ی پاک‌کردن قسمت‌های نشانک‌گذاری شده را بده</string>
-    <string name="pref_remove_exclude_categories">دسته‌بندی‌های محذوف</string>
+    <string name="pref_remove_exclude_categories_manga">دسته‌بندی‌های محذوف</string>
     <string name="pref_auto_update_manga_sync">بعد از خوانده‌شدن، وضعیت قسمت بروزرسانی شود</string>
     <string name="pref_clear_chapter_cache">پاک کردن حافظه پنهان قسمت‌ها</string>
-    <string name="pref_clear_database">پاک کردن پایگاه داده</string>
-    <string name="pref_clear_database_summary">حذف سابقه برای مانگاهایی که در کتابخانه ذخیره نشده اند</string>
+    <string name="pref_clear_manga_database">پاک کردن پایگاه داده</string>
+    <string name="pref_clear_manga_database_summary">حذف سابقه برای مانگاهایی که در کتابخانه ذخیره نشده اند</string>
     <string name="clear_database_confirmation">آیا مطمئن هستید؟ اطلاعات قسمت های خوانده شده برای مانگاهایی که در کتابخانه اضافه نشده از دست خواهد رفت</string>
     <string name="pref_refresh_library_tracking_summary">وضعیت خواندن، امتیاز و آخرین قسمت خوانده شده را از سایت خدمات ردیابی آپدیت می‌کند</string>
     <string name="pref_incognito_mode_summary">متوقف کردن تاریخچه خواندن</string>
diff --git a/i18n/src/main/res/values-fi/strings-aniyomi.xml b/i18n/src/main/res/values-fi/strings-aniyomi.xml
index 3e9039333..2d6b96bc8 100644
--- a/i18n/src/main/res/values-fi/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-fi/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Avaa Aniyomi</string>
     <string name="action_sort_last_manga_update">Viimeisin manga päivitys</string>
     <string name="action_show_manga">Näytä manga</string>
-    <string name="action_display_local_badge">Laitteelle tallennettu manga</string>
+    <string name="action_display_local_badge_manga">Laitteelle tallennettu manga</string>
     <string name="pref_update_only_completely_read">Sarjalla on lukemattomia kappaleita</string>
     <string name="pref_library_update_show_tab_badge">Näytä lukemattomien määrä päivitys ikoneissa</string>
-    <string name="default_category">Oletus kategoria</string>
+    <string name="default_manga_category">Oletus kategoria</string>
     <string name="pref_manga_library_update_categories_details">Poissuljettuihin kategorioihin sisältyvää mangaa ei päivitetä, vaikka ne olisivat myös sisällytetyissä kategorioissa.</string>
     <string name="untrusted_extension_message">Tämä laajennus on allekirjoitettu luottamattomalla sertifikaatilla ja sitä ei ole aktivoitu.
 \n
@@ -18,11 +18,11 @@
     <string name="pref_remove_after_marked_as_read">Manuaalisesti luetuksi merkitsemisen jälkeen</string>
     <string name="pref_remove_after_read">Lukemisen jälkeen</string>
     <string name="pref_remove_bookmarked_chapters">Poista kirjanmerkityt luvut</string>
-    <string name="pref_remove_exclude_categories">Poissuljetut kategoriat</string>
+    <string name="pref_remove_exclude_categories_manga">Poissuljetut kategoriat</string>
     <string name="pref_auto_update_manga_sync">Päivitä luvun edistyminen lukemisen jälkeen</string>
     <string name="pref_clear_chapter_cache">Tyhjennä lukujen välimuisti</string>
-    <string name="pref_clear_database">Tyhjennä tietokanta</string>
-    <string name="pref_clear_database_summary">Poista mangan historia, jota ei ole tallennettu kirjastoosi</string>
+    <string name="pref_clear_manga_database">Tyhjennä tietokanta</string>
+    <string name="pref_clear_manga_database_summary">Poista mangan historia, jota ei ole tallennettu kirjastoosi</string>
     <string name="clear_database_confirmation">Oletko varma\? Luetut luvut ja eteneminen poistetaan muista kun kirjastossa olevista sarjoista</string>
     <string name="pref_refresh_library_tracking_summary">Päivittää tilan, arvosanan ja viimeksi luetun luvun seurantapalveluista</string>
     <string name="pref_incognito_mode_summary">Keskeyttää lukuhistorian</string>
diff --git a/i18n/src/main/res/values-fil/strings-aniyomi.xml b/i18n/src/main/res/values-fil/strings-aniyomi.xml
index 6c35f2bb5..8c0b23006 100644
--- a/i18n/src/main/res/values-fil/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-fil/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Buksan ang Aniyomi</string>
     <string name="action_sort_last_manga_update">Huling update ng pag-tsek</string>
     <string name="action_show_manga">Ipakita ang mga entry</string>
-    <string name="action_display_local_badge">Lokal na pinanggagalingan</string>
+    <string name="action_display_local_badge_manga">Lokal na pinanggagalingan</string>
     <string name="pref_update_only_completely_read">May di pa nababasang kabanata</string>
     <string name="pref_library_update_show_tab_badge">Ipakita ang bilang ng di pa nabasa sa Bago</string>
-    <string name="default_category">Panimulang lagayan</string>
+    <string name="default_manga_category">Panimulang lagayan</string>
     <string name="pref_manga_library_update_categories_details">Ang mga entry sa mga ibinukod na kategorya ay hindi maa-update kahit na sila ay kasama rin sa mga kategoryang kasama.</string>
     <string name="untrusted_extension_message">Pinirmahan ang extension na ito gamit ang isang kaduda-dudang certificate at hindi muna pinagana.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Pagkamarkahang nabasa na</string>
     <string name="pref_remove_after_read">Pagkatapos basahin, kusang burahin</string>
     <string name="pref_remove_bookmarked_chapters">Burahin din ang may pananda</string>
-    <string name="pref_remove_exclude_categories">Kategoryang di-kasama</string>
+    <string name="pref_remove_exclude_categories_manga">Kategoryang di-kasama</string>
     <string name="pref_auto_update_manga_sync">I-update ang progress pagkabasa</string>
     <string name="pref_clear_chapter_cache">Linisin ang cache ng kabanata</string>
     <string name="pref_auto_clear_chapter_cache">Linisin ang cache ng kabanata pagkasara</string>
-    <string name="pref_clear_database">Linisin ang database</string>
-    <string name="pref_clear_database_summary">Burahin ang history para sa mga entry na hindi naka-save sa iyong library</string>
+    <string name="pref_clear_manga_database">Linisin ang database</string>
+    <string name="pref_clear_manga_database_summary">Burahin ang history para sa mga entry na hindi naka-save sa iyong library</string>
     <string name="clear_database_confirmation">Sigurado ka ba\? Mga basa na chapters at mga progress sa mga entry ng non-library ay mawawala</string>
     <string name="pref_refresh_library_tracking_summary">Inia-update ang estado, iskor, at huling nabasang kabanata mula sa mga tracker</string>
     <string name="pref_incognito_mode_summary">Hinihinto ang pagtala sa nakaraan</string>
diff --git a/i18n/src/main/res/values-fr/strings-aniyomi.xml b/i18n/src/main/res/values-fr/strings-aniyomi.xml
index 4c9e05dac..152369801 100644
--- a/i18n/src/main/res/values-fr/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-fr/strings-aniyomi.xml
@@ -45,7 +45,7 @@
     <string name="action_show_anime">Afficher l\'animé</string>
     <string name="action_display_download_badge_anime">Épisodes téléchargés</string>
     <string name="action_display_unseen_badge">Épisodes non vus</string>
-    <string name="action_display_local_badge">Source locale</string>
+    <string name="action_display_local_badge_manga">Source locale</string>
     <string name="action_display_local_badge_anime">Animé local</string>
     <string name="action_display_show_continue_reading_button">Afficher le bouton Continuer à regarder/lire</string>
     <string name="action_order_by_episode_number">Par numéro d\'épisode</string>
@@ -55,7 +55,7 @@
     <string name="pref_bottom_nav_style">Style de navigation en bas de page</string>
     <string name="pref_update_only_completely_read">Avec des chapitres non lus</string>
     <string name="pref_library_update_show_tab_badge">Afficher le nombre de messages non lus sur l\'icône des mises à jour</string>
-    <string name="default_category">Catégorie par défaut</string>
+    <string name="default_manga_category">Catégorie par défaut</string>
     <string name="default_anime_category">Catégorie d\'animé par défaut</string>
     <string name="pref_manga_library_update_categories_details">Les entrées dans les catégories exclues ne seront pas mises à jour même si elles sont aussi dans les catégories inclues.</string>
     <string name="pref_anime_library_update_categories_details">Les animés dans les catégories exclues ne seront pas mis à jour même s\'ils sont aussi dans les catégories incluses.</string>
@@ -91,10 +91,8 @@
     <string name="pref_remove_after_marked_as_read">Après avoir été marqué manuellement comme lu</string>
     <string name="pref_remove_after_read">Après la lecture, supprimer automatiquement</string>
     <string name="pref_remove_bookmarked_chapters">Permettre la suppression des chapitres marqués d\'un marque-page</string>
-    <string name="pref_remove_exclude_categories">Catégories exclues</string>
+    <string name="pref_remove_exclude_categories_manga">Catégories exclues</string>
     <string name="pref_remove_exclude_categories_anime">Catégories d\'animé exclues</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Animé :</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga :</string>
     <string name="pref_category_external_downloader">Téléchargeur externe</string>
     <plurals name="next_unseen_episodes">
         <item quantity="one">Épisode non vu suivant</item>
@@ -106,9 +104,9 @@
     <string name="pref_clear_chapter_cache">Effacer le cache des chapitres</string>
     <string name="used_cache_both">Utilisé par les animé : %1$s, utilisé par les mangas : %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Effacer le cache du chapitre à la fermeture de l\'application</string>
-    <string name="pref_clear_database">Effacer la base de données</string>
+    <string name="pref_clear_manga_database">Effacer la base de données</string>
     <string name="pref_clear_anime_database">Effacer la base de données des animés</string>
-    <string name="pref_clear_database_summary">Supprimer l\'historique des entrées qui ne sont pas enregistrées dans votre bibliothèque</string>
+    <string name="pref_clear_manga_database_summary">Supprimer l\'historique des entrées qui ne sont pas enregistrées dans votre bibliothèque</string>
     <string name="pref_clear_anime_database_summary">Supprimer l\'historique des animés qui ne sont pas sauvegardés dans votre bibliothèque</string>
     <string name="clear_database_confirmation">Êtes-vous sûr(e) \? Les chapitres lus et la progression des entrées non présentes dans la bibliothèque seront perdues</string>
     <string name="pref_refresh_library_tracking_summary">Actualise le statut, la note et le dernier chapitre lu depuis les services de suivi</string>
@@ -159,8 +157,8 @@
     <string name="episode_progress_no_total">Progression : %1$s</string>
     <string name="screenshot_header">Faire une capture d\'écran</string>
     <string name="screenshot_show_subs">Afficher les sous-titres dans la capture d\'écran</string>
-    <string name="toggle_volume_brightness_gestures">Gestes de basculement du volume et de la luminosité</string>
-    <string name="toggle_horizontal_seek_gesture">Activer le geste de recherche horizontale</string>
+    <string name="enable_volume_brightness_gestures">Gestes de basculement du volume et de la luminosité</string>
+    <string name="enable_horizontal_seek_gesture">Activer le geste de recherche horizontale</string>
     <string name="stats_header">Afficher les statistiques</string>
     <string name="stats_page_1">Page 1</string>
     <string name="stats_page_2">Page 2</string>
@@ -242,7 +240,7 @@
     <string name="toggle_stats">Activer les statistiques</string>
     <string name="stats_page">Pages des statistiques</string>
     <string name="download_notifier_download_paused_episodes">Téléchargement d\'épisodes en pause</string>
-    <string name="pref_category_player_aniskip">Paramètres AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Paramètres AniSkip</string>
     <string name="label_animeextensions">Extensions d\'animés</string>
     <string name="label_migration_manga">Migrer les mangas</string>
     <string name="label_mangaextensions">Extensions des mangas</string>
diff --git a/i18n/src/main/res/values-gl/strings-aniyomi.xml b/i18n/src/main/res/values-gl/strings-aniyomi.xml
index 0e8324daf..964ec1d1e 100644
--- a/i18n/src/main/res/values-gl/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-gl/strings-aniyomi.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="manga_categories">Categorías</string>
     <string name="unlock_app">Desbloquea Aniyomi</string>
-    <string name="default_category">Categoría por defecto</string>
+    <string name="default_manga_category">Categoría por defecto</string>
     <string name="untrusted_extension_message">Esta extensión foi firmada non un certificado non confiable e non foi activada
 \n
 \nUnha extensión maliciosa podería ler calquera credencial de inicio de sesión gardado en Tachiyomi ou executar código arbitrario.
diff --git a/i18n/src/main/res/values-he/strings-aniyomi.xml b/i18n/src/main/res/values-he/strings-aniyomi.xml
index f45e7e371..cd3dd2b77 100644
--- a/i18n/src/main/res/values-he/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-he/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">שחרר את Aniyomi</string>
     <string name="action_sort_last_manga_update">עדכון אחרון</string>
     <string name="action_show_manga">הראה פריט</string>
-    <string name="action_display_local_badge">מקור מקומי</string>
+    <string name="action_display_local_badge_manga">מקור מקומי</string>
     <string name="pref_update_only_completely_read">עם פרק(ים) שלא נקרא(ו)</string>
     <string name="pref_library_update_show_tab_badge">הראה מספור של פרקים שלא נקראו באייקון העדכונים</string>
-    <string name="default_category">קטגוריית ברירת המחדל</string>
+    <string name="default_manga_category">קטגוריית ברירת המחדל</string>
     <string name="pref_manga_library_update_categories_details">מנגה הנמצאת בקטגוריית מנועי העדכונים לא תעודכן גם אם היא נכללת בקטגורייה אחרת שכן מתעדכנת.</string>
     <string name="untrusted_extension_message">תוסף זה נחתם עם אישור לא מהימן ולא הופעל.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">אחרי שמסומן ידנית כנקרא</string>
     <string name="pref_remove_after_read">אוטומטי לאחר סיום הקריאה</string>
     <string name="pref_remove_bookmarked_chapters">אפשר מחיקת פרקים שסומנו</string>
-    <string name="pref_remove_exclude_categories">קטגוריות מוחרגות</string>
+    <string name="pref_remove_exclude_categories_manga">קטגוריות מוחרגות</string>
     <string name="pref_auto_update_manga_sync">עדכן התקדמות לאחר הקריאה</string>
     <string name="pref_clear_chapter_cache">נקה את זיכרון המטמון של הפרקים</string>
     <string name="pref_auto_clear_chapter_cache">נקה את זיכרון המטמון של הפרקים כשהאפליקציה נסגרת</string>
-    <string name="pref_clear_database">נקה את מסד הנתונים</string>
-    <string name="pref_clear_database_summary">מחק את היסטוריית המנגה שאינם שמורים בספריה שלך</string>
+    <string name="pref_clear_manga_database">נקה את מסד הנתונים</string>
+    <string name="pref_clear_manga_database_summary">מחק את היסטוריית המנגה שאינם שמורים בספריה שלך</string>
     <string name="clear_database_confirmation">האם אתה בטוח\? פרקים שנקראו וההתקדמות של מנגה שאינה בספרייה יאבדו</string>
     <string name="pref_refresh_library_tracking_summary">עדכן סטטוס, ציון ופרק אחרון שנקרא משירותי המעקב</string>
     <string name="pref_incognito_mode_summary">עוצר את קריאת ההיסטוריה</string>
diff --git a/i18n/src/main/res/values-hi/strings-aniyomi.xml b/i18n/src/main/res/values-hi/strings-aniyomi.xml
index ab61ce19b..974ce9ad5 100644
--- a/i18n/src/main/res/values-hi/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-hi/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">अनलॉक Aniyomi</string>
     <string name="action_sort_last_manga_update">आखिरी किताब अद्यतन</string>
     <string name="action_show_manga">मंगा दिखाएँ</string>
-    <string name="action_display_local_badge">स्थानीय पुस्तक</string>
+    <string name="action_display_local_badge_manga">स्थानीय पुस्तक</string>
     <string name="pref_update_only_completely_read">अपठित अध्याय हैं</string>
     <string name="pref_library_update_show_tab_badge">अपडेट आइकन पर अपठित संख्या दिखाएं</string>
-    <string name="default_category">डिफ़ॉल्ट श्रेणी</string>
+    <string name="default_manga_category">डिफ़ॉल्ट श्रेणी</string>
     <string name="pref_manga_library_update_categories_details">बहिष्कृत श्रेणियों की पुस्तकें अपडेट नहीं की जाएंगी, भले ही वे भी शामिल श्रेणियों में हों।</string>
     <string name="untrusted_extension_message">यह एक्सटेंशन एक अविश्वस्त प्रमाणपत्र के साथ हस्ताक्षरित हुआ था और सक्रिय नहीं हुआ था।
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">\'पढ़ें\' के रूप में खुद से चिह्नित करने के बाद</string>
     <string name="pref_remove_after_read">पढ़ने के बाद स्वचालित रूप से हटाएं</string>
     <string name="pref_remove_bookmarked_chapters">बुकमार्क किए गए अध्यायों को हटाने की अनुमति दें</string>
-    <string name="pref_remove_exclude_categories">बहिष्कृत श्रेणियां</string>
+    <string name="pref_remove_exclude_categories_manga">बहिष्कृत श्रेणियां</string>
     <string name="pref_auto_update_manga_sync">पढ़ने के बाद प्रगति अपडेट करें</string>
     <string name="pref_clear_chapter_cache">अध्याय कैश साफ़ करें</string>
     <string name="pref_auto_clear_chapter_cache">ऐप बंद करते समय चैप्टर कैशे साफ़ करें</string>
-    <string name="pref_clear_database">डेटाबेस साफ़ करें</string>
-    <string name="pref_clear_database_summary">मैंगा जो आपकी लाइब्रेरी में सहेजे नहीं हैं उनका इतिहास हटाएं</string>
+    <string name="pref_clear_manga_database">डेटाबेस साफ़ करें</string>
+    <string name="pref_clear_manga_database_summary">मैंगा जो आपकी लाइब्रेरी में सहेजे नहीं हैं उनका इतिहास हटाएं</string>
     <string name="clear_database_confirmation">क्या आपको यकीन है? अध्यायों और गैर-पुस्तकालय मंगा की प्रगति को खो दिया जाएगा</string>
     <string name="pref_refresh_library_tracking_summary">अपडेट की स्थिति, स्कोर और अंतिम अध्याय ट्रैकिंग सेवाओं से पढ़ें</string>
     <string name="pref_incognito_mode_summary">इतिहास पढ़ने से रोक देता है</string>
diff --git a/i18n/src/main/res/values-hr/strings-aniyomi.xml b/i18n/src/main/res/values-hr/strings-aniyomi.xml
index 83cf9b6c3..3f834a22d 100644
--- a/i18n/src/main/res/values-hr/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-hr/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Otključaj Aniyomi</string>
     <string name="action_sort_last_manga_update">Zadnje aktualiziranje mange</string>
     <string name="action_show_manga">Prikaži manga</string>
-    <string name="action_display_local_badge">Lokalne mange</string>
+    <string name="action_display_local_badge_manga">Lokalne mange</string>
     <string name="pref_update_only_completely_read">S nepročitanim poglavljima</string>
     <string name="pref_library_update_show_tab_badge">Prikaži broj nepročitanih na ikoni „Aktualiziranja”</string>
-    <string name="default_category">Standardna kategorija</string>
+    <string name="default_manga_category">Standardna kategorija</string>
     <string name="pref_manga_library_update_categories_details">Manga u isključenim kategorijama neće se aktualizirati čak niti ako se također nalaze u uključenim kategorijama.</string>
     <string name="untrusted_extension_message">Ovo proširenje potpisano je nepovjerljivim certifikatom i nije aktivirano.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Nakon ručnog označivanja kao pročitano</string>
     <string name="pref_remove_after_read">Automatski izbriši nakon čitanja</string>
     <string name="pref_remove_bookmarked_chapters">Dozvoli brisanje označenih poglavlja</string>
-    <string name="pref_remove_exclude_categories">Isključene kategorije</string>
+    <string name="pref_remove_exclude_categories_manga">Isključene kategorije</string>
     <string name="pref_auto_update_manga_sync">Ažuriraj napredak nakon čitanja</string>
     <string name="pref_clear_chapter_cache">Isprazni predmemoriju poglavlja</string>
     <string name="pref_auto_clear_chapter_cache">Izbriši predmemoriju poglavlja tijekom zatvaranja aplikacije</string>
-    <string name="pref_clear_database">Isprazni bazu podataka</string>
-    <string name="pref_clear_database_summary">Izbriši povijest manga koje se ne nalaze u tvojoj biblioteci</string>
+    <string name="pref_clear_manga_database">Isprazni bazu podataka</string>
+    <string name="pref_clear_manga_database_summary">Izbriši povijest manga koje se ne nalaze u tvojoj biblioteci</string>
     <string name="clear_database_confirmation">Sigurno\? Izgubit ćeš pročitana poglavlja i napredak manga koji nisu u biblioteci</string>
     <string name="pref_refresh_library_tracking_summary">Aktualizira stanje, ocjenu i zadnje pročitano poglavlje iz usluga za praćenje</string>
     <string name="pref_incognito_mode_summary">Zaustavlja čitanje povijesti</string>
diff --git a/i18n/src/main/res/values-hu/strings-aniyomi.xml b/i18n/src/main/res/values-hu/strings-aniyomi.xml
index 15e1d6d7a..2a50b1d45 100644
--- a/i18n/src/main/res/values-hu/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-hu/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Aniyomi feloldása</string>
     <string name="action_sort_last_manga_update">Utolsó manga frissítés</string>
     <string name="action_show_manga">Manga mutatása</string>
-    <string name="action_display_local_badge">Helyi manga</string>
+    <string name="action_display_local_badge_manga">Helyi manga</string>
     <string name="pref_update_only_completely_read">Csak a befejezett fejezeteket()</string>
     <string name="pref_library_update_show_tab_badge">Az olvasatlanok számának megjelnítése a Frissítések ikonon</string>
-    <string name="default_category">Alapértelmezett kategória</string>
+    <string name="default_manga_category">Alapértelmezett kategória</string>
     <string name="pref_manga_library_update_categories_details">Mangák a tiltott kategóriákban nem lesznek frissítve, még akkor se, ha a kedvelt kategóriákban is vannak.</string>
     <string name="untrusted_extension_message">Ezt a kiterjesztést nem megbízható tanúsítvánnyal írták alá, és nem lett aktiválva.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Olvasottnak jelölés után</string>
     <string name="pref_remove_after_read">Automatikus törlés olvasás után</string>
     <string name="pref_remove_bookmarked_chapters">Könyvjelzőzött fejezetek törlésének engedélyezése</string>
-    <string name="pref_remove_exclude_categories">Tiltott kategóriák</string>
+    <string name="pref_remove_exclude_categories_manga">Tiltott kategóriák</string>
     <string name="pref_auto_update_manga_sync">Olvasás után a fejezetek haladásának frissítése</string>
     <string name="pref_clear_chapter_cache">Fejezet gyorsítótárának törlése</string>
     <string name="pref_auto_clear_chapter_cache">Fejezet gyorsítótár törlése kilépéskor</string>
-    <string name="pref_clear_database">Adatbázis törlése</string>
-    <string name="pref_clear_database_summary">Nem könyvtári elemek előzményeinek törlése</string>
+    <string name="pref_clear_manga_database">Adatbázis törlése</string>
+    <string name="pref_clear_manga_database_summary">Nem könyvtári elemek előzményeinek törlése</string>
     <string name="clear_database_confirmation">Biztos benne\? Nem könyvtári elemek olvasott fejezetei elvesznek</string>
     <string name="pref_refresh_library_tracking_summary">Frissíti az állapotot, értékelést és az utolsó olvasott fejezetet a tracking szolgáltatás által</string>
     <string name="pref_incognito_mode_summary">Olvasási előzmények megállítása</string>
diff --git a/i18n/src/main/res/values-in/strings-aniyomi.xml b/i18n/src/main/res/values-in/strings-aniyomi.xml
index be407340f..43085aca5 100644
--- a/i18n/src/main/res/values-in/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-in/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">Tampilkan anime</string>
     <string name="action_display_download_badge_anime">Episode diunduh</string>
     <string name="action_display_unseen_badge">Episode belum dilihat</string>
-    <string name="action_display_local_badge">Lokal manga</string>
+    <string name="action_display_local_badge_manga">Lokal manga</string>
     <string name="action_display_local_badge_anime">Lokal anime</string>
     <string name="action_display_show_continue_reading_button">Tampilkan tombol lanjutkan menonton/membaca</string>
     <string name="action_order_by_episode_number">Dengan jumlah episode</string>
@@ -56,7 +56,7 @@
     <string name="pref_bottom_nav_style">Gaya tombol navigasi</string>
     <string name="pref_update_only_completely_read">Dengan episode belum dilihat (s)/chapter belul dibaca(s)</string>
     <string name="pref_library_update_show_tab_badge">Tampilkan jumlah yang belum dibaca pada ikon Pembaruan</string>
-    <string name="default_category">Kategori bawaan</string>
+    <string name="default_manga_category">Kategori bawaan</string>
     <string name="default_anime_category">Kategori anime standar default</string>
     <string name="pref_manga_library_update_categories_details">Manga dalam kategori yang dikecualikan tidak akan diperbarui meskipun masuk dalam kategori yang disertakan.</string>
     <string name="pref_anime_library_update_categories_details">Anime dalam kategori dikecualikan tidak akan diperbarui bahkan jika mereka juga termasuk dalam kategori.</string>
@@ -99,10 +99,8 @@
     <string name="pref_remove_after_marked_as_read">Setelah secara manual ditandai telah dibaca</string>
     <string name="pref_remove_after_read">Otomatis hapus setelah dibaca</string>
     <string name="pref_remove_bookmarked_chapters">Hapus tanda pada chapter/episode</string>
-    <string name="pref_remove_exclude_categories">Kategori yang dikecualikan</string>
+    <string name="pref_remove_exclude_categories_manga">Kategori yang dikecualikan</string>
     <string name="pref_remove_exclude_categories_anime">Kategori anime yang dikecualikan</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_category_external_downloader">Pengunduhan eksternal</string>
     <string name="pref_use_external_downloader">Selalu gunakan pengunduhan eksternal pada anime</string>
     <string name="pref_external_downloader_selection">Pemilihan app pengunduhan yang digunakan</string>
@@ -118,9 +116,9 @@
     <string name="pref_clear_chapter_cache">Hapus cache chapter dan episode</string>
     <string name="used_cache_both">Digunakan oleh anime: %1$s, digunakan oleh manga: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Bersihkan cache saat aplikasi tertutup</string>
-    <string name="pref_clear_database">Hapus database</string>
+    <string name="pref_clear_manga_database">Hapus database</string>
     <string name="pref_clear_anime_database">Bersihkan database Anime</string>
-    <string name="pref_clear_database_summary">Hapus riwayat manga yang tidak disimpan di pustaka Anda</string>
+    <string name="pref_clear_manga_database_summary">Hapus riwayat manga yang tidak disimpan di pustaka Anda</string>
     <string name="pref_clear_anime_database_summary">Hapus histori dari anime yang tidak disimpan di perpustakaan kamu</string>
     <string name="clear_database_confirmation">Apakah Anda yakin\? episode/chapter yang sudah dilihat dan juga daftar dalam pustaka semua akan hilang</string>
     <string name="pref_refresh_library_tracking_summary">Perbarui status, nilai dan proses terakhir yang dibaca dari layanan pelacakan</string>
@@ -169,8 +167,8 @@
     <string name="episode_progress_no_total">Proses: %1$s</string>
     <string name="screenshot_header">Tangkap layar</string>
     <string name="screenshot_show_subs">Tampilkan subtitel di tangkap layar</string>
-    <string name="toggle_volume_brightness_gestures">Ubah volume dan gestur kecerahan</string>
-    <string name="toggle_horizontal_seek_gesture">ubah gestur gerakan horisontal</string>
+    <string name="enable_volume_brightness_gestures">Ubah volume dan gestur kecerahan</string>
+    <string name="enable_horizontal_seek_gesture">ubah gestur gerakan horisontal</string>
     <string name="stats_header">Tampilkan statistik</string>
     <string name="toggle_stats">Ubah status</string>
     <string name="stats_page">Halaman status</string>
@@ -223,7 +221,7 @@
     <string name="player_aniskip_ed">Lewati Ending</string>
     <string name="player_aniskip_mixedOp">Lewati MixedOp</string>
     <string name="player_aniskip_recap">Lewati Recap</string>
-    <string name="pref_category_player_aniskip">Pengaturan AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Pengaturan AniSkip</string>
     <string name="pref_enable_aniskip">Aktifkan AniSkip</string>
     <string name="pref_enable_auto_skip_ani_skip">Aktifkan otomatis skip</string>
     <string name="pref_waiting_time_aniskip">Tombol waktu habis</string>
diff --git a/i18n/src/main/res/values-it/strings-aniyomi.xml b/i18n/src/main/res/values-it/strings-aniyomi.xml
index b781f32d7..9464297d7 100644
--- a/i18n/src/main/res/values-it/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-it/strings-aniyomi.xml
@@ -15,10 +15,10 @@
     <string name="unlock_app">Sblocca Aniyomi</string>
     <string name="action_sort_last_manga_update">Ultimo aggiornamento manga</string>
     <string name="action_show_manga">Mostra manga</string>
-    <string name="action_display_local_badge">Manga locali</string>
+    <string name="action_display_local_badge_manga">Manga locali</string>
     <string name="pref_update_only_completely_read">Con capitoli non letti</string>
     <string name="pref_library_update_show_tab_badge">Mostra numero di elementi non letti/visti nell\'icona degli aggiornamenti</string>
-    <string name="default_category">Categoria manga predefinita</string>
+    <string name="default_manga_category">Categoria manga predefinita</string>
     <string name="pref_manga_library_update_categories_details">I manga nelle categorie escluse non verranno aggiornati anche se sono anche nelle categorie incluse.</string>
     <string name="untrusted_extension_message">Questa estensione è stata firmata con un certificato non attendibile e non è stata attivata.
 \n
@@ -29,12 +29,12 @@
     <string name="pref_remove_after_marked_as_read">Dopo averli contrassegnati manualmente come letti/visti</string>
     <string name="pref_remove_after_read">Cancella automaticamente dopo la lettura/visione</string>
     <string name="pref_remove_bookmarked_chapters">Consenti eliminazione capitoli/episodi con segnalibro</string>
-    <string name="pref_remove_exclude_categories">Categorie manga escluse</string>
+    <string name="pref_remove_exclude_categories_manga">Categorie manga escluse</string>
     <string name="pref_auto_update_manga_sync">Aggiorna il tracking dopo la lettura/visione</string>
     <string name="pref_clear_chapter_cache">Cancella cache capitoli e episodi</string>
     <string name="pref_auto_clear_chapter_cache">Cancella la cache capitoli/episodi alla chiusura dell\'app</string>
-    <string name="pref_clear_database">Pulisci database manga</string>
-    <string name="pref_clear_database_summary">Elimina la cronologia dei manga che non sono presenti nella libreria</string>
+    <string name="pref_clear_manga_database">Pulisci database manga</string>
+    <string name="pref_clear_manga_database_summary">Elimina la cronologia dei manga che non sono presenti nella libreria</string>
     <string name="clear_database_confirmation">Sei sicuro\? I progressi di lettura/visione dei contenuti fuori dalla libreria verranno persi</string>
     <string name="pref_refresh_library_tracking_summary">Aggiorna stato, voto e progressione dal servizio di tracking</string>
     <string name="pref_incognito_mode_summary">Sospendi cronologia</string>
@@ -83,7 +83,6 @@
     <string name="pref_pip_episode_toasts">Mostra gli \"episode toasts\" quando passi alla modalità PiP</string>
     <string name="playertitle">%1$s - %2$s</string>
     <string name="episode_download_progress">%1$d%%</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_use_external_downloader">Usa sempre un downloader esterno per gli anime</string>
     <string name="pref_category_external_downloader">Downloader esterno</string>
     <string name="auto_download_while_watching">Scarica automaticamente mentre stai guardando</string>
@@ -93,8 +92,8 @@
     <string name="sort_by_episode_number">Per numero episodio</string>
     <string name="download_1_episode">Prossimo episodio</string>
     <string name="screenshot_show_subs">Mostra i sottotitoli negli screenshot</string>
-    <string name="toggle_volume_brightness_gestures">Attiva regolazione Volume e Retroilluminazione attraverso le Gestures</string>
-    <string name="toggle_horizontal_seek_gesture">Attiva movimento di ricerca orizzontale attraverso le Gestures</string>
+    <string name="enable_volume_brightness_gestures">Attiva regolazione Volume e Retroilluminazione attraverso le Gestures</string>
+    <string name="enable_horizontal_seek_gesture">Attiva movimento di ricerca orizzontale attraverso le Gestures</string>
     <string name="stats_header">Mostra statistiche</string>
     <string name="information_no_recent_anime">Nulla è stato guardato di recente</string>
     <plurals name="notification_episodes_generic">
@@ -248,7 +247,7 @@
     <string name="audio_dialog_header">Cambia traccia audio:</string>
     <string name="playback_options_speed">Velocità di riproduzione</string>
     <string name="playback_options_quality">Qualità video</string>
-    <string name="pref_category_player_aniskip">Impostazioni AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Impostazioni AniSkip</string>
     <string name="pref_enable_aniskip">Attiva AniSkip</string>
     <string name="pref_enable_auto_skip_ani_skip">Attiva auto skip</string>
     <string name="pref_waiting_time_aniskip">Pulsante timeout</string>
diff --git a/i18n/src/main/res/values-ja/strings-aniyomi.xml b/i18n/src/main/res/values-ja/strings-aniyomi.xml
index 2cfca9f75..9e808f0f7 100644
--- a/i18n/src/main/res/values-ja/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ja/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Aniyomiのロックを解除する</string>
     <string name="action_sort_last_manga_update">前回の更新確認</string>
     <string name="action_show_manga">項目を表示</string>
-    <string name="action_display_local_badge">ローカル ソース</string>
+    <string name="action_display_local_badge_manga">ローカル ソース</string>
     <string name="pref_update_only_completely_read">未読の章あり</string>
     <string name="pref_library_update_show_tab_badge">更新アイコンで未読カウンターを表示</string>
-    <string name="default_category">デフォルトカテゴリー</string>
+    <string name="default_manga_category">デフォルトカテゴリー</string>
     <string name="pref_manga_library_update_categories_details">含まれているカテゴリーに入っていても、除外対象カテゴリーにある項目は更新されません。</string>
     <string name="untrusted_extension_message">この拡張機能は信頼できない証明書でサインされているため、有効にされていません。
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">手動で既読にした後</string>
     <string name="pref_remove_after_read">読んだ後自動で削除</string>
     <string name="pref_remove_bookmarked_chapters">ブックマークした章の削除を許可</string>
-    <string name="pref_remove_exclude_categories">除外されるカテゴリー</string>
+    <string name="pref_remove_exclude_categories_manga">除外されるカテゴリー</string>
     <string name="pref_auto_update_manga_sync">読んだ後に読書進捗を更新</string>
     <string name="pref_clear_chapter_cache">チャプタキャッシュをクリア</string>
     <string name="pref_auto_clear_chapter_cache">アプリ終了時に章のキャッシュを消去</string>
-    <string name="pref_clear_database">データベースをクリア</string>
-    <string name="pref_clear_database_summary">ライブラリにない項目の履歴を削除</string>
+    <string name="pref_clear_manga_database">データベースをクリア</string>
+    <string name="pref_clear_manga_database_summary">ライブラリにない項目の履歴を削除</string>
     <string name="clear_database_confirmation">データベースをクリアしてもよろしいですか？ライブラリにない項目の読んだ章と読書進捗はすべて失われます</string>
     <string name="pref_refresh_library_tracking_summary">同期サービスでステータス、評価と最後に読んだ章を更新</string>
     <string name="pref_incognito_mode_summary">閲覧履歴の記録を一時停止します</string>
diff --git a/i18n/src/main/res/values-jv/strings-aniyomi.xml b/i18n/src/main/res/values-jv/strings-aniyomi.xml
index a51388add..8f2475aec 100644
--- a/i18n/src/main/res/values-jv/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-jv/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Mbukak Aniyomi</string>
     <string name="action_sort_last_manga_update">Nganyari manga pungkasan</string>
     <string name="action_show_manga">Nampilno manga</string>
-    <string name="action_display_local_badge">Lokal manga</string>
+    <string name="action_display_local_badge_manga">Lokal manga</string>
     <string name="pref_update_only_completely_read">Karo bab durung diwaca</string>
     <string name="pref_library_update_show_tab_badge">Tampilake itungan kang durung diwaca ing ikon nganyari</string>
-    <string name="default_category">kategori gawan</string>
+    <string name="default_manga_category">kategori gawan</string>
     <string name="pref_manga_library_update_categories_details">Manga ing kategori sing ora kalebu ora bakal dianyari sanajan uga ana ing kategori sing kalebu.</string>
     <string name="untrusted_extension_message">Ekstensi iki ditandatangani nganggo sertifikat sing ora dipercaya lan ora diaktifake.
 \n
diff --git a/i18n/src/main/res/values-ka-rGE/strings-aniyomi.xml b/i18n/src/main/res/values-ka-rGE/strings-aniyomi.xml
index 20ae820a2..8cbde5c31 100644
--- a/i18n/src/main/res/values-ka-rGE/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ka-rGE/strings-aniyomi.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="manga_categories">კატეგორიები</string>
     <string name="unlock_app">Aniyomi-ს განბლოკვა</string>
-    <string name="default_category">ნაგულისხმევი კატეგორია</string>
+    <string name="default_manga_category">ნაგულისხმევი კატეგორია</string>
     <string name="untrusted_extension_message">ეს დამატება ხელმოწერილია უცნობი სერთიფიკატის მიერ და არ არის აქტივირებული.
 \n
 \nმავნე დამატებას შეუძლია წაიკითხოს შესვლის მონაცემები შენახული ამ აპლიკაციაში ან გაუშვას თავისი კოდი.
@@ -14,8 +14,8 @@
     <string name="pref_remove_bookmarked_chapters">მონიშნული თავების წაშლა</string>
     <string name="pref_auto_update_manga_sync">განაახლე თავის პროგრესი წაკითხვის შემდეგ</string>
     <string name="pref_clear_chapter_cache">თავის ქეშის გასუფთავება</string>
-    <string name="pref_clear_database">მონაცემთა ბაზის გასუფთავება</string>
-    <string name="pref_clear_database_summary">ბიბლიოთეკაში შეუნახავი მანგების ისტორიის წაშლა</string>
+    <string name="pref_clear_manga_database">მონაცემთა ბაზის გასუფთავება</string>
+    <string name="pref_clear_manga_database_summary">ბიბლიოთეკაში შეუნახავი მანგების ისტორიის წაშლა</string>
     <string name="clear_database_confirmation">დარწმუნებული ხარ? წაკითხული თავები და ბიბლიოთეკაში არ არსებული მანგების პროგრესი დაიკარგება</string>
     <string name="pref_refresh_library_tracking_summary">ანახლებს სტატუსს, შეფასებას და ბოლო თავს წაკითხულს თვალყურის სადევნებელ სერვისებიდან</string>
     <string name="snack_add_to_manga_library">დავამატო მანგა ბიბლიოთეკაში?</string>
diff --git a/i18n/src/main/res/values-kk/strings-aniyomi.xml b/i18n/src/main/res/values-kk/strings-aniyomi.xml
index 3d531a09b..1cd8961ac 100644
--- a/i18n/src/main/res/values-kk/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-kk/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Tachiyomi-ді бұғаттан босату</string>
     <string name="action_sort_last_manga_update">Соңғы жаңартуды тексеру</string>
     <string name="action_show_manga">Жазбаны көрсету</string>
-    <string name="action_display_local_badge">Локалды дереккөз</string>
+    <string name="action_display_local_badge_manga">Локалды дереккөз</string>
     <string name="pref_update_only_completely_read">Оқылмаған тарау(лар)мен</string>
     <string name="pref_library_update_show_tab_badge">Жаңартулар белгішесінде оқылмағандар санын көрсету</string>
-    <string name="default_category">Әдепкі санат</string>
+    <string name="default_manga_category">Әдепкі санат</string>
     <string name="pref_manga_library_update_categories_details">Шығарылған санаттардағы жазбалар енгізілген санаттарда болса да жаңартылмайды.</string>
     <string name="untrusted_extension_message">Бұл кеңейту сенімсіз сертификатпен қол қойылған және іске қосылмаған.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Қолмен оқылған деп белгіленгеннен кейін</string>
     <string name="pref_remove_after_read">Оқығаннан кейін автоматты түрде жою</string>
     <string name="pref_remove_bookmarked_chapters">Бетбелгіленген тарауларды жоюға рұқсат беру</string>
-    <string name="pref_remove_exclude_categories">Саналмайтын санаттар</string>
+    <string name="pref_remove_exclude_categories_manga">Саналмайтын санаттар</string>
     <string name="pref_auto_update_manga_sync">Оқығаннан кейін прогрессті жаңарту</string>
     <string name="pref_clear_chapter_cache">Тарау кешің тазалау</string>
     <string name="pref_auto_clear_chapter_cache">Қолданба жабылғанда тараулар кешің тазалау</string>
-    <string name="pref_clear_database">Дерекқорды тазалау</string>
-    <string name="pref_clear_database_summary">Кітапханада жоқ жазбалардың тарихын жою</string>
+    <string name="pref_clear_manga_database">Дерекқорды тазалау</string>
+    <string name="pref_clear_manga_database_summary">Кітапханада жоқ жазбалардың тарихын жою</string>
     <string name="clear_database_confirmation">Сенімдісіз бе\? Кітапханадағы емес жазбалардың оқылған тараулары мен прогрессі жоғалады</string>
     <string name="pref_refresh_library_tracking_summary">Бақылау қызметтері үшін күйді, рейтингті және соңғы оқылған тарауды жаңартады</string>
     <string name="pref_incognito_mode_summary">Оқу тарихын тоқтатады</string>
diff --git a/i18n/src/main/res/values-km/strings-aniyomi.xml b/i18n/src/main/res/values-km/strings-aniyomi.xml
index 8c538dd3b..ef90ddbb3 100644
--- a/i18n/src/main/res/values-km/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-km/strings-aniyomi.xml
@@ -3,6 +3,6 @@
     <string name="manga_categories">ការតម្រៀបថ្នាក់</string>
     <string name="unlock_app">បើកតាឈិយ៉ូមិ</string>
     <string name="action_show_manga">បង្ហាញម៊េងហ្គា</string>
-    <string name="action_display_local_badge">ម៊េងហ្គាដែលមានស្រាប់ក្នុងឧបករណ៍</string>
-    <string name="default_category">ថ្នាក់ធម្មតា</string>
+    <string name="action_display_local_badge_manga">ម៊េងហ្គាដែលមានស្រាប់ក្នុងឧបករណ៍</string>
+    <string name="default_manga_category">ថ្នាក់ធម្មតា</string>
 </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-kn/strings-aniyomi.xml b/i18n/src/main/res/values-kn/strings-aniyomi.xml
index 7ba7b3043..5b05b6912 100644
--- a/i18n/src/main/res/values-kn/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-kn/strings-aniyomi.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="manga_categories">ವರ್ಗಗಳು</string>
     <string name="unlock_app">ತಚಿಯೋಮಿಯನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಿ</string>
-    <string name="action_display_local_badge">ಸ್ಥಳೀಯ ಬ್ಯಾಡ್ಜ್ ಗಳು</string>
-    <string name="default_category">ಡೀಫಾಲ್ಟ್ ವರ್ಗ</string>
+    <string name="action_display_local_badge_manga">ಸ್ಥಳೀಯ ಬ್ಯಾಡ್ಜ್ ಗಳು</string>
+    <string name="default_manga_category">ಡೀಫಾಲ್ಟ್ ವರ್ಗ</string>
     <string name="pref_manga_library_update_categories_details">ಹೊರಗಿಡಲಾದ ವರ್ಗಗಳಲ್ಲಿನ ಮಾಂಗಾ ಸೇರಿಸಿದ ವಿಭಾಗಗಳಲ್ಲಿದ್ದರೂ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ.</string>
     <string name="untrusted_extension_message">ಈ ವಿಸ್ತರಣೆಯನ್ನು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಪ್ರಮಾಣಪತ್ರದೊಂದಿಗೆ ಸಹಿ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಅದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ.
 \n
@@ -16,8 +16,8 @@
     <string name="pref_remove_bookmarked_chapters">ಬುಕ್ ಮಾರ್ಕ್ ಮಾಡಿದ ಅಧ್ಯಾಯಗಳನ್ನು ಅಳಿಸಿ</string>
     <string name="pref_auto_update_manga_sync">ಓದಿದ ನಂತರ ಅಧ್ಯಾಯದ ಪ್ರಗತಿಯನ್ನು ನವೀಕರಿಸಿ</string>
     <string name="pref_clear_chapter_cache">ಅಧ್ಯಾಯ ಸಂಗ್ರಹವನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="pref_clear_database">ಡೇಟಾಬೇಸ್ ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="pref_clear_database_summary">ನಿಮ್ಮ ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಇಲ್ಲದ ಮಾಂಗಾದ ಇತಿಹಾಸವನ್ನು ಅಳಿಸಿ</string>
+    <string name="pref_clear_manga_database">ಡೇಟಾಬೇಸ್ ತೆರವುಗೊಳಿಸಿ</string>
+    <string name="pref_clear_manga_database_summary">ನಿಮ್ಮ ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಇಲ್ಲದ ಮಾಂಗಾದ ಇತಿಹಾಸವನ್ನು ಅಳಿಸಿ</string>
     <string name="clear_database_confirmation">ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ\? ಅಧ್ಯಾಯಗಳು ಗ್ರಂಥಾಲಯೇತರ ಮಾಂಗಾದ ಓದು ಮತ್ತು ಪ್ರಗತಿ ಕಳೆದುಹೋಗುತ್ತದೆ</string>
     <string name="pref_refresh_library_tracking_summary">ಟ್ರ್ಯಾಕಿಂಗ್ ಸೇವೆಗಳಿಂದ ಓದಿದ ಸ್ಥಿತಿ, ಸ್ಕೋರ್ ಮತ್ತು ಕೊನೆಯ ಅಧ್ಯಾಯವನ್ನು ನವೀಕರಿಸಿ</string>
     <string name="pref_incognito_mode_summary">ಓದುವ ಇತಿಹಾಸವನ್ನು ವಿರಾಮಗೊಳಿಸುತ್ತದೆ</string>
diff --git a/i18n/src/main/res/values-ko/strings-aniyomi.xml b/i18n/src/main/res/values-ko/strings-aniyomi.xml
index ac6a4acaf..9b66fe9e2 100644
--- a/i18n/src/main/res/values-ko/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ko/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">애니메이션 표시</string>
     <string name="action_display_download_badge_anime">다운로드된 회차</string>
     <string name="action_display_unseen_badge">보지 않은 회차</string>
-    <string name="action_display_local_badge">로컬 소스</string>
+    <string name="action_display_local_badge_manga">로컬 소스</string>
     <string name="action_display_local_badge_anime">로컬 애니메이션</string>
     <string name="action_display_show_continue_reading_button">이어서 보기/읽기 버튼 표시</string>
     <string name="action_order_by_episode_number">회차 번호 순</string>
@@ -56,7 +56,7 @@
     <string name="pref_bottom_nav_style">하단 탐색 스타일</string>
     <string name="pref_update_only_completely_read">안 읽은 회차가 있음</string>
     <string name="pref_library_update_show_tab_badge">업데이트 아이콘에 읽지 않은 횟수 표시</string>
-    <string name="default_category">기본 카테고리</string>
+    <string name="default_manga_category">기본 카테고리</string>
     <string name="default_anime_category">기본 애니메이션 카테고리</string>
     <string name="pref_manga_library_update_categories_details">카테고리가 업데이트에서 제외된 경우 다른 카테고리에 포함되어 있어도 업데이트 되지 않습니다.</string>
     <string name="pref_anime_library_update_categories_details">제외된 카테고리의 애니메이션은 포함된 카테고리에 있어도 업데이트되지 않습니다.</string>
@@ -99,10 +99,8 @@
     <string name="pref_remove_after_marked_as_read">수동으로 읽음 표시 될 경우 삭제</string>
     <string name="pref_remove_after_read">읽은 후 자동으로 삭제</string>
     <string name="pref_remove_bookmarked_chapters">북마크 표시된 회차 삭제 허용</string>
-    <string name="pref_remove_exclude_categories">제외된 카테고리</string>
+    <string name="pref_remove_exclude_categories_manga">제외된 카테고리</string>
     <string name="pref_remove_exclude_categories_anime">제외된 애니메이션 카테고리</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">애니메이션:</string>
-    <string name="pref_remove_exclude_categories_prefix">만화:</string>
     <string name="pref_category_external_downloader">외부 다운로더</string>
     <string name="pref_use_external_downloader">애니메이션에는 항상 외부 다운로더 사용</string>
     <string name="pref_external_downloader_selection">다운로더 앱 기본 설정</string>
@@ -118,9 +116,9 @@
     <string name="pref_clear_chapter_cache">회차별 캐시 삭제</string>
     <string name="used_cache_both">애니메이션에서 사용: %1$s, 만화에서 사용: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">앱 종료 시 회차 캐시 삭제</string>
-    <string name="pref_clear_database">데이터베이스 삭제</string>
+    <string name="pref_clear_manga_database">데이터베이스 삭제</string>
     <string name="pref_clear_anime_database">애니메이션 데이터베이스 삭제</string>
-    <string name="pref_clear_database_summary">서재에 추가되지 않은 항목의 기록을 삭제합니다</string>
+    <string name="pref_clear_manga_database_summary">서재에 추가되지 않은 항목의 기록을 삭제합니다</string>
     <string name="pref_clear_anime_database_summary">서재에 추가되지 않은 애니메이션의 기록을 삭제합니다</string>
     <string name="clear_database_confirmation">확실합니까\? 서재에 없는 항목의 읽은 기록이 삭제됩니다</string>
     <string name="pref_refresh_library_tracking_summary">상태 및 평점, 마지막으로 읽은 회차를 동기화 서비스로부터 업데이트합니다</string>
@@ -169,8 +167,8 @@
     <string name="episode_progress_no_total">진행 상황: %1$s</string>
     <string name="screenshot_header">스크린 샷 찍기</string>
     <string name="screenshot_show_subs">스크린 샷에 자막 표시</string>
-    <string name="toggle_volume_brightness_gestures">볼륨 및 밝기 제스처 활성화</string>
-    <string name="toggle_horizontal_seek_gesture">가로 탐색 제스처 활성화</string>
+    <string name="enable_volume_brightness_gestures">볼륨 및 밝기 제스처 활성화</string>
+    <string name="enable_horizontal_seek_gesture">가로 탐색 제스처 활성화</string>
     <string name="stats_header">통계 표시</string>
     <string name="toggle_stats">통계 활성화</string>
     <string name="stats_page">통계 페이지</string>
@@ -223,7 +221,7 @@
     <string name="player_aniskip_ed">엔딩 건너뛰기</string>
     <string name="player_aniskip_mixedOp">MixedOp 건너뛰기</string>
     <string name="player_aniskip_recap">요약 건너뛰기</string>
-    <string name="pref_category_player_aniskip">AniSkip 설정</string>
+    <string name="pref_category_player_aniskip_info">AniSkip 설정</string>
     <string name="pref_enable_aniskip">AniSkip 사용</string>
     <string name="pref_enable_auto_skip_ani_skip">자동 건너뛰기 사용</string>
     <string name="pref_waiting_time_aniskip">버튼 시간 초과</string>
diff --git a/i18n/src/main/res/values-lt/strings-aniyomi.xml b/i18n/src/main/res/values-lt/strings-aniyomi.xml
index 2b9c47723..91aa22d95 100644
--- a/i18n/src/main/res/values-lt/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-lt/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Atrakinkite Anijomi</string>
     <string name="action_sort_last_manga_update">Paskutinis atnaujinimo patikrinimas</string>
     <string name="action_show_manga">Rodyti įrašą</string>
-    <string name="action_display_local_badge">Vietinis šaltinis</string>
+    <string name="action_display_local_badge_manga">Vietinis šaltinis</string>
     <string name="pref_update_only_completely_read">Kai yra neskaitytų skyrių</string>
     <string name="pref_library_update_show_tab_badge">Rodyti neperskaitytų skyrių skaičių prie \"Naujiniai\" ikonos</string>
-    <string name="default_category">Numatyta kategorija</string>
+    <string name="default_manga_category">Numatyta kategorija</string>
     <string name="pref_manga_library_update_categories_details">Įrašai, kurie yra įtraukti į neįtraukiamas kategorijas, nebus atnaujinami, net jei yra įtraukti į įtrauktąsias kategorijas.</string>
     <string name="untrusted_extension_message">Šis plėtinys buvo pasirašytas nepatikimu sertifikatu ir nebuvo aktyvuotas.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Rankinių būdu pažymėtas, kaip skaitytas</string>
     <string name="pref_remove_after_read">Perskaičius automatiškai naikinti</string>
     <string name="pref_remove_bookmarked_chapters">Leisti naikinti žymėtus skyrius</string>
-    <string name="pref_remove_exclude_categories">Neįtrauktos kategorijos</string>
+    <string name="pref_remove_exclude_categories_manga">Neįtrauktos kategorijos</string>
     <string name="pref_auto_update_manga_sync">Po perskaitymo atnaujinti statusą</string>
     <string name="pref_clear_chapter_cache">Išvalyti skyriaus talpyklą</string>
     <string name="pref_auto_clear_chapter_cache">Išvalyti skyriaus talpyklą uždarius programą</string>
-    <string name="pref_clear_database">Išvalyti duomenų bazę</string>
-    <string name="pref_clear_database_summary">Ištrinkite įrašų istoriją, kurie nėra išsaugoti jūsų bibliotekoje</string>
+    <string name="pref_clear_manga_database">Išvalyti duomenų bazę</string>
+    <string name="pref_clear_manga_database_summary">Ištrinkite įrašų istoriją, kurie nėra išsaugoti jūsų bibliotekoje</string>
     <string name="clear_database_confirmation">Ar tikrai\? Perskaityti skyriai ir nebibliotekinių įrašų progresas bus prarastas</string>
     <string name="pref_refresh_library_tracking_summary">Atnaujina būseną, įvertinimą ir paskutinį perskaitytą skyrių iš sekimo paslaugų</string>
     <string name="pref_incognito_mode_summary">Pristabdo skaitymo istoriją</string>
diff --git a/i18n/src/main/res/values-lv/strings-aniyomi.xml b/i18n/src/main/res/values-lv/strings-aniyomi.xml
index 56707f373..e54fedb36 100644
--- a/i18n/src/main/res/values-lv/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-lv/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Atslēgt Anijomi</string>
     <string name="action_sort_last_manga_update">Pēdējais manga atjauninājums</string>
     <string name="action_show_manga">Rādīt manga</string>
-    <string name="action_display_local_badge">Lokālā manga</string>
+    <string name="action_display_local_badge_manga">Lokālā manga</string>
     <string name="pref_update_only_completely_read">Ar nelasītu(ām) nodaļu(ām)</string>
     <string name="pref_library_update_show_tab_badge">Rādīt nelasīto skaitu uz Atjauninājumi ikonas</string>
-    <string name="default_category">Noklusētā kategorija</string>
+    <string name="default_manga_category">Noklusētā kategorija</string>
     <string name="pref_manga_library_update_categories_details">Izslēgto kategoriju manga netiks atjaunināta, pat ja tās ir arī iekļautajās kategorijās.</string>
     <string name="untrusted_extension_message">Šis paplašinājums tika parakstīts ar neuzticamu sertifikātu, un tas netika aktivizēts.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Pēc manuālas atzīmēšanas kā lasītu</string>
     <string name="pref_remove_after_read">Pēc lasīšanas automātiski izdzēst nodaļas</string>
     <string name="pref_remove_bookmarked_chapters">Atļaut dzēst ar grāmatzīmēm atzīmētās nodaļas</string>
-    <string name="pref_remove_exclude_categories">Izslēgtās kategorijas</string>
+    <string name="pref_remove_exclude_categories_manga">Izslēgtās kategorijas</string>
     <string name="pref_auto_update_manga_sync">Atjaunot progresu pēc lasīšanas</string>
     <string name="pref_clear_chapter_cache">Notīrīt nodaļas kešatmiņu</string>
     <string name="pref_auto_clear_chapter_cache">Notīriet nodaļu kešatmiņu, aizverot lietotni</string>
-    <string name="pref_clear_database">Notīrīt datu bāzi</string>
-    <string name="pref_clear_database_summary">Dzēst vēsturi preikš manga, kas nav saglabāta bibliotēkā</string>
+    <string name="pref_clear_manga_database">Notīrīt datu bāzi</string>
+    <string name="pref_clear_manga_database_summary">Dzēst vēsturi preikš manga, kas nav saglabāta bibliotēkā</string>
     <string name="clear_database_confirmation">Vai esi pārliecināts\? Lasītās nodaļas un progress priekš manga, kuras nav bibliotēkā, būs zudis</string>
     <string name="pref_refresh_library_tracking_summary">Atjaunina statusu, vērtējumu un pēdējo izlasīto nodaļu no izsekošanas servisa</string>
     <string name="pref_incognito_mode_summary">Pauzē lasīšanas vēsturi</string>
diff --git a/i18n/src/main/res/values-mr/strings-aniyomi.xml b/i18n/src/main/res/values-mr/strings-aniyomi.xml
index bec0ca40d..d20910d8d 100644
--- a/i18n/src/main/res/values-mr/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-mr/strings-aniyomi.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="manga_categories">श्रेण्या</string>
     <string name="unlock_app">तचीयोमी उघडा</string>
-    <string name="default_category">मूलभूत श्रेणी</string>
+    <string name="default_manga_category">मूलभूत श्रेणी</string>
     <string name="untrusted_extension_message">हे एक्सटेन्शन एका अविश्वासू प्रमानपत्रासहित आले आहे म्हणून हे स्थापित होऊ शकले नाही. 
 \n
 \nअसे अविश्वासू एक्सटेन्शन आपले लॉगिन बाबत माहिती चोरू शकते.
diff --git a/i18n/src/main/res/values-ms/strings-aniyomi.xml b/i18n/src/main/res/values-ms/strings-aniyomi.xml
index 614ec1023..11eb24dda 100644
--- a/i18n/src/main/res/values-ms/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ms/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Buka kunci Aniyomi</string>
     <string name="action_sort_last_manga_update">Semakan kemas kini terakhir</string>
     <string name="action_show_manga">Tunjuk entri</string>
-    <string name="action_display_local_badge">Sumber setempat</string>
+    <string name="action_display_local_badge_manga">Sumber setempat</string>
     <string name="pref_update_only_completely_read">Dengan bab yang belum dibaca</string>
     <string name="pref_library_update_show_tab_badge">Tunjuk bilangan belum dibaca pada ikon Kemas kini</string>
-    <string name="default_category">Kategori lalai</string>
+    <string name="default_manga_category">Kategori lalai</string>
     <string name="pref_manga_library_update_categories_details">Entri di dalam kategori berkecuali tidak akan dikemas kini walaupun ianya ada di dalam kategori hanya.</string>
     <string name="untrusted_extension_message">Sambungan ini telah ditandatangani dengan sijil tidak dipercayai dan ia tidak diaktifkan.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Selepas secara manual ditandakan sebagai dibaca</string>
     <string name="pref_remove_after_read">Selepas membaca padam secara automatik</string>
     <string name="pref_remove_bookmarked_chapters">Benarkan memadam bab yang ditanda</string>
-    <string name="pref_remove_exclude_categories">Kategori dikecualikan</string>
+    <string name="pref_remove_exclude_categories_manga">Kategori dikecualikan</string>
     <string name="pref_auto_update_manga_sync">Kemas kini selepas dibaca</string>
     <string name="pref_clear_chapter_cache">Hapus cache bab</string>
     <string name="pref_auto_clear_chapter_cache">Hapus cache bab apabila menutup aplikasi</string>
-    <string name="pref_clear_database">Hapus pangkalan data</string>
-    <string name="pref_clear_database_summary">Hapus sejarah entri yang tidak disimpan di dalam pustaka</string>
+    <string name="pref_clear_manga_database">Hapus pangkalan data</string>
+    <string name="pref_clear_manga_database_summary">Hapus sejarah entri yang tidak disimpan di dalam pustaka</string>
     <string name="clear_database_confirmation">Adakah anda pasti\? Bab dibaca dan kemajuan entri bukan-pustaka akan hilang</string>
     <string name="pref_refresh_library_tracking_summary">Kemas kini status, skor dan bab terakhir dibaca dari perkhidmatan penjejakan</string>
     <string name="pref_incognito_mode_summary">Menjeda sejarah membaca</string>
diff --git a/i18n/src/main/res/values-my/strings-aniyomi.xml b/i18n/src/main/res/values-my/strings-aniyomi.xml
index 8b822d378..178b65f65 100644
--- a/i18n/src/main/res/values-my/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-my/strings-aniyomi.xml
@@ -2,5 +2,5 @@
 <resources>
     <string name="manga_categories">အမျိုးအစားများ</string>
     <string name="unlock_app">Aniyomi ကိုဖွင့်ပါ</string>
-    <string name="default_category">ပုံသေအမျိုးအစား</string>
+    <string name="default_manga_category">ပုံသေအမျိုးအစား</string>
 </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-nb-rNO/strings-aniyomi.xml b/i18n/src/main/res/values-nb-rNO/strings-aniyomi.xml
index 2774c64af..47de03d05 100644
--- a/i18n/src/main/res/values-nb-rNO/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-nb-rNO/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Lås opp Aniyomi</string>
     <string name="action_sort_last_manga_update">Siste oppdateringssjekk</string>
     <string name="action_show_manga">Vis oppføring</string>
-    <string name="action_display_local_badge">Lokal kilde</string>
+    <string name="action_display_local_badge_manga">Lokal kilde</string>
     <string name="pref_update_only_completely_read">Med uleste kapitler</string>
     <string name="pref_library_update_show_tab_badge">Vis antall uleste på oppdateringsikonet</string>
-    <string name="default_category">Standard kategori</string>
+    <string name="default_manga_category">Standard kategori</string>
     <string name="pref_manga_library_update_categories_details">Oppførninger i utelukkede kategorier vil ikke bli oppdatert selv om de også er i inkluderte kategorier.</string>
     <string name="untrusted_extension_message">Denne utvidelsen ble signert med et usikkert sertifikat, og ble dermed ikke aktivert
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Etter manuelt markert som lest</string>
     <string name="pref_remove_after_read">Slett automatisk etter lesing</string>
     <string name="pref_remove_bookmarked_chapters">Tillat sletting av bokmerkede kapitler</string>
-    <string name="pref_remove_exclude_categories">Utelukkede kategorier</string>
+    <string name="pref_remove_exclude_categories_manga">Utelukkede kategorier</string>
     <string name="pref_auto_update_manga_sync">Oppdater fremdrift etter lesing</string>
     <string name="pref_clear_chapter_cache">Tøm kapittelhurtigbuffer</string>
     <string name="pref_auto_clear_chapter_cache">Tøm kapittel hurtigbufferen ved lukking av appen</string>
-    <string name="pref_clear_database">Tøm database</string>
-    <string name="pref_clear_database_summary">Slett historikk for oppføringer som ikke er lagret i biblioteket ditt</string>
+    <string name="pref_clear_manga_database">Tøm database</string>
+    <string name="pref_clear_manga_database_summary">Slett historikk for oppføringer som ikke er lagret i biblioteket ditt</string>
     <string name="clear_database_confirmation">Er du sikker\? Leste kapitler og framdrift for oppføringer som ikke er i biblioteket vil gå tapt</string>
     <string name="pref_refresh_library_tracking_summary">Oppdaterer status, poengsum og sist leste kapittel fra sporingstjenestene</string>
     <string name="pref_incognito_mode_summary">Setter lesehistorikken på pause</string>
diff --git a/i18n/src/main/res/values-ne/strings-aniyomi.xml b/i18n/src/main/res/values-ne/strings-aniyomi.xml
index 2fef1f75c..a5400b9b4 100644
--- a/i18n/src/main/res/values-ne/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ne/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">अनलक ताचियोमी</string>
     <string name="action_sort_last_manga_update">पछिल्लो माङ्गा अपडेट</string>
     <string name="action_show_manga">माङ्गा देखाउनुहोस्</string>
-    <string name="action_display_local_badge">लोकल माङ्गा</string>
+    <string name="action_display_local_badge_manga">लोकल माङ्गा</string>
     <string name="pref_update_only_completely_read">नपढेका अध्यायहरू छन्</string>
     <string name="pref_library_update_show_tab_badge">अपडेट आइकनमा नपढिएको संख्या देखाउनुहोस्</string>
-    <string name="default_category">पूर्वनिर्धारित वर्ग</string>
+    <string name="default_manga_category">पूर्वनिर्धारित वर्ग</string>
     <string name="pref_manga_library_update_categories_details">\"बहिष्कृत\" वर्गहरूमा रहेका माङ्गा \"समावेश गरिएका\" वर्गहरूमा भए पनि अपडेट हुने छैनन्।</string>
     <string name="untrusted_extension_message">यो एक्सटेनशन एक अविश्वसनीय प्रमाणपत्र संग हस्ताक्षर गरिएको थियो र सक्रिय गरिएको थिएन।
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">आफै पढिएको रूपमा चिन्ह लगाइएपछि</string>
     <string name="pref_remove_after_read">पढिसकेपछि स्वचालित रूपमा हटाउनुहोस्</string>
     <string name="pref_remove_bookmarked_chapters">बुकमार्क गरिएका अध्यायहरू हटाउन अनुमति दिनुहोस्</string>
-    <string name="pref_remove_exclude_categories">बहिष्कृत वर्गहरू</string>
+    <string name="pref_remove_exclude_categories_manga">बहिष्कृत वर्गहरू</string>
     <string name="pref_auto_update_manga_sync">पढिसकेपछि प्रगति अपडेट गर्नुहोस्</string>
     <string name="pref_clear_chapter_cache">अध्याय क्यास खाली गर्नुहोस्</string>
     <string name="pref_auto_clear_chapter_cache">एप बन्दमा अध्याय क्यास खाली गर्नुहोस्</string>
-    <string name="pref_clear_database">डाटाबेस खाली गर्नुहोस्</string>
-    <string name="pref_clear_database_summary">पुस्तकालयमा नभएका माङ्गाको इतिहास हटाउनुहोस्</string>
+    <string name="pref_clear_manga_database">डाटाबेस खाली गर्नुहोस्</string>
+    <string name="pref_clear_manga_database_summary">पुस्तकालयमा नभएका माङ्गाको इतिहास हटाउनुहोस्</string>
     <string name="clear_database_confirmation">साच्चै हो\? पढेका अध्यायहरू र गैर-पुस्तकालय माङ्गाको प्रगति हराउनेछ</string>
     <string name="pref_refresh_library_tracking_summary">ट्र्याकिङ सेवाहरूबाट स्थिति, स्कोर र अन्तिम पढिएको अध्याय अपडेट गर्दछ</string>
     <string name="pref_incognito_mode_summary">पढिएको इतिहास रोक्नु</string>
diff --git a/i18n/src/main/res/values-nl/strings-aniyomi.xml b/i18n/src/main/res/values-nl/strings-aniyomi.xml
index aad62c808..f68e7363d 100644
--- a/i18n/src/main/res/values-nl/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-nl/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Ontgrendel Aniyomi</string>
     <string name="action_sort_last_manga_update">Laatst bijgewerkte manga</string>
     <string name="action_show_manga">Laat manga zien</string>
-    <string name="action_display_local_badge">Lokale manga</string>
+    <string name="action_display_local_badge_manga">Lokale manga</string>
     <string name="pref_update_only_completely_read">Heeft ongelezen hoofdstukken</string>
     <string name="pref_library_update_show_tab_badge">Geef ongelezen aantal weer op het Update icoon</string>
-    <string name="default_category">Standaard categorie</string>
+    <string name="default_manga_category">Standaard categorie</string>
     <string name="pref_manga_library_update_categories_details">Manga in uitgesloten categorieën worden niet bijgewerkt, zelfs niet als ze onder opgenomen categorieën vallen.</string>
     <string name="untrusted_extension_message">Deze extensie is door een niet vertrouwd certificaat ondertekend en is niet geactiveerd.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Nadat ze handmatig gemarkeerd zijn als gelezen</string>
     <string name="pref_remove_after_read">Automatisch verwijderen na het lezen</string>
     <string name="pref_remove_bookmarked_chapters">Verwijderen van hoofdstukken met bladwijzers toestaan</string>
-    <string name="pref_remove_exclude_categories">Uitgesloten categoriën</string>
+    <string name="pref_remove_exclude_categories_manga">Uitgesloten categoriën</string>
     <string name="pref_auto_update_manga_sync">Voortgang bijwerken na lezen</string>
     <string name="pref_clear_chapter_cache">Leeg hoofdstukkencache</string>
     <string name="pref_auto_clear_chapter_cache">Hoofdstuk cache leegmaken na het sluiten van de app</string>
-    <string name="pref_clear_database">Database leegmaken</string>
-    <string name="pref_clear_database_summary">Verwijder geschiedenis voor manga die niet in je bibliotheek zijn opgeslagen</string>
+    <string name="pref_clear_manga_database">Database leegmaken</string>
+    <string name="pref_clear_manga_database_summary">Verwijder geschiedenis voor manga die niet in je bibliotheek zijn opgeslagen</string>
     <string name="clear_database_confirmation">Weet je het zeker\? Gelezen hoofdstukken en voortgang voor manga die niet in de bibliotheek zitten zullen verloren gaan</string>
     <string name="pref_refresh_library_tracking_summary">Update status, score en laatst gelezen hoofdstuk van de trackingdiensten</string>
     <string name="pref_incognito_mode_summary">Pauzeert leesgeschiedenis</string>
diff --git a/i18n/src/main/res/values-nn/strings-aniyomi.xml b/i18n/src/main/res/values-nn/strings-aniyomi.xml
index 99446f473..b12cd82ae 100644
--- a/i18n/src/main/res/values-nn/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-nn/strings-aniyomi.xml
@@ -2,11 +2,11 @@
 <resources><string name="manga_categories">Kategoriar</string>
     <string name="unlock_app">Lås opp Tachiyomi</string>
     <string name="action_show_manga">Vis manga</string>
-    <string name="action_display_local_badge">Lokal manga</string>
-    <string name="default_category">Standard kategori</string>
+    <string name="action_display_local_badge_manga">Lokal manga</string>
+    <string name="default_manga_category">Standard kategori</string>
     <string name="pref_manga_library_update_categories_details">Manga i utelatne kategoriar vil ikkje bli oppdatert sjølv om dei òg er i inkluderte kategoriar.</string>
     <string name="pref_category_delete_chapters">Slett kapittel</string>
-    <string name="pref_remove_exclude_categories">Utelatne kategoriar</string>
+    <string name="pref_remove_exclude_categories_manga">Utelatne kategoriar</string>
     <string name="manga_from_library">Manga frå biblioteket</string>
     <string name="snack_add_to_manga_library">Legg manga til i bibliotek\?</string>
     <string name="download_error">Feil</string>
diff --git a/i18n/src/main/res/values-or/strings-aniyomi.xml b/i18n/src/main/res/values-or/strings-aniyomi.xml
index 95dad04e8..2b239a76c 100644
--- a/i18n/src/main/res/values-or/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-or/strings-aniyomi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources><string name="action_show_manga">ମାଙ୍ଗା ଦେଖାଅ</string>
-    <string name="default_category">ଡିଫଲ୍ଟ ବର୍ଗ</string>
+    <string name="default_manga_category">ଡିଫଲ୍ଟ ବର୍ଗ</string>
     <string name="information_webview_required">Tachiyomi ପାଇଁ WebView ଆବଶ୍ୟକ ଅଟେ</string>
     </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-pl/strings-aniyomi.xml b/i18n/src/main/res/values-pl/strings-aniyomi.xml
index d3b3e65b7..488a9b133 100644
--- a/i18n/src/main/res/values-pl/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-pl/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Odblokuj Aniyomi</string>
     <string name="action_sort_last_manga_update">Ostatnia aktualizacja mangi</string>
     <string name="action_show_manga">Pokaż mangę</string>
-    <string name="action_display_local_badge">Lokalne mangi</string>
+    <string name="action_display_local_badge_manga">Lokalne mangi</string>
     <string name="pref_update_only_completely_read">Posiada nieprzeczytane rozdziały</string>
     <string name="pref_library_update_show_tab_badge">Pokaż wskaźnik nieprzeczytanych na ikonie Aktualizacje</string>
-    <string name="default_category">Domyślna kategoria</string>
+    <string name="default_manga_category">Domyślna kategoria</string>
     <string name="pref_manga_library_update_categories_details">Tytuły w wykluczonych kategoriach nie będą aktualizowane, nawet jeśli są również w uwzględnionych kategoriach.</string>
     <string name="untrusted_extension_message">To rozszerzenie było podpisane niezaufanym certyfikatem i nie zostało aktywowane.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Po ręcznym oznaczeniu jako przeczytane</string>
     <string name="pref_remove_after_read">Usuwaj rozdziały automatycznie po przeczytaniu</string>
     <string name="pref_remove_bookmarked_chapters">Usuwaj rozdziały dodane do zakładek</string>
-    <string name="pref_remove_exclude_categories">Wykluczone kategorie</string>
+    <string name="pref_remove_exclude_categories_manga">Wykluczone kategorie</string>
     <string name="pref_auto_update_manga_sync">Aktualizuj postęp po przeczytaniu rozdziału</string>
     <string name="pref_clear_chapter_cache">Wyczyść cache rozdziałów</string>
     <string name="pref_auto_clear_chapter_cache">Wyczyść cache rozdziałów przy wychodzeniu z aplikacji</string>
-    <string name="pref_clear_database">Wyczyść bazę danych</string>
-    <string name="pref_clear_database_summary">Usuń historię mang, których nie ma w twojej bibliotece</string>
+    <string name="pref_clear_manga_database">Wyczyść bazę danych</string>
+    <string name="pref_clear_manga_database_summary">Usuń historię mang, których nie ma w twojej bibliotece</string>
     <string name="clear_database_confirmation">Na pewno? Przeczytane rozdziały i postęp w mangach spoza biblioteki zostaną utracone</string>
     <string name="pref_refresh_library_tracking_summary">Aktualizuje status, ocenę i ostatnio czytany rozdział na podstawie usług śledzenia</string>
     <string name="pref_incognito_mode_summary">Wstrzymuje zapisywanie do historii czytania</string>
diff --git a/i18n/src/main/res/values-pt-rBR/strings-aniyomi.xml b/i18n/src/main/res/values-pt-rBR/strings-aniyomi.xml
index c447b6ebe..6c5ce0149 100644
--- a/i18n/src/main/res/values-pt-rBR/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-pt-rBR/strings-aniyomi.xml
@@ -38,14 +38,14 @@
     <string name="action_show_manga">Mostrar mangá</string>
     <string name="action_show_anime">Mostrar anime</string>
     <string name="action_display_download_badge_anime">Episódios baixados</string>
-    <string name="action_display_local_badge">Mangá local</string>
+    <string name="action_display_local_badge_manga">Mangá local</string>
     <string name="action_display_local_badge_anime">Anime local</string>
     <string name="action_display_show_continue_reading_button">Mostrar o botão continuar assistindo/lendo</string>
     <string name="action_order_by_episode_number">Por número do episódios</string>
     <string name="pref_player_summary">Controle de progresso, reprodutor interno, reprodutor externo</string>
     <string name="pref_update_only_completely_read">Com episódio(s) não visto(s)/capítulo(s) não lido(s)</string>
     <string name="pref_library_update_show_tab_badge">Mostrar a contagem de não vistos/lidos no ícone de Atualizações</string>
-    <string name="default_category">Categoria de mangá padrão</string>
+    <string name="default_manga_category">Categoria de mangá padrão</string>
     <string name="default_anime_category">Categoria de anime padrão</string>
     <string name="pref_manga_library_update_categories_details">Os mangás nas categorias excluídas não serão atualizados, mesmo que também estejam nas categorias incluídas.</string>
     <string name="pref_anime_library_update_categories_details">Os animes nas categorias excluídas não serão atualizados, mesmo que também estejam nas categorias incluídas.</string>
@@ -74,10 +74,8 @@
     <string name="pref_remove_after_marked_as_read">Depois de marcado manualmente como lido/assistido</string>
     <string name="pref_remove_after_read">Depois de ler/assistir exclua automaticamente</string>
     <string name="pref_remove_bookmarked_chapters">Permitir exclusão de capítulos/episódios marcados</string>
-    <string name="pref_remove_exclude_categories">Categorias de mangá excluídas</string>
+    <string name="pref_remove_exclude_categories_manga">Categorias de mangá excluídas</string>
     <string name="pref_remove_exclude_categories_anime">Categorias de anime excluídas</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Mangá:</string>
     <string name="pref_download_new_episodes">Baixar novos episódios</string>
     <string name="auto_download_while_watching">Baixar automaticamente enquanto assiste</string>
     <string name="pref_auto_update_manga_sync">Atualize o progresso após ler/assistir</string>
@@ -85,9 +83,9 @@
     <string name="pref_clear_chapter_cache">Limpar cache de capítulos e episódios</string>
     <string name="used_cache_both">Usado por anime: %1$s, usado por mangá: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Limpar cache de episódio/capítulo ao fechar o aplicativo</string>
-    <string name="pref_clear_database">Limpar banco de dados de mangá</string>
+    <string name="pref_clear_manga_database">Limpar banco de dados de mangá</string>
     <string name="pref_clear_anime_database">Limpar banco de dados de anime</string>
-    <string name="pref_clear_database_summary">Excluir histórico de mangás que não estão salvos em sua biblioteca</string>
+    <string name="pref_clear_manga_database_summary">Excluir histórico de mangás que não estão salvos em sua biblioteca</string>
     <string name="pref_clear_anime_database_summary">Excluir histórico de animes que não estão salvos em sua biblioteca</string>
     <string name="clear_database_confirmation">Tem certeza\? Os episódios e capítulos concluídos e o progresso dos itens que não estão na sua biblioteca serão perdidos</string>
     <string name="pref_refresh_library_tracking_summary">Atualiza os estados, as avaliações e os últimos capítulos lidos dos serviços de monitoramento</string>
@@ -178,7 +176,7 @@
     <string name="playback_options_title">Opções de reprodução</string>
     <string name="player_aniskip_op">Pular Abertura</string>
     <string name="player_aniskip_ed">Pular Final</string>
-    <string name="pref_category_player_aniskip">Configurações do AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Configurações do AniSkip</string>
     <string name="pref_enable_aniskip">Habilitar o AniSkip</string>
     <string name="pref_waiting_time_aniskip_5">5 segundos</string>
     <string name="pref_waiting_time_aniskip_6">6 segundos</string>
diff --git a/i18n/src/main/res/values-pt/strings-aniyomi.xml b/i18n/src/main/res/values-pt/strings-aniyomi.xml
index 8ebc6c80d..e5fa5f26f 100644
--- a/i18n/src/main/res/values-pt/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-pt/strings-aniyomi.xml
@@ -35,14 +35,14 @@
     <string name="action_show_manga">Mostrar mangá</string>
     <string name="action_show_anime">Mostrar anime</string>
     <string name="action_display_download_badge_anime">Episódios descarregados</string>
-    <string name="action_display_local_badge">Mangás locais</string>
+    <string name="action_display_local_badge_manga">Mangás locais</string>
     <string name="action_display_local_badge_anime">Anime local</string>
     <string name="action_display_show_continue_reading_button">Mostrar o botão continuar assistindo/lendo</string>
     <string name="action_order_by_episode_number">Por número do episódio</string>
     <string name="pref_player_summary">Controle de progresso, reprodutor interno, reprodutor externo</string>
     <string name="pref_update_only_completely_read">Com capítulo(s) não lidos</string>
     <string name="pref_library_update_show_tab_badge">Mostrar número de capítulos não lidos no ícone de Atualizações</string>
-    <string name="default_category">Categoria padrão</string>
+    <string name="default_manga_category">Categoria padrão</string>
     <string name="default_anime_category">Categoria de anime padrão</string>
     <string name="pref_manga_library_update_categories_details">Mangá em categorias excluídas não será atualizada mesmo que também estejam nas categorias incluídas.</string>
     <string name="pref_anime_library_update_categories_details">Os animes nas categorias excluídas não serão atualizados, mesmo que também estejam nas categorias incluídas.</string>
@@ -67,10 +67,8 @@
     <string name="pref_remove_after_marked_as_read">Após marcado como lido manualmente</string>
     <string name="pref_remove_after_read">Eliminar automaticamente após a leitura</string>
     <string name="pref_remove_bookmarked_chapters">Permitir a eliminação de capítulos marcados</string>
-    <string name="pref_remove_exclude_categories">Categorias excluídas</string>
+    <string name="pref_remove_exclude_categories_manga">Categorias excluídas</string>
     <string name="pref_remove_exclude_categories_anime">Categorias de anime excluídas</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Mangá:</string>
     <string name="pref_download_new_episodes">Descarregar novos episódios</string>
     <string name="auto_download_while_watching">Descarregar automaticamente enquanto assiste</string>
     <string name="pref_auto_update_manga_sync">Atualizar progresso após a leitura</string>
@@ -78,9 +76,9 @@
     <string name="pref_clear_chapter_cache">Limpar a cache dos capítulos</string>
     <string name="used_cache_both">Usado por anime: %1$s, usado por mangá: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Limpar a cache de capítulos ao fechar a app</string>
-    <string name="pref_clear_database">Limpar base de dados</string>
+    <string name="pref_clear_manga_database">Limpar base de dados</string>
     <string name="pref_clear_anime_database">Limpar banco de dados de anime</string>
-    <string name="pref_clear_database_summary">Eliminar o histórico de mangás e capítulos não guardados na biblioteca</string>
+    <string name="pref_clear_manga_database_summary">Eliminar o histórico de mangás e capítulos não guardados na biblioteca</string>
     <string name="pref_clear_anime_database_summary">Apagar histórico de animes que não estão gravados na sua biblioteca</string>
     <string name="clear_database_confirmation">Tem certeza\? O progresso de capítulos e mangás fora da biblioteca será perdido</string>
     <string name="pref_refresh_library_tracking_summary">Atualiza estado, avaliações e últimos capítulos lidos dos serviços de monitorização</string>
@@ -156,7 +154,7 @@
     <string name="playback_options_title">Opções de reprodução</string>
     <string name="player_aniskip_op">Pular Abertura</string>
     <string name="player_aniskip_ed">Pular Final</string>
-    <string name="pref_category_player_aniskip">Configurações do AniSkip</string>
+    <string name="pref_category_player_aniskip_info">Configurações do AniSkip</string>
     <string name="pref_enable_aniskip">Ativar o AniSkip</string>
     <string name="pref_waiting_time_aniskip_5">5 segundos</string>
     <string name="pref_waiting_time_aniskip_6">6 segundos</string>
diff --git a/i18n/src/main/res/values-ro/strings-aniyomi.xml b/i18n/src/main/res/values-ro/strings-aniyomi.xml
index 31a08a928..2505c0dbb 100644
--- a/i18n/src/main/res/values-ro/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ro/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Deblochează Aniyomi</string>
     <string name="action_sort_last_manga_update">Ultima actualizare manga</string>
     <string name="action_show_manga">Afișați manga</string>
-    <string name="action_display_local_badge">Manga local</string>
+    <string name="action_display_local_badge_manga">Manga local</string>
     <string name="pref_update_only_completely_read">Cu capitol(e) necitit(e)</string>
     <string name="pref_library_update_show_tab_badge">Afișați numărul de necitite pe pictograma Actualizări</string>
-    <string name="default_category">Categorie implicită</string>
+    <string name="default_manga_category">Categorie implicită</string>
     <string name="pref_manga_library_update_categories_details">Manga din categoriile excluse nu vor fi actualizate, chiar dacă se află și în categoriile incluse.</string>
     <string name="untrusted_extension_message">Extensia a fost semnată cu un certificat nesigur și nu a fost activată.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">După ce a fost marcat manual ca citit</string>
     <string name="pref_remove_after_read">După citire ștergeți automat</string>
     <string name="pref_remove_bookmarked_chapters">Permite ștergerea capitolelor marcate</string>
-    <string name="pref_remove_exclude_categories">Categorii excluse</string>
+    <string name="pref_remove_exclude_categories_manga">Categorii excluse</string>
     <string name="pref_auto_update_manga_sync">Actualizarea progresului după citire</string>
     <string name="pref_clear_chapter_cache">Curățare capitole depozitate</string>
     <string name="pref_auto_clear_chapter_cache">Șterge memoria cache a capitolului la închiderea aplicației</string>
-    <string name="pref_clear_database">Curățați baza de date</string>
-    <string name="pref_clear_database_summary">Ștergeți istoricul pentru manga care nu sunt salvate în bibliotecă</string>
+    <string name="pref_clear_manga_database">Curățați baza de date</string>
+    <string name="pref_clear_manga_database_summary">Ștergeți istoricul pentru manga care nu sunt salvate în bibliotecă</string>
     <string name="clear_database_confirmation">Ești sigur\? Capitolele citite și progresul oricărei manga ce nu este în bibliotecă vor fi pierdute</string>
     <string name="pref_refresh_library_tracking_summary">Actualizează starea, scorul și ultimul capitol citit de la serviciile de urmărire</string>
     <string name="pref_incognito_mode_summary">Întrerupe citirea istoricului</string>
diff --git a/i18n/src/main/res/values-ru/strings-aniyomi.xml b/i18n/src/main/res/values-ru/strings-aniyomi.xml
index 83661f6f0..4255d2d19 100644
--- a/i18n/src/main/res/values-ru/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-ru/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Разблокировать Aniyomi</string>
     <string name="action_sort_last_manga_update">Последняя проверка обновления</string>
     <string name="action_show_manga">Показать запись</string>
-    <string name="action_display_local_badge">Персональный источник</string>
+    <string name="action_display_local_badge_manga">Персональный источник</string>
     <string name="pref_update_only_completely_read">Есть непрочитанные главы</string>
     <string name="pref_library_update_show_tab_badge">Непрочитанные главы на иконке «Обновления»</string>
-    <string name="default_category">Основная категория</string>
+    <string name="default_manga_category">Основная категория</string>
     <string name="pref_manga_library_update_categories_details">Записи в исключённых категориях не будут обновляться, даже если находятся во включённых категориях.</string>
     <string name="untrusted_extension_message">Это расширение было подписано ненадёжным сертификатом и не было активировано.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Удалять помеченое как «Прочитано»</string>
     <string name="pref_remove_after_read">Удалять после прочтения</string>
     <string name="pref_remove_bookmarked_chapters">Удалять главы с закладками</string>
-    <string name="pref_remove_exclude_categories">Исключённые категории</string>
+    <string name="pref_remove_exclude_categories_manga">Исключённые категории</string>
     <string name="pref_auto_update_manga_sync">Обновлять прогресс после прочтения</string>
     <string name="pref_clear_chapter_cache">Очистить кэш глав</string>
     <string name="pref_auto_clear_chapter_cache">Очищать кэш глав при закрытии приложения</string>
-    <string name="pref_clear_database">Очистить базу данных</string>
-    <string name="pref_clear_database_summary">Удалить историю для записей, которые не находятся в библиотеке</string>
+    <string name="pref_clear_manga_database">Очистить базу данных</string>
+    <string name="pref_clear_manga_database_summary">Удалить историю для записей, которые не находятся в библиотеке</string>
     <string name="clear_database_confirmation">Вы уверены\? Прочитанные главы и прогресс не библиотечных записей будет потерян</string>
     <string name="pref_refresh_library_tracking_summary">Обновляет статус, оценку и последнюю прочитанную главу для сервисов отслеживания</string>
     <string name="pref_incognito_mode_summary">Приостанавливает историю чтения</string>
diff --git a/i18n/src/main/res/values-sa/strings-aniyomi.xml b/i18n/src/main/res/values-sa/strings-aniyomi.xml
index 23a5d27ea..e02c0f3e1 100644
--- a/i18n/src/main/res/values-sa/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sa/strings-aniyomi.xml
@@ -3,21 +3,21 @@
     <string name="manga_categories">वर्गाः</string>
     <string name="unlock_app">ताचियोमिम् उद्घाटयतु</string>
     <string name="action_show_manga">माङ्गां दर्शयतु</string>
-    <string name="action_display_local_badge">स्थानीयाः माङ्गाः</string>
+    <string name="action_display_local_badge_manga">स्थानीयाः माङ्गाः</string>
     <string name="pref_update_only_completely_read">अपठितान् अध्यायान् गृह्णाति</string>
     <string name="pref_library_update_show_tab_badge">नवीकरणचित्रकस्य उपरि अपठितसङ्ख्यां दर्शयतु</string>
-    <string name="default_category">प्राथमिकवर्गः</string>
+    <string name="default_manga_category">प्राथमिकवर्गः</string>
     <string name="pref_manga_library_update_categories_details">माङ्गाः याः वर्जितवर्गेषु सन्ति ताः अन्तर्भूतवर्गेषु सन्ति चेदपि तासां नवीकरणं न भविष्यति।</string>
     <string name="pref_category_delete_chapters">अध्यायान् नाशयतु</string>
     <string name="pref_remove_after_marked_as_read">पठितमिति स्वीयचिह्नितात् परम्</string>
     <string name="pref_remove_after_read">पठनात् परं स्वयञ्चालितं नाशयतु</string>
     <string name="pref_remove_bookmarked_chapters">पुटचिह्नकृतानाम् अध्यायानां नाशयितुम् अनुमन्यताम्</string>
-    <string name="pref_remove_exclude_categories">वर्जितवर्गाः</string>
+    <string name="pref_remove_exclude_categories_manga">वर्जितवर्गाः</string>
     <string name="pref_auto_update_manga_sync">पठनात् परं प्रगतिं नवीकरोतु</string>
     <string name="pref_clear_chapter_cache">अध्यायस्य काष्वस्तु मार्जयतु</string>
     <string name="pref_auto_clear_chapter_cache">अनुप्रयोगपिधाने अध्यायस्य काष्वस्तु मार्जयतु</string>
-    <string name="pref_clear_database">दत्तनिधिं मार्जयतु</string>
-    <string name="pref_clear_database_summary">तव ग्रन्थालये न रक्षितानां माङ्गानां चरित्रं नाशय</string>
+    <string name="pref_clear_manga_database">दत्तनिधिं मार्जयतु</string>
+    <string name="pref_clear_manga_database_summary">तव ग्रन्थालये न रक्षितानां माङ्गानां चरित्रं नाशय</string>
     <string name="clear_database_confirmation">त्वं निश्चितं किम्। पर-ग्रन्थालय-माङ्गानाम् अपिठाध्यायाः नष्टाः भविष्यन्ते</string>
     <string name="pref_refresh_library_tracking_summary">अनुप्रज्ञानसेवाभ्यः स्थितिं प्राप्ताङ्कं अन्तिमपठिताध्यायं च नवीकरोति</string>
     <string name="pref_incognito_mode_summary">पठनचरित्रं विरमिष्यति</string>
diff --git a/i18n/src/main/res/values-sah/strings-aniyomi.xml b/i18n/src/main/res/values-sah/strings-aniyomi.xml
index da7e00da3..1939227e8 100644
--- a/i18n/src/main/res/values-sah/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sah/strings-aniyomi.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="manga_categories">Бөлөхтөр</string>
     <string name="unlock_app">Aniyomi арыйыыта</string>
-    <string name="default_category">Куолутунан бөлөх</string>
+    <string name="default_manga_category">Куолутунан бөлөх</string>
     <string name="pref_manga_library_update_categories_details">Сотуллубут категориялар маангалара саҥардыллыа суоҕа, холбоммут категорияларга баарын үрдүнэн.</string>
     <string name="untrusted_extension_message">Бу кэҥэтии эрэлэ суох туоһу суругунан бэлиэтэммит уонна холбоммотох.
 \n
@@ -15,8 +15,8 @@
     <string name="pref_remove_bookmarked_chapters">Кыбытыылах түһүмэхтэри соттор</string>
     <string name="pref_auto_update_manga_sync">Түһүмэх туругун ааҕы кэннэ саҥарт</string>
     <string name="pref_clear_chapter_cache">Түһүмэх кээһин ыраастааһын</string>
-    <string name="pref_clear_database">Билим олоҕо ыраастааһына</string>
-    <string name="pref_clear_database_summary">Эн бэбэлэтиэкэҕэр суох маанга остуоруйатын сотторуу</string>
+    <string name="pref_clear_manga_database">Билим олоҕо ыраастааһына</string>
+    <string name="pref_clear_manga_database_summary">Эн бэбэлэтиэкэҕэр суох маанга остуоруйатын сотторуу</string>
     <string name="clear_database_confirmation">Эрэллэххин дуо\? Ааҕыллыбыт түһүмэхтэр уонна бэбэлэтиэкэҕэ суох маанга туруга сүтүө</string>
     <string name="pref_refresh_library_tracking_summary">Туругу, ахсааны уонна бүтэһик ааҕыллыбыт түһүмэҕи кэтээн көрөр өҥөлөртөн саҥардыы</string>
     <string name="pref_incognito_mode_summary">Ааҕы остуоруйатын тохтотор</string>
diff --git a/i18n/src/main/res/values-sc/strings-aniyomi.xml b/i18n/src/main/res/values-sc/strings-aniyomi.xml
index 34a37252b..c33687693 100644
--- a/i18n/src/main/res/values-sc/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sc/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Isbloca Aniyomi</string>
     <string name="action_sort_last_manga_update">Ùrtimu agiornamentu</string>
     <string name="action_show_manga">Ammustra s\'elementu</string>
-    <string name="action_display_local_badge">Fontes locales</string>
+    <string name="action_display_local_badge_manga">Fontes locales</string>
     <string name="pref_update_only_completely_read">Cun capìtulos non lèghidos</string>
     <string name="pref_library_update_show_tab_badge">Ammustra su nùmeru de capìtulos non lèghidos in s\'icona de sos agiornamentos</string>
-    <string name="default_category">Categoria predefinida</string>
+    <string name="default_manga_category">Categoria predefinida</string>
     <string name="pref_manga_library_update_categories_details">Sos elementos in sas categorias esclùdidas non s\'ant a agiornare nemmancu si sunt fintzas in categorias inclùdidas.</string>
     <string name="untrusted_extension_message">Custa estensione est istada firmada cun unu tzertificadu chi no est afidàbile e no est istada ativada.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">A pustis de l\'àere marcadu manualmente comente lèghidu</string>
     <string name="pref_remove_after_read">Iscantzella in automàticu a pustis de sa leghidura</string>
     <string name="pref_remove_bookmarked_chapters">Permite s\'iscantzelladura de sos capìtulos cun sinnalibros</string>
-    <string name="pref_remove_exclude_categories">Categorias esclùdidas</string>
+    <string name="pref_remove_exclude_categories_manga">Categorias esclùdidas</string>
     <string name="pref_auto_update_manga_sync">Agiorna su progressu a pustis de sa leghidura</string>
     <string name="pref_clear_chapter_cache">Isbòida sa memòria temporànea de sos capìtulos</string>
     <string name="pref_auto_clear_chapter_cache">Isbòida sa memòria temporànea de sos capìtulos cando serras s\'aplicatzione</string>
-    <string name="pref_clear_database">Isbòida sa base de datos</string>
-    <string name="pref_clear_database_summary">Iscantzella sa cronologia pro sos elementos chi non sunt sarvados in sa biblioteca tua</string>
+    <string name="pref_clear_manga_database">Isbòida sa base de datos</string>
+    <string name="pref_clear_manga_database_summary">Iscantzella sa cronologia pro sos elementos chi non sunt sarvados in sa biblioteca tua</string>
     <string name="clear_database_confirmation">Seguru ses\? Sos capìtulos lèghidos e su progressu de sos elementos chi non sunt in sa biblioteca s\'ant a pèrdere</string>
     <string name="pref_refresh_library_tracking_summary">Agiornat s\'istadu, su votu e s\'ùrtimu capìtulu lèghidu dae sos servìtzios de arrastamentu</string>
     <string name="pref_incognito_mode_summary">Ponet in pàusa sa registratzione de sa cronologia de leghidura</string>
diff --git a/i18n/src/main/res/values-sdh/strings-aniyomi.xml b/i18n/src/main/res/values-sdh/strings-aniyomi.xml
index 6d8bf1c9e..9d2c0e035 100644
--- a/i18n/src/main/res/values-sdh/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sdh/strings-aniyomi.xml
@@ -4,6 +4,6 @@
     <string name="unlock_app">بکەرەوەTachiyomi</string>
     <string name="action_sort_last_manga_update">کۆتانوێکردنەوەی مانگا</string>
     <string name="action_show_manga">نیشاندانی مانگا</string>
-    <string name="action_display_local_badge">مانگای ناوخۆیی</string>
+    <string name="action_display_local_badge_manga">مانگای ناوخۆیی</string>
     <string name="snack_add_to_manga_library">زیادکردنی مانگا بۆ کۆکراوەکان؟</string>
 </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-sk/strings-aniyomi.xml b/i18n/src/main/res/values-sk/strings-aniyomi.xml
index d9671a891..e9e2b1cca 100644
--- a/i18n/src/main/res/values-sk/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sk/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Odomknúť Tachiyomi</string>
     <string name="action_sort_last_manga_update">Posledná aktualizácia mangy</string>
     <string name="action_show_manga">Zobraziť mangu</string>
-    <string name="action_display_local_badge">Lokálna manga</string>
+    <string name="action_display_local_badge_manga">Lokálna manga</string>
     <string name="pref_update_only_completely_read">S neprečítanými kapitolami</string>
     <string name="pref_library_update_show_tab_badge">Zobraziť počet neprečítaných kapitol na ikone Aktualizácie</string>
-    <string name="default_category">Predvolená kategória</string>
+    <string name="default_manga_category">Predvolená kategória</string>
     <string name="pref_manga_library_update_categories_details">Mangy vo vylúčených kategóriách nebudú aktualizované, aj keď sú tiež v zahrnutých kategóriách.</string>
     <string name="untrusted_extension_message">Toto rozšírenie bolo podpísané nedôveryhodným certifikátom a nebolo aktivované.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Po manuálnom označení ako prečítané</string>
     <string name="pref_remove_after_read">Po prečítaní automaticky odstrániť</string>
     <string name="pref_remove_bookmarked_chapters">Povoliť odstraňovanie kapitol so záložkami</string>
-    <string name="pref_remove_exclude_categories">Vylúčené kategórie</string>
+    <string name="pref_remove_exclude_categories_manga">Vylúčené kategórie</string>
     <string name="pref_auto_update_manga_sync">Aktualizácia priebehu po prečítaní</string>
     <string name="pref_clear_chapter_cache">Vymazať vyrovnávaciu pamäť kapitol</string>
     <string name="pref_auto_clear_chapter_cache">Vymazanie vyrovnávacej pamäte kapitoly pri zatvorení aplikácie</string>
-    <string name="pref_clear_database">Vymazať databázu</string>
-    <string name="pref_clear_database_summary">Odstránenie histórie mangy, ktorá nie je uložená vo vašej knižnici</string>
+    <string name="pref_clear_manga_database">Vymazať databázu</string>
+    <string name="pref_clear_manga_database_summary">Odstránenie histórie mangy, ktorá nie je uložená vo vašej knižnici</string>
     <string name="clear_database_confirmation">Ste si istý\? Čítanie kapitol a pokrok v mangách mimo vašu knižnicu sa stratí</string>
     <string name="pref_refresh_library_tracking_summary">Aktualizuje stav, skóre a poslednú čítanú kapitolu zo sledovacích služieb</string>
     <string name="pref_incognito_mode_summary">Pozastaví históriu čítania</string>
diff --git a/i18n/src/main/res/values-sr/strings-aniyomi.xml b/i18n/src/main/res/values-sr/strings-aniyomi.xml
index 047520004..f255c2e86 100644
--- a/i18n/src/main/res/values-sr/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sr/strings-aniyomi.xml
@@ -3,10 +3,10 @@
     <string name="manga_categories">Kategorije</string>
     <string name="unlock_app">Откључај Aniyomi</string>
     <string name="action_show_manga">Prikaži mange</string>
-    <string name="action_display_local_badge">Lokalne mange</string>
+    <string name="action_display_local_badge_manga">Lokalne mange</string>
     <string name="pref_update_only_completely_read">Sa neporcitanim poglavljem(ima)</string>
     <string name="pref_library_update_show_tab_badge">Прикажи број непрочитаних на икони \"Ново\"</string>
-    <string name="default_category">Podrazumevana kategorija</string>
+    <string name="default_manga_category">Podrazumevana kategorija</string>
     <string name="pref_manga_library_update_categories_details">Манге у искљученим категоријама се неће ажурирати иако су такође у укљученим категоријама.</string>
     <string name="untrusted_extension_message">Овај додатак је потписан неповерљивим сертификатом и због тога није активиран.
 \n
@@ -17,12 +17,12 @@
     <string name="pref_remove_after_marked_as_read">Када су означена као прочитана</string>
     <string name="pref_remove_after_read">Аутоматски обриши након читања</string>
     <string name="pref_remove_bookmarked_chapters">Дозволи брисање забележених поглавља</string>
-    <string name="pref_remove_exclude_categories">Искључене категорије</string>
+    <string name="pref_remove_exclude_categories_manga">Искључене категорије</string>
     <string name="pref_auto_update_manga_sync">Ажурирај пратиоца након читања</string>
     <string name="pref_clear_chapter_cache">Испразни кеш меморију поглавља</string>
     <string name="pref_auto_clear_chapter_cache">Испразни кеш меморију при изласку из апликације</string>
-    <string name="pref_clear_database">Избриши базу података</string>
-    <string name="pref_clear_database_summary">Избриши историју манги које нису сачуване у колекцији</string>
+    <string name="pref_clear_manga_database">Избриши базу података</string>
+    <string name="pref_clear_manga_database_summary">Избриши историју манги које нису сачуване у колекцији</string>
     <string name="clear_database_confirmation">Да ли сте сигурни\? Изгубићете прочитана поглавља и статус манги које нису у колекцији</string>
     <string name="pref_refresh_library_tracking_summary">Ažuriraj status, ocenu i poslednje pročitano poglavlje iz servisa za praćenje</string>
     <string name="pref_incognito_mode_summary">Zaustavlja praćenje istorije čitanja</string>
diff --git a/i18n/src/main/res/values-sv/strings-aniyomi.xml b/i18n/src/main/res/values-sv/strings-aniyomi.xml
index 91d8c62ba..2f0bd8f1e 100644
--- a/i18n/src/main/res/values-sv/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-sv/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Lås upp Aniyomi</string>
     <string name="action_sort_last_manga_update">Sista manga-uppdateringen</string>
     <string name="action_show_manga">Visa manga</string>
-    <string name="action_display_local_badge">Lokal manga</string>
+    <string name="action_display_local_badge_manga">Lokal manga</string>
     <string name="pref_update_only_completely_read">Med olästa kapitel</string>
     <string name="pref_library_update_show_tab_badge">Visa antalet olästa på ikonen Uppdateringar</string>
-    <string name="default_category">Standardkategori</string>
+    <string name="default_manga_category">Standardkategori</string>
     <string name="pref_manga_library_update_categories_details">Manga i uteslutna kategorier uppdateras inte även om de också ingår i inkluderade kategorier.</string>
     <string name="untrusted_extension_message">Detta tillägg tecknades med ett otillförlitligt certifikat och var inte aktiverat.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Efter manuellt markerad som läst</string>
     <string name="pref_remove_after_read">Ta bort automatiskt efter läsning</string>
     <string name="pref_remove_bookmarked_chapters">Tillåt att radera bokmärkta kapitel</string>
-    <string name="pref_remove_exclude_categories">Uteslutna kategorier</string>
+    <string name="pref_remove_exclude_categories_manga">Uteslutna kategorier</string>
     <string name="pref_auto_update_manga_sync">Uppdatera förlopp efter läsning</string>
     <string name="pref_clear_chapter_cache">Rensa kapitelcache</string>
     <string name="pref_auto_clear_chapter_cache">Rensa kapitelcache när appen stängs</string>
-    <string name="pref_clear_database">Rensa databas</string>
-    <string name="pref_clear_database_summary">Ta bort historik för manga som inte finns i ditt bibliotek</string>
+    <string name="pref_clear_manga_database">Rensa databas</string>
+    <string name="pref_clear_manga_database_summary">Ta bort historik för manga som inte finns i ditt bibliotek</string>
     <string name="clear_database_confirmation">Är du säker\? Lästa kapitel och framsteg av icke-bibliotek manga kommer att gå förlorade</string>
     <string name="pref_refresh_library_tracking_summary">Uppdaterar status, betyg och senaste kapitel läst från spårningstjänsterna</string>
     <string name="pref_incognito_mode_summary">Pausar läshistoriken</string>
diff --git a/i18n/src/main/res/values-te/strings-aniyomi.xml b/i18n/src/main/res/values-te/strings-aniyomi.xml
index c4288ab62..f837b3225 100644
--- a/i18n/src/main/res/values-te/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-te/strings-aniyomi.xml
@@ -2,5 +2,5 @@
 <resources>
     <string name="manga_categories">విభాగములు</string>
     <string name="unlock_app">టచియోమిని తెరవండి</string>
-    <string name="action_display_local_badge">స్థానిక మాంగా</string>
+    <string name="action_display_local_badge_manga">స్థానిక మాంగా</string>
 </resources>
\ No newline at end of file
diff --git a/i18n/src/main/res/values-th/strings-aniyomi.xml b/i18n/src/main/res/values-th/strings-aniyomi.xml
index bdb0a881c..76110b69b 100644
--- a/i18n/src/main/res/values-th/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-th/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">ปลดล็อก Tachiyomi</string>
     <string name="action_sort_last_manga_update">มังงะที่อัปเดตล่าสุด</string>
     <string name="action_show_manga">แสดงมังงะ</string>
-    <string name="action_display_local_badge">มังงะในเครื่อง</string>
+    <string name="action_display_local_badge_manga">มังงะในเครื่อง</string>
     <string name="pref_update_only_completely_read">มีตอนที่ยังไม่ได้อ่าน</string>
     <string name="pref_library_update_show_tab_badge">แสดงไอคอนจำนวนตอนที่ยังไม่ได้อ่าน</string>
-    <string name="default_category">หมวดหมู่เริ่มต้น</string>
+    <string name="default_manga_category">หมวดหมู่เริ่มต้น</string>
     <string name="pref_manga_library_update_categories_details">มังงะในหมวดหมู่ที่ยกเว้นจะไม่ได้รับการอัปเดตแม้ว่าจะอยู่ในหมวดหมู่ที่รวมอยู่ด้วยก็ตาม</string>
     <string name="untrusted_extension_message">ส่วนขยายนี้ลงนามด้วยใบรับรองที่ไม่น่าเชื่อถือและจะไม่ถูกเปิดใช้งาน
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">หลังจากทําเครื่องหมายว่าอ่านแล้วด้วยตนเอง</string>
     <string name="pref_remove_after_read">ลบอัตโนมัติหลังจากที่อ่านแล้ว</string>
     <string name="pref_remove_bookmarked_chapters">อนุญาตให้ลบตอนที่บุ๊คมาร์คไว้</string>
-    <string name="pref_remove_exclude_categories">หมวดหมู่ที่ยกเว้น</string>
+    <string name="pref_remove_exclude_categories_manga">หมวดหมู่ที่ยกเว้น</string>
     <string name="pref_auto_update_manga_sync">อัปเดตความคืบหน้าหลังอ่าน</string>
     <string name="pref_clear_chapter_cache">ล้างแคชตอน</string>
     <string name="pref_auto_clear_chapter_cache">ล้างแคชตอนในเมื่อปิดแอพ</string>
-    <string name="pref_clear_database">ล้างฐานข้อมูล</string>
-    <string name="pref_clear_database_summary">ลบประวัติมังงะที่ไม่ได้บันทึกไว้ในคลัง</string>
+    <string name="pref_clear_manga_database">ล้างฐานข้อมูล</string>
+    <string name="pref_clear_manga_database_summary">ลบประวัติมังงะที่ไม่ได้บันทึกไว้ในคลัง</string>
     <string name="clear_database_confirmation">แน่ใจไหม\? ข้อมูลการอ่านของมังงะที่ไม่ได้อยู่ในคลังจะหายไป</string>
     <string name="pref_refresh_library_tracking_summary">อัปเดตสถานะคะแนนและตอนสุดท้ายที่อ่านจากบริการติดตาม</string>
     <string name="pref_incognito_mode_summary">หยุดประวัติการอ่านชั่วคราว</string>
diff --git a/i18n/src/main/res/values-tr/strings-aniyomi.xml b/i18n/src/main/res/values-tr/strings-aniyomi.xml
index f388c033b..e8c2d9785 100644
--- a/i18n/src/main/res/values-tr/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-tr/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">Anime Göster</string>
     <string name="action_display_download_badge_anime">İndirilmiş Anime Bölümleri</string>
     <string name="action_display_unseen_badge">İzlenmemiş Anime Bölümleri</string>
-    <string name="action_display_local_badge">Yerel kaynak</string>
+    <string name="action_display_local_badge_manga">Yerel kaynak</string>
     <string name="action_display_show_continue_reading_button">İzlemeye/okumaya devam et düğmesini göster</string>
     <string name="action_order_by_episode_number">Bölüm Numarasına Göre</string>
     <string name="action_start_download_externally">Harici İndirme Yöneticisi Kullan</string>
@@ -55,7 +55,7 @@
     <string name="pref_bottom_nav_style">Alt Gezinme Çubuğu Stili</string>
     <string name="pref_update_only_completely_read">Okunmayan bölüm(ler)i olan</string>
     <string name="pref_library_update_show_tab_badge">Güncellemeler simgesinde okunmayan sayısını göster</string>
-    <string name="default_category">Varsayılan kategori</string>
+    <string name="default_manga_category">Varsayılan kategori</string>
     <string name="default_anime_category">Varsayılan anime kategorisi</string>
     <string name="pref_manga_library_update_categories_details">Hariç tutulan kategorilerdeki girdiler, dahil edilen kategorilerde olsa bile güncellenmeyecektir.</string>
     <string name="pref_anime_library_update_categories_details">Hariç tutulan kategorilerdeki animeler, dahil edilen kategorilerde de olsalar dahi güncellenmeyecektir.</string>
@@ -90,10 +90,8 @@
     <string name="pref_remove_after_marked_as_read">Elle okundu olarak işaretlenince</string>
     <string name="pref_remove_after_read">Okunduktan sonra otomatik olarak sil</string>
     <string name="pref_remove_bookmarked_chapters">İşaretli bölümleri silmeye izin ver</string>
-    <string name="pref_remove_exclude_categories">İstenmeyen kategoriler</string>
+    <string name="pref_remove_exclude_categories_manga">İstenmeyen kategoriler</string>
     <string name="pref_remove_exclude_categories_anime">Hariç Tutulan Anime Kategorileri</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime:</string>
-    <string name="pref_remove_exclude_categories_prefix">Manga:</string>
     <string name="pref_category_external_downloader">Harici İndirme Yöneticisi</string>
     <string name="pref_use_external_downloader">Anime İçin Her Zaman Harici İndirme Yöneticisi Kullan</string>
     <string name="pref_external_downloader_selection">İndirme Yöneticisi Uygulama Tercihi</string>
@@ -107,8 +105,8 @@
     <string name="pref_auto_update_manga_sync">Okuyunca ilerlemeyi güncelle</string>
     <string name="pref_clear_chapter_cache">Bölüm önbelleğini temizle</string>
     <string name="pref_auto_clear_chapter_cache">Uygulama kapatıldığında bölüm önbelleğini temizle</string>
-    <string name="pref_clear_database">Veritabanını temizle</string>
-    <string name="pref_clear_database_summary">Kitaplığınıza kaydedilmeyen girdilerin geçmiş bilgisini sil</string>
+    <string name="pref_clear_manga_database">Veritabanını temizle</string>
+    <string name="pref_clear_manga_database_summary">Kitaplığınıza kaydedilmeyen girdilerin geçmiş bilgisini sil</string>
     <string name="clear_database_confirmation">Emin misiniz\? Kitaplıkta olmayan girdilerin okunan bölümleri ve ilerlemesi kaybolacak</string>
     <string name="pref_refresh_library_tracking_summary">İzleme hizmetlerinden durumu, puanı ve son okunan bölümü günceller</string>
     <string name="pref_incognito_mode_summary">Okuma geçmişini duraklatır</string>
diff --git a/i18n/src/main/res/values-uk/strings-aniyomi.xml b/i18n/src/main/res/values-uk/strings-aniyomi.xml
index d688da4e2..a6515bc7a 100644
--- a/i18n/src/main/res/values-uk/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-uk/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Відчинити Aniyomi</string>
     <string name="action_sort_last_manga_update">Останні оновлення манґи</string>
     <string name="action_show_manga">Показати серію</string>
-    <string name="action_display_local_badge">Локальна манґа</string>
+    <string name="action_display_local_badge_manga">Локальна манґа</string>
     <string name="pref_update_only_completely_read">Є непрочитані розділи</string>
     <string name="pref_library_update_show_tab_badge">Показувати кількість непрочитаних на значку оновлення</string>
-    <string name="default_category">Категорія за замовчуванням</string>
+    <string name="default_manga_category">Категорія за замовчуванням</string>
     <string name="pref_manga_library_update_categories_details">Манґу в виключених категоріях не буде оновлено, навіть якщо вона також знаходиться у включених категоріях.</string>
     <string name="untrusted_extension_message">Це розширення було підписано ненадійним сертифікатом та не було активовано.
 \n
@@ -18,13 +18,13 @@
     <string name="pref_remove_after_marked_as_read">Після того, як було відмічено прочитаним вручну</string>
     <string name="pref_remove_after_read">Автоматично видаляти після прочитання</string>
     <string name="pref_remove_bookmarked_chapters">Дозволити видалення розділів/епізодів з закладок</string>
-    <string name="pref_remove_exclude_categories">Виключені категорії</string>
+    <string name="pref_remove_exclude_categories_manga">Виключені категорії</string>
     <string name="pref_external_downloader_selection">Налаштування застосунку для завантаження</string>
     <string name="pref_auto_update_manga_sync">Оновлювати прогрес після прочитання</string>
     <string name="pref_clear_chapter_cache">Очистити кеш розділів та епізодів</string>
     <string name="pref_auto_clear_chapter_cache">Очищати кеш розділів при закритті застосунку</string>
-    <string name="pref_clear_database">Очистити базу даних</string>
-    <string name="pref_clear_database_summary">Видалити історію для манґи, котра не знаходиться в вашій бібліотеці</string>
+    <string name="pref_clear_manga_database">Очистити базу даних</string>
+    <string name="pref_clear_manga_database_summary">Видалити історію для манґи, котра не знаходиться в вашій бібліотеці</string>
     <string name="clear_database_confirmation">Ви впевнені\? Прочитані розділи і прогрес не бібліотечної манґи будуть втрачені</string>
     <string name="pref_refresh_library_tracking_summary">Оновлює статус, оцінку та прогрес із служб відстеження</string>
     <string name="pref_incognito_mode_summary">Призупиняє історію читання</string>
diff --git a/i18n/src/main/res/values-vi/strings-aniyomi.xml b/i18n/src/main/res/values-vi/strings-aniyomi.xml
index c9397fb70..2e55b5a30 100644
--- a/i18n/src/main/res/values-vi/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-vi/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">Mở Khoá Aniyomi</string>
     <string name="action_sort_last_manga_update">Cập nhật truyện lần trước</string>
     <string name="action_show_manga">Hiện truyện manga</string>
-    <string name="action_display_local_badge">Số truyện cục bộ</string>
+    <string name="action_display_local_badge_manga">Số truyện cục bộ</string>
     <string name="pref_update_only_completely_read">Có chương chưa đọc</string>
     <string name="pref_library_update_show_tab_badge">Hiển thị số lượng chưa đọc ở phần biểu tượng Cập nhật</string>
-    <string name="default_category">Danh mục mặc định</string>
+    <string name="default_manga_category">Danh mục mặc định</string>
     <string name="pref_manga_library_update_categories_details">Manga trong danh mục bị loại trừ sẽ không được cập nhật.</string>
     <string name="untrusted_extension_message">Tiện ích mở rộng này được đăng ký bằng chứng chỉ không đáng tin cậy và chưa được kích hoạt.
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">Sau khi đánh dấu thủ công là đã đọc</string>
     <string name="pref_remove_after_read">Tự động xóa sau khi đọc</string>
     <string name="pref_remove_bookmarked_chapters">Cho phép xóa các chương đã đánh dấu</string>
-    <string name="pref_remove_exclude_categories">Các thể loại bị loại trừ</string>
+    <string name="pref_remove_exclude_categories_manga">Các thể loại bị loại trừ</string>
     <string name="pref_auto_update_manga_sync">Cập nhật tiến triển sau khi đọc</string>
     <string name="pref_clear_chapter_cache">Dọn dẹp bộ nhớ đệm</string>
     <string name="pref_auto_clear_chapter_cache">Xóa bộ nhớ đệm các chương khi tắt ứng dụng</string>
-    <string name="pref_clear_database">Dọn dẹp cơ sở dữ liệu</string>
-    <string name="pref_clear_database_summary">Xóa truyện và các chương không nằm trong thư viện</string>
+    <string name="pref_clear_manga_database">Dọn dẹp cơ sở dữ liệu</string>
+    <string name="pref_clear_manga_database_summary">Xóa truyện và các chương không nằm trong thư viện</string>
     <string name="clear_database_confirmation">Bạn có chắc không? Các chương đã đọc và tiến độ đọc các truyện không nằm trong thư viện sẽ bị mất</string>
     <string name="pref_refresh_library_tracking_summary">Cập nhật trạng thái, điểm số và chương cuối đã đọc từ dịch vụ theo dõi</string>
     <string name="pref_incognito_mode_summary">Dừng lưu giữ lịch sử đọc</string>
diff --git a/i18n/src/main/res/values-zh-rCN/strings-aniyomi.xml b/i18n/src/main/res/values-zh-rCN/strings-aniyomi.xml
index fc7365d78..bac4a0ddb 100644
--- a/i18n/src/main/res/values-zh-rCN/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-zh-rCN/strings-aniyomi.xml
@@ -46,7 +46,7 @@
     <string name="action_show_anime">显示动画</string>
     <string name="action_display_download_badge_anime">已下载剧集</string>
     <string name="action_display_unseen_badge">未观看剧集</string>
-    <string name="action_display_local_badge">本地漫画</string>
+    <string name="action_display_local_badge_manga">本地漫画</string>
     <string name="action_display_local_badge_anime">本地动画</string>
     <string name="action_display_show_continue_reading_button">显示“继续观看/阅读”按键</string>
     <string name="action_order_by_episode_number">根据剧集序号</string>
@@ -56,7 +56,7 @@
     <string name="pref_bottom_nav_style">底部导航样式</string>
     <string name="pref_update_only_completely_read">有未读章节</string>
     <string name="pref_library_update_show_tab_badge">在“更新”图标上显示未读章数</string>
-    <string name="default_category">默认漫画分类</string>
+    <string name="default_manga_category">默认漫画分类</string>
     <string name="default_anime_category">默认动画分类</string>
     <string name="pref_manga_library_update_categories_details">同时存在于“包含”分类以及“排除”分类的漫画将不会被自动更新。</string>
     <string name="pref_anime_library_update_categories_details">同时存在于“包含”分类以及“排除”分类的动画将不会被自动更新。</string>
@@ -99,10 +99,8 @@
     <string name="pref_remove_after_marked_as_read">手动标记为已读后</string>
     <string name="pref_remove_after_read">阅毕自动删除</string>
     <string name="pref_remove_bookmarked_chapters">允许删除已添加书签的章节</string>
-    <string name="pref_remove_exclude_categories">排除的分类</string>
+    <string name="pref_remove_exclude_categories_manga">排除的分类</string>
     <string name="pref_remove_exclude_categories_anime">已屏蔽的动画分类</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">动画：</string>
-    <string name="pref_remove_exclude_categories_prefix">漫画：</string>
     <string name="pref_category_external_downloader">外置下载器</string>
     <string name="pref_use_external_downloader">总是在下载动画时使用外置下载器</string>
     <string name="pref_external_downloader_selection">下载器应用偏好</string>
@@ -115,9 +113,9 @@
     <string name="pref_clear_chapter_cache">清除章节缓存</string>
     <string name="used_cache_both">被动画占用：%1$s，被漫画占用：%2$s</string>
     <string name="pref_auto_clear_chapter_cache">关闭应用时清除章节缓存</string>
-    <string name="pref_clear_database">清除漫画数据库</string>
+    <string name="pref_clear_manga_database">清除漫画数据库</string>
     <string name="pref_clear_anime_database">清除动画数据库</string>
-    <string name="pref_clear_database_summary">删除未添加到书架的漫画记录</string>
+    <string name="pref_clear_manga_database_summary">删除未添加到书架的漫画记录</string>
     <string name="pref_clear_anime_database_summary">将未保存在内容库中的动画历史记录清除</string>
     <string name="clear_database_confirmation">你确定吗？不在书架中的漫画的已读章节和进度将会丢失</string>
     <string name="pref_refresh_library_tracking_summary">从记录平台更新阅读状态、评分和进度</string>
@@ -161,8 +159,8 @@
     <string name="dialog_with_checkbox_reset">重置此漫画所有章节</string>
     <string name="screenshot_header">截取屏幕</string>
     <string name="screenshot_show_subs">在截屏中显示字幕</string>
-    <string name="toggle_volume_brightness_gestures">启用音量和亮度手势</string>
-    <string name="toggle_horizontal_seek_gesture">启用水平定位手势</string>
+    <string name="enable_volume_brightness_gestures">启用音量和亮度手势</string>
+    <string name="enable_horizontal_seek_gesture">启用水平定位手势</string>
     <string name="stats_header">显示统计数据</string>
     <string name="toggle_stats">启用数据统计</string>
     <string name="stats_page">数据统计页</string>
diff --git a/i18n/src/main/res/values-zh-rTW/strings-aniyomi.xml b/i18n/src/main/res/values-zh-rTW/strings-aniyomi.xml
index fb0577bfc..ad6a1bc6b 100644
--- a/i18n/src/main/res/values-zh-rTW/strings-aniyomi.xml
+++ b/i18n/src/main/res/values-zh-rTW/strings-aniyomi.xml
@@ -4,10 +4,10 @@
     <string name="unlock_app">解除鎖定 Aniyomi</string>
     <string name="action_sort_last_manga_update">上次檢查更新日期</string>
     <string name="action_show_manga">顯示作品</string>
-    <string name="action_display_local_badge">本機來源</string>
+    <string name="action_display_local_badge_manga">本機來源</string>
     <string name="pref_update_only_completely_read">有未讀的章節</string>
     <string name="pref_library_update_show_tab_badge">在「新刊」導覽圖示上標記未讀章數</string>
-    <string name="default_category">預設類別</string>
+    <string name="default_manga_category">預設類別</string>
     <string name="pref_manga_library_update_categories_details">類別同時屬於「排除」及「包含」的作品，將不會自動更新。</string>
     <string name="untrusted_extension_message">這個擴充套件的憑證並不可靠，且尚未被啟用。
 \n
@@ -18,12 +18,12 @@
     <string name="pref_remove_after_marked_as_read">手動標示為已讀後</string>
     <string name="pref_remove_after_read">翻閱過後自動刪除</string>
     <string name="pref_remove_bookmarked_chapters">允許刪除有書籤的章節</string>
-    <string name="pref_remove_exclude_categories">排除的類別</string>
+    <string name="pref_remove_exclude_categories_manga">排除的類別</string>
     <string name="pref_auto_update_manga_sync">閱後自動更新章節進度</string>
     <string name="pref_clear_chapter_cache">清除章節快取</string>
     <string name="pref_auto_clear_chapter_cache">結束應用程式時清除章節快取</string>
-    <string name="pref_clear_database">清除資料庫</string>
-    <string name="pref_clear_database_summary">將未收藏於書櫃的作品記錄刪除</string>
+    <string name="pref_clear_manga_database">清除資料庫</string>
+    <string name="pref_clear_manga_database_summary">將未收藏於書櫃的作品記錄刪除</string>
     <string name="clear_database_confirmation">不在書櫃中的作品閱讀進度將被清除，你確定嗎？</string>
     <string name="pref_refresh_library_tracking_summary">與歷程平台同步處理閱讀狀態、評分以及進度</string>
     <string name="pref_incognito_mode_summary">暫停閱讀記錄</string>
diff --git a/i18n/src/main/res/values/strings-aniyomi.xml b/i18n/src/main/res/values/strings-aniyomi.xml
index b5f401996..bd3c4062d 100644
--- a/i18n/src/main/res/values/strings-aniyomi.xml
+++ b/i18n/src/main/res/values/strings-aniyomi.xml
@@ -23,6 +23,8 @@
     <string name="pref_bottom_nav_no_manga">Move Manga to the More tab</string>
     <string name="unlock_app">Unlock Aniyomi</string>
     <string name="action_filter_unseen">Unseen</string>
+    <string name="action_global_manga_search">Global Manga Search</string>
+    <string name="action_global_anime_search">Global Anime Search</string>
     <string name="action_sort_total_episodes">Total episodes</string>
     <string name="action_sort_last_seen">Last seen</string>
     <string name="action_sort_last_checked">Last checked</string>
@@ -52,8 +54,10 @@
     <string name="action_show_anime">Show anime</string>
     <string name="action_display_download_badge_anime">Downloaded episodes</string>
     <string name="action_display_unseen_badge">Unseen episodes</string>
-    <string name="action_display_local_badge">Local manga</string>
+    <string name="action_display_local_badge_manga">Local manga</string>
     <string name="action_display_local_badge_anime">Local anime</string>
+    <string name="pref_search_pinned_manga_sources_only">Only include pinned anime sources</string>
+    <string name="pref_search_pinned_anime_sources_only">Only include pinned anime sources</string>
     <string name="action_display_show_continue_reading_button">Show continue watching/reading button</string>
     <string name="action_order_by_episode_number">By episode number</string>
     <string name="action_start_download_externally">Use external downloader</string>
@@ -63,7 +67,7 @@
     <string name="pref_default_home_tab_library">Set start screen to Manga Tab</string>
     <string name="pref_update_only_completely_read">With unseen episode(s)/unread chapter(s)</string>
     <string name="pref_library_update_show_tab_badge">Show unseen/unread count on Updates icon</string>
-    <string name="default_category">Default manga category</string>
+    <string name="default_manga_category">Default manga category</string>
     <string name="default_anime_category">Default anime category</string>
     <string name="pref_manga_library_update_categories_details">Manga in excluded categories will not be updated even if they are also in included categories.</string>
     <string name="pref_anime_library_update_categories_details">Anime in excluded categories will not be updated even if they are also in included categories.</string>
@@ -72,6 +76,7 @@
     <string name="rotation_reverse_landscape">Reverse landscape</string>
     <string name="rotation_sensor_portrait">Sensor portrait</string>
     <string name="rotation_sensor_landscape">Sensor landscape</string>
+    <string name="unofficial_anime_extension_message">This extension is not from the official Aniyomi extensions list.</string>
 
     <!-- Player section -->
     <string name="pref_category_player">Player</string>
@@ -91,6 +96,8 @@
     <string name="pref_default_portrait_orientation">Default portrait</string>
     <string name="pref_default_landscape_orientation">Default landscape</string>
     <string name="pref_category_internal_player">Internal player</string>
+    <string name="pref_category_volume_brightness">Volume and Brightness</string>
+    <string name="pref_category_player_seeking">Seeking</string>
     <string name="pref_default_intro_length">Default skip intro length</string>
     <string name="pref_intro_length">Skip intro length</string>
     <string name="pref_skip_length">Double tap to skip length</string>
@@ -103,6 +110,8 @@
     <string name="pref_player_smooth_seek_summary">When enabled, seeking will not focus on keyframes, leading to slower but precise seeking</string>
     <string name="pref_player_fullscreen">Show content in display cutout</string>
     <string name="pref_player_hide_controls">Hide player controls when opening the player</string>
+    <string name="pref_category_pip">Picture-in-Picture (PiP)</string>
+    <string name="pref_enable_pip">Enable the use of PiP mode</string>
     <string name="pref_pip_episode_toasts">Show episode toasts when switching episodes in PiP mode</string>
     <string name="pref_pip_on_exit">Automatically switch to PiP mode on exiting the player</string>
     <!-- Needs better English -->
@@ -120,10 +129,8 @@
     <string name="pref_remove_after_marked_as_read">After manually marked as read/watched</string>
     <string name="pref_remove_after_read">After reading/watching automatically delete</string>
     <string name="pref_remove_bookmarked_chapters">Allow deleting bookmarked chapters/episodes</string>
-    <string name="pref_remove_exclude_categories">Excluded manga categories</string>
+    <string name="pref_remove_exclude_categories_manga">Excluded manga categories</string>
     <string name="pref_remove_exclude_categories_anime">Excluded anime categories</string>
-    <string name="pref_remove_exclude_categories_anime_prefix">Anime: </string>
-    <string name="pref_remove_exclude_categories_prefix">Manga: </string>
     <string name="pref_category_external_downloader">External downloader</string>
     <string name="pref_use_external_downloader">Always use external downloader for anime</string>
     <string name="pref_external_downloader_selection">Downloader app preference</string>
@@ -140,9 +147,9 @@
     <string name="pref_clear_chapter_cache">Clear chapter and episode cache</string>
     <string name="used_cache_both">Used by anime: %1$s, used by manga: %2$s</string>
     <string name="pref_auto_clear_chapter_cache">Clear episode/chapter cache on app close</string>
-    <string name="pref_clear_database">Clear Manga database</string>
+    <string name="pref_clear_manga_database">Clear Manga database</string>
     <string name="pref_clear_anime_database">Clear Anime database</string>
-    <string name="pref_clear_database_summary">Delete history for manga that are not saved in your library</string>
+    <string name="pref_clear_manga_database_summary">Delete history for manga that are not saved in your library</string>
     <string name="pref_clear_anime_database_summary">Delete history for anime that are not saved in your library</string>
     <string name="clear_database_confirmation">Are you sure? Completed episodes and chapters and progress of non-library entries will be lost</string>
     <string name="pref_refresh_library_tracking_summary">Updates status, score and progress from the tracking services</string>
@@ -192,8 +199,8 @@
     <string name="episode_progress_no_total">Progress: %1$s</string>
     <string name="screenshot_header">Take screenshot</string>
     <string name="screenshot_show_subs">Show subtitles in screenshot</string>
-    <string name="toggle_volume_brightness_gestures">Toggle Volume and Brightness Gestures</string>
-    <string name="toggle_horizontal_seek_gesture">Toggle Horizontal Seek Gesture</string>
+    <string name="enable_volume_brightness_gestures">Enable Volume and Brightness Gestures</string>
+    <string name="enable_horizontal_seek_gesture">Enable Horizontal Seek Gesture</string>
     <string name="stats_header">Show statistics</string>
     <string name="toggle_stats">Toggle stats</string>
     <string name="stats_page">Stats page</string>
@@ -256,7 +263,7 @@
     <string name="player_aniskip_ed">Skip Ending</string>
     <string name="player_aniskip_mixedOp">Skip MixedOp</string>
     <string name="player_aniskip_recap">Skip Recap</string>
-    <string name="pref_category_player_aniskip">AniSkip Settings</string>
+    <string name="pref_category_player_aniskip_info">AniSkip requires the anime to be tracked with MAL or Anilist to work</string>
     <string name="pref_enable_aniskip">Enable AniSkip</string>
     <string name="pref_enable_auto_skip_ani_skip">Enable auto skip</string>
     <string name="pref_waiting_time_aniskip">Button timeout</string>
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index 95a019c3c..ce5a2f52a 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -104,6 +104,7 @@
     <string name="action_display_list">List</string>
     <string name="action_display_cover_only_grid">Cover-only grid</string>
     <string name="action_display_download_badge">Downloaded chapters</string>
+    <string name="action_display_local_badge">Local source</string>
     <string name="action_display_unread_badge">Unread chapters</string>
     <string name="action_display_language_badge">Language</string>
     <string name="action_display_show_tabs">Show category tabs</string>
@@ -253,6 +254,7 @@
     <string name="pref_library_update_refresh_trackers">Automatically refresh trackers</string>
     <string name="pref_library_update_refresh_trackers_summary">Update trackers when updating library</string>
 
+    <string name="default_category">Default category</string>
     <string name="default_category_summary">Always ask</string>
     <string name="categorized_display_settings">Per-category settings for sort and display</string>
     <plurals name="num_categories">
@@ -410,6 +412,7 @@
 
       <!-- Downloads section -->
     <string name="pref_download_directory">Download location</string>
+    <string name="pref_remove_exclude_categories">Excluded categories</string>
     <string name="custom_dir">Custom location</string>
     <string name="invalid_location">Invalid location: %s</string>
     <string name="disabled">Disabled</string>
@@ -443,8 +446,7 @@
 
       <!-- Browse section -->
     <string name="pref_enable_automatic_extension_updates">Check for extension updates</string>
-    <string name="pref_search_pinned_sources_only">Only include pinned manga sources</string>
-    <string name="pref_search_pinned_anime_sources_only">Only include pinned anime sources</string>
+    <string name="pref_search_pinned_sources_only">Only include pinned sources</string>
 
       <!-- Backup section -->
     <string name="pref_create_backup">Create backup</string>
@@ -495,6 +497,8 @@
     <string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
     <string name="cache_delete_error">Error occurred while clearing</string>
     <string name="pref_invalidate_download_cache">Invalidate downloads index</string>
+    <string name="pref_clear_database">Clear database</string>
+    <string name="pref_clear_database_summary">Delete history for entries that are not saved in your library</string>
     <string name="clear_database_source_item_count">%1$d non-library entries in database</string>
     <string name="clear_database_completed">Entries deleted</string>
     <string name="database_clean">Nothing to clear</string>