chore: Release v5.8.0-dev.3 [skip ci]

# [5.8.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.2...v5.8.0-dev.3) (2024-12-26) ### Bug Fixes * **YouTube - Force original audio:** If stream spoofing to Android then show a summary text why force audio is not available ([#4220](https://github.com/ReVanced/revanced-patches/issues/4220)) ([4de768f](4de768febf))
fix(YouTube - Force original audio): If stream spoofing to Android then show a summary text why force audio is not available (#4220 )
2025-12-11 11:53:55 +01:00 · 2024-12-26 10:02:26 +00:00 · 2024-12-26 13:58:29 +04:00 · 2024-12-26 13:58:13 +04:00 · 2024-12-25 04:59:12 +04:00 · 2024-12-24 22:11:57 +00:00
176 changed files with 3927 additions and 2220 deletions
--- a/.github/workflows/pull_strings.yml
+++ b/.github/workflows/pull_strings.yml
@@ -23,6 +23,7 @@ jobs:
        uses: crowdin/github-action@v2
        with:
          config: crowdin.yml
+          upload_sources: false
          download_translations: true
          localization_branch_name: feat/translations
          create_pull_request: false
@@ -39,4 +40,3 @@ jobs:
          destination_branch: dev
          pr_title: "chore: Sync translations"
          pr_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"
-          pr_draft: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,203 @@
+# [5.8.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.2...v5.8.0-dev.3) (2024-12-26)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** If stream spoofing to Android then show a summary text why force audio is not available ([#4220](https://github.com/ReVanced/revanced-patches/issues/4220)) ([029aee8](https://github.com/ReVanced/revanced-patches/commit/029aee8023f096413fc80a2c583b4fe55ecb10ac))
+
+# [5.8.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.1...v5.8.0-dev.2) (2024-12-24)
+
+
+### Features
+
+* **YouTube - Spoof app version:** Add 'Restore old navigation and toolbar icons' ([f84e459](https://github.com/ReVanced/revanced-patches/commit/f84e459d3d54b3001586796ab4e114ebadf09043))
+
+# [5.8.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.2...v5.8.0-dev.1) (2024-12-24)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add option to hide Shorts in watch history ([#4214](https://github.com/ReVanced/revanced-patches/issues/4214)) ([19c2742](https://github.com/ReVanced/revanced-patches/commit/19c2742aa367367c77bb50ddad6f8a20fef8ea0a))
+
+## [5.7.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2) (2024-12-24)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Don't hide Shorts channel bar when toggling for video player ([9af6412](https://github.com/ReVanced/revanced-patches/commit/9af6412d92ec31e612eaabba6578453da0fc61d6))
+* **YouTube - Spoof video streams:** Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([ab29f80](https://github.com/ReVanced/revanced-patches/commit/ab29f808a9f55b5ab0055533c1a6de549b0631a6))
+
+## [5.7.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.2-dev.1...v5.7.2-dev.2) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Don't hide Shorts channel bar when toggling for video player ([9af6412](https://github.com/ReVanced/revanced-patches/commit/9af6412d92ec31e612eaabba6578453da0fc61d6))
+
+## [5.7.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2-dev.1) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([ab29f80](https://github.com/ReVanced/revanced-patches/commit/ab29f808a9f55b5ab0055533c1a6de549b0631a6))
+
+## [5.7.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.0...v5.7.1) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show a toast and not a dialog if segment submitted successfully ([134b189](https://github.com/ReVanced/revanced-patches/commit/134b189791113dcf1a1cb7c87b8a0954f432730c))
+* **YouTube - Spoof video streams:** Use 2 letter device language code ([33ff997](https://github.com/ReVanced/revanced-patches/commit/33ff9972000581aca92262f984efb114eeeb9537))
+* **YouTube - Spoof video streams:** Use Android VR authentication if using default audio language ([#4191](https://github.com/ReVanced/revanced-patches/issues/4191)) ([98773cc](https://github.com/ReVanced/revanced-patches/commit/98773cc7d46e5c9c7715b82c8006f1ccbcc5443c))
+* **YouTube - Theme:** Use dark theme color for status and navigation bar ([0240efe](https://github.com/ReVanced/revanced-patches/commit/0240efe33e5444625ca2b760c861c9046d3dc836))
+* **YouTube:** Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([dda788c](https://github.com/ReVanced/revanced-patches/commit/dda788c58c789d4f91646ea8e8a8077f590ab6b3))
+
+## [5.7.1-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.4...v5.7.1-dev.5) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Use 2 letter device language code ([33ff997](https://github.com/ReVanced/revanced-patches/commit/33ff9972000581aca92262f984efb114eeeb9537))
+
+## [5.7.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.3...v5.7.1-dev.4) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([dda788c](https://github.com/ReVanced/revanced-patches/commit/dda788c58c789d4f91646ea8e8a8077f590ab6b3))
+
+## [5.7.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.2...v5.7.1-dev.3) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show a toast and not a dialog if segment submitted successfully ([134b189](https://github.com/ReVanced/revanced-patches/commit/134b189791113dcf1a1cb7c87b8a0954f432730c))
+
+## [5.7.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.1...v5.7.1-dev.2) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** Use dark theme color for status and navigation bar ([0240efe](https://github.com/ReVanced/revanced-patches/commit/0240efe33e5444625ca2b760c861c9046d3dc836))
+
+## [5.7.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.0...v5.7.1-dev.1) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Use Android VR authentication if using default audio language ([#4191](https://github.com/ReVanced/revanced-patches/issues/4191)) ([98773cc](https://github.com/ReVanced/revanced-patches/commit/98773cc7d46e5c9c7715b82c8006f1ccbcc5443c))
+
+# [5.7.0](https://github.com/ReVanced/revanced-patches/compare/v5.6.0...v5.7.0) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Use correct availability for settings UI ([a7eedcb](https://github.com/ReVanced/revanced-patches/commit/a7eedcb4cca6b7b12629c478c24c0899c80e3615))
+* **YouTube - Spoof video stream:** Remove UI client type setting.  Allow setting default audio language. ([#4184](https://github.com/ReVanced/revanced-patches/issues/4184)) ([99f3f29](https://github.com/ReVanced/revanced-patches/commit/99f3f29c649bf7693c05bbce2bb49bd53e05f050))
+* **YouTube - Spoof video streams:** Remove iOS, add clients Android TV and Android Creator ([#4180](https://github.com/ReVanced/revanced-patches/issues/4180)) ([86abfb2](https://github.com/ReVanced/revanced-patches/commit/86abfb2b0d4675f0a1cb9ab244783075bfe89281))
+* **YouTube:** Change fingerprints to support a wider range of target versions ([8a09174](https://github.com/ReVanced/revanced-patches/commit/8a09174def205a26ce49cb7815097e235069526a))
+
+
+### Features
+
+* **YouTube:** Support version `19.47.53` ([#4182](https://github.com/ReVanced/revanced-patches/issues/4182)) ([2089e61](https://github.com/ReVanced/revanced-patches/commit/2089e613d36c45352db7d852aaee0087b1c3e1a4))
+
+# [5.7.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.4...v5.7.0-dev.1) (2024-12-21)
+
+
+### Features
+
+* **YouTube:** Support version `19.47.53` ([#4182](https://github.com/ReVanced/revanced-patches/issues/4182)) ([2089e61](https://github.com/ReVanced/revanced-patches/commit/2089e613d36c45352db7d852aaee0087b1c3e1a4))
+
+## [5.6.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.3...v5.6.1-dev.4) (2024-12-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video stream:** Remove UI client type setting.  Allow setting default audio language. ([#4184](https://github.com/ReVanced/revanced-patches/issues/4184)) ([99f3f29](https://github.com/ReVanced/revanced-patches/commit/99f3f29c649bf7693c05bbce2bb49bd53e05f050))
+
+## [5.6.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.2...v5.6.1-dev.3) (2024-12-21)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Use correct availability for settings UI ([a7eedcb](https://github.com/ReVanced/revanced-patches/commit/a7eedcb4cca6b7b12629c478c24c0899c80e3615))
+
+## [5.6.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.1...v5.6.1-dev.2) (2024-12-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Remove iOS, add clients Android TV and Android Creator ([#4180](https://github.com/ReVanced/revanced-patches/issues/4180)) ([86abfb2](https://github.com/ReVanced/revanced-patches/commit/86abfb2b0d4675f0a1cb9ab244783075bfe89281))
+
+## [5.6.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.6.0...v5.6.1-dev.1) (2024-12-21)
+
+
+### Bug Fixes
+
+* **YouTube:** Change fingerprints to support a wider range of target versions ([8a09174](https://github.com/ReVanced/revanced-patches/commit/8a09174def205a26ce49cb7815097e235069526a))
+
+# [5.6.0](https://github.com/ReVanced/revanced-patches/compare/v5.5.1...v5.6.0) (2024-12-20)
+
+
+### Bug Fixes
+
+* **Twitter - Change link sharing domain:** Use correct extension package ([ad7fab6](https://github.com/ReVanced/revanced-patches/commit/ad7fab67319ba23f267d27da9b74266965fc4be3))
+* **YouTube - Force original audio:** Use correct original audio stream if app language is not English ([0d20171](https://github.com/ReVanced/revanced-patches/commit/0d2017133efac230887b5c2a331d87159df8af11))
+* **YouTube - Hide layout components:** Hide new kind of community post ([#4155](https://github.com/ReVanced/revanced-patches/issues/4155)) ([08f68cb](https://github.com/ReVanced/revanced-patches/commit/08f68cb5d33f2cfe656d2f93d159c69981f31418))
+* **YouTube - Miniplayer:** Use estimated maximum on screen size for devices with low density screens ([#4150](https://github.com/ReVanced/revanced-patches/issues/4150)) ([2694158](https://github.com/ReVanced/revanced-patches/commit/2694158c3c9935ede21c96832533222f850068df))
+* **YouTube - Open Shorts in regular player:** Do not show the miniplayer after opening a Short while a video is playing ([894e366](https://github.com/ReVanced/revanced-patches/commit/894e36665d17d5a3a5728961d424dffc55faa50b))
+* **YouTube - SponsorBlock:** Show create new segment error messages using a dialog ([#4148](https://github.com/ReVanced/revanced-patches/issues/4148)) ([5870906](https://github.com/ReVanced/revanced-patches/commit/587090636dfff0b358b15026cf7d47c65a4296dc))
+* **YouTube - Spoof video streams:** Change default spoofing to iOS, allow setting a default language with Android VR ([#4171](https://github.com/ReVanced/revanced-patches/issues/4171)) ([171b4e7](https://github.com/ReVanced/revanced-patches/commit/171b4e7e40066e38fba773b7a6525e9a038779ef))
+* **YouTube - Spoof video streams:** Update iOS client version ([df3aeed](https://github.com/ReVanced/revanced-patches/commit/df3aeed3b173e408fad80197a89ec5d003a2b328))
+
+
+### Features
+
+* **YouTube:** Add `Open Shorts in regular player` patch ([#4153](https://github.com/ReVanced/revanced-patches/issues/4153)) ([c7c5e5b](https://github.com/ReVanced/revanced-patches/commit/c7c5e5b2b9cf63d8225bb6bd5e735ddf945b6c29))
+
+# [5.6.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.5...v5.6.0-dev.6) (2024-12-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Update iOS client version ([df3aeed](https://github.com/ReVanced/revanced-patches/commit/df3aeed3b173e408fad80197a89ec5d003a2b328))
+
+# [5.6.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.4...v5.6.0-dev.5) (2024-12-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Change default spoofing to iOS, allow setting a default language with Android VR ([#4171](https://github.com/ReVanced/revanced-patches/issues/4171)) ([171b4e7](https://github.com/ReVanced/revanced-patches/commit/171b4e7e40066e38fba773b7a6525e9a038779ef))
+
+# [5.6.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.3...v5.6.0-dev.4) (2024-12-20)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Use correct original audio stream if app language is not English ([0d20171](https://github.com/ReVanced/revanced-patches/commit/0d2017133efac230887b5c2a331d87159df8af11))
+
+# [5.6.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.2...v5.6.0-dev.3) (2024-12-20)
+
+
+### Bug Fixes
+
+* **Twitter - Change link sharing domain:** Use correct extension package ([ad7fab6](https://github.com/ReVanced/revanced-patches/commit/ad7fab67319ba23f267d27da9b74266965fc4be3))
+
+# [5.6.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.1...v5.6.0-dev.2) (2024-12-19)
+
+
+### Bug Fixes
+
+* **YouTube - Open Shorts in regular player:** Do not show the miniplayer after opening a Short while a video is playing ([894e366](https://github.com/ReVanced/revanced-patches/commit/894e36665d17d5a3a5728961d424dffc55faa50b))
+
+# [5.6.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.5.2-dev.2...v5.6.0-dev.1) (2024-12-19)
+
+
+### Features
+
+* **YouTube:** Add `Open Shorts in regular player` patch ([#4153](https://github.com/ReVanced/revanced-patches/issues/4153)) ([c7c5e5b](https://github.com/ReVanced/revanced-patches/commit/c7c5e5b2b9cf63d8225bb6bd5e735ddf945b6c29))
+
 ## [5.5.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.5.2-dev.1...v5.5.2-dev.2) (2024-12-17)


--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
@@ -3,6 +3,7 @@ package app.revanced.extension.shared.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.parent;
+import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.AudioStreamLanguageOverrideAvailability;
 import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.SpoofiOSAvailability;

 import app.revanced.extension.shared.spoof.AudioStreamLanguage;
@@ -22,9 +23,11 @@ public class BaseSettings {
    public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false);

    public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
-    public static final EnumSetting<AudioStreamLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AudioStreamLanguage.DEFAULT, new SpoofiOSAvailability());
+    public static final EnumSetting<AudioStreamLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AudioStreamLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
+    public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
    public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
-    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS));
+    // Client type must be last spoof setting due to cyclic references.
+    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS));

 }
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/AudioStreamLanguage.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/AudioStreamLanguage.java
@@ -4,14 +4,12 @@ import java.util.Locale;

 public enum AudioStreamLanguage {
    /**
-     * YouTube default.
-     * Can be the original language or can be app language,
-     * depending on what YouTube decides to pick as the default.
+     * The current app language.
     */
    DEFAULT,

    // Language codes found in locale_config.xml
-    // Region specific variants of Chinese/English/Spanish/French have been removed.
+    // All region specific variants have been removed.
    AF,
    AM,
    AR,
@@ -65,8 +63,7 @@ public enum AudioStreamLanguage {
    OR,
    PA,
    PL,
-    PT_BR,
-    PT_PT,
+    PT,
    RO,
    RU,
    SI,
@@ -88,26 +85,22 @@ public enum AudioStreamLanguage {
    ZH,
    ZU;

-    private final String iso639_1;
+    private final String language;

    AudioStreamLanguage() {
-        String name = name();
-        final int regionSeparatorIndex = name.indexOf('_');
-        if (regionSeparatorIndex >= 0) {
-            iso639_1 = name.substring(0, regionSeparatorIndex).toLowerCase(Locale.US)
-                    + name.substring(regionSeparatorIndex);
-        } else {
-            iso639_1 = name().toLowerCase(Locale.US);
-        }
+        language = name().toLowerCase(Locale.US);
    }

-    public String getIso639_1() {
+    /**
+     * @return The 2 letter ISO 639_1 language code.
+     */
+    public String getLanguage() {
        // Changing the app language does not force the app to completely restart,
        // so the default needs to be the current language and not a static field.
        if (this == DEFAULT) {
-            return Locale.getDefault().toLanguageTag();
+            return Locale.getDefault().getLanguage();
        }

-        return iso639_1;
+        return language;
    }
 }
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
@@ -7,40 +7,64 @@ import androidx.annotation.Nullable;
 import app.revanced.extension.shared.settings.BaseSettings;

 public enum ClientType {
-    // Specific purpose for age restricted, or private videos, because the iOS client is not logged in.
    // https://dumps.tadiphone.dev/dumps/oculus/eureka
-    ANDROID_VR(28,
+    ANDROID_VR_NO_AUTH(
+            28,
            "ANDROID_VR",
            "Quest 3",
            "12",
            "com.google.android.apps.youtube.vr.oculus/1.56.21 (Linux; U; Android 12; GB) gzip",
            "32", // Android 12.1
            "1.56.21",
+            false,
+            "Android VR No auth"
+    ),
+    ANDROID_UNPLUGGED(
+            29,
+            "ANDROID_UNPLUGGED",
+            "Google TV Streamer",
+            "14",
+            "com.google.android.apps.youtube.unplugged/8.49.0 (Linux; U; Android 14; GB) gzip",
+            "34",
+            "8.49.0",
            true,
-            false),
-    // Specific for kids videos.
-    IOS(5,
-            "IOS",
+            "Android TV"
+    ),
+    ANDROID_VR(
+            ANDROID_VR_NO_AUTH.id,
+            ANDROID_VR_NO_AUTH.clientName,
+            ANDROID_VR_NO_AUTH.deviceModel,
+            ANDROID_VR_NO_AUTH.osVersion,
+            ANDROID_VR_NO_AUTH.userAgent,
+            ANDROID_VR_NO_AUTH.androidSdkVersion,
+            ANDROID_VR_NO_AUTH.clientVersion,
+            true,
+            "Android VR"
+    ),
+    IOS_UNPLUGGED(33,
+            "IOS_UNPLUGGED",
            forceAVC()
                    ? "iPhone12,5"  // 11 Pro Max (last device with iOS 13)
                    : "iPhone16,2", // 15 Pro Max
-            // iOS 13 and earlier uses only AVC.  14+ adds VP9 and AV1.
+            // iOS 13 and earlier uses only AVC. 14+ adds VP9 and AV1.
            forceAVC()
                    ? "13.7.17H35" // Last release of iOS 13.
-                    : "17.5.1.21F90",
+                    : "18.1.1.22B91",
            forceAVC()
-                    ? "com.google.ios.youtube/17.40.5 (iPhone; U; CPU iOS 13_7 like Mac OS X)"
-                    : "com.google.ios.youtube/19.47.7 (iPhone; U; CPU iOS 17_5_1 like Mac OS X)",
+                    ? "com.google.ios.youtubeunplugged/6.45 (iPhone; U; CPU iOS 13_7 like Mac OS X)"
+                    : "com.google.ios.youtubeunplugged/8.33 (iPhone; U; CPU iOS 18_1_1 like Mac OS X)",
            null,
            // Version number should be a valid iOS release.
-            // https://www.ipa4fun.com/history/185230
+            // https://www.ipa4fun.com/history/152043/
+            // Some newer versions can also force AVC,
+            // but 6.45 is the last version that supports iOS 13.
            forceAVC()
-                    // Some newer versions can also force AVC,
-                    // but 17.40 is the last version that supports iOS 13.
-                    ? "17.40.5"
-                    : "19.47.7",
-            false,
-            true
+                    ? "6.45"
+                    : "8.33",
+            true,
+            forceAVC()
+                    ? "iOS TV Force AVC"
+                    : "iOS TV"
    );

    private static boolean forceAVC() {
@@ -88,9 +112,9 @@ public enum ClientType {
    public final boolean canLogin;

    /**
-     * If a language code should be used.
+     * Friendly name displayed in stats for nerds.
     */
-    public final boolean useLanguageCode;
+    public final String friendlyName;

    ClientType(int id,
               String clientName,
@@ -100,7 +124,7 @@ public enum ClientType {
               @Nullable String androidSdkVersion,
               String clientVersion,
               boolean canLogin,
-               boolean useLanguageCode) {
+               String friendlyName) {
        this.id = id;
        this.clientName = clientName;
        this.deviceModel = deviceModel;
@@ -109,6 +133,7 @@ public enum ClientType {
        this.androidSdkVersion = androidSdkVersion;
        this.clientVersion = clientVersion;
        this.canLogin = canLogin;
-        this.useLanguageCode = useLanguageCode;
+        this.friendlyName = friendlyName;
    }
+
 }
--- 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
@@ -1,6 +1,7 @@
 package app.revanced.extension.shared.spoof;

 import android.net.Uri;
+import android.text.TextUtils;

 import androidx.annotation.Nullable;

@@ -18,7 +19,7 @@ public class SpoofVideoStreamsPatch {
    private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();

    private static final boolean FIX_HLS_CURRENT_TIME = SPOOF_STREAMING_DATA
-            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
+            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;

    /**
     * Any unreachable ip address.  Used to intentionally fail requests.
@@ -26,6 +27,19 @@ public class SpoofVideoStreamsPatch {
    private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
    private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);

+    /**
+     * @return If this patch was included during patching.
+     */
+    private static boolean isPatchIncluded() {
+        return false; // Modified during patching.
+    }
+
+    public static boolean notSpoofingToAndroid() {
+        return !isPatchIncluded()
+                || !BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+    }
+
    /**
     * Injection point.
     * Blocks /get_watch requests by returning an unreachable URI.
@@ -82,6 +96,17 @@ public class SpoofVideoStreamsPatch {
        return SPOOF_STREAMING_DATA;
    }

+    /**
+     * Injection point.
+     * Only invoked when playing a livestream on an iOS client.
+     */
+    public static boolean fixHLSCurrentTime(boolean original) {
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
    /**
     * Injection point.
     */
@@ -171,22 +196,35 @@ public class SpoofVideoStreamsPatch {

    /**
     * Injection point.
-     *
-     * Fixes iOS livestreams starting from the beginning.
     */
-    public static boolean fixHLSCurrentTime(boolean original) {
-        if (FIX_HLS_CURRENT_TIME) {
-            return false;
+    public static String appendSpoofedClient(String videoFormat) {
+        try {
+            if (SPOOF_STREAMING_DATA && BaseSettings.SPOOF_STREAMING_DATA_STATS_FOR_NERDS.get()
+                    && !TextUtils.isEmpty(videoFormat)) {
+                // Force LTR layout, to match the same LTR video time/length layout YouTube uses for all languages.
+                return "\u202D" + videoFormat + "\u2009(" // u202D = left to right override
+                        + StreamingDataRequest.getLastSpoofedClientName() + ")";
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "appendSpoofedClient failure", ex);
        }

-        return original;
+        return videoFormat;
+    }
+
+    public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return !BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                    || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_VR_NO_AUTH;
+        }
    }

    public static final class SpoofiOSAvailability implements Setting.Availability {
        @Override
        public boolean isAvailable() {
            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
+                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
        }
    }
 }
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
@@ -10,6 +10,7 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
 import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.spoof.AudioStreamLanguage;
 import app.revanced.extension.shared.spoof.ClientType;

 final class PlayerRoutes {
@@ -36,10 +37,17 @@ final class PlayerRoutes {
        try {
            JSONObject context = new JSONObject();

+            // Can override default language only if no login is used.
+            // Could use preferred audio for all clients that do not login,
+            // but if this is a fall over client it will set the language even though
+            // the audio language is not selectable in the UI.
+            ClientType userSelectedClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+            AudioStreamLanguage language = userSelectedClient == ClientType.ANDROID_VR_NO_AUTH
+                    ? BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get()
+                    : AudioStreamLanguage.DEFAULT;
+
            JSONObject client = new JSONObject();
-            if (clientType.useLanguageCode) {
-                client.put("hl", BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getIso639_1());
-            }
+            client.put("hl", language.getLanguage());
            client.put("clientName", clientType.clientName);
            client.put("clientVersion", clientType.clientVersion);
            client.put("deviceModel", clientType.deviceModel);
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java
@@ -36,20 +36,40 @@ import app.revanced.extension.shared.spoof.ClientType;
 public class StreamingDataRequest {

    private static final ClientType[] CLIENT_ORDER_TO_USE;
+
+    static {
+        ClientType[] allClientTypes = ClientType.values();
+        ClientType preferredClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+
+        CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
+        CLIENT_ORDER_TO_USE[0] = preferredClient;
+
+        int i = 1;
+        for (ClientType c : allClientTypes) {
+            if (c != preferredClient) {
+                CLIENT_ORDER_TO_USE[i++] = c;
+            }
+        }
+    }
+
    private static final String AUTHORIZATION_HEADER = "Authorization";
+
    private static final String[] REQUEST_HEADER_KEYS = {
            AUTHORIZATION_HEADER, // Available only to logged-in users.
            "X-GOOG-API-FORMAT-VERSION",
            "X-Goog-Visitor-Id"
    };
+
    /**
     * TCP connection and HTTP read timeout.
     */
    private static final int HTTP_TIMEOUT_MILLISECONDS = 10 * 1000;
+
    /**
     * Any arbitrarily large value, but must be at least twice {@link #HTTP_TIMEOUT_MILLISECONDS}
     */
    private static final int MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000;
+
    private static final Map<String, StreamingDataRequest> cache = Collections.synchronizedMap(
            new LinkedHashMap<>(100) {
                /**
@@ -67,22 +87,15 @@ public class StreamingDataRequest {
                }
            });

-    static {
-        ClientType[] allClientTypes = ClientType.values();
-        ClientType preferredClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+    private static volatile ClientType lastSpoofedClientType;

-        CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
-        CLIENT_ORDER_TO_USE[0] = preferredClient;
-
-        int i = 1;
-        for (ClientType c : allClientTypes) {
-            if (c != preferredClient) {
-                CLIENT_ORDER_TO_USE[i++] = c;
-            }
-        }
+    public static String getLastSpoofedClientName() {
+        ClientType client = lastSpoofedClientType;
+        return client == null ? "Unknown" : client.friendlyName;
    }

    private final String videoId;
+
    private final Future<ByteBuffer> future;

    private StreamingDataRequest(String videoId, Map<String, String> playerHeaders) {
@@ -169,7 +182,7 @@ public class StreamingDataRequest {
        // Retry with different client if empty response body is received.
        int i = 0;
        for (ClientType clientType : CLIENT_ORDER_TO_USE) {
-            // Show an error if the last client type fails, or if the debug is enabled then show for all attempts.
+            // Show an error if the last client type fails, or if debug is enabled then show for all attempts.
            final boolean showErrorToast = (++i == CLIENT_ORDER_TO_USE.length) || debugEnabled;

            HttpURLConnection connection = send(clientType, videoId, playerHeaders, showErrorToast);
@@ -178,7 +191,9 @@ public class StreamingDataRequest {
                    // gzip encoding doesn't response with content length (-1),
                    // but empty response body does.
                    if (connection.getContentLength() == 0) {
-                        Logger.printDebug(() -> "Received empty response for video: " + videoId);
+                        if (BaseSettings.DEBUG.get()) {
+                            Logger.printException(() -> "Ignoring empty client: " + clientType);
+                        }
                    } else {
                        try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());
                             ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
@@ -188,6 +203,7 @@ public class StreamingDataRequest {
                            while ((bytesRead = inputStream.read(buffer)) >= 0) {
                                baos.write(buffer, 0, bytesRead);
                            }
+                            lastSpoofedClientType = clientType;

                            return ByteBuffer.wrap(baos.toByteArray());
                        }
@@ -198,7 +214,8 @@ public class StreamingDataRequest {
            }
        }

-        handleConnectionError("Could not fetch any client streams", null, debugEnabled);
+        lastSpoofedClientType = null;
+        handleConnectionError("Could not fetch any client streams", null, true);
        return null;
    }

--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixPlaybackSpeedWhilePlayingPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixPlaybackSpeedWhilePlayingPatch.java
@@ -0,0 +1,24 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.youtube.shared.PlayerType;
+
+@SuppressWarnings("unused")
+public class FixPlaybackSpeedWhilePlayingPatch {
+
+    private static final float DEFAULT_YOUTUBE_PLAYBACK_SPEED = 1.0f;
+
+    public static boolean playbackSpeedChanged(float playbackSpeed) {
+        if (playbackSpeed == DEFAULT_YOUTUBE_PLAYBACK_SPEED &&
+                PlayerType.getCurrent().isMaximizedOrFullscreen()) {
+
+            Logger.printDebug(() -> "Blocking call to change playback speed to 1.0x");
+
+            return true;
+        }
+
+        return false;
+    }
+
+}
+
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ForceOriginalAudioPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ForceOriginalAudioPatch.java
@@ -1,12 +1,28 @@
 package app.revanced.extension.youtube.patches;

 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;

@SuppressWarnings("unused")
 public class ForceOriginalAudioPatch {

-    private static final String DEFAULT_AUDIO_TRACKS_IDENTIFIER = "original";
+    private static final String DEFAULT_AUDIO_TRACKS_SUFFIX = ".4";
+
+    /**
+     * If the conditions to use this patch were present when the app launched.
+     */
+    public static boolean PATCH_AVAILABLE = SpoofVideoStreamsPatch.notSpoofingToAndroid();
+
+    public static final class ForceOriginalAudioAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            // Check conditions of launch and now. Otherwise if spoofing is changed
+            // without a restart the setting will show as available when it's not.
+            return PATCH_AVAILABLE && SpoofVideoStreamsPatch.notSpoofingToAndroid();
+        }
+    }

    /**
     * Injection point.
@@ -17,7 +33,7 @@ public class ForceOriginalAudioPatch {
                return isDefault;
            }

-            if (audioTrackDisplayName.isEmpty()) {
+            if (audioTrackId.isEmpty()) {
                // Older app targets can have empty audio tracks and these might be placeholders.
                // The real audio tracks are called after these.
                return isDefault;
@@ -26,7 +42,7 @@ public class ForceOriginalAudioPatch {
            Logger.printDebug(() -> "default: " + String.format("%-5s", isDefault) + " id: "
                    + String.format("%-8s", audioTrackId) + " name:" + audioTrackDisplayName);

-            final boolean isOriginal = audioTrackDisplayName.contains(DEFAULT_AUDIO_TRACKS_IDENTIFIER);
+            final boolean isOriginal = audioTrackId.endsWith(DEFAULT_AUDIO_TRACKS_SUFFIX);
            if (isOriginal) {
                Logger.printDebug(() -> "Using audio: " + audioTrackId);
            }
@@ -34,8 +50,8 @@ public class ForceOriginalAudioPatch {
            return isOriginal;
        } catch (Exception ex) {
            Logger.printException(() -> "isDefaultAudioStream failure", ex);
-        }

-        return isDefault;
+            return isDefault;
+        }
    }
 }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java
@@ -0,0 +1,95 @@
+package app.revanced.extension.youtube.patches;
+
+import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+
+import java.lang.ref.WeakReference;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class OpenShortsInRegularPlayerPatch {
+
+    public enum ShortsPlayerType {
+        SHORTS_PLAYER,
+        REGULAR_PLAYER,
+        REGULAR_PLAYER_FULLSCREEN
+    }
+
+    static {
+        if (!VersionCheckPatch.IS_19_46_OR_GREATER
+                && Settings.SHORTS_PLAYER_TYPE.get() == ShortsPlayerType.REGULAR_PLAYER_FULLSCREEN) {
+            // User imported newer settings to an older app target.
+            Logger.printInfo(() -> "Resetting " + Settings.SHORTS_PLAYER_TYPE);
+            Settings.SHORTS_PLAYER_TYPE.resetToDefault();
+        }
+    }
+
+    private static WeakReference<Activity> mainActivityRef = new WeakReference<>(null);
+
+    /**
+     * Injection point.
+     */
+    public static void setMainActivity(Activity activity) {
+        mainActivityRef = new WeakReference<>(activity);
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean openShort(String videoID) {
+        try {
+            ShortsPlayerType type = Settings.SHORTS_PLAYER_TYPE.get();
+            if (type == ShortsPlayerType.SHORTS_PLAYER) {
+                return false; // Default unpatched behavior.
+            }
+
+            if (videoID.isEmpty()) {
+                // Shorts was opened using launcher app shortcut.
+                //
+                // This check will not detect if the Shorts app shortcut is used
+                // while the app is running in the background (instead the regular player is opened).
+                // To detect that the hooked method map parameter can be checked
+                // if integer key 'com.google.android.apps.youtube.app.endpoint.flags'
+                // has bitmask 16 set.
+                //
+                // This use case seems unlikely if the user has the Shorts
+                // set to open in the regular player, so it's ignored as
+                // checking the map makes the patch more complicated.
+                Logger.printDebug(() -> "Ignoring Short with no videoId");
+                return false;
+            }
+            
+            if (NavigationButton.getSelectedNavigationButton() == NavigationButton.SHORTS) {
+                return false; // Always use Shorts player for the Shorts nav button.
+            }
+
+            final boolean forceFullScreen = (type == ShortsPlayerType.REGULAR_PLAYER_FULLSCREEN);
+            OpenVideosFullscreenHookPatch.setOpenNextVideoFullscreen(forceFullScreen);
+
+            // Can use the application context and add intent flags of
+            // FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TOP
+            // But the activity context seems to fix random app crashes
+            // if Shorts urls are opened outside the app.
+            var context = mainActivityRef.get();
+
+            Intent videoPlayerIntent = new Intent(
+                    Intent.ACTION_VIEW,
+                    Uri.parse("https://youtube.com/watch?v=" + videoID)
+            );
+            videoPlayerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            videoPlayerIntent.setPackage(context.getPackageName());
+
+            context.startActivity(videoPlayerIntent);
+            return true;
+        } catch (Exception ex) {
+            OpenVideosFullscreenHookPatch.setOpenNextVideoFullscreen(null);
+            Logger.printException(() -> "openShort failure", ex);
+            return false;
+        }
+    }
+}
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java
@@ -1,14 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public class OpenVideosFullscreen {
-
-    /**
-     * Injection point.
-     */
-    public static boolean openVideoFullscreenPortrait(boolean original) {
-        return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
-    }
-}
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java
@@ -0,0 +1,41 @@
+package app.revanced.extension.youtube.patches;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class OpenVideosFullscreenHookPatch {
+
+    @Nullable
+    private static volatile Boolean openNextVideoFullscreen;
+
+    public static void setOpenNextVideoFullscreen(@Nullable Boolean forceFullScreen) {
+        openNextVideoFullscreen = forceFullScreen;
+    }
+
+    /**
+     * Changed during patching since this class is also
+     * used by {@link OpenVideosFullscreenHookPatch}.
+     */
+    private static boolean isFullScreenPatchIncluded() {
+        return false;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean openVideoFullscreenPortrait(boolean original) {
+        Boolean openFullscreen = openNextVideoFullscreen;
+        if (openFullscreen != null) {
+            openNextVideoFullscreen = null;
+            return openFullscreen;
+        }
+
+        if (!isFullScreenPatchIncluded()) {
+            return false;
+        }
+
+        return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
+    }
+}
--- 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
@@ -9,4 +9,5 @@ public class VersionCheckPatch {
    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;
 }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java
@@ -161,9 +161,9 @@ public final class LayoutComponentsFilter extends Filter {
                "inline_expander"
        );

-        final var channelBar = new StringFilterGroup(
+        final var compactChannelBar = new StringFilterGroup(
                Settings.HIDE_CHANNEL_BAR,
-                "channel_bar"
+                "compact_channel_bar"
        );

        final var relatedVideos = new StringFilterGroup(
@@ -252,7 +252,7 @@ public final class LayoutComponentsFilter extends Filter {
                inFeedSurvey,
                notifyMe,
                likeSubscribeGlow,
-                channelBar,
+                compactChannelBar,
                communityPosts,
                paidPromotion,
                searchResultVideo,
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java
@@ -297,7 +297,7 @@ public final class ShortsFilter extends Filter {
            if (matchedGroup == suggestedAction) {
                // Skip searching the buffer if all suggested actions are set to hidden.
                // This has a secondary effect of hiding all new un-identified actions
-                // under the assumption that the user wants all actions hidden.
+                // under the assumption that the user wants all suggestions hidden.
                if (isEverySuggestedActionFilterEnabled()) {
                    return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
                }
@@ -324,19 +324,22 @@ public final class ShortsFilter extends Filter {
    }

    private static boolean shouldHideShortsFeedItems() {
+        // Known issue if hide home is on but at least one other hide is off:
+        //
+        // Shorts suggestions will load in the background if a video is opened and
+        // immediately minimized before any suggestions are loaded.
+        // In this state the player type will show minimized, which cannot
+        // distinguish between Shorts suggestions loading in the player and between
+        // scrolling thru search/home/subscription tabs while a player is minimized.
        final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
        final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
        final boolean hideSearch = Settings.HIDE_SHORTS_SEARCH.get();
+        final boolean hideHistory = Settings.HIDE_SHORTS_HISTORY.get();

-        if (hideHome && hideSubscriptions && hideSearch) {
-            // Shorts suggestions can load in the background if a video is opened and
-            // then immediately minimized before any suggestions are loaded.
-            // In this state the player type will show minimized, which makes it not possible to
-            // distinguish between Shorts suggestions loading in the player and between
-            // scrolling thru search/home/subscription tabs while a player is minimized.
-            //
-            // To avoid this situation for users that never want to show Shorts (all hide Shorts options are enabled)
-            // then hide all Shorts everywhere including the Library history and Library playlists.
+        if (!hideHome && !hideSubscriptions && !hideSearch && !hideHistory) {
+            return false;
+        }
+        if (hideHome && hideSubscriptions && hideSearch && hideHistory) {
            return true;
        }

@@ -352,24 +355,29 @@ public final class ShortsFilter extends Filter {
        }

        // Avoid checking navigation button status if all other Shorts should show.
-        if (!hideHome && !hideSubscriptions) {
+        if (!hideHome && !hideSubscriptions && !hideHistory) {
            return false;
        }

+        // Check navigation absolutely last since the check may block this thread.
        NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
        if (selectedNavButton == null) {
            return hideHome; // Unknown tab, treat the same as home.
        }
-        if (selectedNavButton == NavigationButton.HOME) {
-            return hideHome;
-        }
-        if (selectedNavButton == NavigationButton.SUBSCRIPTIONS) {
-            return hideSubscriptions;
-        }
-        // User must be in the library tab.  Don't hide the history or any playlists here.
-        return false;
+
+        return switch (selectedNavButton) {
+            case HOME -> hideHome;
+            case SUBSCRIPTIONS -> hideSubscriptions;
+            case LIBRARY -> hideHistory;
+            default -> false;
+        };
    }

+    /**
+     * Injection point.  Only used if patching older than 19.03.
+     * This hook may be obsolete even for old versions
+     * as they now use a litho layout like newer versions.
+     */
    public static void hideShortsShelf(final View shortsShelfView) {
        if (shouldHideShortsFeedItems()) {
            Utils.hideViewByLayoutParams(shortsShelfView);
--- 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
@@ -8,6 +8,7 @@ import static app.revanced.extension.shared.settings.Setting.migrateOldSettingTo
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
+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;
@@ -16,6 +17,7 @@ import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerT
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_2;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_3;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_4;
+import static app.revanced.extension.youtube.patches.OpenShortsInRegularPlayerPatch.ShortsPlayerType;
 import static app.revanced.extension.youtube.patches.SeekbarThumbnailsPatch.SeekbarThumbnailsHighQualityAvailability;
 import static app.revanced.extension.youtube.patches.VersionCheckPatch.IS_19_17_OR_GREATER;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.IGNORE;
@@ -52,7 +54,7 @@ public class Settings extends BaseSettings {
    public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds",
            "0.25\n0.5\n0.75\n0.9\n0.95\n1.0\n1.05\n1.1\n1.25\n1.5\n1.75\n2.0\n3.0\n4.0\n5.0", true);
    // Audio
-    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE);
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());

    // Ads
    public static final BooleanSetting HIDE_BUTTONED_ADS = new BooleanSetting("revanced_hide_buttoned_ads", TRUE);
@@ -206,7 +208,7 @@ public class Settings extends BaseSettings {
    public static final BooleanSetting TABLET_LAYOUT = new BooleanSetting("revanced_tablet_layout", FALSE, true, "revanced_tablet_layout_user_dialog_message");
    public static final BooleanSetting WIDE_SEARCHBAR = new BooleanSetting("revanced_wide_searchbar", FALSE, true);
    public static final EnumSetting<StartPage> CHANGE_START_PAGE = new EnumSetting<>("revanced_change_start_page", StartPage.DEFAULT, true);
-    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.35.36" : "17.33.42", true, parent(SPOOF_APP_VERSION));
+    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.26.42" : "17.33.42", true, parent(SPOOF_APP_VERSION));
    // Custom filter
    public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
    public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
@@ -224,12 +226,14 @@ public class Settings extends BaseSettings {
    // Shorts
    public static final BooleanSetting DISABLE_RESUMING_SHORTS_PLAYER = new BooleanSetting("revanced_disable_resuming_shorts_player", FALSE);
    public static final BooleanSetting DISABLE_SHORTS_BACKGROUND_PLAYBACK = new BooleanSetting("revanced_shorts_disable_background_playback", FALSE);
+    public static final EnumSetting<ShortsPlayerType> SHORTS_PLAYER_TYPE = new EnumSetting<>("revanced_shorts_player_type", ShortsPlayerType.SHORTS_PLAYER);
    public static final BooleanSetting HIDE_SHORTS_CHANNEL_BAR = new BooleanSetting("revanced_hide_shorts_channel_bar", FALSE);
    public static final BooleanSetting HIDE_SHORTS_COMMENTS_BUTTON = new BooleanSetting("revanced_hide_shorts_comments_button", FALSE);
    public static final BooleanSetting HIDE_SHORTS_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_shorts_dislike_button", FALSE);
    public static final BooleanSetting HIDE_SHORTS_FULL_VIDEO_LINK_LABEL = new BooleanSetting("revanced_hide_shorts_full_video_link_label", FALSE);
    public static final BooleanSetting HIDE_SHORTS_GREEN_SCREEN_BUTTON = new BooleanSetting("revanced_hide_shorts_green_screen_button", TRUE);
    public static final BooleanSetting HIDE_SHORTS_HASHTAG_BUTTON = new BooleanSetting("revanced_hide_shorts_hashtag_button", TRUE);
+    public static final BooleanSetting HIDE_SHORTS_HISTORY = new BooleanSetting("revanced_hide_shorts_history", FALSE);
    public static final BooleanSetting HIDE_SHORTS_HOME = new BooleanSetting("revanced_hide_shorts_home", FALSE);
    public static final BooleanSetting HIDE_SHORTS_INFO_PANEL = new BooleanSetting("revanced_hide_shorts_info_panel", TRUE);
    public static final BooleanSetting HIDE_SHORTS_JOIN_BUTTON = new BooleanSetting("revanced_hide_shorts_join_button", TRUE);
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceOriginalAudioSwitchPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceOriginalAudioSwitchPreference.java
@@ -0,0 +1,36 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.youtube.patches.ForceOriginalAudioPatch;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class ForceOriginalAudioSwitchPreference extends SwitchPreference {
+
+    {
+        if (!ForceOriginalAudioPatch.PATCH_AVAILABLE) {
+            // Show why force audio is not available.
+            String summary = str("revanced_force_original_audio_not_available");
+            setSummary(summary);
+            setSummaryOn(summary);
+            setSummaryOff(summary);
+        }
+    }
+
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context) {
+        super(context);
+    }
+}
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
@@ -77,8 +77,10 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
        Logger.printDebug(() -> "Updating spoof stream side effects preference");
        setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());

-        String key = "revanced_spoof_video_streams_about_"
-                + clientType.name().toLowerCase();
+        String key = "revanced_spoof_video_streams_about_" +
+                (clientType == ClientType.IOS_UNPLUGGED
+                        ? "ios_tv"
+                        : "android");
        setTitle(str(key + "_title"));
        setSummary(str(key + "_summary"));
    }
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
@@ -54,20 +54,21 @@ public final class NavigationBar {
     * How long to wait for the set nav button latch to be released.  Maximum wait time must
     * be as small as possible while still allowing enough time for the nav bar to update.
     *
-     * YT calls it's back button handlers out of order,
-     * and litho starts filtering before the navigation bar is updated.
+     * YT calls it's back button handlers out of order, and litho starts filtering before the
+     * navigation bar is updated. Fixing this situation and not needlessly waiting requires
+     * somehow detecting if a back button key/gesture will not change the active tab.
     *
-     * Fixing this situation and not needlessly waiting requires somehow
-     * detecting if a back button key-press will cause a tab change.
+     * On average the time between pressing the back button and the first litho event is
+     * about 10-20ms.  Waiting up to 75-150ms should be enough time to handle normal use cases
+     * and not be noticeable, since YT typically takes 100-200ms (or more) to update the view.
     *
-     * Typically after pressing the back button, the time between the first litho event and
-     * when the nav button is updated is about 10-20ms. Using 50-100ms here should be enough time
-     * and not noticeable, since YT typically takes 100-200ms (or more) to update the view anyways.
+     * This delay is only noticeable when the device back button/gesture will not
+     * change the current navigation tab, such as backing out of the watch history.
     *
     * This issue can also be avoided on a patch by patch basis, by avoiding calls to
     * {@link NavigationButton#getSelectedNavigationButton()} unless absolutely necessary.
     */
-    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 75;
+    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 120;

    /**
     * Used as a workaround to fix the issue of YT calling back button handlers out of order.
@@ -113,7 +114,8 @@ public final class NavigationBar {
            // The latch is released from the main thread, and waiting from the main thread will always timeout.
            // This situation has only been observed when navigating out of a submenu and not changing tabs.
            // and for that use case the nav bar does not change so it's safe to return here.
-            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. Using last known navbar button status.");
+            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. " +
+                    "Using last known navbar button status.");
            return;
        }

@@ -131,7 +133,9 @@ public final class NavigationBar {
            Logger.printDebug(() -> "Latch wait timed out");

        } catch (InterruptedException ex) {
-            Logger.printException(() -> "Latch wait interrupted failure", ex); // Will never happen.
+            // Calling YouTube thread was interrupted.
+            Logger.printException(() -> "Latch wait interrupted", ex);
+            Thread.currentThread().interrupt(); // Restore interrupt status flag.
        }
    }

@@ -283,8 +287,8 @@ public final class NavigationBar {
         *
         * All code calling this method should handle a null return value.
         *
-         * <b>Due to issues with how YT processes physical back button events,
-         * this patch uses workarounds that can cause this method to take up to 75ms
+         * <b>Due to issues with how YT processes physical back button/gesture events,
+         * this patch uses workarounds that can cause this method to take up to 120ms
         * if the device back button was recently pressed.</b>
         *
         * @return The active navigation tab.
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java
@@ -150,11 +150,16 @@ public class SBRequester {
            String end = String.format(Locale.US, TIME_TEMPLATE, endTime / 1000f);
            String duration = String.format(Locale.US, TIME_TEMPLATE, videoLength / 1000f);

-            HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS, privateUserId, videoId, category, start, end, duration);
+            HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS,
+                    privateUserId, videoId, category, start, end, duration);
            final int responseCode = connection.getResponseCode();

-            String userMessage = switch (responseCode) {
-                case HTTP_STATUS_CODE_SUCCESS -> str("revanced_sb_submit_succeeded");
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
+                Utils.showToastLong(str("revanced_sb_submit_succeeded"));
+                return;
+            }
+
+            String userErrorMessage = switch (responseCode) {
                case 409 -> str("revanced_sb_submit_failed_duplicate");
                case 403 -> str("revanced_sb_submit_failed_forbidden",
                        Requester.parseErrorStringAndDisconnect(connection));
@@ -167,7 +172,7 @@ public class SBRequester {

            // Message might be about the users account or an error too large to show in a toast.
            // Use a dialog instead.
-            SponsorBlockUtils.showErrorDialog(userMessage);
+            SponsorBlockUtils.showErrorDialog(userErrorMessage);
        } catch (SocketTimeoutException ex) {
            Logger.printDebug(() -> "Timeout", ex);
            Utils.showToastLong(str("revanced_sb_submit_failed_timeout"));
--- a/extensions/youtube/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java
+++ b/extensions/youtube/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java
@@ -1,5 +0,0 @@
-package com.google.protos.youtube.api.innertube;
-
-public class InnertubeContext$ClientInfo {
-    public int r;
-}
--- 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.5.2-dev.2
+version = 5.8.0-dev.3
--- a/patches/api/patches.api
+++ b/patches/api/patches.api
@@ -1177,6 +1177,10 @@ public final class app/revanced/patches/youtube/layout/player/background/PlayerC
 }

 public final class app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenKt {
+	public static final fun getOpenVideosFullscreen ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatchKt {
 	public static final fun getOpenVideosFullscreenPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

@@ -1210,6 +1214,10 @@ public final class app/revanced/patches/youtube/layout/shortsautoplay/ShortsAuto
 	public static final fun getShortsAutoplayPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

+public final class app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatchKt {
+	public static final fun getOpenShortsInRegularPlayerPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatchKt {
 	public static final fun getSponsorBlockPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1288,6 +1296,10 @@ public final class app/revanced/patches/youtube/misc/fix/playback/UserAgentClien
 	public static final fun getUserAgentClientSpoofPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

+public final class app/revanced/patches/youtube/misc/fix/playbackspeed/FIxPlaybackSpeedWhilePlayingPatchKt {
+	public static final fun getFixPlaybackSpeedWhilePlayingPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
--- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.shared.misc.checks

 import android.os.Build.*
 import app.revanced.patcher.Fingerprint
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
@@ -82,7 +82,7 @@ fun checkEnvironmentPatch(
            }
        }

-        fun invokeCheck() = mainActivityOnCreateFingerprint.method.addInstructions(
+        fun invokeCheck() = mainActivityOnCreateFingerprint.method.addInstruction(
            0,
            "invoke-static/range { p0 .. p0 },$EXTENSION_CLASS_DESCRIPTOR->check(Landroid/app/Activity;)V",
        )
--- 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
@@ -121,3 +121,19 @@ internal val hlsCurrentTimeFingerprint = fingerprint {
        HLS_CURRENT_TIME_FEATURE_FLAG
    }
 }
+
+internal val nerdsStatsVideoFormatBuilderFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    returns("Ljava/lang/String;")
+    parameters("L")
+    strings("codecs=\"")
+}
+
+internal val patchIncludedExtensionMethodFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("Z")
+    parameters()
+    custom { method, classDef ->
+        classDef.type == EXTENSION_CLASS_DESCRIPTOR && method.name == "isPatchIncluded"
+    }
+}
--- 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,9 +10,11 @@ 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.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
@@ -39,6 +41,12 @@ fun spoofVideoStreamsPatch(
    dependsOn(addResourcesPatch)

    execute {
+        // region Enable extension helper method used by other patches
+
+        patchIncludedExtensionMethodFingerprint.method.returnEarly(true)
+
+        // endregion
+
        // region Block /initplayback requests to fall back to /get_watch requests.

        val moveUriStringIndex = buildInitPlaybackRequestFingerprint.patternMatch!!.startIndex
@@ -200,6 +208,25 @@ fun spoofVideoStreamsPatch(
                    """,
            )
        }
+
+        // endregion
+
+        // region Append spoof info.
+
+        nerdsStatsVideoFormatBuilderFingerprint.method.apply {
+            findInstructionIndicesReversedOrThrow(Opcode.RETURN_OBJECT).forEach { index ->
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index,
+                    """
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->appendSpoofedClient(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$register
+                    """
+                )
+            }
+        }
+
        // endregion

        // region Fix iOS livestream current time.
--- 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
@@ -11,8 +11,8 @@ import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.twitter.misc.extension.sharedExtensionPatch
 import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c

 internal var tweetShareLinkTemplateId = -1L
    private set
@@ -25,15 +25,7 @@ internal val changeLinkSharingDomainResourcePatch = resourcePatch {
    }
 }

-// This method is used to build the link that is shared when the "Share via..." button is pressed.
-private const val FORMAT_METHOD_RESOURCE_REFERENCE =
-    "Lapp/revanced/extension/twitter/patches/links/ChangeLinkSharingDomainPatch;->" +
-        "formatResourceLink([Ljava/lang/Object;)Ljava/lang/String;"
-
-// This method is used to build the link that is shared when the "Copy link" button is pressed.
-private const val FORMAT_METHOD_REFERENCE =
-    "Lapp/revanced/extension/twitter/patches/links/ChangeLinkSharingDomainPatch;->" +
-        "formatLink(JLjava/lang/String;)Ljava/lang/String;"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/twitter/patches/links/ChangeLinkSharingDomainPatch;"

@Suppress("unused")
 val changeLinkSharingDomainPatch = bytecodePatch(
@@ -71,7 +63,7 @@ val changeLinkSharingDomainPatch = bytecodePatch(
            addInstructions(
                0,
                """
-                    invoke-static { p0, p1, p2 }, $FORMAT_METHOD_REFERENCE
+                    invoke-static { p0, p1, p2 }, $EXTENSION_CLASS_DESCRIPTOR->formatLink(JLjava/lang/String;)Ljava/lang/String;
                    move-result-object p0
                    return-object p0
                """,
@@ -84,12 +76,12 @@ val changeLinkSharingDomainPatch = bytecodePatch(

            // Format the link with the new domain name register (1 instruction below the const).
            val formatLinkCallIndex = templateIdConstIndex + 1
-            val formatLinkCall = getInstruction<Instruction35c>(formatLinkCallIndex)
+            val register = getInstruction<FiveRegisterInstruction>(formatLinkCallIndex).registerE

            // Replace the original method call with the new method call.
            replaceInstruction(
                formatLinkCallIndex,
-                "invoke-static { v${formatLinkCall.registerE} }, $FORMAT_METHOD_RESOURCE_REFERENCE",
+                "invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->formatResourceLink([Ljava/lang/Object;)Ljava/lang/String;",
            )
        }
    }
--- 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
@@ -77,6 +77,7 @@ val hideAdsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -33,6 +33,7 @@ val hideGetPremiumPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -31,6 +31,7 @@ val videoAdsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -61,6 +61,7 @@ val copyVideoUrlPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -32,6 +32,7 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -76,6 +76,7 @@ val downloadsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -31,6 +31,7 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -34,6 +34,7 @@ val enableSeekbarTappingPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -44,6 +44,7 @@ val enableSlideToSeekPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -37,6 +37,7 @@ val seekbarThumbnailsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        )
    )

--- 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
@@ -73,6 +73,7 @@ val swipeControlsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -30,6 +30,7 @@ val autoCaptionsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -51,6 +51,7 @@ val customBrandingPatch = resourcePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -49,6 +49,7 @@ val changeHeaderPatch = resourcePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        )
    )

--- 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
@@ -30,6 +30,7 @@ val hideButtonsPatch = resourcePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -48,6 +48,7 @@ val navigationButtonsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -62,6 +62,7 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -64,6 +64,7 @@ val hideEndscreenCardsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -37,6 +37,7 @@ val disableFullscreenAmbientModePatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -133,6 +133,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -65,6 +65,7 @@ val hideInfoCardsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -32,6 +32,7 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -37,6 +37,7 @@ val disableRollingNumberAnimationPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -33,6 +33,7 @@ val hideSeekbarPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -71,6 +71,7 @@ private val hideShortsComponentsResourcePatch = resourcePatch {
            SwitchPreference("revanced_hide_shorts_home"),
            SwitchPreference("revanced_hide_shorts_subscriptions"),
            SwitchPreference("revanced_hide_shorts_search"),
+            SwitchPreference("revanced_hide_shorts_history"),

            PreferenceScreenPreference(
                key = "revanced_shorts_player_screen",
@@ -190,6 +191,7 @@ val hideShortsComponentsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
@@ -62,6 +62,7 @@ val disableSuggestedVideoEndScreenPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -29,6 +29,7 @@ val hideTimestampPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -170,6 +170,7 @@ val miniplayerPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -29,6 +29,7 @@ val playerPopupPanelsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -20,6 +20,7 @@ val playerControlsBackgroundPatch = resourcePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt
@@ -14,3 +14,15 @@ internal val openVideosFullscreenPortraitFingerprint = fingerprint {
        OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG
    }
 }
+
+/**
+ * Used to enable opening regular videos fullscreen.
+ */
+internal val openVideosFullscreenHookPatchExtensionFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("Z")
+    parameters()
+    custom { methodDef, classDef ->
+        methodDef.name == "isFullScreenPatchIncluded" && classDef.type == EXTENSION_CLASS_DESCRIPTOR
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt
@@ -1,46 +1,9 @@
 package app.revanced.patches.youtube.layout.player.fullscreen

 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.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.misc.settings.PreferenceScreen
-import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.util.insertFeatureFlagBooleanOverride
-
-private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/OpenVideosFullscreen;"

@Suppress("unused")
-val openVideosFullscreenPatch = bytecodePatch(
-    name = "Open videos fullscreen",
-    description = "Adds an option to open videos in full screen portrait mode.",
-) {
-    dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
-        addResourcesPatch,
-    )
-
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.46.42",
-        )
-    )
-
-    execute {
-        openVideosFullscreenPortraitFingerprint.method.insertFeatureFlagBooleanOverride(
-            OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG,
-            "$EXTENSION_CLASS_DESCRIPTOR->openVideoFullscreenPortrait(Z)Z"
-        )
-
-        // Add resources and setting last, in case the user force patches an old incompatible version.
-
-        addResources("youtube", "layout.player.fullscreen.openVideosFullscreen")
-
-        PreferenceScreen.PLAYER.addPreferences(
-            SwitchPreference("revanced_open_videos_fullscreen_portrait")
-        )
-    }
-}
+@Deprecated("Renamed to openVideosFullscreenPatch", ReplaceWith("openVideosFullscreenPatch"))
+val openVideosFullscreen = bytecodePatch{
+    dependsOn(openVideosFullscreenPatch)
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenHookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenHookPatch.kt
@@ -0,0 +1,32 @@
+package app.revanced.patches.youtube.layout.player.fullscreen
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.youtube.layout.shortsplayer.openShortsInRegularPlayerPatch
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_46_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.util.insertFeatureFlagBooleanOverride
+
+internal const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch;"
+
+/**
+ * Used by both [openVideosFullscreenPatch] and [openShortsInRegularPlayerPatch].
+ */
+internal val openVideosFullscreenHookPatch = bytecodePatch {
+    dependsOn(
+        sharedExtensionPatch,
+        versionCheckPatch
+    )
+
+    execute {
+        if (!is_19_46_or_greater) {
+            return@execute
+        }
+
+        openVideosFullscreenPortraitFingerprint.method.insertFeatureFlagBooleanOverride(
+            OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->openVideoFullscreenPortrait(Z)Z"
+        )
+    }
+}
--- 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
@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.player.fullscreen
+
+import app.revanced.patcher.patch.PatchException
+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.misc.playservice.is_19_46_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
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val openVideosFullscreenPatch = bytecodePatch(
+    name = "Open videos fullscreen",
+    description = "Adds an option to open videos in full screen portrait mode.",
+) {
+    dependsOn(
+        openVideosFullscreenHookPatch,
+        settingsPatch,
+        addResourcesPatch,
+        versionCheckPatch
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "19.46.42",
+            "19.47.53",
+        )
+    )
+
+    execute {
+        if (!is_19_46_or_greater) {
+            throw PatchException("'Open videos fullscreen' requires 19.46.42 or greater")
+        }
+
+        addResources("youtube", "layout.player.fullscreen.openVideosFullscreen")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            SwitchPreference("revanced_open_videos_fullscreen_portrait")
+        )
+
+        // Enable the logic for the user Setting to open regular videos fullscreen.
+        openVideosFullscreenHookPatchExtensionFingerprint.method.returnEarly(true)
+    }
+}
--- 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
@@ -60,6 +60,7 @@ val customPlayerOverlayOpacityPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -61,6 +61,7 @@ val returnYouTubeDislikePatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -37,6 +37,7 @@ val wideSearchbarPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.shortsautoplay

+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
@@ -39,6 +40,7 @@ val shortsAutoplayPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

@@ -56,7 +58,7 @@ val shortsAutoplayPatch = bytecodePatch(
        }

        // Main activity is used to check if app is in pip mode.
-        mainActivityOnCreateFingerprint.method.addInstructions(
+        mainActivityOnCreateFingerprint.method.addInstruction(
            1,
            "invoke-static/range { p0 .. p0 }, $EXTENSION_CLASS_DESCRIPTOR->" +
                "setMainActivity(Landroid/app/Activity;)V",
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/Fingerprints.kt
@@ -0,0 +1,56 @@
+package app.revanced.patches.youtube.layout.shortsplayer
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
+import com.android.tools.smali.dexlib2.AccessFlags
+
+/**
+ * Purpose of this method is not clear, and it's only used to identify
+ * the obfuscated name of the videoId() method in PlaybackStartDescriptor.
+ */
+internal val playbackStartFeatureFlagFingerprint = fingerprint {
+    returns("Z")
+    parameters(
+        "Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;",
+    )
+    literal {
+        45380134L
+    }
+}
+
+// Pre 19.25
+internal val shortsPlaybackIntentLegacyFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters(
+        "L",
+        "Ljava/util/Map;",
+        "J",
+        "Ljava/lang/String;",
+        "Z",
+        "Ljava/util/Map;"
+    )
+    strings(
+        // None of these strings are unique.
+        "com.google.android.apps.youtube.app.endpoint.flags",
+        "ReelWatchFragmentArgs",
+        "reels_fragment_descriptor"
+    )
+}
+
+internal val shortsPlaybackIntentFingerprint = fingerprint {
+    accessFlags(AccessFlags.PROTECTED, AccessFlags.FINAL)
+    returns("V")
+    parameters(
+        "Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;",
+        "Ljava/util/Map;",
+        "J",
+        "Ljava/lang/String;"
+    )
+    strings(
+        // None of these strings are unique.
+        "com.google.android.apps.youtube.app.endpoint.flags",
+        "ReelWatchFragmentArgs",
+        "reels_fragment_descriptor"
+    )
+}
--- 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
@@ -0,0 +1,132 @@
+package app.revanced.patches.youtube.layout.shortsplayer
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+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.ListPreference
+import app.revanced.patches.youtube.layout.player.fullscreen.openVideosFullscreenHookPatch
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_19_46_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
+import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
+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
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch;"
+
+@Suppress("unused")
+val openShortsInRegularPlayerPatch = bytecodePatch(
+    name = "Open Shorts in regular player",
+    description = "Adds options to open Shorts in the regular video player.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+        openVideosFullscreenHookPatch,
+        navigationBarHookPatch,
+        versionCheckPatch
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "18.38.44",
+            "18.49.37",
+            "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.shortsplayer.shortsPlayerTypePatch")
+
+        PreferenceScreen.SHORTS.addPreferences(
+            if (is_19_46_or_greater) {
+                ListPreference(
+                    key = "revanced_shorts_player_type",
+                    summaryKey = null,
+                )
+            } else {
+                ListPreference(
+                    key = "revanced_shorts_player_type",
+                    summaryKey = null,
+                    entriesKey = "revanced_shorts_player_type_legacy_entries",
+                    entryValuesKey = "revanced_shorts_player_type_legacy_entry_values"
+                )
+            }
+        )
+
+        // Activity is used as the context to launch an Intent.
+        mainActivityOnCreateFingerprint.method.addInstruction(
+            1,
+            "invoke-static/range { p0 .. p0 }, ${EXTENSION_CLASS_DESCRIPTOR}->" +
+                    "setMainActivity(Landroid/app/Activity;)V",
+        )
+
+        // Find the obfuscated method name for PlaybackStartDescriptor.videoId()
+        val playbackStartVideoIdMethodName = playbackStartFeatureFlagFingerprint.method.let {
+            val stringMethodIndex = it.indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.definingClass == "Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;"
+                        && reference.returnType == "Ljava/lang/String;"
+            }
+
+            navigate(it).to(stringMethodIndex).stop().name
+        }
+
+        fun extensionInstructions(playbackStartRegister: Int, freeRegister: Int) =
+            """
+                invoke-virtual { v$playbackStartRegister }, Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;->$playbackStartVideoIdMethodName()Ljava/lang/String;
+                move-result-object v$freeRegister
+                invoke-static { v$freeRegister }, $EXTENSION_CLASS_DESCRIPTOR->openShort(Ljava/lang/String;)Z
+                move-result v$freeRegister
+                if-eqz v$freeRegister, :disabled
+                return-void
+                
+                :disabled
+                nop
+            """
+
+        if (!is_19_25_or_greater) {
+            shortsPlaybackIntentLegacyFingerprint.method.apply {
+                val index = indexOfFirstInstructionOrThrow {
+                    getReference<MethodReference>()?.returnType ==
+                            "Lcom/google/android/libraries/youtube/player/model/PlaybackStartDescriptor;"
+                }
+                val freeRegister = getInstruction<FiveRegisterInstruction>(index).registerC
+                val playbackStartRegister = getInstruction<OneRegisterInstruction>(index + 1).registerA
+
+                addInstructionsWithLabels(
+                    index + 2,
+                    extensionInstructions(playbackStartRegister, freeRegister)
+                )
+            }
+
+            return@execute
+        }
+
+        shortsPlaybackIntentFingerprint.method.addInstructionsWithLabels(
+            0,
+            """
+                move-object/from16 v0, p1
+                ${extensionInstructions(0, 1)}
+            """
+        )
+    }
+}
--- 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
@@ -119,6 +119,7 @@ val sponsorBlockPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -40,6 +40,7 @@ val spoofAppVersionPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -37,6 +37,7 @@ val changeStartPagePatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -39,6 +39,7 @@ val disableResumingShortsOnStartupPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
@@ -34,6 +34,7 @@ val enableTabletLayoutPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -163,22 +163,31 @@ val themePatch = bytecodePatch(
                    }

                    // Fix the splash screen dark mode background color.
-                    // In earlier versions of the app this is white and makes no sense for dark mode.
-                    // This is only required for 19.32 and greater, but is applied to all targets.
-                    // Only dark mode needs this fix as light mode correctly uses the custom color.
+                    // In 19.32+ the dark mode splash screen is white and fades to black.
+                    // Maybe it's a bug in YT, or maybe it intentionally. Who knows.
                    document("res/values-night/styles.xml").use { document ->
-                        // Create a night mode specific override for the splash screen background.
-                        val style = document.createElement("style")
-                        style.setAttribute("name", "Theme.YouTube.Home")
-                        style.setAttribute("parent", "@style/Base.V23.Theme.YouTube.Home")
-
-                        val windowItem = document.createElement("item")
-                        windowItem.setAttribute("name", "android:windowBackground")
-                        windowItem.textContent = "@color/$splashBackgroundColor"
-                        style.appendChild(windowItem)
-
                        val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
-                        resourcesNode.appendChild(style)
+                        val childNodes = resourcesNode.childNodes
+
+                        for (i in 0 until childNodes.length) {
+                            val node = childNodes.item(i) as? Element ?: continue
+                            val nodeAttributeName = node.getAttribute("name")
+                            if (nodeAttributeName.startsWith("Theme.YouTube.Launcher")) {
+                                val nodeAttributeParent = node.getAttribute("parent")
+
+                                val style = document.createElement("style")
+                                style.setAttribute("name", "Theme.YouTube.Home")
+                                style.setAttribute("parent", nodeAttributeParent)
+
+                                val windowItem = document.createElement("item")
+                                windowItem.setAttribute("name", "android:windowBackground")
+                                windowItem.textContent = "@color/$splashBackgroundColor"
+                                style.appendChild(windowItem)
+
+                                resourcesNode.removeChild(node)
+                                resourcesNode.appendChild(style)
+                            }
+                        }
                    }
                }
            }
@@ -198,6 +207,7 @@ val themePatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -41,6 +41,7 @@ val alternativeThumbnailsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -35,6 +35,7 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.announcements

-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
@@ -31,6 +31,7 @@ val announcementsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

@@ -41,7 +42,7 @@ val announcementsPatch = bytecodePatch(
            SwitchPreference("revanced_announcements"),
        )

-        mainActivityOnCreateFingerprint.method.addInstructions(
+        mainActivityOnCreateFingerprint.method.addInstruction(
            // Insert index must be greater than the insert index used by GmsCoreSupport,
            // as both patch the same method and GmsCore check should be first.
            1,
--- 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
@@ -32,6 +32,7 @@ val autoRepeatPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -56,6 +56,7 @@ val backgroundPlaybackPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -40,6 +40,7 @@ val enableDebuggingPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -32,6 +32,7 @@ val spoofDeviceDimensionsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -1,9 +1,10 @@
 package app.revanced.patches.youtube.misc.dns

-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 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.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint

 private const val EXTENSION_CLASS_DESCRIPTOR =
@@ -13,7 +14,10 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch(
    name = "Check watch history domain name resolution",
    description = "Checks if the device DNS server is preventing user watch history from being saved.",
 ) {
-    dependsOn(addResourcesPatch)
+    dependsOn(
+        sharedExtensionPatch,
+        addResourcesPatch
+    )

    compatibleWith(
        "com.google.android.youtube"(
@@ -25,13 +29,14 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

    execute {
        addResources("youtube", "misc.dns.checkWatchHistoryDomainNameResolutionPatch")

-        mainActivityOnCreateFingerprint.method.addInstructions(
+        mainActivityOnCreateFingerprint.method.addInstruction(
            // FIXME: Insert index must be greater than the insert index used by GmsCoreSupport,
            //  as both patch the same method and GmsCoreSupport check should be first,
            //  but the patch does not depend on GmsCoreSupport, so it should not be possible to enforce this
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/Fingerprints.kt
@@ -15,22 +15,16 @@ internal val onBackPressedFingerprint = fingerprint {
    }
 }

-internal val recyclerViewScrollingFingerprint = fingerprint {
-    accessFlags(AccessFlags.PRIVATE, AccessFlags.FINAL)
+internal val scrollPositionFingerprint = fingerprint {
+    accessFlags(AccessFlags.PROTECTED, AccessFlags.FINAL)
    returns("V")
-    parameters()
+    parameters("L")
    opcodes(
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_LEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_DIRECT,
+        Opcode.RETURN_VOID
    )
+    strings("scroll_position")
 }

 internal val recyclerViewTopScrollingFingerprint = fingerprint {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt
@@ -1,54 +1,49 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture

-import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/FixBackToExitGesturePatch;"

 internal val fixBackToExitGesturePatch = bytecodePatch(
    description = "Fixes the swipe back to exit gesture.",
 ) {

    execute {
-        /**
-         * Inject a call to a method from the extension.
-         *
-         * @param targetMethod The target method to call.
-         */
-        fun Fingerprint.injectCall(targetMethod: ExtensionMethod) = method.addInstruction(
-            patternMatch!!.endIndex,
-            targetMethod.toString(),
-        )
+        recyclerViewTopScrollingFingerprint.match(recyclerViewTopScrollingParentFingerprint.originalClassDef)
+            .let {
+                it.method.addInstruction(
+                    it.patternMatch!!.endIndex,
+                    "invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->onTopView()V"
+                )
+            }

-        mapOf(
-            recyclerViewTopScrollingFingerprint.also {
-                it.match(recyclerViewTopScrollingParentFingerprint.originalClassDef)
-            } to ExtensionMethod(
-                methodName = "onTopView",
-            ),
-            recyclerViewScrollingFingerprint to ExtensionMethod(
-                methodName = "onScrollingViews",
-            ),
-            onBackPressedFingerprint to ExtensionMethod(
-                "p0",
-                "onBackPressed",
-                "Landroid/app/Activity;",
-            ),
-        ).forEach { (fingerprint, target) -> fingerprint.injectCall(target) }
+        scrollPositionFingerprint.let {
+            navigate(it.originalMethod)
+                .to(it.patternMatch!!.startIndex + 1)
+                .stop().apply {
+                    val index = indexOfFirstInstructionOrThrow {
+                        opcode == Opcode.INVOKE_VIRTUAL && getReference<MethodReference>()?.definingClass ==
+                                "Landroid/support/v7/widget/RecyclerView;"
+                    }
+
+                    addInstruction(
+                        index,
+                        "invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->onScrollingViews()V"
+                    )
+                }
+
+        }
+
+        onBackPressedFingerprint.let {
+            it.method.addInstruction(
+                it.patternMatch!!.endIndex,
+                "invoke-static { p0 }, $EXTENSION_CLASS_DESCRIPTOR->onBackPressed(Landroid/app/Activity;)V"
+            )
+        }
    }
 }
-
-/**
- * A reference to a method from the extension for [fixBackToExitGesturePatch].
- *
- * @param register The method registers.
- * @param methodName The method name.
- * @param parameterTypes The parameters of the method.
- */
-private class ExtensionMethod(
-    val register: String = "",
-    val methodName: String,
-    val parameterTypes: String = "",
-) {
-    override fun toString() =
-        "invoke-static {$register}, Lapp/revanced/extension/youtube/patches/FixBackToExitGesturePatch;->$methodName($parameterTypes)V"
-}
--- 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
@@ -0,0 +1,61 @@
+package app.revanced.patches.youtube.misc.fix.playbackspeed
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+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.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.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/FixPlaybackSpeedWhilePlayingPatch;"
+
+/**
+ * Fixes a bug in YouTube 19.34+ where the playback speed
+ * can incorrectly reset to 1.0x under certain conditions.
+ *
+ * Reproduction steps using 19.34+
+ * 1. Open a video and start playback
+ * 2. Change the speed to any value that is not 1.0x.
+ * 3. Open the comments panel.
+ * 4. Tap any "N more replies" link at the bottom of a comment, or tap on a timestamp of a comment.
+ * 5. Pause the video
+ * 6. Resume the video
+ * 7. Playback speed will incorrectly change to 1.0x.
+ */
+@Suppress("unused")
+val fixPlaybackSpeedWhilePlayingPatch = bytecodePatch{
+    dependsOn(
+        sharedExtensionPatch,
+        playerTypeHookPatch,
+        versionCheckPatch,
+    )
+
+    execute {
+        if (!is_19_34_or_greater) {
+            return@execute
+        }
+
+        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)
+
+            addInstructionsWithLabels(
+                playbackSpeedIndex + 1,
+                """
+                    invoke-static { v$playbackSpeedRegister }, $EXTENSION_CLASS_DESCRIPTOR->playbackSpeedChanged(F)Z
+                    move-result v$freeRegister
+                    if-nez v$freeRegister, :do_not_change
+                """,
+                ExternalLabel("do_not_change", getInstruction(returnIndex))
+            )
+        }
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playbackspeed/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playbackspeed/Fingerprints.kt
@@ -0,0 +1,38 @@
+package app.revanced.patches.youtube.misc.fix.playbackspeed
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionReversed
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+/**
+ * This method is usually used to set the initial speed (1.0x) when playback starts from the feed.
+ * For some reason, in the latest YouTube, it is invoked even after the video has already started.
+ */
+internal val playbackSpeedInFeedsFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters("L")
+    opcodes(
+        Opcode.IGET,
+        Opcode.MUL_INT_LIT16,
+        Opcode.IGET_WIDE,
+        Opcode.CONST_WIDE_16,
+        Opcode.CMP_LONG,
+        Opcode.IF_EQZ,
+        Opcode.IF_LEZ,
+        Opcode.SUB_LONG_2ADDR,
+    )
+    custom { method, _ ->
+        indexOfGetPlaybackSpeedInstruction(method) >= 0
+    }
+}
+
+internal fun indexOfGetPlaybackSpeedInstruction(method: Method) =
+    method.indexOfFirstInstructionReversed {
+        opcode == Opcode.IGET &&
+                getReference<FieldReference>()?.type == "F"
+    }
--- 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
@@ -43,6 +43,7 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )
 }
--- 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
@@ -38,6 +38,7 @@ val bypassURLRedirectsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -49,6 +49,7 @@ val openLinksExternallyPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -38,6 +38,7 @@ val removeTrackingQueryParameterPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
@@ -18,6 +18,7 @@ import app.revanced.patches.shared.misc.settings.settingsPatch
 import app.revanced.patches.youtube.misc.check.checkEnvironmentPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.fix.cairo.disableCairoSettingsPatch
+import app.revanced.patches.youtube.misc.fix.playbackspeed.fixPlaybackSpeedWhilePlayingPatch
 import app.revanced.util.*
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -118,6 +119,7 @@ val settingsPatch = bytecodePatch(
        settingsResourcePatch,
        addResourcesPatch,
        disableCairoSettingsPatch,
+        fixPlaybackSpeedWhilePlayingPatch,
        // Currently there is no easy way to make a mandatory patch,
        // so for now this is a dependent of this patch.
        checkEnvironmentPatch,
--- 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
@@ -20,6 +20,7 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

@@ -37,19 +38,20 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
            preferences = setOf(
                SwitchPreference("revanced_spoof_video_streams"),
                ListPreference(
-                    "revanced_spoof_video_streams_client",
+                    "revanced_spoof_video_streams_client_type",
                    summaryKey = null,
                ),
+                NonInteractivePreference(
+                    // Requires a key and title but the actual text is chosen at runtime.
+                    key = "revanced_spoof_video_streams_about_android",
+                    tag = "app.revanced.extension.youtube.settings.preference.SpoofStreamingDataSideEffectsPreference"
+                ),
                ListPreference(
                    "revanced_spoof_video_streams_language",
                    summaryKey = null
                ),
                SwitchPreference("revanced_spoof_video_streams_ios_force_avc"),
-                // Preference requires a title but the actual text is chosen at runtime.
-                NonInteractivePreference(
-                    key = "revanced_spoof_video_streams_about_android_vr",
-                    tag = "app.revanced.extension.youtube.settings.preference.SpoofStreamingDataSideEffectsPreference"
-                ),
+                SwitchPreference("revanced_spoof_streaming_data_stats_for_nerds"),
            ),
        ),
    )
--- 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
@@ -29,6 +29,7 @@ val zoomHapticsPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -49,6 +49,7 @@ val forceOriginalAudioPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

@@ -56,7 +57,10 @@ val forceOriginalAudioPatch = bytecodePatch(
        addResources("youtube", "video.audio.forceOriginalAudioPatch")

        PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference("revanced_force_original_audio")
+            SwitchPreference(
+                key = "revanced_force_original_audio",
+                tag = "app.revanced.extension.youtube.settings.preference.ForceOriginalAudioSwitchPreference"
+            )
        )

        fun Method.firstFormatStreamingModelCall(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
@@ -43,6 +43,7 @@ val rememberVideoQualityPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- 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
@@ -27,6 +27,7 @@ val playbackSpeedPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
@@ -82,6 +82,7 @@ val restoreOldVideoQualityMenuPatch = bytecodePatch(
            "19.43.41",
            "19.45.38",
            "19.46.42",
+            "19.47.53",
        ),
    )

--- a/patches/src/main/resources/addresources/values-af-rZA/strings.xml
+++ b/patches/src/main/resources/addresources/values-af-rZA/strings.xml
@@ -164,6 +164,8 @@ Second \"item\" text"</string>
  </patch>
  <patch id="layout.startupshortsreset.disableResumingShortsOnStartupPatch">
  </patch>
+  <patch id="layout.shortsplayer.shortsPlayerTypePatch">
+  </patch>
  <patch id="layout.shortsautoplay.shortsAutoplayPatch">
  </patch>
  <patch id="layout.tablet.enableTabletLayoutPatch">
@@ -216,6 +218,7 @@ Second \"item\" text"</string>
  <patch id="interaction.seekbar.enableSlideToSeekPatch">
  </patch>
  <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- 'no auth' means no authentication -->
  </patch>
  </app>
  <app id="twitch">
--- a/patches/src/main/resources/addresources/values-am-rET/strings.xml
+++ b/patches/src/main/resources/addresources/values-am-rET/strings.xml
@@ -164,6 +164,8 @@ Second \"item\" text"</string>
  </patch>
  <patch id="layout.startupshortsreset.disableResumingShortsOnStartupPatch">
  </patch>
+  <patch id="layout.shortsplayer.shortsPlayerTypePatch">
+  </patch>
  <patch id="layout.shortsautoplay.shortsAutoplayPatch">
  </patch>
  <patch id="layout.tablet.enableTabletLayoutPatch">
@@ -216,6 +218,7 @@ Second \"item\" text"</string>
  <patch id="interaction.seekbar.enableSlideToSeekPatch">
  </patch>
  <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- 'no auth' means no authentication -->
  </patch>
  </app>
  <app id="twitch">
--- a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
+++ b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
@@ -628,15 +628,18 @@ Second \"item\" text"</string>
  <string name="revanced_shorts_player_screen_summary">إخفاء أو عرض المكونات في مشغل Shorts</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">تم إخفاء Shorts في موجز الصفحة الرئيسية</string>
-  <string name="revanced_hide_shorts_home_summary_off">يتم عرض Shorts في موجز الصفحة الرئيسية</string>
+  <string name="revanced_hide_shorts_home_summary_on">مخفي في الصفحة الرئيسية ومقاطع الفيديو ذات الصلة</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">تم إخفاء Shorts في موجز الاشتراكات</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_off">يتم عرض 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_search_title">إخفاء Shorts في نتائج البحث</string>
-  <string name="revanced_hide_shorts_search_summary_on">تم إخفاء Shorts في نتائج البحث</string>
-  <string name="revanced_hide_shorts_search_summary_off">يتم عرض 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_history_title">إخفاء Shorts في سجل المشاهدة</string>
+  <string name="revanced_hide_shorts_history_summary_on">مخفية في سجل المشاهدة</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>
@@ -1020,6 +1023,7 @@ Second \"item\" text"</string>
                 This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
  <string name="revanced_spoof_app_version_target_title">الهدف من تغيير إصدار التطبيق</string>
  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - استعادة أيقونات مشغل Shorts القديمة</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.26.42 - \"إعادة الرموز القديمة للشريط والأدوات\"</string>
  <!-- 'RYD' is 'Return YouTube Dislike' -->
  <string name="revanced_spoof_app_version_target_legacy_entry_1">18.33.40 - استعادة RYD على Shorts بوضع التخفي</string>
  <string name="revanced_spoof_app_version_target_legacy_entry_2">18.20.39 - استعادة قائمة سرعة الفيديو العريضة &amp; الجودة</string>
@@ -1049,6 +1053,12 @@ Second \"item\" text"</string>
  <string name="revanced_disable_resuming_shorts_player_summary_on">لن يتم استئناف تشغيل مشغل Shorts عند بدء تشغيل التطبيق</string>
  <string name="revanced_disable_resuming_shorts_player_summary_off">سيتم استئناف تشغيل مشغل Shorts عند بدء تشغيل التطبيق</string>
  </patch>
+  <patch id="layout.shortsplayer.shortsPlayerTypePatch">
+  <string name="revanced_shorts_player_type_title">فتح مقاطع الـShorts باستخدام</string>
+  <string name="revanced_shorts_player_type_shorts">مشغل Shorts</string>
+  <string name="revanced_shorts_player_type_regular_player">مشغل عادي</string>
+  <string name="revanced_shorts_player_type_regular_player_fullscreen">شاشة كاملة - مشغل عادي</string>
+  </patch>
  <patch id="layout.shortsautoplay.shortsAutoplayPatch">
  <string name="revanced_shorts_autoplay_title">التشغيل التلقائي لفيديوهات Shorts</string>
  <string name="revanced_shorts_autoplay_summary_on">سيتم تشغيل فيديوهات Shorts تلقائيًا</string>
@@ -1280,21 +1290,27 @@ Second \"item\" text"</string>

 قد لا يعمل تشغيل الفيديو"</string>
  <string name="revanced_spoof_video_streams_user_dialog_message">إيقاف تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
-  <string name="revanced_spoof_video_streams_client_title">العميل الافتراضي</string>
-  <string name="revanced_spoof_video_streams_ios_force_avc_title">فرض AVC (H.264)</string>
-  <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">تم فرض ترميز الفيديو على AVC (H.264)</string>
-  <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">يتم تحديد ترميز الفيديو تلقائيًا</string>
-  <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">"قد يؤدي تمكين هذا إلى تحسين عمر البطارية وإصلاح مشكلة تقطيع التشغيل.
+  <string name="revanced_spoof_video_streams_client_type_title">العميل الافتراضي</string>
+  <!-- 'no auth' means no authentication -->
+  <string name="revanced_spoof_video_streams_client_type_android_vr_no_auth">Android VR (no auth)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_title">فرض iOS AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">يتم إجبار ترميز فيديو على AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">يتم تحديد ترميز فيديو تلقائيًا</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">"قد يؤدي تمكين هذا إلى تحسين عمر البطارية وإصلاح تقطيع التشغيل.

-يتمتع تنسيق AVC بدقة قصوى تبلغ 1080P، برنامج ترميز الصوت Opus غير متوفر، وسيستخدم تشغيل الفيديو المزيد من بيانات الإنترنت مقارنةً بتنسيق VP9 أو AV1."</string>
-  <string name="revanced_spoof_video_streams_about_ios_title">التأثيرات الجانبية لمحاكاة iOS</string>
-  <string name="revanced_spoof_video_streams_about_ios_summary">"• لا يمكن تشغيل مقاطع فيديو الأطفال الخاصة.
-• تنتهي مقاطع الفيديو مبكرًا بمقدار 1 ثانية."</string>
-  <string name="revanced_spoof_video_streams_about_android_vr_title">التأثيرات الجانبية لمحاكاة Android VR</string>
-  <string name="revanced_spoof_video_streams_about_android_vr_summary">"• قد لا يتم تشغيل فيديوهات الأطفال
-• تبدأ البثوث المباشرة من البداية
-• قد تنتهي الفيديوهات قبل النهاية بثانية واحدة"</string>
-  <string name="revanced_spoof_video_streams_language_title">لغة البث الصوتي الافتراضية</string>
+AVC لديه حد أقصى للدقة 1080 بكسل ، لا يتوفر ترميز الصوت Opus ، وسوف يستخدم تشغيل الفيديو بيانات إنترنت أكثر من VP9 أو AV1."</string>
+  <string name="revanced_spoof_video_streams_about_ios_tv_title">آثار جانبية لتزييف iOS</string>
+  <string name="revanced_spoof_video_streams_about_ios_tv_summary">"• قد لا يتم تشغيل الأفلام أو مقاطع الفيديو المدفوعة
+• مستوى الصوت الثابت غير متوفر
+• تنتهي مقاطع الفيديو قبل ثانية واحدة"</string>
+  <string name="revanced_spoof_video_streams_about_android_title">تأثيرات نظام الجهاز الأندرويد</string>
+  <string name="revanced_spoof_video_streams_about_android_summary">"• قائمة قائمة الصوت مفقودة
+• لا يتوفر بحجم الصوت متاح
+• تثبيت الصوت الأصلي ليس غير متوافر"</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>
+  <string name="revanced_spoof_video_streams_language_title">لغة البث الإفتراضي القياسي لافتراضي الاهتداري</string>
  <string name="revanced_spoof_video_streams_language_DEFAULT">لغة التطبيق</string>
  <string name="revanced_spoof_video_streams_language_AR">العربية</string>
  <string name="revanced_spoof_video_streams_language_AZ">Azerbaijani</string>
@@ -1331,8 +1347,7 @@ Second \"item\" text"</string>
  <string name="revanced_spoof_video_streams_language_OR">Odia</string>
  <string name="revanced_spoof_video_streams_language_PA">Punjabi</string>
  <string name="revanced_spoof_video_streams_language_PL">Polish</string>
-  <string name="revanced_spoof_video_streams_language_PT_BR">Portuguese (Brazil)</string>
-  <string name="revanced_spoof_video_streams_language_PT_PT">Portuguese (Portugal)</string>
+  <string name="revanced_spoof_video_streams_language_PT">البرتغالية</string>
  <string name="revanced_spoof_video_streams_language_RO">Romanian</string>
  <string name="revanced_spoof_video_streams_language_RU">Russian</string>
  <string name="revanced_spoof_video_streams_language_SK">Slovak</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	f35247a872	chore: Release v5.8.0-dev.3 [skip ci] # [5.8.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.2...v5.8.0-dev.3) (2024-12-26) ### Bug Fixes * YouTube - Force original audio: If stream spoofing to Android then show a summary text why force audio is not available ([#4220](https://github.com/ReVanced/revanced-patches/issues/4220)) ([`4de768f`](`4de768febf`))	2024-12-26 10:02:26 +00:00
LisoUseInAIKyrios	4de768febf	fix(YouTube - Force original audio): If stream spoofing to Android then show a summary text why force audio is not available (#4220 )	2024-12-26 13:58:29 +04:00
github-actions[bot]	1a5c86db93	chore: Sync translations (#4216 )	2024-12-26 13:58:13 +04:00
LisoUseInAIKyrios	dbba795468	chore(YouTube): Fix inconsistent strings	2024-12-25 04:59:12 +04:00
semantic-release-bot	0a9320551d	chore: Release v5.8.0-dev.2 [skip ci] # [5.8.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.1...v5.8.0-dev.2) (2024-12-24) ### Features * YouTube - Spoof app version: Add 'Restore old navigation and toolbar icons' ([`9fac161`](`9fac1614e7`))	2024-12-24 22:11:57 +00:00
LisoUseInAIKyrios	9fac1614e7	feat(YouTube - Spoof app version): Add 'Restore old navigation and toolbar icons'	2024-12-25 02:09:10 +04:00
semantic-release-bot	2de3523c59	chore: Release v5.8.0-dev.1 [skip ci] # [5.8.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.2...v5.8.0-dev.1) (2024-12-24) ### Features * YouTube - Hide Shorts components: Add option to hide Shorts in watch history ([#4214](https://github.com/ReVanced/revanced-patches/issues/4214)) ([`094a6aa`](`094a6aa6de`))	2024-12-24 21:37:46 +00:00
github-actions[bot]	ad1e40b130	chore: Sync translations (#4215 )	2024-12-25 01:34:11 +04:00
LisoUseInAIKyrios	094a6aa6de	feat(YouTube - Hide Shorts components): Add option to hide Shorts in watch history (#4214 )	2024-12-25 01:32:42 +04:00
LisoUseInAIKyrios	a14e03e4bb	chore(YouTube - Spoof video streams): Update iOS side effects text	2024-12-24 18:40:55 +04:00
semantic-release-bot	6f40b6d30f	chore: Release v5.7.2 [skip ci] ## [5.7.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2) (2024-12-24) ### Bug Fixes * YouTube - Hide layout components: Don't hide Shorts channel bar when toggling for video player ([`87e1c7f`](`87e1c7f4c8`)) * YouTube - Spoof video streams: Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([`ca21a69`](`ca21a69550`))	2024-12-24 06:55:57 +00:00
LisoUseInAIKyrios	1711e1c39d	chore: Merge branch `dev` to `main` (#4205 )	2024-12-24 10:52:54 +04:00
github-actions[bot]	25372828d1	chore: Sync translations (#4210 )	2024-12-24 10:52:18 +04:00
semantic-release-bot	f58245c6cd	chore: Release v5.7.2-dev.2 [skip ci] ## [5.7.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.2-dev.1...v5.7.2-dev.2) (2024-12-23) ### Bug Fixes * YouTube - Hide layout components: Don't hide Shorts channel bar when toggling for video player ([`87e1c7f`](`87e1c7f4c8`))	2024-12-23 23:00:32 +00:00
oSumAtrIX	87e1c7f4c8	fix(YouTube - Hide layout components): Don't hide Shorts channel bar when toggling for video player	2024-12-23 23:57:53 +01:00
semantic-release-bot	55d01c92d1	chore: Release v5.7.2-dev.1 [skip ci] ## [5.7.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2-dev.1) (2024-12-23) ### Bug Fixes * YouTube - Spoof video streams: Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([`ca21a69`](`ca21a69550`))	2024-12-23 18:42:40 +00:00
LisoUseInAIKyrios	ca21a69550	fix(YouTube - Spoof video streams): Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds (#4202 )	2024-12-23 22:39:27 +04:00
semantic-release-bot	634d0b4058	chore: Release v5.7.1 [skip ci] ## [5.7.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.0...v5.7.1) (2024-12-23) ### Bug Fixes * YouTube - SponsorBlock: Show a toast and not a dialog if segment submitted successfully ([`838edb4`](`838edb48e7`)) * YouTube - Spoof video streams: Use 2 letter device language code ([`e174113`](`e1741130af`)) * YouTube - Spoof video streams: Use Android VR authentication if using default audio language ([#4191](https://github.com/ReVanced/revanced-patches/issues/4191)) ([`99334d1`](`99334d1e53`)) * YouTube - Theme: Use dark theme color for status and navigation bar ([`4b81f70`](`4b81f7009b`)) * YouTube: Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([`0ae756b`](`0ae756b0fc`))	2024-12-23 01:16:40 +00:00
LisoUseInAIKyrios	47ea8d5ec8	chore: Merge branch `dev` to `main` (#4192 )	2024-12-23 05:13:45 +04:00
github-actions[bot]	9509ed53f3	chore: Sync translations (#4198 )	2024-12-23 04:53:27 +04:00
semantic-release-bot	39542ddf55	chore: Release v5.7.1-dev.5 [skip ci] ## [5.7.1-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.4...v5.7.1-dev.5) (2024-12-22) ### Bug Fixes * YouTube - Spoof video streams: Use 2 letter device language code ([`e174113`](`e1741130af`))	2024-12-22 23:40:44 +00:00
LisoUseInAIKyrios	e1741130af	fix(YouTube - Spoof video streams): Use 2 letter device language code	2024-12-23 03:37:21 +04:00
semantic-release-bot	e54eb3ce87	chore: Release v5.7.1-dev.4 [skip ci] ## [5.7.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.3...v5.7.1-dev.4) (2024-12-22) ### Bug Fixes * YouTube: Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([`0ae756b`](`0ae756b0fc`))	2024-12-22 17:45:50 +00:00
LisoUseInAIKyrios	0ae756b0fc	fix(YouTube): Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) (#4195 )	2024-12-22 21:42:41 +04:00
github-actions[bot]	77a0ac5c9c	chore: Sync translations (#4196 )	2024-12-22 21:42:29 +04:00
semantic-release-bot	899121b9de	chore: Release v5.7.1-dev.3 [skip ci] ## [5.7.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.2...v5.7.1-dev.3) (2024-12-22) ### Bug Fixes * YouTube - SponsorBlock: Show a toast and not a dialog if segment submitted successfully ([`838edb4`](`838edb48e7`))	2024-12-22 17:34:19 +00:00
LisoUseInAIKyrios	838edb48e7	fix(YouTube - SponsorBlock): Show a toast and not a dialog if segment submitted successfully	2024-12-22 21:31:41 +04:00
semantic-release-bot	b2665c916a	chore: Release v5.7.1-dev.2 [skip ci] ## [5.7.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.1...v5.7.1-dev.2) (2024-12-22) ### Bug Fixes * YouTube - Theme: Use dark theme color for status and navigation bar ([`4b81f70`](`4b81f7009b`))	2024-12-22 11:29:57 +00:00
LisoUseInAIKyrios	4b81f7009b	fix(YouTube - Theme): Use dark theme color for status and navigation bar	2024-12-22 15:27:02 +04:00
semantic-release-bot	1a4c39a2ee	chore: Release v5.7.1-dev.1 [skip ci] ## [5.7.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.0...v5.7.1-dev.1) (2024-12-22) ### Bug Fixes * YouTube - Spoof video streams: Use Android VR authentication if using default audio language ([#4191](https://github.com/ReVanced/revanced-patches/issues/4191)) ([`99334d1`](`99334d1e53`))	2024-12-22 10:26:04 +00:00
LisoUseInAIKyrios	99334d1e53	fix(YouTube - Spoof video streams): Use Android VR authentication if using default audio language (#4191 )	2024-12-22 14:22:49 +04:00
semantic-release-bot	2850a6ed4e	chore: Release v5.7.0 [skip ci] # [5.7.0](https://github.com/ReVanced/revanced-patches/compare/v5.6.0...v5.7.0) (2024-12-22) ### Bug Fixes * YouTube - Force original audio: Use correct availability for settings UI ([`a0b63df`](`a0b63dfa23`)) * YouTube - Spoof video stream: Remove UI client type setting. Allow setting default audio language. ([#4184](https://github.com/ReVanced/revanced-patches/issues/4184)) ([`aeedec7`](`aeedec7fed`)) * YouTube - Spoof video streams: Remove iOS, add clients Android TV and Android Creator ([#4180](https://github.com/ReVanced/revanced-patches/issues/4180)) ([`cdb6820`](`cdb68209d1`)) * YouTube: Change fingerprints to support a wider range of target versions ([`25d7cc6`](`25d7cc68ae`)) ### Features * YouTube: Support version `19.47.53` ([#4182](https://github.com/ReVanced/revanced-patches/issues/4182)) ([`b8635d0`](`b8635d0b88`))	2024-12-22 07:53:45 +00:00
LisoUseInAIKyrios	f28eb5105b	chore: Merge branch `dev` to `main` (#4188 )	2024-12-22 11:50:32 +04:00
github-actions[bot]	69bed4d9fa	chore: Sync translations (#4187 )	2024-12-22 11:49:37 +04:00
oSumAtrIX	a5f1efac27	chore: Merge branch `dev` to `main` (#4183 )	2024-12-22 08:48:36 +01:00
semantic-release-bot	b51be82cff	chore: Release v5.7.0-dev.1 [skip ci] # [5.7.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.4...v5.7.0-dev.1) (2024-12-21) ### Features * YouTube: Support version `19.47.53` ([#4182](https://github.com/ReVanced/revanced-patches/issues/4182)) ([`b8635d0`](`b8635d0b88`))	2024-12-21 15:09:41 +00:00
LisoUseInAIKyrios	b8635d0b88	feat(YouTube): Support version `19.47.53` (#4182 )	2024-12-21 19:06:51 +04:00
semantic-release-bot	78699c8bbf	chore: Release v5.6.1-dev.4 [skip ci] ## [5.6.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.3...v5.6.1-dev.4) (2024-12-21) ### Bug Fixes * YouTube - Spoof video stream: Remove UI client type setting. Allow setting default audio language. ([#4184](https://github.com/ReVanced/revanced-patches/issues/4184)) ([`aeedec7`](`aeedec7fed`))	2024-12-21 14:53:47 +00:00
LisoUseInAIKyrios	aeedec7fed	fix(YouTube - Spoof video stream): Remove UI client type setting. Allow setting default audio language. (#4184 )	2024-12-21 18:49:56 +04:00
semantic-release-bot	32b614696b	chore: Release v5.6.1-dev.3 [skip ci] ## [5.6.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.2...v5.6.1-dev.3) (2024-12-21) ### Bug Fixes * YouTube - Force original audio: Use correct availability for settings UI ([`a0b63df`](`a0b63dfa23`))	2024-12-21 12:11:12 +00:00
LisoUseInAIKyrios	a0b63dfa23	fix(YouTube - Force original audio): Use correct availability for settings UI	2024-12-21 16:08:22 +04:00
semantic-release-bot	f0f53cf72f	chore: Release v5.6.1-dev.2 [skip ci] ## [5.6.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.6.1-dev.1...v5.6.1-dev.2) (2024-12-21) ### Bug Fixes * YouTube - Spoof video streams: Remove iOS, add clients Android TV and Android Creator ([#4180](https://github.com/ReVanced/revanced-patches/issues/4180)) ([`cdb6820`](`cdb68209d1`))	2024-12-21 11:37:01 +00:00
LisoUseInAIKyrios	cdb68209d1	fix(YouTube - Spoof video streams): Remove iOS, add clients Android TV and Android Creator (#4180 )	2024-12-21 15:33:43 +04:00
semantic-release-bot	7369f7b8d5	chore: Release v5.6.1-dev.1 [skip ci] ## [5.6.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.6.0...v5.6.1-dev.1) (2024-12-21) ### Bug Fixes * YouTube: Change fingerprints to support a wider range of target versions ([`25d7cc6`](`25d7cc68ae`))	2024-12-21 10:44:05 +00:00
LisoUseInAIKyrios	db521b940b	refactor(YouTube): Change fingerprints to support a wider range of target versions (#4179 )	2024-12-21 14:41:22 +04:00
LisoUseInAIKyrios	25d7cc68ae	fix(YouTube): Change fingerprints to support a wider range of target versions	2024-12-21 12:55:18 +04:00
semantic-release-bot	9495064e6e	chore: Release v5.6.0 [skip ci] # [5.6.0](https://github.com/ReVanced/revanced-patches/compare/v5.5.1...v5.6.0) (2024-12-20) ### Bug Fixes * Twitter - Change link sharing domain: Use correct extension package ([`20a7ad4`](`20a7ad4715`)) * YouTube - Force original audio: Use correct original audio stream if app language is not English ([`1d0ec98`](`1d0ec98bec`)) * YouTube - Hide layout components: Hide new kind of community post ([#4155](https://github.com/ReVanced/revanced-patches/issues/4155)) ([`246333f`](`246333f3dc`)) * YouTube - Miniplayer: Use estimated maximum on screen size for devices with low density screens ([#4150](https://github.com/ReVanced/revanced-patches/issues/4150)) ([`c87c788`](`c87c788a26`)) * YouTube - Open Shorts in regular player: Do not show the miniplayer after opening a Short while a video is playing ([`c7f42d9`](`c7f42d9a3c`)) * YouTube - SponsorBlock: Show create new segment error messages using a dialog ([#4148](https://github.com/ReVanced/revanced-patches/issues/4148)) ([`44995a9`](`44995a9f15`)) * YouTube - Spoof video streams: Change default spoofing to iOS, allow setting a default language with Android VR ([#4171](https://github.com/ReVanced/revanced-patches/issues/4171)) ([`cd08717`](`cd08717783`)) * YouTube - Spoof video streams: Update iOS client version ([`ec746cb`](`ec746cb05a`)) ### Features * YouTube: Add `Open Shorts in regular player` patch ([#4153](https://github.com/ReVanced/revanced-patches/issues/4153)) ([`1dde485`](`1dde485013`))	2024-12-20 21:57:47 +00:00
LisoUseInAIKyrios	64864c2cdb	chore: Merge branch `dev` to `main` (#4147 )	2024-12-21 01:54:28 +04:00
github-actions[bot]	ad0ffb3328	chore: Sync translations (#4173 )	2024-12-21 01:48:25 +04:00
semantic-release-bot	06800324aa	chore: Release v5.6.0-dev.6 [skip ci] # [5.6.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.5...v5.6.0-dev.6) (2024-12-20) ### Bug Fixes * YouTube - Spoof video streams: Update iOS client version ([`ec746cb`](`ec746cb05a`))	2024-12-20 21:38:18 +00:00
LisoUseInAIKyrios	ec746cb05a	fix(YouTube - Spoof video streams): Update iOS client version	2024-12-21 01:35:06 +04:00
semantic-release-bot	67c5530ea6	chore: Release v5.6.0-dev.5 [skip ci] # [5.6.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.4...v5.6.0-dev.5) (2024-12-20) ### Bug Fixes * YouTube - Spoof video streams: Change default spoofing to iOS, allow setting a default language with Android VR ([#4171](https://github.com/ReVanced/revanced-patches/issues/4171)) ([`cd08717`](`cd08717783`))	2024-12-20 20:41:10 +00:00
LisoUseInAIKyrios	cd08717783	fix(YouTube - Spoof video streams): Change default spoofing to iOS, allow setting a default language with Android VR (#4171 )	2024-12-21 00:38:11 +04:00
semantic-release-bot	7bac023ea5	chore: Release v5.6.0-dev.4 [skip ci] # [5.6.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.3...v5.6.0-dev.4) (2024-12-20) ### Bug Fixes * YouTube - Force original audio: Use correct original audio stream if app language is not English ([`1d0ec98`](`1d0ec98bec`))	2024-12-20 16:29:05 +00:00
LisoUseInAIKyrios	1d0ec98bec	fix(YouTube - Force original audio): Use correct original audio stream if app language is not English	2024-12-20 20:26:17 +04:00
semantic-release-bot	3c603fac2d	chore: Release v5.6.0-dev.3 [skip ci] # [5.6.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.2...v5.6.0-dev.3) (2024-12-20) ### Bug Fixes * Twitter - Change link sharing domain: Use correct extension package ([`20a7ad4`](`20a7ad4715`))	2024-12-20 07:16:17 +00:00
LisoUseInAIKyrios	20a7ad4715	fix(Twitter - Change link sharing domain): Use correct extension package	2024-12-20 11:12:50 +04:00
semantic-release-bot	25a60e305e	chore: Release v5.6.0-dev.2 [skip ci] # [5.6.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.6.0-dev.1...v5.6.0-dev.2) (2024-12-19) ### Bug Fixes * YouTube - Open Shorts in regular player: Do not show the miniplayer after opening a Short while a video is playing ([`c7f42d9`](`c7f42d9a3c`))	2024-12-19 11:20:50 +00:00
LisoUseInAIKyrios	c7f42d9a3c	fix(YouTube - Open Shorts in regular player): Do not show the miniplayer after opening a Short while a video is playing	2024-12-19 15:18:18 +04:00
github-actions[bot]	670f100a29	chore: Sync translations (#4166 )	2024-12-19 15:17:50 +04:00
semantic-release-bot	19140e5918	chore: Release v5.6.0-dev.1 [skip ci] # [5.6.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.5.2-dev.2...v5.6.0-dev.1) (2024-12-19) ### Features * YouTube: Add `Open Shorts in regular player` patch ([#4153](https://github.com/ReVanced/revanced-patches/issues/4153)) ([`1dde485`](`1dde485013`))	2024-12-19 08:14:57 +00:00
LisoUseInAIKyrios	1dde485013	feat(YouTube): Add `Open Shorts in regular player` patch (#4153 )	2024-12-19 12:11:19 +04:00
LisoUseInAIKyrios	5efcdd31c8	ci: Don't upload strings to Crowdin when pulling (#4164 )	2024-12-18 19:04:09 +01:00
github-actions[bot]	e6529837cb	chore: Sync translations (#4162 )	2024-12-18 16:29:33 +04:00