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 3b6094172..28ee2a814 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
@@ -86,7 +86,7 @@ class HideEndScreenOverlayPatch : BytecodePatch() {
             SettingsPatch.addPreference(
                 arrayOf(
                     "PREFERENCE: FULLSCREEN_SETTINGS",
-                    "SETTINGS: HIDE_ENDSCREEN_OVERLAY"
+                    "SETTINGS: HIDE_END_SCREEN_OVERLAY"
                 )
             )
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt
deleted file mode 100644
index 37c9ab33d..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/fingerprints/HideSnackbarFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.general.snackbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object HideSnackbarFingerprint : MethodFingerprint(
-    returnType = "V",
-    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L", "L"),
-    customFingerprint = { it.definingClass == "Lcom/google/android/apps/youtube/app/common/ui/bottomui/BottomUiContainer;" }
-)
\ No newline at end of file
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
deleted file mode 100644
index 241bc50b0..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package app.revanced.patches.youtube.layout.general.snackbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.snackbar.fingerprints.HideSnackbarFingerprint
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
-import app.revanced.util.integrations.Constants.GENERAL
-
-@Patch
-@Name("hide-snackbar")
-@Description("Hides the snackbar action popup.")
-@DependsOn([SettingsPatch::class])
-@YouTubeCompatibility
-@Version("0.0.1")
-class HideSnackbarPatch : BytecodePatch(
-    listOf(
-        HideSnackbarFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        HideSnackbarFingerprint.result?.mutableMethod?.let {
-            it.addInstructions(
-                0, """
-                    invoke-static {}, $GENERAL->hideSnackbar()Z
-                    move-result v0
-                    if-eqz v0, :default
-                    return-void
-                    """, listOf(ExternalLabel("default", it.instruction(0)))
-            )
-        } ?: return HideSnackbarFingerprint.toErrorResult()
-
-        /*
-         * Add settings
-         */
-        SettingsPatch.addPreference(
-            arrayOf(
-                "PREFERENCE: GENERAL_SETTINGS",
-                "SETTINGS: HIDE_SNACKBAR"
-            )
-        )
-
-        SettingsPatch.updatePatchStatus("hide-snackbar")
-
-        return PatchResultSuccess()
-    }
-}
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 1d36f67cc..92052e17e 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
@@ -72,7 +72,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
         SettingsPatch.addPreference(
             arrayOf(
                 "PREFERENCE: GENERAL_SETTINGS",
-                "SETTINGS: ENABLE_TABLET_MINIPLAYER"
+                "SETTINGS: ENABLE_TABLET_MINI_PLAYER"
             )
         )
 
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 9c01a8ba1..81e6ce220 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
@@ -61,7 +61,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
         SettingsPatch.addPreference(
             arrayOf(
                 "PREFERENCE: PLAYER_SETTINGS",
-                "SETTINGS: HIDE_ENDSCREEN_CARDS"
+                "SETTINGS: HIDE_END_SCREEN_CARDS"
             )
         )
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt
index 5c2580f1c..4bc258d06 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt
@@ -9,7 +9,6 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.patch.options.PatchOptions
 import app.revanced.patches.shared.patch.settings.AbstractSettingsResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
@@ -32,7 +31,6 @@ import java.nio.file.Paths
 @DependsOn(
     [
         IntegrationsPatch::class,
-        PatchOptions::class,
         SharedResourceIdPatch::class,
         SettingsBytecodePatch::class
     ]
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 852bc16ec..667ae979d 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -5,24 +5,24 @@
     <string name="microg_not_running_warning">MicroG does not run in the background</string>
     <string name="microg_settings_summary">Enable cloud messaging settings to receive notifications</string>
     <string name="microg_settings_title">Open MicroG</string>
-    <string name="revanced_adremover_button_ads_summary_off">Buttoned ads are shown</string>
-    <string name="revanced_adremover_button_ads_summary_on">Buttoned ads are hidden</string>
-    <string name="revanced_adremover_button_ads_title">Hide buttoned ad</string>
-    <string name="revanced_adremover_custom_filter_summary">Filter components by their name separated by a comma</string>
-    <string name="revanced_adremover_custom_filter_title">Custom filter</string>
-    <string name="revanced_adremover_general_ads_summary_off">General ads are shown</string>
-    <string name="revanced_adremover_general_ads_summary_on">General ads are hidden</string>
-    <string name="revanced_adremover_general_ads_title">Hide general ads</string>
-    <string name="revanced_adremover_paid_content_summary_off">Paid promotion label is shown</string>
-    <string name="revanced_adremover_paid_content_summary_on">Paid promotion label is hidden</string>
-    <string name="revanced_adremover_paid_content_title">Hide paid promotion</string>
-    <string name="revanced_adremover_self_sponsor_summary_off">Self sponsored cards are shown</string>
-    <string name="revanced_adremover_self_sponsor_summary_on">Self sponsored cards are hidden</string>
-    <string name="revanced_adremover_self_sponsor_title">Hide self sponsored cards</string>
-    <string name="revanced_adremover_user_filter_summary_off">User filter is disabled</string>
-    <string name="revanced_adremover_user_filter_summary_on">User filter is enabled</string>
-    <string name="revanced_adremover_user_filter_title">Enable user filter</string>
     <string name="revanced_ads">Ads</string>
+    <string name="revanced_ad_remover_button_ads_summary_off">Buttoned ads are shown</string>
+    <string name="revanced_ad_remover_button_ads_summary_on">Buttoned ads are hidden</string>
+    <string name="revanced_ad_remover_button_ads_title">Hide buttoned ad</string>
+    <string name="revanced_ad_remover_custom_filter_summary">Filter components by their name separated by a comma</string>
+    <string name="revanced_ad_remover_custom_filter_title">Custom filter</string>
+    <string name="revanced_ad_remover_general_ads_summary_off">General ads are shown</string>
+    <string name="revanced_ad_remover_general_ads_summary_on">General ads are hidden</string>
+    <string name="revanced_ad_remover_general_ads_title">Hide general ads</string>
+    <string name="revanced_ad_remover_paid_content_summary_off">Paid promotion label is shown</string>
+    <string name="revanced_ad_remover_paid_content_summary_on">Paid promotion label is hidden</string>
+    <string name="revanced_ad_remover_paid_content_title">Hide paid promotion</string>
+    <string name="revanced_ad_remover_self_sponsor_summary_off">Self sponsored cards are shown</string>
+    <string name="revanced_ad_remover_self_sponsor_summary_on">Self sponsored cards are hidden</string>
+    <string name="revanced_ad_remover_self_sponsor_title">Hide self sponsored cards</string>
+    <string name="revanced_ad_remover_user_filter_summary_off">User filter is disabled</string>
+    <string name="revanced_ad_remover_user_filter_summary_on">User filter is enabled</string>
+    <string name="revanced_ad_remover_user_filter_title">Enable user filter</string>
     <string name="revanced_backup_summary">Import ReVanced settings from file or export ReVanced settings to file</string>
     <string name="revanced_bottom_player">Bottom player</string>
     <string name="revanced_button_container_title">Button container</string>
@@ -139,9 +139,9 @@ Known issues
     <string name="revanced_enable_swipe_volume_title">Enable volume gesture</string>
     <string name="revanced_enable_tablet_layout_summary">Tricks the dpi to use some tablet layouts</string>
     <string name="revanced_enable_tablet_layout_title">Enable tablet layout</string>
-    <string name="revanced_enable_tablet_miniplayer_summary_off">Tablet mini player is disabled</string>
-    <string name="revanced_enable_tablet_miniplayer_summary_on">Tablet mini player is enabled</string>
-    <string name="revanced_enable_tablet_miniplayer_title">Enable tablet mini player</string>
+    <string name="revanced_enable_tablet_mini_player_summary_off">Tablet mini player is disabled</string>
+    <string name="revanced_enable_tablet_mini_player_summary_on">Tablet mini player is enabled</string>
+    <string name="revanced_enable_tablet_mini_player_title">Enable tablet mini player</string>
     <string name="revanced_enable_tablet_navigation_bar_summary_off">Tablet navigation bar is disabled</string>
     <string name="revanced_enable_tablet_navigation_bar_summary_on">Tablet navigation bar is enabled</string>
     <string name="revanced_enable_tablet_navigation_bar_title">Enable tablet navigation bar</string>
@@ -277,12 +277,12 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_emoji_picker_summary_off">Emoji picker is shown</string>
     <string name="revanced_hide_emoji_picker_summary_on">Emoji picker is hidden</string>
     <string name="revanced_hide_emoji_picker_title">Hide emoji picker</string>
-    <string name="revanced_hide_endscreen_cards_summary_off">End screen cards are shown</string>
-    <string name="revanced_hide_endscreen_cards_summary_on">End screen cards are hidden</string>
-    <string name="revanced_hide_endscreen_cards_title">Hide end screen cards</string>
-    <string name="revanced_hide_endscreen_overlay_summary_off">End screen overlay are shown</string>
-    <string name="revanced_hide_endscreen_overlay_summary_on">End screen overlay are hidden</string>
-    <string name="revanced_hide_endscreen_overlay_title">Hide end screen overlay</string>
+    <string name="revanced_hide_end_screen_cards_summary_off">End screen cards are shown</string>
+    <string name="revanced_hide_end_screen_cards_summary_on">End screen cards are hidden</string>
+    <string name="revanced_hide_end_screen_cards_title">Hide end screen cards</string>
+    <string name="revanced_hide_end_screen_overlay_summary_off">End screen overlay are shown</string>
+    <string name="revanced_hide_end_screen_overlay_summary_on">End screen overlay are hidden</string>
+    <string name="revanced_hide_end_screen_overlay_title">Hide end screen overlay</string>
     <string name="revanced_hide_filmstrip_overlay_summary_off">Film strip overlay are shown</string>
     <string name="revanced_hide_filmstrip_overlay_summary_on">Film strip overlay are hidden</string>
     <string name="revanced_hide_filmstrip_overlay_title">Hide film strip overlay</string>
@@ -420,9 +420,9 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_shorts_shelf_summary_off">Shorts shelves are shown</string>
     <string name="revanced_hide_shorts_shelf_summary_on">Shorts shelves are hidden</string>
     <string name="revanced_hide_shorts_shelf_title">Hide shorts shelf</string>
-    <string name="revanced_hide_snackbar_summary_off">Snackbar is shown</string>
-    <string name="revanced_hide_snackbar_summary_on">Snackbar is hidden</string>
-    <string name="revanced_hide_snackbar_title">Hide snackbar</string>
+    <string name="revanced_hide_snack_bar_summary_off">Snack bar is shown</string>
+    <string name="revanced_hide_snack_bar_summary_on">Snack bar is hidden</string>
+    <string name="revanced_hide_snack_bar_title">Hide snack bar</string>
     <string name="revanced_hide_stories_shelf_summary_off">Stories shelves are shown</string>
     <string name="revanced_hide_stories_shelf_summary_on">Stories shelves are hidden</string>
     <string name="revanced_hide_stories_shelf_title">Hide stories shelf</string>
diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml
index 8058f2b6e..d0ff3aad0 100644
--- a/src/main/resources/youtube/settings/values-v21/strings.xml
+++ b/src/main/resources/youtube/settings/values-v21/strings.xml
@@ -3,8 +3,8 @@
     <!-- Translation Exception -->
     <string name="about">@string/pref_about_category</string>
 
-    <string name="revanced_account_menu_custom_filter_summary">@string/revanced_adremover_custom_filter_summary</string>
-    <string name="revanced_account_menu_custom_filter_title">@string/revanced_adremover_custom_filter_title</string>
+    <string name="revanced_account_menu_custom_filter_summary">@string/revanced_ad_remover_custom_filter_summary</string>
+    <string name="revanced_account_menu_custom_filter_title">@string/revanced_ad_remover_custom_filter_title</string>
 
     <string name="revanced_backup_title">@string/settings_ie</string>
     <string name="revanced_extended_settings_title">ReVanced Extended</string>
@@ -37,9 +37,9 @@
     <string name="revanced_hide_shorts_player_info_panel_summary_off">@string/revanced_hide_info_panel_summary_off</string>
     <string name="revanced_hide_shorts_player_info_panel_summary_on">@string/revanced_hide_info_panel_summary_on</string>
     <string name="revanced_hide_shorts_player_info_panel_title">@string/revanced_hide_info_panel_title</string>
-    <string name="revanced_hide_shorts_player_paid_content_summary_off">@string/revanced_adremover_paid_content_summary_off</string>
-    <string name="revanced_hide_shorts_player_paid_content_summary_on">@string/revanced_adremover_paid_content_summary_on</string>
-    <string name="revanced_hide_shorts_player_paid_content_title">@string/revanced_adremover_paid_content_title</string>
+    <string name="revanced_hide_shorts_player_paid_content_summary_off">@string/revanced_ad_remover_paid_content_summary_off</string>
+    <string name="revanced_hide_shorts_player_paid_content_summary_on">@string/revanced_ad_remover_paid_content_summary_on</string>
+    <string name="revanced_hide_shorts_player_paid_content_title">@string/revanced_ad_remover_paid_content_title</string>
     <string name="revanced_hide_shorts_player_remix_button_summary_off">@string/revanced_hide_button_remix_summary_off</string>
     <string name="revanced_hide_shorts_player_remix_button_summary_on">@string/revanced_hide_button_remix_summary_on</string>
     <string name="revanced_hide_shorts_player_remix_button_title">@string/revanced_hide_button_remix_title</string>
@@ -54,7 +54,6 @@
     <string name="revanced_icons_afn_blue">afn / blue</string>
     <string name="revanced_icons_afn_red">afn / red</string>
     <string name="revanced_icons_default">stock</string>
-    <string name="revanced_icons_custom">custom</string>
     <string name="revanced_icons_mmt">mmt</string>
     <string name="revanced_icons_revancify_blue">revancify / blue</string>
     <string name="revanced_icons_revancify_red">revancify / red</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 96e00e432..cda265b31 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -10,13 +10,13 @@
         <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 -->
 
         <!-- SETTINGS: HIDE_GENERAL_ADS
-        <SwitchPreference android:title="@string/revanced_adremover_general_ads_title" android:key="revanced_adremover_general_ads" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_general_ads_summary_on" android:summaryOff="@string/revanced_adremover_general_ads_summary_off" />
-        <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" />
-        <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 -->
+        <SwitchPreference android:title="@string/revanced_ad_remover_general_ads_title" android:key="revanced_ad_remover_general_ads" android:defaultValue="true" android:summaryOn="@string/revanced_ad_remover_general_ads_summary_on" android:summaryOff="@string/revanced_ad_remover_general_ads_summary_off" />
+        <SwitchPreference android:title="@string/revanced_ad_remover_button_ads_title" android:key="revanced_ad_remover_button_ads" android:defaultValue="true" android:summaryOn="@string/revanced_ad_remover_button_ads_summary_on" android:summaryOff="@string/revanced_ad_remover_button_ads_summary_off" />
+        <SwitchPreference android:title="@string/revanced_ad_remover_paid_content_title" android:key="revanced_ad_remover_paid_content" android:defaultValue="true" android:summaryOn="@string/revanced_ad_remover_paid_content_summary_on" android:summaryOff="@string/revanced_ad_remover_paid_content_summary_off" />
+        <SwitchPreference android:title="@string/revanced_ad_remover_self_sponsor_title" android:key="revanced_ad_remover_self_sponsor" android:defaultValue="true" android:summaryOn="@string/revanced_ad_remover_self_sponsor_summary_on" android:summaryOff="@string/revanced_ad_remover_self_sponsor_summary_off" />
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_ad_remover_custom_filter_title" />
+        <SwitchPreference android:title="@string/revanced_ad_remover_user_filter_title" android:key="revanced_ad_remover_user_filter" android:defaultValue="false" android:summaryOn="@string/revanced_ad_remover_user_filter_summary_on" android:summaryOff="@string/revanced_ad_remover_user_filter_summary_off" />
+        <EditTextPreference android:title="@string/revanced_ad_remover_custom_filter_title" android:key="revanced_ad_remover_custom_strings" android:summary="@string/revanced_ad_remover_custom_filter_summary" android:defaultValue=" " android:inputType="text" android:dependency="revanced_ad_remover_user_filter" />SETTINGS: HIDE_GENERAL_ADS -->
 
     <!-- PREFERENCE: ADS_SETTINGS
     </PreferenceScreen>PREFERENCE: ADS_SETTINGS -->
@@ -80,8 +80,8 @@
         <!-- SETTINGS: ENABLE_WIDE_SEARCHBAR
         <SwitchPreference android:title="@string/revanced_enable_wide_searchbar_title" android:key="revanced_enable_wide_searchbar" android:defaultValue="false" android:summaryOn="@string/revanced_enable_wide_searchbar_summary_on" android:summaryOff="@string/revanced_enable_wide_searchbar_summary_off" />SETTINGS: ENABLE_WIDE_SEARCHBAR -->
 
-        <!-- SETTINGS: ENABLE_TABLET_MINIPLAYER
-        <SwitchPreference android:title="@string/revanced_enable_tablet_miniplayer_title" android:key="revanced_enable_tablet_miniplayer" android:defaultValue="false" android:summaryOn="@string/revanced_enable_tablet_miniplayer_summary_on" android:summaryOff="@string/revanced_enable_tablet_miniplayer_summary_off" />SETTINGS: ENABLE_TABLET_MINIPLAYER -->
+        <!-- SETTINGS: ENABLE_TABLET_MINI_PLAYER
+        <SwitchPreference android:title="@string/revanced_enable_tablet_mini_player_title" android:key="revanced_enable_tablet_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_tablet_mini_player_summary_on" android:summaryOff="@string/revanced_enable_tablet_mini_player_summary_off" />SETTINGS: ENABLE_TABLET_MINI_PLAYER -->
 
         <!-- SETTINGS: HIDE_AUTO_CAPTIONS
         <SwitchPreference android:title="@string/revanced_hide_auto_captions_title" android:key="revanced_hide_auto_captions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_auto_captions_summary_on" android:summaryOff="@string/revanced_hide_auto_captions_summary_off" />SETTINGS: HIDE_AUTO_CAPTIONS -->
@@ -101,8 +101,8 @@
         <!-- SETTINGS: HIDE_EMAIL_ADDRESS
         <SwitchPreference android:title="@string/revanced_hide_email_address_title" android:key="revanced_hide_email_address" android:defaultValue="true" android:summaryOn="@string/revanced_hide_email_address_summary_on" android:summaryOff="@string/revanced_hide_email_address_summary_off" />SETTINGS: HIDE_EMAIL_ADDRESS -->
 
-        <!-- SETTINGS: HIDE_SNACKBAR
-        <SwitchPreference android:title="@string/revanced_hide_snackbar_title" android:key="revanced_hide_snackbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_snackbar_summary_on" android:summaryOff="@string/revanced_hide_snackbar_summary_off" />SETTINGS: HIDE_SNACKBAR -->
+        <!-- SETTINGS: HIDE_SNACK_BAR
+        <SwitchPreference android:title="@string/revanced_hide_snack_bar_title" android:key="revanced_hide_snack_bar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_snack_bar_summary_on" android:summaryOff="@string/revanced_hide_snack_bar_summary_off" />SETTINGS: HIDE_SNACK_BAR -->
 
         <!-- SETTINGS: HIDE_SEARCH_TERMS
         <SwitchPreference android:title="@string/revanced_hide_search_terms_title" android:key="revanced_hide_search_terms" android:defaultValue="false" android:summaryOn="@string/revanced_hide_search_terms_summary_on" android:summaryOff="@string/revanced_hide_search_terms_summary_off" />SETTINGS: HIDE_SEARCH_TERMS -->
@@ -183,8 +183,8 @@
         <!-- SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND
         <SwitchPreference android:title="@string/revanced_hide_player_button_background_title" android:key="revanced_hide_player_button_background" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_button_background_summary_on" android:summaryOff="@string/revanced_hide_player_button_background_summary_off" />SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND -->
 
-        <!-- SETTINGS: HIDE_ENDSCREEN_CARDS
-        <SwitchPreference android:title="@string/revanced_hide_endscreen_cards_title" android:key="revanced_hide_endscreen_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_endscreen_cards_summary_on" android:summaryOff="@string/revanced_hide_endscreen_cards_summary_off" />SETTINGS: HIDE_ENDSCREEN_CARDS -->
+        <!-- SETTINGS: HIDE_END_SCREEN_CARDS
+        <SwitchPreference android:title="@string/revanced_hide_end_screen_cards_title" android:key="revanced_hide_end_screen_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_end_screen_cards_summary_on" android:summaryOff="@string/revanced_hide_end_screen_cards_summary_off" />SETTINGS: HIDE_END_SCREEN_CARDS -->
 
         <!-- SETTINGS: HIDE_INFO_CARDS
         <SwitchPreference android:title="@string/revanced_hide_info_cards_title" android:key="revanced_hide_info_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_info_cards_summary_on" android:summaryOff="@string/revanced_hide_info_cards_summary_off" />SETTINGS: HIDE_INFO_CARDS -->
@@ -219,8 +219,8 @@
         <!-- SETTINGS: HIDE_AUTOPLAY_PREVIEW
         <SwitchPreference android:title="@string/revanced_hide_autoplay_preview_title" android:key="revanced_hide_autoplay_preview" android:defaultValue="false" android:summaryOn="@string/revanced_hide_autoplay_preview_summary_on" android:summaryOff="@string/revanced_hide_autoplay_preview_summary_off" />SETTINGS: HIDE_AUTOPLAY_PREVIEW -->
 
-        <!-- SETTINGS: HIDE_ENDSCREEN_OVERLAY
-        <SwitchPreference android:title="@string/revanced_hide_endscreen_overlay_title" android:key="revanced_hide_endscreen_overlay" android:defaultValue="false" android:summaryOn="@string/revanced_hide_endscreen_overlay_summary_on" android:summaryOff="@string/revanced_hide_endscreen_overlay_summary_off" />SETTINGS: HIDE_ENDSCREEN_OVERLAY -->
+        <!-- SETTINGS: HIDE_END_SCREEN_OVERLAY
+        <SwitchPreference android:title="@string/revanced_hide_end_screen_overlay_title" android:key="revanced_hide_end_screen_overlay" android:defaultValue="false" android:summaryOn="@string/revanced_hide_end_screen_overlay_summary_on" android:summaryOff="@string/revanced_hide_end_screen_overlay_summary_off" />SETTINGS: HIDE_END_SCREEN_OVERLAY -->
 
         <!-- SETTINGS: HIDE_FILMSTRIP_OVERLAY
         <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 -->
@@ -477,7 +477,7 @@
             <Preference android:title="hide-crowdfunding-box" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-get-premium" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-email-address" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="hide-snackbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="hide-snack-bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-search-terms" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-floating-microphone" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-category-bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>