chore: Release v5.18.1-dev.2 [skip ci]

## [5.18.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.1-dev.1...v5.18.1-dev.2) (2025-04-01) ### Bug Fixes * **YouTube:** Combine multiple seekbar patches into a single patch ([#4705](https://github.com/ReVanced/revanced-patches/issues/4705)) ([37984b8](37984b8b99))
fix(YouTube): Combine multiple seekbar patches into a single patch (#4705 )
2026-01-13 06:27:41 +00:00 · 2025-04-01 19:00:31 +00:00 · 2025-04-01 20:57:03 +02:00 · 2025-04-01 20:51:16 +02:00 · 2025-04-01 20:17:00 +02:00 · 2025-03-31 13:45:18 +00:00
143 changed files with 1620 additions and 914 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,92 @@
+## [5.18.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.1-dev.1...v5.18.1-dev.2) (2025-04-01)
+
+
+### Bug Fixes
+
+* **YouTube:** Combine multiple seekbar patches into a single patch ([#4705](https://github.com/ReVanced/revanced-patches/issues/4705)) ([503b7eb](https://github.com/ReVanced/revanced-patches/commit/503b7eb8d413ef7f248394f128f3b2a6f3192ba6))
+
+## [5.18.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.18.0...v5.18.1-dev.1) (2025-03-31)
+
+
+### Bug Fixes
+
+* **YouTube - Remove background playback restrictions:** Do not show media controls when playing Shorts from the feed ([2ed675c](https://github.com/ReVanced/revanced-patches/commit/2ed675cdd058fb5876381a9d30dee5263f6b2e26))
+
+# [5.18.0](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](https://github.com/ReVanced/revanced-patches/commit/84f585492e4be3604c6c7680ffb3bebcea5a675f))
+
+
+### Features
+
+* **YouTube:** Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([c1379f6](https://github.com/ReVanced/revanced-patches/commit/c1379f6e520c683d2c9d6a490a69ca542168b3b3))
+
+# [5.18.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.0-dev.1...v5.18.0-dev.2) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](https://github.com/ReVanced/revanced-patches/commit/84f585492e4be3604c6c7680ffb3bebcea5a675f))
+
+# [5.18.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0-dev.1) (2025-03-28)
+
+
+### Features
+
+* **YouTube:** Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([c1379f6](https://github.com/ReVanced/revanced-patches/commit/c1379f6e520c683d2c9d6a490a69ca542168b3b3))
+
+# [5.17.0](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.17.0) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Facebook - Hide 'Sponsored Stories':** Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([46bd1c8](https://github.com/ReVanced/revanced-patches/commit/46bd1c829acd5f83600025e0ceb7d482ae80be69))
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
+# [5.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.3...v5.17.0-dev.4) (2025-03-28)
+
+
+### Bug Fixes
+
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+
+# [5.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.2...v5.17.0-dev.3) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+
+# [5.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.1...v5.17.0-dev.2) (2025-03-27)
+
+
+### Bug Fixes
+
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+# [5.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.2-dev.1...v5.17.0-dev.1) (2025-03-27)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
 ## [5.16.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.16.2-dev.1) (2025-03-26)


--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
@@ -122,6 +122,21 @@ public class SpoofVideoStreamsPatch {
        return false;
    }

+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with video playback.
+     */
+    public static boolean usePlaybackStartFeatureFlag(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "usePlaybackStartFeatureFlag is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
    /**
     * Injection point.
     */
--- a/extensions/spotify/build.gradle.kts
+++ b/extensions/spotify/build.gradle.kts
@@ -1,3 +1,16 @@
 dependencies {
+    compileOnly(project(":extensions:shared:library"))
    compileOnly(project(":extensions:spotify:stub"))
+    compileOnly(libs.annotation)
+}
+
+android {
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
 }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java
@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.patches;

 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;

@SuppressWarnings("unused")
@@ -23,7 +24,13 @@ public class BackgroundPlaybackPatch {
        // 7. Close the Short
        // 8. Resume playing the regular video
        // 9. Minimize the app (PIP should appear)
-        return !ShortsPlayerState.isOpen();
+        if (ShortsPlayerState.isOpen()) {
+            return false;
+        }
+
+        // Check if the video player is opened and it's not playing in the feed.
+        PlayerType current = PlayerType.getCurrent();
+        return !current.isNoneOrHidden() && current != PlayerType.INLINE_MINIMAL;
    }

    /**
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java
@@ -2,7 +2,7 @@ package app.revanced.extension.youtube.patches;

 import app.revanced.extension.youtube.settings.Settings;

-/** @noinspection unused*/
+@SuppressWarnings("unused")
 public class DisableResumingStartupShortsPlayerPatch {

    /**
@@ -11,4 +11,11 @@ public class DisableResumingStartupShortsPlayerPatch {
    public static boolean disableResumingStartupShortsPlayer() {
        return Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableResumingStartupShortsPlayer(boolean original) {
+        return original && !Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
+    }
 }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
@@ -43,10 +43,13 @@ public final class MiniplayerPatch {
        MODERN_2(null, 2),
        MODERN_3(null, 3),
        /**
-         * Half broken miniplayer, that might be work in progress or left over abandoned code.
-         * Can force this type by editing the import/export settings.
+         * Works and is functional with 20.03+
         */
-        MODERN_4(null, 4);
+        MODERN_4(null, 4),
+        /**
+         * Half broken miniplayer, and in 20.02 and earlier is declared as type 4.
+         */
+        MODERN_5(null, 5);

        /**
         * Legacy tablet hook value.
@@ -126,12 +129,13 @@ public final class MiniplayerPatch {
    private static final boolean DRAG_AND_DROP_ENABLED =
            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();

-    private static final boolean HIDE_EXPAND_CLOSE_ENABLED =
-            Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.get()
-                    && Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.isAvailable();
+    private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
+            Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
+                    && Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.isAvailable();

    private static final boolean HIDE_SUBTEXT_ENABLED =
-            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
+            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3 || CURRENT_TYPE == MODERN_4)
+                    && Settings.MINIPLAYER_HIDE_SUBTEXT.get();

    // 19.25 is last version that has forward/back buttons for phones,
    // but buttons still show for tablets/foldable devices and they don't work well so always hide.
@@ -139,7 +143,7 @@ public final class MiniplayerPatch {
            && (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());

    private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
-            Settings.MINIPLAYER_ROUNDED_CORNERS.get();
+            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get();

    private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
            DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get();
@@ -172,11 +176,12 @@ public final class MiniplayerPatch {
        }
    }

-    public static final class MiniplayerHideExpandCloseAvailability implements Setting.Availability {
+    public static final class MiniplayerHideOverlayButtonsAvailability implements Setting.Availability {
        @Override
        public boolean isAvailable() {
            MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
-            return (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
+            return type == MODERN_4
+                    || (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
                    || (!IS_19_26_OR_GREATER && type == MODERN_1
                    && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
                    || (IS_19_29_OR_GREATER && type == MODERN_3);
@@ -227,9 +232,13 @@ public final class MiniplayerPatch {
    /**
     * Injection point.
     */
-    public static void adjustMiniplayerOpacity(ImageView view) {
+    public static void adjustMiniplayerOpacity(View view) {
        if (CURRENT_TYPE == MODERN_1) {
-            view.setImageAlpha(OPACITY_LEVEL);
+            if (view instanceof ImageView imageView) {
+                imageView.setImageAlpha(OPACITY_LEVEL);
+            } else {
+                Logger.printException(() -> "Unknown miniplayer overlay view: " + view);
+            }
        }
    }

@@ -247,7 +256,7 @@ public final class MiniplayerPatch {
    /**
     * Injection point.
     */
-    public static boolean enableMiniplayerDoubleTapAction(boolean original) {
+    public static boolean getMiniplayerDoubleTapAction(boolean original) {
        if (CURRENT_TYPE == DEFAULT) {
            return original;
        }
@@ -258,7 +267,7 @@ public final class MiniplayerPatch {
    /**
     * Injection point.
     */
-    public static boolean enableMiniplayerDragAndDrop(boolean original) {
+    public static boolean getMiniplayerDragAndDrop(boolean original) {
        if (CURRENT_TYPE == DEFAULT) {
            return original;
        }
@@ -266,13 +275,36 @@ public final class MiniplayerPatch {
        return DRAG_AND_DROP_ENABLED;
    }

+    /**
+     * Injection point.
+     */
+    public static boolean getRoundedCorners(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    }

    /**
     * Injection point.
     */
-    public static boolean setRoundedCorners(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    public static boolean getHorizontalDrag(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean getMaximizeAnimation(boolean original) {
+        // This must be forced on if horizontal drag is enabled,
+        // otherwise the UI has visual glitches when maximizing the miniplayer.
+        if (MINIPLAYER_HORIZONTAL_DRAG_ENABLED) {
+            return true;
        }

        return original;
@@ -281,7 +313,7 @@ public final class MiniplayerPatch {
    /**
     * Injection point.
     */
-    public static int setMiniplayerDefaultSize(int original) {
+    public static int getMiniplayerDefaultSize(int original) {
        if (CURRENT_TYPE.isModern()) {
            return MINIPLAYER_SIZE;
        }
@@ -289,29 +321,26 @@ public final class MiniplayerPatch {
        return original;
    }

+    /**
+     * Injection point.
+     */
+    public static void hideMiniplayerExpandClose(View view) {
+        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
+    }

    /**
     * Injection point.
     */
-    public static boolean setHorizontalDrag(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    public static void hideMiniplayerActionButton(View view) {
+        if (CURRENT_TYPE == MODERN_4) {
+            Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
        }
-
-        return original;
    }

    /**
     * Injection point.
     */
-    public static void hideMiniplayerExpandClose(ImageView view) {
-        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_EXPAND_CLOSE_ENABLED, view);
-    }
-
-    /**
-     * Injection point.
-     */
-    public static void hideMiniplayerRewindForward(ImageView view) {
+    public static void hideMiniplayerRewindForward(View view) {
        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_REWIND_FORWARD_ENABLED, view);
    }

--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java
@@ -3,11 +3,15 @@ package app.revanced.extension.youtube.patches;
 import app.revanced.extension.shared.Utils;

 public class VersionCheckPatch {
-    public static final boolean IS_19_17_OR_GREATER = Utils.getAppVersionName().compareTo("19.17.00") >= 0;
-    public static final boolean IS_19_20_OR_GREATER = Utils.getAppVersionName().compareTo("19.20.00") >= 0;
-    public static final boolean IS_19_21_OR_GREATER = Utils.getAppVersionName().compareTo("19.21.00") >= 0;
-    public static final boolean IS_19_26_OR_GREATER = Utils.getAppVersionName().compareTo("19.26.00") >= 0;
-    public static final boolean IS_19_29_OR_GREATER = Utils.getAppVersionName().compareTo("19.29.00") >= 0;
-    public static final boolean IS_19_34_OR_GREATER = Utils.getAppVersionName().compareTo("19.34.00") >= 0;
-    public static final boolean IS_19_46_OR_GREATER = Utils.getAppVersionName().compareTo("19.46.00") >= 0;
+    private static boolean isVersionOrGreater(String version) {
+        return Utils.getAppVersionName().compareTo(version) >= 0;
+    }
+
+    public static final boolean IS_19_17_OR_GREATER = isVersionOrGreater("19.17.00");
+    public static final boolean IS_19_20_OR_GREATER = isVersionOrGreater("19.20.00");
+    public static final boolean IS_19_21_OR_GREATER = isVersionOrGreater("19.21.00");
+    public static final boolean IS_19_26_OR_GREATER = isVersionOrGreater("19.26.00");
+    public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
+    public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
+    public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
 }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
@@ -114,7 +114,7 @@ public class ReturnYouTubeDislike {
    private static final Rect middleSeparatorBounds;

    /**
-     * Left separator horizontal padding for Rolling Number layout.
+     * Horizontal padding between the left and middle separator.
     */
    public static final int leftSeparatorShapePaddingPixels;
    private static final ShapeDrawable leftSeparatorShape;
@@ -129,7 +129,7 @@ public class ReturnYouTubeDislike {
                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3.7f, dp);
        middleSeparatorBounds = new Rect(0, 0, middleSeparatorSize, middleSeparatorSize);

-        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10.0f, dp);
+        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8.4f, dp);

        leftSeparatorShape = new ShapeDrawable(new RectShape());
        leftSeparatorShape.setBounds(leftSeparatorBounds);
@@ -238,7 +238,7 @@ public class ReturnYouTubeDislike {
            String leftSeparatorString = getTextDirectionString();
            final Spannable leftSeparatorSpan;
            if (isRollingNumber) {
-                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
+                leftSeparatorSpan = new SpannableString(leftSeparatorString);
            } else {
                leftSeparatorString += "  ";
                leftSeparatorSpan = new SpannableString(leftSeparatorString);
@@ -623,7 +623,7 @@ public class ReturnYouTubeDislike {
                userVote = vote;
                clearUICache();
            }
-            
+
            if (future.isDone()) {
                // Update the fetched vote data.
                RYDVoteData voteData = getFetchData(MAX_MILLISECONDS_TO_BLOCK_UI_WAITING_FOR_FETCH);
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -10,7 +10,6 @@ import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormF
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
 import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
 import static app.revanced.extension.youtube.patches.ForceOriginalAudioPatch.ForceOriginalAudioAvailability;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideExpandCloseAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@@ -40,6 +39,7 @@ import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.DeArrow
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.StillImagesAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailOption;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailStillTime;
+import app.revanced.extension.youtube.patches.MiniplayerPatch;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;

 public class Settings extends BaseSettings {
@@ -156,7 +156,7 @@ public class Settings extends BaseSettings {
    public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, MINIPLAYER_ANY_MODERN);
    public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, MINIPLAYER_ANY_MODERN);
    public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
-    public static final BooleanSetting MINIPLAYER_HIDE_EXPAND_CLOSE = new BooleanSetting("revanced_miniplayer_hide_expand_close", FALSE, true, new MiniplayerHideExpandCloseAvailability());
+    public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability());
    public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
    public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, MINIPLAYER_TYPE.availability(MODERN_1));
    public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
@@ -233,7 +233,8 @@ public class Settings extends BaseSettings {
    public static final BooleanSetting HIDE_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_hide_notifications_button", FALSE, true);
    public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true,
            "revanced_switch_create_with_notifications_button_user_dialog_message");
-    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true,
+            "revanced_disable_translucent_status_bar_user_dialog_message");
    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);

--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.16.2-dev.1
+version = 5.18.1-dev.2
--- a/patches/api/patches.api
+++ b/patches/api/patches.api
@@ -776,8 +776,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/TextPref
 }

 public final class app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatchKt {
-	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
-	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
 }

 public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPatchKt {
@@ -820,6 +820,10 @@ public final class app/revanced/patches/spotify/misc/UnlockPremiumPatchKt {
 	public static final fun getUnlockPremiumPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

+public final class app/revanced/patches/spotify/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/misc/fix/SpoofSignaturePatchKt {
 	public static final fun getSpoofSignaturePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1092,6 +1096,14 @@ public final class app/revanced/patches/youtube/interaction/seekbar/EnableSlideT
 	public static final fun getEnableSlideToSeekPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

+public final class app/revanced/patches/youtube/interaction/seekbar/HideSeekbarPatchKt {
+	public static final fun getHideSeekbarPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/youtube/interaction/seekbar/SeekbarPatchKt {
+	public static final fun getSeekbarPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatchKt {
 	public static final fun getSeekbarThumbnailsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1181,17 +1193,7 @@ public final class app/revanced/patches/youtube/layout/hide/time/HideTimestampPa
 }

 public final class app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatchKt {
-	public static final fun getFloatyBarButtonTopMargin ()J
-	public static final fun getMiniplayerMaxSize ()J
 	public static final fun getMiniplayerPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-	public static final fun getModernMiniplayerClose ()J
-	public static final fun getModernMiniplayerExpand ()J
-	public static final fun getModernMiniplayerForwardButton ()J
-	public static final fun getModernMiniplayerRewindButton ()J
-	public static final fun getPlayerOverlays ()J
-	public static final fun getScrimOverlay ()J
-	public static final fun getYtOutlinePictureInPictureWhite24 ()J
-	public static final fun getYtOutlineXWhite24 ()J
 }

 public final class app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatchKt {
@@ -1386,6 +1388,12 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_19_46_or_greater ()Z
 	public static final fun is_19_47_or_greater ()Z
 	public static final fun is_19_49_or_greater ()Z
+	public static final fun is_20_02_or_greater ()Z
+	public static final fun is_20_03_or_greater ()Z
+	public static final fun is_20_05_or_greater ()Z
+	public static final fun is_20_07_or_greater ()Z
+	public static final fun is_20_09_or_greater ()Z
+	public static final fun is_20_10_or_greater ()Z
 }

 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
--- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt
@@ -145,7 +145,25 @@ internal val patchIncludedExtensionMethodFingerprint = fingerprint {
 internal const val MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG = 45645570L

 internal val mediaFetchHotConfigFingerprint = fingerprint {
-    literal {
-        MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG
-    }
+    literal { MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG }
+}
+
+// 20.10+
+internal const val MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG = 45683169L
+
+internal val mediaFetchHotConfigAlternativeFingerprint = fingerprint {
+    literal { MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG }
+}
+
+// Feature flag that enables different code for parsing and starting video playback,
+// but it's exact purpose is not known. If this flag is enabled while stream spoofing
+// then videos will never start playback and load forever.
+// Flag does not seem to affect playback if spoofing is off.
+internal const val PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG = 45665455L
+
+internal val playbackStartDescriptorFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters()
+    returns("Z")
+    literal { PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt
@@ -10,6 +10,7 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
@@ -31,7 +32,9 @@ internal const val EXTENSION_CLASS_DESCRIPTOR =

 fun spoofVideoStreamsPatch(
    block: BytecodePatchBuilder.() -> Unit = {},
-    applyMediaFetchHotConfigChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixMediaFetchHotConfigChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixMediaFetchHotConfigAlternativeChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixParsePlaybackResponseFeatureFlag: BytecodePatchBuilder.() -> Boolean = { false },
    executeBlock: BytecodePatchContext.() -> Unit = {},
 ) = bytecodePatch(
    name = "Spoof video streams",
@@ -92,14 +95,14 @@ fun spoofVideoStreamsPatch(
                    getReference<MethodReference>()?.name == "newUrlRequestBuilder"
            }
            val urlRegister = getInstruction<FiveRegisterInstruction>(newRequestBuilderIndex).registerD
-            val freeRegister = getInstruction<OneRegisterInstruction>(newRequestBuilderIndex + 1).registerA
+            val freeRegister = findFreeRegister(newRequestBuilderIndex, urlRegister)

            addInstructions(
                newRequestBuilderIndex,
                """
-                move-object v$freeRegister, p1
-                invoke-static { v$urlRegister, v$freeRegister }, $EXTENSION_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;Ljava/util/Map;)V
-            """,
+                    move-object v$freeRegister, p1
+                    invoke-static { v$urlRegister, v$freeRegister }, $EXTENSION_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;Ljava/util/Map;)V
+                """
            )
        }

@@ -241,13 +244,27 @@ fun spoofVideoStreamsPatch(

        // region turn off stream config replacement feature flag.

-        if (applyMediaFetchHotConfigChanges()) {
+        if (fixMediaFetchHotConfigChanges()) {
            mediaFetchHotConfigFingerprint.method.insertFeatureFlagBooleanOverride(
                MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG,
                "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
            )
        }

+        if (fixMediaFetchHotConfigAlternativeChanges()) {
+            mediaFetchHotConfigAlternativeFingerprint.method.insertFeatureFlagBooleanOverride(
+                MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
+            )
+        }
+
+        if (fixParsePlaybackResponseFeatureFlag()) {
+            playbackStartDescriptorFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->usePlaybackStartFeatureFlag(Z)Z"
+            )
+        }
+
        // endregion

        executeBlock()
--- a/patches/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt
@@ -10,6 +10,7 @@ import org.w3c.dom.Element
 val customThemePatch = resourcePatch(
    name = "Custom theme",
    description = "Applies a custom theme.",
+    use = false,
 ) {
    compatibleWith("com.spotify.music")

--- a/patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt
@@ -16,3 +16,8 @@ internal val productStateProtoFingerprint = fingerprint {
 internal val buildQueryParametersFingerprint = fingerprint {
    strings("trackRows", "device_type:tablet")
 }
+
+internal val contextMenuExperimentsFingerprint = fingerprint {
+    parameters("L")
+    strings("remove_ads_upsell_enabled")
+}
--- a/patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/ExtensionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/ExtensionPatch.kt
@@ -0,0 +1,5 @@
+package app.revanced.patches.spotify.misc.extension
+
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+
+val sharedExtensionPatch = sharedExtensionPatch("spotify", spotifyMainActivityOnCreate)
--- a/patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/Hooks.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/Hooks.kt
@@ -0,0 +1,10 @@
+package app.revanced.patches.spotify.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val spotifyMainActivityOnCreate = extensionHook {
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/music/SpotifyMainActivity;" &&
+                method.name == "onCreate"
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch.kt
@@ -10,7 +10,13 @@ val dynamicColorPatch = resourcePatch(
    name = "Dynamic color",
    description = "Replaces the default X (Formerly Twitter) Blue with the user's Material You palette.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )

    execute {
        val resDirectory = get("res")
--- a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/hook/HookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/hook/HookPatch.kt
@@ -11,7 +11,15 @@ fun hookPatch(
 ) = bytecodePatch(name) {
    dependsOn(jsonHookPatch)

-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            // 10.85+ uses Pairip and requires additional changes to work.
+            "10.84.0-release.0",
+            // Confirmed to not show reply ads. Slightly newer versions may also work.
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )

    execute {
        addJsonHook(JsonHook(hookClassDescriptor))
--- a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt
@@ -37,7 +37,13 @@ val changeLinkSharingDomainPatch = bytecodePatch(
        sharedExtensionPatch,
    )

-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )

    val domainName by stringOption(
        key = "domainName",
--- a/patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch.kt
@@ -8,7 +8,13 @@ val sanitizeSharingLinksPatch = bytecodePatch(
    name = "Sanitize sharing links",
    description = "Removes the tracking query parameters from links before they are shared.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )

    execute {
        sanitizeSharingLinksFingerprint.method.addInstructions(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -82,9 +82,8 @@ val hideAdsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -29,9 +29,8 @@ val hideGetPremiumPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -27,9 +27,8 @@ val videoAdsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt
@@ -57,9 +57,8 @@ val copyVideoUrlPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -28,9 +28,8 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -72,9 +72,8 @@ val downloadsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
@@ -11,8 +11,10 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch

+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch;"
+
 val disablePreciseSeekingGesturePatch = bytecodePatch(
-    name = "Disable precise seeking gesture",
    description = "Adds an option to disable precise seeking when swiping up on the seekbar.",
 ) {
    dependsOn(
@@ -21,26 +23,12 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
        addResourcesPatch,
    )

-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
    execute {
        addResources("youtube", "interaction.seekbar.disablePreciseSeekingGesturePatch")

        PreferenceScreen.SEEKBAR.addPreferences(
            SwitchPreference("revanced_disable_precise_seeking_gesture"),
        )
-        val extensionMethodDescriptor =
-            "Lapp/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch;"

        allowSwipingUpGestureFingerprint.match(
            swipingUpGestureParentFingerprint.originalClassDef,
@@ -48,7 +36,7 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
            addInstructionsWithLabels(
                0,
                """
-                    invoke-static { }, $extensionMethodDescriptor->isGestureDisabled()Z
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->isGestureDisabled()Z
                    move-result v0
                    if-eqz v0, :disabled
                    return-void
@@ -63,7 +51,7 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
            addInstructionsWithLabels(
                0,
                """
-                    invoke-static { }, $extensionMethodDescriptor->isGestureDisabled()Z
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->isGestureDisabled()Z
                    move-result v0
                    if-eqz v0, :disabled
                    const/4 v0, 0x0
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -15,7 +15,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

 val enableSeekbarTappingPatch = bytecodePatch(
-    name = "Enable tap to seek",
    description = "Adds an option to enable tap to seek on the seekbar of the video player.",
 ) {
    dependsOn(
@@ -24,18 +23,6 @@ val enableSeekbarTappingPatch = bytecodePatch(
        addResourcesPatch,
    )

-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
    execute {
        addResources("youtube", "interaction.seekbar.enableSeekbarTappingPatch")

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -18,11 +18,9 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

-internal const val EXTENSION_METHOD_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/SlideToSeekPatch;->isSlideToSeekDisabled(Z)Z"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/SlideToSeekPatch;"

 val enableSlideToSeekPatch = bytecodePatch(
-    name = "Enable slide to seek",
    description = "Adds an option to enable slide to seek " +
        "instead of playing at 2x speed when pressing and holding in the video player."
 ) {
@@ -33,18 +31,6 @@ val enableSlideToSeekPatch = bytecodePatch(
        versionCheckPatch,
    )

-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
    execute {
        addResources("youtube", "interaction.seekbar.enableSlideToSeekPatch")

@@ -60,6 +46,8 @@ val enableSlideToSeekPatch = bytecodePatch(
        val checkReference = slideToSeekFingerprint.method.getInstruction(checkIndex)
            .getReference<MethodReference>()!!

+        val extensionMethodDescriptor = "$EXTENSION_CLASS_DESCRIPTOR->isSlideToSeekDisabled(Z)Z"
+
        // A/B check method was only called on this class.
        slideToSeekFingerprint.classDef.methods.forEach { method ->
            method.findInstructionIndicesReversed {
@@ -71,7 +59,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                    addInstructions(
                        index + 2,
                        """
-                            invoke-static { v$register }, $EXTENSION_METHOD_DESCRIPTOR
+                            invoke-static { v$register }, $extensionMethodDescriptor
                            move-result v$register
                       """,
                    )
@@ -96,7 +84,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                    addInstructions(
                        targetIndex + 1,
                        """
-                            invoke-static { v$targetRegister }, $EXTENSION_METHOD_DESCRIPTOR
+                            invoke-static { v$targetRegister }, $extensionMethodDescriptor
                            move-result v$targetRegister
                        """,
                    )
@@ -110,7 +98,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                addInstructions(
                    insertIndex,
                    """
-                        invoke-static { v$targetRegister }, $EXTENSION_METHOD_DESCRIPTOR
+                        invoke-static { v$targetRegister }, $extensionMethodDescriptor
                        move-result v$targetRegister
                    """,
                )
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/HideSeekbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/HideSeekbarPatch.kt
@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.interaction.seekbar
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.layout.seekbar.seekbarColorPatch
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.patches.youtube.shared.seekbarFingerprint
+import app.revanced.patches.youtube.shared.seekbarOnDrawFingerprint
+
+val hideSeekbarPatch = bytecodePatch(
+    description = "Adds an option to hide the seekbar.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        seekbarColorPatch,
+        addResourcesPatch,
+    )
+
+    execute {
+        addResources("youtube", "layout.hide.seekbar.hideSeekbarPatch")
+
+        PreferenceScreen.SEEKBAR.addPreferences(
+            SwitchPreference("revanced_hide_seekbar"),
+            SwitchPreference("revanced_hide_seekbar_thumbnail"),
+        )
+
+        seekbarOnDrawFingerprint.match(seekbarFingerprint.originalClassDef).method.addInstructionsWithLabels(
+            0,
+            """
+                const/4 v0, 0x0
+                invoke-static { }, Lapp/revanced/extension/youtube/patches/HideSeekbarPatch;->hideSeekbar()Z
+                move-result v0
+                if-eqz v0, :hide_seekbar
+                return-void
+                :hide_seekbar
+                nop
+            """,
+        )
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt
@@ -0,0 +1,31 @@
+package app.revanced.patches.youtube.interaction.seekbar
+
+import app.revanced.patcher.patch.bytecodePatch
+
+@Suppress("unused")
+val seekbarPatch = bytecodePatch(
+    name = "Seekbar",
+    description = "Adds options to disable precise seeking when swiping up on the seekbar, " +
+            "slide to seek instead of playing at 2x speed when pressing and holding, " +
+            "tapping the player seekbar to seek, " +
+            "and hiding the video player seekbar."
+) {
+    dependsOn(
+        disablePreciseSeekingGesturePatch,
+        enableSlideToSeekPatch,
+        enableSeekbarTappingPatch,
+        hideSeekbarPatch,
+        seekbarThumbnailsPatch
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.47.53",
+            "20.07.39",
+        )
+    )
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt
@@ -10,6 +10,7 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.layout.seekbar.fullscreenSeekbarThumbnailsFingerprint
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_17_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_09_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen

@@ -17,7 +18,6 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
    "Lapp/revanced/extension/youtube/patches/SeekbarThumbnailsPatch;"

 val seekbarThumbnailsPatch = bytecodePatch(
-    name = "Seekbar thumbnails",
    description = "Adds an option to use high quality fullscreen seekbar thumbnails. " +
            "Patching 19.16.39 adds an option to restore old seekbar thumbnails.",
 ) {
@@ -27,19 +27,13 @@ val seekbarThumbnailsPatch = bytecodePatch(
        versionCheckPatch,
    )

-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        )
-    )
-
    execute {
+        if (is_20_09_or_greater) {
+            // High quality seekbar thumbnails is partially broken in 20.09
+            // and the code is completely removed in 20.10+
+            return@execute
+        }
+
        addResources("youtube", "layout.seekbar.seekbarThumbnailsPatch")

        if (is_19_17_or_greater) {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
@@ -84,9 +84,8 @@ val swipeControlsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -26,9 +26,8 @@ val autoCaptionsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
@@ -47,9 +47,8 @@ val customBrandingPatch = resourcePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
@@ -45,9 +45,8 @@ val changeHeaderPatch = resourcePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -26,9 +26,8 @@ val hideButtonsPatch = resourcePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -44,9 +44,8 @@ val navigationButtonsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt
@@ -58,9 +58,8 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
@@ -37,9 +37,8 @@ val changeFormFactorPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -63,9 +63,8 @@ val hideEndscreenCardsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt
@@ -35,9 +35,8 @@ val hideEndScreenSuggestedVideoPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -33,9 +33,8 @@ val disableFullscreenAmbientModePatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/Fingerprints.kt
@@ -15,7 +15,21 @@ internal val hideShowMoreButtonFingerprint = fingerprint {
    literal { expandButtonDownId }
 }

+/**
+ * 20.07+
+ */
 internal val parseElementFromBufferFingerprint = fingerprint {
+    parameters("L", "L", "[B", "L", "L")
+    opcodes(
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+    )
+    strings("Failed to parse Element") // String is a partial match.
+}
+
+internal val parseElementFromBufferLegacyFingerprint = fingerprint {
    parameters("L", "L", "[B", "L", "L")
    opcodes(
        Opcode.IGET_OBJECT,
@@ -110,7 +124,6 @@ internal val showFloatingMicrophoneButtonFingerprint = fingerprint {
    opcodes(
        Opcode.IGET_BOOLEAN,
        Opcode.IF_EQZ,
-        Opcode.RETURN_VOID,
    )
    literal { fabButtonId }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -20,12 +20,14 @@ import app.revanced.patches.shared.misc.settings.preference.*
 import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
-import app.revanced.patches.youtube.misc.playservice.is_19_47_or_greater
-import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.patches.youtube.misc.playservice.is_20_07_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -120,7 +122,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
        addResourcesPatch,
        hideLayoutComponentsResourcePatch,
        navigationBarHookPatch,
-        versionCheckPatch
    )

    compatibleWith(
@@ -132,6 +133,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
            "19.45.38",
            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -247,29 +249,31 @@ val hideLayoutComponentsPatch = bytecodePatch(

        // region Mix playlists

-        parseElementFromBufferFingerprint.method.apply {
-            val startIndex = parseElementFromBufferFingerprint.patternMatch!!.startIndex
-            // Target code is a mess with a lot of register moves.
-            // There is no simple way to find a free register for all versions so this is hard coded.
-            val freeRegister = if (is_19_47_or_greater) 6 else 0
-            val byteArrayParameter = "p3"
-            val conversionContextRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
-            val returnEmptyComponentInstruction = instructions.last { it.opcode == Opcode.INVOKE_STATIC }
-            val returnEmptyComponentRegister = (returnEmptyComponentInstruction as FiveRegisterInstruction).registerC
+        (if (is_20_07_or_greater) parseElementFromBufferFingerprint
+        else parseElementFromBufferLegacyFingerprint).let {
+            it.method.apply {
+                val byteArrayParameter = "p3"
+                val startIndex = it.patternMatch!!.startIndex
+                val conversionContextRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
+                val returnEmptyComponentInstruction = instructions.last { it.opcode == Opcode.INVOKE_STATIC }
+                val returnEmptyComponentRegister = (returnEmptyComponentInstruction as FiveRegisterInstruction).registerC
+                val insertIndex = startIndex + 1
+                val freeRegister = findFreeRegister(insertIndex, conversionContextRegister, returnEmptyComponentRegister)

-            addInstructionsWithLabels(
-                startIndex + 1,
-                """
-                    invoke-static { v$conversionContextRegister, $byteArrayParameter }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->filterMixPlaylists(Ljava/lang/Object;[B)Z
-                    move-result v$freeRegister 
-                    if-eqz v$freeRegister, :show
-                    move-object v$returnEmptyComponentRegister, p1   # Required for 19.47
-                    goto :return_empty_component
-                    :show
-                    const/4 v$freeRegister, 0x0   # Restore register, required for 19.16
-                """,
-                ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
-            )
+                addInstructionsWithLabels(
+                    insertIndex,
+                    """
+                        invoke-static { v$conversionContextRegister, $byteArrayParameter }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->filterMixPlaylists(Ljava/lang/Object;[B)Z
+                        move-result v$freeRegister 
+                        if-eqz v$freeRegister, :show
+                        move-object v$returnEmptyComponentRegister, p1   # Required for 19.47
+                        goto :return_empty_component
+                        :show
+                        nop
+                    """,
+                    ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
+                )
+            }
        }

        // endregion
@@ -345,19 +349,18 @@ val hideLayoutComponentsPatch = bytecodePatch(

        // region hide floating microphone

-        showFloatingMicrophoneButtonFingerprint.let {
-            it.method.apply {
-                val startIndex = it.patternMatch!!.startIndex
-                val register = getInstruction<TwoRegisterInstruction>(startIndex).registerA
+        showFloatingMicrophoneButtonFingerprint.method.apply {
+            val literalIndex = indexOfFirstLiteralInstructionOrThrow(fabButtonId)
+            val booleanIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.IGET_BOOLEAN)
+            val register = getInstruction<TwoRegisterInstruction>(booleanIndex).registerA

-                addInstructions(
-                    startIndex + 1,
-                    """
+            addInstructions(
+                booleanIndex + 1,
+                """
                    invoke-static { v$register }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideFloatingMicrophoneButton(Z)Z
                    move-result v$register
-                """,
-                )
-            }
+                """
+            )
        }

        // endregion
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -61,9 +61,8 @@ val hideInfoCardsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -28,9 +28,8 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -33,9 +33,8 @@ val disableRollingNumberAnimationPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -1,59 +1,11 @@
 package app.revanced.patches.youtube.layout.hide.seekbar

-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.layout.seekbar.seekbarColorPatch
-import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.misc.settings.PreferenceScreen
-import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.patches.youtube.shared.seekbarFingerprint
-import app.revanced.patches.youtube.shared.seekbarOnDrawFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.hideSeekbarPatch

-val hideSeekbarPatch = bytecodePatch(
-    name = "Hide seekbar",
-    description = "Adds an option to hide the seekbar.",
-) {
+@Deprecated("Patch was moved to app.revanced.patches.youtube.interaction.seekbar")
+val hideSeekbarPatch = bytecodePatch {
    dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
-        seekbarColorPatch,
-        addResourcesPatch,
+        hideSeekbarPatch
    )
-
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
-    execute {
-        addResources("youtube", "layout.hide.seekbar.hideSeekbarPatch")
-
-        PreferenceScreen.SEEKBAR.addPreferences(
-            SwitchPreference("revanced_hide_seekbar"),
-            SwitchPreference("revanced_hide_seekbar_thumbnail"),
-        )
-
-        seekbarOnDrawFingerprint.match(seekbarFingerprint.originalClassDef).method.addInstructionsWithLabels(
-            0,
-            """
-                const/4 v0, 0x0
-                invoke-static { }, Lapp/revanced/extension/youtube/patches/HideSeekbarPatch;->hideSeekbar()Z
-                move-result v0
-                if-eqz v0, :hide_seekbar
-                return-void
-                :hide_seekbar
-                nop
-            """,
-        )
-    }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -176,9 +176,8 @@ val hideShortsComponentsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
@@ -25,9 +25,8 @@ val hideTimestampPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/Fingerprints.kt
@@ -30,7 +30,7 @@ internal val miniplayerModernAddViewListenerFingerprint = fingerprint {

 internal val miniplayerModernCloseButtonFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
    parameters()
    literal { modernMiniplayerClose }
 }
@@ -62,7 +62,7 @@ internal val miniplayerOnCloseHandlerFingerprint = fingerprint {
 */
 internal val miniplayerModernExpandButtonFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
    parameters()
    literal { modernMiniplayerExpand }
 }
@@ -82,7 +82,7 @@ internal val miniplayerModernExpandCloseDrawablesFingerprint = fingerprint {
 */
 internal val miniplayerModernForwardButtonFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
    parameters()
    literal { modernMiniplayerForwardButton }
 }
@@ -92,7 +92,6 @@ internal val miniplayerModernForwardButtonFingerprint = fingerprint {
 */
 internal val miniplayerModernOverlayViewFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
    parameters()
    literal { scrimOverlay }
 }
@@ -102,7 +101,7 @@ internal val miniplayerModernOverlayViewFingerprint = fingerprint {
 */
 internal val miniplayerModernRewindButtonFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
    parameters()
    literal { modernMiniplayerRewindButton }
 }
@@ -114,6 +113,13 @@ internal val miniplayerModernViewParentFingerprint = fingerprint {
    strings("player_overlay_modern_mini_player_controls")
 }

+internal val miniplayerModernActionButtonFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters()
+    literal { modernMiniPlayerOverlayActionButton }
+}
+
 internal val miniplayerMinimumSizeFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
    custom { method, _ ->
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
@@ -34,27 +34,29 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter

-var floatyBarButtonTopMargin = -1L
+internal var floatyBarButtonTopMargin = -1L
    private set

 // Only available in 19.15 and upwards.
-var ytOutlineXWhite24 = -1L
+internal var ytOutlineXWhite24 = -1L
    private set
-var ytOutlinePictureInPictureWhite24 = -1L
+internal var ytOutlinePictureInPictureWhite24 = -1L
    private set
-var scrimOverlay = -1L
+internal var scrimOverlay = -1L
    private set
-var modernMiniplayerClose = -1L
+internal var modernMiniplayerClose = -1L
    private set
-var modernMiniplayerExpand = -1L
+internal var modernMiniplayerExpand = -1L
    private set
-var modernMiniplayerRewindButton = -1L
+internal var modernMiniplayerRewindButton = -1L
    private set
-var modernMiniplayerForwardButton = -1L
+internal var modernMiniplayerForwardButton = -1L
    private set
-var playerOverlays = -1L
+internal var modernMiniPlayerOverlayActionButton = -1L
    private set
-var miniplayerMaxSize = -1L
+internal var playerOverlays = -1L
+    private set
+internal var miniplayerMaxSize = -1L
    private set

 private val miniplayerResourcePatch = resourcePatch {
@@ -100,6 +102,11 @@ private val miniplayerResourcePatch = resourcePatch {
            "modern_miniplayer_forward_button",
        ]

+        modernMiniPlayerOverlayActionButton = resourceMappings[
+            "id",
+            "modern_miniplayer_overlay_action_button"
+        ]
+
        // Resource id is not used during patching, but is used by extension.
        // Verify the resource is present while patching.
        resourceMappings[
@@ -167,6 +174,7 @@ val miniplayerPatch = bytecodePatch(
            "19.45.38",
            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -175,19 +183,25 @@ val miniplayerPatch = bytecodePatch(

        val preferences = mutableSetOf<BasePreference>()

-
        preferences +=
-            if (is_19_43_or_greater) {
+            if (is_20_03_or_greater) {
                ListPreference(
                    "revanced_miniplayer_type",
                    summaryKey = null,
                )
+            } else if (is_19_43_or_greater) {
+                ListPreference(
+                    "revanced_miniplayer_type",
+                    summaryKey = null,
+                    entriesKey = "revanced_miniplayer_type_legacy_19_43_entries",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_43_entry_values",
+                )
            } else {
                ListPreference(
                    "revanced_miniplayer_type",
                    summaryKey = null,
-                    entriesKey = "revanced_miniplayer_type_legacy_entries",
-                    entryValuesKey = "revanced_miniplayer_type_legacy_entry_values",
+                    entriesKey = "revanced_miniplayer_type_legacy_19_16_entries",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_16_entry_values",
                )
            }

@@ -209,13 +223,13 @@ val miniplayerPatch = bytecodePatch(
        preferences += SwitchPreference("revanced_miniplayer_hide_subtext")

        preferences += if (is_19_26_or_greater) {
-            SwitchPreference("revanced_miniplayer_hide_expand_close")
+            SwitchPreference("revanced_miniplayer_hide_overlay_buttons")
        } else {
            SwitchPreference(
-                key = "revanced_miniplayer_hide_expand_close",
-                titleKey = "revanced_miniplayer_hide_expand_close_legacy_title",
-                summaryOnKey = "revanced_miniplayer_hide_expand_close_legacy_summary_on",
-                summaryOffKey = "revanced_miniplayer_hide_expand_close_legacy_summary_off",
+                key = "revanced_miniplayer_hide_overlay_buttons",
+                titleKey = "revanced_miniplayer_hide_overlay_buttons_legacy_title",
+                summaryOnKey = "revanced_miniplayer_hide_overlay_buttons_legacy_summary_on",
+                summaryOffKey = "revanced_miniplayer_hide_overlay_buttons_legacy_summary_off",
            )
        }

@@ -365,7 +379,7 @@ val miniplayerPatch = bytecodePatch(
        if (is_19_23_or_greater) {
            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                MINIPLAYER_DRAG_DROP_FEATURE_KEY,
-                "enableMiniplayerDragAndDrop",
+                "getMiniplayerDragAndDrop",
            )
        }

@@ -382,7 +396,7 @@ val miniplayerPatch = bytecodePatch(

            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                MINIPLAYER_DOUBLE_TAP_FEATURE_KEY,
-                "enableMiniplayerDoubleTapAction",
+                "getMiniplayerDoubleTapAction",
            )
        }

@@ -398,7 +412,7 @@ val miniplayerPatch = bytecodePatch(
                addInstructions(
                    targetIndex + 1,
                    """
-                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->setMiniplayerDefaultSize(I)I
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getMiniplayerDefaultSize(I)I
                        move-result v$register
                    """,
                )
@@ -421,7 +435,7 @@ val miniplayerPatch = bytecodePatch(
        if (is_19_36_or_greater) {
            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                MINIPLAYER_ROUNDED_CORNERS_FEATURE_KEY,
-                "setRoundedCorners",
+                "getRoundedCorners",
            )
        }

@@ -433,7 +447,7 @@ val miniplayerPatch = bytecodePatch(

            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                MINIPLAYER_HORIZONTAL_DRAG_FEATURE_KEY,
-                "setHorizontalDrag",
+                "getHorizontalDrag",
            )
        }

@@ -473,6 +487,11 @@ val miniplayerPatch = bytecodePatch(
                modernMiniplayerClose,
                "hideMiniplayerExpandClose",
            ),
+            Triple(
+                miniplayerModernActionButtonFingerprint,
+                modernMiniPlayerOverlayActionButton,
+                "hideMiniplayerActionButton"
+            ),
            Triple(
                miniplayerModernRewindButtonFingerprint,
                modernMiniplayerRewindButton,
@@ -490,12 +509,25 @@ val miniplayerPatch = bytecodePatch(
            ),
        ).forEach { (fingerprint, literalValue, methodName) ->
            fingerprint.match(
-                miniplayerModernViewParentFingerprint.classDef,
-            ).method.hookInflatedView(
-                literalValue,
-                "Landroid/widget/ImageView;",
-                "$EXTENSION_CLASS_DESCRIPTOR->$methodName(Landroid/widget/ImageView;)V",
-            )
+                miniplayerModernViewParentFingerprint.originalClassDef
+            ).method.apply {
+                val literalIndex = indexOfFirstLiteralInstructionOrThrow(literalValue)
+                val checkCastIndex = indexOfFirstInstruction(literalIndex) {
+                    opcode == Opcode.CHECK_CAST &&
+                            getReference<TypeReference>()?.type == "Landroid/widget/ImageView;"
+                }
+                val viewIndex = if (checkCastIndex >= 0) {
+                    checkCastIndex
+                } else {
+                    indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT_OBJECT)
+                }
+                val viewRegister = getInstruction<OneRegisterInstruction>(viewIndex).registerA
+
+                addInstruction(
+                    viewIndex + 1,
+                    "invoke-static { v$viewRegister }, $EXTENSION_CLASS_DESCRIPTOR->$methodName(Landroid/view/View;)V"
+                )
+            }
        }

        miniplayerModernAddViewListenerFingerprint.match(
@@ -510,33 +542,40 @@ val miniplayerPatch = bytecodePatch(
        // Modern 2 uses the same overlay controls as the regular video player,
        // and the overlay views are added at runtime.
        // Add a hook to the overlay class, and pass the added views to extension.
+        // Problem is fixed in 19.21+
        //
        // NOTE: Modern 2 uses the same video UI as the regular player except resized to smaller.
        // This patch code could be used to hide other player overlays that do not use Litho.
-        playerOverlaysLayoutFingerprint.classDef.methods.add(
-            ImmutableMethod(
-                YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME,
-                "addView",
-                listOf(
-                    ImmutableMethodParameter("Landroid/view/View;", null, null),
-                    ImmutableMethodParameter("I", null, null),
-                    ImmutableMethodParameter("Landroid/view/ViewGroup\$LayoutParams;", null, null),
-                ),
-                "V",
-                AccessFlags.PUBLIC.value,
-                null,
-                null,
-                MutableMethodImplementation(4),
-            ).toMutable().apply {
-                addInstructions(
-                    """
-                        invoke-super { p0, p1, p2, p3 }, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup${'$'}LayoutParams;)V
-                        invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->playerOverlayGroupCreated(Landroid/view/View;)V
-                        return-void
-                    """
-                )
-            }
-        )
+        if (!is_19_17_or_greater) {
+            playerOverlaysLayoutFingerprint.classDef.methods.add(
+                ImmutableMethod(
+                    YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME,
+                    "addView",
+                    listOf(
+                        ImmutableMethodParameter("Landroid/view/View;", null, null),
+                        ImmutableMethodParameter("I", null, null),
+                        ImmutableMethodParameter(
+                            "Landroid/view/ViewGroup\$LayoutParams;",
+                            null,
+                            null
+                        ),
+                    ),
+                    "V",
+                    AccessFlags.PUBLIC.value,
+                    null,
+                    null,
+                    MutableMethodImplementation(4),
+                ).toMutable().apply {
+                    addInstructions(
+                        """
+                            invoke-super { p0, p1, p2, p3 }, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup${'$'}LayoutParams;)V
+                            invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->playerOverlayGroupCreated(Landroid/view/View;)V
+                            return-void
+                        """
+                    )
+                }
+            )
+        }

        // endregion
    }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
@@ -25,9 +25,8 @@ val playerPopupPanelsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
@@ -16,9 +16,8 @@ val playerControlsBackgroundPatch = resourcePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt
@@ -25,9 +25,8 @@ internal val exitFullscreenPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt
@@ -27,6 +27,7 @@ val openVideosFullscreenPatch = bytecodePatch(
        "com.google.android.youtube"(
            "19.46.42",
            "19.47.53",
+            "20.07.39",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
@@ -56,9 +56,8 @@ val customPlayerOverlayOpacityPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_33_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.addSettingPreference
 import app.revanced.patches.youtube.misc.settings.newIntent
@@ -56,9 +57,8 @@ val returnYouTubeDislikePatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -121,7 +121,7 @@ val returnYouTubeDislikePatch = bytecodePatch(
            val tempRegister: Int
            val charSequenceRegister: Int

-            if (is_19_33_or_greater) {
+            if (is_19_33_or_greater  && !is_20_10_or_greater) {
                insertIndex = indexOfFirstInstructionOrThrow {
                    (opcode == Opcode.INVOKE_STATIC || opcode == Opcode.INVOKE_STATIC_RANGE)
                            && getReference<MethodReference>()?.returnType == textDataClassType
@@ -179,9 +179,6 @@ val returnYouTubeDislikePatch = bytecodePatch(

        // region Hook rolling numbers.

-        // Do this last to allow patching old unsupported versions (if the user really wants),
-        // On older unsupported version this will fail to match and throw an exception,
-        // but everything will still work correctly anyway.
        val dislikesIndex = rollingNumberSetterFingerprint.patternMatch!!.endIndex

        rollingNumberSetterFingerprint.method.apply {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
@@ -33,9 +33,8 @@ val wideSearchbarPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/Fingerprints.kt
@@ -37,12 +37,25 @@ internal val shortsSeekbarColorFingerprint = fingerprint {
    literal { reelTimeBarPlayedColorId }
 }

-internal val playerSeekbarHandleColorFingerprint = fingerprint {
+internal val playerSeekbarHandle1ColorFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
    parameters("Landroid/content/Context;")
-    literal { ytStaticBrandRedId }
+    custom { method, _ ->
+        method.containsLiteralInstruction(ytTextSecondaryId) &&
+                method.containsLiteralInstruction(ytStaticBrandRedId)
+    }
 }

+internal val playerSeekbarHandle2ColorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("Landroid/content/Context;")
+    custom { method, _ ->
+        method.containsLiteralInstruction(inlineTimeBarLiveSeekableRangeId) &&
+                method.containsLiteralInstruction(ytStaticBrandRedId)
+    }
+}
+
+
 internal val watchHistoryMenuUseProgressDrawableFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("V")
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt
@@ -53,6 +53,10 @@ internal var ytYoutubeMagentaColorId = -1L
    private set
 internal var ytStaticBrandRedId = -1L
    private set
+internal var ytTextSecondaryId = -1L
+    private set
+internal var inlineTimeBarLiveSeekableRangeId = -1L
+    private set

 internal const val splashSeekbarColorAttributeName = "splash_custom_seekbar_color"

@@ -76,6 +80,18 @@ private val seekbarColorResourcePatch = resourcePatch {
            "color",
            "inline_time_bar_played_not_highlighted_color",
        ]
+        ytStaticBrandRedId = resourceMappings[
+            "attr",
+            "ytStaticBrandRed"
+        ]
+        ytTextSecondaryId = resourceMappings[
+            "attr",
+            "ytTextSecondary"
+        ]
+        inlineTimeBarLiveSeekableRangeId = resourceMappings[
+            "color",
+            "inline_time_bar_live_seekable_range"
+        ]

        // Modify the resume playback drawable and replace the progress bar with a custom drawable.
        document("res/drawable/resume_playback_progressbar_drawable.xml").use { document ->
@@ -211,7 +227,7 @@ val seekbarColorPatch = bytecodePatch(
    )

    execute {
-        fun MutableMethod.addColorChangeInstructions(resourceId: Long, methodName: String) {
+        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
            val index = indexOfFirstLiteralInstructionOrThrow(resourceId)
            val insertIndex = indexOfFirstInstructionOrThrow(index, Opcode.MOVE_RESULT)
            val register = getInstruction<OneRegisterInstruction>(insertIndex).registerA
@@ -219,19 +235,19 @@ val seekbarColorPatch = bytecodePatch(
            addInstructions(
                insertIndex + 1,
                """
-                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->$methodName(I)I
+                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
                    move-result v$register
                """
            )
        }

        playerSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId, "getVideoPlayerSeekbarColor")
-            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId, "getVideoPlayerSeekbarColor")
+            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId)
+            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId)
        }

        shortsSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(reelTimeBarPlayedColorId, "getVideoPlayerSeekbarColor")
+            addColorChangeInstructions(reelTimeBarPlayedColorId)
        }

        setSeekbarClickedColorFingerprint.originalMethod.let {
@@ -257,8 +273,11 @@ val seekbarColorPatch = bytecodePatch(

        // 19.25+ changes

-        playerSeekbarHandleColorFingerprint.method.apply {
-            addColorChangeInstructions(ytStaticBrandRedId, "getVideoPlayerSeekbarColor")
+        arrayOf(
+            playerSeekbarHandle1ColorFingerprint,
+            playerSeekbarHandle2ColorFingerprint
+        ).forEach {
+            it.method.addColorChangeInstructions(ytStaticBrandRedId)
        }

        // If hiding feed seekbar thumbnails, then turn off the cairo gradient
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt
@@ -37,9 +37,8 @@ val shortsAutoplayPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt
@@ -16,9 +16,9 @@ import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
+import app.revanced.util.findFreeRegister
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@@ -45,9 +45,8 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -107,11 +106,12 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
                    getReference<MethodReference>()?.returnType ==
                            "Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;"
                }
-                val freeRegister = getInstruction<FiveRegisterInstruction>(index).registerC
                val playbackStartRegister = getInstruction<OneRegisterInstruction>(index + 1).registerA
+                val insertIndex = index + 2
+                val freeRegister = findFreeRegister(insertIndex, playbackStartRegister)

                addInstructionsWithLabels(
-                    index + 2,
+                    insertIndex,
                    extensionInstructions(playbackStartRegister, freeRegister)
                )
            }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt
@@ -110,9 +110,8 @@ val sponsorBlockPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
@@ -62,9 +62,8 @@ val spoofAppVersionPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
@@ -33,9 +33,8 @@ val changeStartPagePatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
@@ -7,11 +7,14 @@ import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playservice.is_20_02_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.addInstructionsAtControlFlowLabel
+import app.revanced.util.findFreeRegister
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@@ -38,6 +41,7 @@ val disableResumingShortsOnStartupPatch = bytecodePatch(
            "19.45.38",
            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -48,25 +52,47 @@ val disableResumingShortsOnStartupPatch = bytecodePatch(
            SwitchPreference("revanced_disable_resuming_shorts_player"),
        )

-        userWasInShortsFingerprint.method.apply {
-            val listenableInstructionIndex = indexOfFirstInstructionOrThrow {
-                opcode == Opcode.INVOKE_INTERFACE &&
-                    getReference<MethodReference>()?.definingClass == "Lcom/google/common/util/concurrent/ListenableFuture;" &&
-                    getReference<MethodReference>()?.name == "isDone"
-            }
-            val freeRegister = getInstruction<OneRegisterInstruction>(listenableInstructionIndex + 1).registerA
+        if (is_20_02_or_greater) {
+            userWasInShortsAlternativeFingerprint.let {
+                it.method.apply {
+                    val stringIndex = it.stringMatches!!.first().index
+                    val booleanValueIndex = indexOfFirstInstructionReversedOrThrow(stringIndex) {
+                        opcode == Opcode.INVOKE_VIRTUAL &&
+                                getReference<MethodReference>()?.name == "booleanValue"
+                    }
+                    val booleanValueRegister =
+                        getInstruction<OneRegisterInstruction>(booleanValueIndex + 1).registerA

-            addInstructionsAtControlFlowLabel(
-                listenableInstructionIndex,
-                """
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->disableResumingStartupShortsPlayer()Z
-                    move-result v$freeRegister
-                    if-eqz v$freeRegister, :show_startup_shorts_player
-                    return-void
-                    :show_startup_shorts_player
-                    nop
-                """,
-            )
+                    addInstructions(
+                        booleanValueIndex + 2, """
+                            invoke-static {v$booleanValueRegister}, $EXTENSION_CLASS_DESCRIPTOR->disableResumingStartupShortsPlayer(Z)Z
+                            move-result v$booleanValueRegister
+                            """
+                    )
+                }
+            }
+        } else {
+            userWasInShortsLegacyFingerprint.method.apply {
+                val listenableInstructionIndex = indexOfFirstInstructionOrThrow {
+                    val reference = getReference<MethodReference>()
+                    opcode == Opcode.INVOKE_INTERFACE &&
+                            reference?.definingClass == "Lcom/google/common/util/concurrent/ListenableFuture;" &&
+                            reference.name == "isDone"
+                }
+                val freeRegister = findFreeRegister(listenableInstructionIndex)
+
+                addInstructionsAtControlFlowLabel(
+                    listenableInstructionIndex,
+                    """
+                        invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->disableResumingStartupShortsPlayer()Z
+                        move-result v$freeRegister
+                        if-eqz v$freeRegister, :show
+                        return-void
+                        :show
+                        nop
+                    """
+                )
+            }
        }

        userWasInShortsConfigFingerprint.method.addInstructions(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/Fingerprints.kt
@@ -4,7 +4,17 @@ import app.revanced.patcher.fingerprint
 import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags

-internal val userWasInShortsFingerprint = fingerprint {
+/**
+ * YouTube 20.02.08 ~
+ */
+internal val userWasInShortsAlternativeFingerprint = fingerprint {
+    returns("V")
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters("Ljava/lang/Object;")
+    strings("userIsInShorts: ")
+}
+
+internal val userWasInShortsLegacyFingerprint = fingerprint {
    returns("V")
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    parameters("Ljava/lang/Object;")
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
@@ -221,9 +221,8 @@ val themePatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -37,9 +37,8 @@ val alternativeThumbnailsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt
@@ -31,9 +31,8 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
@@ -27,9 +27,8 @@ val announcementsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
@@ -28,9 +28,8 @@ val autoRepeatPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt
@@ -52,9 +52,8 @@ val backgroundPlaybackPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt
@@ -38,9 +38,8 @@ val enableDebuggingPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
@@ -28,9 +28,8 @@ val spoofDeviceDimensionsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt
@@ -25,9 +25,8 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playbackspeed/FIxPlaybackSpeedWhilePlayingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playbackspeed/FIxPlaybackSpeedWhilePlayingPatch.kt
@@ -8,6 +8,7 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
@@ -42,13 +43,14 @@ val fixPlaybackSpeedWhilePlayingPatch = bytecodePatch{
        }

        playbackSpeedInFeedsFingerprint.method.apply {
-            val freeRegister = implementation!!.registerCount - parameters.size - 2
            val playbackSpeedIndex = indexOfGetPlaybackSpeedInstruction(this)
            val playbackSpeedRegister = getInstruction<TwoRegisterInstruction>(playbackSpeedIndex).registerA
            val returnIndex = indexOfFirstInstructionOrThrow(playbackSpeedIndex, Opcode.RETURN_VOID)
+            val insertIndex = playbackSpeedIndex + 1
+            val freeRegister = findFreeRegister(insertIndex, playbackSpeedRegister)

            addInstructionsWithLabels(
-                playbackSpeedIndex + 1,
+                insertIndex,
                """
                    invoke-static { v$playbackSpeedRegister }, $EXTENSION_CLASS_DESCRIPTOR->playbackSpeedChanged(F)Z
                    move-result v$freeRegister
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
@@ -39,9 +39,8 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
@@ -13,9 +13,11 @@ import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference

 val bypassURLRedirectsPatch = bytecodePatch(
    name = "Bypass URL redirects",
@@ -37,6 +39,7 @@ val bypassURLRedirectsPatch = bytecodePatch(
            "19.45.38",
            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -80,3 +83,8 @@ internal fun Method.findUriParseIndex() = indexOfFirstInstruction {
    val reference = getReference<MethodReference>()
    reference?.returnType == "Landroid/net/Uri;" && reference.name == "parse"
 }
+
+internal fun Method.findWebViewCheckCastIndex() = indexOfFirstInstruction {
+    val reference = getReference<TypeReference>()
+    opcode == Opcode.CHECK_CAST && reference?.type?.endsWith("/WebviewEndpointOuterClass${'$'}WebviewEndpoint;") == true
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/Fingerprints.kt
@@ -11,12 +11,21 @@ internal val abUriParserFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("Ljava/lang/Object")
    parameters("Ljava/lang/Object")
-    strings(
-        "Found entityKey=`",
-        "` that does not contain a PlaylistVideoEntityId message as it's identifier.",
-    )
    custom { method, _ ->
-        method.findUriParseIndex() >= 0
+        method.findUriParseIndex() >= 0 && method.findWebViewCheckCastIndex() >= 0
+    }
+}
+
+/**
+ * Target 19.33+
+ */
+internal val httpUriParserFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    returns("Landroid/net/Uri")
+    parameters("Ljava/lang/String")
+    strings("https", "://", "https:")
+    custom { methodDef, _ ->
+        methodDef.findUriParseIndex() >= 0
    }
 }

@@ -47,19 +56,6 @@ internal val abUriParserLegacyFingerprint = fingerprint {
    }
 }

-/**
- * Target 19.33+
- */
-internal val httpUriParserFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    returns("Landroid/net/Uri")
-    parameters("Ljava/lang/String")
-    strings("https", "https:", "://")
-    custom { methodDef, _ ->
-        methodDef.findUriParseIndex() >= 0
-    }
-}
-
 internal val httpUriParserLegacyFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
    returns("Landroid/net/Uri")
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
@@ -45,9 +45,8 @@ val openLinksExternallyPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/Fingerprints.kt
@@ -10,7 +10,11 @@ import com.android.tools.smali.dexlib2.Opcode
 * In 19.18+ this resolves to a different method.
 */
 internal val componentContextParserFingerprint = fingerprint {
-    strings("Component was not found %s because it was removed due to duplicate converter bindings.")
+    strings(
+        "TreeNode result must be set.",
+        // String is a partial match and changed slightly in 20.03+
+        "it was removed due to duplicate converter bindings."
+    )
 }

 internal val lithoFilterFingerprint = fingerprint {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/LithoFilterPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/LithoFilterPatch.kt
@@ -8,19 +8,21 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_18_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_05_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.*
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@@ -190,17 +192,7 @@ val lithoFilterPatch = bytecodePatch(
                },
            ).registerA

-            // Find a free temporary register.
-            val freeRegister = getInstruction<OneRegisterInstruction>(
-                // Immediately before is a StringBuilder append constant character.
-                indexOfFirstInstructionReversedOrThrow(insertHookIndex, Opcode.CONST_16),
-            ).registerA
-
-            // Verify the temp register will not clobber the method result register.
-            if (stringBuilderRegister == freeRegister) {
-                throw PatchException("Free register will clobber StringBuilder register")
-            }
-
+            val freeRegister = findFreeRegister(insertHookIndex, identifierRegister, stringBuilderRegister)
            val invokeFilterInstructions = """
                invoke-static { v$identifierRegister, v$stringBuilderRegister }, $EXTENSION_CLASS_DESCRIPTOR->filter(Ljava/lang/String;Ljava/lang/StringBuilder;)Z
                move-result v$freeRegister
@@ -235,7 +227,10 @@ val lithoFilterPatch = bytecodePatch(

        // Turn off native code that handles litho component names.  If this feature is on then nearly
        // all litho components have a null name and identifier/path filtering is completely broken.
-        if (is_19_25_or_greater) {
+        //
+        // Flag was removed in 20.05. It appears a new flag might be used instead (45660109L),
+        // but if the flag is forced on then litho filtering still works correctly.
+        if (is_19_25_or_greater && !is_20_05_or_greater) {
            lithoComponentNameUpbFeatureFlagFingerprint.method.apply {
                // Don't use return early, so the debug patch logs if this was originally on.
                val insertIndex = indexOfFirstInstructionOrThrow(Opcode.RETURN)
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
@@ -46,6 +46,18 @@ var is_19_47_or_greater = false
    private set
 var is_19_49_or_greater = false
    private set
+var is_20_02_or_greater = false
+    private set
+var is_20_03_or_greater = false
+    private set
+var is_20_05_or_greater = false
+    private set
+var is_20_07_or_greater = false
+    private set
+var is_20_09_or_greater = false
+    private set
+var is_20_10_or_greater = false
+    private set

 val versionCheckPatch = resourcePatch(
    description = "Uses the Play Store service version to find the major/minor version of the YouTube target app.",
@@ -80,5 +92,11 @@ val versionCheckPatch = resourcePatch(
        is_19_46_or_greater = 244705000 <= playStoreServicesVersion
        is_19_47_or_greater = 244799000 <= playStoreServicesVersion
        is_19_49_or_greater = 245005000 <= playStoreServicesVersion
+        is_20_02_or_greater = 250299000 <= playStoreServicesVersion
+        is_20_03_or_greater = 250405000 <= playStoreServicesVersion
+        is_20_05_or_greater = 250605000 <= playStoreServicesVersion
+        is_20_07_or_greater = 250805000 <= playStoreServicesVersion
+        is_20_09_or_greater = 251006000 <= playStoreServicesVersion
+        is_20_10_or_greater = 251105000 <= playStoreServicesVersion
    }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
@@ -34,9 +34,8 @@ val removeTrackingQueryParameterPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt
@@ -7,6 +7,8 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPref
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.spoof.spoofVideoStreamsPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_03_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
@@ -18,9 +20,8 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

@@ -31,6 +32,10 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
    )
 }, {
    is_19_34_or_greater
+}, {
+    is_20_10_or_greater
+}, {
+    is_20_03_or_greater
 }, {
    addResources("youtube", "misc.fix.playback.spoofVideoStreamsPatch")

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt
@@ -25,9 +25,8 @@ val zoomHapticsPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt
@@ -45,9 +45,8 @@ val forceOriginalAudioPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt
@@ -32,9 +32,8 @@ val disableHdrPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/Fingerprints.kt
@@ -2,11 +2,65 @@ package app.revanced.patches.youtube.video.playerresponse

 import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
+import org.stringtemplate.v4.compiler.Bytecode.instructions

 /**
- * For targets 19.25 and later.
+ * For targets 20.10 and later.
 */
 internal val playerParameterBuilderFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters(
+        "Ljava/lang/String;",  // VideoId.
+        "[B",
+        "Ljava/lang/String;",  // Player parameters proto buffer.
+        "Ljava/lang/String;",
+        "I",
+        "Z",
+        "I",
+        "L",
+        "Ljava/util/Set;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L",
+        "Z", // Appears to indicate if the video id is being opened or is currently playing.
+        "Z",
+        "Z",
+        "Z"
+    )
+    strings("psps")
+}
+
+/**
+ * For targets 20.02 to 20.09.
+ */
+internal val playerParameterBuilder2002Fingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters(
+        "Ljava/lang/String;", // VideoId.
+        "[B",
+        "Ljava/lang/String;", // Player parameters proto buffer.
+        "Ljava/lang/String;",
+        "I",
+        "I",
+        "L", // 19.25+ parameter
+        "Ljava/util/Set;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L",
+        "Z", // Appears to indicate if the video id is being opened or is currently playing.
+        "Z",
+        "Z",
+        "Z",
+    )
+    strings("psps")
+}
+
+/**
+ * For targets 19.25 to 19.50.
+ */
+internal val playerParameterBuilder1925Fingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("L")
    parameters(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
@@ -1,11 +1,14 @@
 package app.revanced.patches.youtube.video.playerresponse

+import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_23_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_02_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch

 private val hooks = mutableSetOf<Hook>()
@@ -35,15 +38,21 @@ val playerResponseMethodHookPatch = bytecodePatch {
    )

    execute {
-        playerResponseMethod = if (is_19_23_or_greater) {
+        val fingerprint : Fingerprint
+        if (is_20_10_or_greater) {
+            parameterIsShortAndOpeningOrPlaying = 13
+            fingerprint = playerParameterBuilderFingerprint
+        } else if (is_20_02_or_greater) {
            parameterIsShortAndOpeningOrPlaying = 12
-
-            playerParameterBuilderFingerprint
+            fingerprint = playerParameterBuilder2002Fingerprint
+        } else if (is_19_23_or_greater) {
+            parameterIsShortAndOpeningOrPlaying = 12
+            fingerprint = playerParameterBuilder1925Fingerprint
        } else {
            parameterIsShortAndOpeningOrPlaying = 11
-
-            playerParameterBuilderLegacyFingerprint
-        }.method
+            fingerprint = playerParameterBuilderLegacyFingerprint
+        }
+        playerResponseMethod = fingerprint.method

        // On some app targets the method has too many registers pushing the parameters past v15.
        // If needed, move the parameters to 4-bit registers, so they can be passed to the extension.
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
@@ -27,9 +27,8 @@ val videoQualityPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -32,9 +32,8 @@ val playbackSpeedPatch = bytecodePatch(
            "19.25.37",
            "19.34.42",
            "19.43.41",
-            "19.45.38",
-            "19.46.42",
            "19.47.53",
+            "20.07.39",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/Fingerprints.kt
@@ -22,14 +22,6 @@ internal val speedArrayGeneratorFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
    returns("[L")
    parameters("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;")
-    opcodes(
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO_16,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-    )
    strings("0.0#")
 }

--- a/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
+++ b/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
@@ -15,13 +15,177 @@ import app.revanced.patches.shared.misc.mapping.get
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode.*
 import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.Reference
 import com.android.tools.smali.dexlib2.util.MethodUtil
+import java.util.EnumSet
+
+/**
+ * Starting from and including the instruction at index [startIndex],
+ * finds the next register that is wrote to and not read from. If a return instruction
+ * is encountered, then the lowest unused register is returned.
+ *
+ * This method can return a non 4-bit register, and the calling code may need to temporarily
+ * swap register contents if a 4-bit register is required.
+ *
+ * @param startIndex Inclusive starting index.
+ * @param registersToExclude Registers to exclude, and consider as used. For most use cases,
+ *                           all registers used in injected code should be specified.
+ * @throws IllegalArgumentException If a branch or conditional statement is encountered
+ *                                  before a suitable register is found.
+ */
+internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude: Int): Int {
+    if (implementation == null) {
+        throw IllegalArgumentException("Method has no implementation: $this")
+    }
+    if (startIndex < 0 || startIndex >= instructions.count()) {
+        throw IllegalArgumentException("startIndex out of bounds: $startIndex")
+    }
+
+    // All registers used by an instruction.
+    fun Instruction.getRegistersUsed() = when (this) {
+        is FiveRegisterInstruction -> listOf(registerC, registerD, registerE, registerF, registerG)
+        is ThreeRegisterInstruction -> listOf(registerA, registerB, registerC)
+        is TwoRegisterInstruction -> listOf(registerA, registerB)
+        is OneRegisterInstruction -> listOf(registerA)
+        is RegisterRangeInstruction -> (startRegister until (startRegister + registerCount)).toList()
+        else -> emptyList()
+    }
+
+    // Register that is written to by an instruction.
+    fun Instruction.getRegisterWritten() = when (this) {
+        is ThreeRegisterInstruction -> registerA
+        is TwoRegisterInstruction -> registerA
+        is OneRegisterInstruction -> registerA
+        else -> throw IllegalStateException("Not a write instruction: $this")
+    }
+
+    val writeOpcodes = EnumSet.of(
+        ARRAY_LENGTH,
+        NEW_INSTANCE, NEW_ARRAY,
+        MOVE, MOVE_FROM16, MOVE_16, MOVE_WIDE, MOVE_WIDE_FROM16, MOVE_WIDE_16, MOVE_OBJECT,
+        MOVE_OBJECT_FROM16, MOVE_OBJECT_16, MOVE_RESULT, MOVE_RESULT_WIDE, MOVE_RESULT_OBJECT, MOVE_EXCEPTION,
+        CONST, CONST_4, CONST_16, CONST_HIGH16, CONST_WIDE_16, CONST_WIDE_32,
+        CONST_WIDE, CONST_WIDE_HIGH16, CONST_STRING, CONST_STRING_JUMBO,
+        IGET, IGET_WIDE, IGET_OBJECT, IGET_BOOLEAN, IGET_BYTE, IGET_CHAR, IGET_SHORT,
+        IGET_VOLATILE, IGET_WIDE_VOLATILE, IGET_OBJECT_VOLATILE,
+        SGET, SGET_WIDE, SGET_OBJECT, SGET_BOOLEAN, SGET_BYTE, SGET_CHAR, SGET_SHORT,
+        SGET_VOLATILE, SGET_WIDE_VOLATILE, SGET_OBJECT_VOLATILE,
+        AGET, AGET_WIDE, AGET_OBJECT, AGET_BOOLEAN, AGET_BYTE, AGET_CHAR, AGET_SHORT,
+        // Arithmetic and logical operations.
+        ADD_DOUBLE_2ADDR, ADD_DOUBLE, ADD_FLOAT_2ADDR, ADD_FLOAT, ADD_INT_2ADDR,
+        ADD_INT_LIT8, ADD_INT, ADD_LONG_2ADDR, ADD_LONG, ADD_INT_LIT16,
+        AND_INT_2ADDR, AND_INT_LIT8, AND_INT_LIT16, AND_INT, AND_LONG_2ADDR, AND_LONG,
+        DIV_DOUBLE_2ADDR, DIV_DOUBLE, DIV_FLOAT_2ADDR, DIV_FLOAT, DIV_INT_2ADDR,
+        DIV_INT_LIT16, DIV_INT_LIT8, DIV_INT, DIV_LONG_2ADDR, DIV_LONG,
+        DOUBLE_TO_FLOAT, DOUBLE_TO_INT, DOUBLE_TO_LONG,
+        FLOAT_TO_DOUBLE, FLOAT_TO_INT, FLOAT_TO_LONG,
+        INT_TO_BYTE, INT_TO_CHAR, INT_TO_DOUBLE, INT_TO_FLOAT, INT_TO_LONG, INT_TO_SHORT,
+        LONG_TO_DOUBLE, LONG_TO_FLOAT, LONG_TO_INT,
+        MUL_DOUBLE_2ADDR, MUL_DOUBLE, MUL_FLOAT_2ADDR, MUL_FLOAT, MUL_INT_2ADDR,
+        MUL_INT_LIT16, MUL_INT_LIT8, MUL_INT, MUL_LONG_2ADDR, MUL_LONG,
+        NEG_DOUBLE, NEG_FLOAT, NEG_INT, NEG_LONG,
+        NOT_INT, NOT_LONG,
+        OR_INT_2ADDR, OR_INT_LIT16, OR_INT_LIT8, OR_INT, OR_LONG_2ADDR, OR_LONG,
+        REM_DOUBLE_2ADDR, REM_DOUBLE, REM_FLOAT_2ADDR, REM_FLOAT, REM_INT_2ADDR,
+        REM_INT_LIT16, REM_INT_LIT8, REM_INT, REM_LONG_2ADDR, REM_LONG,
+        RSUB_INT_LIT8, RSUB_INT,
+        SHL_INT_2ADDR, SHL_INT_LIT8, SHL_INT, SHL_LONG_2ADDR, SHL_LONG,
+        SHR_INT_2ADDR, SHR_INT_LIT8, SHR_INT, SHR_LONG_2ADDR, SHR_LONG,
+        SUB_DOUBLE_2ADDR, SUB_DOUBLE, SUB_FLOAT_2ADDR, SUB_FLOAT, SUB_INT_2ADDR,
+        SUB_INT, SUB_LONG_2ADDR, SUB_LONG,
+        USHR_INT_2ADDR, USHR_INT_LIT8, USHR_INT, USHR_LONG_2ADDR, USHR_LONG,
+        XOR_INT_2ADDR, XOR_INT_LIT16, XOR_INT_LIT8, XOR_INT, XOR_LONG_2ADDR, XOR_LONG,
+    )
+
+    val branchOpcodes = EnumSet.of(
+        GOTO, GOTO_16, GOTO_32,
+        IF_EQ, IF_NE, IF_LT, IF_GE, IF_GT, IF_LE,
+        IF_EQZ, IF_NEZ, IF_LTZ, IF_GEZ, IF_GTZ, IF_LEZ,
+        PACKED_SWITCH_PAYLOAD, SPARSE_SWITCH_PAYLOAD
+    )
+
+    val returnOpcodes = EnumSet.of(
+        RETURN_VOID, RETURN, RETURN_WIDE, RETURN_OBJECT, RETURN_VOID_NO_BARRIER,
+        THROW
+    )
+
+    // Highest 4-bit register available, exclusive. Ideally return a free register less than this.
+    val maxRegister4Bits = 16
+    var bestFreeRegisterFound: Int? = null
+    val usedRegisters = registersToExclude.toMutableSet()
+
+    for (i in startIndex until instructions.count()) {
+        val instruction = getInstruction(i)
+        val instructionRegisters = instruction.getRegistersUsed()
+
+        if (instruction.opcode in returnOpcodes) {
+            // Method returns.
+            usedRegisters.addAll(instructionRegisters)
+
+            // Use lowest register that hasn't been encountered.
+            val freeRegister = (0 until implementation!!.registerCount).find {
+                it !in usedRegisters
+            }
+            if (freeRegister != null) {
+                return freeRegister
+            }
+            if (bestFreeRegisterFound != null) {
+                return bestFreeRegisterFound;
+            }
+
+            // Somehow every method register was read from before any register was wrote to.
+            // In practice this never occurs.
+            throw IllegalArgumentException("Could not find a free register from startIndex: " +
+                    "$startIndex excluding: $registersToExclude")
+        }
+
+        if (instruction.opcode in branchOpcodes) {
+            if (bestFreeRegisterFound != null) {
+                return bestFreeRegisterFound;
+            }
+            // This method is simple and does not follow branching.
+            throw IllegalArgumentException("Encountered a branch statement before a free register could be found")
+        }
+
+        if (instruction.opcode in writeOpcodes) {
+            val writeRegister = instruction.getRegisterWritten()
+
+            if (writeRegister !in usedRegisters) {
+                // Verify the register is only used for write and not also as a parameter.
+                // If the instruction uses the write register once then it's not also a read register.
+                if (instructionRegisters.count { register -> register == writeRegister } == 1) {
+                    if (writeRegister < maxRegister4Bits) {
+                        // Found an ideal register.
+                        return writeRegister
+                    }
+
+                    // Continue searching for a 4-bit register if available.
+                    if (bestFreeRegisterFound == null || writeRegister < bestFreeRegisterFound) {
+                        bestFreeRegisterFound = writeRegister
+                    }
+                }
+            }
+        }
+
+        usedRegisters.addAll(instructionRegisters)
+    }
+
+    // Some methods can have array payloads at the end of the method after a return statement.
+    // But in normal usage this cannot be reached since a branch or return statement
+    // will be encountered before the end of the method.
+    throw IllegalArgumentException("Start index is outside the range of normal control flow: $startIndex")
+}
+

 /**
 * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -395,7 +559,7 @@ fun Method.findInstructionIndicesReversedOrThrow(opcode: Opcode): List<Int> {

 internal fun MutableMethod.insertFeatureFlagBooleanOverride(literal: Long, extensionsMethod: String) {
    val literalIndex = indexOfFirstLiteralInstructionOrThrow(literal)
-    val index = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
+    val index = indexOfFirstInstructionOrThrow(literalIndex, MOVE_RESULT)
    val register = getInstruction<OneRegisterInstruction>(index).registerA

    val operation = if (register < 16) {
@@ -423,7 +587,7 @@ fun BytecodePatchContext.forEachLiteralValueInstruction(
    classes.forEach { classDef ->
        classDef.methods.forEach { method ->
            method.implementation?.instructions?.forEachIndexed { index, instruction ->
-                if (instruction.opcode == Opcode.CONST &&
+                if (instruction.opcode == CONST &&
                    (instruction as WideLiteralInstruction).wideLiteral == literal
                ) {
                    val mutableMethod = proxy(classDef).mutableClass.findMutableMethodOf(method)
--- a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
+++ b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
@@ -22,7 +22,7 @@ Second \"item\" text"</string>
 <resources>
  <app id="shared">
  <patch id="misc.checks.checkEnvironmentPatch">
-  <string name="revanced_check_environment_failed_title">فشلت عمليات التحقق</string>
+  <string name="revanced_check_environment_failed_title">فشلت الفحوصات</string>
  <string name="revanced_check_environment_dialog_open_official_source_button">فتح الموقع الرسمي</string>
  <string name="revanced_check_environment_dialog_ignore_button">تجاهل</string>
  <string name="revanced_check_environment_failed_message">&lt;h5&gt;لا يبدو أن هذا التطبيق قد تم تعديله من قبلك.&lt;/h5&gt;&lt;br&gt;قد لا يعمل هذا التطبيق بشكل صحيح، &lt;b&gt;قد يكون ضارًا أو حتى خطيرًا للاستخدام&lt;/b&gt;.&lt;br&gt;&lt;br&gt;تشير هذه الفحوصات إلى أن هذا التطبيق تم تعديله مسبقًا أو تم الحصول عليه من شخص آخر:&lt;br&gt;&lt;br&gt;&lt;small&gt;%1$s&lt;/small&gt;&lt;br&gt;يوصى بشدة بـ &lt;b&gt;إلغاء تثبيت هذا التطبيق وتعديله بنفسك&lt;/b&gt; للتأكد من أنك تستخدم تطبيقًا معتمدًا وآمنًا.&lt;p&gt;&lt;br&gt;في حالة تجاهل هذا التحذير، سيتم عرضه مرتين فقط.</string>
@@ -30,13 +30,13 @@ Second \"item\" text"</string>
  <string name="revanced_check_environment_manager_not_expected_installer">لم يتم تثبيته بواسطة ReVanced Manager</string>
  <string name="revanced_check_environment_not_near_patch_time">تم تعديله قبل أكثر من 10 دقائق</string>
  <string name="revanced_check_environment_not_near_patch_time_days">تم التعديل منذ %s يوم</string>
-  <string name="revanced_check_environment_not_near_patch_time_invalid">تاريخ إنشاء APK تالف</string>
+  <string name="revanced_check_environment_not_near_patch_time_invalid">تاريخ بناء APK تالف</string>
  </patch>
  <patch id="misc.settings.settingsResourcePatch">
  <string name="revanced_settings_submenu_title">الإعدادات</string>
  <string name="revanced_settings_confirm_user_dialog_title">هل ترغب في المتابعة؟</string>
  <string name="revanced_settings_reset">إعادة التعيين</string>
-  <string name="revanced_settings_restart_title">تحديث وإعادة تشغيل</string>
+  <string name="revanced_settings_restart_title">تحديث وإعادة التشغيل</string>
  <string name="revanced_settings_restart">إعادة التشغيل</string>
  <string name="revanced_settings_import">استيراد</string>
  <string name="revanced_settings_import_copy">نسخ</string>
@@ -106,9 +106,9 @@ Second \"item\" text"</string>
  <string name="revanced_debug_protobuffer_title">سجل بروتوكول التخزين المؤقت</string>
  <string name="revanced_debug_protobuffer_summary_on">تتضمن سجلات التصحيح التخزين المؤقت</string>
  <string name="revanced_debug_protobuffer_summary_off">لا تتضمن سجلات التصحيح التخزين المؤقت</string>
-  <string name="revanced_debug_stacktrace_title">سجل عمليات التطبيق</string>
-  <string name="revanced_debug_stacktrace_summary_on">تتضمن سجلات التصحيح سِجِل عمليات التطبيق</string>
-  <string name="revanced_debug_stacktrace_summary_off">لا تتضمن سجلات التصحيح سِجِل عمليات التطبيق</string>
+  <string name="revanced_debug_stacktrace_title">سجل تتبع المكدس</string>
+  <string name="revanced_debug_stacktrace_summary_on">تتضمن سجلات التصحيح سجل تتبع المكدس</string>
+  <string name="revanced_debug_stacktrace_summary_off">لا تتضمن سجلات التصحيح سجل تتبع المكدس</string>
  <string name="revanced_debug_toast_on_error_title">عرض ملاحظة عند وجود خطأ في ReVanced</string>
  <string name="revanced_debug_toast_on_error_summary_on">يتم عرض ملاحظة في حالة حدوث خطأ</string>
  <string name="revanced_debug_toast_on_error_summary_off">لا يتم عرض ملاحظة في حالة حدوث خطأ</string>
@@ -214,9 +214,9 @@ Second \"item\" text"</string>
  <string name="revanced_hide_related_videos_title">إخفاء الفيديوهات ذات الصلة في الإجراءات السريعة</string>
  <string name="revanced_hide_related_videos_summary_on">تم إخفاء الفيديوهات ذات الصلة</string>
  <string name="revanced_hide_related_videos_summary_off">يتم عرض الفيديوهات ذات الصلة</string>
-  <string name="revanced_hide_image_shelf_title">إخفاء رفوف الصور في نتائج البحث</string>
-  <string name="revanced_hide_image_shelf_summary_on">تم إخفاء رفوف الصورة</string>
-  <string name="revanced_hide_image_shelf_summary_off">يتم عرض رفوف الصورة</string>
+  <string name="revanced_hide_image_shelf_title">إخفاء رف الصورة في نتائج البحث</string>
+  <string name="revanced_hide_image_shelf_summary_on">تم إخفاء رف الصورة</string>
+  <string name="revanced_hide_image_shelf_summary_off">يتم عرض رف الصورة</string>
  <string name="revanced_hide_latest_posts_ads_title">إخفاء آخر المشاركات</string>
  <string name="revanced_hide_latest_posts_ads_summary_on">تم إخفاء أحدث المشاركات</string>
  <string name="revanced_hide_latest_posts_ads_summary_off">يتم عرض أحدث المشاركات</string>
@@ -226,7 +226,7 @@ Second \"item\" text"</string>
  <string name="revanced_hide_artist_cards_title">إخفاء بطاقات الفنان</string>
  <string name="revanced_hide_artist_cards_summary_on">تم إخفاء بطاقات الفنان</string>
  <string name="revanced_hide_artist_cards_summary_off">يتم عرض بطاقات الفنان</string>
-  <string name="revanced_hide_ai_generated_video_summary_section_title">إخفاء \"ملخص الفيديو الذي تم إنشاؤه بواسطة الذكاء الاصطناعي\"</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_title">إخفاء \'ملخص الفيديو الذي تم إنشاؤه بواسطة الذكاء الاصطناعي\'</string>
  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">تم إخفاء قسم ملخص الفيديو</string>
  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">يتم عرض قسم ملخص الفيديو</string>
  <string name="revanced_hide_attributes_section_title">إخفاء الصفات</string>
@@ -253,31 +253,31 @@ Second \"item\" text"</string>
  <string name="revanced_hide_description_components_screen_title">وصف الفيديو</string>
  <string name="revanced_hide_description_components_screen_summary">إخفاء أو عرض مكونات وصف الفيديو</string>
  <string name="revanced_hide_filter_bar_screen_title">شريط التصفية</string>
-  <string name="revanced_hide_filter_bar_screen_summary">إخفاء أو إظهار شريط الفلتر في الخلاصة ونتائج البحث ومقاطع الفيديو ذات الصلة</string>
+  <string name="revanced_hide_filter_bar_screen_summary">إخفاء أو عرض شريط الفلتر في الموجز ونتائج البحث والفيديوهات ذات الصلة</string>
  <string name="revanced_hide_filter_bar_feed_in_feed_title">إخفاء في الموجز</string>
  <string name="revanced_hide_filter_bar_feed_in_feed_summary_on">مخفي في الموجز</string>
-  <string name="revanced_hide_filter_bar_feed_in_feed_summary_off">يعرض في الموجز</string>
+  <string name="revanced_hide_filter_bar_feed_in_feed_summary_off">يُعرض في الموجز</string>
  <string name="revanced_hide_filter_bar_feed_in_search_title">إخفاء في نتائج البحث</string>
  <string name="revanced_hide_filter_bar_feed_in_search_summary_on">مخفي في نتائج البحث</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">يظهر في نتائج البحث</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">يُعرض في نتائج البحث</string>
  <string name="revanced_hide_filter_bar_feed_in_related_videos_title">إخفاء في الفيديوهات ذات الصلة</string>
  <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_on">مخفي في الفيديوهات ذات الصلة</string>
-  <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">يعرض في الفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">يُعرض في الفيديوهات ذات الصلة</string>
  <string name="revanced_comments_screen_title">التعليقات</string>
  <string name="revanced_comments_screen_summary">إخفاء أو عرض مكونات قسم التعليقات</string>
-  <string name="revanced_hide_comments_ai_chat_summary_title">إخفاء ملخص دردشة الذكاء الاصطناعي</string>
+  <string name="revanced_hide_comments_ai_chat_summary_title">إخفاء ملخص محادثات الذكاء الاصطناعي</string>
  <string name="revanced_hide_comments_ai_chat_summary_summary_on">تم إخفاء ملخص المحادثات</string>
  <string name="revanced_hide_comments_ai_chat_summary_summary_off">يتم عرض ملخص المحادثات</string>
  <string name="revanced_hide_comments_ai_summary_title">إخفاء ملخص تعليقات الذكاء الاصطناعي</string>
-  <string name="revanced_hide_comments_ai_summary_summary_on">ملخص التعليقات مخفي</string>
-  <string name="revanced_hide_comments_ai_summary_summary_off">ملخص التعليقات معروض</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">تم إخفاء ملخص التعليقات</string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">يتم عرض ملخص التعليقات</string>
  <string name="revanced_hide_comments_by_members_header_title">إخفاء رأس \'تعليقات الأعضاء\'</string>
  <string name="revanced_hide_comments_by_members_header_summary_on">تم إخفاء علامة تعليقات من الأعضاء</string>
  <string name="revanced_hide_comments_by_members_header_summary_off">يتم عرض علامة تعليقات من الأعضاء</string>
  <string name="revanced_hide_comments_section_title">إخفاء قسم التعليقات</string>
  <string name="revanced_hide_comments_section_summary_on">تم إخفاء قسم التعليقات</string>
  <string name="revanced_hide_comments_section_summary_off">يتم عرض قسم التعليقات</string>
-  <string name="revanced_hide_comments_create_a_short_button_title">إخفاء زر \'إنشاء مقطع Short\'</string>
+  <string name="revanced_hide_comments_create_a_short_button_title">إخفاء زر \'إنشاء Short\'</string>
  <string name="revanced_hide_comments_create_a_short_button_summary_on">تم إخفاء زر إنشاء Short</string>
  <string name="revanced_hide_comments_create_a_short_button_summary_off">يتم عرض زر إنشاء Short</string>
  <string name="revanced_hide_comments_timestamp_and_emoji_buttons_title">إخفاء أزرار الرموز التعبيرية والطوابع الزمنية</string>
@@ -305,7 +305,7 @@ Second \"item\" text"</string>
  <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
  <string name="revanced_custom_filter_strings_summary">قائمة سلاسل منشئ مسار المكونات المراد تصفيتها مفصولة بسطر جديد</string>
  <string name="revanced_custom_filter_toast_invalid_syntax">فلتر مخصص غير صالح: %s</string>
-  <string name="revanced_hide_keyword_content_screen_title">إخفاء محتوى الكلمات الرئيسية</string>
+  <string name="revanced_hide_keyword_content_screen_title">إخفاء محتوى الكلمات المفتاحية</string>
  <string name="revanced_hide_keyword_content_screen_summary">إخفاء فيديوهات البحث والموجز باستخدام فلاتر الكلمات المفتاحية</string>
  <string name="revanced_hide_keyword_content_home_title">إخفاء فيديوهات الصفحة الرئيسية بواسطة الكلمات المفتاحية</string>
  <string name="revanced_hide_keyword_content_home_summary_on">تتم تصفية الفيديوهات في علامة التبويب \"الصفحة الرئيسية\" حسب الكلمات المفتاحية</string>
@@ -335,11 +335,11 @@ Second \"item\" text"</string>
  <!-- Translations _must_ use a localized example.  For languages that do not use spaces between words (Chinese, Japanese, etc.) the English AI example should be used since no localized examples exist.  Or if using machine translations, or if nobody wants to think of a localized example, then the English 'ai' example should be left as-is. -->
  <string name="revanced_hide_keyword_content_about_whole_words_summary">سيؤدي وضع علامة اقتباس مزدوجة حول كلمة رئيسية/عبارة إلى منع التطابقات الجزئية لعناوين الفيديو وأسماء القنوات.&lt;br&gt;&lt;br&gt;على سبيل المثال،&lt;br&gt;&lt;b&gt;\"ai\"&lt;/b&gt; سيخفي الفيديو: &lt;b&gt;How does AI work?&lt;/b&gt;&lt;br&gt;ولكن لن يخفي: &lt;b&gt;What does fair use mean?&lt;/b&gt;</string>
  <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <string name="revanced_hide_keyword_toast_invalid_common">لا يمكن استخدام الكلمة الرئيسية: %s</string>
-  <string name="revanced_hide_keyword_toast_invalid_common_whole_word_required">إضافة اقتباسات لاستخدام الكلمة الرئيسية: %s</string>
-  <string name="revanced_hide_keyword_toast_invalid_conflicting">الكلمة الرئيسية لها بيانات متضاربة: %s</string>
-  <string name="revanced_hide_keyword_toast_invalid_length">الكلمة الرئيسية قصيرة جدًا وتتطلب اقتباسات: %s</string>
-  <string name="revanced_hide_keyword_toast_invalid_broad">الكلمة الرئيسية سوف تخفي جميع الفيديوهات: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_common">لا يمكن استخدام الكلمة المفتاحية: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_common_whole_word_required">إضافة اقتباسات لاستخدام الكلمة المفتاحية: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_conflicting">الكلمة المفتاحية لها بيانات متضاربة: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_length">الكلمة المفتاحية قصيرة جدًا وتتطلب اقتباسات: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_broad">الكلمة المفتاحية سوف تخفي جميع الفيديوهات: %s</string>
  </patch>
  <patch id="ad.general.hideAdsResourcePatch">
  <string name="revanced_hide_general_ads_title">إخفاء الإعلانات العامة</string>
@@ -359,20 +359,20 @@ Second \"item\" text"</string>
  <string name="revanced_hide_self_sponsor_ads_title">إخفاء بطاقات الرعاية الذاتية</string>
  <string name="revanced_hide_self_sponsor_ads_summary_on">تم إخفاء بطاقات الرعاية الذاتية</string>
  <string name="revanced_hide_self_sponsor_ads_summary_off">يتم عرض بطاقات الرعاية الذاتية</string>
-  <string name="revanced_hide_products_banner_title">إخفاء لافتة \"عرض المنتجات\"</string>
+  <string name="revanced_hide_products_banner_title">إخفاء لافتة \'عرض المنتجات\'</string>
  <string name="revanced_hide_products_banner_summary_on">تم إخفاء البانر</string>
  <string name="revanced_hide_products_banner_summary_off">يتم عرض البانر</string>
  <string name="revanced_hide_end_screen_store_banner_title">إخفاء لافتة شاشة المتجر النهائية</string>
  <string name="revanced_hide_end_screen_store_banner_summary_on">تم إخفاء لافتة المتجر</string>
  <string name="revanced_hide_end_screen_store_banner_summary_off">يتم عرض لافتة المتجر</string>
  <string name="revanced_hide_player_store_shelf_title">إخفاء رف مشغل التسوق</string>
-  <string name="revanced_hide_player_store_shelf_summary_on">تم إخفاء رفوف التسوق</string>
-  <string name="revanced_hide_player_store_shelf_summary_off">يتم عرض رفوف التسوق</string>
+  <string name="revanced_hide_player_store_shelf_summary_on">تم إخفاء رف التسوق</string>
+  <string name="revanced_hide_player_store_shelf_summary_off">يتم عرض رف التسوق</string>
  <string name="revanced_hide_shopping_links_title">إخفاء روابط التسوق في وصف الفيديو</string>
  <string name="revanced_hide_shopping_links_summary_on">تم إخفاء روابط التسوق في وصف الفيديو</string>
  <string name="revanced_hide_shopping_links_summary_off">يتم عرض روابط التسوق في وصف الفيديو</string>
  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_visit_store_button_title">إخفاء زر \"زيارة المتجر\" على صفحات القناة</string>
+  <string name="revanced_hide_visit_store_button_title">إخفاء زر \'زيارة المتجر\' على صفحات القناة</string>
  <string name="revanced_hide_visit_store_button_summary_on">تم إخفاء الزر في صفحة القناة</string>
  <string name="revanced_hide_visit_store_button_summary_off">يتم عرض الزر في صفحة القناة</string>
  <string name="revanced_hide_web_search_results_title">إخفاء نتائج بحث الويب</string>
@@ -387,7 +387,7 @@ Second \"item\" text"</string>
  <patch id="ad.getpremium.hideGetPremiumPatch">
  <string name="revanced_hide_get_premium_title">إخفاء ترقية YouTube Premium</string>
  <string name="revanced_hide_get_premium_summary_on">تم إخفاء عروض YouTube Premium الترويجية تحت مشغل الفيديو</string>
-  <string name="revanced_hide_get_premium_summary_off">يتم عرض عروض YouTube Premium الترويجية تحت مشغل الفيديو</string>
+  <string name="revanced_hide_get_premium_summary_off">يتم إظهار عروض YouTube Premium الترويجية تحت مشغل الفيديو</string>
  </patch>
  <patch id="ad.video.videoAdsPatch">
  <string name="revanced_hide_video_ads_title">إخفاء إعلانات الفيديو</string>
@@ -430,9 +430,9 @@ Second \"item\" text"</string>
  <string name="revanced_disable_precise_seeking_gesture_summary_off">تم تمكين الإيماءة</string>
  </patch>
  <patch id="interaction.seekbar.enableSeekbarTappingPatch">
-  <string name="revanced_seekbar_tapping_title">تمكين النقر للبحث</string>
-  <string name="revanced_seekbar_tapping_summary_on">تم تمكين النقر للتنقل</string>
-  <string name="revanced_seekbar_tapping_summary_off">تم تعطيل النقر للبحث</string>
+  <string name="revanced_seekbar_tapping_title">تمكين النقر للتمرير</string>
+  <string name="revanced_seekbar_tapping_summary_on">تم تمكين النقر للتمرير</string>
+  <string name="revanced_seekbar_tapping_summary_off">تم تعطيل النقر للتمرير</string>
  </patch>
  <patch id="interaction.swipecontrols.swipeControlsResourcePatch">
  <string name="revanced_swipe_brightness_title">التحكم بالسطوع عن طريق ايماءة التمرير</string>
@@ -555,6 +555,7 @@ Second \"item\" text"</string>
  <string name="revanced_disable_translucent_status_bar_title">تعطيل شريط الحالة الشفاف</string>
  <string name="revanced_disable_translucent_status_bar_summary_on">شريط الحالة غير شفاف</string>
  <string name="revanced_disable_translucent_status_bar_summary_off">شريط الحالة معتم أو شفاف</string>
+  <string name="revanced_disable_translucent_status_bar_user_dialog_message">في بعض الأجهزة، قد يؤدي تمكين هذه الميزة إلى تغيير شريط التنقل في النظام إلى شفاف.</string>
  <string name="revanced_disable_translucent_navigation_bar_light_title">تعطيل الشريط الشفاف الفاتح</string>
  <string name="revanced_disable_translucent_navigation_bar_light_summary_on">شريط التنقل في الوضع الفاتح غير شفاف</string>
  <string name="revanced_disable_translucent_navigation_bar_light_summary_off">شريط التنقل في الوضع الفاتح معتم او شفاف</string>
@@ -666,17 +667,17 @@ Second \"item\" text"</string>
  <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
  <string name="revanced_hide_shorts_home_title">إخفاء Shorts في موجز الصفحة الرئيسية</string>
  <string name="revanced_hide_shorts_home_summary_on">مخفية في الصفحة الرئيسية والفيديوهات ذات الصلة</string>
-  <string name="revanced_hide_shorts_home_summary_off">تعرض في الصفحة الرئيسية والفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_shorts_home_summary_off">تُعرض في الصفحة الرئيسية والفيديوهات ذات الصلة</string>
  <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
  <string name="revanced_hide_shorts_subscriptions_title">إخفاء Shorts في موجز الاشتراكات</string>
  <string name="revanced_hide_shorts_subscriptions_summary_on">مخفية في موجز الاشتراكات</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_off">تعرض في موجز الاشتراكات</string>
+  <string name="revanced_hide_shorts_subscriptions_summary_off">تُعرض في موجز الاشتراكات</string>
  <string name="revanced_hide_shorts_search_title">إخفاء Shorts في نتائج البحث</string>
  <string name="revanced_hide_shorts_search_summary_on">مخفية في نتائج البحث</string>
-  <string name="revanced_hide_shorts_search_summary_off">تعرض في نتائج البحث</string>
+  <string name="revanced_hide_shorts_search_summary_off">تُعرض في نتائج البحث</string>
  <string name="revanced_hide_shorts_history_title">إخفاء Shorts في سجل المشاهدة</string>
  <string name="revanced_hide_shorts_history_summary_on">مخفية في سجل المشاهدة</string>
-  <string name="revanced_hide_shorts_history_summary_off">تعرض في سجل المشاهدة</string>
+  <string name="revanced_hide_shorts_history_summary_off">تُعرض في سجل المشاهدة</string>
  <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
  <string name="revanced_hide_shorts_join_button_title">إخفاء زر الانضمام</string>
  <string name="revanced_hide_shorts_join_button_summary_on">تم إخفاء زر الانضمام</string>
@@ -765,7 +766,7 @@ Second \"item\" text"</string>
  </patch>
  <patch id="layout.hide.endscreensuggestion.hideEndScreenSuggestedVideoPatch">
  <string name="revanced_end_screen_suggested_video_title">إخفاء الفيديو المقترح في شاشة النهاية</string>
-  <string name="revanced_end_screen_suggested_video_summary_on">"يتم إخفاء الفيديو المقترح في شاشة النهاية عند إيقاف التشغيل التلقائي
+  <string name="revanced_end_screen_suggested_video_summary_on">"تم إخفاء الفيديو المقترح في شاشة النهاية عند إيقاف التشغيل التلقائي

 يمكن تغيير التشغيل التلقائي في إعدادات YouTube:
 الإعدادات ← التشغيل ← تشغيل الفيديو التالي تلقائيًا"</string>
@@ -863,7 +864,7 @@ Second \"item\" text"</string>

 مصغرات شريط التقدم سوف تستخدم نفس جودة الفيديو الحالي.

-تعمل هذه الميزة بشكل أفضل مع جودة فيديو 720p أو أقل وعند استخدام اتصال إنترنت سريع جداً."</string>
+تعمل هذه الميزة بشكل أفضل مع جودة فيديو 720p أو أقل وعند استخدام اتصال إنترنت سريع جدًا."</string>
  <string name="revanced_restore_old_seekbar_thumbnails_title">استعادة مصغرات شريط التقدم القديمة</string>
  <string name="revanced_restore_old_seekbar_thumbnails_summary_on">مصغرات شريط التقدم ستظهر فوق شريط تقدم الفيديو</string>
  <string name="revanced_restore_old_seekbar_thumbnails_summary_off">مصغرات شريط التقدم ستظهر في ملء الشاشة</string>
@@ -936,15 +937,15 @@ Second \"item\" text"</string>
  <string name="revanced_sb_settings_revanced_export_user_id_warning_dismiss">لا تعرض مرة أخرى</string>
  <string name="revanced_sb_diff_segments">تغيير سلوك المقطع</string>
  <string name="revanced_sb_segments_sponsor">الراعي</string>
-  <string name="revanced_sb_segments_sponsor_sum">الترويج المدفوع الأجر، والإحالات المدفوعة الأجر والإعلانات المباشرة. ليس للترويج الذاتي أو لصراعات مجانية للقضايا/المبدعين/المواقع الإلكترونية/المنتجات التي يحبون الحصول عليها</string>
+  <string name="revanced_sb_segments_sponsor_sum">الترويج المدفوع، والإحالات المدفوعة، والإعلانات المباشرة. ليس للترويج الذاتي أو الترويج المجاني للقضايا/المبدعين/المواقع الإلكترونية/المنتجات التي يفضلونها</string>
  <string name="revanced_sb_segments_selfpromo">ترويج شخصي/غير مدفوع الأجر</string>
-  <string name="revanced_sb_segments_selfpromo_sum">مشابهة لـ \"الراعي\" باستثناء ما يتعلق بالإعلانات غير المدفوعة الأجر أو الذاتية. ويشمل ذلك أقسام عن السلع أو التبرعات أو المعلومات المتعلقة بمن تعاونوا مع ناشر المحتوى</string>
+  <string name="revanced_sb_segments_selfpromo_sum">مشابهة لـ \'الراعي\' باستثناء ما يتعلق بالإعلانات غير المدفوعة الأجر أو الذاتية. ويشمل ذلك أقسام عن السلع أو التبرعات أو المعلومات المتعلقة بمن تعاونوا مع ناشر المحتوى</string>
  <string name="revanced_sb_segments_interaction">تذكير بالتفاعل (اشتراك)</string>
  <string name="revanced_sb_segments_interaction_sum">تذكير قصير للإعجاب أو الاشتراك أو المتابعة في منتصف المحتوى. إذا كانت طويلة أو تتعلق بشيء محدد، فيجب أن تكون خاضعة للترويج الشخصي بدلاً من ذلك</string>
  <string name="revanced_sb_segments_highlight">الأبرز</string>
  <string name="revanced_sb_segments_highlight_sum">الجزء من الفيديو الذي يبحث عنه معظم الناس</string>
  <string name="revanced_sb_segments_intro">المقدمة/فاصل</string>
-  <string name="revanced_sb_segments_intro_sum">فاصل زمني بدون محتوى فعلي. يمكن أن يكون وقفاً مؤقتاً، أو إطارًا ثابتاً، أو تكرارًا. لا يتضمن التحولات التي تحتوي على معلومات</string>
+  <string name="revanced_sb_segments_intro_sum">فاصل زمني بدون محتوى فعلي. قد يكون توقفًا مؤقتًا، أو إطارًا ثابتًا، أو رسومًا متحركة متكررة. لا يتضمن انتقالات تحتوي على معلومات</string>
  <string name="revanced_sb_segments_outro">الخاتمة/تترات النهاية</string>
  <string name="revanced_sb_segments_outro_sum">تتر النهاية أو عندما تظهر بطاقات نهاية YouTube، نهايات غير منطوقة. ليس للاستنتاجات مع المعلومات</string>
  <string name="revanced_sb_segments_preview">معاينة/موجز/ربط</string>
@@ -1078,9 +1079,9 @@ Second \"item\" text"</string>
 تصميم الجهاز اللوحي
 • مشاركات المجتمع مخفية

-تصميم السيارة
+تصميم Automotive
 • يتم فتح Shorts في المشغل العادي
-• يتم تنظيم الخلاصة حسب المواضيع والقنوات"</string>
+• يتم تنظيم الموجز حسب المواضيع والقنوات"</string>
  </patch>
  <patch id="layout.spoofappversion.spoofAppVersionPatch">
  <string name="revanced_spoof_app_version_title">خِداع إصدار التطبيق</string>
@@ -1154,6 +1155,7 @@ Second \"item\" text"</string>
  <string name="revanced_miniplayer_type_entry_4">حديث 1</string>
  <string name="revanced_miniplayer_type_entry_5">حديث 2</string>
  <string name="revanced_miniplayer_type_entry_6">حديث 3</string>
+  <string name="revanced_miniplayer_type_entry_7">حديث 4</string>
  <string name="revanced_miniplayer_rounded_corners_title">تمكين الزوايا المستديرة</string>
  <string name="revanced_miniplayer_rounded_corners_summary_on">الزوايا مستديرة</string>
  <string name="revanced_miniplayer_rounded_corners_summary_off">الزوايا مربعة</string>
@@ -1173,14 +1175,14 @@ Second \"item\" text"</string>

 يمكن سحب المشغل المصغر خارج الشاشة إلى اليسار أو اليمين"</string>
  <string name="revanced_miniplayer_horizontal_drag_summary_off">تم تعطيل إيماءة السحب الأفقية</string>
-  <string name="revanced_miniplayer_hide_expand_close_title">إخفاء زر الإغلاق</string>
-  <string name="revanced_miniplayer_hide_expand_close_summary_on">تم إخفاء زر الإغلاق</string>
-  <string name="revanced_miniplayer_hide_expand_close_summary_off">يتم عرض زر الإغلاق</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_title">إخفاء أزرار التوسيع والإغلاق</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_summary_on">"تم إخفاء الأزرار
+  <string name="revanced_miniplayer_hide_overlay_buttons_title">إخفاء أزرار الواجهة</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_on">تم إخفاء أزرار الواجهة</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_off">يتم عرض أزرار الواجهة</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_title">إخفاء زري التوسيع والإغلاق</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_on">"تم إخفاء الأزرار

-مرر للتوسيع أو الإغلاق"</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_summary_off">يتم عرض أزرار التوسيع والإغلاق</string>
+اسحب للتوسيع أو الإغلاق"</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_off">يتم عرض زري التوسيع والإغلاق</string>
  <string name="revanced_miniplayer_hide_subtext_title">إخفاء النصوص الفرعية</string>
  <string name="revanced_miniplayer_hide_subtext_summary_on">تم إخفاء النصوص الفرعية</string>
  <string name="revanced_miniplayer_hide_subtext_summary_off">يتم عرض النصوص الفرعية</string>
@@ -1216,7 +1218,7 @@ Second \"item\" text"</string>
  </patch>
  <patch id="layout.thumbnails.alternativeThumbnailsPatch">
  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <string name="revanced_alt_thumbnail_home_title">علامة تبويب الصفحة الرئيسية</string>
+  <string name="revanced_alt_thumbnail_home_title">علامة التبويب الصفحة الرئيسية</string>
  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
  <string name="revanced_alt_thumbnail_subscription_title">علامة التبويب الاشتراكات</string>
  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
@@ -1227,11 +1229,11 @@ Second \"item\" text"</string>
  <string name="revanced_alt_thumbnail_options_entry_2">DeArrow &amp; المصّغرات الأصلية</string>
  <string name="revanced_alt_thumbnail_options_entry_3">DeArrow &amp; اللقطات الثابتة</string>
  <string name="revanced_alt_thumbnail_options_entry_4">اللقطات الثابتة</string>
-  <string name="revanced_alt_thumbnail_dearrow_about_summary">"يوفر DeArrow مصغرات فيديو من مصادر جماعية لفيديوهات YouTube. هذه المصغرات غالبا ما تكون أكثر صلة من تلك المقدمة من YouTube
+  <string name="revanced_alt_thumbnail_dearrow_about_summary">"يوفر DeArrow مصغرات فيديو من مصادر جماعية لفيديوهات YouTube. هذه المصغرات غالبًا ما تكون أكثر صلة من تلك المقدمة من YouTube

-إذا تم تفعيلها، سيتم إرسال روابط الفيديو إلى خادم API ولن يتم إرسال أي بيانات أخرى. إذا كان الفيديو لا يحتوي على مصغرات DArrow، سيتم عرض المقاطع الأصلية أو اللقطات الثابتة
+إذا تم تفعيلها، سيتم إرسال روابط الفيديو إلى خادم API ولن يتم إرسال أي بيانات أخرى. إذا كان الفيديو لا يحتوي على مصغرات DeArrow، سيتم عرض المقاطع الأصلية أو اللقطات الثابتة

-اضغط هنا لمعرفة المزيد عن DArrow"</string>
+اضغط هنا لمعرفة المزيد عن DeArrow"</string>
  <string name="revanced_alt_thumbnail_dearrow_connection_toast_title">عرض ملاحظة إذا كان API غير متاح</string>
  <string name="revanced_alt_thumbnail_dearrow_connection_toast_summary_on">يتم عرض ملاحظة إذا كان DeArrow غير متوفر</string>
  <string name="revanced_alt_thumbnail_dearrow_connection_toast_summary_off">لا يتم عرض ملاحظة إذا كان DeArrow غير متوفر</string>
@@ -1307,7 +1309,7 @@ Second \"item\" text"</string>
  <string name="revanced_force_original_audio_summary_on">استخدام لغة الصوت الأصلية</string>
  <string name="revanced_force_original_audio_summary_off">استخدام الصوت الافتراضي</string>
  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
-  <string name="revanced_force_original_audio_not_available">لاستخدام هذه الميزة، غيّر \"انتحال دفقات الفيديو\" إلى iOS TV</string>
+  <string name="revanced_force_original_audio_not_available">لاستخدام هذه الميزة، غيّر \'Spoof Video Streams\' إلى iOS TV</string>
  </patch>
  <patch id="video.quality.rememberVideoQualityPatch">
  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
@@ -1321,7 +1323,7 @@ Second \"item\" text"</string>
  <string name="revanced_remember_shorts_quality_last_selected_summary_on">تنطبق تغييرات الجودة على جميع فيديوهات Shorts</string>
  <string name="revanced_remember_shorts_quality_last_selected_summary_off">تنطبق تغييرات الجودة فقط على فيديو Short الحالي</string>
  <string name="revanced_shorts_quality_default_wifi_title">جودة Shorts الافتراضية على شبكة Wi-Fi</string>
-  <string name="revanced_shorts_quality_default_mobile_title">جودة Shorts الافتراضية على شبكة الجوال</string>
+  <string name="revanced_shorts_quality_default_mobile_title">جودة Shorts الافتراضية على شبكة الجوّال</string>
  <string name="revanced_remember_video_quality_mobile">الجوّال</string>
  <string name="revanced_remember_video_quality_wifi">Wi-Fi</string>
  <string name="revanced_remember_video_quality_toast">تم تغيير جودة %1$s الافتراضية إلى: %2$s</string>
@@ -1357,7 +1359,7 @@ Second \"item\" text"</string>
  <string name="revanced_disable_hdr_video_summary_off">تم تمكين فيديو HDR</string>
  </patch>
  <patch id="video.quality.advancedVideoQualityMenuPatch">
-  <string name="revanced_advanced_video_quality_menu_title">إظهار قائمة جودة الفيديو المتقدمة</string>
+  <string name="revanced_advanced_video_quality_menu_title">عرض قائمة جودة الفيديو المتقدمة</string>
  <string name="revanced_advanced_video_quality_menu_summary_on">يتم عرض قائمة جودة الفيديو المتقدمة</string>
  <string name="revanced_advanced_video_quality_menu_summary_off">لا يتم عرض قائمة جودة الفيديو المتقدمة</string>
  </patch>
@@ -1391,7 +1393,7 @@ AVC لديه حد أقصى للدقة 1080p، لا يتوفر ترميز الص
 • مستوى الصوت الثابت غير متاح
 • فرض الصوت الأصلي غير متوفر"</string>
  <string name="revanced_spoof_video_streams_about_no_av1">• لا يوجد ترميز الفيديو AV1</string>
-  <string name="revanced_spoof_video_streams_about_kids_videos">• الفيديوات العربية لا يمكن تشغيل أو في وضع التشغيل أو في حالة الخفية</string>
+  <string name="revanced_spoof_video_streams_about_kids_videos">• قد لا يتم تشغيل الفيديوهات المخصصة للأطفال عند تسجيل الخروج أو عند استخدام وضع التصفح المتخفي</string>
  <string name="revanced_spoof_streaming_data_stats_for_nerds_title">عرض في إحصاءات تقنية</string>
  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">يتم عرض نوع العميل في إحصاءات تقنية</string>
  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">تم إخفاء نوع العميل في إحصاءات تقنية</string>
--- a/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
@@ -226,6 +226,9 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
  <string name="revanced_hide_artist_cards_title">Sənətçi kartlarını gizlət</string>
  <string name="revanced_hide_artist_cards_summary_on">Sənətçi kartları gizlidir</string>
  <string name="revanced_hide_artist_cards_summary_off">Sənətçi kartları göstərilir</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_title">\"AI ilə yaradılan video xülasəsini\" gizlət</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">Video xülasə bölməsi gizlədilib</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">Video xülasə bölməsi göstərilir</string>
  <string name="revanced_hide_attributes_section_title">Atributları Gizlət</string>
  <string name="revanced_hide_attributes_section_summary_on">Seçilən yerlər, Oyunlar, Musiqi və qeyd edilən insanlar bölmələri gizlədilir</string>
  <string name="revanced_hide_attributes_section_summary_off">Seçilən yerlər, Oyunlar, Musiqi və qeyd edilən insanlar bölmələri görünür</string>
@@ -262,8 +265,12 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
  <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">Əlaqəli videolarda görünür</string>
  <string name="revanced_comments_screen_title">Şərhlər</string>
  <string name="revanced_comments_screen_summary">Şərhlər bölməsi elementlərin gizlət və ya göstər</string>
+  <string name="revanced_hide_comments_ai_chat_summary_title">AI Söhbət Xülasəsini Gizlət</string>
  <string name="revanced_hide_comments_ai_chat_summary_summary_on">Söhbət yekunu gizlidir </string>
  <string name="revanced_hide_comments_ai_chat_summary_summary_off">Söhbət yekunu görünür</string>
+  <string name="revanced_hide_comments_ai_summary_title">AI Ṣərhlər Xülasəsini Gizlət</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">Ṣərh yekunu gizlidir </string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">Şərh yekunu görünür</string>
  <string name="revanced_hide_comments_by_members_header_title">\'Üzvlərin şərhləri\' başlığını gizlət</string>
  <string name="revanced_hide_comments_by_members_header_summary_on">Üzvlərin şərhləri başlığı gizlidir</string>
  <string name="revanced_hide_comments_by_members_header_summary_off">Üzvlərin şərhləri başlığı görünür</string>
@@ -423,6 +430,9 @@ Bu xüsusiyyət yalnız köhnə cihazlar üçün mövcuddur"</string>
  <string name="revanced_disable_precise_seeking_gesture_summary_off">Jest aktivləşdirilib</string>
  </patch>
  <patch id="interaction.seekbar.enableSeekbarTappingPatch">
+  <string name="revanced_seekbar_tapping_title">Axtarmaq üçün toxun\'u aktivləşdir</string>
+  <string name="revanced_seekbar_tapping_summary_on">Axtarmaq üçün toxun, aktivdir</string>
+  <string name="revanced_seekbar_tapping_summary_off">Axtarmaq üçün toxun qapalıdır</string>
  </patch>
  <patch id="interaction.swipecontrols.swipeControlsResourcePatch">
  <string name="revanced_swipe_brightness_title">Parlaqlıq jestini aktivləşdir</string>
@@ -435,6 +445,9 @@ Ekranın sol tərəfində dikinə sürüşdürərək parlaqlığı tənzimləyin

 Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənzimlə"</string>
  <string name="revanced_swipe_volume_summary_off">Tam ekran səs sürüşdürməsi qapalıdır</string>
+  <string name="revanced_swipe_press_to_engage_title">Sürüşdürmə jesti üçün sıxmanı aktiv et</string>
+  <string name="revanced_swipe_press_to_engage_summary_on">Sürüşdürmə üçün sıxma aktivdir</string>
+  <string name="revanced_swipe_press_to_engage_summary_off">Sürüşdürmə üçün sıxma qapalıdır</string>
  <string name="revanced_swipe_haptic_feedback_title">Əks-əlaqə reaksiyasını aktivləşdir</string>
  <string name="revanced_swipe_haptic_feedback_summary_on">Əks-əlaqə reaksiyası aktivləşdirilib</string>
  <string name="revanced_swipe_haptic_feedback_summary_off">Əks-əlaqə reaksiyası qeyri-aktivdir</string>
@@ -542,6 +555,7 @@ Bu seçimi dəyişdirmə işə düşmürsə, Gizli rejimə keçməyə çalışı
  <string name="revanced_disable_translucent_status_bar_title">Yarımşəffaf mövqe cizgisin qapat</string>
  <string name="revanced_disable_translucent_status_bar_summary_on">Mövqe cizgisi qeyri-şəffafdır</string>
  <string name="revanced_disable_translucent_status_bar_summary_off">Mövqe cizgisi qeyri-şəffaf və ya şəffafdır</string>
+  <string name="revanced_disable_translucent_status_bar_user_dialog_message">Bəzi cihazlarda bu xüsusiyyət aktivləşməsi sistem fəaliyyət cərgəsini şəffaf-a dəyişə bilər.</string>
  <string name="revanced_disable_translucent_navigation_bar_light_title">Açıq temada şəffaf cizgini qapat</string>
  <string name="revanced_disable_translucent_navigation_bar_light_summary_on">İşıqlı rejim fəaliyyət cərgəsi qeyri-şəffafdır</string>
  <string name="revanced_disable_translucent_navigation_bar_light_summary_off">İşıqlı rejim fəaliyyət cərgəsi qeyri-şəffaf və ya şəffafdır</string>
@@ -1140,6 +1154,7 @@ Sonradan qapadılarsa, UI səhvlərin önləmək üçün tətbiq məlumatların
  <string name="revanced_miniplayer_type_entry_4">Müasir 1</string>
  <string name="revanced_miniplayer_type_entry_5">Müasir 2</string>
  <string name="revanced_miniplayer_type_entry_6">Müasir 3</string>
+  <string name="revanced_miniplayer_type_entry_7">Müasir 4</string>
  <string name="revanced_miniplayer_rounded_corners_title">Dairəvi küncləri aktivləşdir</string>
  <string name="revanced_miniplayer_rounded_corners_summary_on">Künclər dairəvidir</string>
  <string name="revanced_miniplayer_rounded_corners_summary_off">Künclər kvadratdır</string>
@@ -1159,14 +1174,14 @@ Kiçik oynadıcı ekranın istənilən küncünə sürüklənə bilər"</string>

 Kiçik oynadıcı ekrandan sola və ya sağa sürüklənə bilər"</string>
  <string name="revanced_miniplayer_horizontal_drag_summary_off">Üfüqi sürükləmə jesti qapatıldı</string>
-  <string name="revanced_miniplayer_hide_expand_close_title">\"Bağla\" düyməsini gizlət</string>
-  <string name="revanced_miniplayer_hide_expand_close_summary_on">\"Bağla\" düyməsi gizlidir</string>
-  <string name="revanced_miniplayer_hide_expand_close_summary_off">\"Bağla\" düyməsi göstərilir</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_title">Genişləndir və bağla düymələrini gizlət</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_summary_on">"Düymələr gizlidir
+  <string name="revanced_miniplayer_hide_overlay_buttons_title">Örtük düymələrini gizlət</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Örtük düymələri gizlidir</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Örtük düymələri görünür</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_title">Genişləndir və bağla düymələrini gizlət</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_on">"Düymələr gizlidir

 Genişləndirmək və ya bağlamaq üçün sürüşdür"</string>
-  <string name="revanced_miniplayer_hide_expand_close_legacy_summary_off">Genişləndir və bağla düymələri göstərilir</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_off">Genişləndir və bağla düymələri göstərilir</string>
  <string name="revanced_miniplayer_hide_subtext_title">Alt mətnləri gizlət</string>
  <string name="revanced_miniplayer_hide_subtext_summary_on">Alt mətnlər gizlədilir</string>
  <string name="revanced_miniplayer_hide_subtext_summary_off">Alt mətnlər göstərilir</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	0572d48fde	chore: Release v5.18.1-dev.2 [skip ci] ## [5.18.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.1-dev.1...v5.18.1-dev.2) (2025-04-01) ### Bug Fixes * YouTube: Combine multiple seekbar patches into a single patch ([#4705](https://github.com/ReVanced/revanced-patches/issues/4705)) ([`37984b8`](`37984b8b99`))	2025-04-01 19:00:31 +00:00
LisoUseInAIKyrios	37984b8b99	fix(YouTube): Combine multiple seekbar patches into a single patch (#4705 )	2025-04-01 20:57:03 +02:00
github-actions[bot]	6e63193f06	chore: Sync translations (#4713 )	2025-04-01 20:51:16 +02:00
LisoUseInAIKyrios	b2384b22a5	refactor: Add more opcodes to findFreeRegister	2025-04-01 20:17:00 +02:00
semantic-release-bot	ccb76983ff	chore: Release v5.18.1-dev.1 [skip ci] ## [5.18.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.18.0...v5.18.1-dev.1) (2025-03-31) ### Bug Fixes * YouTube - Remove background playback restrictions: Do not show media controls when playing Shorts from the feed ([`318b55b`](`318b55b8fe`))	2025-03-31 13:45:18 +00:00
LisoUseInAIKyrios	318b55b8fe	fix(YouTube - Remove background playback restrictions): Do not show media controls when playing Shorts from the feed	2025-03-31 15:36:01 +02:00
github-actions[bot]	49ade9efbc	chore: Sync translations (#4703 )	2025-03-31 15:35:28 +02:00
LisoUseInAIKyrios	d77515bd68	refactor: Add helper method to find a free register for a specific insert index (#4693 )	2025-03-30 18:37:54 +02:00
semantic-release-bot	087bf1e152	chore: Release v5.18.0 [skip ci] # [5.18.0](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0) (2025-03-28) ### Bug Fixes * Spotify: Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([`84f5854`](`84f585492e`)) ### Features * YouTube: Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([`842ba4f`](`842ba4fc4d`))	2025-03-28 18:51:44 +00:00
LisoUseInAIKyrios	c2994d583d	chore: Merge branch `dev` to `main` (#4686 )	2025-03-28 19:48:32 +01:00
semantic-release-bot	127b0a63fe	chore: Release v5.18.0-dev.2 [skip ci] # [5.18.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.0-dev.1...v5.18.0-dev.2) (2025-03-28) ### Bug Fixes * Spotify: Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([`84f5854`](`84f585492e`))	2025-03-28 18:36:38 +00:00
github-actions[bot]	27aafd0ee1	chore: Sync translations (#4689 )	2025-03-28 19:31:52 +01:00
semantic-release-bot	49c54c0e54	chore: Release v5.18.0-dev.1 [skip ci] # [5.18.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0-dev.1) (2025-03-28) ### Features * YouTube: Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([`842ba4f`](`842ba4fc4d`))	2025-03-28 17:01:42 +00:00
LisoUseInAIKyrios	842ba4fc4d	feat(YouTube): Support version `20.07.39` (#4677 )	2025-03-28 17:49:12 +01:00
semantic-release-bot	66ecadce4f	chore: Release v5.17.0 [skip ci] # [5.17.0](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.17.0) (2025-03-28) ### Bug Fixes * Facebook - Hide 'Sponsored Stories': Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([`4d910fe`](`4d910fea93`)) * Spotify - Unlock Premium: Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([`ca4f960`](`ca4f960171`)) * Spotify - Unlock Premium: Use correct patch description convention ([`a486522`](`a4865228f8`)) * X / Twitter: Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([`497291c`](`497291c478`)) * YouTube - Navigation buttons: Add user dialog message to 'Disable translucent status bar' ([`bf91e12`](`bf91e127d8`)) ### Features * Spotify - Unlock Premium: Disable the "Spotify Premium" upsell experiment in context menus ([`c84be12`](`c84be120bd`))	2025-03-28 16:39:31 +00:00
LisoUseInAIKyrios	73ca04da5e	chore: Merge branch `dev` to `main` (#4658 )	2025-03-28 17:36:31 +01:00
semantic-release-bot	a5d26208c1	chore: Release v5.17.0-dev.4 [skip ci] # [5.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.3...v5.17.0-dev.4) (2025-03-28) ### Bug Fixes * X / Twitter: Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([`497291c`](`497291c478`))	2025-03-28 16:14:49 +00:00
LisoUseInAIKyrios	497291c478	fix(X / Twitter): Constrain patches to latest compatible versions (#4683 )	2025-03-28 17:11:30 +01:00
github-actions[bot]	b24278a544	chore: Sync translations (#4680 )	2025-03-28 15:03:07 +01:00
semantic-release-bot	135f9ead3c	chore: Release v5.17.0-dev.3 [skip ci] # [5.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.2...v5.17.0-dev.3) (2025-03-28) ### Bug Fixes * Spotify - Unlock Premium: Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([`ca4f960`](`ca4f960171`))	2025-03-28 10:55:04 +00:00
xC3FFF0E	ca4f960171	fix(Spotify - Unlock Premium): Override additional attributes (#4651 ) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>	2025-03-28 11:52:23 +01:00
semantic-release-bot	7f228cc535	chore: Release v5.17.0-dev.2 [skip ci] # [5.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.1...v5.17.0-dev.2) (2025-03-27) ### Bug Fixes * YouTube - Navigation buttons: Add user dialog message to 'Disable translucent status bar' ([`bf91e12`](`bf91e127d8`))	2025-03-27 19:23:17 +00:00
LisoUseInAIKyrios	bf91e127d8	fix(YouTube - Navigation buttons): Add user dialog message to 'Disable translucent status bar'	2025-03-27 20:20:05 +01:00
semantic-release-bot	f07fc1ad93	chore: Release v5.17.0-dev.1 [skip ci] # [5.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.2-dev.1...v5.17.0-dev.1) (2025-03-27) ### Bug Fixes * Spotify - Unlock Premium: Use correct patch description convention ([`a486522`](`a4865228f8`)) ### Features * Spotify - Unlock Premium: Disable the "Spotify Premium" upsell experiment in context menus ([`c84be12`](`c84be120bd`))	2025-03-27 00:48:00 +00:00
oSumAtrIX	c84be120bd	feat(Spotify - Unlock Premium): Disable the "Spotify Premium" upsell experiment in context menus	2025-03-27 01:40:54 +01:00