chore(release): 2.63.0 [skip ci]

# [2.63.0](https://github.com/revanced/revanced-patches/compare/v2.62.0...v2.63.0) (2022-09-21) ### Features * `disable-auto-player-popup-panels` ([#543](https://github.com/revanced/revanced-patches/issues/543)) ([35f1323](68ec6d2258)) * disable sponsorblock on shorts ([#439](https://github.com/revanced/revanced-patches/issues/439)) ([5b0a6af](dce28760f5))
feat: disable sponsorblock on shorts (#439 )
2026-01-16 15:53:58 +00:00 · 2022-09-21 01:06:10 +00:00 · 2022-09-21 03:03:47 +02:00 · 2022-09-21 03:02:20 +02:00 · 2022-09-21 01:00:46 +00:00 · 2022-09-21 02:58:39 +02:00
84 changed files with 1134 additions and 491 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -59,3 +59,15 @@ body:
      description: Add additional context here.
    validations:
      required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
--- a/.github/ISSUE_TEMPLATE/patch-request.yml
+++ b/.github/ISSUE_TEMPLATE/patch-request.yml
@@ -27,3 +27,15 @@ body:
      description: Why should your patch request should be considered? What makes it valuable to the community?
    validations:
      required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,103 @@
+# [2.63.0](https://github.com/revanced/revanced-patches/compare/v2.62.0...v2.63.0) (2022-09-21)
+
+
+### Features
+
+* `disable-auto-player-popup-panels` ([#543](https://github.com/revanced/revanced-patches/issues/543)) ([d1fa2c3](https://github.com/revanced/revanced-patches/commit/d1fa2c3bc359018146f1f90b1ed4448b7f19b247))
+* disable sponsorblock on shorts ([#439](https://github.com/revanced/revanced-patches/issues/439)) ([47fbcba](https://github.com/revanced/revanced-patches/commit/47fbcba3f845b5c3ef35c4dded8d6f9ffafc5d9e))
+
+# [2.62.0](https://github.com/revanced/revanced-patches/compare/v2.61.1...v2.62.0) (2022-09-21)
+
+
+### Features
+
+* `hide-time-and-seekbar` patch ([#544](https://github.com/revanced/revanced-patches/issues/544)) ([ef7afc7](https://github.com/revanced/revanced-patches/commit/ef7afc7231f8fa6b9b7f84c2b5b9a9fda80aa0f4))
+
+## [2.61.1](https://github.com/revanced/revanced-patches/compare/v2.61.0...v2.61.1) (2022-09-21)
+
+
+### Bug Fixes
+
+* **sponsorblock:** reflect strings from official guidelines ([#523](https://github.com/revanced/revanced-patches/issues/523)) ([1c83959](https://github.com/revanced/revanced-patches/commit/1c83959e69bfbf5140edbf7ef4d2c8901975bfd4))
+
+# [2.61.0](https://github.com/revanced/revanced-patches/compare/v2.60.0...v2.61.0) (2022-09-20)
+
+
+### Features
+
+* section `acknowledgements` for issue templates ([f663935](https://github.com/revanced/revanced-patches/commit/f663935382036cfdccf04627ca77306c5f951b4c))
+
+# [2.60.0](https://github.com/revanced/revanced-patches/compare/v2.59.0...v2.60.0) (2022-09-19)
+
+
+### Features
+
+* **downloads:** missing package installation request ([bc9e81a](https://github.com/revanced/revanced-patches/commit/bc9e81a6c343a912cab6fe3c2560d759fbf1be8a))
+
+# [2.59.0](https://github.com/revanced/revanced-patches/compare/v2.58.0...v2.59.0) (2022-09-18)
+
+
+### Features
+
+* **sponsorblock:** string for response error code 400 ([#512](https://github.com/revanced/revanced-patches/issues/512)) ([d42569f](https://github.com/revanced/revanced-patches/commit/d42569fcc4367fa65c5c88ddc75098d4e208f7f3))
+
+# [2.58.0](https://github.com/revanced/revanced-patches/compare/v2.57.0...v2.58.0) (2022-09-18)
+
+
+### Bug Fixes
+
+* **hdr-auto-brightness:** increase patching compatibility across versions ([bc5c8c1](https://github.com/revanced/revanced-patches/commit/bc5c8c118d5f95905fb7f0fb6afaf97bdcb753bf))
+* **hide-create-button:** increase patching compatibility across versions ([b217a1e](https://github.com/revanced/revanced-patches/commit/b217a1e89f4b9e3ad030ece08a1b81e507c7cc02))
+* **hide-shorts-button:** increase patching compatibility across versions ([7f17934](https://github.com/revanced/revanced-patches/commit/7f1793490f25b9fa16539e80cdc417b3b3e0e639))
+
+
+### Features
+
+* bump patches compatibility to v17.36.37 ([4493d7e](https://github.com/revanced/revanced-patches/commit/4493d7e6c7d76760cf4bc93968bf425b23c994de))
+
+# [2.57.0](https://github.com/revanced/revanced-patches/compare/v2.56.1...v2.57.0) (2022-09-16)
+
+
+### Features
+
+* **amoled:** remove in favour of `theme` patch ([0032301](https://github.com/revanced/revanced-patches/commit/00323010ed7356a639e4e86916dcbae96a53f7f6))
+* **theme:** arbitrary background color for dark theme ([afd5502](https://github.com/revanced/revanced-patches/commit/afd5502afdb207d5f52516653869b26fae7e5d21))
+
+## [2.56.1](https://github.com/revanced/revanced-patches/compare/v2.56.0...v2.56.1) (2022-09-15)
+
+
+### Bug Fixes
+
+* `auto-captions` patch switch description ([#488](https://github.com/revanced/revanced-patches/issues/488)) ([57824fb](https://github.com/revanced/revanced-patches/commit/57824fb16c56889d8f18299e9bab2563bb13e5c2))
+
+# [2.56.0](https://github.com/revanced/revanced-patches/compare/v2.55.0...v2.56.0) (2022-09-15)
+
+
+### Features
+
+* **tiktok-download:** custom download path ([#479](https://github.com/revanced/revanced-patches/issues/479)) ([944aa48](https://github.com/revanced/revanced-patches/commit/944aa485cec513faa30a21b91887dcacf9d70b45))
+
+# [2.55.0](https://github.com/revanced/revanced-patches/compare/v2.54.1...v2.55.0) (2022-09-15)
+
+
+### Features
+
+* `disable-auto-captions` patch ([#435](https://github.com/revanced/revanced-patches/issues/435)) ([8ee12d0](https://github.com/revanced/revanced-patches/commit/8ee12d0beadfd0a8fdce0a331646e8786527e84d))
+
+## [2.54.1](https://github.com/revanced/revanced-patches/compare/v2.54.0...v2.54.1) (2022-09-14)
+
+
+### Bug Fixes
+
+* alignment of download button icon ([#477](https://github.com/revanced/revanced-patches/issues/477)) ([2093f11](https://github.com/revanced/revanced-patches/commit/2093f11e762c471a0987fb57f03c7f48d565fdce))
+
+# [2.54.0](https://github.com/revanced/revanced-patches/compare/v2.53.0...v2.54.0) (2022-09-14)
+
+
+### Features
+
+* bump YouTube Music patches to v5.23.50 ([#462](https://github.com/revanced/revanced-patches/issues/462)) ([15c10b1](https://github.com/revanced/revanced-patches/commit/15c10b1e0368a021b0f2ec46bc2e9ea84a5d5afd))
+
 # [2.53.0](https://github.com/revanced/revanced-patches/compare/v2.52.3...v2.53.0) (2022-09-13)


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

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.22.54 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.22.54 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.22.54 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.22.54 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.22.54 |
-| `background-play` | Enables playing music in the background. | 5.22.54 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.22.54 |
-| `music-video-ads` | Removes ads in the music player. | 5.22.54 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.22.54 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.22.54 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.23.50 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.23.50 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.23.50 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.23.50 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.23.50 |
+| `background-play` | Enables playing music in the background. | 5.23.50 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.23.50 |
+| `music-video-ads` | Removes ads in the music player. | 5.23.50 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.23.50 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.23.50 |
 </details>

 ### 📦 `de.dwd.warnapp`
@@ -59,7 +59,7 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tiktok-download` | Remove restrictions on downloads video. | all |
+| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
@@ -69,7 +69,7 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tiktok-download` | Remove restrictions on downloads video. | all |
+| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
@@ -79,37 +79,39 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.33.42 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.33.42 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.33.42 |
-| `amoled` | Enables pure black theme. | all |
-| `disable-create-button` | Hides the create button in the navigation bar. | 17.33.42 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.36.37 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.36.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.36.37 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.33.42 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.33.42 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.36.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.36.37 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.33.42 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.33.42 |
-| `theme` | Enables a custom theme. | all |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.33.42 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.33.42 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.33.42 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.33.42 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.33.42 |
-| `minimized-playback` | Enables minimized and background playback. | 17.33.42 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.36.37 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.36.37 |
+| `theme` | Applies a custom theme. | all |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.36.37 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.36.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.36.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.36.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.36.37 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.36.37 |
+| `minimized-playback` | Enables minimized and background playback. | 17.36.37 |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.33.42 |
-| `always-autorepeat` | Always repeats the playing video again. | 17.33.42 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.33.42 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.36.37 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.36.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.36.37 |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
 | `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.33.42 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.33.42 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.33.42 |
-| `video-ads` | Removes ads in the video player. | 17.33.42 |
-| `general-ads` | Removes general ads. | 17.33.42 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.33.42 |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.36.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.36.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.36.37 |
+| `video-ads` | Removes ads in the video player. | 17.36.37 |
+| `general-ads` | Removes general ads. | 17.36.37 |
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.36.37 |
 </details>

 ### 📦 `com.vanced.android.youtube`
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,9 +20,8 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:4.2.3")
+    implementation("app.revanced:revanced-patcher:4.4.2")
    implementation("app.revanced:multidexlib2:2.5.2.r2")
-
    // Required for meta
    implementation("com.google.code.gson:gson:2.9.1")
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.53.0
+version = 2.63.0
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt
@@ -10,7 +10,7 @@ import app.revanced.patcher.annotation.Package
 */
@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("download-path-parent-fingerprint")
+@MatchingMethod("LX/4bF;", "LIZ")
+@DownloadsCompatibility
+@Version("0.0.1")
+object DownloadPathParentFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf(
+        "code",
+        "reason",
+        "params insufficient"
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -4,24 +4,34 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.*
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.StringReference

@Patch
@Name("tiktok-download")
-@Description("Remove restrictions on downloads video.")
+@Description("Removes download restrictions and changes the default path to download to.")
@DownloadsCompatibility
@Version("0.0.1")
 class DownloadsPatch : BytecodePatch(
    listOf(
        ACLCommonShareFingerprint,
        ACLCommonShareFingerprint2,
-        ACLCommonShareFingerprint3
+        ACLCommonShareFingerprint3,
+        DownloadPathParentFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
@@ -50,7 +60,76 @@ class DownloadsPatch : BytecodePatch(
                return v0
            """
        )
+        //Change the download path patch
+        val method4 = DownloadPathParentFingerprint.result!!.mutableMethod
+        val implementation4 = method4.implementation
+        val instructions = implementation4!!.instructions
+        var targetOffset = -1
+        //Search for the target method called instruction offset.
+        for ((index, instruction) in instructions.withIndex()) {
+            if (instruction.opcode != Opcode.CONST_STRING) continue
+            val reference = (instruction as ReferenceInstruction).reference as StringReference
+            if (reference.string != "video/mp4") continue
+            val targetInstruction = instructions[index + 1]
+            if (targetInstruction.opcode != Opcode.INVOKE_STATIC) continue
+            targetOffset = index + 1
+            break
+        }
+        if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
+        //Change videos' download path.
+        val downloadPath = "$downloadPathParent/$downloadPathChild"
+        val downloadUriMethod = data
+            .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
+            .nextMethod(targetOffset, true)
+            .getMethod() as MutableMethod
+        downloadUriMethod.implementation!!.instructions.forEachIndexed { index, instruction ->
+            if (instruction.opcode == Opcode.SGET_OBJECT) {
+                val overrideRegister = (instruction as OneRegisterInstruction).registerA
+                downloadUriMethod.replaceInstruction(
+                    index,
+                    """
+                        const-string v$overrideRegister, "$downloadPath"
+                    """
+                )
+            }
+            if (instruction.opcode == Opcode.CONST_STRING) {
+                val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+                if (string.contains("/Camera")) {
+                    val overrideRegister = (instruction as OneRegisterInstruction).registerA
+                    val overrideString = string.replace("/Camera", "")
+                    downloadUriMethod.replaceInstruction(
+                        index,
+                        """
+                            const-string v$overrideRegister, "$overrideString"
+                        """
+                    )
+                }
+            }
+        }
        return PatchResultSuccess()
    }

+    companion object : OptionsContainer() {
+        private var downloadPathParent: String? by option(
+            PatchOption.StringListOption(
+                key = "mediaFolder",
+                default = "DCIM",
+                options = listOf(
+                    "DCIM", "Movies", "Pictures"
+                ),
+                title = "Media folder",
+                description = "The media root folder to download to.",
+                required = true
+            )
+        )
+        private var downloadPathChild: String? by option(
+            PatchOption.StringOption(
+                key = "downloadPath",
+                default = "TikTok",
+                title = "Download path",
+                description = "Download path relative to the media folder.",
+                required = true
+            )
+        )
+    }
 }
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/annotations/HideInfocardSuggestionsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/annotations/HideInfocardSuggestionsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.27.39", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.27.39", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.amoled.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class AmoledCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt
@@ -1,28 +0,0 @@
-package app.revanced.patches.youtube.layout.amoled.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.PatchDeprecated
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patches.youtube.layout.amoled.annotations.AmoledCompatibility
-import app.revanced.patches.youtube.layout.theme.patch.ThemePatch
-import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-
-@Patch
-@DependsOn([FixLocaleConfigErrorPatch::class])
-@Name("amoled")
-@Description("Enables pure black theme.")
-@AmoledCompatibility
-@Version("0.0.1")
-@PatchDeprecated("Theme patch already includes the Amoled theme.", ThemePatch::class)
-class AmoledPatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
-        ThemePatch.theme = ThemePatch.Themes.Amoled.name
-        return ThemePatch().execute(data)
-    }
-}
--- 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
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.autocaptions.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class AutoCaptionsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
@@ -0,0 +1,40 @@
+package app.revanced.patches.youtube.layout.autocaptions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("start-video-informer-fingerprint")
+@MatchingMethod("Laaxf;", "d")
+@FuzzyPatternScanMethod(3)
+@AutoCaptionsCompatibility
+@Version("0.0.1")
+object StartVideoInformerFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.IF_EQZ,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.CONST_4,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
@@ -0,0 +1,28 @@
+package app.revanced.patches.youtube.layout.autocaptions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("subtitle-button-controller-fingerprint")
+@MatchingMethod("Lcom/google/android/apps/youtube/app/player/overlay/SubtitleButtonController;", "E")
+@AutoCaptionsCompatibility
+@Version("0.0.1")
+object SubtitleButtonControllerFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.RETURN_VOID,
+        Opcode.IGET_BOOLEAN,
+        Opcode.CONST_4,
+        Opcode.IF_NEZ,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
@@ -0,0 +1,26 @@
+package app.revanced.patches.youtube.layout.autocaptions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("subtitle-track-fingerprint")
+@MatchingMethod("Lcom/google/android/libraries/youtube/player/subtitles/model/SubtitleTrack;", "t")
+@AutoCaptionsCompatibility
+@Version("0.0.1")
+object SubtitleTrackFingerprint : MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN,
+    ),
+    strings = listOf("DISABLE_CAPTIONS_OPTION")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
@@ -0,0 +1,80 @@
+package app.revanced.patches.youtube.layout.autocaptions.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
+import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
+import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleButtonControllerFingerprint
+import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleTrackFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("disable-auto-captions")
+@Description("Disable forced captions from being automatically enabled.")
+@AutoCaptionsCompatibility
+@Version("0.0.1")
+class AutoCaptionsPatch : BytecodePatch(
+    listOf(
+        StartVideoInformerFingerprint, SubtitleButtonControllerFingerprint, SubtitleTrackFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_autocaptions_enabled",
+                StringResource("revanced_autocaptions_enabled_title", "Disable auto-captions"),
+                false,
+                StringResource("revanced_autocaptions_summary_on", "Auto-captions are disabled"),
+                StringResource("revanced_autocaptions_summary_off", "Auto-captions are enabled")
+            )
+        )
+
+        val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
+
+        startVideoInformerMethod.addInstructions(
+            0, """
+            const/4 v0, 0x0
+            sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
+        """
+        )
+
+        val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
+
+        subtitleButtonControllerMethod.addInstructions(
+            0, """
+            const/4 v0, 0x1
+            sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
+        """
+        )
+
+        val subtitleTrackMethod = SubtitleTrackFingerprint.result!!.mutableMethod
+
+        subtitleTrackMethod.addInstructions(
+            0, """
+            invoke-static {}, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->autoCaptionsEnabled()Z
+            move-result v0
+            if-eqz v0, :auto_captions_enabled
+            sget-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
+            if-nez v0, :auto_captions_enabled
+            const/4 v0, 0x1
+            return v0
+            :auto_captions_enabled
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -1,79 +0,0 @@
-package app.revanced.patches.youtube.layout.createbutton.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstruction
-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.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
-import app.revanced.patches.youtube.layout.createbutton.fingerprints.CreateButtonFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-@Patch
-@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
-@Name("disable-create-button")
-@Description("Hides the create button in the navigation bar.")
-@CreateButtonCompatibility
-@Version("0.0.1")
-class CreateButtonRemoverPatch : BytecodePatch(
-    listOf(
-        CreateButtonFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_create_button_enabled",
-                StringResource("revanced_create_button_enabled_title", "Show create button"),
-                false,
-                StringResource("revanced_create_button_summary_on", "Create button is shown"),
-                StringResource("revanced_create_button_summary_off", "Create button is hidden")
-            )
-        )
-
-        val result = CreateButtonFingerprint.result!!
-
-        // Get the required register which holds the view object we need to pass to the method hideCreateButton
-        val implementation = result.mutableMethod.implementation!!
-
-        val imageOnlyLayout =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "layout" && it.name == "image_only_tab" }
-
-        val imageOnlyLayoutConstIndex =
-            implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout.id }
-
-        val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
-            .first {
-                (((it.value as? ReferenceInstruction)?.reference) as? MethodReference)?.definingClass?.contains("PivotBar")
-                    ?: false
-            }
-
-        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct instruction")
-
-        val moveResultIndex = imageOnlyLayoutConstIndex + instructionIndex + 1
-        val moveResultInstruction = implementation.instructions[moveResultIndex] as OneRegisterInstruction
-
-        // Hide the button view via proxy by passing it to the hideCreateButton method
-        result.mutableMethod.addInstruction(
-            moveResultIndex + 1,
-            "invoke-static { v${moveResultInstruction.registerA} }, Lapp/revanced/integrations/patches/HideCreateButtonPatch;->hideCreateButton(Landroid/view/View;)V"
-        )
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
 import org.jf.dexlib2.Opcode

@Name("fullscreen-view-adder-fingerprint")
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
 import org.jf.dexlib2.Opcode

@Name("fullscreen-view-adder-parent-fingerprint")
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/annotations/HideTimeAndSeekbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/annotations/HideTimeAndSeekbarCompatibility.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideTimeAndSeekbarCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/InlineTimeBarWrapperFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/InlineTimeBarWrapperFingerprint.kt
@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("inline-time-bar-wrapper-fingerprint")
+@MatchingMethod("Lcom/google/android/apps/youtube/app/common/player/overlay/InlineTimeBarWrapper;", "onLayout")
+@FuzzyPatternScanMethod(3)
+@HideTimeAndSeekbarCompatibility
+@Version("0.0.1")
+object InlineTimeBarWrapperFingerprint : MethodFingerprint(
+    "V", AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("Z", "I", "I", "I", "I"), listOf(
+        Opcode.SUB_INT_2ADDR,
+        Opcode.SUB_INT,
+        Opcode.IF_EQZ,
+        Opcode.IF_NEZ,
+        Opcode.GOTO_16,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.SUB_INT,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.IGET_OBJECT,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/TimeCounterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/TimeCounterFingerprint.kt
@@ -0,0 +1,26 @@
+package app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("time-counter-fingerprint")
+@MatchingMethod("Lfez", "a")
+@FuzzyPatternScanMethod(3)
+@HideTimeAndSeekbarCompatibility
+@Version("0.0.1")
+object TimeCounterFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("J"), listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.CONST_WIDE_16,
+        Opcode.ADD_LONG_2ADDR,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_WIDE,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt
@@ -0,0 +1,72 @@
+package app.revanced.patches.youtube.layout.hidetimeandseekbar.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.InlineTimeBarWrapperFingerprint
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-time-and-seekbar")
+@Description("Hides progress bar and time counter on videos.")
+@HideTimeAndSeekbarCompatibility
+@Version("0.0.1")
+class HideTimeAndSeekbarPatch : BytecodePatch(
+    listOf(
+        InlineTimeBarWrapperFingerprint, TimeCounterFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_time_and_seekbar",
+                StringResource("revanced_hide_time_and_seekbar_title", "Hide time and seekbar"),
+                false,
+                StringResource("revanced_hide_time_and_seekbar_summary_on", "Time and seekbar are hidden"),
+                StringResource("revanced_hide_time_and_seekbar_summary_off", "Time and seekbar are visible")
+            )
+        )
+
+        val inlineTimeBarWrapperMethod = InlineTimeBarWrapperFingerprint.result!!.mutableMethod
+
+        inlineTimeBarWrapperMethod.addInstructions(
+            0, """
+            invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
+            move-result v0
+            if-eqz v0, :hide_time_and_seekbar
+            return-void
+            :hide_time_and_seekbar
+            nop
+        """
+        )
+
+        val timeCounterMethod = TimeCounterFingerprint.result!!.mutableMethod
+
+        timeCounterMethod.addInstructions(
+            0, """
+            invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
+            move-result v0
+            if-eqz v0, :hide_time_and_seekbar
+            const-string v0, ""
+            return-object v0
+            :hide_time_and_seekbar
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/annotations/CreateButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/annotations/CreateButtonCompatibility.kt
@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.layout.createbutton.annotations
+package app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/fingerprints/PivotBarCreateButtonViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/fingerprints/PivotBarCreateButtonViewFingerprint.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("pivot-bar-create-button-view-fingerprint")
+@MatchingMethod(
+    "Lknw", "z"
+)
+@CreateButtonCompatibility
+@Version("0.0.1")
+object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -0,0 +1,72 @@
+package app.revanced.patches.youtube.layout.pivotbar.createbutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+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.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
+@Name("hide-create-button")
+@Description("Hides the create button in the navigation bar.")
+@CreateButtonCompatibility
+@Version("0.0.1")
+class CreateButtonRemoverPatch : BytecodePatch(
+    listOf(
+        PivotBarFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_create_button_enabled",
+                StringResource("revanced_create_button_enabled_title", "Show create button"),
+                false,
+                StringResource("revanced_create_button_summary_on", "Create button is shown"),
+                StringResource("revanced_create_button_summary_off", "Create button is hidden")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
+
+        if (!PivotBarCreateButtonViewFingerprint.resolve(data, pivotBarResult.method, pivotBarResult.classDef))
+            return PatchResultError("${PivotBarCreateButtonViewFingerprint.name} failed")
+
+        val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
+        val insertIndex = createButtonResult.patternScanResult!!.endIndex
+
+        /*
+         * Inject hooks
+         */
+
+        val integrationsClass = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
+        val hook =
+            "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideCreateButton(Landroid/view/View;)V"
+
+        createButtonResult.mutableMethod.injectHook(hook, insertIndex)
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/fingerprints/CreateButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/fingerprints/CreateButtonFingerprint.kt
@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.createbutton.fingerprints
+package app.revanced.patches.youtube.layout.pivotbar.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("create-button-fingerprint")
+@Name("pivot-bar-fingerprint")
@MatchingMethod(
    "Lknw", "z"
 )
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@CreateButtonCompatibility
+@FuzzyPatternScanMethod(2)
+// TODO: This fingerprint is used in multiple patches, so technically two compatibilities are needed
+// @CreateButtonCompatibility
@Version("0.0.1")
-object CreateButtonFingerprint : MethodFingerprint(
+object PivotBarFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
    listOf("Z"),
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/annotations/ShortsButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/annotations/ShortsButtonCompatibility.kt
@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.layout.shorts.button.annotations
+package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/fingerprints/PivotBarEnumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/fingerprints/PivotBarEnumFingerprint.kt
@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("pivot-bar-enum-fingerprint")
+@MatchingMethod(
+    "Lknw", "z"
+)
+@ShortsButtonCompatibility
+@Version("0.0.1")
+object PivotBarEnumFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT8, // unique instruction anchor
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/fingerprints/PivotBarShortsButtonViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/fingerprints/PivotBarShortsButtonViewFingerprint.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("pivot-bar-shorts-button-view-fingerprint")
+@MatchingMethod(
+    "Lknw", "z"
+)
+@ShortsButtonCompatibility
+@Version("0.0.1")
+object PivotBarShortsButtonViewFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL_RANGE, // unique instruction anchor
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.GOTO,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
@@ -0,0 +1,90 @@
+package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+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.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.PivotBarEnumFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.PivotBarShortsButtonViewFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-shorts-button")
+@Description("Hides the shorts button on the navigation bar.")
+@ShortsButtonCompatibility
+@Version("0.0.1")
+class ShortsButtonRemoverPatch : BytecodePatch(
+    listOf(PivotBarFingerprint)
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_shorts_button_enabled",
+                StringResource("revanced_shorts_button_enabled_title", "Show shorts button"),
+                false,
+                StringResource("revanced_shorts_button_summary_on", "Shorts button is shown"),
+                StringResource("revanced_shorts_button_summary_off", "Shorts button is hidden")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
+        val fingerprintResults = arrayOf(PivotBarEnumFingerprint, PivotBarShortsButtonViewFingerprint)
+            .onEach {
+                val resolutionSucceeded = it.resolve(
+                    data,
+                    pivotBarResult.method,
+                    pivotBarResult.classDef
+                )
+
+                if (!resolutionSucceeded) return PatchResultError("${it.name} failed")
+            }
+            .map { it.result!!.patternScanResult!! }
+
+        val enumScanResult = fingerprintResults[0]
+        val buttonViewResult = fingerprintResults[1]
+
+        val enumHookInsertIndex = enumScanResult.startIndex
+        val buttonHookInsertIndex = buttonViewResult.endIndex
+
+        /*
+         * Inject hooks
+         */
+
+        val integrationsClass = "Lapp/revanced/integrations/patches/HideShortsButtonPatch;"
+
+        val enumHook =
+            "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, $integrationsClass->lastPivotTab:Ljava/lang/Enum;"
+        val buttonHook =
+            "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideShortsButton(Landroid/view/View;)V"
+
+        // Inject bottom to top to not mess up the indices
+        mapOf(
+            buttonHook to buttonHookInsertIndex,
+            enumHook to enumHookInsertIndex
+        ).forEach { (hook, insertIndex) ->
+            pivotBarResult.mutableMethod.injectHook(hook, insertIndex)
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/utils/InjectionUtils.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/utils/InjectionUtils.kt
@@ -0,0 +1,30 @@
+package app.revanced.patches.youtube.layout.pivotbar.utils
+
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Opcode.MOVE_RESULT_OBJECT
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+internal object InjectionUtils {
+    const val REGISTER_TEMPLATE_REPLACEMENT: String = "REGISTER_INDEX"
+
+    /**
+     * Injects an instruction into insertIndex of the hook.
+     * @param hook The hook to insert.
+     * @param insertIndex The index to insert the instruction at.
+     * [MOVE_RESULT_OBJECT] has to be the previous instruction before [insertIndex].
+     */
+    fun MutableMethod.injectHook(hook: String, insertIndex: Int) {
+        val injectTarget = this
+
+        // Register to pass to the hook
+        val registerIndex = insertIndex - 1 // MOVE_RESULT_OBJECT is always the previous instruction
+        val register = (injectTarget.instruction(registerIndex) as OneRegisterInstruction).registerA
+
+        injectTarget.addInstruction(
+            insertIndex,
+            hook.replace("REGISTER_INDEX", register.toString()),
+        )
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/annotations/PlayerPopupPanelsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/annotations/PlayerPopupPanelsCompatibility.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.playerpopuppanels.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PlayerPopupPanelsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/fingerprints/EngagementPanelControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/fingerprints/EngagementPanelControllerFingerprint.kt
@@ -0,0 +1,43 @@
+package app.revanced.patches.youtube.layout.playerpopuppanels.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.playerpopuppanels.annotations.PlayerPopupPanelsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("engagement-player-controller-fingerprint")
+@MatchingMethod("Lucf;", "L")
+@FuzzyPatternScanMethod(3)
+@PlayerPopupPanelsCompatibility
+@Version("0.0.1")
+object EngagementPanelControllerFingerprint : MethodFingerprint(
+    "L", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L", "L", "Z", "Z", "Z"), listOf(
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_FROM16,
+        Opcode.IGET_BOOLEAN,
+        Opcode.CONST_4,
+        Opcode.IF_NEZ,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.SGET_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.RETURN_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/patch/PlayerPopupPanelsPatch.kt
@@ -0,0 +1,59 @@
+package app.revanced.patches.youtube.layout.playerpopuppanels.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.playerpopuppanels.annotations.PlayerPopupPanelsCompatibility
+import app.revanced.patches.youtube.layout.playerpopuppanels.fingerprints.EngagementPanelControllerFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("disable-auto-player-popup-panels")
+@Description("Disable automatic popup panels (playlist or live chat) on video player.")
+@PlayerPopupPanelsCompatibility
+@Version("0.0.1")
+class PlayerPopupPanelsPatch : BytecodePatch(
+    listOf(
+        EngagementPanelControllerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_player_popup_panels_enabled",
+                StringResource("revanced_player_popup_panels_title", "Disable player popup panels"),
+                false,
+                StringResource("revanced_player_popup_panels_summary_on", "Player popup panels are enabled"),
+                StringResource("revanced_player_popup_panels_summary_off", "Player popup panels are disabled")
+            )
+        )
+
+        val engagementPanelControllerMethod = EngagementPanelControllerFingerprint.result!!.mutableMethod
+
+        engagementPanelControllerMethod.addInstructions(
+            0, """
+            invoke-static { }, Lapp/revanced/integrations/patches/DisablePlayerPopupPanelsPatch;->disablePlayerPopupPanels()Z
+            move-result v0
+            if-eqz v0, :player_popup_panels
+            if-eqz p4, :player_popup_panels
+            const/4 v0, 0x0
+            return-object v0
+            :player_popup_panels
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonTabEnumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonTabEnumFingerprint.kt
@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.shorts.button.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("pivotbar-buttons-tabenum-fingerprint")
-@MatchingMethod(
-    "Lknw;", "z"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@ShortsButtonCompatibility
-@Version("0.0.1")
-object PivotBarButtonTabEnumFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("Z"),
-    listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonsViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonsViewFingerprint.kt
@@ -1,33 +0,0 @@
-package app.revanced.patches.youtube.layout.shorts.button.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("pivotbar-buttons-view-fingerprint")
-@MatchingMethod(
-    "Lknw;", "z"
-)
-@ShortsButtonCompatibility
-@Version("0.0.1")
-object PivotBarButtonsViewFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("Z"),
-    listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IGET
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt
@@ -1,89 +0,0 @@
-package app.revanced.patches.youtube.layout.shorts.button.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
-import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonTabEnumFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonsViewFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.Opcode
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("hide-shorts-button")
-@Description("Hides the shorts button on the navigation bar.")
-@ShortsButtonCompatibility
-@Version("0.0.1")
-class ShortsButtonRemoverPatch : BytecodePatch(
-    listOf(
-        PivotBarButtonTabEnumFingerprint, PivotBarButtonsViewFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_shorts_button_enabled",
-                StringResource("revanced_shorts_button_enabled_title", "Show shorts button"),
-                false,
-                StringResource("revanced_shorts_button_summary_on", "Shorts button is shown"),
-                StringResource("revanced_shorts_button_summary_off", "Shorts button is hidden")
-            )
-        )
-
-        val tabEnumResult = PivotBarButtonTabEnumFingerprint.result!!
-        val tabEnumImplementation = tabEnumResult.mutableMethod.implementation!!
-        val scanResultEndIndex = tabEnumResult.patternScanResult!!.endIndex
-        val tabEnumIndex = scanResultEndIndex +
-                if (tabEnumImplementation.instructions[scanResultEndIndex + 1].opcode == Opcode.IGET_OBJECT) {
-                    // for 17.31.xx and lower
-                    7
-                } else {
-                    // since 17.32.xx
-                    10
-                }
-        val moveEnumInstruction = tabEnumImplementation.instructions[tabEnumIndex]
-        val enumRegister = (moveEnumInstruction as OneRegisterInstruction).registerA
-
-        val buttonsViewResult = PivotBarButtonsViewFingerprint.result!!
-        val buttonsViewImplementation = buttonsViewResult.mutableMethod.implementation!!
-        val scanResultStartIndex = buttonsViewResult.patternScanResult!!.startIndex
-        val buttonsViewIndex = scanResultStartIndex +
-                if (buttonsViewImplementation.instructions[scanResultStartIndex - 1].opcode == Opcode.GOTO) {
-                    // since 17.32.xx
-                    -7
-                } else {
-                    // for 17.31.xx and lower
-                    -3
-                }
-        val moveViewInstruction = buttonsViewImplementation.instructions[buttonsViewIndex - 1]
-        val viewRegister = (moveViewInstruction as OneRegisterInstruction).registerA
-
-
-        // Save the tab enum in XGlobals to avoid smali/register workarounds
-        tabEnumResult.mutableMethod.addInstruction(
-            tabEnumIndex,
-            "sput-object v$enumRegister, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->lastPivotTab:Ljava/lang/Enum;"
-        )
-
-        // Hide the button view via proxy by passing it to the hideShortsButton method
-        // It only hides it if the last tab name is "TAB_SHORTS"
-        buttonsViewResult.mutableMethod.addInstruction(
-            buttonsViewIndex + 1,
-            "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->hideShortsButton(Landroid/view/View;)V"
-        )
-
-        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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.22.36", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.22.36", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
@@ -0,0 +1,38 @@
+package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("shorts-player-constructor-fingerprint")
+@MatchingMethod("Lhgp;", "<init>")
+@FuzzyPatternScanMethod(3)
+@SponsorBlockCompatibility
+@Version("0.0.1")
+object ShortsPlayerConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    opcodes = listOf(
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.INVOKE_DIRECT_RANGE,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT
+    )
+)
--- 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
@@ -25,6 +25,7 @@ import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.MutableMethodImplementation
@@ -53,7 +54,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        NextGenWatchLayoutFingerprint,
        AppendTimeFingerprint,
        PlayerInitFingerprint,
-        PlayerOverlaysLayoutInitFingerprint
+        PlayerOverlaysLayoutInitFingerprint,
+        ShortsPlayerConstructorFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {/*
@@ -324,6 +326,23 @@ class SponsorBlockBytecodePatch : BytecodePatch(
            }
        }

+        val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
+        startVideoInformerMethod.addInstructions(
+            0, """
+            const/4 v0, 0x1
+            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
+        """
+        )
+
+        val shortsPlayerConstructorMethod = ShortsPlayerConstructorFingerprint.result!!.mutableMethod
+
+        shortsPlayerConstructorMethod.addInstructions(
+            0, """
+            const/4 v0, 0x0
+            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
+        """
+        )
+
        // TODO: isSBChannelWhitelisting implementation

        return PatchResultSuccess()
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.26.35", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.26.35", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
@@ -4,7 +4,10 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.ResourcePatch
@@ -15,19 +18,24 @@ import org.w3c.dom.Element
@Patch
@DependsOn([FixLocaleConfigErrorPatch::class])
@Name("theme")
-@Description("Enables a custom theme.")
+@Description("Applies a custom theme.")
@ThemeCompatibility
@Version("0.0.1")
 class ThemePatch : ResourcePatch() {
    override fun execute(data: ResourceData): PatchResult {
-        val theme = Themes.of(theme!!) ?: return PatchResultError("Theme '$theme' not found.")
+        val backgroundColor = backgroundColor!!

        data.xmlEditor["res/values/colors.xml"].use { editor ->
            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element

            for (i in 0 until resourcesNode.childNodes.length) {
                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-                node.textContent = theme.apply(node.getAttribute("name")) ?: continue
+
+                node.textContent = when (node.getAttribute("name")) {
+                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
+                    "yt_status_bar_background_dark" -> backgroundColor
+                    else -> continue
+                }
            }
        }

@@ -35,33 +43,13 @@ class ThemePatch : ResourcePatch() {
    }

    companion object : OptionsContainer() {
-        var theme: String? by option(
-            PatchOption.StringListOption(
-                key = "theme",
-                default = Themes.Amoled.name,
-                options = Themes.names,
-                title = "Theme",
-                description = "Select a theme.",
-                required = true
+        var backgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "darkThemeBackgroundColor",
+                default = "@android:color/black",
+                title = "Background color for the dark theme",
+                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
            )
        )
    }
-
-    enum class Themes(val apply: (String) -> String?) {
-        Amoled({ attr ->
-            when (attr) {
-                "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
-                "yt_status_bar_background_dark" -> "@android:color/black"
-
-                "yt_selected_nav_label_dark" -> "#ffdf0000"
-                else -> null
-            }
-        });
-
-        companion object {
-            val names = values().map { it.name }
-
-            fun of(name: String) = values().firstOrNull { it.name == name }
-        }
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/annotations/HideWaterwarkCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/annotations/HideWaterwarkCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/annotations/CustomPlaybackSpeedCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/annotations/CustomPlaybackSpeedCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt
@@ -2,30 +2,17 @@ package app.revanced.patches.youtube.misc.hdrbrightness.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import org.jf.dexlib2.Opcode

-@Name("hdr-brightness-fingerprint-xxz")
+@Name("hdr-brightness-fingerprint")
@MatchingMethod(
-    "Lyjk;", "D"
+    "Lyls;", "c"
 )
-@FuzzyPatternScanMethod(3)
@HDRBrightnessCompatibility
@Version("0.0.1")
-object HDRBrightnessFingerprintYJK : MethodFingerprint(
+object HDRBrightnessFingerprint : MethodFingerprint(
    "V",
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET,
-        Opcode.IPUT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL
-    ),
-    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
+    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview", "lux"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt
@@ -1,43 +0,0 @@
-package app.revanced.patches.youtube.misc.hdrbrightness.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Name("hdr-brightness-fingerprint-xxz")
-@MatchingMethod(
-    "Lyel;", "G"
-)
-@FuzzyPatternScanMethod(3)
-@HDRBrightnessCompatibility
-@Version("0.0.1")
-object HDRBrightnessFingerprintYEL : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("I", "I", "I", "I"),
-    listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET,
-        Opcode.IPUT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL
-    ),
-    customFingerprint = { methodDef ->
-        methodDef.implementation!!.instructions.any {
-            ((it as? ReferenceInstruction)?.reference as? FieldReference)?.let { field ->
-                // iput vx, vy, Landroid/view/WindowManager$LayoutParams;->screenBrightness:F
-                field.definingClass == "Landroid/view/WindowManager\$LayoutParams;" && field.name == "screenBrightness"
-            } == true
-        }
-    }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt
@@ -11,8 +11,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprintYEL
-import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprintYJK
+import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -28,10 +27,7 @@ import org.jf.dexlib2.iface.reference.FieldReference
@Version("0.0.2")
@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 class HDRBrightnessPatch : BytecodePatch(
-    listOf(
-        HDRBrightnessFingerprintYEL,
-        HDRBrightnessFingerprintYJK
-    )
+    listOf(HDRBrightnessFingerprint)
 ) {
    override fun execute(data: BytecodeData): PatchResult {
        SettingsPatch.PreferenceScreen.MISC.addPreferences(
@@ -44,32 +40,25 @@ class HDRBrightnessPatch : BytecodePatch(
            )
        )

-        val result = try {
-            HDRBrightnessFingerprintYEL.result!!
-        } catch (e: Exception) {
-            HDRBrightnessFingerprintYJK.result!!
-        }
+        val method = HDRBrightnessFingerprint.result!!.mutableMethod

-        val method = result.mutableMethod
-
-        method.implementation!!.instructions.filter {
-            ((it as? ReferenceInstruction)?.reference as? FieldReference)?.let { field ->
-                // iput vx, vy, Landroid/view/WindowManager$LayoutParams;->screenBrightness:F
-                field.definingClass == "Landroid/view/WindowManager\$LayoutParams;" && field.name == "screenBrightness"
-            } == true
+        method.implementation!!.instructions.filter { instruction ->
+            val fieldReference = (instruction as? ReferenceInstruction)?.reference as? FieldReference
+            fieldReference?.let { it.name == "screenBrightness" } == true
        }.forEach { instruction ->
-            // inject right before the call that sets 'screenBrightness'
-            val index = method.implementation!!.instructions.indexOf(instruction)
+            val brightnessRegisterIndex = method.implementation!!.instructions.indexOf(instruction)
            val register = (instruction as TwoRegisterInstruction).registerA

-            // inject the call to
+            val insertIndex = brightnessRegisterIndex + 1
            method.addInstructions(
-                index, """
-           invoke-static {v$register}, Lapp/revanced/integrations/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
-           move-result v$register
-        """
+                insertIndex,
+                """
+                   invoke-static {v$register}, Lapp/revanced/integrations/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
+                   move-result v$register
+                """
            )
        }
+
        return PatchResultSuccess()
    }
 }
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.27.39", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.27.39", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/quality/annotations/DefaultVideoQualityCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/quality/annotations/DefaultVideoQualityCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.22.36", "17.24.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.22.36", "17.24.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- 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
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.25.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/videoid/annotation/VideoIdCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videoid/annotation/VideoIdCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.22.36", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.22.36", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/resources/downloads/drawable/revanced_yt_download_button.xml
+++ b/src/main/resources/downloads/drawable/revanced_yt_download_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:tint="#FFFFFF" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M5.5,9.3L5.5,0h1v9.3l3.6,-3.7 0.8,0.8 -4.9,4.8 -4.9,-4.8 0.8,-0.8L5.5,9.3ZM0,11h1v1.5h10L11,11h1v2.5L0,13.5L0,11Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M 6.0050001,16.257111 h 0.916667 v 1.666667 H 16.088333 V 16.257111 H 17.005 v 2.777778 H 6.0050001 Z M 16.5,11.4 15.8,10.7 12,14.4 V 4 h -1 v 10.4 l -3.8,-3.8 -0.7,0.7 5,5 z"/>
 </vector>
--- a/src/main/resources/downloads/host/values/strings.xml
+++ b/src/main/resources/downloads/host/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="downloader_not_installed_warning">is not installed</string>
+    <string name="downloader_not_installed_warning">is not installed. Please install it.</string>
 </resources>
--- a/src/main/resources/sponsorblock/host/values/strings.xml
+++ b/src/main/resources/sponsorblock/host/values/strings.xml
@@ -33,11 +33,11 @@
    <string name="segments_endcards">Endcards/Credits</string>
    <string name="segments_endcards_sum">Credits or when the YouTube endcards appear. Not for spoken conclusions</string>
    <string name="segments_subscribe">Interaction Reminder (Subscribe)</string>
-    <string name="segments_subscribe_sum">When there is a short reminder to like, subscribe or follow them in the middle of content</string>
+    <string name="segments_subscribe_sum">When there is a short reminder to like, subscribe, follow or interact with them on any free or paid platform</string>
    <string name="segments_selfpromo">Unpaid/Self Promotion</string>
    <string name="segments_selfpromo_sum">When there is unpaid or self promotion. This includes specific sections about merchandise, donations, or information about who they collaborated with</string>
    <string name="segments_nomusic">Music: Non-Music Section</string>
-    <string name="segments_nomusic_sum">Only for use in music videos. This includes introductions or outros in music videos</string>
+    <string name="segments_nomusic_sum">Only for use in music videos. Skips parts of the video not in official mixes</string>
    <string name="segments_filler">Filler Tangent/Jokes</string>
    <string name="segments_filler_sum">Tangential scenes added only for filler or humor that are not required to understand the main content of the video. This should not include context or background details</string>
    <string name="skipped_segment">Skipped a sponsor segment</string>
@@ -60,6 +60,7 @@
    <string name="about_madeby">Integration made by JakubWeg, recoded by oSumAtrIX</string>
    <string name="tap_skip">Tap to skip</string>

+    <string name="submit_failed_invalid">Can\'t submit the segment: %s</string>
    <string name="submit_failed_unknown_error" formatted="false">Unable to submit segments: Status: %d %s</string>
    <string name="submit_failed_rate_limit">Can\'t submit the segment.\nRate Limited (Too many from the same user or IP)</string>
    <string name="submit_failed_forbidden" formatted="false">Can\'t submit the segment.\n\n%s</string>
@@ -112,7 +113,7 @@
    <string name="general_browser_button">Enable SB Browser button</string>
    <string name="general_browser_button_sum">Clicking this button under the player will open sb.ltn.fi where you can see all the segments on the video.</string>
    <string name="segments_preview">Preview/Recap</string>
-    <string name="segments_preview_sum">Recap of previous episodes, or a preview of what\'s coming up later in the current video or future videos in the same series. Intended for edited together clips that do not provide additional information.</string>
+    <string name="segments_preview_sum">Recap of previous episodes, or a preview of what\'s coming up later in the current video or future videos in the same series. Clips should not provide additional information.</string>
    <string name="stats">Stats</string>
    <string name="stats_loading">Loading..</string>
    <string name="stats_sb_disabled">SponsorBlock is disabled</string>
Author	SHA1	Message	Date
semantic-release-bot	4e2d30228a	chore(release): 2.63.0 [skip ci] # [2.63.0](https://github.com/revanced/revanced-patches/compare/v2.62.0...v2.63.0) (2022-09-21) ### Features * `disable-auto-player-popup-panels` ([#543](https://github.com/revanced/revanced-patches/issues/543)) ([`35f1323`](`68ec6d2258`)) * disable sponsorblock on shorts ([#439](https://github.com/revanced/revanced-patches/issues/439)) ([`5b0a6af`](`dce28760f5`))	2022-09-21 01:06:10 +00:00
OxrxL	dce28760f5	feat: disable sponsorblock on shorts (#439 )	2022-09-21 03:03:47 +02:00
OxrxL	68ec6d2258	feat: `disable-auto-player-popup-panels` (#543 )	2022-09-21 03:02:20 +02:00
semantic-release-bot	83498fd29c	chore(release): 2.62.0 [skip ci] # [2.62.0](https://github.com/revanced/revanced-patches/compare/v2.61.1...v2.62.0) (2022-09-21) ### Features * `hide-time-and-seekbar` patch ([#544](https://github.com/revanced/revanced-patches/issues/544)) ([`9c86429`](`1ab35a1cfa`))	2022-09-21 01:00:46 +00:00
OxrxL	1ab35a1cfa	feat: `hide-time-and-seekbar` patch (#544 )	2022-09-21 02:58:39 +02:00
semantic-release-bot	e0b45237bb	chore(release): 2.61.1 [skip ci] ## [2.61.1](https://github.com/revanced/revanced-patches/compare/v2.61.0...v2.61.1) (2022-09-21) ### Bug Fixes * sponsorblock: reflect strings from official guidelines ([#523](https://github.com/revanced/revanced-patches/issues/523)) ([`8f8bcee`](`161a1b0af1`))	2022-09-21 00:00:54 +00:00
Michael M. Chang	161a1b0af1	fix(sponsorblock): reflect strings from official guidelines (#523 )	2022-09-21 01:58:29 +02:00
semantic-release-bot	7618376388	chore(release): 2.61.0 [skip ci] # [2.61.0](https://github.com/revanced/revanced-patches/compare/v2.60.0...v2.61.0) (2022-09-20) ### Features * section `acknowledgements` for issue templates ([`8f4cdbb`](`2bdb857a9f`))	2022-09-20 22:38:27 +00:00
oSumAtrIX	2bdb857a9f	feat: section `acknowledgements` for issue templates Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-21 00:36:26 +02:00
semantic-release-bot	be02acecfc	chore(release): 2.60.0 [skip ci] # [2.60.0](https://github.com/revanced/revanced-patches/compare/v2.59.0...v2.60.0) (2022-09-19) ### Features * downloads: missing package installation request ([`ccb90e9`](`9e873329c6`))	2022-09-19 22:39:17 +00:00
oSumAtrIX	9e873329c6	feat(downloads): missing package installation request	2022-09-20 00:37:30 +02:00
semantic-release-bot	8a2b79ec16	chore(release): 2.59.0 [skip ci] # [2.59.0](https://github.com/revanced/revanced-patches/compare/v2.58.0...v2.59.0) (2022-09-18) ### Features * sponsorblock: string for response error code 400 ([#512](https://github.com/revanced/revanced-patches/issues/512)) ([`fd0a45f`](`9842f7ca0d`))	2022-09-18 22:06:17 +00:00
Michael M. Chang	9842f7ca0d	feat(sponsorblock): string for response error code 400 (#512 )	2022-09-19 00:04:11 +02:00
semantic-release-bot	8a913c6a2a	chore(release): 2.58.0 [skip ci] # [2.58.0](https://github.com/revanced/revanced-patches/compare/v2.57.0...v2.58.0) (2022-09-18) ### Bug Fixes * hdr-auto-brightness: increase patching compatibility across versions ([`4933e58`](`886018d6fb`)) * hide-create-button: increase patching compatibility across versions ([`751fa45`](`c707dc8769`)) * hide-shorts-button: increase patching compatibility across versions ([`624215d`](`1bb93e3598`)) ### Features * bump patches compatibility to v17.36.37 ([`2a7222f`](`eb985942f0`))	2022-09-18 06:28:04 +00:00
oSumAtrIX	84676ef33d	build: bump patcher dependency version Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 08:25:37 +02:00
oSumAtrIX	eb985942f0	feat: bump patches compatibility to v17.36.37 Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 08:10:53 +02:00
oSumAtrIX	886018d6fb	fix(hdr-auto-brightness): increase patching compatibility across versions Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 08:10:31 +02:00
oSumAtrIX	e7a17ccbc6	refactor: move `InjectionUtils` to `utils` subpackage Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 07:35:59 +02:00
oSumAtrIX	c707dc8769	fix(hide-create-button): increase patching compatibility across versions Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 07:33:42 +02:00
oSumAtrIX	1bb93e3598	fix(hide-shorts-button): increase patching compatibility across versions Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-18 07:33:11 +02:00
semantic-release-bot	e8848171ac	chore(release): 2.57.0 [skip ci] # [2.57.0](https://github.com/revanced/revanced-patches/compare/v2.56.1...v2.57.0) (2022-09-16) ### Features * amoled: remove in favour of `theme` patch ([0032301](`47fbe3cb25`)) * theme: arbitrary background color for dark theme ([afd5502](`1791525b54`))	2022-09-16 00:13:24 +00:00
oSumAtrIX	249288c8a5	docs(theme): proper wording in description Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-16 02:10:50 +02:00
oSumAtrIX	1791525b54	feat(theme): arbitrary background color for dark theme Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-16 02:10:19 +02:00
oSumAtrIX	47fbe3cb25	feat(amoled): remove in favour of `theme` patch Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-16 02:09:19 +02:00
semantic-release-bot	89235ca7fa	chore(release): 2.56.1 [skip ci] ## [2.56.1](https://github.com/revanced/revanced-patches/compare/v2.56.0...v2.56.1) (2022-09-15) ### Bug Fixes * `auto-captions` patch switch description ([#488](https://github.com/revanced/revanced-patches/issues/488)) ([57824fb](`f63abb8eb3`))	2022-09-15 14:28:30 +00:00
OxrxL	f63abb8eb3	fix: `auto-captions` patch switch description (#488 )	2022-09-15 16:25:57 +02:00
semantic-release-bot	b701f86fa1	chore(release): 2.56.0 [skip ci] # [2.56.0](https://github.com/revanced/revanced-patches/compare/v2.55.0...v2.56.0) (2022-09-15) ### Features * tiktok-download: custom download path ([#479](https://github.com/revanced/revanced-patches/issues/479)) ([944aa48](`3117ee7ba4`))	2022-09-15 14:06:07 +00:00
d4rkk3y	3117ee7ba4	feat(tiktok-download): custom download path (#479 )	2022-09-15 16:04:20 +02:00
semantic-release-bot	b8e084b9e1	chore(release): 2.55.0 [skip ci] # [2.55.0](https://github.com/revanced/revanced-patches/compare/v2.54.1...v2.55.0) (2022-09-15) ### Features * `disable-auto-captions` patch ([#435](https://github.com/revanced/revanced-patches/issues/435)) ([8ee12d0](`bafeff84c2`))	2022-09-15 01:02:51 +00:00
OxrxL	bafeff84c2	feat: `disable-auto-captions` patch (#435 )	2022-09-15 03:00:19 +02:00
semantic-release-bot	8d193786cb	chore(release): 2.54.1 [skip ci] ## [2.54.1](https://github.com/revanced/revanced-patches/compare/v2.54.0...v2.54.1) (2022-09-14) ### Bug Fixes * alignment of download button icon ([#477](https://github.com/revanced/revanced-patches/issues/477)) ([2093f11](`d78d271967`))	2022-09-14 16:03:59 +00:00
Ushie	d78d271967	fix: alignment of download button icon (#477 )	2022-09-14 18:02:11 +02:00
semantic-release-bot	59ea2bc636	chore(release): 2.54.0 [skip ci] # [2.54.0](https://github.com/revanced/revanced-patches/compare/v2.53.0...v2.54.0) (2022-09-14) ### Features * bump YouTube Music patches to v5.23.50 ([#462](https://github.com/revanced/revanced-patches/issues/462)) ([15c10b1](`e8b550f5aa`))	2022-09-14 13:48:11 +00:00
Suraj Anil Yadav	e8b550f5aa	feat: bump YouTube Music patches to v5.23.50 (#462 )	2022-09-14 15:46:25 +02:00