chore(release): 2.166.0-dev.1 [skip ci]

# [2.166.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.166.0-dev.1) (2023-03-14) ### Bug Fixes * **backdrops/pro-unlock:** constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([5a65668](5a65668892)) * **instagram/hide-timeline-ads:** fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([d6d7aca](d6d7acafb2)) * **twitch:** misspelling annotations ([2939856](2939856bbc)) * **youtube/general-ads:** remove duplicate preference ([d876096](d8760969f7)) * **youtube/return-youtube-dislike:** add missing strings ([bf8f74f](bf8f74f5bf)) * **youtube/spoof-signature-verification:** use correct fingerprint ([e36902a](e36902a530)) ### Features * **myexpenses/unlock-pro:** constrain to last working version ([452a922](452a92287f)) * **reddit:** add more compatibility constraints ([2140ac2](2140ac2a6b)) * **reddit:** bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([d9526a9](d9526a95de)) * **twitch:** constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([696685b](696685b7bb)) * **youtube/custom-video-buffer:** replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([4d9659e](4d9659e643)) * **youtube/disable-player-popup-panels:** use better patch description ([6485d4c](6485d4c74d)) * **youtube/general-ads:** do not hide components in library tab ([48cdd4c](48cdd4cee2)) * **youtube/general-ads:** hide image shelf from search results ([e2b907b](e2b907b217)) * **youtube/hide-autoplay-button:** do not disable autoplay button when hidden ([db81982](db81982fc9)) * **youtube:** `hide-floating-microphone-button` patch ([16dfab6](16dfab69be)) * **youtube:** bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([4d2131f](4d2131f148)) * **youtube:** bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([14229c7](14229c7636)) * **youtubevanced:** `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([3eae68f](3eae68f49b))
feat(youtube): bump compatibility to 18.05.40 (#1743 )
2026-01-13 06:27:41 +00:00 · 2023-03-14 13:03:43 +00:00 · 2023-03-14 13:58:58 +01:00 · 2023-03-14 13:58:57 +01:00 · 2023-03-14 13:58:57 +01:00 · 2023-03-14 13:58:57 +01:00
234 changed files with 2366 additions and 4584 deletions
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +0,0 @@
-firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -21,10 +21,5 @@ jobs:
        with:
          destination_branch: 'main'
          pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: |
-            This pull request will ${{ env.MESSAGE }}.
-          
-            ## Dependencies before merge
-
-            - [ ] https://github.com/revanced/revanced-integrations
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
          pr_draft: true
--- a/.releaserc
+++ b/.releaserc
@@ -7,13 +7,7 @@
    }
  ],
  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "revanced-patcher", "release": "patch" }
-        ]
-      }
-    ],
+    "@semantic-release/commit-analyzer",
    "@semantic-release/release-notes-generator",
    "@semantic-release/changelog",
    "gradle-semantic-release-plugin",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,542 +1,32 @@
-# [2.174.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.6...v2.174.0-dev.7) (2023-05-07)
-
-
-### Features
-
-* **syncforreddit:** add `disable-ads` patch ([#2066](https://github.com/revanced/revanced-patches/issues/2066)) ([c1de5d6](https://github.com/revanced/revanced-patches/commit/c1de5d6e433263b9a17305fa1c65807921594731))
-
-# [2.174.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.5...v2.174.0-dev.6) (2023-05-07)
-
-
-### Features
-
-* **youtube:** `hide-load-more-button` patch ([#2078](https://github.com/revanced/revanced-patches/issues/2078)) ([7170802](https://github.com/revanced/revanced-patches/commit/71708022a06453f6f56c19d686fc505286523391))
-
-# [2.174.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.4...v2.174.0-dev.5) (2023-05-07)
-
-
-### Bug Fixes
-
-* **spotify/disable-capture-restriction:** make compatible with latest versions ([#2095](https://github.com/revanced/revanced-patches/issues/2095)) ([e48f127](https://github.com/revanced/revanced-patches/commit/e48f1278da2a9d82e70be41fa2c4c480c574816b))
-
-# [2.174.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.3...v2.174.0-dev.4) (2023-05-07)
-
-
-### Bug Fixes
-
-* **youtube/theme:** move options out of dependency patch ([a953448](https://github.com/revanced/revanced-patches/commit/a95344879c2ac2cd6da8ce0273dcb05e8a35d2ec))
-
-
-### Features
-
-* improve structure of `README` ([279b193](https://github.com/revanced/revanced-patches/commit/279b193b687ad9cba44ab9c2a88d2ce06be0bbf0))
-
-# [2.174.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.2...v2.174.0-dev.3) (2023-05-06)
-
-# [2.174.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.174.0-dev.1...v2.174.0-dev.2) (2023-05-03)
-
-
-### Features
-
-* **patch:** bump compatibility ([#2060](https://github.com/revanced/revanced-patches/issues/2060)) ([f86836d](https://github.com/revanced/revanced-patches/commit/f86836d6295db9eb8c59916deaa991b4d99e96be))
-
-# [2.174.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.173.1-dev.1...v2.174.0-dev.1) (2023-05-03)
-
-
-### Features
-
-* **youtube/settings:** add reset button to edit preference dialog ([#2047](https://github.com/revanced/revanced-patches/issues/2047)) ([ede765a](https://github.com/revanced/revanced-patches/commit/ede765ae3c506909ee8a99517b99b6f5f113f01a))
-
-## [2.173.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.173.0...v2.173.1-dev.1) (2023-05-03)
-
-
-### Bug Fixes
-
-* **youtube/sponsorblock:** fix skip button in wrong location when full screen and comments visible ([#2051](https://github.com/revanced/revanced-patches/issues/2051)) ([30a954c](https://github.com/revanced/revanced-patches/commit/30a954cac83a66fbb25589edc487797ea5f19986))
-
-# [2.173.0](https://github.com/revanced/revanced-patches/compare/v2.172.0...v2.173.0) (2023-05-02)
-
-
-### Features
-
-* **youtube/create-button:** switch create with notifications button ([385ceda](https://github.com/revanced/revanced-patches/commit/385ceda61f586f24b11a284688f55758ef5b4e74))
-* **youtube/theme:** change seekbar color via preference ([9b465d9](https://github.com/revanced/revanced-patches/commit/9b465d95887863f6b42baa6b710ed98c97383a82))
-* **youtube/theme:** theme seekbar when clicked ([691a231](https://github.com/revanced/revanced-patches/commit/691a231d99b3b2fbe446fc7edb7a88c7a3127037))
-* **youtube:** `navigation-buttons` patch ([4bece31](https://github.com/revanced/revanced-patches/commit/4bece31f56eb340933ad26da3d1bfc902ea8569f))
-* **youtube:** bump compatibility to `18.16.37` ([fe3fdd5](https://github.com/revanced/revanced-patches/commit/fe3fdd5c6cb186bcebc2f86b1d5b597109b25cb6))
-* **youtube:** support version `18.16.37` ([8beb5ea](https://github.com/revanced/revanced-patches/commit/8beb5ea860284be915c0ef0c6039821a50c14fa8))
-
-# [2.173.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.173.0-dev.4...v2.173.0-dev.5) (2023-05-02)
-
-
-### Features
-
-* **youtube:** `navigation-buttons` patch ([4bece31](https://github.com/revanced/revanced-patches/commit/4bece31f56eb340933ad26da3d1bfc902ea8569f))
-
-# [2.173.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.173.0-dev.3...v2.173.0-dev.4) (2023-05-02)
-
-
-### Features
-
-* **youtube/create-button:** switch create with notifications button ([385ceda](https://github.com/revanced/revanced-patches/commit/385ceda61f586f24b11a284688f55758ef5b4e74))
-
-# [2.173.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.173.0-dev.2...v2.173.0-dev.3) (2023-05-02)
-
-
-### Features
-
-* **youtube/theme:** theme seekbar when clicked ([691a231](https://github.com/revanced/revanced-patches/commit/691a231d99b3b2fbe446fc7edb7a88c7a3127037))
-
-# [2.173.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.173.0-dev.1...v2.173.0-dev.2) (2023-05-02)
-
-
-### Features
-
-* **youtube/theme:** change seekbar color via preference ([9b465d9](https://github.com/revanced/revanced-patches/commit/9b465d95887863f6b42baa6b710ed98c97383a82))
-
-# [2.173.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.172.0...v2.173.0-dev.1) (2023-05-02)
-
-
-### Features
-
-* **youtube:** bump compatibility to `18.16.37` ([fe3fdd5](https://github.com/revanced/revanced-patches/commit/fe3fdd5c6cb186bcebc2f86b1d5b597109b25cb6))
-* **youtube:** support version `18.16.37` ([8beb5ea](https://github.com/revanced/revanced-patches/commit/8beb5ea860284be915c0ef0c6039821a50c14fa8))
-
-# [2.172.0](https://github.com/revanced/revanced-patches/compare/v2.171.0...v2.172.0) (2023-05-01)
-
-
-### Bug Fixes
-
-* **change-package-name:** use `null` as default value for option `packageName` ([#1998](https://github.com/revanced/revanced-patches/issues/1998)) ([8128e6b](https://github.com/revanced/revanced-patches/commit/8128e6ba57ec4e4e01a0923a0d353cc934b93899))
-* **youtube/minimized-playback:** fix background play of kids videos ([#2016](https://github.com/revanced/revanced-patches/issues/2016)) ([89b1484](https://github.com/revanced/revanced-patches/commit/89b1484d1d8c1419ba8020d0571b25071d43e926))
-* **youtube/return-youtube-dislike:** support older UI layouts ([#2031](https://github.com/revanced/revanced-patches/issues/2031)) ([c82ccb5](https://github.com/revanced/revanced-patches/commit/c82ccb59955d7663a5be20338b4b5c9b7601195c))
-* **youtube/spoof-app-version:** adjust available app targets ([#2030](https://github.com/revanced/revanced-patches/issues/2030)) ([a16cb0d](https://github.com/revanced/revanced-patches/commit/a16cb0d32f40694f237cb1820b965cee26663fdd))
-
-
-### Features
-
-* **youtube/general-ads:** hide multiple audio track button on video player overlay ([#2021](https://github.com/revanced/revanced-patches/issues/2021)) ([8d7f305](https://github.com/revanced/revanced-patches/commit/8d7f305aa2d8f86a9232a6a9577a87f58b53d51c))
-* **youtube/hide-get-premium:** hide get premium advertisements under video player ([#2020](https://github.com/revanced/revanced-patches/issues/2020)) ([05904a2](https://github.com/revanced/revanced-patches/commit/05904a2569cf9b82e3731692b93bc3a6bb005b03))
-* **youtube/hide-player-overlay:** exclude by default ([1c6fb94](https://github.com/revanced/revanced-patches/commit/1c6fb941f59599e2fe4a7d6f96babb6b0edac054))
-* **youtube/spoof-app-version:** user selectable version to spoof ([#2013](https://github.com/revanced/revanced-patches/issues/2013)) ([fd66417](https://github.com/revanced/revanced-patches/commit/fd6641747bd60bdd8b967db7cceaed454fb891a1))
-* **youtube/spoof-signature-verification:** list known spoofing side effects in revanced settings ([#2011](https://github.com/revanced/revanced-patches/issues/2011)) ([dc6e9b2](https://github.com/revanced/revanced-patches/commit/dc6e9b2268efe8a1bb72b80e5285d7002f448f4d))
-
-# [2.172.0-dev.9](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.8...v2.172.0-dev.9) (2023-05-01)
-
-
-### Features
-
-* **youtube/general-ads:** hide multiple audio track button on video player overlay ([#2021](https://github.com/revanced/revanced-patches/issues/2021)) ([8d7f305](https://github.com/revanced/revanced-patches/commit/8d7f305aa2d8f86a9232a6a9577a87f58b53d51c))
-
-# [2.172.0-dev.8](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.7...v2.172.0-dev.8) (2023-05-01)
-
-
-### Bug Fixes
-
-* **change-package-name:** use `null` as default value for option `packageName` ([#1998](https://github.com/revanced/revanced-patches/issues/1998)) ([8128e6b](https://github.com/revanced/revanced-patches/commit/8128e6ba57ec4e4e01a0923a0d353cc934b93899))
-
-# [2.172.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.6...v2.172.0-dev.7) (2023-04-30)
-
-
-### Bug Fixes
-
-* **youtube/return-youtube-dislike:** support older UI layouts ([#2031](https://github.com/revanced/revanced-patches/issues/2031)) ([c82ccb5](https://github.com/revanced/revanced-patches/commit/c82ccb59955d7663a5be20338b4b5c9b7601195c))
-
-# [2.172.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.5...v2.172.0-dev.6) (2023-04-30)
-
-
-### Features
-
-* **youtube/hide-get-premium:** hide get premium advertisements under video player ([#2020](https://github.com/revanced/revanced-patches/issues/2020)) ([05904a2](https://github.com/revanced/revanced-patches/commit/05904a2569cf9b82e3731692b93bc3a6bb005b03))
-
-# [2.172.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.4...v2.172.0-dev.5) (2023-04-30)
-
-
-### Bug Fixes
-
-* **youtube/spoof-app-version:** adjust available app targets ([#2030](https://github.com/revanced/revanced-patches/issues/2030)) ([a16cb0d](https://github.com/revanced/revanced-patches/commit/a16cb0d32f40694f237cb1820b965cee26663fdd))
-
-# [2.172.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.3...v2.172.0-dev.4) (2023-04-30)
-
-
-### Features
-
-* **youtube/hide-player-overlay:** exclude by default ([1c6fb94](https://github.com/revanced/revanced-patches/commit/1c6fb941f59599e2fe4a7d6f96babb6b0edac054))
-
-# [2.172.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.2...v2.172.0-dev.3) (2023-04-29)
-
-
-### Features
-
-* **youtube/spoof-signature-verification:** list known spoofing side effects in revanced settings ([#2011](https://github.com/revanced/revanced-patches/issues/2011)) ([dc6e9b2](https://github.com/revanced/revanced-patches/commit/dc6e9b2268efe8a1bb72b80e5285d7002f448f4d))
-
-# [2.172.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.172.0-dev.1...v2.172.0-dev.2) (2023-04-29)
-
-
-### Bug Fixes
-
-* **youtube/minimized-playback:** fix background play of kids videos ([#2016](https://github.com/revanced/revanced-patches/issues/2016)) ([89b1484](https://github.com/revanced/revanced-patches/commit/89b1484d1d8c1419ba8020d0571b25071d43e926))
-
-# [2.172.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.171.0...v2.172.0-dev.1) (2023-04-28)
-
-
-### Features
-
-* **youtube/spoof-app-version:** user selectable version to spoof ([#2013](https://github.com/revanced/revanced-patches/issues/2013)) ([fd66417](https://github.com/revanced/revanced-patches/commit/fd6641747bd60bdd8b967db7cceaed454fb891a1))
-
-# [2.171.0](https://github.com/revanced/revanced-patches/compare/v2.170.0...v2.171.0) (2023-04-27)
-
-
-### Bug Fixes
-
-* **enable-android-debugging:** make option `debuggable` false by default ([e717e26](https://github.com/revanced/revanced-patches/commit/e717e260fd0449a97929c3c82da577362586c5e1))
-* **youtube/minimized-playback:** disable minimized playback for shorts ([#1990](https://github.com/revanced/revanced-patches/issues/1990)) ([b91d18d](https://github.com/revanced/revanced-patches/commit/b91d18d24f332a9aa8721dc053e395d352b5796d))
-* **youtube/spoof-signature-verification:** additional fixes for subtitle window positions ([#1975](https://github.com/revanced/revanced-patches/issues/1975)) ([08584e6](https://github.com/revanced/revanced-patches/commit/08584e680fc658f37e8730499fa5197a08370776))
-
-
-### Features
-
-* **id-austria:** remove compatibility version constraint ([#1952](https://github.com/revanced/revanced-patches/issues/1952)) ([94ffd5a](https://github.com/revanced/revanced-patches/commit/94ffd5a26fe42f223a09ad6bd7f34f1fac0986ad))
-* **youtube/sponsorblock:** automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([c3c8ae6](https://github.com/revanced/revanced-patches/commit/c3c8ae6b4377b12838971cedc32779e12c07363c))
-* **youtube:** `hide-player-overlay` patch ([#1965](https://github.com/revanced/revanced-patches/issues/1965)) ([d233d96](https://github.com/revanced/revanced-patches/commit/d233d96faf838b22f4c458ad445af048362e7421))
-
-# [2.171.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.4...v2.171.0-dev.5) (2023-04-27)
-
-
-### Bug Fixes
-
-* **enable-android-debugging:** make option `debuggable` false by default ([e717e26](https://github.com/revanced/revanced-patches/commit/e717e260fd0449a97929c3c82da577362586c5e1))
-
-# [2.171.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.3...v2.171.0-dev.4) (2023-04-27)
-
-
-### Bug Fixes
-
-* **youtube/minimized-playback:** disable minimized playback for shorts ([#1990](https://github.com/revanced/revanced-patches/issues/1990)) ([b91d18d](https://github.com/revanced/revanced-patches/commit/b91d18d24f332a9aa8721dc053e395d352b5796d))
-
-# [2.171.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.2...v2.171.0-dev.3) (2023-04-26)
-
-
-### Features
-
-* **youtube/sponsorblock:** automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([c3c8ae6](https://github.com/revanced/revanced-patches/commit/c3c8ae6b4377b12838971cedc32779e12c07363c))
-
-# [2.171.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.1...v2.171.0-dev.2) (2023-04-25)
-
-
-### Features
-
-* **youtube:** `hide-player-overlay` patch ([#1965](https://github.com/revanced/revanced-patches/issues/1965)) ([d233d96](https://github.com/revanced/revanced-patches/commit/d233d96faf838b22f4c458ad445af048362e7421))
-
-# [2.171.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.1-dev.1...v2.171.0-dev.1) (2023-04-25)
-
-
-### Features
-
-* **id-austria:** remove compatibility version constraint ([#1952](https://github.com/revanced/revanced-patches/issues/1952)) ([94ffd5a](https://github.com/revanced/revanced-patches/commit/94ffd5a26fe42f223a09ad6bd7f34f1fac0986ad))
-
-## [2.170.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.0...v2.170.1-dev.1) (2023-04-25)
-
-
-### Bug Fixes
-
-* **youtube/spoof-signature-verification:** additional fixes for subtitle window positions ([#1975](https://github.com/revanced/revanced-patches/issues/1975)) ([08584e6](https://github.com/revanced/revanced-patches/commit/08584e680fc658f37e8730499fa5197a08370776))
-
-# [2.170.0](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.170.0) (2023-04-24)
-
-
-### Bug Fixes
-
-* **enable-android-debugging:** don't include by default ([b2856f7](https://github.com/revanced/revanced-patches/commit/b2856f7f71640f78dfc11b3dff90a58add48d605))
-* **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([6138c2a](https://github.com/revanced/revanced-patches/commit/6138c2ac24f586137bc4ef974a6600d24ebdda3e))
-* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ab5842](https://github.com/revanced/revanced-patches/commit/3ab5842ebbee3381604efcaa454ea5c49d3a5363))
-* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
-* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
-* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([642eef3](https://github.com/revanced/revanced-patches/commit/642eef39e8e8eeb1f95980f95b83e79faffe3a18))
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([bb5885e](https://github.com/revanced/revanced-patches/commit/bb5885eca4b750f15776de9099fb4dd83f6d70f5))
-* **youtube:** bump compatibility to `18.15.40` ([ad82fcd](https://github.com/revanced/revanced-patches/commit/ad82fcdb63c7cc77e7387b7f0da95b005c90ce31))
-* **youtube:** constrain patches to `18.15.40` ([c0c10de](https://github.com/revanced/revanced-patches/commit/c0c10dec3446d35e20b17c25510cddcbe07b494f))
-* **youtube:** remove non working patch `hide-my-mix` ([6ae0f0b](https://github.com/revanced/revanced-patches/commit/6ae0f0b466322c4d60feb20ed0e809783452b9d4))
-* **youtube:** support version `18.15.40` ([c3614ab](https://github.com/revanced/revanced-patches/commit/c3614ab1d10a70fdb0813d7249866d696b28088f))
-
-# [2.170.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.4...v2.170.0-dev.1) (2023-04-24)
-
-
-### Bug Fixes
-
-* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([c78ab33](https://github.com/revanced/revanced-patches/commit/c78ab33a8d41694aaee60d0a3d99c51c95085489))
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([ac9ad79](https://github.com/revanced/revanced-patches/commit/ac9ad79f2ff4fbe4fa73b80bae88d12a03a287d7))
-* **youtube:** bump compatibility to `18.15.40` ([72008da](https://github.com/revanced/revanced-patches/commit/72008da28637bb6b4bf6f0e0ae1b6bce584dd696))
-* **youtube:** bump compatibility to `18.15.40` ([#1964](https://github.com/revanced/revanced-patches/issues/1964)) ([c4c6653](https://github.com/revanced/revanced-patches/commit/c4c6653c37b9675ff0f7b0f29470342c99caba34))
-* **youtube:** constrain patches to `18.15.40` ([dfbf8ab](https://github.com/revanced/revanced-patches/commit/dfbf8ab206e779fe2624d5f62c5dab170d68fce5))
-* **youtube:** remove non working patch `hide-my-mix` ([f8ea2cf](https://github.com/revanced/revanced-patches/commit/f8ea2cf3bcec3ec4bfb424ed8e4a640b505387d7))
-* **youtube:** support version `18.15.40` ([b2916a3](https://github.com/revanced/revanced-patches/commit/b2916a379a631481c0750e312d04a4c9e82590d6))
-
-## [2.169.1-dev.4](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.3...v2.169.1-dev.4) (2023-04-23)
-
-
-### Bug Fixes
-
-* **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([100d9dd](https://github.com/revanced/revanced-patches/commit/100d9dd7e0b9d83a96fb25c2ffda06fc018830e4))
-
-## [2.169.1-dev.3](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.2...v2.169.1-dev.3) (2023-04-23)
-
-
-### Bug Fixes
-
-* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ff1489](https://github.com/revanced/revanced-patches/commit/3ff1489b32968e9bad3361f924b7079e7b6f29e2))
-
-## [2.169.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.1...v2.169.1-dev.2) (2023-04-21)
-
-
-### Bug Fixes
-
-* **"enable-android-debugging:** don't include by default ([14b2128](https://github.com/revanced/revanced-patches/commit/14b212844f308b95ad6ed02c455716cd84c0db01))
-
-## [2.169.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.169.1-dev.1) (2023-04-21)
-
-
-### Bug Fixes
-
-* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
-* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
-
-# [2.169.0](https://github.com/revanced/revanced-patches/compare/v2.168.0...v2.169.0) (2023-04-21)
-
-
-### Bug Fixes
-
-* add missing annotation to patches ([#1882](https://github.com/revanced/revanced-patches/issues/1882)) ([d86b6a4](https://github.com/revanced/revanced-patches/commit/d86b6a4a659172c3f1db8eb883f28dfee4e83e4c))
-* **youtube/hide-video-action-buttons:** change 'Hide create, clip and thanks buttons' to default off ([#1923](https://github.com/revanced/revanced-patches/issues/1923)) ([fc89c86](https://github.com/revanced/revanced-patches/commit/fc89c865f94fffd748809eaf0504cc91f6389500))
-* **youtube/hide-video-action-buttons:** fix 'hide share button' ([#1924](https://github.com/revanced/revanced-patches/issues/1924)) ([bc05e44](https://github.com/revanced/revanced-patches/commit/bc05e4494d914f944a831bfb83a150ad93bb342f))
-* **youtube/microg-support:** remove incorrect patch dependency ([3e0c45c](https://github.com/revanced/revanced-patches/commit/3e0c45c2dff9f6336e42fdd3d1b5b5de5af1b1cb))
-* **youtube/microg-support:** rename patch correctly ([091a25d](https://github.com/revanced/revanced-patches/commit/091a25d46145b1c27791245fca0933e9c8a68e9a))
-* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#1873](https://github.com/revanced/revanced-patches/issues/1873)) ([85675b8](https://github.com/revanced/revanced-patches/commit/85675b800070de9752b2a4bfea3182381d4cfba4))
-* **youtube/sponsorblock:** do not depend on `remember-playback-speed` patch ([b0834fa](https://github.com/revanced/revanced-patches/commit/b0834faa69755a94f70ae5075a10cf15e8a6b857))
-* **youtube/sponsorblock:** fix autorepeat button layout ([#1868](https://github.com/revanced/revanced-patches/issues/1868)) ([5e148d9](https://github.com/revanced/revanced-patches/commit/5e148d9384e8f9f1bc8f5daa7e68a05574810329))
-* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([0d47375](https://github.com/revanced/revanced-patches/commit/0d47375092639e3e5dad8d67991004fc2f103606))
-* **youtubevanced/hide-ads:** hide more types of ads ([#1781](https://github.com/revanced/revanced-patches/issues/1781)) ([47ff447](https://github.com/revanced/revanced-patches/commit/47ff447f8ec0e5bbc174f34bd7d61b3031276641))
-* **youtubevanced/hide-ads:** remove broken ad filter ([#1881](https://github.com/revanced/revanced-patches/issues/1881)) ([5b987e1](https://github.com/revanced/revanced-patches/commit/5b987e14e81a47691883a5b5196c7ffee03941d0))
-
-
-### Features
-
-* `change-package-name` patch ([#1864](https://github.com/revanced/revanced-patches/issues/1864)) ([f9a6672](https://github.com/revanced/revanced-patches/commit/f9a6672122eb28fe06c9f5e137906ad868a491d6))
-* `enable-android-debugging` patch ([#1876](https://github.com/revanced/revanced-patches/issues/1876)) ([bd224d9](https://github.com/revanced/revanced-patches/commit/bd224d90deb838ee3e7bd0c16860023ebf113e96))
-* **facebook:** `hide-inbox-ads` patch ([#1893](https://github.com/revanced/revanced-patches/issues/1893)) ([2cfc982](https://github.com/revanced/revanced-patches/commit/2cfc9829e119884ca566d6ad90fd0542317891d7))
-* **id-austria:** bump compatibility to `2.6.0` ([#1827](https://github.com/revanced/revanced-patches/issues/1827)) ([f48e794](https://github.com/revanced/revanced-patches/commit/f48e794eebf9ea44008c4c8a3967ad039d19180a))
-* **inshorts:** `hide-ads` patch ([#1828](https://github.com/revanced/revanced-patches/issues/1828)) ([04a2acc](https://github.com/revanced/revanced-patches/commit/04a2accfe9f9254af9074ad0a309d485cedb01cb))
-* **memegenerator:** `unlock-pro` patch ([#1902](https://github.com/revanced/revanced-patches/issues/1902)) ([7d30541](https://github.com/revanced/revanced-patches/commit/7d3054178187bed294d156d3858613fa63a626ef))
-* **photomath/unlock-plus:** bump compatibility to `8.21.1` ([#1926](https://github.com/revanced/revanced-patches/issues/1926)) ([beb8d9c](https://github.com/revanced/revanced-patches/commit/beb8d9cbf254b4a2b2207a307934be65507dcf80))
-* **photomath:** bump compatibility up to `8.21.0` ([#1886](https://github.com/revanced/revanced-patches/issues/1886)) ([43464fd](https://github.com/revanced/revanced-patches/commit/43464fd6ffe6f097c574156146aeb23f8f026840))
-* **reddit:** bump compatibility to `2023.12.0` ([#1825](https://github.com/revanced/revanced-patches/issues/1825)) ([e3666e6](https://github.com/revanced/revanced-patches/commit/e3666e68ed4816c85fbb110cb098f53fddf135f1))
-* use better patch description ([32fcd25](https://github.com/revanced/revanced-patches/commit/32fcd258c6b00315265c09380550a2e98b5ec9e7))
-* **youtube-music:** `bypass-certificate-checks` patch ([#1810](https://github.com/revanced/revanced-patches/issues/1810)) ([ef8f26f](https://github.com/revanced/revanced-patches/commit/ef8f26fb976c3044039f9bff0496088763ab66cd))
-* **youtube/settings:** disable preferences and add dialog messages to preferences ([#1801](https://github.com/revanced/revanced-patches/issues/1801)) ([05023ba](https://github.com/revanced/revanced-patches/commit/05023bab1d94e04553ac274468bdba7a19ad9180))
-* **youtube/sponsorblock:** skip to video highlight ([#1874](https://github.com/revanced/revanced-patches/issues/1874)) ([83747b7](https://github.com/revanced/revanced-patches/commit/83747b7aea33d8fe4b4b9514fdf7c9081c357410))
-* **youtube:** bump compatibility to `18.08.37` ([29561ec](https://github.com/revanced/revanced-patches/commit/29561eca10e18e11f2d4a7f9bab2f12303490b6f))
-* **youtube:** change default video speed and quality inside the settings menu ([#1880](https://github.com/revanced/revanced-patches/issues/1880)) ([fbb1763](https://github.com/revanced/revanced-patches/commit/fbb17636d8ab9f2a43ead896451804b04464527c))
-* **youtube:** constrain compatibility to `18.08.37` ([7403fc8](https://github.com/revanced/revanced-patches/commit/7403fc86ae7b7d756a2939fa0a507f237aaf6edf))
-* **youtube:** sponsorblock improvements ([#1557](https://github.com/revanced/revanced-patches/issues/1557)) ([b5d712a](https://github.com/revanced/revanced-patches/commit/b5d712a3326d1e8cdb8d8642aa7bd1bee6e30ac1))
-* **youtube:** support version `18.08.37` ([4f4ceab](https://github.com/revanced/revanced-patches/commit/4f4ceab2cc32a38dd3967fd4e81f690330c08f5c))
-
-# [2.169.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.168.0...v2.169.0-dev.1) (2023-04-21)
-
-
-### Bug Fixes
-
-* add missing annotation to patches ([#1882](https://github.com/revanced/revanced-patches/issues/1882)) ([d86b6a4](https://github.com/revanced/revanced-patches/commit/d86b6a4a659172c3f1db8eb883f28dfee4e83e4c))
-* **youtube/hide-video-action-buttons:** change 'Hide create, clip and thanks buttons' to default off ([#1923](https://github.com/revanced/revanced-patches/issues/1923)) ([fc89c86](https://github.com/revanced/revanced-patches/commit/fc89c865f94fffd748809eaf0504cc91f6389500))
-* **youtube/hide-video-action-buttons:** fix 'hide share button' ([#1924](https://github.com/revanced/revanced-patches/issues/1924)) ([bc05e44](https://github.com/revanced/revanced-patches/commit/bc05e4494d914f944a831bfb83a150ad93bb342f))
-* **youtube/microg-support:** remove incorrect patch dependency ([3e0c45c](https://github.com/revanced/revanced-patches/commit/3e0c45c2dff9f6336e42fdd3d1b5b5de5af1b1cb))
-* **youtube/microg-support:** rename patch correctly ([091a25d](https://github.com/revanced/revanced-patches/commit/091a25d46145b1c27791245fca0933e9c8a68e9a))
-* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#1873](https://github.com/revanced/revanced-patches/issues/1873)) ([85675b8](https://github.com/revanced/revanced-patches/commit/85675b800070de9752b2a4bfea3182381d4cfba4))
-* **youtube/sponsorblock:** do not depend on `remember-playback-speed` patch ([b0834fa](https://github.com/revanced/revanced-patches/commit/b0834faa69755a94f70ae5075a10cf15e8a6b857))
-* **youtube/sponsorblock:** fix autorepeat button layout ([#1868](https://github.com/revanced/revanced-patches/issues/1868)) ([5e148d9](https://github.com/revanced/revanced-patches/commit/5e148d9384e8f9f1bc8f5daa7e68a05574810329))
-* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([0d47375](https://github.com/revanced/revanced-patches/commit/0d47375092639e3e5dad8d67991004fc2f103606))
-* **youtubevanced/hide-ads:** hide more types of ads ([#1781](https://github.com/revanced/revanced-patches/issues/1781)) ([47ff447](https://github.com/revanced/revanced-patches/commit/47ff447f8ec0e5bbc174f34bd7d61b3031276641))
-* **youtubevanced/hide-ads:** remove broken ad filter ([#1881](https://github.com/revanced/revanced-patches/issues/1881)) ([5b987e1](https://github.com/revanced/revanced-patches/commit/5b987e14e81a47691883a5b5196c7ffee03941d0))
-
-
-### Features
-
-* `change-package-name` patch ([#1864](https://github.com/revanced/revanced-patches/issues/1864)) ([f9a6672](https://github.com/revanced/revanced-patches/commit/f9a6672122eb28fe06c9f5e137906ad868a491d6))
-* `enable-android-debugging` patch ([#1876](https://github.com/revanced/revanced-patches/issues/1876)) ([bd224d9](https://github.com/revanced/revanced-patches/commit/bd224d90deb838ee3e7bd0c16860023ebf113e96))
-* **facebook:** `hide-inbox-ads` patch ([#1893](https://github.com/revanced/revanced-patches/issues/1893)) ([2cfc982](https://github.com/revanced/revanced-patches/commit/2cfc9829e119884ca566d6ad90fd0542317891d7))
-* **id-austria:** bump compatibility to `2.6.0` ([#1827](https://github.com/revanced/revanced-patches/issues/1827)) ([f48e794](https://github.com/revanced/revanced-patches/commit/f48e794eebf9ea44008c4c8a3967ad039d19180a))
-* **inshorts:** `hide-ads` patch ([#1828](https://github.com/revanced/revanced-patches/issues/1828)) ([04a2acc](https://github.com/revanced/revanced-patches/commit/04a2accfe9f9254af9074ad0a309d485cedb01cb))
-* **memegenerator:** `unlock-pro` patch ([#1902](https://github.com/revanced/revanced-patches/issues/1902)) ([7d30541](https://github.com/revanced/revanced-patches/commit/7d3054178187bed294d156d3858613fa63a626ef))
-* **photomath/unlock-plus:** bump compatibility to `8.21.1` ([#1926](https://github.com/revanced/revanced-patches/issues/1926)) ([beb8d9c](https://github.com/revanced/revanced-patches/commit/beb8d9cbf254b4a2b2207a307934be65507dcf80))
-* **photomath:** bump compatibility up to `8.21.0` ([#1886](https://github.com/revanced/revanced-patches/issues/1886)) ([43464fd](https://github.com/revanced/revanced-patches/commit/43464fd6ffe6f097c574156146aeb23f8f026840))
-* **reddit:** bump compatibility to `2023.12.0` ([#1825](https://github.com/revanced/revanced-patches/issues/1825)) ([e3666e6](https://github.com/revanced/revanced-patches/commit/e3666e68ed4816c85fbb110cb098f53fddf135f1))
-* use better patch description ([32fcd25](https://github.com/revanced/revanced-patches/commit/32fcd258c6b00315265c09380550a2e98b5ec9e7))
-* **youtube-music:** `bypass-certificate-checks` patch ([#1810](https://github.com/revanced/revanced-patches/issues/1810)) ([ef8f26f](https://github.com/revanced/revanced-patches/commit/ef8f26fb976c3044039f9bff0496088763ab66cd))
-* **youtube/settings:** disable preferences and add dialog messages to preferences ([#1801](https://github.com/revanced/revanced-patches/issues/1801)) ([05023ba](https://github.com/revanced/revanced-patches/commit/05023bab1d94e04553ac274468bdba7a19ad9180))
-* **youtube/sponsorblock:** skip to video highlight ([#1874](https://github.com/revanced/revanced-patches/issues/1874)) ([83747b7](https://github.com/revanced/revanced-patches/commit/83747b7aea33d8fe4b4b9514fdf7c9081c357410))
-* **youtube:** bump compatibility to `18.08.37` ([29561ec](https://github.com/revanced/revanced-patches/commit/29561eca10e18e11f2d4a7f9bab2f12303490b6f))
-* **youtube:** change default video speed and quality inside the settings menu ([#1880](https://github.com/revanced/revanced-patches/issues/1880)) ([fbb1763](https://github.com/revanced/revanced-patches/commit/fbb17636d8ab9f2a43ead896451804b04464527c))
-* **youtube:** constrain compatibility to `18.08.37` ([7403fc8](https://github.com/revanced/revanced-patches/commit/7403fc86ae7b7d756a2939fa0a507f237aaf6edf))
-* **youtube:** sponsorblock improvements ([#1557](https://github.com/revanced/revanced-patches/issues/1557)) ([b5d712a](https://github.com/revanced/revanced-patches/commit/b5d712a3326d1e8cdb8d8642aa7bd1bee6e30ac1))
-* **youtube:** support version `18.08.37` ([4f4ceab](https://github.com/revanced/revanced-patches/commit/4f4ceab2cc32a38dd3967fd4e81f690330c08f5c))
-
-# [2.168.0](https://github.com/revanced/revanced-patches/compare/v2.167.1...v2.168.0) (2023-04-13)
-
-
-### Features
-
-* **youtube/spoof-signature-verification:** enable by default ([#1896](https://github.com/revanced/revanced-patches/issues/1896)) ([774e45e](https://github.com/revanced/revanced-patches/commit/774e45ed50bb15adb2b55d103ff7bfae38570056))
-
-## [2.167.1](https://github.com/revanced/revanced-patches/compare/v2.167.0...v2.167.1) (2023-04-13)
-
-
-### Bug Fixes
-
-* **youtube/spoof-signature-verification:** fixed subtitles in wrong location ([#1833](https://github.com/revanced/revanced-patches/issues/1833)) ([0dbfa62](https://github.com/revanced/revanced-patches/commit/0dbfa6247e6e7ff51e8fee86fd798f693ab05bcf))
-* **youtube/spoof-signature-verification:** spoof videos in playlists ([0a858ec](https://github.com/revanced/revanced-patches/commit/0a858ecef3f152dfd97e7f2d27501201968de4e4))
-
-# [2.167.0](https://github.com/revanced/revanced-patches/compare/v2.166.0...v2.167.0) (2023-03-29)
-
-
-### Bug Fixes
-
-* **youtube/remember-playback-speed:**  allow to not remember playback speed ([#1762](https://github.com/revanced/revanced-patches/issues/1762)) ([49ec3e8](https://github.com/revanced/revanced-patches/commit/49ec3e83f18ec4eb180d220c5a7015f8e4feb3a7))
-* **youtube/sponsorblock:** fix segments not skipping during background play ([#1765](https://github.com/revanced/revanced-patches/issues/1765)) ([7620ea1](https://github.com/revanced/revanced-patches/commit/7620ea1752406d703deb15aa0267d4572b1b171a))
-* **youtube/spoof-signature-verification:** fix audio during home feed video playback ([#1754](https://github.com/revanced/revanced-patches/issues/1754)) ([7dd067b](https://github.com/revanced/revanced-patches/commit/7dd067b0e96679fe653c9796bef31d743287b2d0))
-
-
-### Features
-
-* `export-all-activities` patch ([#1751](https://github.com/revanced/revanced-patches/issues/1751)) ([aad6e05](https://github.com/revanced/revanced-patches/commit/aad6e055380f91462d94fc96c4ec17a27e283c64))
-* **reddit:** bump compatibility to `2023.10.0` ([#1772](https://github.com/revanced/revanced-patches/issues/1772)) ([f95ab6e](https://github.com/revanced/revanced-patches/commit/f95ab6e13e70667fdffe479b7292112244e6bb9e))
-* **twitter:** remove `monochrome-icon` patch ([#1786](https://github.com/revanced/revanced-patches/issues/1786)) ([b8bf804](https://github.com/revanced/revanced-patches/commit/b8bf804835e75c9f2c8453c8ce22cfd8d17318ce))
-* **youtube/microg-support:** do not depend on `spoof-signature-verification` patch ([af4e765](https://github.com/revanced/revanced-patches/commit/af4e765ca87c6c979e95bc274b32c764a0a32a88))
-* **youtube/spoof-signature-verification:** automatic signature spoofing ([f1395f4](https://github.com/revanced/revanced-patches/commit/f1395f49fae1c0a00de074d58fa7d81f562d3009))
-
-# [2.167.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.5...v2.167.0-dev.6) (2023-03-22)
-
-
-### Features
-
-* **twitter:** remove `monochrome-icon` patch ([#1786](https://github.com/revanced/revanced-patches/issues/1786)) ([b8bf804](https://github.com/revanced/revanced-patches/commit/b8bf804835e75c9f2c8453c8ce22cfd8d17318ce))
-
-# [2.167.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.4...v2.167.0-dev.5) (2023-03-20)
-
-
-### Features
-
-* **reddit:** bump compatibility to `2023.10.0` ([#1772](https://github.com/revanced/revanced-patches/issues/1772)) ([f95ab6e](https://github.com/revanced/revanced-patches/commit/f95ab6e13e70667fdffe479b7292112244e6bb9e))
-
-# [2.167.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.3...v2.167.0-dev.4) (2023-03-19)
-
-
-### Bug Fixes
-
-* **youtube/sponsorblock:** fix segments not skipping during background play ([#1765](https://github.com/revanced/revanced-patches/issues/1765)) ([7620ea1](https://github.com/revanced/revanced-patches/commit/7620ea1752406d703deb15aa0267d4572b1b171a))
-
-
-### Features
-
-* `export-all-activities` patch ([#1751](https://github.com/revanced/revanced-patches/issues/1751)) ([aad6e05](https://github.com/revanced/revanced-patches/commit/aad6e055380f91462d94fc96c4ec17a27e283c64))
-
-# [2.167.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.2...v2.167.0-dev.3) (2023-03-19)
-
-
-### Bug Fixes
-
-* **youtube/remember-playback-speed:**  allow to not remember playback speed ([#1762](https://github.com/revanced/revanced-patches/issues/1762)) ([49ec3e8](https://github.com/revanced/revanced-patches/commit/49ec3e83f18ec4eb180d220c5a7015f8e4feb3a7))
-
-# [2.167.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.1...v2.167.0-dev.2) (2023-03-19)
-
-
-### Features
-
-* **youtube/microg-support:** do not depend on `spoof-signature-verification` patch ([af4e765](https://github.com/revanced/revanced-patches/commit/af4e765ca87c6c979e95bc274b32c764a0a32a88))
-
-# [2.167.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.166.1-dev.1...v2.167.0-dev.1) (2023-03-17)
-
-
-### Features
-
-* **youtube/spoof-signature-verification:** automatic signature spoofing ([f1395f4](https://github.com/revanced/revanced-patches/commit/f1395f49fae1c0a00de074d58fa7d81f562d3009))
-
-## [2.166.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.166.0...v2.166.1-dev.1) (2023-03-15)
-
-
-### Bug Fixes
-
-* **youtube/spoof-signature-verification:** fix audio during home feed video playback ([#1754](https://github.com/revanced/revanced-patches/issues/1754)) ([7dd067b](https://github.com/revanced/revanced-patches/commit/7dd067b0e96679fe653c9796bef31d743287b2d0))
-
-# [2.166.0](https://github.com/revanced/revanced-patches/compare/v2.165.1...v2.166.0) (2023-03-14)
-
-
-### Bug Fixes
-
-* **backdrops/pro-unlock:** constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([7680838](https://github.com/revanced/revanced-patches/commit/768083882952f49b8c867043518ba888603b3049))
-* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([b803e3e](https://github.com/revanced/revanced-patches/commit/b803e3e1a743e32809195e8a358568572a59dac2))
-* **twitch:** misspelling annotations ([675c970](https://github.com/revanced/revanced-patches/commit/675c970041abc30440533f763c5be709abd3f725))
-* **youtube/general-ads:** remove duplicate preference ([89820c6](https://github.com/revanced/revanced-patches/commit/89820c60bb393a6a94bbc868a6fae0501c91d811))
-* **youtube/return-youtube-dislike:** add missing strings ([19047b6](https://github.com/revanced/revanced-patches/commit/19047b6963ff578a70d3d327306e1050f7ce1c70))
-
-
-### Features
-
-* **myexpenses/unlock-pro:** constrain to last working version ([f68c87b](https://github.com/revanced/revanced-patches/commit/f68c87b0edc88e80ef2f3110f75be86236dffdb7))
-* **reddit:** add more compatibility constraints ([65e5c26](https://github.com/revanced/revanced-patches/commit/65e5c2639084f07e1f19b9933febcebc43ad12c4))
-* **reddit:** bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([c8997e8](https://github.com/revanced/revanced-patches/commit/c8997e8ca587aedfa4318ace9fc119c262f00933))
-* **twitch:** constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([7d4294f](https://github.com/revanced/revanced-patches/commit/7d4294f691e1e2e8a2679e2504a9fd5dc7e05201))
-* **youtube/custom-video-buffer:** replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([29f952d](https://github.com/revanced/revanced-patches/commit/29f952d73e07f8f666d4744d6d97374bebfdc3c6))
-* **youtube/disable-player-popup-panels:** use better patch description ([7150662](https://github.com/revanced/revanced-patches/commit/71506625aca42aa4901878c0f706793e17ca5607))
-* **youtube/general-ads:** do not hide components in library tab ([d56d3bd](https://github.com/revanced/revanced-patches/commit/d56d3bd94b8f06ff9f915fe0b0ba3d5f484ea971))
-* **youtube/general-ads:** hide image shelf from search results ([e4c2450](https://github.com/revanced/revanced-patches/commit/e4c2450ebac4cacae64a81060de8c146ba542e37))
-* **youtube/hide-autoplay-button:** do not disable autoplay button when hidden ([98d0084](https://github.com/revanced/revanced-patches/commit/98d00848c9a0aa0247d77e9ae16450697a6c154c))
-* **youtube:** `hide-floating-microphone-button` patch ([8f33b11](https://github.com/revanced/revanced-patches/commit/8f33b110facb8f8a04416459f3d715bc77002231))
-* **youtube:** bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([77fe23b](https://github.com/revanced/revanced-patches/commit/77fe23b53e27b7b6a1c48ba0cfeb182ae99f9ab8))
-* **youtube:** bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([1090388](https://github.com/revanced/revanced-patches/commit/109038839574f7ba07f91ef27b61d6a650f2ef34))
-* **youtubevanced:** `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([b6ca3b4](https://github.com/revanced/revanced-patches/commit/b6ca3b4491cc0a5c42b6a52ec48ad0ff8a54f0b2))
-
-# [2.166.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.165.1...v2.166.0-dev.1) (2023-03-14)
-
-
-### Bug Fixes
-
-* **backdrops/pro-unlock:** constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([7680838](https://github.com/revanced/revanced-patches/commit/768083882952f49b8c867043518ba888603b3049))
-* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([b803e3e](https://github.com/revanced/revanced-patches/commit/b803e3e1a743e32809195e8a358568572a59dac2))
-* **twitch:** misspelling annotations ([675c970](https://github.com/revanced/revanced-patches/commit/675c970041abc30440533f763c5be709abd3f725))
-* **youtube/general-ads:** remove duplicate preference ([89820c6](https://github.com/revanced/revanced-patches/commit/89820c60bb393a6a94bbc868a6fae0501c91d811))
-* **youtube/return-youtube-dislike:** add missing strings ([19047b6](https://github.com/revanced/revanced-patches/commit/19047b6963ff578a70d3d327306e1050f7ce1c70))
-
-
-### Features
-
-* **myexpenses/unlock-pro:** constrain to last working version ([f68c87b](https://github.com/revanced/revanced-patches/commit/f68c87b0edc88e80ef2f3110f75be86236dffdb7))
-* **reddit:** add more compatibility constraints ([65e5c26](https://github.com/revanced/revanced-patches/commit/65e5c2639084f07e1f19b9933febcebc43ad12c4))
-* **reddit:** bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([c8997e8](https://github.com/revanced/revanced-patches/commit/c8997e8ca587aedfa4318ace9fc119c262f00933))
-* **twitch:** constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([7d4294f](https://github.com/revanced/revanced-patches/commit/7d4294f691e1e2e8a2679e2504a9fd5dc7e05201))
-* **youtube/custom-video-buffer:** replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([29f952d](https://github.com/revanced/revanced-patches/commit/29f952d73e07f8f666d4744d6d97374bebfdc3c6))
-* **youtube/disable-player-popup-panels:** use better patch description ([7150662](https://github.com/revanced/revanced-patches/commit/71506625aca42aa4901878c0f706793e17ca5607))
-* **youtube/general-ads:** do not hide components in library tab ([d56d3bd](https://github.com/revanced/revanced-patches/commit/d56d3bd94b8f06ff9f915fe0b0ba3d5f484ea971))
-* **youtube/general-ads:** hide image shelf from search results ([e4c2450](https://github.com/revanced/revanced-patches/commit/e4c2450ebac4cacae64a81060de8c146ba542e37))
-* **youtube/hide-autoplay-button:** do not disable autoplay button when hidden ([98d0084](https://github.com/revanced/revanced-patches/commit/98d00848c9a0aa0247d77e9ae16450697a6c154c))
-* **youtube:** `hide-floating-microphone-button` patch ([8f33b11](https://github.com/revanced/revanced-patches/commit/8f33b110facb8f8a04416459f3d715bc77002231))
-* **youtube:** bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([77fe23b](https://github.com/revanced/revanced-patches/commit/77fe23b53e27b7b6a1c48ba0cfeb182ae99f9ab8))
-* **youtube:** bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([1090388](https://github.com/revanced/revanced-patches/commit/109038839574f7ba07f91ef27b61d6a650f2ef34))
-* **youtubevanced:** `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([b6ca3b4](https://github.com/revanced/revanced-patches/commit/b6ca3b4491cc0a5c42b6a52ec48ad0ff8a54f0b2))
-
-## [2.165.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.165.1) (2023-03-14)
+# [2.166.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.166.0-dev.1) (2023-03-14)


 ### Bug Fixes

+* **backdrops/pro-unlock:** constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([e209ba5](https://github.com/revanced/revanced-patches/commit/e209ba519e630e4589b9bd19720d30a005eea118))
+* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([f502e83](https://github.com/revanced/revanced-patches/commit/f502e83b2e8b8459369923c74785152b817aedca))
+* **twitch:** misspelling annotations ([5b634f6](https://github.com/revanced/revanced-patches/commit/5b634f61224532499bd9091dab1714942ec989ef))
+* **youtube/general-ads:** remove duplicate preference ([9934e89](https://github.com/revanced/revanced-patches/commit/9934e8963669b39deb6c3d571dd3a1be93ec2ccb))
+* **youtube/return-youtube-dislike:** add missing strings ([6cde7db](https://github.com/revanced/revanced-patches/commit/6cde7db2e431a56dc25823f664b6cf6665595ad9))
 * **youtube/spoof-signature-verification:** use correct fingerprint ([13090ee](https://github.com/revanced/revanced-patches/commit/13090eeb47660980cec8dc5bbb80447de5047a1d))

+
+### Features
+
+* **myexpenses/unlock-pro:** constrain to last working version ([f307c66](https://github.com/revanced/revanced-patches/commit/f307c66447edd1b226db3c1189494a45c956c32c))
+* **reddit:** add more compatibility constraints ([0cd4e86](https://github.com/revanced/revanced-patches/commit/0cd4e86d79e5ec65aa190a7ee186e2eb54d5894b))
+* **reddit:** bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([f5e38a8](https://github.com/revanced/revanced-patches/commit/f5e38a8ef23a9de09cadeb4137a8950d24f71698))
+* **twitch:** constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([d5fe867](https://github.com/revanced/revanced-patches/commit/d5fe867385fd35c7639204e9fdbc6855b775e7c0))
+* **youtube/custom-video-buffer:** replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([7c24561](https://github.com/revanced/revanced-patches/commit/7c2456115e279db2154bcbcd66a723e41e243717))
+* **youtube/disable-player-popup-panels:** use better patch description ([58a6090](https://github.com/revanced/revanced-patches/commit/58a609074e009864d61d2b72a68dc1a8532ac203))
+* **youtube/general-ads:** do not hide components in library tab ([6d61d76](https://github.com/revanced/revanced-patches/commit/6d61d765251af92829d0522e2c33b02647c3fed4))
+* **youtube/general-ads:** hide image shelf from search results ([f71aa3f](https://github.com/revanced/revanced-patches/commit/f71aa3f77ba1b2722fc146fe643245ee5f9397ae))
+* **youtube/hide-autoplay-button:** do not disable autoplay button when hidden ([874b68a](https://github.com/revanced/revanced-patches/commit/874b68add6fe79375d232b6363af88b9a7f51ede))
+* **youtube:** `hide-floating-microphone-button` patch ([9fb176c](https://github.com/revanced/revanced-patches/commit/9fb176cdc680504dc378090161ac4849915d5a2a))
+* **youtube:** bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([cadb04c](https://github.com/revanced/revanced-patches/commit/cadb04c0d840cf48887002d41850086019ad5c14))
+* **youtube:** bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([dc16e11](https://github.com/revanced/revanced-patches/commit/dc16e11b13676870ffaba6ebb0bf9e250741a783))
+* **youtubevanced:** `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([b8e610b](https://github.com/revanced/revanced-patches/commit/b8e610bba91ea88aed8b09e56cbf8f85f8222609))
+
 # [2.165.0](https://github.com/revanced/revanced-patches/compare/v2.164.0...v2.165.0) (2023-03-14)


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

-The official ReVanced Patches.
-
-## 📋 List of patches in this repository
-
-{{ table }}
+The official Patch bundle provided by ReVanced and the community.

 > 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.
@@ -66,6 +64,7 @@ Example:
    "description": "Enables a custom theme.",
    "version": "0.0.1",
    "excluded": false,
+    "deprecated": false,
    "options": [
      {
        "key": "theme",
@@ -92,6 +91,7 @@ Example:
    "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",
--- a/README.md
+++ b/README.md
@@ -1,67 +1,68 @@
-## 🧩 ReVanced Patches
+## 🧩 Patches

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

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

 ### [📦 `com.google.android.youtube`](https://play.google.com/store/apps/details?id=com.google.android.youtube)
 <details>

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

 ### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
@@ -70,7 +71,6 @@ The official ReVanced Patches.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `background-play` | Enables playing music in the background. | all |
-| `bypass-certificate-checks` | Bypasses certificate checks which prevent YouTube Music from working on Android Auto. | 5.39.52 |
 | `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | all |
 | `compact-header` | Hides the music category bar at the top of the homepage. | all |
 | `exclusive-audio-playback` | Enables the option to play music without video. | all |
@@ -120,7 +120,7 @@ The official ReVanced Patches.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `block-audio-ads` | Blocks audio ads in streams and VODs. | 14.6.1 |
-| `block-embedded-ads` | Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
+| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
 | `block-video-ads` | Blocks video ads in streams and VODs. | 14.6.1 |
 | `debug-mode` | Enables Twitch's internal debugging mode. | all |
 | `settings` | Adds settings menu to Twitch. | all |
@@ -136,6 +136,7 @@ The official ReVanced Patches.
 | `hide-ads` | Hides ads. | all |
 | `hide-recommended-users` | Hides recommended users. | all |
 | `hide-views-stats` | Hides the view stats under tweets. | 9.71.0-release.0 |
+| `monochrome-icon` | Adds a monochrome icon. | all |
 </details>

 ### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
@@ -153,11 +154,20 @@ The official ReVanced Patches.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.12.0 |
-| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.12.0 |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.09.1 |
+| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.09.1 |
 | `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>

+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `hide-ads` | Removes general ads. | all |
+</details>
+
 ### [📦 `at.gv.bmf.bmf2go`](https://play.google.com/store/apps/details?id=at.gv.bmf.bmf2go)
 <details>

@@ -172,16 +182,8 @@ The official ReVanced Patches.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | all |
-| `spoof-signature` | Spoofs the signature of the app. | all |
-</details>
-
-### [📦 `com.laurencedawson.reddit_sync`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-ads` | Disables ads. | all |
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.5.2 |
+| `spoof-signature` | Spoofs the signature of the app. | 2.5.2 |
 </details>

 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
@@ -200,30 +202,6 @@ The official ReVanced Patches.
 | `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
 </details>

-### [📦 `com.nis.app`](https://play.google.com/store/apps/details?id=com.nis.app)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes ads from Inshorts. | all |
-</details>
-
-### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes general ads. | all |
-</details>
-
-### [📦 `com.facebook.orca`](https://play.google.com/store/apps/details?id=com.facebook.orca)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-inbox-ads` | Hides ads in inbox. | all |
-</details>
-
 ### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
 <details>

@@ -320,22 +298,6 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>

-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
-</details>
-
-### [📦 `com.zombodroid.MemeGenerator`](https://play.google.com/store/apps/details?id=com.zombodroid.MemeGenerator)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | 4.6377 |
-</details>
-
 ### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
 <details>

@@ -360,12 +322,20 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>

+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
+</details>
+
 ### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-themes` | Unlocks all themes that are inaccessible until a certain level is reached. | all |
+| `unlock-themes` | Unlocks all themes. | all |
 </details>

 ### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
@@ -378,8 +348,6 @@ The official ReVanced Patches.



-> Looking for the JSON variant of this? [Click here](patches.json).
-
 ## 📝 JSON Format

 This section explains the JSON format for the [patches.json](patches.json) file.
@@ -438,6 +406,7 @@ Example:
    "description": "Enables a custom theme.",
    "version": "0.0.1",
    "excluded": false,
+    "deprecated": false,
    "options": [
      {
        "key": "theme",
@@ -464,6 +433,7 @@ Example:
    "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",
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.7.0"
 }

 group = "app.revanced"
@@ -20,7 +20,7 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:7.1.0")
+    implementation("app.revanced:revanced-patcher:7.0.0")
    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
    // Required for meta
    implementation("com.google.code.gson:gson:2.10.1")
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.174.0-dev.7
+version = 2.166.0-dev.1
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/7
+++ b/7
@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
--- a/package-lock.json
+++ b/package-lock.json
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.util.patch.PatchBundle
 import java.io.File

-internal typealias PatchBundlePatches = List<Class<out Patch<Context>>>
+typealias PatchBundlePatches = List<Class<out Patch<Context>>>

 internal interface PatchesFileGenerator {
    fun generate(bundle: PatchBundlePatches)
--- a/src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
@@ -1,45 +0,0 @@
-package app.revanced.patches.all.activity.exportAll.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-
-@Patch(false)
-@Name("export-all-activities")
-@Description("Makes all app activities exportable.")
-@Version("0.0.1")
-class ExportAllActivitiesPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-            val activities = document.getElementsByTagName("activity")
-
-            for(i in 0..activities.length) {
-                activities.item(i)?.apply {
-                    val exportedAttribute = attributes.getNamedItem(EXPORTED_FLAG)
-
-                    if (exportedAttribute != null) {
-                        if (exportedAttribute.nodeValue != "true")
-                            exportedAttribute.nodeValue = "true"
-                    }
-                    // Reason why the attribute is added in the case it does not exist:
-                    // https://github.com/revanced/revanced-patches/pull/1751/files#r1141481604
-                    else document.createAttribute(EXPORTED_FLAG)
-                        .apply { value = "true" }
-                        .let(attributes::setNamedItem)
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val EXPORTED_FLAG = "android:exported"
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
@@ -4,7 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
 import org.jf.dexlib2.iface.ClassDef
@@ -16,7 +15,6 @@ import java.util.*
@Name("spoof-wifi-connection")
@Description("Spoofs an existing Wi-Fi connection.")
@Version("0.0.1")
-@RequiresIntegrations
 internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
@@ -1,42 +0,0 @@
-package app.revanced.patches.all.misc.debugging.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("enable-android-debugging")
-@Description("Enables Android debugging capabilities.")
-@Version("0.0.1")
-class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        if (debuggable == true) {
-            context.xmlEditor["AndroidManifest.xml"].use { dom ->
-                val applicationNode = dom
-                    .file
-                    .getElementsByTagName("application")
-                    .item(0) as Element
-
-                // set application as debuggable
-                applicationNode.setAttribute("android:debuggable", "true")
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var debuggable: Boolean? by option(
-            PatchOption.BooleanOption(
-                key = "debuggable",
-                default = false,
-                title = "App debugging",
-                description = "Whether to make the app debuggable on Android.",
-            )
-        )
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
@@ -1,50 +0,0 @@
-package app.revanced.patches.all.misc.packagename.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("change-package-name")
-@Description("Changes the package name.")
-@Version("0.0.1")
-class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        packageName?.let { packageName ->
-            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
-            if (!packageName.matches(packageNameRegex))
-                return PatchResultError("Invalid package name")
-
-            var originalPackageName = ""
-            context.xmlEditor["AndroidManifest.xml"].use { editor ->
-                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-                originalPackageName = manifest.getAttribute("package")
-            }
-
-            if (!originalPackageName.matches(packageNameRegex))
-                return PatchResultError("Failed to get the original package name")
-
-            context["AndroidManifest.xml"].apply {
-                readText().replace(originalPackageName, packageName).let(::writeText)
-            }
-
-        } ?: return PatchResultError("No package name provided")
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var packageName: String? by option(
-            PatchOption.StringOption(
-                key = "packageName",
-                default = null,
-                title = "Package name",
-                description = "The name of the package to rename of the app.",
-            )
-        )
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
@@ -4,7 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
 import org.jf.dexlib2.iface.ClassDef
@@ -16,7 +15,6 @@ import java.util.*
@Name("remove-screenshot-restriction")
@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
@Version("0.0.1")
-@RequiresIntegrations
 internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
@@ -1,14 +1,15 @@
 package app.revanced.patches.backdrops.misc.pro.patch

-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
@@ -24,20 +25,17 @@ class ProUnlockPatch : BytecodePatch(
    listOf(ProUnlockFingerprint)
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        ProUnlockFingerprint.result?.let { result ->
-            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
+        val result = ProUnlockFingerprint.result ?: return PatchResultError("${ProUnlockFingerprint.name} not found")

-            result.mutableMethod.apply {
-                val register = instruction<OneRegisterInstruction>(registerIndex).registerA
-                addInstructions(
-                    result.scanResult.patternScanResult!!.endIndex,
-                    """
-                        const/4 v$register, 0x1
-                    """
-                )
-            }
+        val moveRegisterInstruction = result.mutableMethod.instruction(result.scanResult.patternScanResult!!.endIndex - 1)
+        val register = (moveRegisterInstruction as OneRegisterInstruction).registerA

-        } ?: return ProUnlockFingerprint.toErrorResult()
+        result.mutableMethod.addInstructions(
+            result.scanResult.patternScanResult!!.endIndex,
+            """
+                const/4 v$register, 0x1
+            """
+        )

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

-@Compatibility([Package("at.gv.oe.app")])
+@Compatibility([Package("at.gv.oe.app", arrayOf("2.5.2"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
@@ -1,9 +0,0 @@
-package app.revanced.patches.inshorts.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.nis.app")])
-
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
@@ -1,9 +0,0 @@
-package app.revanced.patches.inshorts.ad.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object InshortsAdsFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("GoogleAdLoader","exception in requestAd")
-)
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
@@ -1,38 +0,0 @@
-package app.revanced.patches.inshorts.ad.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
-import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
-
-@Patch
-@Name("hide-ads")
-@Description("Removes ads from Inshorts.")
-@HideAdsCompatibility
-@Version("0.0.1")
-class HideAdsPatch : BytecodePatch(
-    listOf(InshortsAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        InshortsAdsFingerprint.result?.let { result ->
-            result.apply {
-                mutableMethod.addInstruction(
-                    0,
-                    """
-                        return-void
-                    """
-                )
-            }
-        } ?: return InshortsAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
@@ -55,8 +55,8 @@ class HideTimelineAdsPatch : BytecodePatch(
            val scanStart = scanResult.patternScanResult!!.startIndex
            val jumpIndex = scanStart - 1

-            val mediaInstanceRegister = mutableMethod.instruction<FiveRegisterInstruction>(scanStart).registerC
-            val freeRegister = mutableMethod.instruction<OneRegisterInstruction>(jumpIndex).registerA
+            val mediaInstanceRegister = (mutableMethod.instruction(scanStart) as FiveRegisterInstruction).registerC
+            val freeRegister = (mutableMethod.instruction(jumpIndex) as OneRegisterInstruction).registerA

            val returnFalseLabel = "an_ad"

--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
@@ -1,24 +0,0 @@
-package app.revanced.patches.memegenerator.detection.license.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object LicenseValidationFingerprint : MethodFingerprint(
-    returnType = "Z",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Landroid/content/Context;"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.CMP_LONG,
-        Opcode.IF_GEZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.CONST_4,
-        Opcode.RETURN
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
@@ -1,31 +0,0 @@
-package app.revanced.patches.memegenerator.detection.license.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
-
-@Description("Disables Firebase license validation.")
-@Version("0.0.1")
-class LicenseValidationPatch : BytecodePatch(
-    listOf(LicenseValidationFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LicenseValidationFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw LicenseValidationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
@@ -1,35 +0,0 @@
-package app.revanced.patches.memegenerator.detection.signature.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2)
-object VerifySignatureFingerprint : MethodFingerprint(
-    returnType = "Z",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Landroid/app/Activity;"),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_STATIC,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.SGET_OBJECT,
-        Opcode.ARRAY_LENGTH,
-        Opcode.IF_GE,
-        Opcode.AGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.ADD_INT_LIT8
-    ),
-)
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
@@ -1,31 +0,0 @@
-package app.revanced.patches.memegenerator.detection.signature.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint
-
-@Description("Disables detection of incorrect signature.")
-@Version("0.0.1")
-class SignatureVerificationPatch : BytecodePatch(
-    listOf(VerifySignatureFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        VerifySignatureFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw VerifySignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/annotations/UnlockProCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/annotations/UnlockProCompatibility.kt
@@ -1,17 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.zombodroid.MemeGenerator", arrayOf(
-            "4.6364",
-            "4.6370",
-            "4.6375",
-            "4.6377",
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
@@ -1,22 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object IsFreeVersionFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/Boolean;",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    strings = listOf("free"),
-    parameters = listOf("Landroid/content/Context;"),
-    opcodes = listOf(
-        Opcode.SGET,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
@@ -1,45 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
-import app.revanced.patches.memegenerator.detection.signature.patch.SignatureVerificationPatch
-import app.revanced.patches.memegenerator.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.memegenerator.misc.pro.fingerprint.IsFreeVersionFingerprint
-
-@Patch
-@Name("unlock-pro")
-@Description("Unlocks pro features.")
-@DependsOn([
-    SignatureVerificationPatch::class,
-    LicenseValidationPatch::class
-])
-@UnlockProCompatibility
-@Version("0.0.1")
-class UnlockProVersionPatch : BytecodePatch(
-    listOf(
-        IsFreeVersionFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsFreeVersionFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(0,
-                """
-                    sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-                    return-object p0
-                """
-            )
-        } ?: throw IsFreeVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
@@ -1,18 +0,0 @@
-package app.revanced.patches.messenger.ads.inbox.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object LoadInboxAdsFingerprint : MethodFingerprint(
-    returnType = "V",
-    strings = listOf(
-        "ads_load_begin",
-        "inbox_ads_fetch_start"
-    ),
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    customFingerprint = {
-        it.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
-    }
-)
-
--- a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
@@ -1,29 +0,0 @@
-package app.revanced.patches.messenger.ads.inbox.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
-
-@Patch
-@Name("hide-inbox-ads")
-@Description("Hides ads in inbox.")
-@Compatibility([Package("com.facebook.orca")])
-@Version("0.0.1")
-class HideInboxAdsPatch : BytecodePatch(
-    listOf(LoadInboxAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
-            this.replaceInstruction(0, "return-void")
-        } ?: return LoadInboxAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
-
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/annotations/BypassCertificateChecksCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/annotations/BypassCertificateChecksCompatibility.kt
@@ -1,35 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.apps.youtube.music",
-        arrayOf(
-            "5.14.53",
-            "5.16.51",
-            "5.17.51",
-            "5.21.52",
-            "5.22.54",
-            "5.23.50",
-            "5.25.51",
-            "5.25.52",
-            "5.26.52",
-            "5.27.51",
-            "5.28.52",
-            "5.29.52",
-            "5.31.50",
-            "5.34.51",
-            "5.36.51",
-            "5.38.53",
-            "5.39.52",
-            "5.40.51",
-            "5.41.50",
-            "5.48.52"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class BypassCertificateChecksCompatibility
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
@@ -1,10 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.androidauto.patch.BypassCertificateChecksPatch
-
-
-object CheckCertificateFingerprint : MethodFingerprint(
-    "Z",
-    strings = listOf("No match") // Unique in combination with boolean return type
-)
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
@@ -1,41 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.misc.androidauto.annotations.BypassCertificateChecksCompatibility
-import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
-
-@Patch
-@Name("bypass-certificate-checks")
-@Description("Bypasses certificate checks which prevent YouTube Music from working on Android Auto.")
-@BypassCertificateChecksCompatibility
-@Version("0.0.1")
-class BypassCertificateChecksPatch : BytecodePatch(
-    listOf(
-        CheckCertificateFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CheckCertificateFingerprint.result?.let { result ->
-            val noMatchIndex = result.scanResult.stringsScanResult!!.matches.first().index
-
-            result.mutableMethod.apply {
-                val isPartnerIndex = noMatchIndex + 2
-
-                replaceInstruction(isPartnerIndex, "const/4 p1, 0x1")
-                addInstruction(isPartnerIndex + 1, "return p1")
-            }
-        } ?: return CheckCertificateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt
@@ -0,0 +1,8 @@
+package app.revanced.patches.photomath.detection.signature.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.microblink.photomath")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class DisableSignatureDetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
@@ -1,18 +1,9 @@
 package app.revanced.patches.photomath.detection.signature.fingerprints

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

 object CheckSignatureFingerprint : MethodFingerprint(
-    returnType = "V",
-    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = {
-        (it.definingClass == "Lcom/microblink/photomath/main/activity/LauncherActivity;" ||
-                it.definingClass == "Lcom/microblink/photomath/PhotoMath;") &&
-                it.name == "onCreate"
-    },
    strings = listOf(
        "currentSignature"
    ),
@@ -27,4 +18,4 @@ object CheckSignatureFingerprint : MethodFingerprint(
        Opcode.INVOKE_STATIC,
        Opcode.MOVE_RESULT,
    )
-)
+)
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/MainOnCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/MainOnCreateFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.photomath.detection.signature.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object MainOnCreateFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lcom/microblink/photomath/PhotoMath;" && methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
@@ -1,33 +1,42 @@
 package app.revanced.patches.photomath.detection.signature.patch

-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.photomath.detection.signature.annotations.DisableSignatureDetectionCompatibility
 import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
+import app.revanced.patches.photomath.detection.signature.fingerprints.MainOnCreateFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Description("Disables detection of incorrect signature.")
-@Version("0.0.2")
+@DisableSignatureDetectionCompatibility
+@Version("0.0.1")
 class SignatureDetectionPatch : BytecodePatch(
    listOf(
-        CheckSignatureFingerprint
+        MainOnCreateFingerprint
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        CheckSignatureFingerprint.result?.apply {
-            val signatureCheckInstruction = mutableMethod.instruction(scanResult.patternScanResult!!.endIndex)
+        val mainOnCreate = MainOnCreateFingerprint.result!!
+
+        val patternResult = CheckSignatureFingerprint.also {
+            it.resolve(context, mainOnCreate.method, mainOnCreate.classDef)
+        }.result!!.scanResult.patternScanResult!!
+
+        mainOnCreate.mutableMethod.apply {
+            val signatureCheckInstruction = instruction(patternResult.endIndex)
            val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA

-            mutableMethod.replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
-        } ?: throw CheckSignatureFingerprint.toErrorResult()
+            replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
+        }

        return PatchResultSuccess()
    }

-}
+}
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
@@ -0,0 +1,8 @@
+package app.revanced.patches.photomath.misc.unlockplus.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.microblink.photomath")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class UnlockPlusCompatibilty
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
@@ -1,10 +1,8 @@
 package app.revanced.patches.photomath.misc.unlockplus.patch

 import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
@@ -14,13 +12,14 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
+import app.revanced.patches.photomath.misc.unlockplus.annotations.UnlockPlusCompatibilty
 import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlockedFingerprint

@Patch
@Name("unlock-plus")
@DependsOn([SignatureDetectionPatch::class])
@Description("Unlocks plus features.")
-@Compatibility([Package("com.microblink.photomath")])
+@UnlockPlusCompatibilty
@Version("0.0.1")
 class UnlockPlusPatch : BytecodePatch(
    listOf(
@@ -41,4 +40,4 @@ class UnlockPlusPatch : BytecodePatch(
        return PatchResultSuccess()
    }

-}
+}
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/banner/annotations/HideBannerCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/banner/annotations/HideBannerCompatibility.kt
@@ -12,10 +12,7 @@ import app.revanced.patcher.annotation.Package
            "2023.07.1",
            "2023.08.0",
            "2023.09.0",
-            "2023.09.1",
-            "2023.10.0",
-            "2023.11.0",
-            "2023.12.0"
+            "2023.09.1"
        )
    )]
 )
--- 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
@@ -14,10 +14,7 @@ import app.revanced.patcher.annotation.Package
            "2023.07.1",
            "2023.08.0",
            "2023.09.0",
-            "2023.09.1",
-            "2023.10.0",
-            "2023.11.0",
-            "2023.12.0"
+            "2023.09.1"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/annotations/ClientSpoofCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/annotations/ClientSpoofCompatibility.kt
@@ -4,21 +4,10 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf(
-            "17.49.37",
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
-        )
-    )]
+    [
+        Package("com.google.android.youtube"),
+        Package("com.vanced.android.youtube")
+    ]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class ClientSpoofCompatibility
--- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.shared.misc.fix.spoof.patch

-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -10,37 +9,29 @@ import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.misc.fix.spoof.annotations.ClientSpoofCompatibility
 import app.revanced.patches.shared.misc.fix.spoof.fingerprints.UserAgentHeaderBuilderFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.patch.SpoofSignatureVerificationPatch
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction

@Patch
@Name("client-spoof")
-@Description("Spoofs a patched client to allow playback.")
+@Description("Spoofs the YouTube or Vanced client to prevent playback issues.")
@ClientSpoofCompatibility
-@DependsOn([SpoofSignatureVerificationPatch::class])
@Version("0.0.1")
 class ClientSpoofPatch : BytecodePatch(
    listOf(UserAgentHeaderBuilderFingerprint)
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        UserAgentHeaderBuilderFingerprint.result?.let { result ->
-            val insertIndex = result.scanResult.patternScanResult!!.endIndex
-           result.mutableMethod.apply {
-               val packageNameRegister = instruction<FiveRegisterInstruction>(insertIndex).registerD
+        val result = UserAgentHeaderBuilderFingerprint.result!!
+        val method = result.mutableMethod

-               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
-           }
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
+        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD

-        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
+        val originalPackageName = "com.google.android.youtube"
+        method.addInstruction(insertIndex, "const-string v$packageNameRegister, \"$originalPackageName\"")

        return PatchResultSuccess()
    }
-
-    private companion object {
-        private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
@@ -20,17 +20,19 @@ class VerticalScrollPatch : BytecodePatch(
    listOf(CanScrollVerticallyFingerprint)
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        CanScrollVerticallyFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val insertIndex = it.scanResult.patternScanResult!!.endIndex
-                val moveResultRegister = instruction<OneRegisterInstruction>(insertIndex - 1).registerA
+        val result = CanScrollVerticallyFingerprint.result ?: return CanScrollVerticallyFingerprint.toErrorResult()

-                addInstruction(
-                    insertIndex,
-                    "const/4 v$moveResultRegister, 0x0"
-                )
-            }
-        } ?: return CanScrollVerticallyFingerprint.toErrorResult()
+        with(result) {
+            val method = mutableMethod
+
+            val moveResultIndex = scanResult.patternScanResult!!.endIndex
+            val moveResultRegister = (method.instruction(moveResultIndex) as OneRegisterInstruction).registerA
+
+            method.addInstruction(
+                moveResultIndex + 1,
+                "const/4 v$moveResultRegister, 0x0"
+            )
+        }

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt
@@ -11,7 +11,6 @@ import org.w3c.dom.Element
 *  @param name The name of the array resource.
 *  @param items The items of the array resource.
 */
-// TODO: allow specifying an array resource file instead of using a list of StringResources
 internal data class ArrayResource(
    override val name: String,
    val items: List<StringResource>
--- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt
@@ -1,7 +1,10 @@
 package app.revanced.patches.shared.settings.preference.impl

-import app.revanced.patches.shared.settings.preference.*
-import app.revanced.patches.shared.settings.resource.patch.AbstractSettingsResourcePatch.Companion.include
+import app.revanced.patches.shared.settings.preference.BasePreference
+import app.revanced.patches.shared.settings.preference.IResource
+import app.revanced.patches.shared.settings.preference.addDefault
+import app.revanced.patches.shared.settings.preference.addSummary
+import app.revanced.patches.shared.settings.preference.SummaryType
 import org.w3c.dom.Document
 import org.w3c.dom.Element

@@ -13,21 +16,16 @@ import org.w3c.dom.Element
 * @param default The default value of the switch.
 * @param summaryOn The summary to show when the preference is enabled.
 * @param summaryOff The summary to show when the preference is disabled.
- * @param userDialogMessage The message to show in a dialog when the user toggles the preference.
 */
 internal class SwitchPreference(
    key: String, title: StringResource,
    val default: Boolean = false,
    val summaryOn: StringResource? = null,
-    val summaryOff: StringResource? = null,
-    val userDialogMessage: StringResource? = null
+    val summaryOff: StringResource? = null
 ) : BasePreference(key, title) {
    override val tag: String = "SwitchPreference"

    override fun serialize(ownerDocument: Document, resourceCallback: ((IResource) -> Unit)?): Element {
-        // dialog message is stored as a regular string and later referenced by SettingsEnum
-        userDialogMessage?.include()
-
        return super.serialize(ownerDocument, resourceCallback).apply {
            addDefault(default)
            addSummary(summaryOn?.also { resourceCallback?.invoke(it) }, SummaryType.ON)
--- a/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt
@@ -23,7 +23,7 @@ internal class TextPreference(
    val default: String? = null,
    val summary: StringResource? = null
 ) : BasePreference(key, title) {
-    override val tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference"
+    override val tag: String = "EditTextPreference"

    override fun serialize(ownerDocument: Document, resourceCallback: ((IResource) -> Unit)?): Element {
        return super.serialize(ownerDocument, resourceCallback).apply {
--- a/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt
@@ -8,13 +8,18 @@ import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.spotify.audio.annotation.DisableCaptureRestrictionCompatibility
 import app.revanced.patches.spotify.audio.fingerprints.DisableCaptureRestrictionAudioDriverFingerprint
 import app.revanced.patches.spotify.audio.resource.patch.DisableCaptureRestrictionResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference

@Patch
@Name("disable-capture-restriction")
@@ -30,16 +35,49 @@ class DisableCaptureRestrictionBytecodePatch : BytecodePatch(
    override fun execute(context: BytecodeContext): PatchResult {
        val method = DisableCaptureRestrictionAudioDriverFingerprint.result!!.mutableMethod

-        method.apply {
-            // Replace constant
-            val original = instruction(0) as OneRegisterInstruction
-            replaceInstruction(
-                0,
-                "const/4 v${original.registerA}, $ALLOW_CAPTURE_BY_ALL"
-            )
+        var invokePosition: Int? = null
+        var invokeParamRegister: Int? = null
+
+        // Find INVOKE_VIRTUAL opcode with call to AudioAttributesBuilder.setAllowedCapturePolicy(I)
+        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+            if(instruction.opcode != Opcode.INVOKE_VIRTUAL)
+                continue
+
+            val methodName = ((instruction as ReferenceInstruction).reference as MethodReference).name
+            if (methodName != "setAllowedCapturePolicy")
+                continue
+
+            // Store register of the integer parameter for setAllowedCapturePolicy
+            invokeParamRegister = (instruction as FiveRegisterInstruction).registerD
+            invokePosition = index
        }

-        return PatchResultSuccess()
+        if(invokePosition == null || invokeParamRegister == null)
+            return PatchResultError("Cannot find setAllowedCapturePolicy method call")
+
+        // Walk back to the const/4 instruction that sets the parameter register
+        var matchFound = false
+        for (index in invokePosition downTo 0) {
+            val instruction = method.instruction(index)
+            if(instruction.opcode != Opcode.CONST_4)
+                continue
+
+            val register = (instruction as OneRegisterInstruction).registerA
+            if(register != invokeParamRegister)
+                continue
+
+            // Replace parameter value
+            method.replaceInstruction(
+                index, "const/4 v$register, $ALLOW_CAPTURE_BY_ALL"
+            )
+            matchFound = true
+            break
+        }
+
+        return if (matchFound)
+            PatchResultSuccess()
+        else
+            PatchResultError("Const instruction not found")
    }

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/spotify/audio/fingerprints/DisableCaptureRestrictionAudioDriverFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/audio/fingerprints/DisableCaptureRestrictionAudioDriverFingerprint.kt
@@ -1,27 +1,10 @@
 package app.revanced.patches.spotify.audio.fingerprints


-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference

 object DisableCaptureRestrictionAudioDriverFingerprint : MethodFingerprint(
-    "L",
-    AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.SYNTHETIC or AccessFlags.BRIDGE,
-    listOf("L"),
-    listOf(
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    ),
    customFingerprint = { methodDef ->
-        // Check for method call to AudioAttributes$Builder.setAllowedCapturePolicy Android API
-        methodDef.implementation?.instructions?.any {
-            ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "setAllowedCapturePolicy"
-        } == true
+        methodDef.definingClass == "Lcom/spotify/playback/playbacknative/AudioDriver;" && methodDef.name == "constructAudioAttributes"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt
@@ -1,8 +0,0 @@
-package app.revanced.patches.syncforreddit.ads.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.laurencedawson.reddit_sync")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt
@@ -1,11 +0,0 @@
-package app.revanced.patches.syncforreddit.ads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IsAdsEnabledFingerprint : MethodFingerprint(
-    returnType = "Z",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    strings = listOf("SyncIapHelper")
-)
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt
@@ -1,39 +0,0 @@
-package app.revanced.patches.syncforreddit.ads.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.syncforreddit.ads.annotations.DisableAdsCompatibility
-import app.revanced.patches.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
-import app.revanced.patches.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
-
-@Patch
-@Name("disable-ads")
-@DependsOn([DisablePiracyDetectionPatch::class])
-@Description("Disables ads.")
-@Version("0.0.1")
-@DisableAdsCompatibility
-class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsAdsEnabledFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                const/4 v0, 0x0
-                return v0
-            """
-            )
-        } ?: return IsAdsEnabledFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
@@ -1,29 +0,0 @@
-package app.revanced.patches.syncforreddit.detection.piracy.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.TypeReference
-
-object PiracyDetectionFingerprint : MethodFingerprint(
-    returnType = "V",
-    access = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL
-    ),
-    customFingerprint = { method ->
-        method.implementation?.instructions?.any {
-            if (it.opcode != Opcode.NEW_INSTANCE) return@any false
-
-            val reference = (it as ReferenceInstruction).reference
-
-            reference.toString() == "Lcom/github/javiersantos/piracychecker/PiracyChecker;"
-        } ?: false
-    }
-)
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
@@ -1,28 +0,0 @@
-package app.revanced.patches.syncforreddit.detection.piracy.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
-
-@Description("Disables detection of modified versions.")
-@Version("0.0.1")
-class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        PiracyDetectionFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                return-void
-            """
-            )
-        } ?: return PiracyDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
@@ -16,7 +16,7 @@ import app.revanced.patches.ticktick.misc.themeunlock.fingerprints.SetThemeFinge

@Patch
@Name("unlock-themes")
-@Description("Unlocks all themes that are inaccessible until a certain level is reached.")
+@Description("Unlocks all themes.")
@UnlockThemesCompatibility
@Version("0.0.1")
 class UnlockProPatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
@@ -25,6 +25,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.iface.reference.TypeReference

@Patch
@DependsOn([IntegrationsPatch::class])
@@ -95,7 +96,7 @@ class SettingsPatch : BytecodePatch(
    private fun patchOptionNameAndOnClickEvent(index: Int, context: BytecodeContext) {
        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
            // Patch option name
-            val overrideRegister = instruction<OneRegisterInstruction>(index - 4).registerA
+            val overrideRegister = (instruction(index - 4) as OneRegisterInstruction).registerA
            replaceInstruction(
                index - 4,
                """
@@ -104,14 +105,16 @@ class SettingsPatch : BytecodePatch(
            )

            // Patch option OnClick Event
-            val type = instruction<ReferenceInstruction>(index).reference.toString()
-            context.findClass(type)!!.mutableClass.methods.first { type == "onClick" }.addInstructions(
-                0,
-            """
-                     invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
-                     return-void
-                 """
-            )
+            with(((instruction(index) as ReferenceInstruction).reference as TypeReference).type) {
+                context.findClass(this)!!.mutableClass.methods.first { it.name == "onClick" }
+                    .addInstructions(
+                        0,
+                        """
+                                 invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
+                                 return-void
+                             """
+                    )
+            }
        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
@@ -97,14 +97,14 @@ class SpoofSimPatch : BytecodePatch() {

    // Patch Android API and return fake sim information
    private fun MutableMethod.replaceReference(index: Int, replacement: String) {
-        val resultReg = instruction<OneRegisterInstruction>(index + 1).registerA
+        val resultReg = (instruction(index + 1) as OneRegisterInstruction).registerA

        addInstructions(
            index + 2,
-        """
-                 invoke-static {v$resultReg}, Lapp/revanced/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String;
-                 move-result-object v$resultReg
-             """
+            """
+                     invoke-static {v$resultReg}, Lapp/revanced/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String;
+                     move-result-object v$resultReg
+                 """
        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
@@ -24,7 +24,7 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
@Patch
@DependsOn([VideoAdsPatch::class, IntegrationsPatch::class, SettingsPatch::class])
@Name("block-embedded-ads")
-@Description("Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker.")
+@Description("Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker.")
@EmbeddedAdsCompatibility
@Version("0.0.1")
 class EmbeddedAdsPatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
@@ -4,12 +4,8 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.extensions.*
+import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -17,9 +13,7 @@ import app.revanced.patches.shared.settings.preference.impl.ArrayResource
 import app.revanced.patches.shared.settings.preference.impl.ListPreference
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.twitch.chat.antidelete.annotations.ShowDeletedMessagesCompatibility
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.ChatUtilCreateDeletedSpanFingerprint
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.DeletedMessageClickableSpanCtorFingerprint
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.SetHasModAccessFingerprint
+import app.revanced.patches.twitch.chat.antidelete.fingerprints.*
 import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch

--- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -4,9 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.extensions.*
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -21,10 +19,7 @@ import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen
 import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.twitch.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.twitch.misc.settings.components.CustomPreferenceCategory
-import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsOnClickFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsUpdatedFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsActivityOnCreateFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsMenuItemEnumFingerprint
+import app.revanced.patches.twitch.misc.settings.fingerprints.*
 import app.revanced.patches.twitch.misc.settings.resource.patch.SettingsResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.immutable.ImmutableField
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt
@@ -0,0 +1,8 @@
+package app.revanced.patches.twitter.misc.monochrome.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.twitter.android")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class MonochromeIconCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt
@@ -0,0 +1,55 @@
+package app.revanced.patches.twitter.misc.monochrome.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.twitter.misc.monochrome.annotations.MonochromeIconCompatibility
+import java.io.FileWriter
+import java.nio.file.Files
+
+@Patch
+@Name("monochrome-icon")
+@Description("Adds a monochrome icon.")
+@MonochromeIconCompatibility
+@Version("0.0.1")
+class MonochromeIconPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        val resDirectory = context["res"]
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val mipmapV33Directory = resDirectory.resolve("mipmap-anydpi-v33")
+        if (!mipmapV33Directory.isDirectory) Files.createDirectories(mipmapV33Directory.toPath())
+
+        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter.xml")).use {
+            it.write(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                        "<adaptive-icon\n" +
+                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "</adaptive-icon>"
+            )
+        }
+
+        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter_round.xml")).use {
+            it.write(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                        "<adaptive-icon\n" +
+                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "</adaptive-icon>"
+            )
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt
@@ -1,7 +1,6 @@
 package app.revanced.patches.youtube.ad.general.bytecode.patch

 import app.revanced.extensions.findMutableMethodOf
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -10,15 +9,16 @@ import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
+import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
@@ -71,16 +71,20 @@ class GeneralAdsPatch : BytecodePatch(
            }
        }

-        ReelConstructorFingerprint.result?.let {
+        with(
+            ReelConstructorFingerprint.result
+                ?: return PatchResultError("Could not resolve fingerprint")
+        ) {
            // iput-object v$viewRegister, ...
-            val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
+            val insertIndex = this.scanResult.patternScanResult!!.startIndex + 2

-            it.mutableMethod.apply {
-                val viewRegister = instruction<TwoRegisterInstruction>(insertIndex).registerA
+            with(this.mutableMethod) {
+                val viewRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA

                injectHideCall(insertIndex, viewRegister, "hideReelView")
            }
-        } ?: return ReelConstructorFingerprint.toErrorResult()
+
+        }

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt
@@ -212,13 +212,6 @@ class GeneralAdsResourcePatch : ResourcePatch {
                true,
                StringResource("revanced_hide_image_shelf_summary_on", "Image shelf is hidden"),
                StringResource("revanced_hide_image_shelf_summary_off", "Image shelf is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_audio_track_button",
-                StringResource("revanced_hide_audio_track_button_title", "Hide audio track button"),
-                false,
-                StringResource("revanced_hide_audio_track_button_on", "Audio track button is hidden"),
-                StringResource("revanced_hide_audio_track_button_off", "Audio track button is shown")
            )
        )

--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- 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
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
@@ -31,11 +31,18 @@ class HideButtonsPatch : ResourcePatch {
                StringResource("revanced_hide_buttons_title", "Hide action buttons"),
                listOf(
                    SwitchPreference(
-                        "revanced_hide_like_dislike_button",
-                        StringResource("revanced_hide_like_dislike_button_title", "Hide like and dislike buttons"),
+                        "revanced_hide_like_button",
+                        StringResource("revanced_hide_like_button_title", "Hide like button"),
                        false,
-                        StringResource("revanced_hide_like_dislike_button_summary_on", "Like and dislike buttons are hidden"),
-                        StringResource("revanced_hide_like_dislike_button_summary_off", "Like and dislike buttons are shown")
+                        StringResource("revanced_hide_like_button_summary_on", "Like button is hidden"),
+                        StringResource("revanced_hide_like_button_summary_off", "Like button is shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_hide_dislike_button",
+                        StringResource("revanced_hide_dislike_button_title", "Hide dislike button"),
+                        false,
+                        StringResource("revanced_hide_dislike_button_summary_on", "Dislike button is hidden"),
+                        StringResource("revanced_hide_dislike_button_summary_off", "Dislike button is shown")
                    ),
                    SwitchPreference(
                        "revanced_hide_download_button",
@@ -52,20 +59,18 @@ class HideButtonsPatch : ResourcePatch {
                        StringResource("revanced_hide_playlist_button_summary_off", "Playlist button is shown")
                    ),
                    SwitchPreference(
-                        "revanced_hide_clip_button",
-                        StringResource("revanced_hide_clip_button_title", "Hide clip button"),
-                        false,
-                        StringResource("revanced_hide_clip_button_summary_on", "Clip button is hidden"),
-                        StringResource("revanced_hide_clip_button_summary_off", "Clip button is shown"),
-                        StringResource("revanced_hide_clip_button_user_dialog_message",
-                            "Hiding the clip button might not work reliably. In the case it does not work, it can only be hidden by enabling \\'Hide all other action buttons\\'")
+                        "revanced_hide_action_button",
+                        StringResource("revanced_hide_action_button_title", "Hide create, clip and thanks buttons"),
+                        true,
+                        StringResource("revanced_hide_action_button_summary_on", "Buttons are hidden"),
+                        StringResource("revanced_hide_action_button_summary_off", "Buttons are shown")
                    ),
                    SwitchPreference(
-                        "revanced_hide_action_buttons",
-                        StringResource("revanced_hide_action_buttons_title", "Hide all other action buttons"),
+                        "revanced_hide_share_button",
+                        StringResource("revanced_hide_share_button_title", "Hide share button"),
                        false,
-                        StringResource("revanced_hide_action_buttons_summary_on", "Share, remix, thanks, shop, live chat buttons are hidden"),
-                        StringResource("revanced_hide_action_buttons_summary_off", "Share, remix, thanks, shop, live chat buttons are shown")
+                        StringResource("revanced_hide_share_button_summary_on", "Share button is hidden"),
+                        StringResource("revanced_hide_share_button_summaryoff", "Share button is shown")
                    )
                ),
                StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
@@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -21,7 +20,6 @@ import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.LayoutC
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.Instruction
-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
@@ -68,15 +66,12 @@ class HideAutoplayButtonPatch : BytecodePatch(

            val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction

-            // can be clobbered because this register is overwritten after the injected code
-            val clobberRegister = instruction<OneRegisterInstruction>(insertIndex).registerA
-
            addInstructions(
                insertIndex,
                """
                invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-                move-result v$clobberRegister
-                if-eqz v$clobberRegister, :hidden
+                move-result v11
+                if-eqz v11, :hidden
            """, listOf(ExternalLabel("hidden", jumpInstruction))
            )
        } ?: return LayoutConstructorFingerprint.toErrorResult()
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/AddCreateButtonViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/AddCreateButtonViewFingerprint.kt
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-internal const val ANDROID_AUTOMOTIVE_STRING = "Android Automotive"
-
-object AddCreateButtonViewFingerprint : MethodFingerprint(
-    strings = listOf(
-        "Android Wear",
-        ANDROID_AUTOMOTIVE_STRING,
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
@@ -1,196 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.navigation.annotations.NavigationButtonsCompatibility
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.*
-import app.revanced.patches.youtube.layout.buttons.navigation.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
-import app.revanced.patches.youtube.layout.buttons.navigation.utils.InjectionUtils.injectHook
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        SettingsPatch::class,
-        ResolvePivotBarFingerprintsPatch::class,
-    ]
-)
-@Name("navigation-buttons")
-@Description("Adds options to hide or change navigation buttons.")
-@NavigationButtonsCompatibility
-@Version("0.0.1")
-class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_navigation_buttons",
-                StringResource("revanced_navigation_buttons", "Navigation button settings"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_home_button",
-                        StringResource("revanced_hide_home_button_title", "Hide home button"),
-                        false,
-                        StringResource("revanced_hide_home_button_summary_on", "Home button is hidden"),
-                        StringResource("revanced_hide_home_button_summary_off", "Home button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_button",
-                        StringResource("revanced_hide_shorts_button_title", "Hide shorts button"),
-                        true,
-                        StringResource("revanced_hide_shorts_button_summary_on", "Shorts button is hidden"),
-                        StringResource("revanced_hide_shorts_button_summary_off", "Shorts button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_subscriptions_button",
-                        StringResource("revanced_hide_subscriptions_button_title", "Hide subscriptions button"),
-                        false,
-                        StringResource(
-                            "revanced_hide_subscriptions_button_summary_on",
-                            "Home subscriptions is hidden"
-                        ),
-                        StringResource("revanced_hide_subscriptions_button_summary_off", "Home subscriptions is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_create_button",
-                        StringResource("revanced_hide_create_button_title", "Hide create button"),
-                        true,
-                        StringResource("revanced_hide_create_button_summary_on", "Create button is hidden"),
-                        StringResource("revanced_hide_create_button_summary_off", "Create button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_switch_create_with_notifications_button",
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_title",
-                            "Switch create with notifications button"
-                        ),
-                        true,
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_summary_on",
-                            "Create button is switched with notifications"
-                        ),
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_summary_off",
-                            "Create button is not switched with notifications"
-                        ),
-                    ),
-                ),
-            )
-        )
-
-        /*
-         * Resolve fingerprints
-         */
-
-        val initializeButtonsResult = InitializeButtonsFingerprint.result!!
-
-        val fingerprintResults =
-            arrayOf(PivotBarEnumFingerprint, PivotBarButtonsViewFingerprint)
-                .onEach {
-                    if (!it.resolve(
-                            context,
-                            initializeButtonsResult.mutableMethod,
-                            initializeButtonsResult.mutableClass
-                        )
-                    )
-                        return it.toErrorResult()
-                }
-                .map { it.result!!.scanResult.patternScanResult!! }
-
-
-        val enumScanResult = fingerprintResults[0]
-        val buttonViewResult = fingerprintResults[1]
-
-        val enumHookInsertIndex = enumScanResult.startIndex + 2
-        val buttonHookInsertIndex = buttonViewResult.endIndex
-
-        /*
-         * Inject hooks
-         */
-
-        val enumHook = "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, " +
-                "$INTEGRATIONS_CLASS_DESCRIPTOR->lastNavigationButton:Ljava/lang/Enum;"
-        val buttonHook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
-                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideButton(Landroid/view/View;)V"
-
-        // Inject bottom to top to not mess up the indices
-        mapOf(
-            buttonHook to buttonHookInsertIndex,
-            enumHook to enumHookInsertIndex
-        ).forEach { (hook, insertIndex) ->
-            initializeButtonsResult.mutableMethod.injectHook(hook, insertIndex)
-        }
-
-        /*
-         * Hide create or switch it with notifications buttons.
-         */
-
-        AddCreateButtonViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val stringIndex = it.scanResult.stringsScanResult!!.matches.find {
-                        match -> match.string == ANDROID_AUTOMOTIVE_STRING
-                }!!.index
-
-                val conditionalCheckIndex = stringIndex - 1
-                val conditionRegister = instruction<OneRegisterInstruction>(conditionalCheckIndex).registerA
-
-                addInstructions(
-                    conditionalCheckIndex,
-                    """
-                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->switchCreateWithNotificationButton()Z
-                        move-result v$conditionRegister
-                    """
-                )
-            }
-        } ?: return AddCreateButtonViewFingerprint.toErrorResult()
-
-        /*
-         * Resolve fingerprints
-         */
-
-        InitializeButtonsFingerprint.result!!.let {
-            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
-                return PivotBarCreateButtonViewFingerprint.toErrorResult()
-        }
-
-        PivotBarCreateButtonViewFingerprint.result!!.apply {
-            val insertIndex = mutableMethod.implementation!!.instructions.let {
-                val scanStart = scanResult.patternScanResult!!.endIndex
-
-                scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction ->
-                    instruction.opcode == Opcode.INVOKE_STATIC
-                }
-            }
-
-            /*
-             * Inject hooks
-             */
-            val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
-                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
-
-            mutableMethod.injectHook(hook, insertIndex)
-        }
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/NavigationButtonsPatch;"
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/create/fingerprints/PivotBarCreateButtonViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/create/fingerprints/PivotBarCreateButtonViewFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+package app.revanced.patches.youtube.layout.buttons.pivotbar.create.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/create/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/create/patch/CreateButtonRemoverPatch.kt
@@ -0,0 +1,79 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.create.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.pivotbar.create.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.Opcode
+
+@Patch
+@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
+@Name("hide-create-button")
+@Description("Hides the create button in the navigation bar.")
+@PivotBarCompatibility
+@Version("0.0.1")
+class CreateButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_create_button",
+                StringResource("revanced_hide_create_button_title", "Hide create button"),
+                true,
+                StringResource("revanced_hide_create_button_summary_on", "Create button is hidden"),
+                StringResource("revanced_hide_create_button_summary_off", "Create button is shown")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        InitializeButtonsFingerprint.result!!.let {
+            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
+                return PivotBarCreateButtonViewFingerprint.toErrorResult()
+        }
+
+        PivotBarCreateButtonViewFingerprint.result!!.apply {
+            val insertIndex = mutableMethod.implementation!!.instructions.let {
+                val scanStart = scanResult.patternScanResult!!.endIndex
+
+                scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction ->
+                    instruction.opcode == Opcode.INVOKE_STATIC
+                }
+            }
+
+            /*
+             * Inject hooks
+             */
+            val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
+
+            mutableMethod.injectHook(hook, insertIndex)
+        }
+
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/annotations/HideLoadMoreButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/annotations/HideLoadMoreButtonCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton.annotations
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -6,20 +6,16 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
@Target(AnnotationTarget.CLASS)
-internal annotation class HideLoadMoreButtonCompatibility
-
+internal annotation class PivotBarCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/fingerprints/InitializeButtonsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/fingerprints/InitializeButtonsFingerprint.kt
@@ -1,7 +1,7 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.buttons.navigation.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/fingerprints/PivotBarConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/fingerprints/PivotBarConstructorFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/patch/ResolvePivotBarFingerprintsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/patch/ResolvePivotBarFingerprintsPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.patch
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch

 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -11,15 +11,21 @@ import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.InitializeButtonsFingerprint
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.PivotBarConstructorFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.PivotBarConstructorFingerprint

@DependsOn([ResourceMappingPatch::class])
+@PivotBarCompatibility
@Description("Resolves necessary fingerprints.")
@Version("0.0.1")
 class ResolvePivotBarFingerprintsPatch : BytecodePatch(
    listOf(PivotBarConstructorFingerprint)
 ) {
+    internal companion object {
+        var imageOnlyTabResourceId: Long = -1
+    }
+
    override fun execute(context: BytecodeContext): PatchResult {
        // imageOnlyTabResourceId is used in InitializeButtonsFingerprint fingerprint
        ResourceMappingPatch.resourceMappings.find { it.type == "layout" && it.name == "image_only_tab" }
@@ -36,8 +42,4 @@ class ResolvePivotBarFingerprintsPatch : BytecodePatch(
        } ?: return PivotBarConstructorFingerprint.toErrorResult()
        return PatchResultSuccess()
    }
-
-    internal companion object {
-        var imageOnlyTabResourceId: Long = -1
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/fingerprints/PivotBarEnumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/fingerprints/PivotBarEnumFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/fingerprints/PivotBarShortsButtonViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/fingerprints/PivotBarShortsButtonViewFingerprint.kt
@@ -1,9 +1,9 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

-object PivotBarButtonsViewFingerprint : MethodFingerprint(
+object PivotBarShortsButtonViewFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL_RANGE,
        Opcode.MOVE_RESULT_OBJECT, // target reference
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/patch/ShortsButtonRemoverPatch.kt
@@ -0,0 +1,93 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints.PivotBarEnumFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints.PivotBarShortsButtonViewFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
+@Name("hide-shorts-button")
+@Description("Hides the shorts button on the navigation bar.")
+@PivotBarCompatibility
+@Version("0.0.1")
+class ShortsButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideShortsButtonPatch;"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_shorts_button",
+                StringResource("revanced_hide_shorts_button_title", "Hide shorts button"),
+                true,
+                StringResource("revanced_hide_shorts_button_summary_on", "Shorts button is hidden"),
+                StringResource("revanced_hide_shorts_button_summary_off", "Shorts button is shown")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        val initializeButtonsResult = InitializeButtonsFingerprint.result!!
+
+        val fingerprintResults =
+            arrayOf(PivotBarEnumFingerprint, PivotBarShortsButtonViewFingerprint)
+                .onEach {
+                    if (!it.resolve(
+                            context,
+                            initializeButtonsResult.mutableMethod,
+                            initializeButtonsResult.mutableClass
+                        )
+                    )
+                        return it.toErrorResult()
+                }
+                .map { it.result!!.scanResult.patternScanResult!! }
+
+
+        val enumScanResult = fingerprintResults[0]
+        val buttonViewResult = fingerprintResults[1]
+
+        val enumHookInsertIndex = enumScanResult.startIndex + 2
+        val buttonHookInsertIndex = buttonViewResult.endIndex
+
+        /*
+         * Inject hooks
+         */
+
+        val enumHook = "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->lastPivotTab:Ljava/lang/Enum;"
+        val buttonHook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideShortsButton(Landroid/view/View;)V"
+
+        // Inject bottom to top to not mess up the indices
+        mapOf(
+            buttonHook to buttonHookInsertIndex,
+            enumHook to enumHookInsertIndex
+        ).forEach { (hook, insertIndex) ->
+            initializeButtonsResult.mutableMethod.injectHook(hook, insertIndex)
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.utils
+package app.revanced.patches.youtube.layout.buttons.pivotbar.utils

 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.instruction
@@ -20,7 +20,7 @@ internal object InjectionUtils {

        // Register to pass to the hook
        val registerIndex = insertIndex - 1 // MOVE_RESULT_OBJECT is always the previous instruction
-        val register = injectTarget.instruction<OneRegisterInstruction>(registerIndex).registerA
+        val register = (injectTarget.instruction(registerIndex) as OneRegisterInstruction).registerA

        injectTarget.addInstruction(
            insertIndex,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt
@@ -5,17 +5,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
@@ -55,7 +55,7 @@ class HidePlayerButtonsPatch : BytecodePatch(

        PlayerControlsVisibilityModelFingerprint.result?.apply {
            val callIndex = scanResult.patternScanResult!!.endIndex
-            val callInstruction = mutableMethod.instruction<Instruction3rc>(callIndex)
+            val callInstruction = mutableMethod.instruction(callIndex) as Instruction3rc

            // overriding this parameter register hides the previous and next buttons
            val hasNextParameterRegister = callInstruction.startRegister + ParameterOffsets.HAS_NEXT
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.layout.hide.albumcards.bytecode.patch

-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -30,22 +29,16 @@ class AlbumCardsPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        AlbumCardsFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val checkCastAnchorIndex = it.scanResult.patternScanResult!!.endIndex
-                val insertIndex = checkCastAnchorIndex + 1
+        val albumCardsResult = AlbumCardsFingerprint.result!!
+        val albumCardsMethod = albumCardsResult.mutableMethod

-                val albumCardViewRegister = instruction<OneRegisterInstruction>(checkCastAnchorIndex).registerA
+        val checkCastAnchorIndex = albumCardsResult.scanResult.patternScanResult!!.endIndex

-                addInstruction(
-                    insertIndex,
-                    "invoke-static {v$albumCardViewRegister}, " +
-                            "Lapp/revanced/integrations/patches/HideAlbumCardsPatch;" +
-                            "->" +
-                            "hideAlbumCards(Landroid/view/View;)V"
-                )
-            }
-        } ?: return AlbumCardsFingerprint.toErrorResult()
+        albumCardsMethod.addInstruction(
+            checkCastAnchorIndex + 1, """
+            invoke-static {v${(albumCardsMethod.instruction(checkCastAnchorIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideAlbumCardsPatch;->hideAlbumCards(Landroid/view/View;)V
+        """
+        )

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.patch

-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -25,29 +24,22 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@BreakingNewsCompatibility
@Version("0.0.1")
 class BreakingNewsPatch : BytecodePatch(
-    listOf(BreakingNewsFingerprint)
+    listOf(
+        BreakingNewsFingerprint,
+    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        BreakingNewsFingerprint.result?.let {
-            val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
-            val moveResultIndex = insertIndex - 1
+        val breakingNewsResult = BreakingNewsFingerprint.result!!
+        val breakingNewsMethod = breakingNewsResult.mutableMethod

-            it.mutableMethod.apply {
-                val breakingNewsViewRegister = instruction<OneRegisterInstruction>(moveResultIndex).registerA
-
-                addInstruction(
-                    insertIndex,
-                    """
-                        invoke-static {v$breakingNewsViewRegister}, 
-                        Lapp/revanced/integrations/patches/HideBreakingNewsPatch;
-                        ->
-                        hideBreakingNews(Landroid/view/View;)V
-                    """
-                )
-            }
-
-        } ?: return BreakingNewsFingerprint.toErrorResult()
+        val moveResultObjectIndex =
+            breakingNewsResult.scanResult.patternScanResult!!.endIndex - 2

+        breakingNewsMethod.addInstruction(
+            moveResultObjectIndex + 1, """
+            invoke-static {v${(breakingNewsMethod.instruction(moveResultObjectIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideBreakingNewsPatch;->hideBreakingNews(Landroid/view/View;)V
+        """
+        )

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/annotations/CommentsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/annotations/CommentsCompatibility.kt
@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Package
@Compatibility(
    [Package(
        "com.google.android.youtube", arrayOf(
-            "17.49.37",
+            "17.49.37", 
            "18.03.36",
            "18.03.42",
            "18.04.35",
            "18.04.41",
            "18.05.32",
            "18.05.35",
-            "18.05.40",
-            "18.08.37",
-            "18.15.40",
-            "18.16.37"
+            "18.05.40"
        )
    )]
 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	6f4729f317	chore(release): 2.166.0-dev.1 [skip ci] # [2.166.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.166.0-dev.1) (2023-03-14) ### Bug Fixes * backdrops/pro-unlock: constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([`5a65668`](`5a65668892`)) * instagram/hide-timeline-ads: fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([`d6d7aca`](`d6d7acafb2`)) * twitch: misspelling annotations ([`2939856`](`2939856bbc`)) * youtube/general-ads: remove duplicate preference ([`d876096`](`d8760969f7`)) * youtube/return-youtube-dislike: add missing strings ([`bf8f74f`](`bf8f74f5bf`)) * youtube/spoof-signature-verification: use correct fingerprint ([`e36902a`](`e36902a530`)) ### Features * myexpenses/unlock-pro: constrain to last working version ([`452a922`](`452a92287f`)) * reddit: add more compatibility constraints ([`2140ac2`](`2140ac2a6b`)) * reddit: bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([`d9526a9`](`d9526a95de`)) * twitch: constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([`696685b`](`696685b7bb`)) * youtube/custom-video-buffer: replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([`4d9659e`](`4d9659e643`)) * youtube/disable-player-popup-panels: use better patch description ([`6485d4c`](`6485d4c74d`)) * youtube/general-ads: do not hide components in library tab ([`48cdd4c`](`48cdd4cee2`)) * youtube/general-ads: hide image shelf from search results ([`e2b907b`](`e2b907b217`)) * youtube/hide-autoplay-button: do not disable autoplay button when hidden ([`db81982`](`db81982fc9`)) * youtube: `hide-floating-microphone-button` patch ([`16dfab6`](`16dfab69be`)) * youtube: bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([`4d2131f`](`4d2131f148`)) * youtube: bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([`14229c7`](`14229c7636`)) * youtubevanced: `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([`3eae68f`](`3eae68f49b`))	2023-03-14 13:03:43 +00:00
LisoUseInAIKyrios	14229c7636	feat(youtube): bump compatibility to `18.05.40` (#1743 )	2023-03-14 13:58:58 +01:00
johnconner122	3eae68f49b	feat(youtubevanced): `general-ads` patch (#1693 )	2023-03-14 13:58:57 +01:00
LisoUseInAIKyrios	4d9659e643	feat(youtube/custom-video-buffer): replace patch with removal notice (#1718 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:57 +01:00
EvadeMaster	2939856bbc	fix(twitch): misspelling annotations	2023-03-14 13:58:57 +01:00
EvadeMaster	696685b7bb	feat(twitch): constraint compatibility to `14.6.1` (#1736 )	2023-03-14 13:58:56 +01:00
EvadeMaster	d08dbcd117	chore(gradle): bump wrapper to `8.0.2` (#1737 )	2023-03-14 13:58:56 +01:00
EvadeMaster	d9526a95de	feat(reddit): bump compatibility to `2023.09.1` (#1729 )	2023-03-14 13:58:56 +01:00
EvadeMaster	4d2131f148	feat(youtube): bump compatibility to `18.05.40` (#1704 )	2023-03-14 13:58:55 +01:00
LisoUseInAIKyrios	452a92287f	feat(myexpenses/unlock-pro): constrain to last working version	2023-03-14 13:58:55 +01:00
LisousEinaiKyrios	2140ac2a6b	feat(reddit): add more compatibility constraints	2023-03-14 13:58:55 +01:00
LisousEinaiKyrios	bf8f74f5bf	fix(youtube/return-youtube-dislike): add missing strings	2023-03-14 13:58:54 +01:00
Javier Flores	713eba9a75	chore: update gradle wrapper to 8.0.1 (#1680 )	2023-03-14 13:58:54 +01:00
oSumAtrIX	c95a97d5c3	build: update dependencies Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:54 +01:00
oSumAtrIX	d0f21cd196	refactor: remove unnecessary annotations Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:53 +01:00
oSumAtrIX	7cefed2dbb	refactor(youtube/hide-timestamp): use better descriptions Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:53 +01:00
oSumAtrIX	16dfab69be	feat(youtube): `hide-floating-microphone-button` patch Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:53 +01:00
oSumAtrIX	db81982fc9	feat(youtube/hide-autoplay-button): do not disable autoplay button when hidden Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:52 +01:00
KAZI MMT	5a65668892	fix(backdrops/pro-unlock): constrain to most recent working app version (#1677 )	2023-03-14 13:58:52 +01:00
oSumAtrIX	48cdd4cee2	feat(youtube/general-ads): do not hide components in library tab This reverts commit `5a62eb1a28`. Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:51 +01:00
oSumAtrIX	6485d4c74d	feat(youtube/disable-player-popup-panels): use better patch description Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:58:51 +01:00
falafelp	d6d7acafb2	fix(instagram/hide-timeline-ads): fix compatibility with newer versions (#1672 ) Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>	2023-03-14 13:58:51 +01:00
oSumAtrIX	d8760969f7	fix(youtube/general-ads): remove duplicate preference	2023-03-14 13:58:51 +01:00
oSumAtrIX	e2b907b217	feat(youtube/general-ads): hide image shelf from search results Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-03-14 13:57:00 +01:00