diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatch.kt
index 7c88029dca..e44f4cc0f5 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -3,10 +3,12 @@ package app.revanced.patches.music.layout.hide.general
 import app.revanced.patches.music.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.music.misc.settings.settingsPatch
 import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch
+import app.revanced.patches.music.misc.settings.PreferenceScreen
 
 val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
     lithoFilterPatch = lithoFilterPatch,
     settingsPatch = settingsPatch,
+    generalSettingsScreen = PreferenceScreen.GENERAL,
     filterClasses = setOf("Lapp/revanced/extension/shared/patches/litho/CustomFilter;"),
     compatibleWithPackages = arrayOf(
         "com.google.android.apps.youtube.music" to setOf(
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/layout/hide/general/HideLayoutComponentsPatch.kt
index aa13dc7e0c..dda9f05ae4 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -5,8 +5,8 @@ import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.music.misc.settings.PreferenceScreen
 import app.revanced.patches.shared.misc.litho.filter.addLithoFilter
+import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
 import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@@ -16,6 +16,7 @@ import kotlin.collections.toTypedArray
 internal fun hideLayoutComponentsPatch(
     lithoFilterPatch: Patch,
     settingsPatch: Patch,
+    generalSettingsScreen: BasePreferenceScreen.Screen,
     additionalDependencies: Set<Patch> = emptySet(),
     filterClasses: Set<String>,
     vararg compatibleWithPackages: Pair<String, Set<String>?>,
@@ -36,7 +37,7 @@ internal fun hideLayoutComponentsPatch(
     apply {
         addResources("shared", "layout.hide.general.hideLayoutComponentsPatch")
 
-        PreferenceScreen.GENERAL.addPreferences(
+        generalSettingsScreen.addPreferences(
             PreferenceScreenPreference(
                 key = "revanced_custom_filter_screen",
                 sorting = PreferenceScreenPreference.Sorting.UNSORTED,
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
index b57010b903..a1260cdd0c 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -9,7 +9,6 @@ import app.revanced.patcher.extensions.instructions
 import app.revanced.patcher.extensions.replaceInstructions
 import app.revanced.patcher.firstMethodDeclaratively
 import app.revanced.patcher.immutableClassDef
-import app.revanced.patcher.instructions
 import app.revanced.patcher.parameterTypes
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.returnType
@@ -53,7 +52,7 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
     apply {
         addResources("youtube", "interaction.dialog.removeViewerDiscretionDialogPatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             SwitchPreference("revanced_remove_viewer_discretion_dialog"),
         )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
index befd7171e9..36c6aa2653 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
@@ -19,7 +19,7 @@ val customBrandingPatch = baseCustomBrandingPatch(
     getMainActivityOnCreate = BytecodePatchContext::mainActivityOnCreateMethod::get,
     mainActivityName = YOUTUBE_MAIN_ACTIVITY_NAME,
     activityAliasNameWithIntents = $$"com.google.android.youtube.app.honeycomb.Shell$HomeActivity",
-    preferenceScreen = PreferenceScreen.GENERAL_LAYOUT,
+    preferenceScreen = PreferenceScreen.GENERAL,
 
     block = {
         dependsOn(sharedExtensionPatch)
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
index 38b40e4d33..4555a64b3c 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.branding.header
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.getInstruction
 import app.revanced.patcher.extensions.wideLiteral
-import app.revanced.patcher.firstMethod
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
@@ -135,7 +134,7 @@ val changeHeaderPatch = resourcePatch(
     apply {
         addResources("youtube", "layout.branding.changeHeaderPatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             if (custom == null) {
                 ListPreference("revanced_header_logo")
             } else {
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationBarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationBarPatch.kt
index 8abeeab8d3..64df88bb37 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationBarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationBarPatch.kt
@@ -82,7 +82,7 @@ val navigationBarPatch = bytecodePatch(
             preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_light")
             preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_dark")
 
-            PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            PreferenceScreen.GENERAL.addPreferences(
                 SwitchPreference("revanced_disable_translucent_status_bar")
             )
 
@@ -91,7 +91,7 @@ val navigationBarPatch = bytecodePatch(
             }
         }
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             PreferenceScreenPreference(
                 key = "revanced_navigation_buttons_screen",
                 sorting = Sorting.UNSORTED,
@@ -189,7 +189,7 @@ val navigationBarPatch = bytecodePatch(
             toolbarPreferences += SwitchPreference("revanced_wide_searchbar")
         }
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             PreferenceScreenPreference(
                 key = "revanced_toolbar_screen",
                 sorting = Sorting.UNSORTED,
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
index d20f4d742d..c1ca314270 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
@@ -44,7 +44,7 @@ val changeFormFactorPatch = bytecodePatch(
     apply {
         addResources("youtube", "layout.formfactor.changeFormFactorPatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             ListPreference("revanced_change_form_factor"),
         )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
index 864583af4c..ea7fd4c919 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -31,7 +31,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
@@ -77,6 +76,7 @@ private const val KEYWORD_FILTER_CLASS_NAME =
 val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
     lithoFilterPatch = lithoFilterPatch,
     settingsPatch = settingsPatch,
+    generalSettingsScreen = PreferenceScreen.GENERAL,
     additionalDependencies = setOf(
         hideLayoutComponentsResourcePatch,
         navigationBarHookPatch,
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
index f55cab1921..0704ca1036 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
@@ -51,7 +51,7 @@ val spoofAppVersionPatch = bytecodePatch(
     apply {
         addResources("youtube", "layout.spoofappversion.spoofAppVersionPatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             // Group the switch and list preference together, since General menu is sorted by name
             // and the preferences can be scattered apart with non English languages.
             PreferenceCategory(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
index c2d47290db..599a6e36ea 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
@@ -43,7 +43,7 @@ val changeStartPagePatch = bytecodePatch(
     apply {
         addResources("youtube", "layout.startpage.changeStartPagePatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             PreferenceCategory(
                 titleKey = null,
                 sorting = Sorting.UNSORTED,
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
index f1d4fb2cc5..87a40c54dc 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
@@ -203,7 +203,7 @@ val themePatch = baseThemePatch(
     executeBlock = {
         addResources("youtube", "layout.theme.themePatch")
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             SwitchPreference("revanced_gradient_loading_screen"),
         )
 
@@ -231,7 +231,7 @@ val themePatch = baseThemePatch(
         )
 
         if (is_19_47_or_greater) {
-            PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            PreferenceScreen.GENERAL.addPreferences(
                 ListPreference("revanced_splash_screen_animation_style"),
             )
         }
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
index 3eb9d2eb15..dd3dd01761 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
@@ -188,16 +188,16 @@ val settingsPatch = bytecodePatch(
         )
 
         if (is_19_34_or_greater) {
-            PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            PreferenceScreen.GENERAL.addPreferences(
                 SwitchPreference("revanced_restore_old_settings_menus"),
             )
         }
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             SwitchPreference("revanced_settings_search_history"),
         )
 
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        PreferenceScreen.GENERAL.addPreferences(
             if (is_20_31_or_greater) {
                 PreferenceCategory(
                     titleKey = null,
@@ -382,7 +382,7 @@ object PreferenceScreen : BasePreferenceScreen() {
         iconBold = "@drawable/revanced_settings_screen_03_feed_bold",
         layout = "@layout/preference_with_icon",
     )
-    val GENERAL_LAYOUT = Screen(
+    val GENERAL = Screen(
         key = "revanced_settings_screen_04_general",
         summaryKey = null,
         icon = "@drawable/revanced_settings_screen_04_general",