chore(release): 2.73.0 [skip ci]

# [2.73.0](https://github.com/revanced/revanced-patches/compare/v2.72.1...v2.73.0) (2022-09-29) ### Features * `dynamic-color` patch ([#652](https://github.com/revanced/revanced-patches/issues/652)) ([47d4b90](237129d327))
feat: dynamic-color patch (#652 )
2025-12-15 21:52:27 +01:00 · 2022-09-29 20:09:46 +00:00 · 2022-09-29 22:08:00 +02:00 · 2022-09-29 21:42:45 +02:00 · 2022-09-29 17:26:19 +00:00 · 2022-09-29 19:24:32 +02:00
79 changed files with 2141 additions and 573 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,171 @@
+# [2.73.0](https://github.com/revanced/revanced-patches/compare/v2.72.1...v2.73.0) (2022-09-29)
+
+
+### Features
+
+* `dynamic-color` patch ([#652](https://github.com/revanced/revanced-patches/issues/652)) ([a16575b](https://github.com/revanced/revanced-patches/commit/a16575b984354138b9ab175307be8d15de60b6a6))
+
+## [2.72.1](https://github.com/revanced/revanced-patches/compare/v2.72.0...v2.72.1) (2022-09-29)
+
+
+### Bug Fixes
+
+* **hdr-brightness:** trim list of compatible versions ([#602](https://github.com/revanced/revanced-patches/issues/602)) ([3209d90](https://github.com/revanced/revanced-patches/commit/3209d902e4d1aa73b59ce059cf3f76ef2095af70))
+
+# [2.72.0](https://github.com/revanced/revanced-patches/compare/v2.71.2...v2.72.0) (2022-09-29)
+
+
+### Features
+
+* `tiktok-speed` patch ([#668](https://github.com/revanced/revanced-patches/issues/668)) ([23fff16](https://github.com/revanced/revanced-patches/commit/23fff16e6ab02bf281d46d8b5f93788425d8b525))
+* bump YouTube Music patches to v5.25.51 ([#669](https://github.com/revanced/revanced-patches/issues/669)) ([563c846](https://github.com/revanced/revanced-patches/commit/563c8466568d578de7c8a8e869fb1aa74370784a))
+
+## [2.71.2](https://github.com/revanced/revanced-patches/compare/v2.71.1...v2.71.2) (2022-09-28)
+
+
+### Bug Fixes
+
+* **hide-email-address:** invalid instruction offsets ([#654](https://github.com/revanced/revanced-patches/issues/654)) ([1a3db44](https://github.com/revanced/revanced-patches/commit/1a3db44b5bd9628b7b25cc113a3a53bf8a85bd2b))
+
+## [2.71.1](https://github.com/revanced/revanced-patches/compare/v2.71.0...v2.71.1) (2022-09-28)
+
+
+### Bug Fixes
+
+* **disable-auto-player-popup-panels:** swap switch toggle state description ([#653](https://github.com/revanced/revanced-patches/issues/653)) ([f881301](https://github.com/revanced/revanced-patches/commit/f88130143689c7a63fd67df3dff37caec5db9548))
+
+# [2.71.0](https://github.com/revanced/revanced-patches/compare/v2.70.0...v2.71.0) (2022-09-28)
+
+
+### Features
+
+* `hide-email-address` patch ([#578](https://github.com/revanced/revanced-patches/issues/578)) ([82cb632](https://github.com/revanced/revanced-patches/commit/82cb6321beace1e5feed248d3f3d6ae56cf0d96b))
+
+# [2.70.0](https://github.com/revanced/revanced-patches/compare/v2.69.4...v2.70.0) (2022-09-28)
+
+
+### Features
+
+* `monochrome-icon` patch ([#643](https://github.com/revanced/revanced-patches/issues/643)) ([127c8e5](https://github.com/revanced/revanced-patches/commit/127c8e54e54709c2716029044ae337ad53daafad))
+
+## [2.69.4](https://github.com/revanced/revanced-patches/compare/v2.69.3...v2.69.4) (2022-09-27)
+
+
+### Bug Fixes
+
+* **sponsorblock:** dynamically insert `setSponsorBarRect` call ([#644](https://github.com/revanced/revanced-patches/issues/644)) ([998a249](https://github.com/revanced/revanced-patches/commit/998a249a23d09eb752b35c4da731f4223be40a3b))
+
+## [2.69.3](https://github.com/revanced/revanced-patches/compare/v2.69.2...v2.69.3) (2022-09-27)
+
+
+### Bug Fixes
+
+* **sponsorblock:** correct class name for field reference ([#582](https://github.com/revanced/revanced-patches/issues/582)) ([7cd585c](https://github.com/revanced/revanced-patches/commit/7cd585cd78e284a82cee17d09f8049f0a5cdf2e8))
+
+## [2.69.3](https://github.com/revanced/revanced-patches/compare/v2.69.2...v2.69.3) (2022-09-27)
+
+
+### Bug Fixes
+
+* **sponsorblock:** correct class name for field reference ([#582](https://github.com/revanced/revanced-patches/issues/582)) ([7cd585c](https://github.com/revanced/revanced-patches/commit/7cd585cd78e284a82cee17d09f8049f0a5cdf2e8))
+
+## [2.69.2](https://github.com/revanced/revanced-patches/compare/v2.69.1...v2.69.2) (2022-09-26)
+
+
+### Performance Improvements
+
+* **resource-mapping:** map resources with multiple threads ([a7e4da0](https://github.com/revanced/revanced-patches/commit/a7e4da018bf939accdf6d406b471ac74f9078095))
+
+## [2.69.1](https://github.com/revanced/revanced-patches/compare/v2.69.0...v2.69.1) (2022-09-24)
+
+
+### Bug Fixes
+
+* **sponsorblock:** reflect changes to strings ([#585](https://github.com/revanced/revanced-patches/issues/585)) ([d03568a](https://github.com/revanced/revanced-patches/commit/d03568aa39195a07bec62f43d929923825c67d3f))
+
+# [2.69.0](https://github.com/revanced/revanced-patches/compare/v2.68.3...v2.69.0) (2022-09-24)
+
+
+### Features
+
+* `spotify-theme` patch ([#608](https://github.com/revanced/revanced-patches/issues/608)) ([7ee1b78](https://github.com/revanced/revanced-patches/commit/7ee1b78e8048698ef6490445dd012e2d88b4d332))
+
+## [2.68.3](https://github.com/revanced/revanced-patches/compare/v2.68.2...v2.68.3) (2022-09-23)
+
+
+### Bug Fixes
+
+* **seekbar-tapping:** do not disable seekbar when hiding it ([#600](https://github.com/revanced/revanced-patches/issues/600)) ([68a9457](https://github.com/revanced/revanced-patches/commit/68a9457464c786a61b756eb18ca5f1ce05316636))
+
+## [2.68.2](https://github.com/revanced/revanced-patches/compare/v2.68.1...v2.68.2) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-time-and-seekbar:** don't draw the seekbar ([#594](https://github.com/revanced/revanced-patches/issues/594)) ([46e0195](https://github.com/revanced/revanced-patches/commit/46e0195f760dc11ec8d2068ffb57997eccab1aff))
+
+## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23)
+
+
+### Bug Fixes
+
+* **sponsorblock:** resolve unresolved fingerprint ([e7296f3](https://github.com/revanced/revanced-patches/commit/e7296f3424bed78a0149cca9bf6e29243e962150))
+
+# [2.68.0](https://github.com/revanced/revanced-patches/compare/v2.67.1...v2.68.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-navbar:** remove the correct instructions ([#591](https://github.com/revanced/revanced-patches/issues/591)) ([b4b0c97](https://github.com/revanced/revanced-patches/commit/b4b0c972d28cf7591ece04d154d1183c8431cb77))
+
+
+### Features
+
+* **tiktok:** adapt `tiktok-download` with `tiktok-settings`. ([#586](https://github.com/revanced/revanced-patches/issues/586)) ([876b726](https://github.com/revanced/revanced-patches/commit/876b7266109b099597dd19d6ed3fa3dac098b73b))
+
+## [2.67.1](https://github.com/revanced/revanced-patches/compare/v2.67.0...v2.67.1) (2022-09-23)
+
+# [2.67.0](https://github.com/revanced/revanced-patches/compare/v2.66.2...v2.67.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-nav-bar:** invalid import ([#590](https://github.com/revanced/revanced-patches/issues/590)) ([37ad223](https://github.com/revanced/revanced-patches/commit/37ad22360e6ac5e1b1dce474fe6a4e3813e03330))
+
+
+### Features
+
+* `hide-premium-nav-bar` patch ([#589](https://github.com/revanced/revanced-patches/issues/589)) ([1811416](https://github.com/revanced/revanced-patches/commit/18114168d7f8c3dd41d1f124c3524c7ca850d33d))
+
+## [2.66.2](https://github.com/revanced/revanced-patches/compare/v2.66.1...v2.66.2) (2022-09-22)
+
+
+### Bug Fixes
+
+* **custom-playback-speed:** implement own method instead of `takeWhile` ([8522d4c](https://github.com/revanced/revanced-patches/commit/8522d4cd705118bf1108ec88bbed542a0cb15943))
+
+## [2.66.1](https://github.com/revanced/revanced-patches/compare/v2.66.0...v2.66.1) (2022-09-22)
+
+
+### Bug Fixes
+
+* **sponsorblock:** broken fingerprint and invert setting `shorts_playing` ([#579](https://github.com/revanced/revanced-patches/issues/579)) ([59fb674](https://github.com/revanced/revanced-patches/commit/59fb674437207aeabed5b92ba32bda120820fb8f))
+
+# [2.66.0](https://github.com/revanced/revanced-patches/compare/v2.65.0...v2.66.0) (2022-09-22)
+
+
+### Features
+
+* **custom-playback-speed:** max, min, granularity option ([b1e423d](https://github.com/revanced/revanced-patches/commit/b1e423d9cdca51e54c154cc39a24c508ca322f60))
+
+# [2.65.0](https://github.com/revanced/revanced-patches/compare/v2.64.2...v2.65.0) (2022-09-21)
+
+
+### Features
+
+* `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch ([#501](https://github.com/revanced/revanced-patches/issues/501)) ([10e0286](https://github.com/revanced/revanced-patches/commit/10e028626f2b9d9d01279682198daf135bc82c20))
+* **theme:** arbitrary background color for light theme  ([#565](https://github.com/revanced/revanced-patches/issues/565)) ([da40e7e](https://github.com/revanced/revanced-patches/commit/da40e7e0cf266edc89353e62b9821b450f8f0295))
+
 ## [2.64.2](https://github.com/revanced/revanced-patches/compare/v2.64.1...v2.64.2) (2022-09-21)


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

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

-### 📦 `com.twitter.android`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
-</details>
-
 ### 📦 `com.reddit.frontpage`
 <details>

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

-### 📦 `com.garzotto.pflotsh.ecmwf_a`
+### 📦 `com.spotify.music`
 <details>

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

 ### 📦 `de.dwd.warnapp`
@@ -54,14 +30,26 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>

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

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `tiktok-speed` | Enables the playback speed option for all videos. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-force-login` | Do not force login. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
+| `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 </details>

 ### 📦 `com.zhiliaoapp.musically`
@@ -69,9 +57,40 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `tiktok-speed` | Enables the playback speed option for all videos. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-force-login` | Do not force login. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
+| `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
+</details>
+
+### 📦 `com.twitter.android`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `monochrome-icon` | Adds a monochrome icon. | all |
+| `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+</details>
+
+### 📦 `com.google.android.apps.youtube.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.25.51 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.25.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.25.51 |
+| `music-video-ads` | Removes ads in the music player. | 5.25.51 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.25.51 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.25.51 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.25.51 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.25.51 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.25.51 |
+| `background-play` | Enables playing music in the background. | 5.25.51 |
 </details>

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

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

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

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

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

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

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

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

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

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

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MusicMicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MusicMicroGBytecodePatch.kt
@@ -1,37 +1,27 @@
 package app.revanced.patches.music.misc.microg.patch.bytecode

-import app.revanced.extensions.equalsAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
-import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
-import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
-import app.revanced.patches.music.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.fingerprints.*
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants
+import app.revanced.util.microg.MicroGBytecodeHelper

@Patch
@DependsOn([MusicMicroGResourcePatch::class])
@Name("music-microg-support")
@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
@MusicMicroGPatchCompatibility
-@Version("0.0.1")
+@Version("0.0.2")
 class MusicMicroGBytecodePatch : BytecodePatch(
    listOf(
        ServiceCheckFingerprint,
@@ -42,130 +32,34 @@ class MusicMicroGBytecodePatch : BytecodePatch(
        PrimeFingerprint,
    )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
-        disablePlayServiceChecks()
-        data.classes.forEach { classDef ->
-            var proxiedClass: MutableClass? = null
-
-            classDef.methods.forEach methodLoop@{ method ->
-                val implementation = method.implementation ?: return@methodLoop
-
-                var proxiedImplementation: MutableMethodImplementation? = null
-
-                implementation.instructions.forEachIndexed { i, instruction ->
-                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
-
-                    val stringValue = ((instruction as Instruction21c).reference as StringReference).string
-
-                    val replaceMode = if (stringValue.equalsAny(
-                            "com.google.android.gms",
-                            "com.google.android.gms.chimera",
-                            "com.google.android.c2dm.intent.REGISTER",
-                            "com.google.android.c2dm.permission.SEND",
-                            "com.google.iid.TOKEN_REQUEST",
-                            "com.google",
-                            "com.google.android.gms.chimera.GmsIntentOperationService",
-                            "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-                            "com.google.android.gms.phenotype.internal.IPhenotypeService",
-                            "com.google.android.gms.phenotype.service.START",
-                            "com.google.android.gms.phenotype.PACKAGE_NAME",
-                            "com.google.android.gms.phenotype.UPDATE",
-                            "com.google.android.gms.phenotype",
-                            "com.google.android.gms.auth.accounts",
-                            "com.google.android.c2dm.intent.REGISTRATION",
-                            "com.google.android.gsf.action.GET_GLS",
-                            "com.google.android.gsf.login",
-                            "content://com.google.settings/partner",
-                            "content://com.google.android.gms.phenotype/",
-                            "content://com.google.android.gsf.gservices",
-                            "content://com.google.android.gsf.gservices/prefix",
-                            "com.google.android.c2dm.intent.RECEIVE"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_MICROG
-                    } else if (stringValue.equalsAny(
-                            "com.google.android.apps.youtube.music.SuggestionsProvider", "com.google.android.apps.youtube.music.fileprovider"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_REVANCED
-                    } else {
-                        StringReplaceMode.DO_NOT_REPLACE
-                    }
-
-                    if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
-                        if (proxiedClass == null) {
-                            proxiedClass = data.proxy(classDef).resolve()
-                        }
-
-                        if (proxiedImplementation == null) {
-                            proxiedImplementation = proxiedClass!!.methods.first {
-                                it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
-                            }.implementation!!
-                        }
-
-                        val newString = if (replaceMode == StringReplaceMode.REPLACE_WITH_REVANCED) stringValue.replace(
-                            "com.google.android.apps.youtube.music", REVANCED_MUSIC_PACKAGE_NAME
-                        )
-                        else stringValue.replace("com.google", BASE_MICROG_PACKAGE_NAME)
-
-                        proxiedImplementation!!.replaceInstruction(
-                            i, BuilderInstruction21c(
-                                Opcode.CONST_STRING, instruction.registerA, ImmutableStringReference(newString)
-                            )
-                        )
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private fun disablePlayServiceChecks() {
-        listOf(
-            ServiceCheckFingerprint,
-            GooglePlayUtilityFingerprint,
-            CastDynamiteModuleFingerprint,
-            CastDynamiteModuleV2Fingerprint,
-            CastContextFetchFingerprint,
-        ).forEach { fingerprint ->
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
-                        const/4 v0, 0x0
-                        return-object v0
-                        """
-
-                'V' -> "return-void"
-                'I' -> """
-                        const/4 v0, 0x0
-                        return v0
-                        """
-
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
+    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
+    // - "com.google.android.gms.chimera.GmsIntentOperationService",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
+    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
+    // - "com.google.android.gms.phenotype.UPDATE",
+    // - "com.google.android.gms.phenotype",
+    override fun execute(data: BytecodeData) =
+        // apply common microG patch
+        MicroGBytecodeHelper.patchBytecode(
+            data,
+            arrayOf(
+                MicroGBytecodeHelper.packageNameTransform(
+                    Constants.PACKAGE_NAME,
+                    Constants.REVANCED_PACKAGE_NAME
+                )
+            ),
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                PrimeFingerprint,
+                MUSIC_PACKAGE_NAME,
+                REVANCED_MUSIC_PACKAGE_NAME
+            ),
+            listOf(
+                ServiceCheckFingerprint,
+                GooglePlayUtilityFingerprint,
+                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleV2Fingerprint,
+                CastContextFetchFingerprint
            )
-        }
-
-        val primeMethod = PrimeFingerprint.result!!.mutableMethod
-        val implementation = primeMethod.implementation!!
-
-        var register = 2
-        val index = implementation.instructions.indexOfFirst {
-            if (it.opcode != Opcode.CONST_STRING) return@indexOfFirst false
-
-            val instructionString = ((it as Instruction21c).reference as StringReference).string
-            if (instructionString != "com.google.android.apps.youtube.music") return@indexOfFirst false
-
-            register = it.registerA
-            return@indexOfFirst true
-        }
-
-        primeMethod.replaceInstruction(
-            index, "const-string v$register, \"$REVANCED_MUSIC_PACKAGE_NAME\""
-        )
-
-    }
+        ).let { PatchResultSuccess() }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MusicMicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MusicMicroGResourcePatch.kt
@@ -1,44 +1,41 @@
-package app.revanced.patches.music.misc.microg.patch.resource
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
-import app.revanced.patches.music.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-
-@Name("music-microg-resource-patch")
-@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
-class MusicMicroGResourcePatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
-
-        val manifest = data["AndroidManifest.xml"].readText()
-
-        data["AndroidManifest.xml"].writeText(
-            manifest.replace(
-                "package=\"com.google.android.apps.youtube.music", "package=\"$REVANCED_MUSIC_PACKAGE_NAME"
-            ).replace(
-                "android:label=\"@string/app_name", "android:label=\"$REVANCED_MUSIC_APP_NAME"
-            ).replace(
-                "android:label=\"@string/app_launcher_name", "android:label=\"$REVANCED_MUSIC_APP_NAME"
-            ).replace(
-                "android:authorities=\"com.google.android.apps.youtube.music", "android:authorities=\"$REVANCED_MUSIC_PACKAGE_NAME"
-            ).replace(
-                "com.google.android.apps.youtube.music.permission.C2D_MESSAGE", "$REVANCED_MUSIC_PACKAGE_NAME.permission.C2D_MESSAGE"
-            ).replace(
-                "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
-            ).replace(
-                "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
-            )
-        )
-
-        return PatchResultSuccess()
-    }
+package app.revanced.patches.music.misc.microg.patch.resource
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
+import app.revanced.util.microg.MicroGManifestHelper
+import app.revanced.util.microg.MicroGResourceHelper
+
+@Name("music-microg-resource-patch")
+@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
+@MusicMicroGPatchCompatibility
+@Version("0.0.2")
+class MusicMicroGResourcePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        // update manifest
+        MicroGResourceHelper.patchManifest(
+            data,
+            MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_APP_NAME
+        )
+
+        // add metadata to the manifest
+        MicroGManifestHelper.addSpoofingMetadata(
+            data,
+            SPOOFED_PACKAGE_NAME,
+            SPOOFED_PACKAGE_SIGNATURE
+        )
+        return PatchResultSuccess()
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/shared/Constants.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/shared/Constants.kt
@@ -1,7 +1,9 @@
 package app.revanced.patches.music.misc.microg.shared

 object Constants {
-    internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
    internal const val REVANCED_MUSIC_APP_NAME = "YouTube Music ReVanced"
    internal const val REVANCED_MUSIC_PACKAGE_NAME = "app.revanced.android.apps.youtube.music"
+    internal const val MUSIC_PACKAGE_NAME = "com.google.android.apps.youtube.music"
+    internal const val SPOOFED_PACKAGE_NAME = MUSIC_PACKAGE_NAME
+    internal const val SPOOFED_PACKAGE_SIGNATURE = "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"
 }
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.spotify.layout.theme.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.spotify.music")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ThemeCompatibility
--- a/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
@@ -0,0 +1,70 @@
+package app.revanced.patches.spotify.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.impl.ResourceData
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.spotify.layout.theme.annotations.ThemeCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import org.w3c.dom.Element
+
+@Patch
+@DependsOn([FixLocaleConfigErrorPatch::class])
+@Name("spotify-theme")
+@Description("Applies a custom theme.")
+@ThemeCompatibility
+@Version("0.0.1")
+class ThemePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        data.xmlEditor["res/values/colors.xml"].use { editor ->
+            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+
+            for (i in 0 until resourcesNode.childNodes.length) {
+                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
+
+                node.textContent = when (node.getAttribute("name")) {
+                    "gray_7" -> backgroundColor!!
+                    "dark_brightaccent_background_base", "dark_base_text_brightaccent", "green_light" -> accentColor!!
+                    "dark_brightaccent_background_press" -> accentPressedColor!!
+                    else -> continue
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object : OptionsContainer() {
+        var backgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "backgroundColor",
+                default = "@android:color/black",
+                title = "Background color",
+                description = "The background color. Can be a hex color or a resource reference.",
+            )
+        )
+        var accentColor: String? by option(
+            PatchOption.StringOption(
+                key = "accentColor",
+                default = "#ff1ed760",
+                title = "Accent color",
+                description = "The accent color ('spotify green' by default). Can be a hex color or a resource reference.",
+            )
+        )
+        var accentPressedColor: String? by option(
+            PatchOption.StringOption(
+                key = "accentPressedColor",
+                default = "#ff169c46",
+                title = "Pressed accent for the dark theme",
+                description = "The color when accented buttons are pressed, by default slightly darker than accent. Can be a hex color or a resource reference.",
+            )
+        )
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.spotify.premium_navbar_tab.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.spotify.music")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumNavbarTabCompatibility
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("premium-navbar-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabFingerprint : MethodFingerprint(
+    parameters = listOf("L", "L", "L", "L", "L", "L")
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("add-premium-navbar-tab-parent-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
+     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
@@ -0,0 +1,62 @@
+package app.revanced.patches.spotify.premium_navbar_tab.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Patch
+@Name("hide-premium-navbar")
+@Description("Removes the premium tab from the navbar.")
+@PremiumNavbarTabCompatibility
+@Version("0.0.1")
+@DependsOn([ResourceMappingResourcePatch::class])
+class PremiumNavbarTabPatch : BytecodePatch(
+    listOf(
+        AddPremiumNavbarTabParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
+        AddPremiumNavbarTabFingerprint.resolve(data, parentResult.classDef)
+
+        val result = AddPremiumNavbarTabFingerprint.result!!
+
+        val method = result.mutableMethod
+        val methodInstructions = method.implementation!!.instructions
+        val lastInstructionIdx = methodInstructions.size - 1
+
+        val premiumTabId = ResourceMappingResourcePatch.resourceMappings.single{it.type == "id" && it.name == "premium_tab"}.id
+
+        var removeAmount = 2
+        // 2nd const remove method
+        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
+            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
+            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
+
+            val findThreshold = 10
+            val constIndex = lastInstructionIdx - i
+            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
+                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
+            }
+            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
+
+            if (--removeAmount == 0) break
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.feedfilter.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FeedFilterCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.tiktok.feedfilter.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("feed-api-service-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/feed/FeedApiService;",
+    "LIZ",
+)
+@FeedFilterCompatibility
+@Version("0.0.1")
+object FeedApiServiceLIZFingerprint : MethodFingerprint(
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/FeedApiService;") && methodDef.name == "LIZ"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/TiktokFeedFilter.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/TiktokFeedFilter.kt
@@ -0,0 +1,51 @@
+package app.revanced.patches.tiktok.feedfilter.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
+import app.revanced.patches.tiktok.feedfilter.fingerprints.FeedApiServiceLIZFingerprint
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+import app.revanced.patches.tiktok.misc.settings.patch.TikTokSettingsPatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([TikTokIntegrationsPatch::class, TikTokSettingsPatch::class])
+@Name("tiktok-feed-filter")
+@Description("Filters tiktok videos: removing ads, removing livestreams.")
+@FeedFilterCompatibility
+@Version("0.0.1")
+class TiktokFeedFilter : BytecodePatch(
+    listOf(
+        FeedApiServiceLIZFingerprint,
+        SettingsStatusLoadFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = FeedApiServiceLIZFingerprint.result!!.mutableMethod
+        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.RETURN_OBJECT) continue
+            val feedItemsRegister = (instruction as OneRegisterInstruction).registerA
+            method.addInstruction(
+                index,
+                "invoke-static {v$feedItemsRegister}, Lapp/revanced/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
+            )
+            break
+        }
+        val method2 = SettingsStatusLoadFingerprint.result!!.mutableMethod
+        method2.addInstruction(
+            0,
+            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -5,9 +5,13 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -16,6 +20,7 @@ import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonS
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -31,7 +36,8 @@ class DownloadsPatch : BytecodePatch(
        ACLCommonShareFingerprint,
        ACLCommonShareFingerprint2,
        ACLCommonShareFingerprint3,
-        DownloadPathParentFingerprint
+        DownloadPathParentFingerprint,
+        SettingsStatusLoadFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
@@ -53,11 +59,16 @@ class DownloadsPatch : BytecodePatch(
        )
        //Download videos without watermark.
        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
-        method3.replaceInstructions(
+        method3.addInstructions(
            0,
            """
+                invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->shouldRemoveWatermark()Z
+                move-result v0
+                if-eqz v0, :noremovewatermark
                const/4 v0, 0x1
                return v0
+                :noremovewatermark
+                nop
            """
        )
        //Change the download path patch
@@ -77,7 +88,6 @@ class DownloadsPatch : BytecodePatch(
        }
        if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
        //Change videos' download path.
-        val downloadPath = "$downloadPathParent/$downloadPathChild"
        val downloadUriMethod = data
            .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
            .nextMethod(targetOffset, true)
@@ -85,10 +95,11 @@ class DownloadsPatch : BytecodePatch(
        downloadUriMethod.implementation!!.instructions.forEachIndexed { index, instruction ->
            if (instruction.opcode == Opcode.SGET_OBJECT) {
                val overrideRegister = (instruction as OneRegisterInstruction).registerA
-                downloadUriMethod.replaceInstruction(
-                    index,
+                downloadUriMethod.addInstructions(
+                    index + 1,
                    """
-                        const-string v$overrideRegister, "$downloadPath"
+                        invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
+                        move-result-object v$overrideRegister
                    """
                )
            }
@@ -106,30 +117,11 @@ class DownloadsPatch : BytecodePatch(
                }
            }
        }
+        val method5 = SettingsStatusLoadFingerprint.result!!.mutableMethod
+        method5.addInstruction(
+            0,
+            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableDownload()V"
+        )
        return PatchResultSuccess()
    }
-
-    companion object : OptionsContainer() {
-        private var downloadPathParent: String? by option(
-            PatchOption.StringListOption(
-                key = "mediaFolder",
-                default = "DCIM",
-                options = listOf(
-                    "DCIM", "Movies", "Pictures"
-                ),
-                title = "Media folder",
-                description = "The media root folder to download to.",
-                required = true
-            )
-        )
-        private var downloadPathChild: String? by option(
-            PatchOption.StringOption(
-                key = "downloadPath",
-                default = "TikTok",
-                title = "Download path",
-                description = "Download path relative to the media folder.",
-                required = true
-            )
-        )
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/annotations/SpeedCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/annotations/SpeedCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.speed.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SpeedCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.tiktok.interaction.speed.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.speed.annotations.SpeedCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("speed-control-parent-fingerprint")
+@MatchingMethod("LX/4cP;", "LJIILL")
+@SpeedCompatibility
+@Version("0.0.1")
+object SpeedControlParentFingerprint : MethodFingerprint(
+    returnType = "L",
+    access = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    parameters = listOf(
+        "L"
+    ),
+    strings = listOf(
+        "playback_speed"
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/SpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/SpeedPatch.kt
@@ -0,0 +1,48 @@
+package app.revanced.patches.tiktok.interaction.speed.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.tiktok.interaction.speed.annotations.SpeedCompatibility
+import app.revanced.patches.tiktok.interaction.speed.fingerprints.SpeedControlParentFingerprint
+import org.jf.dexlib2.Opcode
+
+@Patch
+@Name("tiktok-speed")
+@Description("Enables the playback speed option for all videos.")
+@SpeedCompatibility
+@Version("0.0.1")
+class SpeedPatch : BytecodePatch(
+    listOf(
+        SpeedControlParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val parentMethod = SpeedControlParentFingerprint.result!!.mutableMethod
+        val parentMethodInstructions = parentMethod.implementation!!.instructions
+        for ((index, instruction) in parentMethodInstructions.withIndex()) {
+            if (instruction.opcode != Opcode.INVOKE_VIRTUAL) continue
+            val isSpeedEnableMethod = data
+                .toMethodWalker(parentMethod)
+                .nextMethod(index, true)
+                .getMethod() as MutableMethod
+            isSpeedEnableMethod.addInstructions(
+                0,
+                """
+                    const/4 v0, 0x1
+                    return v0
+                """
+            )
+            break
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/annotations/DisableForceLoginCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/annotations/DisableForceLoginCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.forcelogin.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DisableForceLoginCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+
+@Name("mandatory-login-service-fingerprint")
+@MatchingMethod("/MandatoryLoginService;", "enableForcedLogin")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+object MandatoryLoginServiceFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
+                methodDef.name == "enableForcedLogin"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint2.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint2.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+
+@Name("mandatory-login-service-fingerprint2")
+@MatchingMethod("/MandatoryLoginService;", "shouldShowForcedLogin")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+object MandatoryLoginServiceFingerprint2 : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
+                methodDef.name == "shouldShowForcedLogin"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/patch/DisableForceLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/patch/DisableForceLoginPatch.kt
@@ -0,0 +1,43 @@
+package app.revanced.patches.tiktok.misc.forcelogin.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint2
+
+@Patch
+@Name("tiktok-force-login")
+@Description("Do not force login.")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+class DisableForceLoginPatch : BytecodePatch(
+    listOf(
+        MandatoryLoginServiceFingerprint,
+        MandatoryLoginServiceFingerprint2
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        listOf(
+            MandatoryLoginServiceFingerprint,
+            MandatoryLoginServiceFingerprint2
+        ).forEach { fingerprint ->
+            val method = fingerprint.result!!.mutableMethod
+            method.addInstructions(
+                0,
+                """
+                const/4 v0, 0x0
+                return v0
+            """
+            )
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/TikTokIntegrationsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/TikTokIntegrationsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.integrations.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TikTokIntegrationsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.misc.integrations.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+
+@Name("init-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/app/host/AwemeHostApplication;", "onCreate"
+)
+@TikTokIntegrationsCompatibility
+@Version("0.0.1")
+object InitFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
@@ -0,0 +1,38 @@
+package app.revanced.patches.tiktok.misc.integrations.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
+
+@Name("tiktok-integrations")
+@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
+@TikTokIntegrationsCompatibility
+@Version("0.0.1")
+class TikTokIntegrationsPatch : BytecodePatch(
+    listOf(
+        InitFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        if (data.findClass("Lapp/revanced/tiktok/utils/ReVancedUtils") == null)
+            return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
+        val result = InitFingerprint.result!!
+
+        val method = result.mutableMethod
+        val implementation = method.implementation!!
+        val count = implementation.registerCount - 1
+
+        method.addInstruction(
+            0, "sput-object v$count, Lapp/revanced/tiktok/utils/ReVancedUtils;->context:Landroid/content/Context;"
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/annotations/TikTokSettingsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/annotations/TikTokSettingsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.settings.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TikTokSettingsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("ad-personalization-activity-fingerprint")
+@MatchingMethod(
+    "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;",
+    "onCreate"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object AdPersonalizationActivityFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AdPersonalizationActivity;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("copyright-settings-string-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/setting/ui/SettingNewVersionFragment;",
+    "onViewCreated"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object CopyRightSettingsStringFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/SettingNewVersionFragment;") &&
+                methodDef.name == "onViewCreated"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("settings-status-load-fingerprint")
+@MatchingMethod(
+    "Lapp/revanced/tiktok/settingsmenu/SettingsStatus;",
+    "load"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object SettingsStatusLoadFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("Lapp/revanced/tiktok/settingsmenu/SettingsStatus;") &&
+                methodDef.name == "load"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
@@ -0,0 +1,98 @@
+package app.revanced.patches.tiktok.misc.settings.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.CopyRightSettingsStringFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
+
+@Patch
+@DependsOn([TikTokIntegrationsPatch::class])
+@Name("tiktok-settings")
+@Description("Add settings menu to TikTok.")
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+class TikTokSettingsPatch : BytecodePatch(
+    listOf(
+        AdPersonalizationActivityFingerprint,
+        CopyRightSettingsStringFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        //Replace string `Copyright Policy` to 'Revanced Settings` in TikTok settings.
+        val method1 = CopyRightSettingsStringFingerprint.result!!.mutableMethod
+        val implementation1 = method1.implementation!!
+        for ((index, instruction) in implementation1.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.CONST_STRING) continue
+            val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+            if (string != "copyright_policy") continue
+            var targetIndex = index
+            while (targetIndex >= 0) {
+                targetIndex--
+                val invokeInstruction = implementation1.instructions[targetIndex]
+                if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) continue
+                val methodName = ((invokeInstruction as Instruction35c).reference as MethodReference).name
+                if (methodName != "getString") continue
+                val resultInstruction = implementation1.instructions[targetIndex + 1]
+                if (resultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT) continue
+                val overrideRegister = (resultInstruction as OneRegisterInstruction).registerA
+                method1.replaceInstruction(
+                    targetIndex + 1,
+                    """
+                        const-string v$overrideRegister, "Revanced Settings"
+                    """
+                )
+                break
+            }
+            //Change onClick to start settings activity.
+            val clickInstruction = implementation1.instructions[index - 1]
+            if (clickInstruction.opcode != Opcode.INVOKE_DIRECT)
+                return PatchResultError("Can not find click listener.")
+            val clickClass = ((clickInstruction as ReferenceInstruction).reference as MethodReference).definingClass
+            val mutableClickClass = data.findClass(clickClass)!!.resolve()
+            val mutableOnClickMethod = mutableClickClass.methods.first {
+                it.name == "onClick"
+            }
+            mutableOnClickMethod.addInstructions(
+                0,
+                """
+                    invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
+                    return-void
+                """
+            )
+            break
+        }
+        //Implement revanced settings screen in `AdPersonalizationActivity`
+        val method2 = AdPersonalizationActivityFingerprint.result!!.mutableMethod
+        for ((index, instruction) in method2.implementation!!.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.INVOKE_SUPER) continue
+            val thisRegister = (instruction as Instruction35c).registerC
+            method2.addInstructions(
+                index + 1,
+                """
+                    invoke-static {v$thisRegister}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->initializeSettings(Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;)V
+                    return-void
+                """
+            )
+            break
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.twitter.misc.dynamiccolor.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.twitter.android")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DynamicColorCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
@@ -0,0 +1,89 @@
+package app.revanced.patches.twitter.misc.dynamiccolor.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.twitter.misc.dynamiccolor.annotations.DynamicColorCompatibility
+import java.nio.file.Files
+
+@Patch
+@Name("dynamic-color")
+@Description("Replaces the default Twitter Blue with the users Material You palette.")
+@DynamicColorCompatibility
+@Version("0.0.1")
+class DynamicColorPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data["res"]
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val valuesV31Directory = resDirectory.resolve("values-v31")
+        if (!valuesV31Directory.isDirectory) Files.createDirectories(valuesV31Directory.toPath())
+
+        val valuesNightV31Directory = resDirectory.resolve("values-night-v31")
+        if (!valuesNightV31Directory.isDirectory) Files.createDirectories(valuesNightV31Directory.toPath())
+
+        listOf(valuesV31Directory, valuesNightV31Directory).forEach {
+            val colorsXml = it.resolve("colors.xml")
+
+            if(!colorsXml.exists()) {
+                Files.writeString(
+                    colorsXml.toPath(),
+                    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                            "<resources>\n" +
+                            "</resources>"
+                )
+            }
+        }
+
+        data.xmlEditor["res/values-v31/colors.xml"].use { editor ->
+            val document = editor.file
+
+            mapOf(
+                "ps__twitter_blue" to "@color/twitter_blue",
+                "ps__twitter_blue_pressed" to "@color/twitter_blue_fill_pressed",
+                "twitter_blue" to "@android:color/system_accent1_400",
+                "twitter_blue_fill_pressed" to "@android:color/system_accent1_300",
+                "twitter_blue_opacity_30" to "@android:color/system_accent1_100",
+                "twitter_blue_opacity_50" to "@android:color/system_accent1_200",
+                "twitter_blue_opacity_58" to "@android:color/system_accent1_300",
+                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200",
+                "ic_launcher_background" to "#1DA1F2"
+            ).forEach { (k, v) ->
+                val colorElement = document.createElement("color")
+
+                colorElement.setAttribute("name", k)
+                colorElement.textContent = v
+
+                document.getElementsByTagName("resources").item(0).appendChild(colorElement)
+            }
+        }
+
+        data.xmlEditor["res/values-night-v31/colors.xml"].use { editor ->
+            val document = editor.file
+
+            mapOf(
+                "twitter_blue" to "@android:color/system_accent1_200",
+                "twitter_blue_fill_pressed" to "@android:color/system_accent1_300",
+                "twitter_blue_opacity_30" to "@android:color/system_accent1_50",
+                "twitter_blue_opacity_50" to "@android:color/system_accent1_100",
+                "twitter_blue_opacity_58" to "@android:color/system_accent1_200",
+                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200"
+            ).forEach { (k, v) ->
+                val colorElement = document.createElement("color")
+
+                colorElement.setAttribute("name", k)
+                colorElement.textContent = v
+
+                document.getElementsByTagName("resources").item(0).appendChild(colorElement)
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.twitter.misc.monochrome.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.twitter.android")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class MonochromeIconCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt
@@ -0,0 +1,53 @@
+package app.revanced.patches.twitter.misc.monochrome.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.DomFileEditor
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.twitter.misc.monochrome.annotations.MonochromeIconCompatibility
+import java.nio.file.Files
+
+@Patch
+@Name("monochrome-icon")
+@Description("Adds a monochrome icon.")
+@MonochromeIconCompatibility
+@Version("0.0.1")
+class MonochromeIconPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data["res"]
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val mipmapV33Directory = resDirectory.resolve("mipmap-anydpi-v33")
+        if (!mipmapV33Directory.isDirectory) Files.createDirectories(mipmapV33Directory.toPath())
+
+        Files.writeString(
+            mipmapV33Directory.resolve("ic_launcher_twitter.xml").toPath(),
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+            "<adaptive-icon\n" +
+            "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+            "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+            "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+            "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+            "</adaptive-icon>"
+        )
+
+        Files.writeString(
+            mipmapV33Directory.resolve("ic_launcher_twitter_round.xml").toPath(),
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+            "<adaptive-icon\n" +
+            "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+            "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+            "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+            "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+            "</adaptive-icon>"
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
@@ -22,7 +22,7 @@ import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensi
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
 import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
@@ -41,7 +41,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference

@Patch
-@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([ResourceMappingResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
@Name("general-ads")
@Description("Removes general ads.")
@GeneralAdsCompatibility
@@ -61,7 +61,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
        "promoted_video_item_land",
        "promoted_video_item_full_bleed",
    ).map { name ->
-        ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.name == name }.id
+        ResourceMappingResourcePatch.resourceMappings.single { it.name == name }.id
    }

    private val stringReferences = arrayOf(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu
 import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutoNavInformerFingerprint
 import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.iface.reference.MethodReference

@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
@Name("hide-autoplay-button")
@Description("Hides the autoplay button in the video player.")
@AutoplayButtonCompatibility
@@ -53,7 +53,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions

        // resolve the offsets such as ...
-        val autoNavPreviewStubId = ResourceIdMappingProviderResourcePatch.resourceMappings.single {
+        val autoNavPreviewStubId = ResourceMappingResourcePatch.resourceMappings.single {
            it.name == "autonav_preview_stub"
        }.id
        // where to insert the branch instructions and ...
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/InlineTimeBarWrapperFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/InlineTimeBarWrapperFingerprint.kt
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("inline-time-bar-wrapper-fingerprint")
-@MatchingMethod("Lcom/google/android/apps/youtube/app/common/player/overlay/InlineTimeBarWrapper;", "onLayout")
-@FuzzyPatternScanMethod(3)
-@HideTimeAndSeekbarCompatibility
-@Version("0.0.1")
-object InlineTimeBarWrapperFingerprint : MethodFingerprint(
-    "V", AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("Z", "I", "I", "I", "I"), listOf(
-        Opcode.SUB_INT_2ADDR,
-        Opcode.SUB_INT,
-        Opcode.IF_EQZ,
-        Opcode.IF_NEZ,
-        Opcode.GOTO_16,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.SUB_INT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IGET_OBJECT,
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/TimeCounterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/TimeCounterFingerprint.kt
@@ -11,16 +11,22 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

@Name("time-counter-fingerprint")
-@MatchingMethod("Lfez", "a")
+@MatchingMethod("Lfga", "pk")
@FuzzyPatternScanMethod(3)
@HideTimeAndSeekbarCompatibility
@Version("0.0.1")
 object TimeCounterFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("J"), listOf(
-        Opcode.SGET_OBJECT,
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_WIDE,
        Opcode.CONST_WIDE_16,
-        Opcode.ADD_LONG_2ADDR,
+        Opcode.CMP_LONG,
+        Opcode.IF_LEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_EQZ,
        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_WIDE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.GOTO,
    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt
@@ -10,9 +10,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.patch.impl.BytecodePatch
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.InlineTimeBarWrapperFingerprint
 import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
 import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.CreateVideoPlayerSeekbarFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -26,7 +26,7 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit
@Version("0.0.1")
 class HideTimeAndSeekbarPatch : BytecodePatch(
    listOf(
-        InlineTimeBarWrapperFingerprint, TimeCounterFingerprint
+        CreateVideoPlayerSeekbarFingerprint, TimeCounterFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
@@ -40,10 +40,11 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
            )
        )

-        val inlineTimeBarWrapperMethod = InlineTimeBarWrapperFingerprint.result!!.mutableMethod
+        val createVideoPlayerSeekbarMethod = CreateVideoPlayerSeekbarFingerprint.result!!.mutableMethod

-        inlineTimeBarWrapperMethod.addInstructions(
+        createVideoPlayerSeekbarMethod.addInstructions(
            0, """
+            const/4 v0, 0x0
            invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
            move-result v0
            if-eqz v0, :hide_time_and_seekbar
@@ -60,8 +61,7 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
            invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
            move-result v0
            if-eqz v0, :hide_time_and_seekbar
-            const-string v0, ""
-            return-object v0
+            return-void
            :hide_time_and_seekbar
            nop
        """
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/annotations/HideEmailAddressCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/annotations/HideEmailAddressCompatibility.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.personalinformation.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideEmailAddressCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt
@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.layout.personalinformation.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("account-switcher-accessibility-label-fingerprint")
+@MatchingMethod("Lqvs;", "mH")
+@FuzzyPatternScanMethod(3)
+@HideEmailAddressCompatibility
+@Version("0.0.1")
+object AccountSwitcherAccessibilityLabelFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
+    listOf("L", "L"),
+    listOf(
+        Opcode.CHECK_CAST,
+        Opcode.IGET_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_DIRECT,
+        Opcode.CONST_4,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.IGET,
+        Opcode.CONST_4,
+        Opcode.ADD_INT_2ADDR,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/patch/HideEmailAddressPatch.kt
@@ -0,0 +1,76 @@
+package app.revanced.patches.youtube.layout.personalinformation.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
+import app.revanced.patches.youtube.layout.personalinformation.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Name("hide-email-address")
+@Description("Hides the email address in the account switcher.")
+@HideEmailAddressCompatibility
+@Version("0.0.1")
+class HideEmailAddressPatch : BytecodePatch(
+    listOf(
+        AccountSwitcherAccessibilityLabelFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_email_address",
+                StringResource("revanced_hide_email_address_title", "Hide the email address"),
+                false,
+                StringResource("revanced_hide_email_address_summary_on", "Email address is hidden"),
+                StringResource("revanced_hide_email_address_summary_off", "Email address is visible")
+            )
+        )
+
+        val accountSwitcherAccessibilityLabelId =
+            ResourceMappingResourcePatch.resourceMappings.single {
+                it.type == "string" && it.name == "account_switcher_accessibility_label"
+            }.id
+
+        val accountSwitcherAccessibilityLabelMethod = AccountSwitcherAccessibilityLabelFingerprint.result!!.mutableMethod
+        val accountSwitcherAccessibilityLabelInstruction = accountSwitcherAccessibilityLabelMethod.implementation!!.instructions
+
+        val setVisibilityConstIndex = accountSwitcherAccessibilityLabelInstruction.indexOfFirst {
+            (it as? WideLiteralInstruction)?.wideLiteral == accountSwitcherAccessibilityLabelId
+        } - 1
+
+        val setVisibilityConstRegister = (accountSwitcherAccessibilityLabelInstruction[setVisibilityConstIndex] as OneRegisterInstruction).registerA
+        val toggleRegister = (setVisibilityConstRegister + 1)
+
+        accountSwitcherAccessibilityLabelMethod.addInstructions(
+            setVisibilityConstIndex + 1, """
+            invoke-static {}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress()Z
+            move-result v$toggleRegister
+            if-eqz v$toggleRegister, :hide
+            const/16 v$setVisibilityConstRegister, 0x8
+            :hide
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -18,13 +18,13 @@ import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.Cre
 import app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints.PivotBarCreateButtonViewFingerprint
 import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference

@Patch
-@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, ResourceMappingResourcePatch::class, SettingsPatch::class])
@Name("hide-create-button")
@Description("Hides the create button in the navigation bar.")
@CreateButtonCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/patch/PlayerPopupPanelsPatch.kt
@@ -34,8 +34,8 @@ class PlayerPopupPanelsPatch : BytecodePatch(
                "revanced_player_popup_panels_enabled",
                StringResource("revanced_player_popup_panels_title", "Disable player popup panels"),
                false,
-                StringResource("revanced_player_popup_panels_summary_on", "Player popup panels are enabled"),
-                StringResource("revanced_player_popup_panels_summary_off", "Player popup panels are disabled")
+                StringResource("revanced_player_popup_panels_summary_on", "Player popup panels are disabled"),
+                StringResource("revanced_player_popup_panels_summary_off", "Player popup panels are enabled")
            )
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
@@ -7,8 +7,10 @@ import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

@Name("shorts-player-constructor-fingerprint")
@MatchingMethod("Lhgp;", "<init>")
@@ -33,6 +35,13 @@ object ShortsPlayerConstructorFingerprint : MethodFingerprint(
        Opcode.IPUT_OBJECT,
        Opcode.NEW_INSTANCE,
        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT
-    )
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_4
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            (instruction as? WideLiteralInstruction)?.wideLiteral == SponsorBlockResourcePatch.reelButtonGroupResourceId
+        } == true
+    }
 )
--- 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
@@ -22,7 +22,7 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
@@ -40,7 +40,7 @@ import org.jf.dexlib2.util.MethodUtil

@Patch
@DependsOn(
-    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
+    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
 )
@Name("sponsorblock")
@Description("Integrate SponsorBlock.")
@@ -55,7 +55,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        AppendTimeFingerprint,
        PlayerInitFingerprint,
        PlayerOverlaysLayoutInitFingerprint,
-        ShortsPlayerConstructorFingerprint
+        ShortsPlayerConstructorFingerprint,
+        StartVideoInformerFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {/*
@@ -98,10 +99,14 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        /*
         Get the instance of the seekbar rectangle
         */
-        seekbarMethod.addInstruction(
-            1,
-            "invoke-static {v0}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarRect(Ljava/lang/Object;)V"
-        )
+        for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
+            if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
+            seekbarMethod.addInstruction(
+                index + 1,
+                "invoke-static {v0}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarRect(Ljava/lang/Object;)V"
+            )
+            break
+        }

        for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
            if (instruction.opcode != Opcode.INVOKE_STATIC) continue
@@ -177,9 +182,9 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        val controlsMethodResult = PlayerControlsBytecodePatch.showPlayerControlsFingerprintResult

        val controlsLayoutStubResourceId =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "controls_layout_stub" }.id
+            ResourceMappingResourcePatch.resourceMappings.single { it.type == "id" && it.name == "controls_layout_stub" }.id
        val zoomOverlayResourceId =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "video_zoom_overlay_stub" }.id
+            ResourceMappingResourcePatch.resourceMappings.single { it.type == "id" && it.name == "video_zoom_overlay_stub" }.id

        methods@ for (method in controlsMethodResult.mutableClass.methods) {
            val instructions = method.implementation?.instructions!!
@@ -329,8 +334,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
        startVideoInformerMethod.addInstructions(
            0, """
-            const/4 v0, 0x1
-            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
+            const/4 v0, 0x0
+            sput-boolean v0, Lapp/revanced/integrations/sponsorblock/PlayerController;->shorts_playing:Z
        """
        )

@@ -338,8 +343,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(

        shortsPlayerConstructorMethod.addInstructions(
            0, """
-            const/4 v0, 0x0
-            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
+            const/4 v0, 0x1
+            sput-boolean v0, Lapp/revanced/integrations/sponsorblock/PlayerController;->shorts_playing:Z
        """
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -19,9 +20,13 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode

@Name("sponsorblock-resource-patch")
@SponsorBlockCompatibility
-@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
+@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
@Version("0.0.1")
 class SponsorBlockResourcePatch : ResourcePatch() {
+    companion object {
+        internal var reelButtonGroupResourceId: Long = 0
+    }
+
    override fun execute(data: ResourceData): PatchResult {
        val youtubePackage = "com.google.android.youtube"
        SettingsPatch.addPreference(
@@ -102,6 +107,10 @@ class SponsorBlockResourcePatch : ResourcePatch() {
            }
        }.close() // close afterwards

+        reelButtonGroupResourceId = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "id" && it.name == "reel_persistent_edu_button_group"
+        }.id
+
        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
@@ -23,7 +23,8 @@ import org.w3c.dom.Element
@Version("0.0.1")
 class ThemePatch : ResourcePatch() {
    override fun execute(data: ResourceData): PatchResult {
-        val backgroundColor = backgroundColor!!
+        val darkThemeBackgroundColor = darkThemeBackgroundColor!!
+        val lightThemeBackgroundColor = lightThemeBackgroundColor!!

        data.xmlEditor["res/values/colors.xml"].use { editor ->
            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
@@ -33,7 +34,11 @@ class ThemePatch : ResourcePatch() {

                node.textContent = when (node.getAttribute("name")) {
                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
-                    "yt_status_bar_background_dark" -> backgroundColor
+                    "yt_status_bar_background_dark" -> darkThemeBackgroundColor
+
+                    "yt_white1", "yt_white1_opacity95", "yt_white2", "yt_white3", 
+                    "yt_white4" -> lightThemeBackgroundColor
+
                    else -> continue
                }
            }
@@ -43,7 +48,7 @@ class ThemePatch : ResourcePatch() {
    }

    companion object : OptionsContainer() {
-        var backgroundColor: String? by option(
+        var darkThemeBackgroundColor: String? by option(
            PatchOption.StringOption(
                key = "darkThemeBackgroundColor",
                default = "@android:color/black",
@@ -51,5 +56,14 @@ class ThemePatch : ResourcePatch() {
                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/misc/customplaybackspeed/fingerprints/VideoSpeedPatchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/VideoSpeedPatchFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("video-speed-patch-fingerprint")
+@MatchingMethod(
+    "Lapp/revanced/integrations/patches/VideoSpeedPatch;", "<init>"
+)
+@CustomPlaybackSpeedCompatibility
+@Version("0.0.1")
+object VideoSpeedPatchFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.FILL_ARRAY_DATA),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("VideoSpeedPatch;") && methodDef.name == "<clinit>"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt
@@ -6,37 +6,44 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedArrayGeneratorFingerprint
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.VideoSpeedPatchFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import org.jf.dexlib2.builder.instruction.BuilderArrayPayload
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
+import java.util.stream.DoubleStream
+import kotlin.math.roundToInt

@Patch
@Name("custom-playback-speed")
@Description("Adds more video playback speed options.")
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, ResourceMappingResourcePatch::class])
@CustomPlaybackSpeedCompatibility
@Version("0.0.1")
 class CustomPlaybackSpeedPatch : BytecodePatch(
    listOf(
-        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint
+        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint, VideoSpeedPatchFingerprint
    )
 ) {

    override fun execute(data: BytecodeData): PatchResult {
        //TODO: include setting to skip remembering the new speed

+        val speedLimitMin = minVideoSpeed!!.toFloat()
+        val speedLimitMax = maxVideoSpeed!!.toFloat().coerceAtLeast(speedLimitMin)
+        val speedsGranularity = videoSpeedsGranularity!!.toFloat()
+
        val arrayGenMethod = SpeedArrayGeneratorFingerprint.result?.mutableMethod!!
        val arrayGenMethodImpl = arrayGenMethod.implementation!!

@@ -82,12 +89,9 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
            "sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType"
        )

-        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!;
+        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!
        val limiterMethodImpl = limiterMethod.implementation!!

-        val speedLimitMin = 0.25f
-        val speedLimitMax = 100f
-
        val (limiterMinConstIndex, limiterMinConst) = limiterMethodImpl.instructions.withIndex()
            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 0.25f.toRawBits() }
        val (limiterMaxConstIndex, limiterMaxConst) = limiterMethodImpl.instructions.withIndex()
@@ -107,6 +111,89 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
            "const/high16 v$limiterMaxConstDestination, ${hexFloat(speedLimitMax)}"
        )

+        val constructorResult = VideoSpeedPatchFingerprint.result!!
+        val constructor = constructorResult.mutableMethod
+        val implementation = constructor.implementation!!
+
+        val stepsGranularity = 8F
+        val step = speedLimitMax
+            .minus(speedLimitMin) // calculate the range of the speeds
+            .div(speedsGranularity)
+            .times(stepsGranularity)
+            .roundToInt()
+            .div(stepsGranularity)// round to nearest multiple of stepsGranularity
+            .coerceAtLeast(1 / stepsGranularity) // ensure steps are at least 1/8th of the step granularity
+
+        val videoSpeedsArray = buildList<Number> {
+            DoubleStream
+                .iterate(speedLimitMin.toDouble()) { it + step } // create a stream of speeds
+                .let { speedStream ->
+                    for (speed in speedStream) {
+                        if (speed > speedLimitMax) break
+                        add(speed.toFloat().toRawBits())
+                    }
+                }
+        }
+
+        // adjust the new array of speeds size
+        constructor.replaceInstruction(
+            0,
+            "const/16 v0, ${videoSpeedsArray.size}"
+        )
+
+        // create the payload with the new speeds
+        val arrayPayloadIndex = implementation.instructions.size - 1
+        implementation.replaceInstruction(
+            arrayPayloadIndex,
+            BuilderArrayPayload(
+                4,
+                videoSpeedsArray
+            )
+        )
+
        return PatchResultSuccess()
    }
+
+    companion object : OptionsContainer() {
+        private fun String?.validate(max: Int? = null) = this?.toFloatOrNull() != null &&
+                toFloat().let { float ->
+                    float > 0 && max?.let { max -> float <= max } ?: true
+                }
+
+        val videoSpeedsGranularity by option(
+            PatchOption.StringOption(
+                "granularity",
+                "16",
+                "Video speed granularity",
+                "The granularity of the video speeds. The higher the value, the more speeds will be available.",
+                true
+            ) {
+                it.validate()
+            }
+        )
+
+        val minVideoSpeed by option(
+            PatchOption.StringOption(
+                "min",
+                "0.25",
+                "Minimum video speed",
+                "The minimum video speed.",
+                true
+            ) {
+                it.validate()
+            }
+        )
+
+        val maxVideoSpeed by option(
+            PatchOption.StringOption(
+                "max",
+                "5.0",
+                "Maximum video speed",
+                "The maximum video speed. Must be greater than the minimum video speed and smaller than 5.",
+                true
+            ) {
+                it.validate(5)
+            }
+        )
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37")
+        "com.google.android.youtube", arrayOf("17.33.42", "17.34.35", "17.34.36", "17.36.37")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
+import org.jf.dexlib2.AccessFlags

@Name("hdr-brightness-fingerprint")
@MatchingMethod(
@@ -13,6 +14,6 @@ import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightness
@HDRBrightnessCompatibility
@Version("0.0.1")
 object HDRBrightnessFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview", "lux"),
+    "V", AccessFlags.FINAL.value,
+    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceIdMappingProviderResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceIdMappingProviderResourcePatch.kt
@@ -1,40 +0,0 @@
-package app.revanced.patches.youtube.misc.mapping.patch
-
-import app.revanced.extensions.doRecursively
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
-import org.w3c.dom.Element
-
-@Name("resource-id-mapping-provider-resource-patch-dependency")
-@Description("Acts as a provider/dependency for resource mappings.")
-@Version("0.0.1")
-class ResourceIdMappingProviderResourcePatch : ResourcePatch() {
-    companion object {
-        internal lateinit var resourceMappings: List<ResourceElement>
-            private set
-    }
-
-    override fun execute(data: ResourceData): PatchResult {
-        data.xmlEditor["res/values/public.xml"].use { editor ->
-            resourceMappings = buildList {
-                editor.file.documentElement.doRecursively { node ->
-                    if (node !is Element) return@doRecursively
-                    val nameAttribute = node.getAttribute("name")
-                    val typeAttribute = node.getAttribute("type")
-                    if (node.nodeName != "public" || nameAttribute.startsWith("APKTOOL")) return@doRecursively
-                    val id = node.getAttribute("id").substring(2).toLong(16)
-                    add(ResourceElement(typeAttribute, nameAttribute, id))
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
-
-data class ResourceElement(val type: String, val name: String, val id: Long)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceMappingResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceMappingResourcePatch.kt
@@ -0,0 +1,73 @@
+package app.revanced.patches.youtube.misc.mapping.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.ResourcePatch
+import org.w3c.dom.Element
+import java.util.*
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+
+@Name("resource-mapping")
+@Description("Creates a map of public resources.")
+@Version("0.0.1")
+class ResourceMappingResourcePatch : ResourcePatch() {
+    companion object {
+        internal lateinit var resourceMappings: List<ResourceElement>
+            private set
+
+        private val THREAD_COUNT = Runtime.getRuntime().availableProcessors()
+        private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
+    }
+
+    override fun execute(data: ResourceData): PatchResult {
+        // save the file in memory to concurrently read from
+        val resourceXmlFile = data["res/values/public.xml"].readBytes()
+
+        // create a synchronized list to store the resource mappings
+        val mappings = Collections.synchronizedList(mutableListOf<ResourceElement>())
+
+        for (threadIndex in 0 until THREAD_COUNT) {
+            threadPoolExecutor.execute thread@{
+                data.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
+                    val resources = editor.file.documentElement.childNodes
+                    val resourcesLength = resources.length
+                    val jobSize = resourcesLength / THREAD_COUNT
+
+                    val batchStart = jobSize * threadIndex
+                    val batchEnd = jobSize * (threadIndex + 1)
+                    element@ for (i in batchStart until batchEnd) {
+                        // make sure to not to go out of bounds when rounding errors occur at calculating the jobSize
+                        if (i >= resourcesLength) return@thread
+
+                        val node = resources.item(i)
+                        if (node !is Element) continue
+
+                        val nameAttribute = node.getAttribute("name")
+                        val typeAttribute = node.getAttribute("type")
+
+                        if (node.nodeName != "public" || nameAttribute.startsWith("APKTOOL")) continue
+
+                        val id = node.getAttribute("id").substring(2).toLong(16)
+                        mappings.add(ResourceElement(typeAttribute, nameAttribute, id))
+                    }
+                }
+            }
+        }
+
+        threadPoolExecutor
+            .also { it.shutdown() }
+            .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
+
+        resourceMappings = mappings
+
+        return PatchResultSuccess()
+    }
+}
+
+data class ResourceElement(val type: String, val name: String, val id: Long)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
@@ -1,32 +1,21 @@
 package app.revanced.patches.youtube.misc.microg.patch.bytecode

-import app.revanced.extensions.equalsAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
 import app.revanced.patches.youtube.misc.clientspoof.patch.ClientSpoofPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.fingerprints.*
 import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
-import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
-import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.PACKAGE_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+import app.revanced.util.microg.MicroGBytecodeHelper

@Patch
@DependsOn(
@@ -51,121 +40,27 @@ class MicroGBytecodePatch : BytecodePatch(
        PrimeFingerprint,
    )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
-        disablePlayServiceChecksAndFixCastIssues()
-        data.classes.forEach { classDef ->
-            var proxiedClass: MutableClass? = null
-
-            classDef.methods.forEach methodLoop@{ method ->
-                val implementation = method.implementation ?: return@methodLoop
-
-                var proxiedImplementation: MutableMethodImplementation? = null
-
-                implementation.instructions.forEachIndexed { i, instruction ->
-                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
-
-                    val stringValue = ((instruction as Instruction21c).reference as StringReference).string
-
-                    val replaceMode = if (stringValue.equalsAny(
-                            "com.google.android.gms",
-                            "com.google.android.c2dm.intent.REGISTER",
-                            "com.google.android.c2dm.permission.SEND",
-                            "com.google.iid.TOKEN_REQUEST",
-                            "com.google",
-                            "com.google.android.gms.auth.accounts",
-                            "com.google.android.c2dm.intent.REGISTRATION",
-                            "com.google.android.gsf.action.GET_GLS",
-                            "com.google.android.gsf.login",
-                            "content://com.google.settings/partner",
-                            "content://com.google.android.gsf.gservices",
-                            "content://com.google.android.gsf.gservices/prefix",
-                            "com.google.android.c2dm.intent.RECEIVE"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_MICROG
-                    } else if (stringValue.equalsAny(
-                            "com.google.android.youtube.SuggestionsProvider", "com.google.android.youtube.fileprovider"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_REVANCED
-                    } else {
-                        StringReplaceMode.DO_NOT_REPLACE
-                    }
-
-                    if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
-                        if (proxiedClass == null) {
-                            proxiedClass = data.proxy(classDef).resolve()
-                        }
-
-                        if (proxiedImplementation == null) {
-                            proxiedImplementation = proxiedClass!!.methods.first {
-                                it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
-                            }.implementation!!
-                        }
-
-                        val newString = if (replaceMode == StringReplaceMode.REPLACE_WITH_REVANCED) stringValue.replace(
-                            "com.google.android.youtube", REVANCED_PACKAGE_NAME
-                        )
-                        else stringValue.replace("com.google", BASE_MICROG_PACKAGE_NAME)
-
-                        proxiedImplementation!!.replaceInstruction(
-                            i, BuilderInstruction21c(
-                                Opcode.CONST_STRING, instruction.registerA, ImmutableStringReference(newString)
-                            )
-                        )
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private fun disablePlayServiceChecksAndFixCastIssues() {
-        listOf(
-            IntegrityCheckFingerprint,
-            ServiceCheckFingerprint,
-            GooglePlayUtilityFingerprint,
-            CastDynamiteModuleFingerprint,
-            CastDynamiteModuleV2Fingerprint,
-            CastContextFetchFingerprint
-        ).forEach { fingerprint ->
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
-                        const/4 v0, 0x0
-                        return-object v0
-                        """
-
-                'V' -> "return-void"
-                'I' -> """
-                        const/4 v0, 0x0
-                        return v0
-                        """
-
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
+    override fun execute(data: BytecodeData) =
+        // apply common microG patch
+        MicroGBytecodeHelper.patchBytecode(
+            data, arrayOf(
+                MicroGBytecodeHelper.packageNameTransform(
+                    PACKAGE_NAME,
+                    REVANCED_PACKAGE_NAME
+                )
+            ),
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                PrimeFingerprint,
+                PACKAGE_NAME,
+                REVANCED_PACKAGE_NAME
+            ),
+            listOf(
+                IntegrityCheckFingerprint,
+                ServiceCheckFingerprint,
+                GooglePlayUtilityFingerprint,
+                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleV2Fingerprint,
+                CastContextFetchFingerprint
            )
-        }
-
-        val primeMethod = PrimeFingerprint.result!!.mutableMethod
-        val implementation = primeMethod.implementation!!
-
-        var register = 2
-        val index = implementation.instructions.indexOfFirst {
-            if (it.opcode != Opcode.CONST_STRING) return@indexOfFirst false
-
-            val instructionString = ((it as Instruction21c).reference as StringReference).string
-            if (instructionString != "com.google.android.youtube") return@indexOfFirst false
-
-            register = it.registerA
-            return@indexOfFirst true
-        }
-
-        primeMethod.replaceInstruction(
-            index, "const-string v$register, \"$REVANCED_PACKAGE_NAME\""
-        )
-    }
+        ).let { PatchResultSuccess() }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
@@ -8,14 +8,21 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.music.misc.microg.shared.Constants
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
-import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
+import app.revanced.patches.youtube.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
+import app.revanced.util.microg.Constants.MICROG_VENDOR
+import app.revanced.util.microg.MicroGManifestHelper
+import app.revanced.util.microg.MicroGResourceHelper

@Name("microg-resource-patch")
@DependsOn([FixLocaleConfigErrorPatch::class, SettingsResourcePatch::class])
@@ -27,32 +34,26 @@ class MicroGResourcePatch : ResourcePatch() {
        SettingsPatch.addPreference(
            Preference(
                StringResource("microg_settings", "MicroG Settings"),
-                Preference.Intent("$BASE_MICROG_PACKAGE_NAME.android.gms", "", "org.microg.gms.ui.SettingsActivity"),
+                Preference.Intent("$MICROG_VENDOR.android.gms", "", "org.microg.gms.ui.SettingsActivity"),
                StringResource("microg_settings_summary", "Settings for MicroG"),
            )
        )
        SettingsPatch.renameIntentsTargetPackage(REVANCED_PACKAGE_NAME)

-        val manifest = data["AndroidManifest.xml"]
-        manifest.writeText(
-            manifest.readText()
-                .replace(
-                    "package=\"com.google.android.youtube", "package=\"$REVANCED_PACKAGE_NAME"
-                ).replace(
-                    "android:authorities=\"com.google.android.youtube", "android:authorities=\"$REVANCED_PACKAGE_NAME"
-                ).replace(
-                    "com.google.android.youtube.permission.C2D_MESSAGE", "$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE"
-                ).replace( // might not be needed
-                    "com.google.android.youtube.lifecycle-trojan", "$REVANCED_PACKAGE_NAME.lifecycle-trojan"
-                ).replace( // might not be needed
-                    "com.google.android.youtube.photopicker_images", "$REVANCED_PACKAGE_NAME.photopicker_images"
-                ).replace(
-                    "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
-                ).replace(
-                    "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
-                )
+        // update manifest
+        MicroGResourceHelper.patchManifest(
+            data,
+            PACKAGE_NAME,
+            REVANCED_PACKAGE_NAME,
+            REVANCED_APP_NAME
        )

+        // add metadata to manifest
+        MicroGManifestHelper.addSpoofingMetadata(
+            data,
+            SPOOFED_PACKAGE_NAME,
+            SPOOFED_PACKAGE_SIGNATURE
+        )
        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/enum/StringReplaceMode.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/enum/StringReplaceMode.kt
@@ -1,5 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.patch.resource.enum
-
-enum class StringReplaceMode {
-    REPLACE_WITH_MICROG, REPLACE_WITH_REVANCED, DO_NOT_REPLACE
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt
@@ -1,6 +1,9 @@
 package app.revanced.patches.youtube.misc.microg.shared

 object Constants {
-    internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
+    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
    internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
+    internal const val PACKAGE_NAME = "com.google.android.youtube"
+    internal const val SPOOFED_PACKAGE_NAME = PACKAGE_NAME
+    internal const val SPOOFED_PACKAGE_SIGNATURE = "24bb24c05e47e0aefa68a58a766179d9b613a600"
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
@@ -11,14 +11,14 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Name("player-controls-bytecode-patch")
-@DependsOn([ResourceIdMappingProviderResourcePatch::class])
+@DependsOn([ResourceMappingResourcePatch::class])
@Description("Manages the code for the player controls of the YouTube player.")
@PlayerControlsCompatibility
@Version("0.0.1")
@@ -28,7 +28,7 @@ class PlayerControlsBytecodePatch : BytecodePatch(
    override fun execute(data: BytecodeData): PatchResult {
        showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!

-        bottomUiContainerResourceId = ResourceIdMappingProviderResourcePatch
+        bottomUiContainerResourceId = ResourceMappingResourcePatch
            .resourceMappings
            .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id

--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.LicenseActivityFingerprint
 import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.ReVancedSettingsActivityFingerprint
@@ -94,7 +94,7 @@ class SettingsPatch : BytecodePatch(

    internal companion object {
        // TODO: hide this somehow
-        var appearanceStringId: Long = ResourceIdMappingProviderResourcePatch.resourceMappings.find {
+        var appearanceStringId: Long = ResourceMappingResourcePatch.resourceMappings.find {
            it.type == "string" && it.name == "app_theme_appearance_dark"
        }!!.id

--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.BasePreference
@@ -22,7 +22,7 @@ import java.io.Closeable

@Name("settings-resource-patch")
@SettingsCompatibility
-@DependsOn([FixLocaleConfigErrorPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@DependsOn([FixLocaleConfigErrorPatch::class, ResourceMappingResourcePatch::class])
@Version("0.0.1")
 class SettingsResourcePatch : ResourcePatch(), Closeable {

--- a/src/main/kotlin/app/revanced/util/microg/Constants.kt
+++ b/src/main/kotlin/app/revanced/util/microg/Constants.kt
@@ -0,0 +1,130 @@
+package app.revanced.util.microg
+
+/**
+ * constants for microG builds with signature spoofing
+ */
+internal object Constants {
+    /**
+     * microG vendor name
+     * aka. package prefix / package base
+     */
+    const val MICROG_VENDOR = "com.mgoogle"
+
+    /**
+     * meta-data for microG package name spoofing on patched builds
+     */
+    const val META_SPOOFED_PACKAGE_NAME = "$MICROG_VENDOR.android.gms.SPOOFED_PACKAGE_NAME"
+
+    /**
+     * meta-data for microG package signature spoofing on patched builds
+     */
+    const val META_SPOOFED_PACKAGE_SIGNATURE = "$MICROG_VENDOR.android.gms.SPOOFED_PACKAGE_SIGNATURE"
+
+    /**
+     * meta-data for microG package detection
+     */
+    const val META_GMS_PACKAGE_NAME = "app.revanced.MICROG_PACKAGE_NAME"
+
+    /**
+     * a list of all permissions in microG
+     */
+    val PERMISSIONS = listOf(
+        // C2DM / GCM
+        "com.google.android.c2dm.permission.RECEIVE",
+        "com.google.android.c2dm.permission.SEND",
+        "com.google.android.gtalkservice.permission.GTALK_SERVICE",
+
+        // GAuth
+        "com.google.android.googleapps.permission.GOOGLE_AUTH",
+        "com.google.android.googleapps.permission.GOOGLE_AUTH.cp",
+        "com.google.android.googleapps.permission.GOOGLE_AUTH.local",
+        "com.google.android.googleapps.permission.GOOGLE_AUTH.mail",
+        "com.google.android.googleapps.permission.GOOGLE_AUTH.writely",
+    )
+
+    /**
+     * a list of all (intent) actions in microG
+     */
+    val ACTIONS = listOf(
+        // location
+        "com.google.android.gms.location.places.ui.PICK_PLACE",
+        "com.google.android.gms.location.places.GeoDataApi",
+        "com.google.android.gms.location.places.PlacesApi",
+        "com.google.android.gms.location.places.PlaceDetectionApi",
+        "com.google.android.gms.wearable.MESSAGE_RECEIVED",
+
+        // C2DM / GCM
+        "com.google.android.c2dm.intent.REGISTER",
+        "com.google.android.c2dm.intent.REGISTRATION",
+        "com.google.android.c2dm.intent.UNREGISTER",
+        "com.google.android.c2dm.intent.RECEIVE",
+        "com.google.iid.TOKEN_REQUEST",
+        "com.google.android.gcm.intent.SEND",
+
+        // car
+        "com.google.android.gms.car.service.START",
+
+        // people
+        "com.google.android.gms.people.service.START",
+
+        // wearable
+        "com.google.android.gms.wearable.BIND",
+
+        // auth
+        "com.google.android.gsf.login",
+        "com.google.android.gsf.action.GET_GLS",
+        "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
+        "com.google.android.gms.auth.login.LOGIN",
+        "com.google.android.gms.auth.api.credentials.PICKER",
+        "com.google.android.gms.auth.api.credentials.service.START",
+        "com.google.android.gms.auth.service.START",
+        "com.google.firebase.auth.api.gms.service.START",
+        "com.google.android.gms.auth.be.appcert.AppCertService",
+
+        // fido
+        "com.google.android.gms.fido.fido2.privileged.START",
+
+        // games
+        "com.google.android.gms.games.service.START",
+        "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
+
+        // chimera
+        "com.google.android.gms.chimera",
+
+        // fonts
+        "com.google.android.gms.fonts",
+
+        // phenotype
+        "com.google.android.gms.phenotype.service.START",
+
+        // location
+        "com.google.android.gms.location.reporting.service.START",
+
+        // misc
+        "com.google.android.gms.gmscompliance.service.START",
+        "com.google.android.gms.oss.licenses.service.START",
+        "com.google.android.gms.safetynet.service.START",
+        "com.google.android.gms.tapandpay.service.BIND"
+    )
+
+    /**
+     * a list of all content provider authorities in microG
+     */
+    val AUTHORITIES = listOf(
+        // gsf
+        "com.google.android.gsf.gservices",
+        "com.google.settings",
+
+        // auth
+        "com.google.android.gms.auth.accounts",
+
+        // chimera
+        "com.google.android.gms.chimera",
+
+        // fonts
+        "com.google.android.gms.fonts",
+
+        // phenotype
+        "com.google.android.gms.phenotype"
+    )
+}
--- a/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
+++ b/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
@@ -0,0 +1,229 @@
+package app.revanced.util.microg
+
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.util.microg.Constants.ACTIONS
+import app.revanced.util.microg.Constants.AUTHORITIES
+import app.revanced.util.microg.Constants.MICROG_VENDOR
+import app.revanced.util.microg.Constants.PERMISSIONS
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+
+/**
+ * Helper class for applying bytecode patches needed for the microg-support patches.
+ */
+internal object MicroGBytecodeHelper {
+
+    /**
+     * Transform strings with package name out of [fromPackageName] and [toPackageName].
+     *
+     * @param fromPackageName Original package name.
+     * @param toPackageName The package name to accept.
+     **/
+    fun packageNameTransform(fromPackageName: String, toPackageName: String): (String) -> String? {
+        return { referencedString ->
+            when (referencedString) {
+                "$fromPackageName.SuggestionsProvider",
+                "$fromPackageName.fileprovider" -> referencedString.replace(fromPackageName, toPackageName)
+                else -> null
+            }
+        }
+    }
+
+    /**
+     * Prime method data class for the [MicroGBytecodeHelper] class.
+     *
+     * @param primeMethodFingerprint The prime methods [MethodFingerprint].
+     * @param fromPackageName Original package name.
+     * @param toPackageName The package name to accept.
+     **/
+    data class PrimeMethodTransformationData(
+        val primeMethodFingerprint: MethodFingerprint,
+        val fromPackageName: String,
+        val toPackageName: String
+    ) {
+        /**
+         * Patch the prime method to accept the new package name.
+         */
+        fun transformPrimeMethodPackageName() {
+            val primeMethod = primeMethodFingerprint.result!!.mutableMethod
+            val implementation = primeMethod.implementation!!
+
+            var register = 2
+            val index = implementation.instructions.indexOfFirst {
+                if (it.opcode != Opcode.CONST_STRING) return@indexOfFirst false
+
+                val instructionString = ((it as Instruction21c).reference as StringReference).string
+                if (instructionString != fromPackageName) return@indexOfFirst false
+
+                register = it.registerA
+                return@indexOfFirst true
+            }
+
+            primeMethod.replaceInstruction(
+                index, "const-string v$register, \"$toPackageName\""
+            )
+        }
+    }
+
+    /**
+     * Patch the bytecode to work with MicroG.
+     * Note: this only handles string constants to gms (intent actions, authorities, ...).
+     * If the app employs additional checks to validate the installed gms package, you'll have to handle those in the app- specific patch
+     *
+     * @param data Bytecode data instance.
+     * @param additionalStringTransforms Additional transformations applied to all const-string references.
+     * @param primeMethodTransformationData Data to patch the prime method.
+     * @param earlyReturns List of [MethodFingerprint] to return the resolved methods early.
+     */
+    fun patchBytecode(
+        data: BytecodeData,
+        additionalStringTransforms: Array<(str: String) -> String?>,
+        primeMethodTransformationData: PrimeMethodTransformationData,
+        earlyReturns: List<MethodFingerprint>
+    ) {
+        earlyReturns.returnEarly()
+        primeMethodTransformationData.transformPrimeMethodPackageName()
+
+        val allTransforms = arrayOf(
+            MicroGBytecodeHelper::commonTransform,
+            MicroGBytecodeHelper::contentUrisTransform,
+            *additionalStringTransforms
+        )
+
+        // transform all strings using all provided transforms, first match wins
+        data.transformStringReferences transform@{
+            for (transformFn in allTransforms) {
+                val s = transformFn(it)
+                if (s != null) return@transform s
+            }
+
+            return@transform null
+        }
+    }
+
+    /**
+     * const-string transform function for common gms string references.
+     *
+     * @param referencedString The string to transform.
+     */
+    private fun commonTransform(referencedString: String): String? =
+        when (referencedString) {
+            "com.google",
+            "com.google.android.gms",
+            in PERMISSIONS,
+            in ACTIONS,
+            in AUTHORITIES -> referencedString.replace("com.google", MICROG_VENDOR)
+
+            // subscribedfeeds has no vendor prefix for whatever reason...
+            "subscribedfeeds" -> "${MICROG_VENDOR}.subscribedfeeds"
+            else -> null
+        }
+
+
+    /**
+     * const-string transform function for strings containing gms content uris / authorities.
+     */
+    private fun contentUrisTransform(str: String): String? {
+        // only when content:// uri
+        if (str.startsWith("content://")) {
+            // check if matches any authority
+            for (authority in AUTHORITIES) {
+                val uriPrefix = "content://$authority"
+                if (str.startsWith(uriPrefix)) {
+                    return str.replace(
+                        uriPrefix,
+                        "content://${authority.replace("com.google", MICROG_VENDOR)}"
+                    )
+                }
+            }
+
+            // gms also has a 'subscribedfeeds' authority, check for that one too
+            val subFeedsUriPrefix = "content://subscribedfeeds"
+            if (str.startsWith(subFeedsUriPrefix)) {
+                return str.replace(subFeedsUriPrefix, "content://${MICROG_VENDOR}.subscribedfeeds")
+            }
+        }
+
+        return null
+    }
+
+    /**
+     * Transform all constant string references using a transformation function.
+     *
+     * @param transformFn string transformation function. if null, string is not changed.
+     */
+    private fun BytecodeData.transformStringReferences(transformFn: (str: String) -> String?) {
+        classes.forEach { classDef ->
+            var mutableClass: MutableClass? = null
+
+            // enumerate all methods
+            classDef.methods.forEach classLoop@{ methodDef ->
+                var mutableMethod: MutableMethod? = null
+                val implementation = methodDef.implementation ?: return@classLoop
+
+                // enumerate all instructions and find const-string
+                implementation.instructions.forEachIndexed implLoop@{ index, instruction ->
+                    // skip all that are not const-string
+                    if (instruction.opcode != Opcode.CONST_STRING) return@implLoop
+                    val str = ((instruction as Instruction21c).reference as StringReference).string
+
+                    // call transform function
+                    val transformedStr = transformFn(str)
+                    if (transformedStr != null) {
+                        // make class and method mutable, if not already
+                        mutableClass = mutableClass ?: proxy(classDef).resolve()
+                        mutableMethod = mutableMethod ?: mutableClass!!.methods.first {
+                            it.name == methodDef.name && it.parameterTypes.containsAll(methodDef.parameterTypes)
+                        }
+
+                        // replace instruction with updated string
+                        mutableMethod!!.implementation!!.replaceInstruction(
+                            index,
+                            BuilderInstruction21c(
+                                Opcode.CONST_STRING,
+                                instruction.registerA,
+                                ImmutableStringReference(
+                                    transformedStr
+                                )
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Return the resolved methods of a list of [MethodFingerprint] early.
+     */
+    private fun List<MethodFingerprint>.returnEarly() {
+        this.forEach { fingerprint ->
+            val result = fingerprint.result!!
+            val stringInstructions = when (result.method.returnType.first()) {
+                'L' -> """
+                        const/4 v0, 0x0
+                        return-object v0
+                        """
+
+                'V' -> "return-void"
+                'I' -> """
+                        const/4 v0, 0x0
+                        return v0
+                        """
+
+                else -> throw Exception("This case should never happen.")
+            }
+            result.mutableMethod.addInstructions(
+                0, stringInstructions
+            )
+        }
+    }
+}
--- a/src/main/kotlin/app/revanced/util/microg/MicroGManifestHelper.kt
+++ b/src/main/kotlin/app/revanced/util/microg/MicroGManifestHelper.kt
@@ -0,0 +1,58 @@
+package app.revanced.util.microg
+
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.util.microg.Constants.META_GMS_PACKAGE_NAME
+import app.revanced.util.microg.Constants.META_SPOOFED_PACKAGE_NAME
+import app.revanced.util.microg.Constants.META_SPOOFED_PACKAGE_SIGNATURE
+import app.revanced.util.microg.Constants.MICROG_VENDOR
+import org.w3c.dom.Element
+import org.w3c.dom.Node
+
+/**
+ * helper class for adding manifest metadata needed for microG builds with signature spoofing
+ */
+internal object MicroGManifestHelper {
+
+    /**
+     * Add manifest entries needed for package and signature spoofing when using MicroG.
+     * Note: this only adds metadata entries for signature spoofing, other changes may still be required to make a microG patch work.
+     *
+     * @param data Resource data.
+     * @param spoofedPackage The package to spoof.
+     * @param spoofedSignature The signature to spoof.
+     */
+    fun addSpoofingMetadata(
+        data: ResourceData,
+        spoofedPackage: String,
+        spoofedSignature: String
+    ) {
+        data.xmlEditor["AndroidManifest.xml"].use {
+            val applicationNode = it
+                .file
+                .getElementsByTagName("application")
+                .item(0)
+
+            // package spoofing
+            applicationNode.adoptChild("meta-data") {
+                setAttribute("android:name", META_SPOOFED_PACKAGE_NAME)
+                setAttribute("android:value", spoofedPackage)
+            }
+            applicationNode.adoptChild("meta-data") {
+                setAttribute("android:name", META_SPOOFED_PACKAGE_SIGNATURE)
+                setAttribute("android:value", spoofedSignature)
+            }
+
+            // microG presence detection in integrations
+            applicationNode.adoptChild("meta-data") {
+                setAttribute("android:name", META_GMS_PACKAGE_NAME)
+                setAttribute("android:value", "${MICROG_VENDOR}.android.gms")
+            }
+        }
+    }
+
+    private fun Node.adoptChild(tagName: String, block: Element.() -> Unit) {
+        val child = ownerDocument.createElement(tagName)
+        child.block()
+        appendChild(child)
+    }
+}
--- a/src/main/kotlin/app/revanced/util/microg/MicroGResourceHelper.kt
+++ b/src/main/kotlin/app/revanced/util/microg/MicroGResourceHelper.kt
@@ -0,0 +1,49 @@
+package app.revanced.util.microg
+
+import app.revanced.patcher.data.impl.ResourceData
+
+/**
+ * Helper class for applying resource patches needed for the microg-support patches.
+ */
+internal object MicroGResourceHelper {
+    /**
+     * Patch the manifest to work with MicroG.
+     *
+     * @param data Bytecode data instance.
+     * @param fromPackageName Original package name.
+     * @param toPackageName The package name to accept.
+     * @param toName The new name of the app.
+     */
+    fun patchManifest(
+        data: ResourceData,
+        fromPackageName: String,
+        toPackageName: String,
+        toName: String
+    ) {
+        val manifest = data["AndroidManifest.xml"].readText()
+        data["AndroidManifest.xml"].writeText(
+            manifest.replace(
+                "package=\"$fromPackageName",
+                "package=\"$toPackageName"
+            ).replace(
+                "android:label=\"@string/app_name",
+                "android:label=\"$toName"
+            ).replace(
+                "android:label=\"@string/app_launcher_name",
+                "android:label=\"$toName"
+            ).replace(
+                "android:authorities=\"$fromPackageName",
+                "android:authorities=\"$toPackageName"
+            ).replace(
+                "$fromPackageName.permission.C2D_MESSAGE",
+                "$toPackageName.permission.C2D_MESSAGE"
+            ).replace(
+                "com.google.android.c2dm",
+                "${Constants.MICROG_VENDOR}.android.c2dm"
+            ).replace(
+                "</queries>",
+                "<package android:name=\"${Constants.MICROG_VENDOR}.android.gms\"/></queries>"
+            )
+        )
+    }
+}
--- a/src/main/resources/sponsorblock/host/values/strings.xml
+++ b/src/main/resources/sponsorblock/host/values/strings.xml
@@ -14,10 +14,10 @@
    <string name="general_adjusting_sum">This is the number of milliseconds you can move when you use the time adjustment buttons while adding new segment</string>
    <string name="general_min_duration">Minimum segment duration</string>
    <string name="general_min_duration_sum">Segments shorter than the set value (in seconds) will not be skipped or shown in the player</string>
-    <string name="general_uuid">Your unique user id</string>
+    <string name="general_uuid">Your private user id</string>
    <string name="general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
    <string name="settings_ie">Import/Export settings</string>
-    <string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your userID, so be sure to share this wisely.</string>
+    <string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your Private userID, so be sure to share this wisely.</string>
    <string name="general_api_url">Change API URL</string>
    <string name="general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing.&lt;/b></string>
    <string name="settings_import_successful">Settings were successfully imported</string>
Author	SHA1	Message	Date
semantic-release-bot	2f932d697b	chore(release): 2.73.0 [skip ci] # [2.73.0](https://github.com/revanced/revanced-patches/compare/v2.72.1...v2.73.0) (2022-09-29) ### Features * `dynamic-color` patch ([#652](https://github.com/revanced/revanced-patches/issues/652)) ([`47d4b90`](`237129d327`))	2022-09-29 20:09:46 +00:00
bennett-sh	237129d327	feat: `dynamic-color` patch (#652 )	2022-09-29 22:08:00 +02:00
oSumAtrIX	e4d7dc0aa9	chore: bump patcher dependency version	2022-09-29 21:42:45 +02:00
semantic-release-bot	fed9e4aafa	chore(release): 2.72.1 [skip ci] ## [2.72.1](https://github.com/revanced/revanced-patches/compare/v2.72.0...v2.72.1) (2022-09-29) ### Bug Fixes * hdr-brightness: trim list of compatible versions ([#602](https://github.com/revanced/revanced-patches/issues/602)) ([`eb900b1`](`85aa45d3f2`))	2022-09-29 17:26:19 +00:00
OxrxL	85aa45d3f2	fix(hdr-brightness): trim list of compatible versions (#602 )	2022-09-29 19:24:32 +02:00
semantic-release-bot	16df8d5ebc	chore(release): 2.72.0 [skip ci] # [2.72.0](https://github.com/revanced/revanced-patches/compare/v2.71.2...v2.72.0) (2022-09-29) ### Features * `tiktok-speed` patch ([#668](https://github.com/revanced/revanced-patches/issues/668)) ([`805d301`](`0f78f621c7`)) * bump YouTube Music patches to v5.25.51 ([#669](https://github.com/revanced/revanced-patches/issues/669)) ([`ca88b01`](`e89c3dad39`))	2022-09-29 15:27:16 +00:00
sandip93291	e89c3dad39	feat: bump YouTube Music patches to v5.25.51 (#669 )	2022-09-29 17:25:01 +02:00
d4rkk3y	0f78f621c7	feat: `tiktok-speed` patch (#668 )	2022-09-29 17:23:58 +02:00
semantic-release-bot	fe30cea22d	chore(release): 2.71.2 [skip ci] ## [2.71.2](https://github.com/revanced/revanced-patches/compare/v2.71.1...v2.71.2) (2022-09-28) ### Bug Fixes * hide-email-address: invalid instruction offsets ([#654](https://github.com/revanced/revanced-patches/issues/654)) ([`6c8f447`](`5a30d8564c`))	2022-09-28 13:44:59 +00:00
OxrxL	5a30d8564c	fix(hide-email-address): invalid instruction offsets (#654 )	2022-09-28 15:42:35 +02:00
semantic-release-bot	34222d9f2c	chore(release): 2.71.1 [skip ci] ## [2.71.1](https://github.com/revanced/revanced-patches/compare/v2.71.0...v2.71.1) (2022-09-28) ### Bug Fixes * disable-auto-player-popup-panels: swap switch toggle state description ([#653](https://github.com/revanced/revanced-patches/issues/653)) ([`632323a`](`f765af0929`))	2022-09-28 13:24:22 +00:00
NRJ YDV	f765af0929	fix(disable-auto-player-popup-panels): swap switch toggle state description (#653 )	2022-09-28 15:21:55 +02:00
semantic-release-bot	298c33deb6	chore(release): 2.71.0 [skip ci] # [2.71.0](https://github.com/revanced/revanced-patches/compare/v2.70.0...v2.71.0) (2022-09-28) ### Features * `hide-email-address` patch ([#578](https://github.com/revanced/revanced-patches/issues/578)) ([`9ed8f94`](`111db2a499`))	2022-09-28 11:29:51 +00:00
OxrxL	111db2a499	feat: `hide-email-address` patch (#578 )	2022-09-28 13:28:07 +02:00
semantic-release-bot	fa536957cc	chore(release): 2.70.0 [skip ci] # [2.70.0](https://github.com/revanced/revanced-patches/compare/v2.69.4...v2.70.0) (2022-09-28) ### Features * `monochrome-icon` patch ([#643](https://github.com/revanced/revanced-patches/issues/643)) ([`b744c37`](`980deec6af`))	2022-09-28 11:16:24 +00:00
bennett-sh	980deec6af	feat: `monochrome-icon` patch (#643 )	2022-09-28 13:14:39 +02:00
semantic-release-bot	658638bfad	chore(release): 2.69.4 [skip ci] ## [2.69.4](https://github.com/revanced/revanced-patches/compare/v2.69.3...v2.69.4) (2022-09-27) ### Bug Fixes * sponsorblock: dynamically insert `setSponsorBarRect` call ([#644](https://github.com/revanced/revanced-patches/issues/644)) ([`88940dd`](`d5ee3b006d`))	2022-09-27 20:02:25 +00:00
d4rkk3y	d5ee3b006d	fix(sponsorblock): dynamically insert `setSponsorBarRect` call (#644 )	2022-09-27 22:00:24 +02:00
semantic-release-bot	36ab007924	chore(release): 2.69.3 [skip ci] ## [2.69.3](https://github.com/revanced/revanced-patches/compare/v2.69.2...v2.69.3) (2022-09-27) ### Bug Fixes * sponsorblock: correct class name for field reference ([#582](https://github.com/revanced/revanced-patches/issues/582)) ([`c584092`](`31ae362d18`))	2022-09-27 13:32:48 +00:00
semantic-release-bot	c46705f21a	chore(release): 2.69.3 [skip ci] ## [2.69.3](https://github.com/revanced/revanced-patches/compare/v2.69.2...v2.69.3) (2022-09-27) ### Bug Fixes * sponsorblock: correct class name for field reference ([#582](https://github.com/revanced/revanced-patches/issues/582)) ([`c584092`](`31ae362d18`))	2022-09-27 04:57:01 +00:00
inotia00	31ae362d18	fix(sponsorblock): correct class name for field reference (#582 )	2022-09-27 06:55:15 +02:00
semantic-release-bot	b64f7bb400	chore(release): 2.69.2 [skip ci] ## [2.69.2](https://github.com/revanced/revanced-patches/compare/v2.69.1...v2.69.2) (2022-09-26) ### Performance Improvements * resource-mapping: map resources with multiple threads ([`81e86c4`](`64244ec476`))	2022-09-26 02:33:00 +00:00
oSumAtrIX	64244ec476	perf(resource-mapping): map resources with multiple threads	2022-09-26 04:30:49 +02:00
oSumAtrIX	f005314358	chore: bump patcher dependency version	2022-09-26 04:30:49 +02:00
shadow578	ae1aeffc62	refactor(microg-support): share code between `music-microg-support` patch	2022-09-26 04:30:49 +02:00
semantic-release-bot	56768caa4c	chore(release): 2.69.1 [skip ci] ## [2.69.1](https://github.com/revanced/revanced-patches/compare/v2.69.0...v2.69.1) (2022-09-24) ### Bug Fixes * sponsorblock: reflect changes to strings ([#585](https://github.com/revanced/revanced-patches/issues/585)) ([`ee3a9c5`](`19484ca2bc`))	2022-09-24 21:46:59 +00:00
Michael M. Chang	19484ca2bc	fix(sponsorblock): reflect changes to strings (#585 )	2022-09-24 23:45:02 +02:00
semantic-release-bot	a8a98646e7	chore(release): 2.69.0 [skip ci] # [2.69.0](https://github.com/revanced/revanced-patches/compare/v2.68.3...v2.69.0) (2022-09-24) ### Features * `spotify-theme` patch ([#608](https://github.com/revanced/revanced-patches/issues/608)) ([`468ec3e`](`4927bc7451`))	2022-09-24 13:45:49 +00:00
bogadana	4927bc7451	feat: `spotify-theme` patch (#608 )	2022-09-24 15:44:04 +02:00
semantic-release-bot	66a5ca3fa8	chore(release): 2.68.3 [skip ci] ## [2.68.3](https://github.com/revanced/revanced-patches/compare/v2.68.2...v2.68.3) (2022-09-23) ### Bug Fixes * seekbar-tapping: do not disable seekbar when hiding it ([#600](https://github.com/revanced/revanced-patches/issues/600)) ([`f251ae7`](`6c0b9213fe`))	2022-09-23 19:11:44 +00:00
OxrxL	6c0b9213fe	fix(seekbar-tapping): do not disable seekbar when hiding it (#600 )	2022-09-23 21:09:47 +02:00
semantic-release-bot	70e21500cc	chore(release): 2.68.2 [skip ci] ## [2.68.2](https://github.com/revanced/revanced-patches/compare/v2.68.1...v2.68.2) (2022-09-23) ### Bug Fixes * hide-time-and-seekbar: don't draw the seekbar ([#594](https://github.com/revanced/revanced-patches/issues/594)) ([`8b3ab04`](`784e97591a`))	2022-09-23 10:53:30 +00:00
OxrxL	784e97591a	fix(hide-time-and-seekbar): don't draw the seekbar (#594 )	2022-09-23 12:51:58 +02:00
semantic-release-bot	26ff3b338e	chore(release): 2.68.1 [skip ci] ## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23) ### Bug Fixes * sponsorblock: resolve unresolved fingerprint ([`986a396`](`28c864ae95`))	2022-09-23 09:51:06 +00:00
oSumAtrIX	28c864ae95	fix(sponsorblock): resolve unresolved fingerprint	2022-09-23 11:49:08 +02:00
semantic-release-bot	deb829c791	chore(release): 2.68.0 [skip ci] # [2.68.0](https://github.com/revanced/revanced-patches/compare/v2.67.1...v2.68.0) (2022-09-23) ### Bug Fixes * hide-premium-navbar: remove the correct instructions ([#591](https://github.com/revanced/revanced-patches/issues/591)) ([`d82a947`](`3c0f3ac968`)) ### Features * tiktok: adapt `tiktok-download` with `tiktok-settings`. ([#586](https://github.com/revanced/revanced-patches/issues/586)) ([`459963c`](`2f6da4ed27`))	2022-09-23 05:42:52 +00:00
Tim Wüstenhagen	3c0f3ac968	fix(hide-premium-navbar): remove the correct instructions (#591 )	2022-09-23 07:40:50 +02:00
d4rkk3y	2f6da4ed27	feat(tiktok): adapt `tiktok-download` with `tiktok-settings`. (#586 )	2022-09-23 07:40:16 +02:00
semantic-release-bot	1b653c77c4	chore(release): 2.67.1 [skip ci] ## [2.67.1](https://github.com/revanced/revanced-patches/compare/v2.67.0...v2.67.1) (2022-09-23)	2022-09-23 04:47:01 +00:00
oSumAtrIX	82ea2d3498	build: update patcher dependency	2022-09-23 06:35:29 +02:00
semantic-release-bot	07dee5b87a	chore(release): 2.67.0 [skip ci] # [2.67.0](https://github.com/revanced/revanced-patches/compare/v2.66.2...v2.67.0) (2022-09-23) ### Bug Fixes * hide-premium-nav-bar: invalid import ([#590](https://github.com/revanced/revanced-patches/issues/590)) ([`78f0200`](`7713516ed8`)) ### Features * `hide-premium-nav-bar` patch ([#589](https://github.com/revanced/revanced-patches/issues/589)) ([`950f7e2`](`22fa09dc27`))	2022-09-23 00:27:51 +00:00
Tim Wüstenhagen	7713516ed8	fix(hide-premium-nav-bar): invalid import (#590 )	2022-09-23 02:26:06 +02:00
Tim Wüstenhagen	22fa09dc27	feat: `hide-premium-nav-bar` patch (#589 )	2022-09-23 02:05:41 +02:00
semantic-release-bot	24d03387de	chore(release): 2.66.2 [skip ci] ## [2.66.2](https://github.com/revanced/revanced-patches/compare/v2.66.1...v2.66.2) (2022-09-22) ### Bug Fixes * custom-playback-speed: implement own method instead of `takeWhile` ([`4070744`](`04310901b7`))	2022-09-22 06:40:39 +00:00
oSumAtrIX	04310901b7	fix(custom-playback-speed): implement own method instead of `takeWhile`	2022-09-22 08:38:49 +02:00
semantic-release-bot	3011c1fa45	chore(release): 2.66.1 [skip ci] ## [2.66.1](https://github.com/revanced/revanced-patches/compare/v2.66.0...v2.66.1) (2022-09-22) ### Bug Fixes * sponsorblock: broken fingerprint and invert setting `shorts_playing` ([#579](https://github.com/revanced/revanced-patches/issues/579)) ([`0125b09`](`6b83fe572a`))	2022-09-22 05:46:12 +00:00
OxrxL	6b83fe572a	fix(sponsorblock): broken fingerprint and invert setting `shorts_playing` (#579 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-22 07:43:54 +02:00
semantic-release-bot	32d303f4b7	chore(release): 2.66.0 [skip ci] # [2.66.0](https://github.com/revanced/revanced-patches/compare/v2.65.0...v2.66.0) (2022-09-22) ### Features * custom-playback-speed: max, min, granularity option ([`61df23c`](`837c381e19`))	2022-09-22 05:21:14 +00:00
oSumAtrIX	837c381e19	feat(custom-playback-speed): max, min, granularity option	2022-09-22 07:17:10 +02:00
semantic-release-bot	09ae60bb28	chore(release): 2.65.0 [skip ci] # [2.65.0](https://github.com/revanced/revanced-patches/compare/v2.64.2...v2.65.0) (2022-09-21) ### Features * `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch ([#501](https://github.com/revanced/revanced-patches/issues/501)) ([`f506bff`](`c40181140d`)) * theme: arbitrary background color for light theme ([#565](https://github.com/revanced/revanced-patches/issues/565)) ([`741d005`](`f9d180aad4`))	2022-09-21 21:03:06 +00:00
Pranshu Goyal	f9d180aad4	feat(theme): arbitrary background color for light theme (#565 )	2022-09-21 23:01:23 +02:00
d4rkk3y	c40181140d	feat: `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch (#501 )	2022-09-21 23:00:03 +02:00