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 124f5c956..a1fbbfa11 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
@@ -98,8 +98,7 @@ class GeneralAdsPatch : ResourcePatch {
                 "SETTINGS: HIDE_VIEW_PRODUCT",
                 "SETTINGS: DOUBLE_BACK_TIMEOUT",
 
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: COMMENT_COMPONENT_PARENT"
             )
         )
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 efd4a8ae6..be62ca592 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,8 +32,7 @@ class ButtonContainerPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                 "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 13d561fa3..0c754c4f2 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,8 +32,7 @@ class CommentComponentPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: COMMENT_COMPONENT_PARENT",
                 "SETTINGS: COMMENT_COMPONENTS"
             )
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 c17fca9c4..04b1ace65 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,8 +32,7 @@ class FlyoutPanelPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FLYOUT_PANEL",
+                "PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
                 "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 906270ac5..2bb06c6ff 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
@@ -70,8 +70,7 @@ class OldQualityLayoutPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FLYOUT_PANEL",
+                "PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
                 "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 c6600963d..6bd73103f 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,8 +85,7 @@ class HideEndscreenOverlayPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: FULLSCREEN",
+                    "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                     "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 64d7e7114..c305bc559 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,8 +61,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                      */
                     SettingsPatch.addPreference(
                         arrayOf(
-                            "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                            "PREFERENCE_HEADER: FULLSCREEN",
+                            "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                             "SETTINGS: HIDE_FILMSTRIP_OVERLAY"
                         )
                     )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
index a1f624597..8a88e973c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
@@ -33,8 +33,7 @@ class HideFullscreenButtonContainerPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_FULLSCREEN_BUTTON_CONTAINER"
             )
         )
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 844813552..fe0b34823 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
@@ -88,8 +88,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                 "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 63790e32a..bb5dee73e 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,8 +56,7 @@ class HapticFeedBackPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                 "SETTINGS: DISABLE_HAPTIC_FEEDBACK"
             )
         )
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 427e9d4f3..4ed90662e 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
@@ -81,8 +81,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "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 9fcb98ff8..e95d51c99 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,8 +50,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "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 483cf927d..1ae3502d4 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,8 +43,7 @@ class HideCastButtonPatch : BytecodePatch() {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_CAST_BUTTON"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
index 13196c622..02ab0d898 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
@@ -32,8 +32,7 @@ class HideCollapseButtonPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_COLLAPSE_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 16e9866ec..c921cf910 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,8 +60,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "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 de8bdf2c5..ae2f15612 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,8 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "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 e324caf6a..0b1b560bf 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,8 +32,7 @@ class HideLiveChatButtonPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "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 d439eba5a..6f74a2a16 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,8 +32,7 @@ class HideNextPrevButtonPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_NEXT_BUTTON",
                 "SETTINGS: HIDE_PREV_BUTTON"
             )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
index 7da7e7160..da66a4fba 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
@@ -44,8 +44,7 @@ class HidePlayerButtonBackgroundPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND"
             )
         )
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 c2369d445..ffbd7b034 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,8 +92,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: PLAYER",
+                    "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                     "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 8da6c2275..9a102ca05 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,8 +77,7 @@ class SuggestedActionsPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: PLAYER",
+                    "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                     "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 a9b611b01..0a039b696 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,8 +56,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_CHANNEL_WATERMARK"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
index 7138e2919..38f28e67e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
@@ -47,8 +47,7 @@ class HideSeekbarPatch : BytecodePatch() {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_SEEKBAR"
             )
         )
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 f72a5b060..6a9e9e58a 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,8 +82,7 @@ class SeekbarColorPatch : BytecodePatch() {
              */
             SettingsPatch.addPreference(
                 arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: SEEKBAR",
+                    "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                     "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 8131a26f1..8881866fb 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,8 +92,7 @@ class SeekbarTappingPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                 "SETTINGS: ENABLE_SEEKBAR_TAPPING"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
index bdcb1be01..31b380f3a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
@@ -53,8 +53,7 @@ class HideTimeStampPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                 "SETTINGS: HIDE_TIME_STAMP"
             )
         )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt
index 03833ef58..554e8d497 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt
@@ -43,9 +43,7 @@ class MicroGPatch : ResourcePatch {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE_CATEGORY: MICROG_SETTINGS",
-                "PREFERENCE: MICROG_SETTINGS",
-                "SETTINGS: MICROG_SETTINGS"
+                "PREFERENCE: MICROG_SETTINGS"
             )
         )
         SettingsPatch.updatePatchStatus("microg-support")
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
index 4dc611265..129a4fb20 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -13,6 +13,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.patch.PlayerControlsPatch
+import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch
 import app.revanced.patches.youtube.misc.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.misc.timebar.patch.HookTimebarPatch
@@ -32,6 +33,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
     [
         MainstreamVideoIdPatch::class,
         PlayerControlsPatch::class,
+        PlayerTypeHookPatch::class,
         SharedResourcdIdPatch::class
     ]
 )
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 0bb28509b..4d2735528 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -44,10 +44,8 @@
     <string name="microg_not_installed_notice">Please install MicroG</string>
     <string name="microg_not_installed_warning">MicroG is not found</string>
     <string name="microg_not_running_warning">MicroG does not run in the background</string>
-    <string name="microg_notification_settings_summary">"1. Google device registration and Cloud Messaging need to be enabled for notifications.
-2. ReVanced needs to be shown as registered under Cloud Messaging.
-3. Current State in Cloud Messaging must be Connected."</string>
-    <string name="microg_notification_settings_title">Notification</string>
+    <string name="microg_settings_summary">Enable cloud messaging settings to receive notifications</string>
+    <string name="microg_settings_title">Open MicroG</string>
     <string name="minutes">min</string>
     <string name="new_segment_choose_category">Choose the segment category</string>
     <string name="new_segment_confirm_content" formatted="false">"The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)
@@ -69,8 +67,7 @@ Is it ready to submit?"</string>
     <string name="new_segment_time_start_set">Beginning of segment set</string>
     <string name="new_segment_title">New SponsorBlock segment</string>
     <string name="reset">Reset</string>
-    <string name="revanced_ads_settings_summary">Ads related settings</string>
-    <string name="revanced_ads_settings_title">Ads</string>
+    <string name="revanced_ads">Ads</string>
     <string name="revanced_adremover_album_card_in_search_summary_off">Album cards are shown from search results</string>
     <string name="revanced_adremover_album_card_in_search_summary_on">Album cards are hidden from search results</string>
     <string name="revanced_adremover_album_card_in_search_title">Hide album cards</string>
@@ -154,7 +151,11 @@ Is it ready to submit?"</string>
     <string name="revanced_adremover_web_search_panel_summary_off">Web search panels are shown</string>
     <string name="revanced_adremover_web_search_panel_summary_on">Web search panels are hidden</string>
     <string name="revanced_adremover_web_search_panel_title">Hide web search panels</string>
-    <string name="revanced_backup_settings_summary">Import ReVanced settings from file or export ReVanced settings to file</string>
+    <string name="revanced_backup_summary">Import ReVanced settings from file or export ReVanced settings to file</string>
+    <string name="revanced_bottom_player_layout">Bottom player layout</string>
+    <string name="revanced_button_container_title">Button container</string>
+    <string name="revanced_comments_title">Comments</string>
+    <string name="revanced_copytimestamp_success">Time Stamp copied to clipboard</string>
     <string name="revanced_custom_seekbar_color_value_summary">Type the hex code of the seekbar color to use in dark mode</string>
     <string name="revanced_custom_seekbar_color_value_title">Custom seekbar color value</string>
     <string name="revanced_default_video_quality_mobile_title">Default video quality Cellular</string>
@@ -176,12 +177,10 @@ Is it ready to submit?"</string>
     <string name="revanced_disable_haptic_feedback_chapters_summary_off">Chapters haptic feedback is enabled</string>
     <string name="revanced_disable_haptic_feedback_chapters_summary_on">Chapters haptic feedback is disabled</string>
     <string name="revanced_disable_haptic_feedback_chapters_title">Disable chapters haptic feedback</string>
-    <string name="revanced_disable_haptic_feedback_summary">Disable haptic feedback on long press</string>
-    <string name="revanced_disable_haptic_feedback_title">Disable haptic feedback</string>
+    <string name="revanced_haptic_feedback_title">Haptic feedback</string>
     <string name="revanced_disable_haptic_feedback_zoom_summary_off">Zoom haptic feedback is enabled</string>
     <string name="revanced_disable_haptic_feedback_zoom_summary_on">Zoom haptic feedback is disabled</string>
     <string name="revanced_disable_haptic_feedback_zoom_title">Disable zoom haptic feedback</string>
-    <string name="revanced_copytimestamp_success">Time Stamp copied to clipboard</string>
     <string name="revanced_enable_always_auto_repeat_summary_off">Always auto repeat is disabled</string>
     <string name="revanced_enable_always_auto_repeat_summary_on">Always auto repeat is enabled</string>
     <string name="revanced_enable_always_auto_repeat_title">Always auto repeat</string>
@@ -253,8 +252,9 @@ Is it ready to submit?"</string>
     <string name="revanced_export_settings_title">Export settings</string>
     <string name="revanced_extended_support_center_summary">Report issues or leave suggestions here</string>
     <string name="revanced_extended_support_center_title">Support Center</string>
-    <string name="revanced_general_layout_settings_summary">General layout related settings</string>
-    <string name="revanced_general_layout_settings_title">General layout</string>
+    <string name="revanced_flyout_menu_layout">Flyout menu layout</string>
+    <string name="revanced_fullscreen_layout">Fullscreen layout</string>
+    <string name="revanced_general_layout">General layout</string>
     <string name="revanced_hide_auto_captions_summary_off">Captions are enabled when playing a video with captioning is enforced</string>
     <string name="revanced_hide_auto_captions_summary_on">"Captions aren't enabled when playing a video with captioning is enforced"</string>
     <string name="revanced_hide_auto_captions_title">Hide auto captions</string>
@@ -264,8 +264,6 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_autoplay_button_summary_off">Autoplay button is shown</string>
     <string name="revanced_hide_autoplay_button_summary_on">Autoplay button is hidden</string>
     <string name="revanced_hide_autoplay_button_title">Hide autoplay button</string>
-    <string name="revanced_hide_button_container_summary">Hides the component of the button container</string>
-    <string name="revanced_hide_button_container_title">Hide button container component</string>
     <string name="revanced_hide_button_create_clip_summary_off">Clip button is shown</string>
     <string name="revanced_hide_button_create_clip_summary_on">Clip button is hidden</string>
     <string name="revanced_hide_button_create_clip_title">Hide clip button</string>
@@ -308,8 +306,6 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_collapse_button_summary_off">Collapse button is shown</string>
     <string name="revanced_hide_collapse_button_summary_on">Collapse button is hidden</string>
     <string name="revanced_hide_collapse_button_title">Hide collapse button</string>
-    <string name="revanced_hide_comments_component_summary">Hides the comments section or component</string>
-    <string name="revanced_hide_comments_component_title">Hide comments component</string>
     <string name="revanced_hide_comments_section_summary_off">Comment section is shown</string>
     <string name="revanced_hide_comments_section_summary_on">Comment section is hidden</string>
     <string name="revanced_hide_comments_section_title">Hide comments section</string>
@@ -441,16 +437,8 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_time_stamp_title">Hide time stamp</string>
     <string name="revanced_import_settings_summary">Fetch ReVanced settings from saved file</string>
     <string name="revanced_import_settings_title">Import settings</string>
-    <string name="revanced_layout_settings_bottomplayer">Bottom player layout</string>
-    <string name="revanced_layout_settings_flyoutmenu">Flyout menu layout</string>
-    <string name="revanced_layout_settings_fullscreen">Fullscreen layout</string>
-    <string name="revanced_layout_settings_player">Player layout</string>
-    <string name="revanced_layout_settings_seekbar">Seekbar layout</string>
-    <string name="revanced_misc_settings_summary">Miscellaneous related settings</string>
-    <string name="revanced_misc_settings_title">Miscellaneous</string>
-    <string name="revanced_others_title">Others</string>
-    <string name="revanced_other_layout_settings_summary">Other layout related settings</string>
-    <string name="revanced_other_layout_settings_title">Other layout</string>
+    <string name="revanced_misc">Miscellaneous</string>
+    <string name="revanced_others">Others</string>
     <string name="revanced_overlay_button_auto_repeat_summary_off">Auto repeat button is hidden</string>
     <string name="revanced_overlay_button_auto_repeat_summary_on">Auto repeat button is shown</string>
     <string name="revanced_overlay_button_auto_repeat_title">Show auto repeat button</string>
@@ -463,8 +451,7 @@ Is it ready to submit?"</string>
     <string name="revanced_overlay_button_downloads_summary_off">Download button is hidden</string>
     <string name="revanced_overlay_button_downloads_summary_on">Download button is shown</string>
     <string name="revanced_overlay_button_downloads_title">Show download button</string>
-    <string name="revanced_overlay_button_summary">Overlay button related settings</string>
-    <string name="revanced_overlay_button_title">Overlay button</string>
+    <string name="revanced_overlay_button">Overlay button</string>
     <string name="revanced_overlay_button_speed_reset">Video speed reseted (1.0x)</string>
     <string name="revanced_overlay_button_speed_summary_off">Speed button is hidden</string>
     <string name="revanced_overlay_button_speed_summary_on">Speed button is shown</string>
@@ -477,8 +464,8 @@ Is it ready to submit?"</string>
     <string name="revanced_override_premium_header_title">Premium Header</string>
     <string name="revanced_patches_information_summary">Information about applied patches</string>
     <string name="revanced_patches_information">Patches Information</string>
-    <string name="revanced_player_flyout_panel_summary">Hides the component of the player settings flyout panel</string>
-    <string name="revanced_player_flyout_panel_title">Player flyout panel component</string>
+    <string name="revanced_player_flyout_panel_title">Player flyout panel</string>
+    <string name="revanced_player_layout">Player layout</string>
     <string name="revanced_reboot_warning_general">"As this is still an experimental feature, there may be other unknown issues.
 Are you sure you want to continue though?"</string>
     <string name="revanced_reboot_warning_oldlayout">"Tricks the YouTube client version to v17.28.35 to load the old layout
@@ -518,9 +505,9 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_save_video_quality_wifi">Changing default Wi-Fi quality to:</string>
     <string name="revanced_save_video_quality_wifi_error">Failed to change default WI-FI quality</string>
     <string name="revanced_save_video_speed">Changing default speed to:</string>
+    <string name="revanced_seekbar_layout">Seekbar layout</string>
     <string name="revanced_sponsorblock_settings_summary">SponsorBlock related settings</string>
-    <string name="revanced_swipe_controls_summary">Swipe controls related settings</string>
-    <string name="revanced_swipe_controls_title">Swipe controls</string>
+    <string name="revanced_swipe_controls">Swipe controls</string>
     <string name="revanced_swipe_magnitude_threshold_summary">The amount of threshold for swipe to occur</string>
     <string name="revanced_swipe_magnitude_threshold_title">Swipe magnitude threshold</string>
     <string name="revanced_swipe_overlay_background_alpha_summary">The visibility of swipe overlay background</string>
@@ -536,8 +523,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_video_ads_removal_summary_off">Video ads are shown</string>
     <string name="revanced_video_ads_removal_summary_on">Video ads are hidden</string>
     <string name="revanced_video_ads_removal_title">Hide video ads</string>
-    <string name="revanced_video_settings_summary">Video related settings</string>
-    <string name="revanced_video_settings_title">Video</string>
+    <string name="revanced_video">Video</string>
     <string name="revanced_whitelisting_add_failed" formatted="false">Failed to add channel %s to the %s whitelist</string>
     <string name="revanced_whitelisting_added" formatted="false">Channel %s was added to the %s whitelist</string>
     <string name="revanced_whitelisting_ads">Video Ads</string>
diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml
index a01ab7045..eb4cc79ca 100644
--- a/src/main/resources/youtube/settings/values-v21/strings.xml
+++ b/src/main/resources/youtube/settings/values-v21/strings.xml
@@ -3,9 +3,7 @@
     <!-- Translation Exception Language Resources -->
     <string name="about">@string/pref_about_category</string>
 
-    <string name="microg_settings_title">MicroG</string>
-
-    <string name="revanced_backup_settings_title">@string/settings_ie</string>
+    <string name="revanced_backup_title">@string/settings_ie</string>
     <string name="revanced_extended_settings_title">ReVanced Extended</string>
     <string name="revanced_hide_live_chat_button_summary_off">@string/revanced_hide_button_live_chat_summary_off</string>
     <string name="revanced_hide_live_chat_button_summary_on">@string/revanced_hide_button_live_chat_summary_on</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 9865954fb..532e76c92 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -2,18 +2,9 @@
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
 
-    <!-- PREFERENCE_CATEGORY: MICROG_SETTINGS
-    <PreferenceCategory android:title="@string/microg_settings_title">
-        <PreferenceScreen android:title="@string/microg_notification_settings_title" android:summary="@string/microg_notification_settings_summary">
-            <intent android:targetPackage="com.mgoogle.android.gms" android:targetClass="org.microg.gms.ui.SettingsActivity" />
-        </PreferenceScreen>
-    </PreferenceCategory>PREFERENCE_CATEGORY: MICROG_SETTINGS -->
-
-    <PreferenceCategory android:layout_height="fill_parent" android:title="@string/revanced_extended_settings_title" />
-
     <!-- PREFERENCE: ADS_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_ads_settings_title" android:key="ads_settings" android:summary="@string/revanced_ads_settings_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_ads_settings_title" />PREFERENCE: ADS_SETTINGS -->
+    <PreferenceScreen android:title="@string/revanced_ads" android:key="ads">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_ads" />PREFERENCE: ADS_SETTINGS -->
 
         <!-- SETTINGS: HIDE_VIDEO_ADS
         <SwitchPreference android:title="@string/revanced_video_ads_removal_title" android:key="revanced_video_ads_removal" android:defaultValue="true" android:summaryOn="@string/revanced_video_ads_removal_summary_on" android:summaryOff="@string/revanced_video_ads_removal_summary_off" />SETTINGS: HIDE_VIDEO_ADS -->
@@ -23,19 +14,17 @@
         <SwitchPreference android:title="@string/revanced_adremover_button_ads_title" android:key="revanced_adremover_button_ads" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_button_ads_summary_on" android:summaryOff="@string/revanced_adremover_button_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_paid_content_title" android:key="revanced_adremover_paid_content" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_paid_content_summary_on" android:summaryOff="@string/revanced_adremover_paid_content_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_self_sponsor_title" android:key="revanced_adremover_self_sponsor" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_self_sponsor_summary_on" android:summaryOff="@string/revanced_adremover_self_sponsor_summary_off" />
-        <PreferenceScreen android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_filter" android:summary="@string/revanced_adremover_custom_filter_summary" >
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_adremover_custom_filter_title" />
-            <SwitchPreference android:title="@string/revanced_adremover_user_filter_title" android:key="revanced_adremover_user_filter" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_user_filter_summary_on" android:summaryOff="@string/revanced_adremover_user_filter_summary_off" />
-            <EditTextPreference android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_strings" android:summary="@string/revanced_adremover_custom_filter_summary" android:defaultValue="" android:inputType="text" android:dependency="revanced_adremover_user_filter" />
-        </PreferenceScreen>SETTINGS: HIDE_GENERAL_ADS -->
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_adremover_custom_filter_title" />
+        <SwitchPreference android:title="@string/revanced_adremover_user_filter_title" android:key="revanced_adremover_user_filter" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_user_filter_summary_on" android:summaryOff="@string/revanced_adremover_user_filter_summary_off" />
+        <EditTextPreference android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_strings" android:summary="@string/revanced_adremover_custom_filter_summary" android:defaultValue=" " android:inputType="text" android:dependency="revanced_adremover_user_filter" />SETTINGS: HIDE_GENERAL_ADS -->
 
     <!-- PREFERENCE: ADS_SETTINGS
     </PreferenceScreen>PREFERENCE: ADS_SETTINGS -->
 
 
     <!-- PREFERENCE: SWIPE_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_swipe_controls_title" android:key="swipe_controls" android:summary="@string/revanced_swipe_controls_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />PREFERENCE: SWIPE_SETTINGS -->
+    <PreferenceScreen android:title="@string/revanced_swipe_controls" android:key="swipe_controls">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls" />PREFERENCE: SWIPE_SETTINGS -->
 
         <!-- SETTINGS: SWIPE_CONTROLS
         <SwitchPreference android:title="@string/revanced_enable_swipe_auto_brightness_title" android:key="revanced_enable_swipe_auto_brightness" android:defaultValue="false" android:summaryOn="@string/revanced_enable_swipe_auto_brightness_summary_on" android:summaryOff="@string/revanced_enable_swipe_auto_brightness_summary_off" android:dependency="revanced_enable_swipe_brightness" />
@@ -56,12 +45,15 @@
 
 
     <!-- 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 -->
+    <PreferenceScreen android:title="@string/revanced_general_layout" android:key="general_layout">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout" />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 -->
 
+        <!-- SETTINGS: SWITCH_CREATE_NOTIFICATION
+        <SwitchPreference android:title="@string/revanced_switching_create_notification_title" android:key="revanced_switching_create_notification" android:defaultValue="false" android:summaryOn="@string/revanced_switching_create_notification_summary_on" android:summaryOff="@string/revanced_switching_create_notification_summary_off" />SETTINGS: SWITCH_CREATE_NOTIFICATION -->
+
         <!-- SETTINGS: HIDE_CREATE_BUTTON
         <SwitchPreference android:title="@string/revanced_hide_create_button_title" android:key="revanced_hide_create_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_create_button_summary_on" android:summaryOff="@string/revanced_hide_create_button_summary_off" />SETTINGS: HIDE_CREATE_BUTTON -->
 
@@ -145,18 +137,13 @@
         <!-- 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 -->
 
-        <!-- SETTINGS: SWITCH_CREATE_NOTIFICATION
-        <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />
-        <SwitchPreference android:title="@string/revanced_switching_create_notification_title" android:key="revanced_switching_create_notification" android:defaultValue="false" android:summaryOn="@string/revanced_switching_create_notification_summary_on" android:summaryOff="@string/revanced_switching_create_notification_summary_off" />SETTINGS: SWITCH_CREATE_NOTIFICATION -->
-
     <!-- 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 -->
+    <!-- PREFERENCE: PLAYER_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_player_layout" android:key="player_layout">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_layout" />PREFERENCE: PLAYER_LAYOUT_SETTINGS -->
 
         <!-- SETTINGS: HIDE_CAST_BUTTON
         <SwitchPreference android:title="@string/revanced_hide_cast_button_title" android:key="revanced_hide_cast_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_cast_button_summary_on" android:summaryOff="@string/revanced_hide_cast_button_summary_off" />SETTINGS: HIDE_CAST_BUTTON -->
@@ -200,9 +187,13 @@
         <!-- SETTINGS: HIDE_PLAYER_OVERLAY_FILTER
         <SwitchPreference android:title="@string/revanced_hide_player_overlay_filter_title" android:key="revanced_hide_player_overlay_filter" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_overlay_filter_summary_on" android:summaryOff="@string/revanced_hide_player_overlay_filter_summary_off" />SETTINGS: HIDE_PLAYER_OVERLAY_FILTER -->
 
+    <!-- PREFERENCE: PLAYER_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: PLAYER_LAYOUT_SETTINGS -->
 
-    <!-- PREFERENCE_HEADER: FULLSCREEN
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_fullscreen" />PREFERENCE_HEADER: FULLSCREEN -->
+
+    <!-- PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_fullscreen_layout" android:key="fullscreen_layout">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen_layout" />PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS -->
 
         <!-- SETTINGS: HIDE_FULLSCREEN_PANELS
         <SwitchPreference android:title="@string/revanced_hide_fullscreen_panels_title" android:key="revanced_hide_fullscreen_panels" android:defaultValue="false" android:summaryOn="@string/revanced_hide_fullscreen_panels_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_panels_summary_off" />SETTINGS: HIDE_FULLSCREEN_PANELS -->
@@ -217,70 +208,74 @@
         <SwitchPreference android:title="@string/revanced_hide_filmstrip_overlay_title" android:key="revanced_hide_filmstrip_overlay" android:defaultValue="false" android:summaryOn="@string/revanced_hide_filmstrip_overlay_summary_on" android:summaryOff="@string/revanced_hide_filmstrip_overlay_summary_off" />SETTINGS: HIDE_FILMSTRIP_OVERLAY -->
 
         <!-- SETTINGS: DISABLE_HAPTIC_FEEDBACK
-        <PreferenceScreen android:title="@string/revanced_disable_haptic_feedback_title" android:key="revanced_disable_haptic_feedback" android:summary="@string/revanced_disable_haptic_feedback_summary">
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_disable_haptic_feedback_title" />
-            <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_seek_title" android:key="revanced_disable_haptic_feedback_seek" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_seek_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_seek_summary_off" />
-            <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_scrubbing_title" android:key="revanced_disable_haptic_feedback_scrubbing" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_scrubbing_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_scrubbing_summary_off" />
-            <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_chapters_title" android:key="revanced_disable_haptic_feedback_chapters" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_chapters_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_chapters_summary_off" />
-            <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_zoom_title" android:key="revanced_disable_haptic_feedback_zoom" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_zoom_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_zoom_summary_off" />
-        </PreferenceScreen>SETTINGS: DISABLE_HAPTIC_FEEDBACK -->
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_haptic_feedback_title" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_seek_title" android:key="revanced_disable_haptic_feedback_seek" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_seek_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_seek_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_scrubbing_title" android:key="revanced_disable_haptic_feedback_scrubbing" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_scrubbing_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_scrubbing_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_chapters_title" android:key="revanced_disable_haptic_feedback_chapters" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_chapters_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_chapters_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_zoom_title" android:key="revanced_disable_haptic_feedback_zoom" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_zoom_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_zoom_summary_off" />SETTINGS: DISABLE_HAPTIC_FEEDBACK -->
+    <!-- PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS -->
 
-    <!-- PREFERENCE_HEADER: BOTTOM_PLAYER
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_bottomplayer" />PREFERENCE_HEADER: BOTTOM_PLAYER -->
+
+    <!-- PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_bottom_player_layout" android:key="bottom_player">PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS -->
 
         <!-- SETTINGS: BUTTON_CONTAINER
-        <PreferenceScreen android:title="@string/revanced_hide_button_container_title" android:key="revanced_hide_button_container" android:summary="@string/revanced_hide_button_container_summary">
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_hide_button_container_title" />
-            <SwitchPreference android:title="@string/revanced_hide_button_like_title" android:key="revanced_hide_button_like" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_like_summary_on" android:summaryOff="@string/revanced_hide_button_like_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_dislike_title" android:key="revanced_hide_button_dislike" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_dislike_summary_on" android:summaryOff="@string/revanced_hide_button_dislike_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_share_title" android:key="revanced_hide_button_share" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_share_summary_on" android:summaryOff="@string/revanced_hide_button_share_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_live_chat_title" android:key="revanced_hide_button_live_chat" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_live_chat_summary_on" android:summaryOff="@string/revanced_hide_button_live_chat_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_report_title" android:key="revanced_hide_button_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_report_summary_on" android:summaryOff="@string/revanced_hide_button_report_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_create_short_title" android:key="revanced_hide_button_create_short" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_create_short_summary_on" android:summaryOff="@string/revanced_hide_button_create_short_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_thanks_title" android:key="revanced_hide_button_thanks" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_thanks_summary_on" android:summaryOff="@string/revanced_hide_button_thanks_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_create_clip_title" android:key="revanced_hide_button_create_clip" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_create_clip_summary_on" android:summaryOff="@string/revanced_hide_button_create_clip_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_download_title" android:key="revanced_hide_button_download" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_download_summary_on" android:summaryOff="@string/revanced_hide_button_download_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_button_playlist_title" android:key="revanced_hide_button_playlist" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_playlist_summary_on" android:summaryOff="@string/revanced_hide_button_playlist_summary_off" />
-        </PreferenceScreen>SETTINGS: BUTTON_CONTAINER -->
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_button_container_title" />
+        <SwitchPreference android:title="@string/revanced_hide_button_like_title" android:key="revanced_hide_button_like" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_like_summary_on" android:summaryOff="@string/revanced_hide_button_like_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_dislike_title" android:key="revanced_hide_button_dislike" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_dislike_summary_on" android:summaryOff="@string/revanced_hide_button_dislike_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_share_title" android:key="revanced_hide_button_share" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_share_summary_on" android:summaryOff="@string/revanced_hide_button_share_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_live_chat_title" android:key="revanced_hide_button_live_chat" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_live_chat_summary_on" android:summaryOff="@string/revanced_hide_button_live_chat_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_report_title" android:key="revanced_hide_button_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_report_summary_on" android:summaryOff="@string/revanced_hide_button_report_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_create_short_title" android:key="revanced_hide_button_create_short" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_create_short_summary_on" android:summaryOff="@string/revanced_hide_button_create_short_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_thanks_title" android:key="revanced_hide_button_thanks" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_thanks_summary_on" android:summaryOff="@string/revanced_hide_button_thanks_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_create_clip_title" android:key="revanced_hide_button_create_clip" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_create_clip_summary_on" android:summaryOff="@string/revanced_hide_button_create_clip_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_download_title" android:key="revanced_hide_button_download" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_download_summary_on" android:summaryOff="@string/revanced_hide_button_download_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_button_playlist_title" android:key="revanced_hide_button_playlist" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_playlist_summary_on" android:summaryOff="@string/revanced_hide_button_playlist_summary_off" />SETTINGS: BUTTON_CONTAINER -->
 
         <!-- SETTINGS: COMMENT_COMPONENT_PARENT
-        <PreferenceScreen android:title="@string/revanced_hide_comments_component_title" android:key="revanced_hide_comments_component" android:summary="@string/revanced_hide_comments_component_summary">
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_hide_comments_component_title" />SETTINGS: COMMENT_COMPONENT_PARENT -->
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_comments_title" />SETTINGS: COMMENT_COMPONENT_PARENT -->
 
-            <!-- SETTINGS: COMMENT_COMPONENTS
-            <SwitchPreference android:title="@string/revanced_hide_comments_section_title" android:key="revanced_hide_comments_section" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_section_summary_on" android:summaryOff="@string/revanced_hide_comments_section_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_preview_comment_title" android:key="revanced_hide_preview_comment" android:defaultValue="false" android:summaryOn="@string/revanced_hide_preview_comment_on" android:summaryOff="@string/revanced_hide_preview_comment_off" />SETTINGS: COMMENT_COMPONENTS -->
+        <!-- SETTINGS: COMMENT_COMPONENTS
+        <SwitchPreference android:title="@string/revanced_hide_comments_section_title" android:key="revanced_hide_comments_section" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_section_summary_on" android:summaryOff="@string/revanced_hide_comments_section_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_preview_comment_title" android:key="revanced_hide_preview_comment" android:defaultValue="false" android:summaryOn="@string/revanced_hide_preview_comment_on" android:summaryOff="@string/revanced_hide_preview_comment_off" />SETTINGS: COMMENT_COMPONENTS -->
 
-            <!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
-            <SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />SETTINGS: HIDE_GENERAL_LAYOUT_ADS -->
-        <!-- SETTINGS: COMMENT_COMPONENT_PARENT
-        </PreferenceScreen>SETTINGS: COMMENT_COMPONENT_PARENT -->
+        <!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
+        <SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />SETTINGS: HIDE_GENERAL_LAYOUT_ADS -->
 
-    <!-- PREFERENCE_HEADER: FLYOUT_PANEL
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_flyoutmenu" />PREFERENCE_HEADER: FLYOUT_PANEL -->
+    <!-- PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS -->
+
+
+    <!-- PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_flyout_menu_layout" android:key="flyout_menu">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu_layout" />PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS -->
 
         <!-- SETTINGS: ENABLE_OLD_QUALITY_LAYOUT
         <SwitchPreference android:title="@string/revanced_enable_old_quality_layout_title" android:key="revanced_enable_old_quality_layout" android:defaultValue="true" android:summaryOn="@string/revanced_enable_old_quality_layout_summary_on" android:summaryOff="@string/revanced_enable_old_quality_layout_summary_off" />SETTINGS: ENABLE_OLD_QUALITY_LAYOUT -->
 
         <!-- SETTINGS: FLYOUT_PANEL_COMPONENT
-        <PreferenceScreen android:title="@string/revanced_player_flyout_panel_title" android:key="revanced_player_flyout_panel" android:summary="@string/revanced_player_flyout_panel_summary">
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_captions_title" android:key="revanced_hide_menu_captions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_captions_summary_on" android:summaryOff="@string/revanced_hide_menu_captions_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_loop_video_title" android:key="revanced_hide_menu_loop_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_loop_video_summary_on" android:summaryOff="@string/revanced_hide_menu_loop_video_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_ambient_mode_title" android:key="revanced_hide_menu_ambient_mode" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_ambient_mode_summary_on" android:summaryOff="@string/revanced_hide_menu_ambient_mode_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_report_title" android:key="revanced_hide_menu_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_report_summary_on" android:summaryOff="@string/revanced_hide_menu_report_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_help_title" android:key="revanced_hide_menu_help" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_help_summary_on" android:summaryOff="@string/revanced_hide_menu_help_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_more_info_title" android:key="revanced_hide_menu_more_info" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_more_info_summary_on" android:summaryOff="@string/revanced_hide_menu_more_info_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_speed_title" android:key="revanced_hide_menu_speed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_speed_summary_on" android:summaryOff="@string/revanced_hide_menu_speed_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_listening_controls_title" android:key="revanced_hide_menu_listening_controls" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listening_controls_summary_on" android:summaryOff="@string/revanced_hide_menu_listening_controls_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_audio_track_title" android:key="revanced_hide_menu_audio_track" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_audio_track_summary_on" android:summaryOff="@string/revanced_hide_menu_audio_track_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_watch_in_vr_title" android:key="revanced_hide_menu_watch_in_vr" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_watch_in_vr_summary_on" android:summaryOff="@string/revanced_hide_menu_watch_in_vr_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_stats_for_nerds_title" android:key="revanced_hide_menu_stats_for_nerds" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_hide_menu_stats_for_nerds_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_menu_listen_with_youtube_music_title" android:key="revanced_hide_menu_listen_with_youtube_music" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listen_with_youtube_music_summary_on" android:summaryOff="@string/revanced_hide_menu_listen_with_youtube_music_summary_off" />
-        </PreferenceScreen>SETTINGS: FLYOUT_PANEL_COMPONENT -->
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_captions_title" android:key="revanced_hide_menu_captions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_captions_summary_on" android:summaryOff="@string/revanced_hide_menu_captions_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_loop_video_title" android:key="revanced_hide_menu_loop_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_loop_video_summary_on" android:summaryOff="@string/revanced_hide_menu_loop_video_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_ambient_mode_title" android:key="revanced_hide_menu_ambient_mode" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_ambient_mode_summary_on" android:summaryOff="@string/revanced_hide_menu_ambient_mode_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_report_title" android:key="revanced_hide_menu_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_report_summary_on" android:summaryOff="@string/revanced_hide_menu_report_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_help_title" android:key="revanced_hide_menu_help" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_help_summary_on" android:summaryOff="@string/revanced_hide_menu_help_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_more_info_title" android:key="revanced_hide_menu_more_info" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_more_info_summary_on" android:summaryOff="@string/revanced_hide_menu_more_info_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_speed_title" android:key="revanced_hide_menu_speed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_speed_summary_on" android:summaryOff="@string/revanced_hide_menu_speed_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_listening_controls_title" android:key="revanced_hide_menu_listening_controls" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listening_controls_summary_on" android:summaryOff="@string/revanced_hide_menu_listening_controls_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_audio_track_title" android:key="revanced_hide_menu_audio_track" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_audio_track_summary_on" android:summaryOff="@string/revanced_hide_menu_audio_track_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_watch_in_vr_title" android:key="revanced_hide_menu_watch_in_vr" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_watch_in_vr_summary_on" android:summaryOff="@string/revanced_hide_menu_watch_in_vr_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_stats_for_nerds_title" android:key="revanced_hide_menu_stats_for_nerds" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_hide_menu_stats_for_nerds_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_menu_listen_with_youtube_music_title" android:key="revanced_hide_menu_listen_with_youtube_music" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listen_with_youtube_music_summary_on" android:summaryOff="@string/revanced_hide_menu_listen_with_youtube_music_summary_off" />SETTINGS: FLYOUT_PANEL_COMPONENT -->
 
-    <!-- PREFERENCE_HEADER: SEEKBAR
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_seekbar" />PREFERENCE_HEADER: SEEKBAR -->
+    <!-- PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS -->
+
+
+    <!-- PREFERENCE: SEEKBAR_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_seekbar_layout" android:key="seekbar">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar_layout" />PREFERENCE: SEEKBAR_LAYOUT_SETTINGS -->
 
     <!-- SETTINGS: CUSTOM_SEEKBAR_COLOR
         <SwitchPreference android:title="@string/revanced_enable_custom_seekbar_color_title" android:key="revanced_enable_custom_seekbar_color" android:defaultValue="true" android:summaryOn="@string/revanced_enable_custom_seekbar_color_summary_on" android:summaryOff="@string/revanced_enable_custom_seekbar_color_summary_off" />
@@ -295,13 +290,13 @@
     <!-- SETTINGS: HIDE_TIME_STAMP
         <SwitchPreference android:title="@string/revanced_hide_time_stamp_title" android:key="revanced_hide_time_stamp" android:defaultValue="false" android:summaryOn="@string/revanced_hide_time_stamp_summary_on" android:summaryOff="@string/revanced_hide_time_stamp_summary_off" />SETTINGS: HIDE_TIME_STAMP -->
 
-    <!-- PREFERENCE: OTHER_LAYOUT_SETTINGS
-    </PreferenceScreen>PREFERENCE: OTHER_LAYOUT_SETTINGS -->
+    <!-- PREFERENCE: SEEKBAR_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: SEEKBAR_LAYOUT_SETTINGS -->
 
 
     <!-- PREFERENCE: OVERLAY_BUTTONS
-    <PreferenceScreen android:title="@string/revanced_overlay_button_title" android:key="overlaybutton" android:summary="@string/revanced_overlay_button_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button_title" />
+    <PreferenceScreen android:title="@string/revanced_overlay_button" android:key="overlay_button">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button" />
         <SwitchPreference android:title="@string/revanced_overlay_button_speed_title" android:key="revanced_overlay_button_speed" android:defaultValue="true" android:summaryOn="@string/revanced_overlay_button_speed_summary_on" android:summaryOff="@string/revanced_overlay_button_speed_summary_off" />
         <SwitchPreference android:title="@string/revanced_overlay_button_whitelist_title" android:key="revanced_overlay_button_whitelist" android:defaultValue="false" android:summaryOn="@string/revanced_overlay_button_whitelist_summary_on" android:summaryOff="@string/revanced_overlay_button_whitelist_summary_off" />
         <SwitchPreference android:title="@string/revanced_overlay_button_copy_url_title" android:key="revanced_overlay_button_copy_url" android:defaultValue="false" android:summaryOn="@string/revanced_overlay_button_copy_url_summary_on" android:summaryOff="@string/revanced_overlay_button_copy_url_summary_off" />
@@ -320,8 +315,8 @@
 
 
     <!-- PREFERENCE: VIDEO_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_video_settings_title" android:key="video_settings" android:summary="@string/revanced_video_settings_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />PREFERENCE: VIDEO_SETTINGS -->
+    <PreferenceScreen android:title="@string/revanced_video" android:key="video">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video" />PREFERENCE: VIDEO_SETTINGS -->
 
         <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
         <ListPreference android:title="@string/revanced_default_video_quality_wifi_title" android:key="revanced_default_video_quality_wifi" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />
@@ -343,8 +338,13 @@
     </PreferenceScreen>PREFERENCE: VIDEO_SETTINGS -->
 
 
-    <PreferenceScreen android:title="@string/revanced_misc_settings_title" android:key="misc" android:summary="@string/revanced_misc_settings_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc_settings_title" />
+    <PreferenceScreen android:title="@string/revanced_misc" android:key="misc">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc" />
+
+        <!-- PREFERENCE: MICROG_SETTINGS
+        <Preference android:title="@string/microg_settings_title" android:summary="@string/microg_settings_summary">
+            <intent android:targetPackage="com.mgoogle.android.gms" android:targetClass="org.microg.gms.ui.SettingsActivity" />
+        </Preference>PREFERENCE: MICROG_SETTINGS -->
 
         <!-- SETTINGS: ENABLE_EXTERNAL_BROWSER
         <SwitchPreference android:title="@string/revanced_enable_external_browser_title" android:key="revanced_enable_external_browser" android:defaultValue="true" android:summaryOn="@string/revanced_enable_external_browser_summary_on" android:summaryOff="@string/revanced_enable_external_browser_summary_off" />SETTINGS: ENABLE_EXTERNAL_BROWSER -->
@@ -358,7 +358,7 @@
         <!-- SETTINGS: DOUBLE_BACK_TIMEOUT
         <ListPreference android:title="@string/revanced_double_back_timeout_title" android:summary="@string/revanced_double_back_timeout_summary" android:key="revanced_double_back_timeout" android:defaultValue="2" />SETTINGS: DOUBLE_BACK_TIMEOUT -->
 
-        <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_experimental_flag" />
         <!-- SETTINGS: ENABLE_OLD_LAYOUT
         <SwitchPreference android:title="@string/revanced_enable_old_layout_title" android:key="revanced_enable_old_layout" android:defaultValue="false" android:summaryOn="@string/revanced_enable_old_layout_summary_on" android:summaryOff="@string/revanced_enable_old_layout_summary_off" />SETTINGS: ENABLE_OLD_LAYOUT -->
         <!-- SETTINGS: LAYOUT_SWITCH
@@ -366,8 +366,8 @@
         <SwitchPreference android:title="@string/revanced_enable_phone_layout_title" android:key="revanced_enable_phone_layout" android:summary="@string/revanced_enable_phone_layout_summary" android:defaultValue="false" />SETTINGS: LAYOUT_SWITCH -->
         <!-- SETTINGS: ENABLE_VP9_CODEC
         <SwitchPreference android:title="@string/revanced_enable_vp9_codec_title" android:key="revanced_enable_vp9_codec" android:defaultValue="false" android:summary="@string/revanced_enable_vp9_codec_summary" />SETTINGS: ENABLE_VP9_CODEC -->
-        <PreferenceScreen android:title="@string/revanced_backup_settings_title" android:key="backup" android:summary="@string/revanced_backup_settings_summary">
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_backup_settings_title" />
+        <PreferenceScreen android:title="@string/revanced_backup_title" android:key="backup" android:summary="@string/revanced_backup_summary">
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_backup_title" />
         </PreferenceScreen>
 
         <Preference android:title=" " android:selectable="false" android:summary="@string/pref_about_category" />
@@ -376,14 +376,14 @@
             <Preference android:title="revanced-patches" android:selectable="false" android:summary="2.164.15" />
             <Preference android:title="revanced-integrations" android:key="revanced-integrations" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_ads_removal_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_ads" />
             <Preference android:title="hide-general-ads" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-video-ads" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls" />
             <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout_settings_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout" />
             <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"/>
@@ -401,7 +401,7 @@
             <Preference android:title="header-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="switch-create-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_player" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_layout" />
             <Preference android:title="hide-cast-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-autoplay-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-captions-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -414,36 +414,36 @@
             <Preference android:title="hide-suggested-actions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-player-overlay-filter" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_fullscreen" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen_layout" />
             <Preference android:title="hide-fullscreen-panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-fullscreen-buttoncontainer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-endscreen-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-filmstrip-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="disable-haptic-feedback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_bottomplayer" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_bottom_player_layout" />
             <Preference android:title="hide-button-container" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-comment-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_flyoutmenu" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu_layout" />
             <Preference android:title="enable-old-quality-layout" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-flyout-panel" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_seekbar" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar_layout" />
             <Preference android:title="custom-seekbar-color" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="enable-seekbar-tapping" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-seekbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-time-stamp" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button" />
             <Preference android:title="overlay-buttons" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video" />
             <Preference android:title="default-video-quality" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="default-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="custom-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc_settings_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc" />
             <Preference android:title="enable-external-browser" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="enable-open-links-directly" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="enable-minimized-playback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -451,7 +451,7 @@
             <Preference android:title="layout-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="force-vp9-codec" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_others_title" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_others" />
             <Preference android:title="return-youtube-dislike" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="sponsorblock" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="microg-support" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>