chore(release): 2.174.0-dev.7 [skip ci]

# [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)) ([6951e4a](6951e4a0e9))
feat(syncforreddit): add disable-ads patch (#2066 )
2025-12-25 10:24:08 +01:00 · 2023-05-07 16:17:11 +00:00 · 2023-05-07 18:15:30 +02:00 · 2023-05-07 15:28:43 +00:00 · 2023-05-07 17:26:58 +02:00 · 2023-05-07 14:13:32 +00:00
74 changed files with 1130 additions and 595 deletions
--- a/.releaserc
+++ b/.releaserc
@@ -7,7 +7,13 @@
    }
  ],
  "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "revanced-patcher", "release": "patch" }
+        ]
+      }
+    ],
    "@semantic-release/release-notes-generator",
    "@semantic-release/changelog",
    "gradle-semantic-release-plugin",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,99 @@
+# [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)


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

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

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

 {{ table }}

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

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

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

 ### [📦 `com.google.android.youtube`](https://play.google.com/store/apps/details?id=com.google.android.youtube)
 <details>
@@ -10,7 +10,7 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `always-autorepeat` | Always repeats the playing video again. | 18.16.37 |
-| `client-spoof` | Spoofs a patched client to allow playback. | all |
+| `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 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
@@ -31,7 +31,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `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 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 18.16.37 |
 | `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 |
@@ -41,12 +40,12 @@ The official Patch bundle provided by ReVanced and the community.
 | `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-shorts-button` | Hides the shorts button on the navigation bar. | 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 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
@@ -57,7 +56,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `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 |
-| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 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 |
 | `theme` | Applies a custom theme. | all |
@@ -160,15 +158,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `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 a patched client to allow playback. | 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>

@@ -187,6 +176,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `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 |
+</details>
+
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
 <details>

@@ -211,6 +208,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `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>

@@ -288,7 +293,7 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-plus` | Unlocks plus features. | 8.9.0 |
+| `unlock-plus` | Unlocks plus features. | all |
 </details>

 ### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)
@@ -328,7 +333,7 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | 4.6364 |
+| `unlock-pro` | Unlocks pro features. | 4.6377 |
 </details>

 ### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
@@ -373,6 +378,8 @@ The official Patch bundle provided by ReVanced and the community.



+> 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.
@@ -431,7 +438,6 @@ Example:
    "description": "Enables a custom theme.",
    "version": "0.0.1",
    "excluded": false,
-    "deprecated": false,
    "options": [
      {
        "key": "theme",
@@ -458,7 +464,6 @@ 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
@@ -20,7 +20,7 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:7.0.0")
+    implementation("app.revanced:revanced-patcher:7.1.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.173.0-dev.1
+version = 2.174.0-dev.7
--- a/patches.json
+++ b/patches.json
--- 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,15 +1,14 @@
 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
@@ -25,17 +24,20 @@ class ProUnlockPatch : BytecodePatch(
    listOf(ProUnlockFingerprint)
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        val result = ProUnlockFingerprint.result ?: return PatchResultError("${ProUnlockFingerprint.name} not found")
+        ProUnlockFingerprint.result?.let { result ->
+            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1

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

-        result.mutableMethod.addInstructions(
-            result.scanResult.patternScanResult!!.endIndex,
-            """
-                const/4 v$register, 0x1
-            """
-        )
+        } ?: return ProUnlockFingerprint.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(scanStart) as FiveRegisterInstruction).registerC
-            val freeRegister = (mutableMethod.instruction(jumpIndex) as OneRegisterInstruction).registerA
+            val mediaInstanceRegister = mutableMethod.instruction<FiveRegisterInstruction>(scanStart).registerC
+            val freeRegister = mutableMethod.instruction<OneRegisterInstruction>(jumpIndex).registerA

            val returnFalseLabel = "an_ad"

--- 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
@@ -3,6 +3,15 @@ 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"))])
+@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/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
@@ -1,30 +0,0 @@
-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", arrayOf(
-            "8.6.0",
-            "8.7.0",
-            "8.8.0",
-            "8.9.0",
-            "8.10.0",
-            "8.11.0",
-            "8.12.0",
-            "8.13.0",
-            "8.14.0",
-            "8.15.0",
-            "8.16.0",
-            "8.17.0",
-            "8.18.0",
-            "8.18.1",
-            "8.19.0",
-            "8.20.0",
-            "8.21.0",
-        )
-    )]
-)
-@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,8 +1,10 @@
 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
@@ -12,14 +14,13 @@ 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.")
-@UnlockPlusCompatibilty
+@Compatibility([Package("com.microblink.photomath")])
@Version("0.0.1")
 class UnlockPlusPatch : BytecodePatch(
    listOf(
@@ -40,4 +41,4 @@ class UnlockPlusPatch : BytecodePatch(
        return PatchResultSuccess()
    }

-}
+}
--- 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,10 +4,21 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [
-        Package("com.google.android.youtube"),
-        Package("com.vanced.android.youtube")
-    ]
+    [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"
+        )
+    )]
 )
@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
@@ -10,15 +10,18 @@ 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.")
@ClientSpoofCompatibility
+@DependsOn([SpoofSignatureVerificationPatch::class])
@Version("0.0.1")
 class ClientSpoofPatch : BytecodePatch(
    listOf(UserAgentHeaderBuilderFingerprint)
@@ -27,7 +30,8 @@ class ClientSpoofPatch : BytecodePatch(
        UserAgentHeaderBuilderFingerprint.result?.let { result ->
            val insertIndex = result.scanResult.patternScanResult!!.endIndex
           result.mutableMethod.apply {
-               val packageNameRegister = (instruction(insertIndex) as FiveRegisterInstruction).registerD
+               val packageNameRegister = instruction<FiveRegisterInstruction>(insertIndex).registerD
+
               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
           }

--- 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,19 +20,17 @@ class VerticalScrollPatch : BytecodePatch(
    listOf(CanScrollVerticallyFingerprint)
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        val result = CanScrollVerticallyFingerprint.result ?: return CanScrollVerticallyFingerprint.toErrorResult()
+        CanScrollVerticallyFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.endIndex
+                val moveResultRegister = instruction<OneRegisterInstruction>(insertIndex - 1).registerA

-        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"
-            )
-        }
+                addInstruction(
+                    insertIndex,
+                    "const/4 v$moveResultRegister, 0x0"
+                )
+            }
+        } ?: return CanScrollVerticallyFingerprint.toErrorResult()

        return PatchResultSuccess()
    }
--- 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 = "EditTextPreference"
+    override val tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference"

    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,18 +8,13 @@ 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")
@@ -35,49 +30,16 @@ class DisableCaptureRestrictionBytecodePatch : BytecodePatch(
    override fun execute(context: BytecodeContext): PatchResult {
        val method = DisableCaptureRestrictionAudioDriverFingerprint.result!!.mutableMethod

-        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
-        }
-
-        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"
+        method.apply {
+            // Replace constant
+            val original = instruction(0) as OneRegisterInstruction
+            replaceInstruction(
+                0,
+                "const/4 v${original.registerA}, $ALLOW_CAPTURE_BY_ALL"
            )
-            matchFound = true
-            break
        }

-        return if (matchFound)
-            PatchResultSuccess()
-        else
-            PatchResultError("Const instruction not found")
+        return PatchResultSuccess()
    }

    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,10 +1,27 @@
 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 ->
-        methodDef.definingClass == "Lcom/spotify/playback/playbacknative/AudioDriver;" && methodDef.name == "constructAudioAttributes"
+        // Check for method call to AudioAttributes$Builder.setAllowedCapturePolicy Android API
+        methodDef.implementation?.instructions?.any {
+            ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "setAllowedCapturePolicy"
+        } == true
    }
 )
--- a/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt
@@ -0,0 +1,8 @@
+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
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,39 @@
+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
@@ -0,0 +1,29 @@
+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
@@ -0,0 +1,28 @@
+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/tiktok/misc/settings/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
@@ -25,7 +25,6 @@ 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])
@@ -96,7 +95,7 @@ class SettingsPatch : BytecodePatch(
    private fun patchOptionNameAndOnClickEvent(index: Int, context: BytecodeContext) {
        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
            // Patch option name
-            val overrideRegister = (instruction(index - 4) as OneRegisterInstruction).registerA
+            val overrideRegister = instruction<OneRegisterInstruction>(index - 4).registerA
            replaceInstruction(
                index - 4,
                """
@@ -105,16 +104,14 @@ class SettingsPatch : BytecodePatch(
            )

            // Patch option OnClick Event
-            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
-                             """
-                    )
-            }
+            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
+                 """
+            )
        }
    }
 }
--- 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(index + 1) as OneRegisterInstruction).registerA
+        val resultReg = instruction<OneRegisterInstruction>(index + 1).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/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
@@ -4,8 +4,12 @@ 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.*
-import app.revanced.patcher.patch.*
+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.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -13,7 +17,9 @@ 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.*
+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.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,7 +4,9 @@ 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.*
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -19,7 +21,10 @@ 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.*
+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.resource.patch.SettingsResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.immutable.ImmutableField
--- 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,6 +1,7 @@
 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
@@ -9,16 +10,15 @@ 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,20 +71,16 @@ class GeneralAdsPatch : BytecodePatch(
            }
        }

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

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

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

        return PatchResultSuccess()
    }
--- 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
@@ -69,7 +69,7 @@ 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(insertIndex) as OneRegisterInstruction).registerA
+            val clobberRegister = instruction<OneRegisterInstruction>(insertIndex).registerA

            addInstructions(
                insertIndex,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/annotations/NavigationButtonsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/annotations/NavigationButtonsCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.playback.annotation
+package app.revanced.patches.youtube.layout.buttons.navigation.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -21,4 +21,4 @@ import app.revanced.patcher.annotation.Package
    )]
 )
@Target(AnnotationTarget.CLASS)
-internal annotation class ProtobufSpoofCompatibility
+internal annotation class NavigationButtonsCompatibility
--- 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
@@ -0,0 +1,12 @@
+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/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.pivotbar.shared.fingerprints
+package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.navigation.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/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.pivotbar.shorts.fingerprints
+package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

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

-object PivotBarShortsButtonViewFingerprint : MethodFingerprint(
+object PivotBarButtonsViewFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL_RANGE,
        Opcode.MOVE_RESULT_OBJECT, // target reference
--- 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.pivotbar.shared.fingerprints
+package app.revanced.patches.youtube.layout.buttons.navigation.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/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.pivotbar.create.fingerprints
+package app.revanced.patches.youtube.layout.buttons.navigation.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/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.pivotbar.shorts.fingerprints
+package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode
--- 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
@@ -0,0 +1,196 @@
+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/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.pivotbar.shared.patch
+package app.revanced.patches.youtube.layout.buttons.navigation.patch

 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -11,21 +11,15 @@ 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.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
+import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.navigation.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" }
@@ -42,4 +36,8 @@ 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/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.pivotbar.utils
+package app.revanced.patches.youtube.layout.buttons.navigation.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(registerIndex) as OneRegisterInstruction).registerA
+        val register = injectTarget.instruction<OneRegisterInstruction>(registerIndex).registerA

        injectTarget.addInstruction(
            insertIndex,
--- 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
@@ -1,79 +0,0 @@
-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/buttons/pivotbar/shorts/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shorts/patch/ShortsButtonRemoverPatch.kt
@@ -1,93 +0,0 @@
-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/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(callIndex) as Instruction3rc
+            val callInstruction = mutableMethod.instruction<Instruction3rc>(callIndex)

            // 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/bytecode/patch/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
@@ -1,5 +1,6 @@
 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
@@ -29,16 +30,22 @@ class AlbumCardsPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        val albumCardsResult = AlbumCardsFingerprint.result!!
-        val albumCardsMethod = albumCardsResult.mutableMethod
+        AlbumCardsFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val checkCastAnchorIndex = it.scanResult.patternScanResult!!.endIndex
+                val insertIndex = checkCastAnchorIndex + 1

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

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

        return PatchResultSuccess()
    }
--- 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,5 +1,6 @@
 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
@@ -24,22 +25,29 @@ 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 {
-        val breakingNewsResult = BreakingNewsFingerprint.result!!
-        val breakingNewsMethod = breakingNewsResult.mutableMethod
+        BreakingNewsFingerprint.result?.let {
+            val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
+            val moveResultIndex = insertIndex - 1

-        val moveResultObjectIndex =
-            breakingNewsResult.scanResult.patternScanResult!!.endIndex - 2
+            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()

-        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/bytecode/patch/CommentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.comments.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
@@ -32,9 +33,6 @@ class CommentsPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        val shortsCommentsButtonResult = ShortsCommentsButtonFingerprint.result!!
-        val shortsCommentsButtonMethod = shortsCommentsButtonResult.mutableMethod
-
        val checkCastAnchorFingerprint = object : MethodFingerprint(
            opcodes = listOf(
                Opcode.CONST,
@@ -47,15 +45,24 @@ class CommentsPatch : BytecodePatch(
            )
        ) {}

-        val checkCastAnchorIndex = checkCastAnchorFingerprint.also {
-            it.resolve(context, shortsCommentsButtonMethod, shortsCommentsButtonResult.classDef)
-        }.result!!.scanResult.patternScanResult!!.endIndex
+        ShortsCommentsButtonFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val checkCastAnchorIndex = checkCastAnchorFingerprint.also { result ->
+                    if (!result.resolve(context, this, it.classDef))
+                        throw checkCastAnchorFingerprint.toErrorResult()
+                }.result!!.scanResult.patternScanResult!!.endIndex

-        shortsCommentsButtonMethod.addInstructions(
-            checkCastAnchorIndex + 1, """
-                invoke-static {v${(shortsCommentsButtonMethod.instruction(checkCastAnchorIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideShortsCommentsButtonPatch;->hideShortsCommentsButton(Landroid/view/View;)V
-            """
-        )
+                val shortsCommentsButtonRegister = instruction<OneRegisterInstruction>(checkCastAnchorIndex).registerA
+                val insertIndex = checkCastAnchorIndex + 1
+
+                addInstructions(
+                    insertIndex,
+                    """
+                    invoke-static {v$shortsCommentsButtonRegister, Lapp/revanced/integrations/patches/HideShortsCommentsButtonPatch;->hideShortsCommentsButton(Landroid/view/View;)V
+                """
+                )
+            }
+        } ?: return ShortsCommentsButtonFingerprint.toErrorResult()

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
@@ -33,7 +33,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
        CrowdfundingBoxFingerprint.result?.let {
            it.mutableMethod.apply {
                val insertIndex = it.scanResult.patternScanResult!!.endIndex
-                val objectRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA
+                val objectRegister = instruction<TwoRegisterInstruction>(insertIndex).registerA

                addInstruction(insertIndex, "invoke-static {v$objectRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR")
            }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.endscreencards.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
@@ -35,19 +36,23 @@ class HideEndscreenCardsPatch : BytecodePatch(
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
        fun MethodFingerprint.injectHideCall() {
-            val layoutResult = result!!
-            val layoutMethod = layoutResult.mutableMethod
+            val layoutResult = result ?: throw toErrorResult()
+            layoutResult.mutableMethod.apply {
+                val insertIndex = layoutResult.scanResult.patternScanResult!!.endIndex + 1
+                val viewRegister = instruction<Instruction21c>(insertIndex - 1).registerA

-            val checkCastIndex = layoutResult.scanResult.patternScanResult!!.endIndex
-            val viewRegister = (layoutMethod.instruction(checkCastIndex) as Instruction21c).registerA
-
-            layoutMethod.addInstruction(
-                checkCastIndex + 1,
-                "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V"
-            )
+                addInstruction(
+                    insertIndex,
+                    "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V"
+                )
+            }
        }
-        
-        listOf(LayoutCircleFingerprint, LayoutIconFingerprint, LayoutVideoFingerprint).forEach(MethodFingerprint::injectHideCall)
+
+        listOf(
+            LayoutCircleFingerprint,
+            LayoutIconFingerprint,
+            LayoutVideoFingerprint
+        ).forEach(MethodFingerprint::injectHideCall)

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
@@ -29,7 +29,7 @@ class HideFloatingMicrophoneButtonPatch : BytecodePatch(
        ShowFloatingMicrophoneButtonFingerprint.result?.let { result ->
            with(result.mutableMethod) {
                val insertIndex = result.scanResult.patternScanResult!!.startIndex + 1
-                val showButtonRegister = (instruction(insertIndex - 1) as TwoRegisterInstruction).registerA
+                val showButtonRegister = instruction<TwoRegisterInstruction>(insertIndex - 1).registerA

                addInstructions(
                    insertIndex,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
@@ -45,8 +45,9 @@ class HideGetPremiumPatch : BytecodePatch(
        GetPremiumViewFingerprint.result?.let {
            it.mutableMethod.apply {
                val startIndex = it.scanResult.patternScanResult!!.startIndex
-                val measuredWidthRegister = (instruction(startIndex) as TwoRegisterInstruction).registerA
-                val measuredHeightInstruction = instruction(startIndex + 1) as TwoRegisterInstruction
+                val measuredWidthRegister = instruction<TwoRegisterInstruction>(startIndex).registerA
+                val measuredHeightInstruction = instruction<TwoRegisterInstruction>(startIndex + 1)
+
                val measuredHeightRegister = measuredHeightInstruction.registerA
                val tempRegister = measuredHeightInstruction.registerB

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
@@ -20,7 +20,8 @@ import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.Infocards
 import app.revanced.patches.youtube.layout.hide.infocards.resource.patch.HideInfocardsResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction

@Patch
@DependsOn([IntegrationsPatch::class, HideInfocardsResourcePatch::class])
@@ -35,18 +36,17 @@ class HideInfoCardsPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        with(InfocardsIncognitoFingerprint.also {
+       InfocardsIncognitoFingerprint.also {
            it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
-        }.result!!.mutableMethod) {
+        }.result!!.mutableMethod.apply {
            val invokeInstructionIndex = implementation!!.instructions.indexOfFirst {
                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal &&
-                        ((it as? BuilderInstruction35c)?.reference.toString() ==
-                                "Landroid/view/View;->setVisibility(I)V")
+                        ((it as ReferenceInstruction).reference.toString() == "Landroid/view/View;->setVisibility(I)V")
            }

            addInstructions(
                invokeInstructionIndex,
-                "invoke-static {v${(instruction(invokeInstructionIndex) as? BuilderInstruction35c)?.registerC}}," +
+                "invoke-static {v${instruction<FiveRegisterInstruction>(invokeInstructionIndex).registerC}}," +
                        " Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsIncognito(Landroid/view/View;)V"
            )
        }
--- 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.buttons.pivotbar.shared.annotations
+package app.revanced.patches.youtube.layout.hide.loadmorebutton.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -21,4 +21,5 @@ import app.revanced.patcher.annotation.Package
    )]
 )
@Target(AnnotationTarget.CLASS)
-internal annotation class PivotBarCompatibility
+internal annotation class HideLoadMoreButtonCompatibility
+
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/fingerprints/HideLoadMoreButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/fingerprints/HideLoadMoreButtonFingerprint.kt
@@ -0,0 +1,29 @@
+package app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch.HideLoadMoreButtonResourcePatch
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object HideLoadMoreButtonFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf("L", "L", "L", "L"),
+    opcodes = listOf(
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any {
+            if (it.opcode != Opcode.CONST) return@any false
+
+            val literal = (it as WideLiteralInstruction).wideLiteral
+
+            literal == HideLoadMoreButtonResourcePatch.expandButtonDownId
+        } ?: false
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.hide.loadmorebutton.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
+import app.revanced.patcher.data.BytecodeContext
+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.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.fingerprints.HideLoadMoreButtonFingerprint
+import app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch.HideLoadMoreButtonResourcePatch
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+
+@Patch
+@Name("hide-load-more-button")
+@Description("Hides the button under videos that loads similar videos.")
+@DependsOn([HideLoadMoreButtonResourcePatch::class])
+@Version("0.0.1")
+class HideLoadMoreButtonPatch : BytecodePatch(listOf(HideLoadMoreButtonFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        HideLoadMoreButtonFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val moveRegisterIndex = it.scanResult.patternScanResult!!.endIndex
+                val viewRegister = instruction<TwoRegisterInstruction>(moveRegisterIndex).registerA
+
+                val insertIndex = moveRegisterIndex + 1
+                addInstruction(
+                    insertIndex,
+                    "invoke-static { v$viewRegister }, " +
+                            "$INTEGRATIONS_CLASS_DESCRIPTOR->hideLoadMoreButton(Landroid/view/View;)V"
+                )
+            }
+        } ?: return HideLoadMoreButtonFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/HideLoadMoreButtonPatch;"
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
@@ -0,0 +1,40 @@
+package app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch
+
+import app.revanced.patcher.annotation.Name
+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.DependsOn
+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.hide.loadmorebutton.annotations.HideLoadMoreButtonCompatibility
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@Name("hide-load-more-button-resource-patch")
+@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
+@HideLoadMoreButtonCompatibility
+class HideLoadMoreButtonResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_load_more_button",
+                StringResource("revanced_hide_load_more_button_title", "Hide Load More button"),
+                true,
+                StringResource("revanced_hide_load_more_button_summary_on", "Load More button is hidden"),
+                StringResource("revanced_hide_load_more_button_summary_off", "Load More button is shown")
+            )
+        )
+
+        expandButtonDownId = ResourceMappingPatch.resourceMappings.single {
+            it.type == "layout" && it.name == "expand_button_down"
+        }.id
+
+        return PatchResultSuccess()
+    }
+
+    internal companion object {
+        var expandButtonDownId: Long = -1
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.personalinformation.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
@@ -29,23 +30,22 @@ class HideEmailAddressPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        val accountSwitcherAccessibilityLabelResult = AccountSwitcherAccessibilityLabelFingerprint.result!!
-        val accountSwitcherAccessibilityLabelMethod = accountSwitcherAccessibilityLabelResult.mutableMethod
+        AccountSwitcherAccessibilityLabelFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val setVisibilityConstIndex = it.scanResult.patternScanResult!!.endIndex

-        val setVisibilityConstIndex =
-            accountSwitcherAccessibilityLabelResult.scanResult.patternScanResult!!.endIndex
+                val setVisibilityConstRegister =
+                    instruction<OneRegisterInstruction>(setVisibilityConstIndex - 2).registerA

-        val setVisibilityConstRegister = (
-                accountSwitcherAccessibilityLabelMethod.instruction
-                (setVisibilityConstIndex - 2) as OneRegisterInstruction
-            ).registerA
-
-        accountSwitcherAccessibilityLabelMethod.addInstructions(
-            setVisibilityConstIndex, """
-            invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I
-            move-result v$setVisibilityConstRegister
-        """
-        )
+                addInstructions(
+                    setVisibilityConstIndex,
+                    """
+                        invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I
+                        move-result v$setVisibilityConstRegister
+                    """
+                )
+            }
+        } ?: return AccountSwitcherAccessibilityLabelFingerprint.toErrorResult()

        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
@@ -102,18 +102,21 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
            val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
                .scanResult.patternScanResult!!.startIndex

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

-                val insertIndex = atomicReferenceStartIndex + 8
-                val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction
+                val atomicReferenceRegister =
+                    instruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 5).registerC
+
+                val moveCharSequenceInstruction = instruction<TwoRegisterInstruction>(insertIndex)
                val charSequenceRegister = moveCharSequenceInstruction.registerB

                // Insert as first instructions at the control flow label.
@@ -145,8 +148,8 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                            return PatchResultError("Method signature did not match: $this $parameterTypes")

                        val insertIndex = implementation!!.instructions.size - 1
-                        val spannedParameterRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA
-                        val parameter = (instruction(insertIndex - 2) as BuilderInstruction35c).reference
+                        val spannedParameterRegister = instruction<OneRegisterInstruction>(insertIndex).registerA
+                        val parameter = instruction<BuilderInstruction35c>(insertIndex - 2).reference

                        if (!parameter.toString().endsWith("Landroid/text/Spanned;"))
                            return PatchResultError("Method signature parameter did not match: $parameter")
@@ -171,9 +174,12 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
        DislikesOldLayoutTextViewFingerprint.result?.let {
            it.mutableMethod.apply {
                val startIndex = it.scanResult.patternScanResult!!.startIndex
-                val resourceIdentifierRegister = (instruction(startIndex) as OneRegisterInstruction).registerA
-                val textViewRegister = (instruction(startIndex + 4) as OneRegisterInstruction).registerA
-                addInstruction(startIndex + 4,
+
+                val resourceIdentifierRegister = instruction<OneRegisterInstruction>(startIndex).registerA
+                val textViewRegister = instruction<OneRegisterInstruction>(startIndex + 4).registerA
+
+                addInstruction(
+                    startIndex + 4,
                    "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V"
                )
            }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

@Compatibility(
-    [Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40", "18.16.37"))]
+    [Package("com.google.android.youtube", arrayOf("18.15.40", "18.16.37"))]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class SponsorBlockCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ControlsOverlayFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ControlsOverlayFingerprint.kt
@@ -0,0 +1,27 @@
+package app.revanced.patches.youtube.layout.sponsorblock.bytecode.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 ControlsOverlayFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    parameters = listOf(),
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST, // R.id.inset_overlay_view_layout
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.NEW_INSTANCE,
+        ),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lcom/google/android/apps/youtube/app/player/overlay/YouTubeControlsOverlay;"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PlayerOverlaysLayoutInitFingerprint : MethodFingerprint(
-
-    customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -8,6 +8,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
+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
@@ -22,7 +23,7 @@ import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.AppendTimeFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.PlayerOverlaysLayoutInitFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.ControlsOverlayFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.RectangleFieldInvalidatorFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
@@ -60,7 +61,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
    listOf(
        SeekbarFingerprint,
        AppendTimeFingerprint,
-        PlayerOverlaysLayoutInitFingerprint,
+        ControlsOverlayFingerprint,
        AutoRepeatParentFingerprint,
    )
 ) {
@@ -198,8 +199,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                        method.addInstructions(
                            moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register
                            """
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
+                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
+                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
                            """
                        )
                    }
@@ -240,10 +241,16 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        VideoInformationPatch.onCreateHook(INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR, "initialize")

        // initialize the sponsorblock view
-        PlayerOverlaysLayoutInitFingerprint.result!!.mutableMethod.addInstruction(
-            6, // after inflating the view
-            "invoke-static {p0}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V"
-        )
+        ControlsOverlayFingerprint.result?.let {
+            val startIndex = it.scanResult.patternScanResult!!.startIndex
+            it.mutableMethod.apply {
+                val frameLayoutRegister = (instruction(startIndex + 2) as OneRegisterInstruction).registerA
+                addInstruction(
+                    startIndex + 3,
+                    "invoke-static {v$frameLayoutRegister}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/ViewGroup;)V"
+                )
+            }
+        }  ?: return ControlsOverlayFingerprint.toErrorResult()

        // get rectangle field name
        RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/CreateDarkThemeSeekbarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/CreateDarkThemeSeekbarFingerprint.kt
@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.layout.theme.bytecode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.CreateDarkThemeSeekbarFingerprint.indexOfInstructionWithSeekbarId
+import app.revanced.patches.youtube.layout.theme.resource.ThemeResourcePatch
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object CreateDarkThemeSeekbarFingerprint : MethodFingerprint(
+    access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    customFingerprint = { method -> method.indexOfInstructionWithSeekbarId != -1 },
+) {
+    /**
+     * The index of the instruction that loads the resource id of the seekbar.
+     */
+    internal val Method.indexOfInstructionWithSeekbarId
+        get() = implementation?.let {
+            it.instructions.indexOfFirst { instruction ->
+                instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == ThemeResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId
+            }
+        }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/SetSeekbarClickedColorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/SetSeekbarClickedColorFingerprint.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.layout.theme.bytecode.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object SetSeekbarClickedColorFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.CONST_HIGH16),
+    strings = listOf("YOUTUBE", "PREROLL", "POSTROLL")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
@@ -0,0 +1,93 @@
+package app.revanced.patches.youtube.layout.theme.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
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.*
+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.youtube.layout.theme.annotations.ThemeCompatibility
+import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.CreateDarkThemeSeekbarFingerprint
+import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.CreateDarkThemeSeekbarFingerprint.indexOfInstructionWithSeekbarId
+import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.SetSeekbarClickedColorFingerprint
+import app.revanced.patches.youtube.layout.theme.resource.ThemeResourcePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+
+@Patch
+@Name("theme")
+@Description("Applies a custom theme.")
+@DependsOn([ThemeLithoComponentsPatch::class, ThemeResourcePatch::class, IntegrationsPatch::class])
+@ThemeCompatibility
+@Version("0.0.1")
+class ThemeBytecodePatch : BytecodePatch(
+    listOf(CreateDarkThemeSeekbarFingerprint, SetSeekbarClickedColorFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        CreateDarkThemeSeekbarFingerprint.result?.let {
+            val putColorValueIndex = it.method.indexOfInstructionWithSeekbarId!! + 3
+
+            it.mutableMethod.apply {
+                val overrideRegister = instruction<TwoRegisterInstruction>(putColorValueIndex).registerA
+
+                addInstructions(
+                    putColorValueIndex,
+                    """
+                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarColorValue()I
+                        move-result v$overrideRegister
+                    """
+                )
+            }
+        } ?: return CreateDarkThemeSeekbarFingerprint.toErrorResult()
+
+        SetSeekbarClickedColorFingerprint.result?.let { result ->
+            result.mutableMethod.let {
+                val setColorMethodIndex = result.scanResult.patternScanResult!!.startIndex + 1
+                val method = context
+                    .toMethodWalker(it)
+                    .nextMethod(setColorMethodIndex, true)
+                    .getMethod() as MutableMethod
+
+                method.apply {
+                    val colorRegister = method.instruction<TwoRegisterInstruction>(0).registerA
+                    addInstructions(
+                        0,
+                        """
+                            invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarClickedColorValue(I)I
+                            move-result v$colorRegister
+                        """
+                    )
+                }
+            }
+        } ?: return SetSeekbarClickedColorFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+
+    companion object : OptionsContainer() {
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/theme/ThemePatch;"
+
+        var darkThemeBackgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "darkThemeBackgroundColor",
+                default = "@android:color/black",
+                title = "Background color for the dark theme",
+                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
+            )
+        )
+
+        var lightThemeBackgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "lightThemeBackgroundColor",
+                default = "@android:color/white",
+                title = "Background color for the light theme",
+                description = "The background color of the light theme. Can be a hex color or a resource reference.",
+            )
+        )
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeLithoComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeLithoComponentsPatch.kt
@@ -0,0 +1,40 @@
+package app.revanced.patches.youtube.layout.theme.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
+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.youtube.layout.theme.annotations.ThemeCompatibility
+import app.revanced.patches.youtube.layout.theme.fingerprints.LithoThemeFingerprint
+
+@Name("theme-litho-components")
+@Description("Applies a custom theme to Litho components.")
+@ThemeCompatibility
+@Version("0.0.1")
+class ThemeLithoComponentsPatch : BytecodePatch(listOf(LithoThemeFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        LithoThemeFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val patchIndex = it.scanResult.patternScanResult!!.endIndex - 1
+
+                addInstructions(
+                    patchIndex,
+                    """
+                        invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->getValue(I)I
+                        move-result p1
+                    """
+                )
+            }
+        } ?: return LithoThemeFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/theme/ThemeLithoComponentsPatch;"
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/LithoThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/LithoThemePatch.kt
@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
-import app.revanced.patches.youtube.layout.theme.fingerprints.LithoThemeFingerprint
-
-@Name("litho-components-theme")
-@Description("Applies a custom theme to litho components.")
-@ThemeCompatibility
-@Version("0.0.1")
-class LithoThemePatch : BytecodePatch(
-    listOf(
-        LithoThemeFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = LithoThemeFingerprint.result!!
-        val method = result.mutableMethod
-        val patchIndex = result.scanResult.patternScanResult!!.endIndex - 1
-
-        method.addInstructions(
-            patchIndex, """
-                invoke-static {p1}, Lapp/revanced/integrations/patches/LithoThemePatch;->applyLithoTheme(I)I
-                move-result p1
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
@@ -1,81 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.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.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import org.w3c.dom.Element
-
-@Patch
-@DependsOn([LithoThemePatch::class])
-@Name("theme")
-@Description("Applies a custom theme.")
-@ThemeCompatibility
-@Version("0.0.1")
-class ThemePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        val darkThemeBackgroundColor = darkThemeBackgroundColor!!
-        val lightThemeBackgroundColor = lightThemeBackgroundColor!!
-        val darkThemeSeekbarColor = darkThemeSeekbarColor!!
-
-        context.xmlEditor["res/values/colors.xml"].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
-
-            for (i in 0 until resourcesNode.childNodes.length) {
-                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-
-                node.textContent = when (node.getAttribute("name")) {
-                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3", "yt_black4", "yt_status_bar_background_dark", "material_grey_850" -> darkThemeBackgroundColor
-
-                    "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98", "yt_white2", "yt_white3", "yt_white4",
-                    -> lightThemeBackgroundColor
-
-                    "inline_time_bar_colorized_bar_played_color_dark" -> darkThemeSeekbarColor
-                    else -> continue
-                }
-            }
-        }
-
-        // copies the resource file to change the splash screen color
-        context.copyResources(
-            "theme", ResourceUtils.ResourceGroup("values-night-v31", "styles.xml")
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var darkThemeBackgroundColor: String? by option(
-            PatchOption.StringOption(
-                key = "darkThemeBackgroundColor",
-                default = "@android:color/black",
-                title = "Background color for the dark theme",
-                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
-            )
-        )
-
-        var lightThemeBackgroundColor: String? by option(
-            PatchOption.StringOption(
-                key = "lightThemeBackgroundColor",
-                default = "@android:color/white",
-                title = "Background color for the light theme",
-                description = "The background color of the light theme. Can be a hex color or a resource reference.",
-            )
-        )
-
-        var darkThemeSeekbarColor: String? by option(
-            PatchOption.StringOption(
-                key = "darkThemeSeekbarColor",
-                default = "#ffff0000",
-                title = "Dark theme seekbar color",
-                description = "The background color of the seekbar of the dark theme. Leave empty for default color.",
-            )
-        )
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
@@ -0,0 +1,78 @@
+package app.revanced.patches.youtube.layout.theme.resource
+
+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.DependsOn
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.InputType
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.TextPreference
+import app.revanced.patches.youtube.layout.theme.bytecode.patch.ThemeBytecodePatch.Companion.darkThemeBackgroundColor
+import app.revanced.patches.youtube.layout.theme.bytecode.patch.ThemeBytecodePatch.Companion.lightThemeBackgroundColor
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.copyResources
+import org.w3c.dom.Element
+
+@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
+class ThemeResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            TextPreference(
+                "revanced_seekbar_color",
+                StringResource("revanced_seekbar_color_title", "Seekbar color"),
+                InputType.STRING,
+                "#FF0000",
+                StringResource(
+                    "revanced_seekbar_color_summary",
+                    "The color of the seekbar for the dark theme."
+                )
+            ),
+        )
+
+        // Edit theme colors via bytecode.
+        // For that the resource id is used in a bytecode patch to change the color.
+
+        inlineTimeBarColorizedBarPlayedColorDarkId = ResourceMappingPatch.resourceMappings
+            .find { it.name == "inline_time_bar_colorized_bar_played_color_dark" }?.id
+            ?: return PatchResultError("Could not find seekbar resource")
+
+
+        val darkThemeBackgroundColor = darkThemeBackgroundColor!!
+        val lightThemeBackgroundColor = lightThemeBackgroundColor!!
+
+        // Edit theme colors via resources.
+        context.xmlEditor["res/values/colors.xml"].use { editor ->
+            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+
+            for (i in 0 until resourcesNode.childNodes.length) {
+                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
+
+                node.textContent = when (node.getAttribute("name")) {
+                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
+                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850" -> darkThemeBackgroundColor
+
+                    "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
+                    "yt_white2", "yt_white3", "yt_white4",
+                    -> lightThemeBackgroundColor
+
+                    else -> continue
+                }
+            }
+        }
+
+        // Copy the resource file to change the splash screen color.
+        context.copyResources(
+            "theme", ResourceUtils.ResourceGroup("values-night-v31", "styles.xml")
+        )
+
+        return PatchResultSuccess()
+    }
+
+    internal companion object {
+        var inlineTimeBarColorizedBarPlayedColorDarkId = -1L
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
@@ -12,12 +12,9 @@ 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.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.misc.fix.spoof.patch.ClientSpoofPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.annotation.ProtobufSpoofCompatibility
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.OpenCronetDataSourceFingerprint
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.SubtitleWindowSettingsConstructorFingerprint
@@ -27,15 +24,12 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

-@Patch
@Name("spoof-signature-verification")
@Description("Spoofs a patched client to prevent playback issues.")
-@ProtobufSpoofCompatibility
@DependsOn([
    IntegrationsPatch::class,
    SettingsPatch::class,
    PlayerTypeHookPatch::class,
-    ClientSpoofPatch::class,
    VideoIdPatch::class
 ])
@Version("0.0.1")
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt
@@ -93,7 +93,7 @@ class VideoInformationPatch : BytecodePatch(

            with(videoLengthMethodResult.mutableMethod) {
                val videoLengthRegisterIndex = videoLengthMethodResult.scanResult.patternScanResult!!.endIndex - 2
-                val videoLengthRegister = (instruction(videoLengthRegisterIndex) as OneRegisterInstruction).registerA
+                val videoLengthRegister = instruction<OneRegisterInstruction>(videoLengthRegisterIndex).registerA
                val dummyRegisterForLong = videoLengthRegister + 1 // required for long values since they are wide

                addInstruction(
@@ -140,7 +140,7 @@ class VideoInformationPatch : BytecodePatch(
            speedSelectionInsertMethod = mutableMethod
            speedSelectionInsertIndex = scanResult.patternScanResult!!.startIndex - 3
            speedSelectionValueRegister =
-                (mutableMethod.instruction(speedSelectionInsertIndex) as FiveRegisterInstruction).registerD
+                mutableMethod.instruction<FiveRegisterInstruction>(speedSelectionInsertIndex).registerD

            val speedSelectionMethodInstructions = mutableMethod.implementation!!.instructions
            setPlaybackSpeedContainerClassFieldReference =
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
@@ -7,7 +7,9 @@ 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.*
+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.patcher.util.smali.ExternalLabel
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt
@@ -33,7 +33,7 @@ class VideoIdPatch : BytecodePatch(
            result.mutableMethod.also {
                insertMethod = it
            }.apply {
-                videoIdRegister = (instruction(videoIdRegisterInstructionIndex) as OneRegisterInstruction).registerA
+                videoIdRegister = instruction<OneRegisterInstruction>(videoIdRegisterInstructionIndex).registerA
                insertIndex = videoIdRegisterInstructionIndex + 1
            }
        } ?: return VideoIdFingerprint.toErrorResult()
@@ -44,7 +44,7 @@ class VideoIdPatch : BytecodePatch(
            result.mutableMethod.also {
                backgroundPlaybackMethod = it
            }.apply {
-                backgroundPlaybackVideoIdRegister = (instruction(endIndex + 1) as OneRegisterInstruction).registerA
+                backgroundPlaybackVideoIdRegister = instruction<OneRegisterInstruction>(endIndex + 1).registerA
                backgroundPlaybackInsertIndex = endIndex + 2
            }
        } ?: return VideoIdFingerprintBackgroundPlay.toErrorResult()
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
@@ -12,9 +12,9 @@ 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.smali.ExternalLabel
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.zoomhaptics.annotations.ZoomHapticsCompatibility
 import app.revanced.patches.youtube.misc.zoomhaptics.fingerprints.ZoomHapticsFingerprint

--- a/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
@@ -32,7 +32,7 @@ class HideAdsPatch : BytecodePatch(
        ContainsAdFingerprint.result?.let { result ->
            result.mutableMethod.apply {
                val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
-                val adsListRegister = (instruction(insertIndex - 2) as Instruction21c).registerA
+                val adsListRegister = instruction<Instruction21c>(insertIndex - 2).registerA

                listOf(
                    "_buttoned_layout",
--- a/src/main/resources/settings/host/values/strings.xml
+++ b/src/main/resources/settings/host/values/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="revanced_settings_confirm_user_dialog_title">Do you wish to proceed?</string>
+    <string name="revanced_settings_reset">Reset</string>
 </resources>
Author	SHA1	Message	Date
semantic-release-bot	35cd7780d0	chore(release): 2.174.0-dev.7 [skip ci] # [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)) ([`6951e4a`](`6951e4a0e9`))	2023-05-07 16:17:11 +00:00
nik2143	6951e4a0e9	feat(syncforreddit): add `disable-ads` patch (#2066 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-05-07 18:15:30 +02:00
semantic-release-bot	9bfcf99a22	chore(release): 2.174.0-dev.6 [skip ci] # [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)) ([`56d3cf2`](`56d3cf258c`))	2023-05-07 15:28:43 +00:00
johnconner122	56d3cf258c	feat(youtube): `hide-load-more-button` patch (#2078 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-05-07 17:26:58 +02:00
semantic-release-bot	81a5d37bc3	chore(release): 2.174.0-dev.5 [skip ci] # [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)) ([`c50f703`](`c50f703551`))	2023-05-07 14:13:32 +00:00
Tim Schneeberger	c50f703551	fix(spotify/disable-capture-restriction): make compatible with latest versions (#2095 )	2023-05-07 16:11:52 +02:00
oSumAtrIX	85516401be	docs: remove invalid key from example `patches.json` in `README` file	2023-05-07 02:42:40 +02:00
oSumAtrIX	311f5d80fc	docs: add missing header to `README` file	2023-05-07 02:33:38 +02:00
semantic-release-bot	73c86c85c6	chore(release): 2.174.0-dev.4 [skip ci] # [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 ([`9727cfc`](`9727cfc169`)) ### Features * improve structure of `README` ([`751d74f`](`751d74f5c0`))	2023-05-07 00:18:50 +00:00
oSumAtrIX	9727cfc169	fix(youtube/theme): move options out of dependency patch	2023-05-07 02:16:37 +02:00
oSumAtrIX	751d74f5c0	feat: improve structure of `README`	2023-05-07 02:15:28 +02:00
semantic-release-bot	fe72363c52	chore(release): 2.174.0-dev.3 [skip ci] # [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)	2023-05-06 21:25:17 +00:00
oSumAtrIX	d763108110	ci: release when bumping ReVanced Patcher This is required when two projects bump ReVanced Patcher, but one does not release a new version, resulting them to get out of sync. For that reason, commits of type `build` and scope `revanced-patcher` are treated as releasing commits.	2023-05-06 23:22:49 +02:00
oSumAtrIX	0af514d76c	refactor: simplify casting instructions	2023-05-06 23:22:48 +02:00
oSumAtrIX	6a1cc85439	build(revanced-patcher): bump version	2023-05-06 23:22:47 +02:00
semantic-release-bot	6587acb2c5	chore(release): 2.174.0-dev.2 [skip ci] # [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)) ([`00f6343`](`00f63439ac`))	2023-05-03 08:58:36 +00:00
badawoll	00f63439ac	feat(patch): bump compatibility (#2060 )	2023-05-03 10:56:28 +02:00
semantic-release-bot	a783834de7	chore(release): 2.174.0-dev.1 [skip ci] # [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)) ([`a33d04f`](`a33d04fdac`))	2023-05-03 07:52:53 +00:00
LisoUseInAIKyrios	a33d04fdac	feat(youtube/settings): add reset button to edit preference dialog (#2047 )	2023-05-03 11:50:35 +04:00
semantic-release-bot	d281de13ee	chore(release): 2.173.1-dev.1 [skip ci] ## [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)) ([`b006238`](`b006238fff`))	2023-05-03 07:31:40 +00:00
LisoUseInAIKyrios	b006238fff	fix(youtube/sponsorblock): fix skip button in wrong location when full screen and comments visible (#2051 )	2023-05-03 11:29:54 +04:00
semantic-release-bot	a4d0cd6c87	chore(release): 2.173.0 [skip ci] # [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 ([`eb93f14`](`eb93f149df`)) * youtube/theme: change seekbar color via preference ([`f8d5fb8`](`f8d5fb8ac1`)) * youtube/theme: theme seekbar when clicked ([`dc9575e`](`dc9575e52d`)) * youtube: `navigation-buttons` patch ([`3130c6a`](`3130c6ac72`)) * youtube: bump compatibility to `18.16.37` ([`4aedf37`](`4aedf37194`)) * youtube: support version `18.16.37` ([`6c9fe25`](`6c9fe251dd`))	2023-05-02 05:48:51 +00:00
oSumAtrIX	f3bf532dc3	chore: merge branch `dev` to `main` (#2041 )	2023-05-02 07:46:34 +02:00
semantic-release-bot	b680a4d1d3	chore(release): 2.173.0-dev.5 [skip ci] # [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 ([`3130c6a`](`3130c6ac72`))	2023-05-02 05:39:23 +00:00
oSumAtrIX	3130c6ac72	feat(youtube): `navigation-buttons` patch	2023-05-02 07:37:41 +02:00
semantic-release-bot	f0c91102e1	chore(release): 2.173.0-dev.4 [skip ci] # [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 ([`eb93f14`](`eb93f149df`))	2023-05-02 05:00:34 +00:00
oSumAtrIX	eb93f149df	feat(youtube/create-button): switch create with notifications button	2023-05-02 06:58:49 +02:00
semantic-release-bot	24d2f11659	chore(release): 2.173.0-dev.3 [skip ci] # [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 ([`dc9575e`](`dc9575e52d`))	2023-05-02 04:12:17 +00:00
oSumAtrIX	dc9575e52d	feat(youtube/theme): theme seekbar when clicked	2023-05-02 06:09:50 +02:00
semantic-release-bot	a10ff13c74	chore(release): 2.173.0-dev.2 [skip ci] # [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 ([`f8d5fb8`](`f8d5fb8ac1`))	2023-05-02 03:32:37 +00:00
oSumAtrIX	f8d5fb8ac1	feat(youtube/theme): change seekbar color via preference	2023-05-02 05:30:36 +02:00
oSumAtrIX	95edd987f1	feat!(youtube/client-spoof): depend on `spoof-signature-verification` patch This gets rid of compatibility for Vanced YouTube. At the same time the `spoof-signature-verification` patch is now a dependency patch only.	2023-05-02 05:30:36 +02:00