diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
index c81800455..173250047 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
@@ -92,11 +92,10 @@ class GeneralAdsPatch : ResourcePatch {
                 "PREFERENCE: ADS_SETTINGS",
                 "SETTINGS: HIDE_GENERAL_ADS",
 
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_GENERAL_LAYOUT_ADS",
 
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_VIEW_PRODUCT"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
index d9d2a5b34..efd4a8ae6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
@@ -32,7 +32,7 @@ class ButtonContainerPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: BOTTOM_PLAYER",
                 "SETTINGS: BUTTON_CONTAINER"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
index ffd603ec1..94194a505 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
@@ -32,7 +32,7 @@ class CommentComponentPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: BOTTOM_PLAYER",
                 "SETTINGS: COMMENT_COMPONENT"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
index 3eed89459..c17fca9c4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
@@ -32,7 +32,7 @@ class FlyoutPanelPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: FLYOUT_PANEL",
                 "SETTINGS: FLYOUT_PANEL_COMPONENT"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
index 1cc2753c2..4bd018682 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@@ -45,7 +45,7 @@ class OldQualityLayoutPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: FLYOUT_PANEL",
                 "SETTINGS: ENABLE_OLD_QUALITY_LAYOUT"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt
index e20e78343..c6600963d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt
@@ -85,7 +85,7 @@ class HideEndscreenOverlayPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                     "PREFERENCE_HEADER: FULLSCREEN",
                     "SETTINGS: HIDE_ENDSCREEN_OVERLAY"
                 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
index 267736500..64d7e7114 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
@@ -61,7 +61,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                      */
                     SettingsPatch.addPreference(
                         arrayOf(
-                            "PREFERENCE: LAYOUT_SETTINGS",
+                            "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                             "PREFERENCE_HEADER: FULLSCREEN",
                             "SETTINGS: HIDE_FILMSTRIP_OVERLAY"
                         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
index 19411fd2b..596cce92c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
@@ -62,7 +62,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: FULLSCREEN",
                 "SETTINGS: HIDE_FULLSCREEN_PANELS"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
index c3fc5d3ff..63790e32a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
@@ -56,7 +56,7 @@ class HapticFeedBackPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: FULLSCREEN",
                 "SETTINGS: DISABLE_HAPTIC_FEEDBACK"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
index 364d22220..527470a63 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
@@ -69,8 +69,7 @@ class AutoCaptionsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_AUTO_CAPTIONS"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
index 3b448d624..aaab4e1e2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
@@ -49,8 +49,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
index 823012626..55b66e225 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
@@ -76,8 +76,7 @@ class CrowdfundingBoxPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                     "SETTINGS: HIDE_CROWDFUNDING_BOX"
                 )
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
index 5caa6cce2..c181e5f84 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
@@ -80,8 +80,7 @@ class HeaderSwitchPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                     "SETTINGS: HEADER_SWITCH"
                 )
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
index c908917bc..f921f79f4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
@@ -56,8 +56,7 @@ class MixPlaylistsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_MIX_PLAYLISTS"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
index 5e5fed794..f28835cbe 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
@@ -48,8 +48,7 @@ class HideEmailAddressPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_EMAIL_ADDRESS"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
index d371691aa..72b932941 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -73,8 +73,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
                      */
                     SettingsPatch.addPreference(
                         arrayOf(
-                            "PREFERENCE: LAYOUT_SETTINGS",
-                            "PREFERENCE_HEADER: GENERAL",
+                            "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                             "SETTINGS: HIDE_CREATE_BUTTON"
                         )
                     )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
index 1a8d9d21b..beedcd65e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
@@ -77,8 +77,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: SHORTS_COMPONENT.PARENT",
                 "SETTINGS: SHORTS_COMPONENT_PARENT.A",
                 "SETTINGS: HIDE_SHORTS_BUTTON"
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
index 9b222a601..39c6a373e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
@@ -111,8 +111,7 @@ class ShortsComponentPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                     "SETTINGS: SHORTS_COMPONENT.PARENT",
                     "SETTINGS: SHORTS_COMPONENT_PARENT.A",
                     "SETTINGS: SHORTS_COMPONENT_PARENT.B",
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
index 60e167e20..95e4abf73 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
@@ -47,8 +47,7 @@ class HideSnackbarPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_SNACKBAR"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
index cfd5205a7..46021d2af 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
@@ -53,8 +53,7 @@ class HideShortsOnStartupPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: SHORTS_COMPONENT.PARENT",
                 "SETTINGS: SHORTS_COMPONENT_PARENT.B",
                 "SETTINGS: HIDE_STARTUP_SHORTS_PLAYER"
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
index 29308f238..4ec8b3df2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
@@ -79,8 +79,7 @@ class HideStoriesPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                     "SETTINGS: HIDE_STORIES_SHELF"
                 )
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
index c8205fe53..1f54bf8c8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@@ -65,8 +65,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: ENABLE_TABLET_MINIPLAYER"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt
index 845e1c2dc..585ae202a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt
@@ -58,8 +58,7 @@ class WideSearchbarPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                 "SETTINGS: ENABLE_WIDE_SEARCHBAR"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
index de762f7e6..569e70f45 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@@ -72,7 +72,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_AUTOPLAY_BUTTON"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
index 0ee8e2f6c..9fcb98ff8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
@@ -50,7 +50,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_CAPTIONS_BUTTON"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
index b2c117a74..483cf927d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
@@ -43,7 +43,7 @@ class HideCastButtonPatch : BytecodePatch() {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_CAST_BUTTON"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
index f7a1bd4c6..16e9866ec 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
@@ -60,7 +60,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_ENDSCREEN_CARDS"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
index 0b619cc68..de8bdf2c5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
@@ -45,7 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_INFO_CARDS"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
index 30f566528..e324caf6a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
@@ -32,7 +32,7 @@ class HideLiveChatButtonPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_LIVE_CHATS_BUTTON"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
index 6bfdb8ee2..d439eba5a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
@@ -32,7 +32,7 @@ class HideNextPrevButtonPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_NEXT_BUTTON",
                 "SETTINGS: HIDE_PREV_BUTTON"
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
index 6924e8abf..c2369d445 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
@@ -92,7 +92,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                     "PREFERENCE_HEADER: PLAYER",
                     "SETTINGS: HIDE_PLAYER_OVERLAY_FILTER"
                 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
index 062ec73a7..8da6c2275 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
@@ -77,7 +77,7 @@ class SuggestedActionsPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                     "PREFERENCE_HEADER: PLAYER",
                     "SETTINGS: HIDE_SUGGESTED_ACTION"
                 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
index e6346a92e..a9b611b01 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
@@ -56,7 +56,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: PLAYER",
                 "SETTINGS: HIDE_CHANNEL_WATERMARK"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
index 9423d0207..f72a5b060 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
@@ -82,7 +82,7 @@ class SeekbarColorPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                     "PREFERENCE_HEADER: SEEKBAR",
                     "SETTINGS: CUSTOM_SEEKBAR_COLOR"
                 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
index 76f6f39ea..8131a26f1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
@@ -92,7 +92,7 @@ class SeekbarTappingPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: SEEKBAR",
                 "SETTINGS: ENABLE_SEEKBAR_TAPPING"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt
index 18742400c..d4af4545a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt
@@ -65,7 +65,7 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                 "PREFERENCE_HEADER: SEEKBAR",
                 "SETTINGS: HIDE_TIME_AND_SEEKBAR"
             )
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index a85e9a43f..d288d7e82 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -76,11 +76,9 @@
     </PreferenceScreen>PREFERENCE: SWIPE_SETTINGS -->
 
 
-    <!-- PREFERENCE: LAYOUT_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_layout_settings_title" android:key="layout" android:summary="@string/revanced_layout_settings_summary">PREFERENCE: LAYOUT_SETTINGS -->
-
-    <!-- PREFERENCE_HEADER: GENERAL
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_general" />PREFERENCE_HEADER: GENERAL -->
+    <!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_general_layout_settings_title" android:key="general_layout" android:summary="@string/revanced_general_layout_settings_summary">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout_settings_title" />PREFERENCE: GENERAL_LAYOUT_SETTINGS -->
 
         <!-- SETTINGS: HIDE_STORIES_SHELF
         <SwitchPreference android:title="@string/revanced_hide_stories_shelf_title" android:key="revanced_hide_stories_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_stories_shelf_summary_on" android:summaryOff="@string/revanced_hide_stories_shelf_summary_off" />SETTINGS: HIDE_STORIES_SHELF -->
@@ -169,6 +167,12 @@
         <!-- SETTINGS: HEADER_SWITCH
         <SwitchPreference android:title="@string/revanced_override_premium_header_title" android:key="revanced_override_premium_header" android:defaultValue="false" android:summaryOn="@string/revanced_override_premium_header_summary_on" android:summaryOff="@string/revanced_override_premium_header_summary_off" />SETTINGS: HEADER_SWITCH -->
 
+    <!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: GENERAL_LAYOUT_SETTINGS -->
+
+    <!-- PREFERENCE: OTHER_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_other_layout_settings_title" android:key="other_layout" android:summary="@string/revanced_other_layout_settings_summary">PREFERENCE: OTHER_LAYOUT_SETTINGS -->
+
     <!-- PREFERENCE_HEADER: PLAYER
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_player" />PREFERENCE_HEADER: PLAYER -->
 
@@ -290,8 +294,8 @@
     <!-- SETTINGS: HIDE_TIME_AND_SEEKBAR
         <SwitchPreference android:title="@string/revanced_hide_time_and_seekbar_title" android:key="revanced_hide_time_and_seekbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_time_and_seekbar_summary_on" android:summaryOff="@string/revanced_hide_time_and_seekbar_summary_off" />SETTINGS: HIDE_TIME_AND_SEEKBAR -->
 
-    <!-- PREFERENCE: LAYOUT_SETTINGS
-    </PreferenceScreen>PREFERENCE: LAYOUT_SETTINGS -->
+    <!-- PREFERENCE: OTHER_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: OTHER_LAYOUT_SETTINGS -->
 
 
     <!-- PREFERENCE: OVERLAY_BUTTONS
@@ -353,7 +357,7 @@
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />
             <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_general" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout_settings_title" />
             <Preference android:title="hide-stories" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-create-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-shorts-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>