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))
feat: hide-time-and-seekbar patch (#544 )
2025-12-25 10:24:08 +01:00 · 2022-09-21 01:00:46 +00:00 · 2022-09-21 02:58:39 +02:00 · 2022-09-21 00:00:54 +00:00 · 2022-09-21 01:58:29 +02:00 · 2022-09-20 22:38:27 +00:00
250 changed files with 3926 additions and 1829 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/feature-issue.yml
+++ b/.github/ISSUE_TEMPLATE/feature-issue.yml
@@ -1,46 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed feature request.
-title: 'feat: <title>'
-labels: [feature-request]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced feature request
-        
-        Do not submit requests for patches here. Please submit them [here](https://github.com/orgs/revanced/discussions/categories/patches) instead.
-        Important to note that your feature request may have already been made before. Please check for existing feature requests [here](https://github.com/revanced/revanced-patches/labels/feature-request).
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Functionality
-        - Cosmetic
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Issue
-      description: What is the current problem. Why does it require a feature request?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Feature
-      description: Describe your feature in detail. How does it solve the issue?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Why should your feature should be considered?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/patch-request.yml
+++ b/.github/ISSUE_TEMPLATE/patch-request.yml
@@ -0,0 +1,41 @@
+name: ⭐ Patch Request
+description: Create a detailed patch request.
+title: 'feat(patch): '
+labels: [patch-request]
+body:
+  - type: textarea
+    attributes:
+      label: Application
+      description: Which application is this patch for?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Issue
+      description: What is the issue this patch should solve?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patch
+      description: "Describe the patch you'd like to see in detail."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      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/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,16 +24,12 @@ jobs:
          java-version: '17'
          distribution: 'adopt'
          cache: gradle
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "lts/*"
      - name: Setup Android SDK
        uses: android-actions/setup-android@v2
      - name: Build with Gradle
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean generateReadme
+        run: ./gradlew build clean generateMeta
      - name: Install Android build-tools
        run: sdkmanager "build-tools;32.0.0"
      - name: Setup semantic-release
--- a/.gitignore
+++ b/.gitignore
@@ -114,4 +114,7 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties

 # Potentially copyrighted test APK
-*.apk
+*.apk
+
+# Ignore vscode config
+.vscode/
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,4 @@
 /dataSources.local.xml
 # Editor-based HTTP Client requests
 /httpRequests/
+/kotlinc.xml
--- a/.releaserc
+++ b/.releaserc
@@ -21,7 +21,8 @@
        "assets": [
          "README.md",
          "CHANGELOG.md",
-          "gradle.properties"
+          "gradle.properties",
+          "patches.json"
        ]
      }
    ],
@@ -33,7 +34,7 @@
            "path": "build/libs/*.jar"
          },
          {
-            "path": "build/libs/*.dex"
+            "path": "patches.json"
          }
        ]
      }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,376 @@
+# [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)
+
+
+### Features
+
+* patch requests issue template ([#467](https://github.com/revanced/revanced-patches/issues/467)) ([d8bb354](https://github.com/revanced/revanced-patches/commit/d8bb35472258c0634599102f4f4bf4cea587a817)), closes [revanced/revanced-patches#463](https://github.com/revanced/revanced-patches/issues/463)
+
+## [2.52.3](https://github.com/revanced/revanced-patches/compare/v2.52.2...v2.52.3) (2022-09-11)
+
+
+### Bug Fixes
+
+* path for download icon ([#465](https://github.com/revanced/revanced-patches/issues/465)) ([bff22c3](https://github.com/revanced/revanced-patches/commit/bff22c3a154fd8059f4f8995a303354633a50517))
+
+## [2.52.2](https://github.com/revanced/revanced-patches/compare/v2.52.1...v2.52.2) (2022-09-11)
+
+
+### Bug Fixes
+
+* design language for download icon ([#464](https://github.com/revanced/revanced-patches/issues/464)) ([c24dc17](https://github.com/revanced/revanced-patches/commit/c24dc175f705fd5364b8bcf01f27f3ac8ecc0e64))
+
+## [2.52.1](https://github.com/revanced/revanced-patches/compare/v2.52.0...v2.52.1) (2022-09-08)
+
+
+### Bug Fixes
+
+* multiple compatible pkgs on readme ([3f82a13](https://github.com/revanced/revanced-patches/commit/3f82a1349fb11b1152ac10d76deb930f7325b7c9))
+
+# [2.52.0](https://github.com/revanced/revanced-patches/compare/v2.51.3...v2.52.0) (2022-09-08)
+
+
+### Features
+
+* add deprecated & options to patches.json ([759315b](https://github.com/revanced/revanced-patches/commit/759315be1b23a6b3655fc87b56a8974ebac648cc))
+
+## [2.51.3](https://github.com/revanced/revanced-patches/compare/v2.51.2...v2.51.3) (2022-09-08)
+
+
+### Bug Fixes
+
+* cleanup & trigger release for ThemePatch ([8d25b21](https://github.com/revanced/revanced-patches/commit/8d25b214e297797092432b5fe1a4ede1f42115c8)), closes [#447](https://github.com/revanced/revanced-patches/issues/447) [revanced/revanced-patcher#99](https://github.com/revanced/revanced-patcher/issues/99)
+
+## [2.51.2](https://github.com/revanced/revanced-patches/compare/v2.51.1...v2.51.2) (2022-09-08)
+
+## [2.51.1](https://github.com/revanced/revanced-patches/compare/v2.51.0...v2.51.1) (2022-09-08)
+
+
+### Bug Fixes
+
+* wrap theme option ([150c173](https://github.com/revanced/revanced-patches/commit/150c173adce31d9984d6feca694b472649233056))
+
+# [2.51.0](https://github.com/revanced/revanced-patches/compare/v2.50.8...v2.51.0) (2022-09-08)
+
+
+### Features
+
+* Theme Patch ([#440](https://github.com/revanced/revanced-patches/issues/440)) ([f3b92ca](https://github.com/revanced/revanced-patches/commit/f3b92cab5a057ce605b6d9e75e3b99161bf1422c))
+
+## [2.50.8](https://github.com/revanced/revanced-patches/compare/v2.50.7...v2.50.8) (2022-09-08)
+
+## [2.50.7](https://github.com/revanced/revanced-patches/compare/v2.50.6...v2.50.7) (2022-09-08)
+
+## [2.50.6](https://github.com/revanced/revanced-patches/compare/v2.50.5...v2.50.6) (2022-09-07)
+
+## [2.50.5](https://github.com/revanced/revanced-patches/compare/v2.50.4...v2.50.5) (2022-09-07)
+
+## [2.50.4](https://github.com/revanced/revanced-patches/compare/v2.50.3...v2.50.4) (2022-09-03)
+
+
+### Bug Fixes
+
+* don't respect primary color for the download button icon ([#424](https://github.com/revanced/revanced-patches/issues/424)) ([3fa70f4](https://github.com/revanced/revanced-patches/commit/3fa70f48a206c56f6ca8aed88baed722e76281e2))
+
+## [2.50.3](https://github.com/revanced/revanced-patches/compare/v2.50.2...v2.50.3) (2022-09-01)
+
+
+### Bug Fixes
+
+* partial ad blockage in `tiktok-ads` patch ([#420](https://github.com/revanced/revanced-patches/issues/420)) ([bc6d192](https://github.com/revanced/revanced-patches/commit/bc6d19205940e3b4b228a9b5de627a2260abd00e))
+
+## [2.50.2](https://github.com/revanced/revanced-patches/compare/v2.50.1...v2.50.2) (2022-08-31)
+
+
+### Bug Fixes
+
+* wrong dependency version ([1e63a57](https://github.com/revanced/revanced-patches/commit/1e63a57b86475670442e6a24a7f24c02dabee239))
+
+## [2.50.1](https://github.com/revanced/revanced-patches/compare/v2.50.0...v2.50.1) (2022-08-31)
+
+
+### Bug Fixes
+
+* resolve fingerprint in `premium-icon-reddit` patch ([#413](https://github.com/revanced/revanced-patches/issues/413)) ([60ec2c6](https://github.com/revanced/revanced-patches/commit/60ec2c6f8a29cfc36313617a92e976f01213ce00))
+
+# [2.50.0](https://github.com/revanced/revanced-patches/compare/v2.49.0...v2.50.0) (2022-08-31)
+
+
+### Features
+
+* `tiktok-download` and `tiktok-seekbar` patch ([#405](https://github.com/revanced/revanced-patches/issues/405)) ([f36e000](https://github.com/revanced/revanced-patches/commit/f36e0007c52f4e925a3a2370cdb51bd45ee00a1b))
+
+# [2.49.0](https://github.com/revanced/revanced-patches/compare/v2.48.2...v2.49.0) (2022-08-31)
+
+
+### Features
+
+* bump YouTube Music patches to v5.22.54 ([#409](https://github.com/revanced/revanced-patches/issues/409)) ([859176e](https://github.com/revanced/revanced-patches/commit/859176e3ece415243ba887424513a961fe4a5ad8))
+
+## [2.48.2](https://github.com/revanced/revanced-patches/compare/v2.48.1...v2.48.2) (2022-08-30)
+
+
+### Bug Fixes
+
+* do not constrain `amoled` patch to versions ([#408](https://github.com/revanced/revanced-patches/issues/408)) ([4af1714](https://github.com/revanced/revanced-patches/commit/4af1714dae4da40fe7488e8b734da91c978f1bdf))
+
+## [2.48.1](https://github.com/revanced/revanced-patches/compare/v2.48.0...v2.48.1) (2022-08-30)
+
+
+### Bug Fixes
+
+* don't overwrite register in `compact-header` patch ([#406](https://github.com/revanced/revanced-patches/issues/406)) ([3da8ab5](https://github.com/revanced/revanced-patches/commit/3da8ab5702f5c2a0384ce85fcb3df3b837cdc90e))
+
+# [2.48.0](https://github.com/revanced/revanced-patches/compare/v2.47.0...v2.48.0) (2022-08-30)
+
+
+### Features
+
+* bump YouTube Music patches to v5.21.52 ([#404](https://github.com/revanced/revanced-patches/issues/404)) ([0abb196](https://github.com/revanced/revanced-patches/commit/0abb1960c10f03149e45e9e5074cafcc1801fc32))
+
+# [2.47.0](https://github.com/revanced/revanced-patches/compare/v2.46.0...v2.47.0) (2022-08-29)
+
+
+### Features
+
+* bump youtube version to v17.33.42 ([#398](https://github.com/revanced/revanced-patches/issues/398)) ([769aa25](https://github.com/revanced/revanced-patches/commit/769aa25a6fffbff4c895ae8a291d97836ba03ed9))
+
+# [2.46.0](https://github.com/revanced/revanced-patches/compare/v2.45.3...v2.46.0) (2022-08-29)
+
+
+### Bug Fixes
+
+* `seekbar-tapping` toggling ([#401](https://github.com/revanced/revanced-patches/issues/401)) ([5550244](https://github.com/revanced/revanced-patches/commit/55502446ce5967922f2e9711a5fea2758fe31e83))
+
+
+### Features
+
+* `premium-icon-reddit` patch ([#333](https://github.com/revanced/revanced-patches/issues/333)) ([6739e7b](https://github.com/revanced/revanced-patches/commit/6739e7b94c18200bb3afbc9a8465d97bd18d1945))
+* blacklist `.vsc` folder in `.gitignore` ([#331](https://github.com/revanced/revanced-patches/issues/331)) ([1922253](https://github.com/revanced/revanced-patches/commit/1922253118e670aa66b33186f5cee2ffb3c55718))
+
+## [2.45.3](https://github.com/revanced/revanced-patches/compare/v2.45.2...v2.45.3) (2022-08-29)
+
+
+### Bug Fixes
+
+* release `patches.json` file ([#402](https://github.com/revanced/revanced-patches/issues/402)) ([17e351c](https://github.com/revanced/revanced-patches/commit/17e351c99a69652f20d89e579f43c1ce110cd81d))
+
+## [2.45.2](https://github.com/revanced/revanced-patches/compare/v2.45.1...v2.45.2) (2022-08-28)
+
+
+### Bug Fixes
+
+* add `patches.json` as a release asset ([a0b2c89](https://github.com/revanced/revanced-patches/commit/a0b2c89071d64efa7629a8d6d6bc0492c9772aa9))
+
+## [2.45.1](https://github.com/revanced/revanced-patches/compare/v2.45.0...v2.45.1) (2022-08-28)
+
+
+### Bug Fixes
+
+* run meta generator ([70a2b45](https://github.com/revanced/revanced-patches/commit/70a2b456b4031b3da38a18a71ede7bf84099acd0))
+
+# [2.45.0](https://github.com/revanced/revanced-patches/compare/v2.44.0...v2.45.0) (2022-08-28)
+
+
+### Features
+
+* Add JSON meta ([4c229d3](https://github.com/revanced/revanced-patches/commit/4c229d350859903a782c43b13457628739572f09))
+
+# [2.44.0](https://github.com/revanced/revanced-patches/compare/v2.43.2...v2.44.0) (2022-08-27)
+
+
+### Features
+
+* add debug switch ([#391](https://github.com/revanced/revanced-patches/issues/391)) ([ee4b776](https://github.com/revanced/revanced-patches/commit/ee4b7761d8bb4549f2f100f721c90c664eedfe4a))
+
+## [2.43.2](https://github.com/revanced/revanced-patches/compare/v2.43.1...v2.43.2) (2022-08-26)
+
+
+### Bug Fixes
+
+* package name for Vanced ([#390](https://github.com/revanced/revanced-patches/issues/390)) ([85206b9](https://github.com/revanced/revanced-patches/commit/85206b99e1399d00e5eaebded8aadc5fb982aaa4))
+
+## [2.43.1](https://github.com/revanced/revanced-patches/compare/v2.43.0...v2.43.1) (2022-08-26)
+
+
+### Bug Fixes
+
+* `Patch` annotation for `client-spoof` patch ([6a8af47](https://github.com/revanced/revanced-patches/commit/6a8af47f2dfb319a53db9b5f9deb0392f10f4185))
+
+# [2.43.0](https://github.com/revanced/revanced-patches/compare/v2.42.1...v2.43.0) (2022-08-26)
+
+
+### Features
+
+* `client-spoof` patch ([5512c07](https://github.com/revanced/revanced-patches/commit/5512c072fa4b047849dbea0d2d382dd85e3a0827))
+
+## [2.42.1](https://github.com/revanced/revanced-patches/compare/v2.42.0...v2.42.1) (2022-08-26)
+
+
+### Bug Fixes
+
+* changed default value for autorepeat setting ([#386](https://github.com/revanced/revanced-patches/issues/386)) ([d43add7](https://github.com/revanced/revanced-patches/commit/d43add7c21f0d9f45830476704985755e37d33ef))
+
+# [2.42.0](https://github.com/revanced/revanced-patches/compare/v2.41.0...v2.42.0) (2022-08-22)
+
+
+### Bug Fixes
+
+* default values for settings ([834c4ad](https://github.com/revanced/revanced-patches/commit/834c4add71570d36b645246621ba24da3869d613))
+
+
+### Features
+
+* setting for downloader package name ([965d05c](https://github.com/revanced/revanced-patches/commit/965d05cfa55d7a51f64a11f0219e2867568ba852))
+* v17.29.34 compatibility for `downloads` patch ([#374](https://github.com/revanced/revanced-patches/issues/374)) ([d81f1af](https://github.com/revanced/revanced-patches/commit/d81f1af327e0d7471f410811af46da34ddfb1bb4))
+
+# [2.41.0](https://github.com/revanced/revanced-patches/compare/v2.40.2...v2.41.0) (2022-08-22)
+
+
+### Features
+
+* `downloads` patch ([#215](https://github.com/revanced/revanced-patches/issues/215)) ([304fbac](https://github.com/revanced/revanced-patches/commit/304fbacab22538fb0945f564e061783b47120120))
+
+## [2.40.2](https://github.com/revanced/revanced-patches/compare/v2.40.1...v2.40.2) (2022-08-22)
+
+
+### Bug Fixes
+
+* correct title for `tablet-miniplayer` setting switch ([6af6c02](https://github.com/revanced/revanced-patches/commit/6af6c02154d170153093bd846dfcb7a6205dd6fa))
+
+## [2.40.1](https://github.com/revanced/revanced-patches/compare/v2.40.0...v2.40.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* add missing switch for `tablet-mini-player` patch ([244a1b2](https://github.com/revanced/revanced-patches/commit/244a1b2cb9f77272dc62287a4a34a487b0289295))
+
+# [2.40.0](https://github.com/revanced/revanced-patches/compare/v2.39.1...v2.40.0) (2022-08-22)
+
+
+### Features
+
+* `settings` patch framework ([#266](https://github.com/revanced/revanced-patches/issues/266)) ([084a99b](https://github.com/revanced/revanced-patches/commit/084a99bc6f5ed67c0b270e219c2dd75a30f302f1))
+
+## [2.39.1](https://github.com/revanced/revanced-patches/compare/v2.39.0...v2.39.1) (2022-08-21)
+
+
+### Bug Fixes
+
+* make `custom-branding` cross-platform ([#366](https://github.com/revanced/revanced-patches/issues/366)) ([02ac62b](https://github.com/revanced/revanced-patches/commit/02ac62b0ea7e47ff3aa5078ce4645421f410b154))
+
+# [2.39.0](https://github.com/revanced/revanced-patches/compare/v2.38.0...v2.39.0) (2022-08-19)
+
+
+### Features
+
+* bundle `dex` file into `jar` file ([#359](https://github.com/revanced/revanced-patches/issues/359)) ([f419252](https://github.com/revanced/revanced-patches/commit/f4192526eab1e3e0208e7460847b892e077fcf5a))
+
+# [2.38.0](https://github.com/revanced/revanced-patches/compare/v2.37.0...v2.38.0) (2022-08-17)
+
+
+### Features
+
+* bump YouTube patches to `v17.32.35` ([#347](https://github.com/revanced/revanced-patches/issues/347)) ([5292a0e](https://github.com/revanced/revanced-patches/commit/5292a0e973953225f94eed887a5d8f1ead17bb97))
+
+# [2.37.0](https://github.com/revanced/revanced-patches/compare/v2.36.2...v2.37.0) (2022-08-15)
+
+
+### Features
+
+* ˋpflotsh-ecmwf-subscription-unlockˋ patch ([#332](https://github.com/revanced/revanced-patches/issues/332)) ([ae2a1d8](https://github.com/revanced/revanced-patches/commit/ae2a1d8362e388032c3521101ff60698c4af1583))
+
 ## [2.36.2](https://github.com/revanced/revanced-patches/compare/v2.36.1...v2.36.2) (2022-08-14)


--- a/README-template.md
+++ b/README-template.md
@@ -1,7 +1,124 @@
-# 🧩 ReVanced Patches
+## 🧩 Patches

-Official patches by ReVanced
+The official Patch bundle provided by ReVanced and the community.

-## 📜 List of available patches
+> Looking for the JSON variant of this? [Click here](patches.json).

 {{ table }}
+
+## 📝 JSON Format
+
+This section explains the JSON format for the [patches.json](patches.json) file.
+
+The file contains an array of objects, each object representing a patch. The object contains the following properties:
+
+| key                           | description                                                                                                                                                                           |
+|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `name`                        | The name of the patch.                                                                                                                                                                |
+| `description`                 | The description of the patch.                                                                                                                                                         |
+| `version`                     | The version of the patch.                                                                                                                                                             |
+| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
+| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
+| `options`                     | An array of options for this patch.                                                                                                                                                   |
+| `options.key`                 | The key of the option.                                                                                                                                                                |
+| `options.title`               | The title of the option.                                                                                                                                                              |
+| `options.description`         | The description of the option.                                                                                                                                                        |
+| `options.required`            | Whether the option is required.                                                                                                                                                       |
+| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
+| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
+
+Example:
+
+```json
+[
+  {
+    "name": "remember-video-quality",
+    "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [],
+    "dependencies": [
+      "integrations",
+      "video-id-hook"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": [
+          "17.22.36",
+          "17.24.35",
+          "17.26.35",
+          "17.27.39",
+          "17.28.34",
+          "17.29.34",
+          "17.32.35",
+          "17.33.42"
+        ]
+      }
+    ]
+  },
+  {
+    "name": "theme",
+    "description": "Enables a custom theme.",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "theme",
+        "title": "Theme",
+        "description": "Select a theme.",
+        "required": true,
+        "choices": [
+          "Amoled"
+        ]
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": []
+      }
+    ]
+  },
+  {
+    "name": "custom-branding",
+    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "appName",
+        "title": "Application Name",
+        "description": "The name of the application it will show on your home screen.",
+        "required": true,
+        "choices": null
+      },
+      {
+        "key": "appIconPath",
+        "title": "Application Icon Path",
+        "description": "A path to the icon of the application.",
+        "required": false,
+        "choices": null
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": []
+      }
+    ]
+  }
+]
+```
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# 🧩 ReVanced Patches
+## 🧩 Patches

-Official patches by ReVanced
+The official Patch bundle provided by ReVanced and the community.

-## 📜 List of available patches
+> Looking for the JSON variant of this? [Click here](patches.json).

 ### 📦 `com.twitter.android`
 <details>
@@ -17,24 +17,33 @@ Official patches by ReVanced

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `premium-icon-reddit` | Unlocking Premium Icons in reddit app. | all |
 | `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
 </details>

+### 📦 `com.garzotto.pflotsh.ecmwf_a`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
+</details>
+
 ### 📦 `com.google.android.apps.youtube.music`
 <details>

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

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `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>
+
+### 📦 `com.zhiliaoapp.musically`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `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>

@@ -58,34 +79,163 @@ Official patches by ReVanced

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.29.34 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.29.34 |
-| `minimized-playback` | Enables minimized and background playback. | 17.29.34 |
-| `amoled` | Enables pure black theme. | 17.29.34 |
-| `disable-create-button` | Hides the create button in the navigation bar. | 17.29.34 |
+| `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.29.34 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.29.34 |
+| `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.29.34 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.29.34 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.29.34 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.29.34 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.29.34 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.29.34 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.29.34 |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.29.34 |
-| `always-autorepeat` | Always repeats the playing video again. | 17.29.34 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG | 17.29.34 |
+| `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 |
+| `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.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.29.34 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.29.34 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.29.34 |
-| `video-ads` | Removes ads in the video player. | 17.29.34 |
-| `general-ads` | Removes general ads. | 17.29.34 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.29.34 |
+| `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`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
 </details>


+
+## 📝 JSON Format
+
+This section explains the JSON format for the [patches.json](patches.json) file.
+
+The file contains an array of objects, each object representing a patch. The object contains the following properties:
+
+| key                           | description                                                                                                                                                                           |
+|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `name`                        | The name of the patch.                                                                                                                                                                |
+| `description`                 | The description of the patch.                                                                                                                                                         |
+| `version`                     | The version of the patch.                                                                                                                                                             |
+| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
+| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
+| `options`                     | An array of options for this patch.                                                                                                                                                   |
+| `options.key`                 | The key of the option.                                                                                                                                                                |
+| `options.title`               | The title of the option.                                                                                                                                                              |
+| `options.description`         | The description of the option.                                                                                                                                                        |
+| `options.required`            | Whether the option is required.                                                                                                                                                       |
+| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
+| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
+
+Example:
+
+```json
+[
+  {
+    "name": "remember-video-quality",
+    "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [],
+    "dependencies": [
+      "integrations",
+      "video-id-hook"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": [
+          "17.22.36",
+          "17.24.35",
+          "17.26.35",
+          "17.27.39",
+          "17.28.34",
+          "17.29.34",
+          "17.32.35",
+          "17.33.42"
+        ]
+      }
+    ]
+  },
+  {
+    "name": "theme",
+    "description": "Enables a custom theme.",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "theme",
+        "title": "Theme",
+        "description": "Select a theme.",
+        "required": true,
+        "choices": [
+          "Amoled"
+        ]
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": []
+      }
+    ]
+  },
+  {
+    "name": "custom-branding",
+    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "appName",
+        "title": "Application Name",
+        "description": "The name of the application it will show on your home screen.",
+        "required": true,
+        "choices": null
+      },
+      {
+        "key": "appIconPath",
+        "title": "Application Icon Path",
+        "description": "A path to the icon of the application.",
+        "required": false,
+        "choices": null
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
+        "versions": []
+      }
+    ]
+  }
+]
+```
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,22 +20,21 @@ repositories {
 }

 dependencies {
-    implementation(kotlin("stdlib"))
-
-    implementation("app.revanced:revanced-patcher:3.3.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")
 }

 tasks {
-    register<DefaultTask>("generateDex") {
-        description = "Generate dex files from build"
+    register<DefaultTask>("generateBundle") {
+        description = "Generate dex files from build and bundle them in the jar file"
        dependsOn(build)

        doLast {
            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
            val d8 = "${androidHome}/build-tools/32.0.0/d8"
            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
-            val output = input.replace(".jar", ".dex")
            val work = File("${buildDir}/libs")

            exec {
@@ -45,16 +44,16 @@ tasks {

            exec {
                workingDir = work
-                commandLine = listOf("mv", "classes.dex", output)
+                commandLine = listOf("zip", "-u", input, "classes.dex")
            }
        }
    }
-    register<JavaExec>("generateReadme") {
-        description = "Generate README.md"
+    register<JavaExec>("generateMeta") {
+        description = "Generate metadata for this bundle"
        dependsOn(build)

        classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("app.revanced.meta.readme.Generator")
+        mainClass.set("app.revanced.meta.Meta")
    }
    // Dummy task to fix the Gradle semantic-release plugin.
    // Remove this if you forked it to support building only.
@@ -62,6 +61,6 @@ tasks {
    register<DefaultTask>("publish") {
        group = "publish"
        description = "Dummy task"
-        dependsOn(named("generateDex"), named("generateReadme"))
+        dependsOn(named("generateBundle"), named("generateMeta"))
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.36.2
+version = 2.62.0
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/meta/Meta.kt
+++ b/src/main/kotlin/app/revanced/meta/Meta.kt
@@ -0,0 +1,27 @@
+package app.revanced.meta
+
+import app.revanced.meta.json.generateJson
+import app.revanced.meta.readme.generateText
+import app.revanced.patcher.data.Data
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.patch.impl.JarPatchBundle
+import java.io.File
+
+typealias Bundle = List<Class<out Patch<Data>>>
+
+object Meta {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        val patches = accumulatePatches()
+        if (patches.isEmpty()) throw IllegalStateException("No patches found")
+
+        generateText(patches)
+        generateJson(patches)
+    }
+}
+
+fun accumulatePatches() = JarPatchBundle(
+    File("build/libs/").listFiles()!!.first {
+        it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
+    }.absolutePath
+).loadPatches()
--- a/src/main/kotlin/app/revanced/meta/json/Generator.kt
+++ b/src/main/kotlin/app/revanced/meta/json/Generator.kt
@@ -0,0 +1,50 @@
+package app.revanced.meta.json
+
+import app.revanced.meta.Bundle
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.extensions.PatchExtensions.deprecated
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.include
+import app.revanced.patcher.extensions.PatchExtensions.options
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.extensions.PatchExtensions.version
+import app.revanced.patcher.patch.PatchOption
+import com.google.gson.GsonBuilder
+import java.io.File
+
+private val gson = GsonBuilder().serializeNulls().create()
+
+fun generateJson(bundle: Bundle) {
+    val patches = bundle.map {
+        JsonPatch(
+            it.patchName,
+            it.description ?: "This patch has no description.",
+            it.version ?: "0.0.0",
+            !it.include,
+            it.deprecated != null,
+            it.options?.map { option ->
+                Option(
+                    option.key,
+                    option.title,
+                    option.description,
+                    option.required,
+                    option.let { lo ->
+                        if (lo is PatchOption.ListOption<*>) {
+                            lo.options.toMutableList().toTypedArray()
+                        } else null
+                    }
+                )
+            }?.toTypedArray() ?: emptyArray(),
+            it.dependencies?.map { dep ->
+                dep.java.patchName
+            }?.toTypedArray() ?: emptyArray(),
+            it.compatiblePackages?.map { pkg ->
+                CompatiblePackage(pkg.name, pkg.versions)
+            }?.toTypedArray() ?: emptyArray()
+        )
+    }
+
+    val json = File("patches.json")
+    json.writeText(gson.toJson(patches))
+}
--- a/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt
+++ b/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt
@@ -0,0 +1,27 @@
+@file:Suppress("ArrayInDataClass") // We don't need it here.
+
+package app.revanced.meta.json
+
+data class JsonPatch(
+    val name: String,
+    val description: String,
+    val version: String,
+    val excluded: Boolean,
+    val deprecated: Boolean,
+    val options: Array<Option>,
+    val dependencies: Array<String>,
+    val compatiblePackages: Array<CompatiblePackage>,
+)
+
+data class CompatiblePackage(
+    val name: String,
+    val versions: Array<String>,
+)
+
+data class Option(
+    val key: String,
+    val title: String,
+    val description: String,
+    val required: Boolean,
+    val choices: Array<*>?,
+)
--- a/src/main/kotlin/app/revanced/meta/readme/Extensions.kt
+++ b/src/main/kotlin/app/revanced/meta/readme/Extensions.kt
@@ -4,8 +4,7 @@ import app.revanced.patcher.data.Data
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.patch.Patch

-internal fun Class<out Patch<Data>>.getLatestVersion(): SemanticVersion? =
-    this.compatiblePackages?.first()?.versions?.map { SemanticVersion.fromString(it) }
-        ?.maxWithOrNull(
-            SemanticVersionComparator
-        )
+internal fun Class<out Patch<Data>>.getLatestVersion() =
+    this.compatiblePackages?.first()?.versions?.map {
+        SemanticVersion.fromString(it)
+    }?.maxWithOrNull(SemanticVersionComparator)
--- a/src/main/kotlin/app/revanced/meta/readme/Generator.kt
+++ b/src/main/kotlin/app/revanced/meta/readme/Generator.kt
@@ -1,55 +1,42 @@
 package app.revanced.meta.readme

+import app.revanced.meta.Bundle
 import app.revanced.patcher.data.Data
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.impl.JarPatchBundle
 import java.io.File

-object Generator {
-    private const val TABLE_HEADER =
-        "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" +
-                "|:--------:|:--------------:|:-----------------:|"
+private const val TABLE_HEADER =
+    "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" + "|:--------:|:--------------:|:-----------------:|"

-    @JvmStatic
-    fun main(args: Array<String>) {
-        val buildDir = File("build/libs/")
-        val buildJar =
-            buildDir.listFiles()?.first { it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar") }!!
+private val TABLE_REGEX = Regex("\\{\\{\\s?table\\s?}}")

-        val bundle = JarPatchBundle(buildJar.absolutePath).loadPatches()
+fun generateText(bundle: Bundle) {
+    val output = StringBuilder()
+    val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()

-        val output = StringBuilder()
-
-        val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
-
-        bundle.map {
-            val packageName = it.compatiblePackages?.first()?.name!!
-            if (!packages.contains(packageName)) {
-                packages[packageName] = mutableListOf()
-            }
-
-            packages[packageName]?.add(it)
+    for (patch in bundle) {
+        patch.compatiblePackages?.forEach { pkg ->
+            if (!packages.contains(pkg.name)) packages[pkg.name] = mutableListOf()
+            packages[pkg.name]!!.add(patch)
        }
-
-        for (pkg in packages) {
-            output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
-            output.appendLine("<details>\n")
-
-            output.appendLine(TABLE_HEADER)
-            pkg.value.forEach { output.appendLine("| `${it.patchName}` | ${it.description} | ${it.getLatestVersion() ?: "all"} |") }
-
-            output.appendLine("</details>\n")
-        }
-
-        val readMeTemplateFile = File("README-template.md")
-        val readmeTemplate = Template(readMeTemplateFile.readText())
-
-        readmeTemplate.replaceVariable("table", output.toString())
-
-        val readme = File("README.md")
-        readme.writeText(readmeTemplate.toString())
    }
+
+    for (pkg in packages) {
+        output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
+        output.appendLine("<details>\n")
+
+        output.appendLine(TABLE_HEADER)
+        pkg.value.forEach { output.appendLine("| `${it.patchName}` | ${it.description} | ${it.getLatestVersion() ?: "all"} |") }
+
+        output.appendLine("</details>\n")
+    }
+
+    val readmeTemplate = Template(File("README-template.md").readText())
+    readmeTemplate.replaceVariable(TABLE_REGEX, output.toString())
+
+    val readme = File("README.md")
+    readme.writeText(readmeTemplate.toString())
 }
--- a/src/main/kotlin/app/revanced/meta/readme/SemanticVersion.kt
+++ b/src/main/kotlin/app/revanced/meta/readme/SemanticVersion.kt
@@ -3,10 +3,8 @@ package app.revanced.meta.readme
 data class SemanticVersion(val major: Int, val minor: Int, val patch: Int) {
    companion object {
        fun fromString(version: String): SemanticVersion {
-            var parts = version.split(".")
-
+            val parts = version.split(".")
            if (parts.count() != 3) throw IllegalArgumentException("Invalid semantic version")
-
            val versionNumbers = parts.map { it.toInt() }
            return SemanticVersion(versionNumbers[0], versionNumbers[1], versionNumbers[2])
        }
--- a/src/main/kotlin/app/revanced/meta/readme/Template.kt
+++ b/src/main/kotlin/app/revanced/meta/readme/Template.kt
@@ -1,12 +1,10 @@
 package app.revanced.meta.readme

 class Template(template: String) {
-    val result: StringBuilder = StringBuilder(template)
+    val result = StringBuilder(template)

-    fun replaceVariable(name: String, value: String) {
-        val regex = Regex("\\{\\{\\s?$name\\s?}}")
+    fun replaceVariable(regex: Regex, value: String) {
        val range = regex.find(result)!!.range
-
        result.replace(range.first, range.last + 1, value)
    }

--- 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")
+        "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")
+        "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/fingerprints/CodecsLockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.music.audio.codecs.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -19,7 +19,7 @@ import org.jf.dexlib2.Opcode
@CodecsUnlockCompatibility
@Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
        Opcode.INVOKE_DIRECT,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
@@ -35,5 +35,5 @@ object CodecsLockFingerprint : MethodFingerprint(
        Opcode.INVOKE_DIRECT,
        Opcode.RETURN_OBJECT
    ),
-    listOf("eac3_supported")
+    strings = listOf("eac3_supported")
 )
--- 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")
+        "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")
+        "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/compactheader/patch/CompactHeaderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
@@ -31,8 +31,8 @@ class CompactHeaderPatch : BytecodePatch(
        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
        method.addInstructions(
            insertIndex, """
-                const/16 v0, 0x8
-                invoke-virtual {v${register}, v0}, Landroid/view/View;->setVisibility(I)V
+                const/16 v2, 0x8
+                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
            """
        )

--- 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")
+        "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")
+        "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.14.53", "5.16.51")
+        "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/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
@RemoveTasteBuilderCompatibility
@Version("0.0.1")
 object TasteBuilderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L"), listOf(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
        Opcode.INVOKE_DIRECT,
        Opcode.INVOKE_VIRTUAL,
        Opcode.NEW_INSTANCE,
@@ -35,9 +35,9 @@ object TasteBuilderConstructorFingerprint : MethodFingerprint(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT,
        Opcode.NEW_INSTANCE,
        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST
    )
 )
--- 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")
+        "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")
+        "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/fingerprints/CastContextFetchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Error fetching CastContext.")
+    strings = listOf("Error fetching CastContext.")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-module-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Failed to load module via V2: ")
+    strings = listOf("Failed to load module via V2: ")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.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.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,5 +17,14 @@ import org.jf.dexlib2.AccessFlags
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
-    "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("This should never happen.", "MetadataValueReader", "GooglePlayServicesUtil", "com.android.vending", "android.hardware.type.embedded")
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf(
+        "This should never happen.",
+        "MetadataValueReader",
+        "GooglePlayServicesUtil",
+        "com.android.vending",
+        "android.hardware.type.embedded"
+    )
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.music.misc.microg.annotations.MusicMicroGPatchCompatibility

@Name("google-play-prime-fingerprint")
@@ -15,5 +15,5 @@ import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompat
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending")
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("Google Play Services not available")
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf("Google Play Services not available")
 )
--- 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")
+        "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/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.reddit.ad.general.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.reddit.frontpage", arrayOf()
-    )]
-)
+@Compatibility([Package("com.reddit.frontpage")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.reddit.layout.premiumicon.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.reddit.frontpage")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumIconCompatibility
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.reddit.layout.premiumicon.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.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
+
+@Name("premium-icon-fingerprint")
+@MatchingMethod(
+    "Lcom/reddit/domain/model/MyAccount;", "isPremiumSubscriber"
+)
+@PremiumIconCompatibility
+@Version("0.0.1")
+object PremiumIconFingerprint : MethodFingerprint(
+    "Z",
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
@@ -0,0 +1,36 @@
+package app.revanced.patches.reddit.layout.premiumicon.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.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
+import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
+
+@Patch
+@Name("premium-icon-reddit")
+@Description("Unlocking Premium Icons in reddit app.")
+@PremiumIconCompatibility
+@Version("0.0.1")
+class PremiumIconPatch : BytecodePatch(
+    listOf(
+        PremiumIconFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = PremiumIconFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt
@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [
-        Package("com.ss.android.ugc.trill", arrayOf()),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
    ]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.ad.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.tiktok.ad.annotations.TiktokAdsCompatibility
+
+@Name("convert-help-v2-feeditemlist-fingerprint")
+@MatchingMethod(
+    "Lbeancopy/ConvertHelp;",
+    "com${'$'}ss${'$'}ugc${'$'}aweme${'$'}proto${'$'}aweme_v2_feed_response${'$'}${'$'}com${'$'}ss${'$'}android${'$'}ugc${'$'}aweme${'$'}feed${'$'}model${'$'}FeedItemList",
+)
+@TiktokAdsCompatibility
+@Version("0.0.1")
+object ConvertHelpFeedItemListFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ConvertHelp;") &&
+                methodDef.name.endsWith("${'$'}FeedItemList")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
@@ -14,7 +14,7 @@ import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
@TiktokAdsCompatibility
@Version("0.0.1")
 object FeedItemListCloneFingerprint : MethodFingerprint(
-    null, null, null, null,null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt
@@ -11,6 +11,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
+import app.revanced.patches.tiktok.ad.fingerprints.ConvertHelpFeedItemListFingerprint
 import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -23,26 +24,34 @@ import org.jf.dexlib2.iface.reference.FieldReference
@TiktokAdsCompatibility
@Version("0.0.1")
 class TiktokAdsPatch : BytecodePatch(
-    listOf(FeedItemListCloneFingerprint)
+    listOf(
+        FeedItemListCloneFingerprint,
+        ConvertHelpFeedItemListFingerprint
+    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
-        val method = FeedItemListCloneFingerprint.result!!.mutableMethod
-        // iterate all instructions in the clone method
-        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
-            // conditions for the instruction we need
-            if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
-            val clonePreloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
-            if ((clonePreloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue
+        listOf(
+            FeedItemListCloneFingerprint,
+            ConvertHelpFeedItemListFingerprint
+        ).forEach { fingerprint ->
+            val method = fingerprint.result!!.mutableMethod
+            // iterate all instructions in the clone method
+            for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+                // conditions for the instruction we need
+                if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
+                val preloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
+                if ((preloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue

-            // set null instead of the field "preloadAds"
-            val overrideRegister = (clonePreloadAdsFieldInstruction as TwoRegisterInstruction).registerA
-            method.addInstruction(
-                index,
-                "const/4 v$overrideRegister, 0x0"
-            )
-            return PatchResultSuccess()
+                // set null instead of the field "preloadAds"
+                val overrideRegister = (preloadAdsFieldInstruction as TwoRegisterInstruction).registerA
+                method.addInstruction(
+                    index,
+                    "const/4 v$overrideRegister, 0x0"
+                )
+                return@forEach
+            }
+            return PatchResultError("Can not find required instruction.")
        }
-
-        return PatchResultError("Could not find required instruction.")
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.downloads.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DownloadsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
@@ -0,0 +1,22 @@
+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("acl-common-share-get-code")
+@MatchingMethod("ACLCommonShare", "getCode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getCode"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
@@ -0,0 +1,22 @@
+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("acl-common-share-get-show-type")
+@MatchingMethod("ACLCommonShare", "getShowType")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint2 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getShowType"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
@@ -0,0 +1,22 @@
+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("acl-common-share-get-transcode")
+@MatchingMethod("ACLCommonShare", "getTranscode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint3 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getTranscode"
+    }
+)
--- 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
@@ -0,0 +1,135 @@
+package app.revanced.patches.tiktok.interaction.downloads.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.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.extensions.replaceInstructions
+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.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("Removes download restrictions and changes the default path to download to.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsPatch : BytecodePatch(
+    listOf(
+        ACLCommonShareFingerprint,
+        ACLCommonShareFingerprint2,
+        ACLCommonShareFingerprint3,
+        DownloadPathParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
+        method1.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x0
+                return v0
+            """
+        )
+        val method2 = ACLCommonShareFingerprint2.result!!.mutableMethod
+        method2.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x2
+                return v0
+            """
+        )
+        //Download videos without watermark.
+        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
+        method3.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                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/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.seekbar.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SeekbarCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.interaction.seekbar.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.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("aweme-get-video-control")
+@MatchingMethod("Aweme", "getVideoControl")
+@SeekbarCompatibility
+@Version("0.0.1")
+object AwemeGetVideoControlFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PUBLIC.value,
+   customFingerprint = { methodDef ->
+       methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
+   }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt
@@ -0,0 +1,47 @@
+package app.revanced.patches.tiktok.interaction.seekbar.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.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
+import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.*
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
+
+@Patch
+@Name("tiktok-seekbar")
+@Description("Show progress bar for all video.")
+@SeekbarCompatibility
+@Version("0.0.1")
+class TiktokSeekbarPatch : BytecodePatch(
+    listOf(
+        AwemeGetVideoControlFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        //Get VideoControl FieldReference
+        val videoControl = data.findClass { it.type.endsWith("/VideoControl;") }
+            ?: return PatchResultError("Can not find target class")
+        val fieldList = videoControl.immutableClass.fields.associateBy { field -> field.name }
+
+        val method = AwemeGetVideoControlFingerprint.result!!.mutableMethod
+        val implementation = method.implementation!!
+        implementation.addInstructions(
+            1, listOf(
+                BuilderInstruction11n(Opcode.CONST_4, 1, 1),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["showProgressBar"]!!),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["draftProgressBar"]!!)
+            )
+        )
+        return PatchResultSuccess()
+    }
+
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.twitter.ad.timeline.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.twitter.android", arrayOf()
-    )]
-)
+@Compatibility([Package("com.twitter.android")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class TimelineAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
@@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode
@TimelineAdsCompatibility
@Version("0.0.1")
 object TimelineTweetJsonParserFingerprint : MethodFingerprint(
-    null, null, null, listOf(
+    opcodes = listOf(
        Opcode.IPUT_OBJECT,
        Opcode.GOTO,
        Opcode.SGET_OBJECT,
@@ -21,6 +21,6 @@ object TimelineTweetJsonParserFingerprint : MethodFingerprint(
        Opcode.CHECK_CAST,
        Opcode.IPUT_OBJECT,
        Opcode.RETURN_VOID,
-    ), listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
-    { methodDef -> methodDef.name == "parseField" }
+    ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
+    customFingerprint = { methodDef -> methodDef.name == "parseField" }
 )
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
+@Compatibility([Package("de.dwd.warnapp")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FirebaseGetCertPatchCompatibility
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
@Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
-    null,
-    null,
-    null,
-    listOf(
+    strings = listOf(
        "ContentValues",
        "Could not get fingerprint hash for package: ",
        "No such package: "
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
@Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
-    null,
-    null,
-    null,
-    listOf(
+    strings = listOf(
        "FirebaseRemoteConfig",
        "Could not get fingerprint hash for package: ",
        "No such package: "
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.promocode.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
+@Compatibility([Package("de.dwd.warnapp")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PromoCodeUnlockCompatibility
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.warnwetter.misc.promocode.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility

@Name("promo-code-unlock-fingerprint")
@@ -13,12 +13,7 @@ import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnloc
@PromoCodeUnlockCompatibility
@Version("0.0.1")
 object PromoCodeUnlockFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
    }
 )
--- 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")
+        "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/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
@@ -23,6 +23,9 @@ import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensi
 import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
 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.builder.MutableMethodImplementation
 import org.jf.dexlib2.builder.instruction.*
@@ -38,7 +41,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference

@Patch
-@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class])
+@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
@Name("general-ads")
@Description("Removes general ads.")
@GeneralAdsCompatibility
@@ -68,6 +71,135 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
    )

    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_home_ads_removal",
+                StringResource("revanced_home_ads_removal_title", "Remove home ads"),
+                true,
+                StringResource("revanced_home_ads_removal_summary_on", "Home ads are hidden"),
+                StringResource("revanced_home_ads_removal_summary_off", "Home ads are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_ad_removal",
+                StringResource("revanced_adremover_ad_removal_enabled_title", "Remove general ads"),
+                true,
+                StringResource("revanced_adremover_ad_removal_enabled_summary_on", "General ads are hidden"),
+                StringResource("revanced_adremover_ad_removal_enabled_summary_off", "General ads are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_merchandise",
+                StringResource("revanced_adremover_merchandise_enabled_title", "Remove merchandise banners"),
+                true,
+                StringResource("revanced_adremover_merchandise_enabled_summary_on", "Merchandise banners are hidden"),
+                StringResource("revanced_adremover_merchandise_enabled_summary_off", "Merchandise banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_community_posts_removal",
+                StringResource("revanced_adremover_community_posts_enabled_title", "Remove community posts"),
+                true,
+                StringResource("revanced_adremover_community_posts_enabled_summary_on", "Community posts are hidden"),
+                StringResource("revanced_adremover_community_posts_enabled_summary_off", "Community posts are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_compact_banner_removal",
+                StringResource("revanced_adremover_compact_banner_enabled_title", "Remove compact banners"),
+                true,
+                StringResource("revanced_adremover_compact_banner_enabled_summary_on", "Compact banners are hidden"),
+                StringResource("revanced_adremover_compact_banner_enabled_summary_off", "Compact banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_comments_removal",
+                StringResource("revanced_adremover_comments_enabled_title", "Remove comments section"),
+                false,
+                StringResource("revanced_adremover_comments_enabled_summary_on", "Comment section is hidden"),
+                StringResource("revanced_adremover_comments_enabled_summary_off", "Comment section is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_movie",
+                StringResource("revanced_adremover_movie_enabled_title", "Remove movies section"),
+                true,
+                StringResource("revanced_adremover_movie_enabled_summary_on", "Movies section is hidden"),
+                StringResource("revanced_adremover_movie_enabled_summary_off", "Movies section is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_feed_survey",
+                StringResource("revanced_adremover_feed_survey_enabled_title", "Remove feed surveys"),
+                true,
+                StringResource("revanced_adremover_feed_survey_enabled_summary_on", "Feed surveys are hidden"),
+                StringResource("revanced_adremover_feed_survey_enabled_summary_off", "Feed surveys are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_shorts_shelf",
+                StringResource("revanced_adremover_shorts_shelf_enabled_title", "Remove shorts shelf"),
+                true,
+                StringResource("revanced_adremover_shorts_shelf_enabled_summary_on", "Shorts shelves are hidden"),
+                StringResource("revanced_adremover_shorts_shelf_enabled_summary_off", "Shorts shelves are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_community_guidelines",
+                StringResource("revanced_adremover_community_guidelines_enabled_title", "Remove community guidelines"),
+                true,
+                StringResource("revanced_adremover_community_guidelines_enabled_summary_on", "Community guidelines are hidden"),
+                StringResource("revanced_adremover_community_guidelines_enabled_summary_off", "Community guidelines are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_emergency_box_removal",
+                StringResource("revanced_adremover_emergency_box_enabled_title", "Remove emergency boxes"),
+                true,
+                StringResource("revanced_adremover_emergency_box_enabled_summary_on", "Emergency boxes are hidden"),
+                StringResource("revanced_adremover_emergency_box_enabled_summary_off", "Emergency boxes are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_info_panel",
+                StringResource("revanced_adremover_info_panel_enabled_title", "Remove info panels"),
+                true,
+                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Merchandise banners are hidden"),
+                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Merchandise banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_medical_panel",
+                StringResource("revanced_adremover_medical_panel_enabled_title", "Remove medical panels"),
+                true,
+                StringResource("revanced_adremover_medical_panel_enabled_summary_on", "Medical panels are hidden"),
+                StringResource("revanced_adremover_medical_panel_enabled_summary_off", "Medical panels are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_paid_content",
+                StringResource("revanced_adremover_paid_content_enabled_title", "Remove paid content"),
+                true,
+                StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
+                StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_suggested",
+                StringResource("revanced_adremover_suggested_enabled_title", "Remove personal suggestions"),
+                true,
+                StringResource("revanced_adremover_suggested_enabled_summary_on", "Personal suggestions are hidden"),
+                StringResource("revanced_adremover_suggested_enabled_summary_off", "Personal suggestions are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_suggestions",
+                StringResource("revanced_adremover_hide_suggestions_enabled_title", "Hide suggestions"),
+                true,
+                StringResource("revanced_adremover_hide_suggestions_enabled_summary_on", "Suggestions are hidden"),
+                StringResource("revanced_adremover_hide_suggestions_enabled_summary_off", "Suggestions are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_latest_posts",
+                StringResource("revanced_adremover_hide_latest_posts_enabled_title", "Hide latest posts"),
+                true,
+                StringResource("revanced_adremover_hide_latest_posts_enabled_summary_on", "Latest posts are hidden"),
+                StringResource("revanced_adremover_hide_latest_posts_enabled_summary_off", "Latest posts are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_channel_guidelines",
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
+                true,
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_on", "Channel guidelines are hidden"),
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_off", "Channel guidelines are shown")
+            ),
+        )
+
        // iterating through all classes is expensive
        for (classDef in data.classes) {
            var mutableClass: MutableClass? = null
--- 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")
+        "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/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt
@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsFingerprint : MethodFingerprint(
    "Ljava/lang/Boolean;",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    null,
-    listOf("vibrator"),
-    null
+    strings = listOf("vibrator")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.youtube.ad.infocardsuggestions.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
-    null,
-    listOf("player_overlay_info_card_teaser"),
-    null
+    strings = listOf("player_overlay_info_card_teaser"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt
@@ -16,10 +16,13 @@ import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfoc
 import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsParentFingerprint
 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.builder.instruction.BuilderInstruction35c

@Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@Name("hide-infocard-suggestions")
@Description("Hides infocards in videos.")
@HideInfocardSuggestionsCompatibility
@@ -30,6 +33,16 @@ class HideInfocardSuggestionsPatch : BytecodePatch(
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_info_cards_enabled",
+                StringResource("revanced_info_cards_enabled_title", "Show info-cards"),
+                false,
+                StringResource("revanced_info_cards_enabled_summary_on", "Info-cards are shown"),
+                StringResource("revanced_info_cards_enabled_summary_off", "Info-cards are hidden")
+            )
+        )
+
        val parentResult = HideInfocardSuggestionsParentFingerprint.result
            ?: return PatchResultError("Parent fingerprint not resolved!")

--- 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")
+        "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/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@VideoAdsCompatibility
@Version("0.0.1")
 object ShowVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
@@ -15,9 +15,12 @@ import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsConstructorFingerprint
 import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsFingerprint
 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])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@Name("video-ads")
@Description("Removes ads in the video player.")
@VideoAdsCompatibility
@@ -28,7 +31,19 @@ class VideoAdsPatch : BytecodePatch(
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
-        ShowVideoAdsFingerprint.resolve(data, ShowVideoAdsConstructorFingerprint.result!!.classDef)
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_video_ads_removal",
+                StringResource("revanced_video_ads_removal_title", "Hide video ads"),
+                true,
+                StringResource("revanced_video_ads_removal_summary_on", "Video ads are hidden"),
+                StringResource("revanced_video_ads_removal_summary_off", "Video ads are shown")
+            )
+        )
+
+        ShowVideoAdsFingerprint.resolve(
+            data, ShowVideoAdsConstructorFingerprint.result!!.classDef
+        )

        // Override the parameter by calling shouldShowAds and setting the parameter to the result
        ShowVideoAdsFingerprint.result!!.mutableMethod.addInstructions(
@@ -40,4 +55,4 @@ class VideoAdsPatch : BytecodePatch(

        return PatchResultSuccess()
    }
-}
+}
--- 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
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.downloads.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+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", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DownloadsCompatibility
+
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt
@@ -0,0 +1,52 @@
+package app.revanced.patches.youtube.interaction.downloads.bytecode.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.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.interaction.downloads.annotation.DownloadsCompatibility
+import app.revanced.patches.youtube.interaction.downloads.resource.patch.DownloadsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
+import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+
+@Patch
+@Name("downloads")
+@DependsOn([DownloadsResourcePatch::class, PlayerControlsBytecodePatch::class, VideoIdPatch::class])
+@Description("Enables downloading music and videos from YouTube.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsBytecodePatch : BytecodePatch() {
+    override fun execute(data: BytecodeData): PatchResult {
+        val integrationsPackage = "app/revanced/integrations"
+        val classDescriptor = "L$integrationsPackage/videoplayer/DownloadButton;"
+
+        /*
+        initialize the control
+         */
+
+        val initializeDownloadsDescriptor = "$classDescriptor->initializeDownloadButton(Ljava/lang/Object;)V"
+        PlayerControlsBytecodePatch.initializeControl(initializeDownloadsDescriptor)
+
+        /*
+         add code to change the visibility of the control
+         */
+
+        val changeVisibilityDescriptor = "$classDescriptor->changeVisibility(Z)V"
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(changeVisibilityDescriptor)
+
+        /*
+         add code to change to update the video id
+         */
+
+        val setVideoIdDescriptor =
+            "L$integrationsPackage/patches/downloads/DownloadsPatch;->setVideoId(Ljava/lang/String;)V"
+        VideoIdPatch.injectCall(setVideoIdDescriptor)
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/DownloadsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/DownloadsResourcePatch.kt
@@ -0,0 +1,72 @@
+package app.revanced.patches.youtube.interaction.downloads.resource.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.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
+import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
+import app.revanced.util.resources.ResourceUtils.copyResources
+
+@Name("downloads-resource-patch")
+@DependsOn([BottomControlsResourcePatch::class, FixLocaleConfigErrorPatch::class, SettingsPatch::class])
+@Description("Makes necessary changes to resources for the download button.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsResourcePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
+            PreferenceScreen(
+                "revanced_downloads",
+                StringResource("revanced_downloads_title", "Download settings"),
+                listOf(
+                    SwitchPreference(
+                        "revanced_downloads",
+                        StringResource("revanced_downloads_enabled_title", "Show download button"),
+                        true,
+                        StringResource("revanced_downloads_enabled_summary_on", "Download button is visible"),
+                        StringResource("revanced_downloads_enabled_summary_off", "Download button is hidden")
+                    ),
+                    TextPreference(
+                        "revanced_downloads_package_name",
+                        StringResource("revanced_downloads_package_name_title", "Downloader package name"),
+                        InputType.STRING,
+                        "org.schabi.newpipe" /* NewPipe */,
+                        StringResource("revanced_downloads_package_name_summary", "Package name of the downloader app such as NewPipe\\'s or PowerTube\\'s")
+                    )
+                ),
+                StringResource("revanced_downloads_summary", "Settings related to downloads")
+            )
+        )
+
+
+        /*
+         * Copy strings
+         */
+
+        data.mergeStrings("downloads/host/values/strings.xml")
+
+        /*
+         * Copy resources
+         */
+
+        data.copyResources("downloads", ResourceUtils.ResourceGroup("drawable", "revanced_yt_download_button.xml"))
+
+        /*
+        * Add download button node
+         */
+
+        BottomControlsResourcePatch.addControls("downloads/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
+
+        return PatchResultSuccess()
+    }
+}
--- 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")
+        "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/seekbar/patch/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
@@ -15,6 +15,9 @@ import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappin
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingParentFingerprint
 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.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
 import org.jf.dexlib2.iface.Method
@@ -22,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction11n
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c

@Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@Name("seekbar-tapping")
@Description("Enables tap-to-seek on the seekbar of the video player.")
@SeekbarTappingCompatibility
@@ -33,6 +36,16 @@ class EnableSeekbarTappingPatch : BytecodePatch(
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
+            SwitchPreference(
+                "revanced_enable_tap_seeking",
+                StringResource("revanced_seekbar_tapping_enabled_title", "Enable seekbar tapping"),
+                true,
+                StringResource("revanced_seekbar_tapping_summary_on", "Seekbar tapping is enabled"),
+                StringResource("revanced_seekbar_tapping_summary_off", "Seekbar tapping is disabled")
+            )
+        )
+
        var result = SeekbarTappingParentFingerprint.result!!

        val tapSeekMethods = mutableMapOf<String, Method>()
@@ -42,7 +55,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
            if (it.implementation == null) continue

            val instructions = it.implementation!!.instructions
-            // here we make sure we actually find the method because it has more then 7 instructions
+            // here we make sure we actually find the method because it has more than 7 instructions
            if (instructions.count() < 7) continue

            // we know that the 7th instruction has the opcode CONST_4
@@ -71,6 +84,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register")
        val register = (instruction as Instruction35c).registerC

+        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
        // the instructions are written in reverse order.
        result.mutableMethod.addInstructions(
            result.patternScanResult!!.endIndex + 1, """
@@ -80,7 +94,6 @@ class EnableSeekbarTappingPatch : BytecodePatch(
        )

        // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
-        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
        implementation.addInstruction(
            result.patternScanResult!!.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
        )
--- 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")
+        "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/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
@SwipeControlsCompatibility
@Version("0.0.1")
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "<init>"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
@SwipeControlsCompatibility
@Version("0.0.1")
 object WatchWhileActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
@@ -65,5 +65,4 @@ class SwipeControlsBytecodePatch : BytecodePatch(
        }
        return PatchResultSuccess()
    }
-}
-
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
@@ -1,31 +1,106 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource

-import app.revanced.extensions.injectResources
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.ResourceData
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
+import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.copyResources

@Name("swipe-controls-resource-patch")
+@DependsOn([SettingsPatch::class])
@SwipeControlsCompatibility
@Version("0.0.1")
 class SwipeControlsResourcePatch : ResourcePatch() {
    override fun execute(data: ResourceData): PatchResult {
-        val resourcesDir = "swipecontrols"
+        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
+            PreferenceScreen(
+                "revanced_swipe_controls", StringResource("revanced_swipe_controls_title", "Swipe controls"), listOf(
+                    SwitchPreference(
+                        "revanced_enable_swipe_brightness",
+                        StringResource("revanced_swipe_brightness_enabled_title", "Enable brightness gesture"),
+                        true,
+                        StringResource("revanced_swipe_brightness_summary_on", "Brightness swipe is enabled"),
+                        StringResource("revanced_swipe_brightness_summary_off", "Brightness swipe is disabled")
+                    ),
+                    SwitchPreference(
+                        "revanced_enable_swipe_volume",
+                        StringResource("revanced_swipe_volume_enabled_title", "Enable volume gesture"),
+                        true,
+                        StringResource("revanced_swipe_volume_summary_on", "Volume swipe is enabled"),
+                        StringResource("revanced_swipe_volume_summary_off", "Volume swipe is disabled")
+                    ),
+                    SwitchPreference(
+                        "revanced_enable_press_to_swipe",
+                        StringResource("revanced_press_to_swipe_enabled_title", "Enable press-to-swipe gesture"),
+                        false,
+                        StringResource("revanced_press_to_swipe_summary_on", "Press-to-swipe is enabled"),
+                        StringResource("revanced_press_to_swipe_summary_off", "Press-to-swipe is disabled")
+                    ),
+                    SwitchPreference(
+                        "revanced_enable_swipe_haptic_feedback",
+                        StringResource("revanced_swipe_haptic_feedback_enabled_title", "Enable haptic feedback"),
+                        true,
+                        StringResource("revanced_swipe_haptic_feedback_summary_on", "Haptic feedback is enabled"),
+                        StringResource("revanced_swipe_haptic_feedback_summary_off", "Haptic feedback is disabled")
+                    ),
+                    TextPreference(
+                        "revanced_swipe_overlay_timeout",
+                        StringResource("revanced_swipe_overlay_timeout_title", "Swipe overlay timeout"),
+                        InputType.NUMBER,
+                        "500",
+                        StringResource(
+                            "revanced_swipe_overlay_timeout_summary",
+                            "The amount of milliseconds the overlay is visible"
+                        )
+                    ),
+                    TextPreference(
+                        "revanced_swipe_overlay_text_size",
+                        StringResource("revanced_swipe_overlay_text_size_title", "Swipe overlay text size"),
+                        InputType.NUMBER,
+                        "22",
+                        StringResource("revanced_swipe_overlay_text_size_summary", "The text size for swipe overlay")
+                    ),
+                    TextPreference(
+                        "revanced_swipe_overlay_background_alpha",
+                        StringResource("revanced_swipe_overlay_background_alpha_title", "Swipe background visibility"),
+                        InputType.NUMBER,
+                        "127",
+                        StringResource(
+                            "revanced_swipe_overlay_background_alpha_summary",
+                            "The visibility of swipe overlay background"
+                        )
+                    ),
+                    TextPreference(
+                        "revanced_swipe_magnitude_threshold",
+                        StringResource("revanced_swipe_magnitude_threshold_title", "Swipe magnitude threshold"),
+                        InputType.NUMBER,
+                        "30",
+                        StringResource(
+                            "revanced_swipe_magnitude_threshold_summary",
+                            "The amount of threshold for swipe to occur"
+                        )
+                    )
+                ),
+                StringResource("revanced_swipe_controls_summary","Control volume and brightness")
+            )
+        )

-        data.injectResources(
-            this.javaClass.classLoader,
-            resourcesDir,
-            "drawable",
-            listOf(
-                "ic_sc_brightness_auto",
-                "ic_sc_brightness_manual",
-                "ic_sc_volume_mute",
-                "ic_sc_volume_normal"
-            ).map { "$it.xml" }
+        data.copyResources(
+            "swipecontrols",
+            ResourceUtils.ResourceGroup(
+                "drawable",
+                "ic_sc_brightness_auto.xml",
+                "ic_sc_brightness_manual.xml",
+                "ic_sc_volume_mute.xml",
+                "ic_sc_volume_normal.xml"
+            )
        )
        return PatchResultSuccess()
    }
--- 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,13 +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", 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")
-    )]
-)
-@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,43 +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.Version
-import app.revanced.patcher.data.impl.ResourceData
-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
-import app.revanced.patches.youtube.layout.amoled.annotations.AmoledCompatibility
-import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-import org.w3c.dom.Element
-import java.io.File
-
-@Patch
-@DependsOn([FixLocaleConfigErrorPatch::class])
-@Name("amoled")
-@Description("Enables pure black theme.")
-@AmoledCompatibility
-@Version("0.0.1")
-class AmoledPatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
-        data.xmlEditor["res${File.separator}values${File.separator}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)
-                if (node !is Element) continue
-
-                val element = resourcesNode.childNodes.item(i) as Element
-                element.textContent = when (element.getAttribute("name")) {
-                    "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 -> continue
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
--- 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")
+        "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/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.autoplaybutton.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.autoplaybutton.annotations.AutoplayButtonCompatibility
@@ -14,14 +13,12 @@ import org.jf.dexlib2.Opcode
@MatchingMethod(
    "LWillAutonavInformer;", "k"
 )
-@FuzzyPatternScanMethod(2)
@AutoplayButtonCompatibility
@Version("0.0.1")
-object AutonavInformerFingerprint : MethodFingerprint(
+object AutoNavInformerFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_INTERFACE,
        Opcode.MOVE_RESULT_OBJECT,
@@ -29,6 +26,5 @@ object AutonavInformerFingerprint : MethodFingerprint(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
    ),
-    null,
-    { it.definingClass.endsWith("WillAutonavInformer;") }
-)
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
@@ -2,31 +2,19 @@ package app.revanced.patches.youtube.layout.autoplaybutton.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.autoplaybutton.annotations.AutoplayButtonCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode

@Name("layout-constructor-fingerprint")
@MatchingMethod(
    "LYouTubeControlsOverlay;", "F"
 )
-@FuzzyPatternScanMethod(2)
@AutoplayButtonCompatibility
@Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-    ),
-    listOf("1.0x")
-)
+    strings = listOf("1.0x"),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt
@@ -1,88 +0,0 @@
-package app.revanced.patches.youtube.layout.autoplaybutton.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.extensions.removeInstruction
-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.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
-import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutonavInformerFingerprint
-import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-@Patch
-@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class])
-@Name("hide-autoplay-button")
-@Description("Hides the autoplay button in the video player.")
-@AutoplayButtonCompatibility
-@Version("0.0.1")
-class HideAutoplayButton : BytecodePatch(
-    listOf(
-        LayoutConstructorFingerprint, AutonavInformerFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val layoutGenMethod = LayoutConstructorFingerprint.result!!.mutableMethod
-
-        val autonavToggle =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_toggle" }
-        val autonavPreviewStub =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_preview_stub" }
-
-        val instructions = layoutGenMethod.implementation!!.instructions
-
-        val autonavToggleConstIndex =
-            instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavToggle.id } + 4
-        val autonavPreviewStubConstIndex =
-            instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavPreviewStub.id } + 4
-
-        injectIfBranch(layoutGenMethod, autonavToggleConstIndex)
-        injectIfBranch(layoutGenMethod, autonavPreviewStubConstIndex)
-
-        val autonavInformerMethod = AutonavInformerFingerprint.result!!.mutableMethod
-
-        //force disable autoplay since it's hard to do without the button
-        autonavInformerMethod.addInstructions(
-            0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-            move-result v0
-            if-nez v0, :hidden
-            const/4 v0, 0x0
-            return v0
-            :hidden
-            nop
-        """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    private fun injectIfBranch(method: MutableMethod, index: Int) {
-        val instructions = method.implementation!!.instructions
-        val insn = (instructions.get(index) as? Instruction35c)!!
-        val methodToCall = insn.reference.toString()
-
-        //remove the invoke-virtual because we want to put it in an if-statement
-        method.removeInstruction(index)
-        method.addInstructions(
-            index, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-            move-result v11
-            if-eqz v11, :hidebutton
-            invoke-virtual {v${insn.registerC}, v${insn.registerD}, v${insn.registerE}}, $methodToCall
-            :hidebutton
-            nop
-        """
-        )
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@@ -0,0 +1,92 @@
+package app.revanced.patches.youtube.layout.autoplaybutton.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.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutoNavInformerFingerprint
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
+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.iface.instruction.Instruction
+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, SettingsPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@Name("hide-autoplay-button")
+@Description("Hides the autoplay button in the video player.")
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+class HideAutoplayButtonPatch : BytecodePatch(
+    listOf(
+        LayoutConstructorFingerprint, AutoNavInformerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_autoplay_button_enabled",
+                StringResource("revanced_autoplay_button_enabled_title", "Show autoplay button"),
+                false,
+                StringResource("revanced_autoplay_button_summary_on", "Autoplay button is shown"),
+                StringResource("revanced_autoplay_button_summary_off", "Autoplay button is hidden")
+            )
+        )
+
+        val autoNavInformerMethod = AutoNavInformerFingerprint.result!!.mutableMethod
+
+        val layoutGenMethodResult = LayoutConstructorFingerprint.result!!
+        val layoutGenMethod = layoutGenMethodResult.mutableMethod
+        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions
+
+        // resolve the offsets such as ...
+        val autoNavPreviewStubId = ResourceIdMappingProviderResourcePatch.resourceMappings.single {
+            it.name == "autonav_preview_stub"
+        }.id
+        // where to insert the branch instructions and ...
+        val insertIndex = layoutGenMethodInstructions.indexOfFirst {
+            (it as? WideLiteralInstruction)?.wideLiteral == autoNavPreviewStubId
+        }
+        // where to branch away
+        val branchIndex = layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1).indexOfFirst {
+            ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
+        } + 2
+
+        val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
+        layoutGenMethod.addInstructions(
+            insertIndex, """
+                invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+                move-result v11
+                if-eqz v11, :hidden
+            """, listOf(ExternalLabel("hidden", jumpInstruction))
+        )
+
+        //force disable autoplay since it's hard to do without the button
+        autoNavInformerMethod.addInstructions(
+            0, """
+            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+            move-result v0
+            if-nez v0, :hidden
+            const/4 v0, 0x0
+            return v0
+            :hidden
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumHeadingCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.icon.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CustomBrandingCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
@@ -41,20 +41,18 @@ class CustomBrandingPatch : ResourcePatch() {
            "hdpi" to 72,
            "mdpi" to 48
        ).forEach { (iconDirectory, size) ->
-            iconNames.forEach iconLoop@{ iconName ->
+            iconNames.forEach { iconName ->
                val iconFile = getIconStream("branding/$size/$iconName.png")
                    ?: return PatchResultError("The icon $iconName can not be found.")

                Files.write(
                    resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(),
-                    iconFile.readAllBytes()
+                    iconFile.readBytes()
                )
            }
        }

        // Name branding
-        val appName: String by options[keyAppName]
-
        val manifest = data["AndroidManifest.xml"]
        manifest.writeText(
            manifest.readText()
@@ -67,24 +65,7 @@ class CustomBrandingPatch : ResourcePatch() {
        return PatchResultSuccess()
    }

-    override val options = PatchOptions(
-        PatchOption.StringOption(
-            key = keyAppName,
-            default = "YouTube ReVanced",
-            title = "Application Name",
-            description = "The name of the application it will show on your home screen.",
-            required = true
-        ),
-        PatchOption.StringOption(
-            key = keyAppIconPath,
-            default = null,
-            title = "Application Icon Path",
-            description = "A path to the icon of the application."
-        )
-    )
-
    private fun getIconStream(iconPath: String): InputStream? {
-        val appIconPath: String? by options[keyAppIconPath]
        if (appIconPath == null) {
            return this.javaClass.classLoader.getResourceAsStream(iconPath)
        }
@@ -93,8 +74,24 @@ class CustomBrandingPatch : ResourcePatch() {
        return FileInputStream(file)
    }

-    private companion object {
-        private const val keyAppName = "appName"
-        private const val keyAppIconPath = "appIconPath"
+    companion object : OptionsContainer() {
+        private var appName: String? by option(
+            PatchOption.StringOption(
+                key = "appName",
+                default = "YouTube ReVanced",
+                title = "Application Name",
+                description = "The name of the application it will show on your home screen.",
+                required = true
+            )
+        )
+
+        private var appIconPath: String? by option(
+            PatchOption.StringOption(
+                key = "appIconPath",
+                default = null,
+                title = "Application Icon Path",
+                description = "A path to the icon of the application."
+            )
+        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.castbutton.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CastButtonCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt
@@ -12,15 +12,28 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
 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])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@Name("hide-cast-button")
@Description("Hides the cast button in the video player.")
@CastButtonCompatibility
@Version("0.0.1")
 class HideCastButtonPatch : BytecodePatch() {
    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_cast_button_enabled",
+                StringResource("revanced_cast_button_enabled_title", "Show cast button"),
+                false,
+                StringResource("revanced_cast_button_summary_on", "Cast button is shown"),
+                StringResource("revanced_cast_button_summary_off", "Cast button is hidden")
+            )
+        )
+
        data.classes.forEach { classDef ->
            classDef.methods.forEach { method ->
                if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
--- 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,66 +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 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])
-@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 {
-        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/Show More
+++ b/Show More