chore(release): 2.169.1-dev.4 [skip ci]

## [2.169.1-dev.4](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.3...v2.169.1-dev.4) (2023-04-23) ### Bug Fixes * **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([936d9f6](936d9f61a3))
fix(twitch/block-embedded-ads): correct spelling mistake (#1962 )
2025-12-09 02:43:57 +01:00 · 2023-04-23 03:05:18 +00:00 · 2023-04-23 05:03:33 +02:00 · 2023-04-23 02:17:52 +00:00 · 2023-04-23 06:16:10 +04:00 · 2023-04-21 16:50:56 +00:00
78 changed files with 330 additions and 359 deletions
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +0,0 @@
-firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,62 +1,3 @@
-# [2.171.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.1...v2.171.0-dev.2) (2023-04-25)
-
-
-### Features
-
-* **youtube:** `hide-player-overlay` patch ([#1965](https://github.com/revanced/revanced-patches/issues/1965)) ([d233d96](https://github.com/revanced/revanced-patches/commit/d233d96faf838b22f4c458ad445af048362e7421))
-
-# [2.171.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.1-dev.1...v2.171.0-dev.1) (2023-04-25)
-
-
-### Features
-
-* **id-austria:** remove compatibility version constraint ([#1952](https://github.com/revanced/revanced-patches/issues/1952)) ([94ffd5a](https://github.com/revanced/revanced-patches/commit/94ffd5a26fe42f223a09ad6bd7f34f1fac0986ad))
-
-## [2.170.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.0...v2.170.1-dev.1) (2023-04-25)
-
-
-### Bug Fixes
-
-* **youtube/spoof-signature-verification:** additional fixes for subtitle window positions ([#1975](https://github.com/revanced/revanced-patches/issues/1975)) ([08584e6](https://github.com/revanced/revanced-patches/commit/08584e680fc658f37e8730499fa5197a08370776))
-
-# [2.170.0](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.170.0) (2023-04-24)
-
-
-### Bug Fixes
-
-* **enable-android-debugging:** don't include by default ([b2856f7](https://github.com/revanced/revanced-patches/commit/b2856f7f71640f78dfc11b3dff90a58add48d605))
-* **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([6138c2a](https://github.com/revanced/revanced-patches/commit/6138c2ac24f586137bc4ef974a6600d24ebdda3e))
-* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ab5842](https://github.com/revanced/revanced-patches/commit/3ab5842ebbee3381604efcaa454ea5c49d3a5363))
-* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
-* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
-* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([642eef3](https://github.com/revanced/revanced-patches/commit/642eef39e8e8eeb1f95980f95b83e79faffe3a18))
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([bb5885e](https://github.com/revanced/revanced-patches/commit/bb5885eca4b750f15776de9099fb4dd83f6d70f5))
-* **youtube:** bump compatibility to `18.15.40` ([ad82fcd](https://github.com/revanced/revanced-patches/commit/ad82fcdb63c7cc77e7387b7f0da95b005c90ce31))
-* **youtube:** constrain patches to `18.15.40` ([c0c10de](https://github.com/revanced/revanced-patches/commit/c0c10dec3446d35e20b17c25510cddcbe07b494f))
-* **youtube:** remove non working patch `hide-my-mix` ([6ae0f0b](https://github.com/revanced/revanced-patches/commit/6ae0f0b466322c4d60feb20ed0e809783452b9d4))
-* **youtube:** support version `18.15.40` ([c3614ab](https://github.com/revanced/revanced-patches/commit/c3614ab1d10a70fdb0813d7249866d696b28088f))
-
-# [2.170.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.4...v2.170.0-dev.1) (2023-04-24)
-
-
-### Bug Fixes
-
-* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([c78ab33](https://github.com/revanced/revanced-patches/commit/c78ab33a8d41694aaee60d0a3d99c51c95085489))
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([ac9ad79](https://github.com/revanced/revanced-patches/commit/ac9ad79f2ff4fbe4fa73b80bae88d12a03a287d7))
-* **youtube:** bump compatibility to `18.15.40` ([72008da](https://github.com/revanced/revanced-patches/commit/72008da28637bb6b4bf6f0e0ae1b6bce584dd696))
-* **youtube:** bump compatibility to `18.15.40` ([#1964](https://github.com/revanced/revanced-patches/issues/1964)) ([c4c6653](https://github.com/revanced/revanced-patches/commit/c4c6653c37b9675ff0f7b0f29470342c99caba34))
-* **youtube:** constrain patches to `18.15.40` ([dfbf8ab](https://github.com/revanced/revanced-patches/commit/dfbf8ab206e779fe2624d5f62c5dab170d68fce5))
-* **youtube:** remove non working patch `hide-my-mix` ([f8ea2cf](https://github.com/revanced/revanced-patches/commit/f8ea2cf3bcec3ec4bfb424ed8e4a640b505387d7))
-* **youtube:** support version `18.15.40` ([b2916a3](https://github.com/revanced/revanced-patches/commit/b2916a379a631481c0750e312d04a4c9e82590d6))
-
 ## [2.169.1-dev.4](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.3...v2.169.1-dev.4) (2023-04-23)


--- a/README.md
+++ b/README.md
@@ -9,60 +9,60 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 18.15.40 |
+| `always-autorepeat` | Always repeats the playing video again. | 18.08.37 |
 | `client-spoof` | Spoofs a patched client to allow playback. | all |
-| `comments` | Hides components related to comments. | 18.15.40 |
-| `copy-video-url` | Adds buttons in player to copy video links. | 18.15.40 |
+| `comments` | Hides components related to comments. | 18.08.37 |
+| `copy-video-url` | Adds buttons in player to copy video links. | 18.08.37 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 18.15.40 |
-| `custom-video-speed` | Adds more video speed options. | 18.15.40 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.15.40 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.15.40 |
-| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.15.40 |
-| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.15.40 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 18.08.37 |
+| `custom-video-speed` | Adds more video speed options. | 18.08.37 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.08.37 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.08.37 |
+| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.08.37 |
+| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.08.37 |
 | `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 18.15.40 |
+| `downloads` | Enables downloading music and videos from YouTube. | 18.08.37 |
 | `enable-debugging` | Adds debugging options. | all |
-| `general-ads` | Removes general ads. | 18.15.40 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.15.40 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 18.15.40 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 18.15.40 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.15.40 |
-| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.15.40 |
-| `hide-captions-button` | Hides the captions button on video player. | 18.15.40 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.08.37 |
+| `general-ads` | Removes general ads. | 18.08.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.08.37 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 18.08.37 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 18.08.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.08.37 |
+| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.08.37 |
+| `hide-captions-button` | Hides the captions button on video player. | 18.08.37 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 18.15.40 |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.15.40 |
-| `hide-email-address` | Hides the email address in the account switcher. | 18.15.40 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.15.40 |
-| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.15.40 |
-| `hide-info-cards` | Hides info cards in videos. | 18.15.40 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 18.08.37 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.08.37 |
+| `hide-email-address` | Hides the email address in the account switcher. | 18.08.37 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.08.37 |
+| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.08.37 |
+| `hide-info-cards` | Hides info cards in videos. | 18.08.37 |
+| `hide-my-mix` | Hides mix playlists. | 18.08.37 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
-| `hide-player-overlay` | Hides the dark player overlay when player controls are visible. | all |
-| `hide-seekbar` | Hides the seekbar. | 18.15.40 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.15.40 |
-| `hide-timestamp` | Hides timestamp in video player. | 18.15.40 |
-| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.15.40 |
-| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.15.40 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 18.15.40 |
-| `minimized-playback` | Enables minimized and background playback. | 18.15.40 |
-| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.15.40 |
-| `open-links-externally` | Open links outside of the app directly in your browser. | 18.15.40 |
+| `hide-seekbar` | Hides the seekbar. | 18.08.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.08.37 |
+| `hide-timestamp` | Hides timestamp in video player. | 18.08.37 |
+| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.08.37 |
+| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.08.37 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 18.08.37 |
+| `minimized-playback` | Enables minimized and background playback. | 18.08.37 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.08.37 |
+| `open-links-externally` | Open links outside of the app directly in your browser. | 18.08.37 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.15.40 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.15.40 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 18.15.40 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.15.40 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.15.40 |
-| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.15.40 |
-| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.15.40 |
-| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.15.40 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 18.15.40 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 18.15.40 |
+| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.08.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.08.37 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 18.08.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.08.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.08.37 |
+| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.08.37 |
+| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.08.37 |
+| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.08.37 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 18.08.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 18.08.37 |
 | `theme` | Applies a custom theme. | all |
-| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.15.40 |
-| `video-ads` | Removes ads in the video player. | 18.15.40 |
-| `wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.15.40 |
+| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.08.37 |
+| `video-ads` | Removes ads in the video player. | 18.08.37 |
 </details>

 ### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
@@ -182,8 +182,8 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | all |
-| `spoof-signature` | Spoofs the signature of the app. | all |
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.6.0 |
+| `spoof-signature` | Spoofs the signature of the app. | 2.6.0 |
 </details>

 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.171.0-dev.2
+version = 2.169.1-dev.4
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import org.w3c.dom.Element

--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
@@ -3,6 +3,6 @@ package app.revanced.patches.idaustria.detection.shared.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility([Package("at.gv.oe.app")])
+@Compatibility([Package("at.gv.oe.app", arrayOf("2.5.2", "2.6.0"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/annotations/PivotBarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/annotations/PivotBarCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt
@@ -13,8 +13,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/annotations/CommentsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/annotations/CommentsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndScreenCardsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndScreenCardsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/annotations/MixPlaylistsPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/annotations/MixPlaylistsPatchCompatibility.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.layout.hide.mixplaylists.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf(
+            "17.49.37",
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40",
+            "18.08.37"
+        )
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+internal annotation class MixPlaylistsPatchCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/fingerprints/CreateMixPlaylistFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/fingerprints/CreateMixPlaylistFingerprint.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object CreateMixPlaylistFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/fingerprints/SecondCreateMixPlaylistFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/fingerprints/SecondCreateMixPlaylistFingerprint.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object SecondCreateMixPlaylistFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/patch/MixPlaylistsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/patch/MixPlaylistsPatch.kt
@@ -0,0 +1,64 @@
+package app.revanced.patches.youtube.layout.hide.mixplaylists.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.hide.mixplaylists.annotations.MixPlaylistsPatchCompatibility
+import app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints.CreateMixPlaylistFingerprint
+import app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints.SecondCreateMixPlaylistFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([IntegrationsPatch::class])
+@Name("hide-my-mix")
+@Description("Hides mix playlists.")
+@MixPlaylistsPatchCompatibility
+@Version("0.0.1")
+class MixPlaylistsPatch : BytecodePatch(
+    listOf(
+        CreateMixPlaylistFingerprint, SecondCreateMixPlaylistFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_mix_playlists",
+                StringResource("revanced_hide_mix_playlists_title", "Hide mix playlists"),
+                false,
+                StringResource("revanced_hide_mix_playlists_summary_on", "Mix playlists are hidden"),
+                StringResource("revanced_hide_mix_playlists_summary_off", "Mix playlists are shown")
+            )
+        )
+
+        arrayOf(CreateMixPlaylistFingerprint, SecondCreateMixPlaylistFingerprint).forEach(::addHook)
+
+        return PatchResultSuccess()
+    }
+
+    private fun addHook(fingerprint: MethodFingerprint) {
+        with (fingerprint.result!!) {
+            val insertIndex = scanResult.patternScanResult!!.endIndex - 3
+
+            val register = (mutableMethod.instruction(insertIndex - 2) as OneRegisterInstruction).registerA
+
+            mutableMethod.addInstruction(
+                insertIndex,
+                "invoke-static {v$register}, Lapp/revanced/integrations/patches/HideMixPlaylistsPatch;->hideMixPlaylists(Landroid/view/View;)V"
+            )
+        }
+
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HidePlayerOverlayPatchCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/patch/HidePlayerOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/patch/HidePlayerOverlayPatch.kt
@@ -1,46 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.player.overlay.annotations.HidePlayerOverlayPatchCompatibility
-
-@Patch
-@Name("hide-player-overlay")
-@Description("Hides the dark player overlay when player controls are visible.")
-@HidePlayerOverlayPatchCompatibility
-@Version("0.0.1")
-class HidePlayerOverlayPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        val attributes = arrayOf("height", "width")
-
-        context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
-            editor.file.getElementsByTagName("FrameLayout").item(0).childNodes.apply {
-                for (i in 1 until length) {
-                    val view = item(i)
-                    if (
-                        view.attributes.getNamedItem("android:id")
-                            ?.nodeValue
-                            ?.endsWith("scrim_overlay") == true
-                    ) {
-                        attributes.forEach {
-                            view.attributes.getNamedItem("android:layout_$it").nodeValue = "0.0dip"
-                        }
-                        break
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val RESOURCE_FILE_PATH = "res/layout/youtube_controls_overlay.xml"
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watchinvr/annotations/WatchinVRCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watchinvr/annotations/WatchinVRCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWaterwarkCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWaterwarkCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt
@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.layout.returnyoutubedislike.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility([Package("com.google.android.youtube", arrayOf("18.15.40"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class ReturnYouTubeDislikeCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextComponentParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextComponentParentFingerprint.kt
@@ -1,10 +1,13 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

 object ShortsTextComponentParentFingerprint : MethodFingerprint(
    returnType = "V",
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL,
    parameters = listOf("L", "L"),
    opcodes = listOf(
        Opcode.INVOKE_STATIC,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
@@ -16,16 +16,15 @@ object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
        Opcode.MOVE_OBJECT, // available unused register
        Opcode.MOVE_OBJECT_FROM16,
        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_FROM16,
        Opcode.INVOKE_VIRTUAL, // CharSequence atomic reference
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.CHECK_CAST,
        Opcode.MOVE_OBJECT, // CharSequence reference, and control flow label. Insert code here.
-        Opcode.INVOKE_VIRTUAL,
+        Opcode.INVOKE_VIRTUAL_RANGE,
        Opcode.MOVE_RESULT,
        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
+        Opcode.INVOKE_VIRTUAL_RANGE,
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.GOTO,
        Opcode.CONST_4,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
@@ -26,7 +26,6 @@ import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@@ -102,15 +101,14 @@ class ReturnYouTubeDislikePatch : BytecodePatch(

            textComponentContextFingerprintResult.mutableMethod.apply {
                // Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
-                val conversionContextFieldReference =
-                    (instruction(conversionContextIndex) as ReferenceInstruction).reference
-                // any free register
-                val contextRegister =
+                val conversionContextFieldName =
+                    (instruction(conversionContextIndex) as ReferenceInstruction).reference.toString()
+                val contextRegister = // any free register
                    (instruction(atomicReferenceStartIndex) as TwoRegisterInstruction).registerB
                val atomicReferenceRegister =
-                    (instruction(atomicReferenceStartIndex + 5) as FiveRegisterInstruction).registerC
+                    (instruction(atomicReferenceStartIndex + 4) as BuilderInstruction35c).registerC

-                val insertIndex = atomicReferenceStartIndex + 8
+                val insertIndex = atomicReferenceStartIndex + 7
                val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction
                val charSequenceRegister = moveCharSequenceInstruction.registerB

@@ -119,10 +117,10 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                replaceInstruction(insertIndex, "move-object/from16 v$contextRegister, p0")
                addInstructions(
                    insertIndex + 1, """
-                        iget-object v$contextRegister, v$contextRegister, $conversionContextFieldReference  # copy obfuscated context field into free register
+                        iget-object v$contextRegister, v$contextRegister, $conversionContextFieldName  # copy obfuscated context field into free register
                        invoke-static {v$contextRegister, v$atomicReferenceRegister, v$charSequenceRegister}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
                        move-result-object v$charSequenceRegister
-                        move-object v${moveCharSequenceInstruction.registerA}, v${charSequenceRegister}  # original instruction at the insertion point
+                        move-object v${moveCharSequenceInstruction.registerA}, v${moveCharSequenceInstruction.registerB}  # original instruction at the insertion point
                    """
                )
            }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/fingerprints/CreateSearchSuggestionsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/fingerprints/CreateSearchSuggestionsFingerprint.kt
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.searchbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object CreateSearchSuggestionsFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4
-    ),
-    strings = listOf("ss_rds")
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/fingerprints/DrawActionBarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/fingerprints/DrawActionBarFingerprint.kt
@@ -0,0 +1,27 @@
+package app.revanced.patches.youtube.layout.searchbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object DrawActionBarFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PRIVATE or AccessFlags.FINAL,
+    listOf("I", "I"),
+    listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
@@ -17,46 +17,22 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.searchbar.annotations.WideSearchbarCompatibility
-import app.revanced.patches.youtube.layout.searchbar.fingerprints.CreateSearchSuggestionsFingerprint
+import app.revanced.patches.youtube.layout.searchbar.fingerprints.DrawActionBarFingerprint
 import app.revanced.patches.youtube.layout.searchbar.fingerprints.SetWordmarkHeaderFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch

@Patch
@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("wide-searchbar")
+@Name("enable-wide-searchbar")
@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
@WideSearchbarCompatibility
@Version("0.0.1")
 class WideSearchbarPatch : BytecodePatch(
    listOf(
-        SetWordmarkHeaderFingerprint, CreateSearchSuggestionsFingerprint
+        SetWordmarkHeaderFingerprint, DrawActionBarFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_wide_searchbar",
-                StringResource("revanced_wide_searchbar_enabled_title", "Enable wide search bar"),
-                false,
-                StringResource("revanced_wide_searchbar_summary_on", "Wide search bar is enabled"),
-                StringResource("revanced_wide_searchbar_summary_off", "Wide search bar is disabled")
-            )
-        )
-
-        val result = CreateSearchSuggestionsFingerprint.result ?: return CreateSearchSuggestionsFingerprint.toErrorResult()
-
-        // patch methods
-        mapOf(
-            SetWordmarkHeaderFingerprint to 1,
-            CreateSearchSuggestionsFingerprint to result.scanResult.patternScanResult!!.startIndex
-        ).forEach { (fingerprint, callIndex) ->
-            context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
-        }
-
-        return PatchResultSuccess()
-    }
-
    private companion object {
        /**
         * Walk a fingerprints method at a given index mutably.
@@ -68,7 +44,7 @@ class WideSearchbarPatch : BytecodePatch(
        fun BytecodeContext.walkMutable(index: Int, fromFingerprint: MethodFingerprint) =
            fromFingerprint.result?.let {
                toMethodWalker(it.method).nextMethod(index, true).getMethod() as MutableMethod
-            } ?: throw fromFingerprint.toErrorResult()
+            } ?: throw SetWordmarkHeaderFingerprint.toErrorResult()


        /**
@@ -79,10 +55,34 @@ class WideSearchbarPatch : BytecodePatch(
            addInstructions(
                implementation!!.instructions.size - 1,
                """
-                    invoke-static {}, Lapp/revanced/integrations/patches/WideSearchbarPatch;->enableWideSearchbar()Z
+                    invoke-static {}, Lapp/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
                    move-result p0
                """
            )
        }
    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_wide_searchbar",
+                StringResource("revanced_wide_searchbar_enabled_title", "Enable wide search bar"),
+                false,
+                StringResource("revanced_wide_searchbar_summary_on", "Wide search bar is enabled"),
+                StringResource("revanced_wide_searchbar_summary_off", "Wide search bar is disabled")
+            )
+        )
+
+        val result = DrawActionBarFingerprint.result ?: return DrawActionBarFingerprint.toErrorResult()
+
+        // patch methods
+        mapOf(
+            SetWordmarkHeaderFingerprint to 1,
+            DrawActionBarFingerprint to result.scanResult.patternScanResult!!.endIndex
+        ).forEach { (fingerprint, callIndex) ->
+            context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
+        }
+
+        return PatchResultSuccess()
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
+    [Package("com.google.android.youtube", arrayOf("18.08.37"))]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class SponsorBlockCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -21,9 +21,7 @@ import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
 import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.AppendTimeFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.PlayerOverlaysLayoutInitFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.RectangleFieldInvalidatorFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
 import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
@@ -155,22 +153,14 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        /*
         * Draw segment
         */
-
-        // Find the drawCircle call and draw the segment before it
-        for (i in seekbarMethodInstructions.size - 1 downTo 0) {
-            val invokeInstruction = seekbarMethodInstructions[i] as? ReferenceInstruction ?: continue
-            if ((invokeInstruction.reference as MethodReference).name != "drawCircle") continue
-
-            val (canvasInstance, centerY) = (invokeInstruction as FiveRegisterInstruction).let {
-                it.registerC to it.registerE
-            }
-            seekbarMethod.addInstruction(
-                i,
-                "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
-            )
-
-            break
+        val drawSegmentInstructionInsertIndex = (seekbarMethodInstructions.size - 1 - 2)
+        val (canvasInstance, centerY) = (seekbarMethodInstructions[drawSegmentInstructionInsertIndex] as FiveRegisterInstruction).let {
+            it.registerC to it.registerE
        }
+        seekbarMethod.addInstruction(
+            drawSegmentInstructionInsertIndex,
+            "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
+        )

        /*
         * Voting & Shield button
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt
@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.layout.tabletminiplayer.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility([Package("com.google.android.youtube", arrayOf("18.15.40"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class TabletMiniPlayerCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt
@@ -9,5 +9,5 @@ object MiniPlayerOverrideParentFingerprint : MethodFingerprint(
    returnType = "L",
    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
    parameters = listOf("L"),
-    strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
+    strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@@ -67,9 +67,10 @@ class TabletMiniPlayerPatch : BytecodePatch(
         */
        MiniPlayerOverrideParentFingerprint.result?.let {
            if (!MiniPlayerOverrideFingerprint.resolve(context, it.classDef))
-                throw MiniPlayerOverrideFingerprint.toErrorResult()
+                return MiniPlayerOverrideFingerprint.toErrorResult()

            MiniPlayerOverrideFingerprint.addProxyCall()
+
        } ?: return MiniPlayerOverrideParentFingerprint.toErrorResult()

        /*
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
@@ -4,17 +4,16 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.debugging.annotations.DebuggingCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.w3c.dom.Element

@Patch
@Name("enable-debugging")
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/annotation/FixBackToExitGestureCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/annotation/FixBackToExitGestureCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/annotation/ProtobufSpoofCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/annotation/ProtobufSpoofCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
@@ -24,7 +24,6 @@ import app.revanced.patches.youtube.misc.fix.playback.fingerprints.SubtitleWindo
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@@ -35,8 +34,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
    IntegrationsPatch::class,
    SettingsPatch::class,
    PlayerTypeHookPatch::class,
-    ClientSpoofPatch::class,
-    VideoIdPatch::class
+    ClientSpoofPatch::class
 ])
@Version("0.0.1")
 class SpoofSignatureVerificationPatch : BytecodePatch(
@@ -59,9 +57,6 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
            )
        )

-        // Hook video id, required for subtitle fix.
-        VideoIdPatch.injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
-
        // hook parameter
        ProtobufParameterBuilderFingerprint.result?.let {
            val setParamMethod = context
@@ -107,7 +102,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
                        invoke-static {p1, p2, p3, p4, p5}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSubtitleWindowSettingsOverride(IIIZZ)[I
                        move-result-object v0
                        const/4 v1, 0x0
-                        aget p1, v0, v1     # ap, anchor position
+                        aget p1, v0, v1     # ap, anchor configuration
                        const/4 v1, 0x1
                        aget p2, v0, v1     # ah, horizontal anchor
                        const/4 v1, 0x2
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/annotations/OpenLinksExternallyCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/annotations/OpenLinksExternallyCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/annotation/LithoFilterCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/annotation/LithoFilterCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
@@ -9,5 +9,5 @@ object ComponentContextParserFingerprint : MethodFingerprint(
        Opcode.IPUT_OBJECT,
        Opcode.NEW_INSTANCE
    ),
-    strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings")
+    strings = listOf("LoggingProperties are not in proto format")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
@@ -10,6 +10,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -21,7 +22,6 @@ import app.revanced.patches.youtube.misc.litho.filter.fingerprints.ReadComponent
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction

@DependsOn([IntegrationsPatch::class])
@Description("Hooks the method which parses the bytes into a ComponentContext to filter components.")
@@ -44,15 +44,15 @@ class LithoFilterPatch : BytecodePatch(
                val insertHookIndex = result.scanResult.patternScanResult!!.endIndex
                val builderMethodDescriptor = instruction(builderMethodIndex).descriptor
                val emptyComponentFieldDescriptor = instruction(emptyComponentFieldIndex).descriptor
-                // Register is overwritten right after it is used in this patch, therefore free to clobber.
-                val clobberedRegister = instruction(insertHookIndex - 1).twoRegisterA
+                // Register is overwritten right after it is used for this patch, therefore free to clobber.
+                val clobberedRegister = instruction(insertHookIndex).oneRegister

                @Suppress("UnnecessaryVariable")
                // The register, this patch clobbers, is previously used for the StringBuilder,
                // later on a new StringBuilder is instantiated on it.
                val stringBuilderRegister = clobberedRegister

-                val identifierRegister = instruction(ReadComponentIdentifierFingerprint.patternScanEndIndex).oneRegisterA
+                val identifierRegister = instruction(ReadComponentIdentifierFingerprint.patternScanEndIndex).oneRegister

                addInstructions(
                    insertHookIndex, // right after setting the component.pathBuilder field,
@@ -69,7 +69,7 @@ class LithoFilterPatch : BytecodePatch(
                    listOf(ExternalLabel("not_an_ad", instruction(insertHookIndex)))
                )
            }
-        } ?: return ComponentContextParserFingerprint.toErrorResult()
+        } ?: return PatchResultError("Could not find the method to hook.")

        return PatchResultSuccess()
    }
@@ -81,10 +81,8 @@ class LithoFilterPatch : BytecodePatch(
        val Instruction.descriptor
            get() = (this as ReferenceInstruction).reference.toString()

-        val Instruction.oneRegisterA
+        val Instruction.oneRegister
            get() = (this as OneRegisterInstruction).registerA

-        val Instruction.twoRegisterA
-            get() = (this as TwoRegisterInstruction).registerA
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt
@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
+    [Package("com.google.android.youtube", arrayOf("18.08.37"))]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class VideoInformationCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/quality/annotations/RememberVideoQualityCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/quality/annotations/RememberVideoQualityCompatibility.kt
@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
+    [Package("com.google.android.youtube", arrayOf("18.08.37"))]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class RememberVideoQualityCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/custom/annotations/CustomPlaybackSpeedCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/custom/annotations/CustomPlaybackSpeedCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/annotation/RememberPlaybackSpeedCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/annotation/RememberPlaybackSpeedCompatibility.kt
@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
+    [Package("com.google.android.youtube", arrayOf("18.08.37"))]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class RememberPlaybackSpeedCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/annotation/VideoIdCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/annotation/VideoIdCompatibility.kt
@@ -14,8 +14,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/annotations/CustomVideoBufferCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/annotations/CustomVideoBufferCompatibility.kt
@@ -15,8 +15,7 @@ import app.revanced.patcher.annotation.Package
            "18.05.32",
            "18.05.35",
            "18.05.40",
-            "18.08.37",
-            "18.15.40"
+            "18.08.37"
        )
    )]
 )
Author	SHA1	Message	Date
semantic-release-bot	274b6959f7	chore(release): 2.169.1-dev.4 [skip ci] ## [2.169.1-dev.4](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.3...v2.169.1-dev.4) (2023-04-23) ### Bug Fixes * twitch/block-embedded-ads: correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([`936d9f6`](`936d9f61a3`))	2023-04-23 03:05:18 +00:00
parknich081	936d9f61a3	fix(twitch/block-embedded-ads): correct spelling mistake (#1962 )	2023-04-23 05:03:33 +02:00
semantic-release-bot	6c62db8019	chore(release): 2.169.1-dev.3 [skip ci] ## [2.169.1-dev.3](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.2...v2.169.1-dev.3) (2023-04-23) ### Bug Fixes * youtube/hide-video-action-buttons: fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([`064557c`](`064557c0c8`))	2023-04-23 02:17:52 +00:00
LisoUseInAIKyrios	064557c0c8	fix(youtube/hide-video-action-buttons): fix hide action buttons not working for some users (#1959 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-04-23 06:16:10 +04:00
semantic-release-bot	85a32e833e	chore(release): 2.169.1-dev.2 [skip ci] ## [2.169.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.1...v2.169.1-dev.2) (2023-04-21) ### Bug Fixes * "enable-android-debugging: don't include by default ([`5614651`](`5614651d34`))	2023-04-21 16:50:56 +00:00
oSumAtrIX	5614651d34	fix("enable-android-debugging): don't include by default	2023-04-21 18:49:10 +02:00