From 7e1bb8f3c70c3acdc0ce1ef87d9b90ea48e344a9 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sat, 20 Sep 2025 15:33:42 +0000
Subject: [PATCH 01/16] chore: Release v5.40.0-dev.8 [skip ci]

# [5.40.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.7...v5.40.0-dev.8) (2025-09-20)

### Features

* **YouTube:** Support version `20.14.43` ([#5940](https://github.com/ReVanced/revanced-patches/issues/5940)) ([f7f4a1b](https://github.com/ReVanced/revanced-patches/commit/f7f4a1b0f0186598266b41a2c6a781fdee49e440))
---
 CHANGELOG.md      | 7 +++++++
 gradle.properties | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef513ef33..efe394880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.40.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.7...v5.40.0-dev.8) (2025-09-20)
+
+
+### Features
+
+* **YouTube:** Support version `20.14.43` ([#5940](https://github.com/ReVanced/revanced-patches/issues/5940)) ([f7f4a1b](https://github.com/ReVanced/revanced-patches/commit/f7f4a1b0f0186598266b41a2c6a781fdee49e440))
+
 # [5.40.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.6...v5.40.0-dev.7) (2025-09-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index 6f587b080..8110ad013 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0-dev.7
+version = 5.40.0-dev.8

From 4178e8a64ff3d31c340aa93c0f83f16fe8cb2456 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Sep 2025 20:09:07 +0400
Subject: [PATCH 02/16] chore: Sync translations (#5943)

---
 .../addresources/values-af-rZA/strings.xml    |  1 +
 .../addresources/values-am-rET/strings.xml    |  1 +
 .../addresources/values-ar-rSA/strings.xml    | 27 ++++---
 .../addresources/values-as-rIN/strings.xml    |  1 +
 .../addresources/values-az-rAZ/strings.xml    | 23 +++---
 .../addresources/values-be-rBY/strings.xml    | 27 ++++---
 .../addresources/values-bg-rBG/strings.xml    | 27 ++++---
 .../addresources/values-bn-rBD/strings.xml    | 27 ++++---
 .../addresources/values-bs-rBA/strings.xml    |  1 +
 .../addresources/values-ca-rES/strings.xml    |  1 +
 .../addresources/values-cs-rCZ/strings.xml    | 27 ++++---
 .../addresources/values-da-rDK/strings.xml    | 27 ++++---
 .../addresources/values-de-rDE/strings.xml    | 27 ++++---
 .../addresources/values-el-rGR/strings.xml    | 61 ++++++++--------
 .../addresources/values-es-rES/strings.xml    | 27 ++++---
 .../addresources/values-et-rEE/strings.xml    | 27 ++++---
 .../addresources/values-eu-rES/strings.xml    |  1 +
 .../addresources/values-fa-rIR/strings.xml    |  1 +
 .../addresources/values-fi-rFI/strings.xml    | 27 ++++---
 .../addresources/values-fil-rPH/strings.xml   | 27 ++++---
 .../addresources/values-fr-rFR/strings.xml    | 27 ++++---
 .../addresources/values-ga-rIE/strings.xml    | 27 ++++---
 .../addresources/values-gl-rES/strings.xml    |  1 +
 .../addresources/values-gu-rIN/strings.xml    |  1 +
 .../addresources/values-hi-rIN/strings.xml    |  1 +
 .../addresources/values-hr-rHR/strings.xml    |  1 +
 .../addresources/values-hu-rHU/strings.xml    | 27 ++++---
 .../addresources/values-hy-rAM/strings.xml    | 27 ++++---
 .../addresources/values-in-rID/strings.xml    | 47 ++++++------
 .../addresources/values-is-rIS/strings.xml    |  1 +
 .../addresources/values-it-rIT/strings.xml    | 27 ++++---
 .../addresources/values-iw-rIL/strings.xml    | 27 ++++---
 .../addresources/values-ja-rJP/strings.xml    | 27 ++++---
 .../addresources/values-ka-rGE/strings.xml    |  1 +
 .../addresources/values-kk-rKZ/strings.xml    |  1 +
 .../addresources/values-km-rKH/strings.xml    |  1 +
 .../addresources/values-kn-rIN/strings.xml    |  1 +
 .../addresources/values-ko-rKR/strings.xml    | 31 ++++----
 .../addresources/values-ky-rKG/strings.xml    |  1 +
 .../addresources/values-lo-rLA/strings.xml    |  1 +
 .../addresources/values-lt-rLT/strings.xml    | 27 ++++---
 .../addresources/values-lv-rLV/strings.xml    | 27 ++++---
 .../addresources/values-mk-rMK/strings.xml    |  1 +
 .../addresources/values-ml-rIN/strings.xml    |  1 +
 .../addresources/values-mn-rMN/strings.xml    |  1 +
 .../addresources/values-mr-rIN/strings.xml    |  1 +
 .../addresources/values-ms-rMY/strings.xml    |  1 +
 .../addresources/values-my-rMM/strings.xml    |  1 +
 .../addresources/values-nb-rNO/strings.xml    |  1 +
 .../addresources/values-ne-rIN/strings.xml    |  1 +
 .../addresources/values-nl-rNL/strings.xml    | 27 ++++---
 .../addresources/values-or-rIN/strings.xml    |  1 +
 .../addresources/values-pa-rIN/strings.xml    |  1 +
 .../addresources/values-pl-rPL/strings.xml    | 27 ++++---
 .../addresources/values-pt-rBR/strings.xml    | 27 ++++---
 .../addresources/values-pt-rPT/strings.xml    | 27 ++++---
 .../addresources/values-ro-rRO/strings.xml    | 27 ++++---
 .../addresources/values-ru-rRU/strings.xml    | 27 ++++---
 .../addresources/values-si-rLK/strings.xml    |  1 +
 .../addresources/values-sk-rSK/strings.xml    | 27 ++++---
 .../addresources/values-sl-rSI/strings.xml    | 27 ++++---
 .../addresources/values-sq-rAL/strings.xml    | 27 ++++---
 .../addresources/values-sr-rCS/strings.xml    | 27 ++++---
 .../addresources/values-sr-rSP/strings.xml    | 27 ++++---
 .../addresources/values-sv-rSE/strings.xml    | 27 ++++---
 .../addresources/values-sw-rKE/strings.xml    |  1 +
 .../addresources/values-ta-rIN/strings.xml    |  1 +
 .../addresources/values-te-rIN/strings.xml    |  1 +
 .../addresources/values-th-rTH/strings.xml    | 27 ++++---
 .../addresources/values-tr-rTR/strings.xml    | 27 ++++---
 .../addresources/values-uk-rUA/strings.xml    | 47 ++++++------
 .../addresources/values-ur-rIN/strings.xml    |  1 +
 .../addresources/values-uz-rUZ/strings.xml    |  1 +
 .../addresources/values-vi-rVN/strings.xml    | 57 ++++++++-------
 .../addresources/values-zh-rCN/strings.xml    | 27 ++++---
 .../addresources/values-zh-rTW/strings.xml    | 71 ++++++++++---------
 .../addresources/values-zu-rZA/strings.xml    |  1 +
 77 files changed, 779 insertions(+), 538 deletions(-)

diff --git a/patches/src/main/resources/addresources/values-af-rZA/strings.xml b/patches/src/main/resources/addresources/values-af-rZA/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-af-rZA/strings.xml
+++ b/patches/src/main/resources/addresources/values-af-rZA/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-am-rET/strings.xml b/patches/src/main/resources/addresources/values-am-rET/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-am-rET/strings.xml
+++ b/patches/src/main/resources/addresources/values-am-rET/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
index 34d523cc3..372761c83 100644
--- a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
+++ b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">تسجيل تصحيح الأخطاء</string>
   <string name="revanced_debug_summary_on">تم تمكين تسجيلات تصحيح الأخطاء</string>
   <string name="revanced_debug_summary_off">تم تعطيل تسجيلات تصحيح الأخطاء</string>
+  <string name="revanced_debug_stacktrace_title">سجل تتبع المكدس</string>
+  <string name="revanced_debug_stacktrace_summary_on">تتضمن سجلات التصحيح سجل تتبع المكدس</string>
+  <string name="revanced_debug_stacktrace_summary_off">لا تتضمن سجلات التصحيح سجل تتبع المكدس</string>
+  <string name="revanced_debug_toast_on_error_title">عرض ملاحظة عند وجود خطأ في ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">يتم عرض ملاحظة في حالة حدوث خطأ</string>
+  <string name="revanced_debug_toast_on_error_summary_off">لا يتم عرض ملاحظة في حالة حدوث خطأ</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"يؤدي إيقاف تشغيل ملاحظات الأخطاء إلى إخفاء كافة إشعارات أخطاء ReVanced.
+
+لن يتم إعلامك بأي أخطاء غير متوقعة."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">تصدير سجلات تصحيح الأخطاء</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">نسخ سجلات تصحيح أخطاء ReVanced إلى الحافظة</string>
   <string name="revanced_debug_logs_disabled">تم تعطيل تسجيلات تصحيح الأخطاء</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 يمكن أن يساعد هذا في تحديد المكونات عند إنشاء عوامل تصفية مخصصة.
 
 ومع ذلك، سيؤدي تمكين هذا أيضًا إلى تسجيل بعض بيانات المستخدم مثل عنوان IP الخاص بك."</string>
-  <string name="revanced_debug_stacktrace_title">سجل تتبع المكدس</string>
-  <string name="revanced_debug_stacktrace_summary_on">تتضمن سجلات التصحيح سجل تتبع المكدس</string>
-  <string name="revanced_debug_stacktrace_summary_off">لا تتضمن سجلات التصحيح سجل تتبع المكدس</string>
-  <string name="revanced_debug_toast_on_error_title">عرض ملاحظة عند وجود خطأ في ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">يتم عرض ملاحظة في حالة حدوث خطأ</string>
-  <string name="revanced_debug_toast_on_error_summary_off">لا يتم عرض ملاحظة في حالة حدوث خطأ</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"يؤدي إيقاف تشغيل ملاحظات الأخطاء إلى إخفاء كافة إشعارات أخطاء ReVanced.
-
-لن يتم إعلامك بأي أخطاء غير متوقعة."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">إخفاء بطاقات الألبوم</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">إخفاء إيقاف الإعلانات</string>
   <string name="revanced_hide_stop_ads_button_summary_on">زر إيقاف الإعلانات مخفي</string>
   <string name="revanced_hide_stop_ads_button_summary_off">زر إيقاف الإعلانات معروض</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">إخفاء التعليقات</string>
+  <string name="revanced_hide_comments_button_summary_on">زر التعليقات مخفي</string>
+  <string name="revanced_hide_comments_button_summary_off">زر التعليقات ظاهر</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">إخفاء الإبلاغ</string>
@@ -1242,8 +1246,9 @@ Second \"item\" text"</string>
 
 إذا تم إيقاف تشغيله لاحقًا، من المستحسن مسح بيانات التطبيق لمنع حدوث أخطاء في واجهة المستخدم."</string>
   <string name="revanced_spoof_app_version_target_title">الهدف من تغيير إصدار التطبيق</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - استعادة أيقونات مشغل Shorts القديمة</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - استعادة أيقونات التنقل القديمة</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - استعادة شريط إجراءات الفيديو غير المطوي</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - استعادة أيقونات مشغل Shorts القديمة</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - استعادة أيقونات التنقل القديمة</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">تغيير صفحة البداية</string>
diff --git a/patches/src/main/resources/addresources/values-as-rIN/strings.xml b/patches/src/main/resources/addresources/values-as-rIN/strings.xml
index 89ca72a06..9ba0d2bf2 100644
--- a/patches/src/main/resources/addresources/values-as-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-as-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-az-rAZ/strings.xml b/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
index 50b6a7bbf..380716891 100644
--- a/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
@@ -107,6 +107,15 @@ Oynatma işləməyə bilər"</string>
   <string name="revanced_debug_title">Sazlama jurnalı</string>
   <string name="revanced_debug_summary_on">Sazlama jurnalı işləkdir</string>
   <string name="revanced_debug_summary_off">Sazlama jurnalı qeyri-aktivdir</string>
+  <string name="revanced_debug_stacktrace_title">Yığın izləri jurnalı</string>
+  <string name="revanced_debug_stacktrace_summary_on">Sazlama jurnalına yığın izləri daxildir</string>
+  <string name="revanced_debug_stacktrace_summary_off">Sazlama jurnalına yığın izləri daxil deyil</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced xətasında ani bildiriş göstər</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Xəta baş verərsə ani bildiriş görünür</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Xəta baş verərsə ani bildiriş görünmür</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Xəta ani bildirişlərin qapatmaq, bütün ReVanced xəta bildirişlərin gizlədir.
+
+Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Sazlama qeydlərini ixrac edin</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">ReVanced sazlama qeydlərini buferə köçürür</string>
   <string name="revanced_debug_logs_disabled">Sazlama qeydi qapalıdır</string>
@@ -151,15 +160,6 @@ Oynatma işləməyə bilər"</string>
 Bu, xüsusi filtrlər yaradarkən quruluşları müəyyən etməyə kömək edə bilər.
 
 Hər halda, bunu aktivləşdirmə IP ünvanınız kimi bəzi istifadəçi məlumatın da daxil edəcək."</string>
-  <string name="revanced_debug_stacktrace_title">Yığın izləri jurnalı</string>
-  <string name="revanced_debug_stacktrace_summary_on">Sazlama jurnalına yığın izləri daxildir</string>
-  <string name="revanced_debug_stacktrace_summary_off">Sazlama jurnalına yığın izləri daxil deyil</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced xətasında ani bildiriş göstər</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Xəta baş verərsə ani bildiriş görünür</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Xəta baş verərsə ani bildiriş görünmür</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Xəta ani bildirişlərin qapatmaq, bütün ReVanced xəta bildirişlərin gizlədir.
-
-Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Albom kartlarını gizlət</string>
@@ -586,6 +586,7 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_hide_stop_ads_button_title">Reklamları Dayandırın-ı gizlət</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Reklamları dayandır düyməsi gizlidir</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Reklamları dayandır düyməsi görünür</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">\"Xəbər verin\"i gizlət</string>
@@ -1241,8 +1242,8 @@ Bu tətbiqin görünüşün və xüsusiyyətlərin dəyişdirəcək, lakin bilin
 
 Sonradan qapadılarsa, UI səhvlərin önləmək üçün tətbiq məlumatların silmək tövsiyə olunur."</string>
   <string name="revanced_spoof_app_version_target_title">Saxta tətbiq versiyası hədəfi</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Köhnə Shorts oynadıcı işarələrin bərpa et</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Köhnə fəaliyyət simvolların bərpa et</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Köhnə Shorts oynadıcı işarələrin bərpa et</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Köhnə fəaliyyət simvolların bərpa et</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Başlatma səhifəsini dəyişdir</string>
diff --git a/patches/src/main/resources/addresources/values-be-rBY/strings.xml b/patches/src/main/resources/addresources/values-be-rBY/strings.xml
index 4e16211e9..194341e8d 100644
--- a/patches/src/main/resources/addresources/values-be-rBY/strings.xml
+++ b/patches/src/main/resources/addresources/values-be-rBY/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Запіс адладкі</string>
   <string name="revanced_debug_summary_on">Журналы адладкі ўключаны</string>
   <string name="revanced_debug_summary_off">Журналы адладкі адключаны</string>
+  <string name="revanced_debug_stacktrace_title">Сляды стэка журнала</string>
+  <string name="revanced_debug_stacktrace_summary_on">Журналы адладкі ўключаюць трасіроўку стэка</string>
+  <string name="revanced_debug_stacktrace_summary_off">Журналы адладкі не ўключаюць трасіроўку стэка</string>
+  <string name="revanced_debug_toast_on_error_title">Паказаць тост пры памылцы ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Паказваць toast у выпадку памылкі</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Не паказваць toast у выпадку памылкі</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Адключэнне паведамленняў пра памылкі схавае ўсе апавяшчэнні ReVanced пра памылкі.
+
+Вы не будзеце атрымліваць апавяшчэнні пра нечаканыя падзеі."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Экспартаваць адладачныя лагі</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Капіруе адладачныя лагі ReVanced у буфер абмену</string>
   <string name="revanced_debug_logs_disabled">Адладачнае лагаванне адключана</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Гэта можа дапамагчы ідэнтыфікаваць кампаненты пры стварэнні карыстацкіх фільтраў.
 
 Аднак уключэнне гэтага параметра таксама будзе запісваць некаторыя даныя карыстальніка, такія як ваш IP-адрас."</string>
-  <string name="revanced_debug_stacktrace_title">Сляды стэка журнала</string>
-  <string name="revanced_debug_stacktrace_summary_on">Журналы адладкі ўключаюць трасіроўку стэка</string>
-  <string name="revanced_debug_stacktrace_summary_off">Журналы адладкі не ўключаюць трасіроўку стэка</string>
-  <string name="revanced_debug_toast_on_error_title">Паказаць тост пры памылцы ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Паказваць toast у выпадку памылкі</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Не паказваць toast у выпадку памылкі</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Адключэнне паведамленняў пра памылкі схавае ўсе апавяшчэнні ReVanced пра памылкі.
-
-Вы не будзеце атрымліваць апавяшчэнні пра нечаканыя падзеі."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Схаваць карты альбома</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Схаваць Спыніць рэкламу</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Кнопка \"Спыніць рэкламу\" схавана</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Кнопка \"Спыніць рэкламу\" паказана</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Схаваць каментарыі</string>
+  <string name="revanced_hide_comments_button_summary_on">Кнопка каментарыяў схавана</string>
+  <string name="revanced_hide_comments_button_summary_off">Кнопка каментарыяў паказана</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Схаваць справаздачу</string>
@@ -1243,8 +1247,9 @@ Second \"item\" text"</string>
 
 Калі пазней будзе адключана, рэкамендуецца ачысціць даныя прыкладання, каб пазбегнуць памылак у інтэрфейсе."</string>
   <string name="revanced_spoof_app_version_target_title">Падробка мэтавай версіі праграмы</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 — Восстановить старые значки плеера Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Аднаўленне старых значкоў навігацыі</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Аднавіць не згорнуты радок дзеянняў відэа</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 — Восстановить старые значки плеера Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Аднаўленне старых значкоў навігацыі</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Змяніць стартавую старонку</string>
diff --git a/patches/src/main/resources/addresources/values-bg-rBG/strings.xml b/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
index 420c5cbde..6d2437fc1 100644
--- a/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
+++ b/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Дневник на отстраняването на грешки</string>
   <string name="revanced_debug_summary_on">Дневникът за остраняване на грешки е активиран</string>
   <string name="revanced_debug_summary_off">Дневникът за остраняване на грешки е деактивиран</string>
+  <string name="revanced_debug_stacktrace_title">Следи от стека на дневника</string>
+  <string name="revanced_debug_stacktrace_summary_on">Дневникът за отстраняване на грешки съдържа следи от стека</string>
+  <string name="revanced_debug_stacktrace_summary_off">Дневникът за отстраняване на грешки не съдържа следи от стека</string>
+  <string name="revanced_debug_toast_on_error_title">Покажи системно съобщение при ReVanced грешка</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Показва се toast, ако възникне грешка</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Не се показва toast, ако възникне грешка</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Изключването на изскачащи съобщения за грешки крие всички известия за грешки на ReVanced.
+
+Няма да бъдете уведомени за неочаквани събития."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Експортиране на логове за отстраняване на грешки</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Копира логовете за отстраняване на грешки на ReVanced в клипборда</string>
   <string name="revanced_debug_logs_disabled">Отстраняването на грешки е деактивирано</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Това може да помогне за идентифициране на компоненти при създаване на персонализирани филтри.
 
 Активирането на тази настройка обаче ще регистрира и някои потребителски данни, като например вашия IP адрес."</string>
-  <string name="revanced_debug_stacktrace_title">Следи от стека на дневника</string>
-  <string name="revanced_debug_stacktrace_summary_on">Дневникът за отстраняване на грешки съдържа следи от стека</string>
-  <string name="revanced_debug_stacktrace_summary_off">Дневникът за отстраняване на грешки не съдържа следи от стека</string>
-  <string name="revanced_debug_toast_on_error_title">Покажи системно съобщение при ReVanced грешка</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Показва се toast, ако възникне грешка</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Не се показва toast, ако възникне грешка</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Изключването на изскачащи съобщения за грешки крие всички известия за грешки на ReVanced.
-
-Няма да бъдете уведомени за неочаквани събития."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">\"Карти на албумите\"</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Скриване на „Спиране на реклами“</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Бутонът за спиране на реклами е скрит</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Бутонът за спиране на реклами е показан</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Скрий коментари</string>
+  <string name="revanced_hide_comments_button_summary_on">Бутонът за коментари е скрит</string>
+  <string name="revanced_hide_comments_button_summary_off">Бутонът за коментари е показан</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Бутон за доклади</string>
@@ -1242,8 +1246,9 @@ Second \"item\" text"</string>
 
 Ако по-късно бъде изключено, препоръчително е да изчистите данните на приложението, за да предотвратите грешки в потребителския интерфейс."</string>
   <string name="revanced_spoof_app_version_target_title">Подлъгване за версията на</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Възстановете старите икони на Shorts в плейъра</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Възстановяване на стари икони за навигация</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Възстановяване на несгъваема лента с действия за видео</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Възстановете старите икони на Shorts в плейъра</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Възстановяване на стари икони за навигация</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Промяна на началната страница</string>
diff --git a/patches/src/main/resources/addresources/values-bn-rBD/strings.xml b/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
index 1baa688da..4f6420605 100644
--- a/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
+++ b/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
@@ -107,6 +107,15 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_debug_title">ডিবাগ লগিং</string>
   <string name="revanced_debug_summary_on">ডিবাগ লগ সক্রিয় হয়েছে</string>
   <string name="revanced_debug_summary_off">ডিবাগ লগ নিষ্ক্রিয় হয়েছে</string>
+  <string name="revanced_debug_stacktrace_title">স্টেক ট্রেস লগ</string>
+  <string name="revanced_debug_stacktrace_summary_on">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে</string>
+  <string name="revanced_debug_stacktrace_summary_off">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে না</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced এর ত্রুটির ক্ষেত্রে টোস্ট দেখান</string>
+  <string name="revanced_debug_toast_on_error_summary_on">যদি ত্রুটি ঘটে তবে toast দেখানো হবে</string>
+  <string name="revanced_debug_toast_on_error_summary_off">যদি ত্রুটি ঘটে তবে toast দেখানো হবে না</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"ত্রুটি \"toast\" বন্ধ করে ReVanced ত্রুটি বিজ্ঞপ্তিগুলি লুকানো হয়।
+
+আপনি কোনও অপ্রত্যাশিত ঘটনার বিষয়ে অবহিত হবেন না।"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">ডিবাগ লগগুলি রফতানি করুন</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">ক্লিপবোর্ডে ReVanced ডিবাগ লগগুলি অনুলিপি করে</string>
   <string name="revanced_debug_logs_disabled">ডিবাগ লগিং নিষ্ক্রিয় করা হয়েছে</string>
@@ -147,15 +156,6 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_debug_protobuffer_summary_on">ডিবাগ লগ প্রটোকল বাফার সংযুক্ত করবে</string>
   <string name="revanced_debug_protobuffer_summary_off">ডিবাগ লগ প্রটোকল বাফার সংযুক্ত করবে না</string>
   <string name="revanced_debug_protobuffer_user_dialog_message">"এই সেটিংস সক্ষম করলে কিছু UI উপাদানের জন্য অন-স্ক্রীন পাঠ্য সহ অতিরিক্ত লেআউট ডেটা লগ করা হবে।\n\nএটি কাস্টম ফিল্টার তৈরি করার সময় উপাদান সনাক্ত করতে সাহায্য করতে পারে।\n\nতবে, এটি সক্রিয় করলে আপনার আইপি ঠিকানার মতো কিছু ব্যবহারকারীর ডেটাও লগ করা হবে।"</string>
-  <string name="revanced_debug_stacktrace_title">স্টেক ট্রেস লগ</string>
-  <string name="revanced_debug_stacktrace_summary_on">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে</string>
-  <string name="revanced_debug_stacktrace_summary_off">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে না</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced এর ত্রুটির ক্ষেত্রে টোস্ট দেখান</string>
-  <string name="revanced_debug_toast_on_error_summary_on">যদি ত্রুটি ঘটে তবে toast দেখানো হবে</string>
-  <string name="revanced_debug_toast_on_error_summary_off">যদি ত্রুটি ঘটে তবে toast দেখানো হবে না</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"ত্রুটি \"toast\" বন্ধ করে ReVanced ত্রুটি বিজ্ঞপ্তিগুলি লুকানো হয়।
-
-আপনি কোনও অপ্রত্যাশিত ঘটনার বিষয়ে অবহিত হবেন না।"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">অ্যালবাম কার্ড লুকান</string>
@@ -582,6 +582,10 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_hide_stop_ads_button_title">বিজ্ঞাপন বন্ধ করুন লুকান</string>
   <string name="revanced_hide_stop_ads_button_summary_on">বিজ্ঞাপন বন্ধ করুন বোতামটি লুকানো আছে</string>
   <string name="revanced_hide_stop_ads_button_summary_off">বিজ্ঞাপন বন্ধ করুন বোতামটি দেখানো হচ্ছে</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">মন্তব্য লুকান</string>
+  <string name="revanced_hide_comments_button_summary_on">মন্তব্য বোতাম লুকানো আছে</string>
+  <string name="revanced_hide_comments_button_summary_off">মন্তব্য বোতাম দেখানো আছে</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Report লুকান</string>
@@ -1238,8 +1242,9 @@ YouTube সেটিংসে অটো প্লে পরিবর্তন 
 
 পরে যদি বন্ধ করা হয়, UI বাগ এড়াতে অ্যাপ্লিকেশন ডেটা পরিষ্কার করার পরামর্শ দেওয়া হয়।"</string>
   <string name="revanced_spoof_app_version_target_title">স্পুফ অ্যাপ সংস্করণ লক্ষ্য</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - পুরনো Shorts প্লেয়ার আইকন পুনরুদ্ধার করুন</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - পুরনো নেভিগেশন আইকন পুনরুদ্ধার করুন</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - প্রসারিত নয় এমন ভিডিও অ্যাকশন বার পুনরুদ্ধার করুন</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - পুরনো Shorts প্লেয়ার আইকন পুনরুদ্ধার করুন</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - পুরনো নেভিগেশন আইকন পুনরুদ্ধার করুন</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">শুরুর পৃষ্ঠা পরিবর্তন করুন</string>
diff --git a/patches/src/main/resources/addresources/values-bs-rBA/strings.xml b/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
+++ b/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ca-rES/strings.xml b/patches/src/main/resources/addresources/values-ca-rES/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ca-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-ca-rES/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml b/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
index 8c092a5c9..c2dc16b0a 100644
--- a/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
@@ -107,6 +107,15 @@ Přehrávání nemusí fungovat"</string>
   <string name="revanced_debug_title">Debugovací záznamy</string>
   <string name="revanced_debug_summary_on">Debugovací záznamy jsou zapnuty</string>
   <string name="revanced_debug_summary_off">Debugovací záznamy jsou vypnuty</string>
+  <string name="revanced_debug_stacktrace_title">Protokolovat trasování zásobníku</string>
+  <string name="revanced_debug_stacktrace_summary_on">Protokoly ladění obsahují trasování zásobníku</string>
+  <string name="revanced_debug_stacktrace_summary_off">Ladící protokoly nezahrnují sledování zásobníku</string>
+  <string name="revanced_debug_toast_on_error_title">Zobrazit oznámení v případě chyby ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Zobrazí se toast, pokud dojde k chybě</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toast se nezobrazí, pokud dojde k chybě</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vypnutí chybových toastů skryje všechna chybová oznámení ReVanced.
+
+Nebudete informováni o žádné neočekávané události."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportovat ladicí protokoly</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Zkopíruje ladicí protokoly ReVanced do schránky</string>
   <string name="revanced_debug_logs_disabled">Ladění je vypnuto</string>
@@ -151,15 +160,6 @@ Přehrávání nemusí fungovat"</string>
 To může pomoci identifikovat komponenty při vytváření vlastních filtrů.
 
 Povolením této možnosti se však budou zaznamenávat i některá uživatelská data, jako je vaše IP adresa."</string>
-  <string name="revanced_debug_stacktrace_title">Protokolovat trasování zásobníku</string>
-  <string name="revanced_debug_stacktrace_summary_on">Protokoly ladění obsahují trasování zásobníku</string>
-  <string name="revanced_debug_stacktrace_summary_off">Ladící protokoly nezahrnují sledování zásobníku</string>
-  <string name="revanced_debug_toast_on_error_title">Zobrazit oznámení v případě chyby ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Zobrazí se toast, pokud dojde k chybě</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toast se nezobrazí, pokud dojde k chybě</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vypnutí chybových toastů skryje všechna chybová oznámení ReVanced.
-
-Nebudete informováni o žádné neočekávané události."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Skrýt karty alb</string>
@@ -586,6 +586,10 @@ Hlasitost se upravuje svislým přejetím po pravé straně obrazovky"</string>
   <string name="revanced_hide_stop_ads_button_title">Skrýt Zastavit reklamy</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Tlačítko pro zastavení reklam je skryté</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Tlačítko pro zastavení reklam je zobrazeno</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Skrýt komentáře</string>
+  <string name="revanced_hide_comments_button_summary_on">Tlačítko komentářů je skryto</string>
+  <string name="revanced_hide_comments_button_summary_off">Tlačítko komentářů je zobrazeno</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Skrýt Nahlásit</string>
@@ -1242,8 +1246,9 @@ To změní vzhled a funkce aplikace, ale mohou se objevit neznámé vedlejší e
 
 Pokud bude později vypnuta, doporučujeme vymazat data aplikace, aby se zabránilo chybám uživatelského rozhraní."</string>
   <string name="revanced_spoof_app_version_target_title">Cíl napodobení verze aplikace</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Obnovuje staré ikony Shorts přehrávače</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Obnovit staré ikony navigace</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Obnovit nerozbalený panel akcí videa</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Obnovuje staré ikony Shorts přehrávače</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Obnovit staré ikony navigace</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Změnit úvodní stránku</string>
diff --git a/patches/src/main/resources/addresources/values-da-rDK/strings.xml b/patches/src/main/resources/addresources/values-da-rDK/strings.xml
index 15af0db71..89b84e2ed 100644
--- a/patches/src/main/resources/addresources/values-da-rDK/strings.xml
+++ b/patches/src/main/resources/addresources/values-da-rDK/strings.xml
@@ -107,6 +107,15 @@ Afspilning fungerer muligvis ikke"</string>
   <string name="revanced_debug_title">Fejlfindingslogning</string>
   <string name="revanced_debug_summary_on">Fejlfindingslogge er aktiveret</string>
   <string name="revanced_debug_summary_off">Fejlfindingslogge er deaktiveret</string>
+  <string name="revanced_debug_stacktrace_title">Logstakspor</string>
+  <string name="revanced_debug_stacktrace_summary_on">Fejlfindingslogge inkluderer stakspor</string>
+  <string name="revanced_debug_stacktrace_summary_off">Fejlfindingslogge inkluderer ikke stakspor</string>
+  <string name="revanced_debug_toast_on_error_title">Vis toastbesked ved ReVanced-fejl</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Toast vises, hvis der opstår en fejl</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toast vises ikke, hvis der opstår en fejl</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Hvis du deaktiverer fejl-toasts, skjules alle ReVanced-fejlmeddelelser.
+
+Du modtager ikke notifikationer om uventede hændelser."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Eksportér fejlsøgningslogfiler</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopierer ReVanced-fejlsøgningslogfiler til udklipsholderen</string>
   <string name="revanced_debug_logs_disabled">Fejlsøgningslogning er deaktiveret</string>
@@ -151,15 +160,6 @@ Afspilning fungerer muligvis ikke"</string>
 Dette kan hjælpe med at identificere komponenter, når der oprettes brugerdefinerede filtre.
 
 Aktivering af dette vil dog også logge nogle brugerdata, såsom din IP-adresse."</string>
-  <string name="revanced_debug_stacktrace_title">Logstakspor</string>
-  <string name="revanced_debug_stacktrace_summary_on">Fejlfindingslogge inkluderer stakspor</string>
-  <string name="revanced_debug_stacktrace_summary_off">Fejlfindingslogge inkluderer ikke stakspor</string>
-  <string name="revanced_debug_toast_on_error_title">Vis toastbesked ved ReVanced-fejl</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Toast vises, hvis der opstår en fejl</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toast vises ikke, hvis der opstår en fejl</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Hvis du deaktiverer fejl-toasts, skjules alle ReVanced-fejlmeddelelser.
-
-Du modtager ikke notifikationer om uventede hændelser."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Skjul albumkort</string>
@@ -586,6 +586,10 @@ Juster lydstyrken ved at swipe lodret i højre side af skærmen"</string>
   <string name="revanced_hide_stop_ads_button_title">Skjul Stop reklamer</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Knappen \"Stop annoncer\" er skjult</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Knappen \"Stop annoncer\" vises</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Skjul kommentarer</string>
+  <string name="revanced_hide_comments_button_summary_on">Kommentarknappen er skjult</string>
+  <string name="revanced_hide_comments_button_summary_off">Kommentarknappen vises</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Skjul Rapport</string>
@@ -1244,8 +1248,9 @@ Dette ændrer appens udseende og funktioner, men ukendte bivirkninger kan foreko
 
 Hvis det senere slås fra, anbefales det at rydde app-dataene for at forhindre UI-fejl."</string>
   <string name="revanced_spoof_app_version_target_title">Spoof app version mål</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Gendan gamle Shorts player ikoner</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Gendan gamle navigationsikoner</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Gendan ikke-kollapset videohandlingslinje</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Gendan gamle Shorts player ikoner</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Gendan gamle navigationsikoner</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Skift startside</string>
diff --git a/patches/src/main/resources/addresources/values-de-rDE/strings.xml b/patches/src/main/resources/addresources/values-de-rDE/strings.xml
index 0efed29ce..e6e92e7bc 100644
--- a/patches/src/main/resources/addresources/values-de-rDE/strings.xml
+++ b/patches/src/main/resources/addresources/values-de-rDE/strings.xml
@@ -107,6 +107,15 @@ Die Wiedergabe funktioniert möglicherweise nicht"</string>
   <string name="revanced_debug_title">Debug-Protokollierung</string>
   <string name="revanced_debug_summary_on">Debug-Protokolle sind aktiviert</string>
   <string name="revanced_debug_summary_off">Debug-Protokolle sind deaktiviert</string>
+  <string name="revanced_debug_stacktrace_title">Stacktraces protokollieren</string>
+  <string name="revanced_debug_stacktrace_summary_on">Debug-Protokolle enthalten Stacktrace</string>
+  <string name="revanced_debug_stacktrace_summary_off">Debug-Logs enthalten keine Stack-Traces</string>
+  <string name="revanced_debug_toast_on_error_title">Toast bei ReVanced Fehler anzeigen</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Ein Toast wird angezeigt, wenn ein Fehler auftritt</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Es wird keine Toast-Nachricht angezeigt, wenn ein Fehler auftritt</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Das Ausschalten von Fehler-Toasts blendet alle Benachrichtigungen über Fehler in ReVanced aus.
+
+Sie werden nicht über unerwartete Ereignisse informiert."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Debug-Protokolle exportieren</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopiert ReVanced-Debug-Protokolle in die Zwischenablage</string>
   <string name="revanced_debug_logs_disabled">Debug-Protokollierung ist deaktiviert</string>
@@ -151,15 +160,6 @@ Die Wiedergabe funktioniert möglicherweise nicht"</string>
 Dies kann helfen, Komponenten bei der Erstellung benutzerdefinierter Filter zu identifizieren.
 
 Wenn Sie dies aktivieren, werden jedoch auch einige Benutzerdaten wie Ihre IP-Adresse protokolliert."</string>
-  <string name="revanced_debug_stacktrace_title">Stacktraces protokollieren</string>
-  <string name="revanced_debug_stacktrace_summary_on">Debug-Protokolle enthalten Stacktrace</string>
-  <string name="revanced_debug_stacktrace_summary_off">Debug-Logs enthalten keine Stack-Traces</string>
-  <string name="revanced_debug_toast_on_error_title">Toast bei ReVanced Fehler anzeigen</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Ein Toast wird angezeigt, wenn ein Fehler auftritt</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Es wird keine Toast-Nachricht angezeigt, wenn ein Fehler auftritt</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Das Ausschalten von Fehler-Toasts blendet alle Benachrichtigungen über Fehler in ReVanced aus.
-
-Sie werden nicht über unerwartete Ereignisse informiert."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Albumkarten ausblenden</string>
@@ -583,6 +583,10 @@ Passen Sie die Helligkeit an, indem Sie auf der linken Seite des Bildschirms ver
   <string name="revanced_hide_stop_ads_button_title">Werbung stoppen ausblenden</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Schaltfläche \"Werbung stoppen\" ist ausgeblendet</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Schaltfläche \"Werbung stoppen\" ist sichtbar</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Kommentare ausblenden</string>
+  <string name="revanced_hide_comments_button_summary_on">Kommentare-Schaltfläche ist ausgeblendet</string>
+  <string name="revanced_hide_comments_button_summary_off">Kommentare-Schaltfläche wird angezeigt</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Bericht ausblenden</string>
@@ -1239,8 +1243,9 @@ Dadurch ändert sich das Erscheinungsbild und die Funktionen der App, es können
 
 Wenn Sie die Funktion später deaktivieren, wird empfohlen, die App-Daten zu löschen, um UI-Fehler zu vermeiden."</string>
   <string name="revanced_spoof_app_version_target_title">Spoof-App-Versionsziel</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Alte Shorts Spielersymbole wiederherstellen</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Alte Navigations-Symbole wiederherstellen</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Nicht eingeklappte Video-Aktionsleiste wiederherstellen</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Alte Shorts Spielersymbole wiederherstellen</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Alte Navigations-Symbole wiederherstellen</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Startseite ändern</string>
diff --git a/patches/src/main/resources/addresources/values-el-rGR/strings.xml b/patches/src/main/resources/addresources/values-el-rGR/strings.xml
index 478bc23c8..9bbf30c50 100644
--- a/patches/src/main/resources/addresources/values-el-rGR/strings.xml
+++ b/patches/src/main/resources/addresources/values-el-rGR/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Καταγραφή εντοπισμού σφαλμάτων</string>
   <string name="revanced_debug_summary_on">Η καταγραφή εντοπισμού σφαλμάτων είναι ενεργοποιημένη</string>
   <string name="revanced_debug_summary_off">Η καταγραφή εντοπισμού σφαλμάτων είναι απενεργοποιημένη</string>
+  <string name="revanced_debug_stacktrace_title">Καταγραφή ιχνών στοίβας</string>
+  <string name="revanced_debug_stacktrace_summary_on">Τα αρχεία καταγραφής σφαλμάτων περιλαμβάνουν ίχνη στοίβας</string>
+  <string name="revanced_debug_stacktrace_summary_off">Τα αρχεία καταγραφής σφαλμάτων δεν περιλαμβάνουν ίχνη στοίβας</string>
+  <string name="revanced_debug_toast_on_error_title">Εμφάνιση μηνυμάτων σφαλμάτων ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Εμφανίζεται μήνυμα στο κάτω μέρος της οθόνης αν προκύψει σφάλμα</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Δεν εμφανίζεται μήνυμα στο κάτω μέρος της οθόνης αν προκύψει σφάλμα</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Η απενεργοποίηση των μηνυμάτων σφαλμάτων κρύβει όλες τις ειδοποιήσεις σφαλμάτων που αφορούν το ReVanced.
+
+Δεν θα ειδοποιηθείτε για τυχόν απρόβλεπτα γεγονότα."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Εξαγωγή αρχείων καταγραφής εντοπισμού σφαλμάτων</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Αντιγραφή των αρχείων καταγραφής εντοπισμού σφαλμάτων ReVanced στο πρόχειρο</string>
   <string name="revanced_debug_logs_disabled">Η καταγραφή εντοπισμού σφαλμάτων είναι απενεργοποιημένη</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Αυτό μπορεί να βοηθήσει στον εντοπισμό στοιχείων κατά τη δημιουργία προσαρμοσμένων φίλτρων.
 
 Ωστόσο, η ενεργοποίηση αυτής της ρύθμισης θα καταγράψει επίσης ορισμένα δεδομένα χρήστη, όπως τη διεύθυνση IP σας."</string>
-  <string name="revanced_debug_stacktrace_title">Καταγραφή ιχνών στοίβας</string>
-  <string name="revanced_debug_stacktrace_summary_on">Τα αρχεία καταγραφής σφαλμάτων περιλαμβάνουν ίχνη στοίβας</string>
-  <string name="revanced_debug_stacktrace_summary_off">Τα αρχεία καταγραφής σφαλμάτων δεν περιλαμβάνουν ίχνη στοίβας</string>
-  <string name="revanced_debug_toast_on_error_title">Εμφάνιση μηνυμάτων σφαλμάτων ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Εμφανίζεται μήνυμα στο κάτω μέρος της οθόνης αν προκύψει σφάλμα</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Δεν εμφανίζεται μήνυμα στο κάτω μέρος της οθόνης αν προκύψει σφάλμα</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Η απενεργοποίηση των μηνυμάτων σφαλμάτων κρύβει όλες τις ειδοποιήσεις σφαλμάτων που αφορούν το ReVanced.
-
-Δεν θα ειδοποιηθείτε για τυχόν απρόβλεπτα γεγονότα."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Κάρτες άλμπουμ</string>
@@ -588,6 +588,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Κουμπί «Διακοπή διαφημίσεων»</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Κρυμμένο</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Εμφανίζεται</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Απόκρυψη σχολίων</string>
+  <string name="revanced_hide_comments_button_summary_on">Κρυμμένο</string>
+  <string name="revanced_hide_comments_button_summary_off">Εμφανίζεται</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Μενού «Αναφορά»</string>
@@ -1243,8 +1247,9 @@ Second \"item\" text"</string>
 
 Αν αργότερα απενεργοποιηθεί, συνιστάται η εκκαθάριση δεδομένων της εφαρμογής για την αποφυγή σφαλμάτων UI."</string>
   <string name="revanced_spoof_app_version_target_title">Έκδοση παραποίησης της εφαρμογής</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Επαναφορά των παλιών εικονιδίων της οθόνης αναπαραγωγής Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Επαναφορά παλιών εικονιδίων γραμμής πλοήγησης</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Επαναφορά της μη συμπτυγμένης γραμμής ενεργειών βίντεο</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Επαναφορά των παλιών εικονιδίων της οθόνης αναπαραγωγής Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Επαναφορά παλιών εικονιδίων γραμμής πλοήγησης</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Αλλαγή αρχικής σελίδας</string>
@@ -1585,7 +1590,7 @@ Second \"item\" text"</string>
   <string name="revanced_music_play_permanent_repeat_summary_off">Η μόνιμη επανάληψη είναι απενεργοποιημένη</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
-  <string name="revanced_music_hide_cast_button_title">Απόκρυψη κουμπιού μετάδοσης</string>
+  <string name="revanced_music_hide_cast_button_title">Κουμπί μετάδοσης</string>
   <string name="revanced_music_hide_cast_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_cast_button_summary_off">Εμφανίζεται</string>
   </patch>
@@ -1596,30 +1601,30 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.navigationbar.navigationBarPatch">
   <string name="revanced_music_navigation_bar_screen_title">Γραμμή πλοήγησης</string>
-  <string name="revanced_music_navigation_bar_screen_summary">Απόκρυψη ή αλλαγή κουμπιών γραμμής πλοήγησης</string>
+  <string name="revanced_music_navigation_bar_screen_summary">Απόκρυψη ή αλλαγή κουμπιών της γραμμής πλοήγησης</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Απόκρυψη κουμπιού Αρχικής οθόνης</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Κουμπί «Αρχική»</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Εμφανίζεται</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Απόκρυψη κουμπιού Δειγμάτων</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Το κουμπί «Δείγματα» είναι κρυμμένο</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Το κουμπί «Δείγματα» εμφανίζεται</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Κουμπί «Δείγματα»</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Κρυμμένο</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Εμφανίζεται</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Απόκρυψη κουμπιού Εξερεύνησης</string>
-  <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Το κουμπί «Εξερεύνηση» είναι κρυμμένο</string>
-  <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Το κουμπί «Εξερεύνηση» εμφανίζεται</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Κουμπί «Εξερεύνηση»</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Κρυμμένο</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Εμφανίζεται</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Απόκρυψη κουμπιού Βιβλιοθήκης</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Το κουμπί «Βιβλιοθήκη» είναι κρυμμένο</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Το κουμπί «Βιβλιοθήκη» εμφανίζεται</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Κουμπί «Βιβλιοθήκη»</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Κρυμμένο</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Εμφανίζεται</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Απόκρυψη κουμπιού «Αναβάθμιση»</string>
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Το κουμπί «Αναβάθμιση» είναι κρυμμένο</string>
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Το κουμπί «Αναβάθμιση» εμφανίζεται</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Κουμπί «Αναβάθμιση»</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Κρυμμένο</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Εμφανίζεται</string>
   <string name="revanced_music_hide_navigation_bar_title">Γραμμή πλοήγησης</string>
-  <string name="revanced_music_hide_navigation_bar_summary_on">Η γραμμή πλοήγησης θα είναι κρυμμένη κατά την αναπαραγωγή Shorts</string>
-  <string name="revanced_music_hide_navigation_bar_summary_off">Η γραμμή πλοήγησης εμφανίζεται κατά την αναπαραγωγή Shorts</string>
+  <string name="revanced_music_hide_navigation_bar_summary_on">Κρυμμένη</string>
+  <string name="revanced_music_hide_navigation_bar_summary_off">Εμφανίζεται</string>
   <string name="revanced_music_hide_navigation_bar_labels_title">Ονομασίες κουμπιών γραμμής πλοήγησης</string>
   <string name="revanced_music_hide_navigation_bar_labels_summary_on">Κρυμμένες</string>
   <string name="revanced_music_hide_navigation_bar_labels_summary_off">Εμφανίζονται</string>
diff --git a/patches/src/main/resources/addresources/values-es-rES/strings.xml b/patches/src/main/resources/addresources/values-es-rES/strings.xml
index fa88a6fa4..dd8a21277 100644
--- a/patches/src/main/resources/addresources/values-es-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-es-rES/strings.xml
@@ -107,6 +107,15 @@ La reproducción podría no funcionar"</string>
   <string name="revanced_debug_title">Registro de depuración</string>
   <string name="revanced_debug_summary_on">Los registros de depuración están habilitados</string>
   <string name="revanced_debug_summary_off">Los registros de depuración están desactivados</string>
+  <string name="revanced_debug_stacktrace_title">Registrar stack traces</string>
+  <string name="revanced_debug_stacktrace_summary_on">Los registros de depuración incluyen stack trace</string>
+  <string name="revanced_debug_stacktrace_summary_off">Los registros de depuración no incluyen stack trace</string>
+  <string name="revanced_debug_toast_on_error_title">Mostrar aviso de error en ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Se mostrará un aviso si se produce un error</string>
+  <string name="revanced_debug_toast_on_error_summary_off">No se mostrará un aviso si se produce un error</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Desactivar los avisos de error oculta todas las notificaciones de error de ReVanced.
+
+No se le notificará de ningún evento inesperado."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportar registros de depuración</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copia los registros de depuración de ReVanced al portapapeles</string>
   <string name="revanced_debug_logs_disabled">El registro de depuración está desactivado</string>
@@ -151,15 +160,6 @@ La reproducción podría no funcionar"</string>
 Esto puede ayudar a identificar componentes al crear filtros personalizados.
 
 Sin embargo, si activas esto, también se registrarán algunos datos del usuario, como tu dirección IP."</string>
-  <string name="revanced_debug_stacktrace_title">Registrar stack traces</string>
-  <string name="revanced_debug_stacktrace_summary_on">Los registros de depuración incluyen stack trace</string>
-  <string name="revanced_debug_stacktrace_summary_off">Los registros de depuración no incluyen stack trace</string>
-  <string name="revanced_debug_toast_on_error_title">Mostrar aviso de error en ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Se mostrará un aviso si se produce un error</string>
-  <string name="revanced_debug_toast_on_error_summary_off">No se mostrará un aviso si se produce un error</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Desactivar los avisos de error oculta todas las notificaciones de error de ReVanced.
-
-No se le notificará de ningún evento inesperado."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Ocultar tarjetas de álbum</string>
@@ -586,6 +586,10 @@ Ajusta el volumen deslizando verticalmente en el lado derecho de la pantalla"</s
   <string name="revanced_hide_stop_ads_button_title">Ocultar Detener anuncios</string>
   <string name="revanced_hide_stop_ads_button_summary_on">El botón de detener anuncios está oculto</string>
   <string name="revanced_hide_stop_ads_button_summary_off">El botón de detener anuncios está mostrado</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ocultar comentarios</string>
+  <string name="revanced_hide_comments_button_summary_on">El botón de comentarios está oculto</string>
+  <string name="revanced_hide_comments_button_summary_off">El botón de comentarios es visible</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Ocultar informe</string>
@@ -1233,8 +1237,9 @@ Esto cambiará la apariencia y las características de la aplicación, pero pued
 
 Si se desactiva posteriormente, se recomienda borrar los datos de la aplicación para evitar errores en la interfaz de usuario."</string>
   <string name="revanced_spoof_app_version_target_title">Versión objetiva de aplicación falsificada</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Restaurar iconos antiguos del reproductor de Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Restaurar iconos de navegación antiguos</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Restaurar barra de acciones de vídeo no colapsada</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Restaurar iconos antiguos del reproductor de Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Restaurar iconos de navegación antiguos</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Cambiar página de inicio</string>
diff --git a/patches/src/main/resources/addresources/values-et-rEE/strings.xml b/patches/src/main/resources/addresources/values-et-rEE/strings.xml
index e01a31817..ea644518c 100644
--- a/patches/src/main/resources/addresources/values-et-rEE/strings.xml
+++ b/patches/src/main/resources/addresources/values-et-rEE/strings.xml
@@ -107,6 +107,15 @@ Taasesitus ei pruugi töötada"</string>
   <string name="revanced_debug_title">Veaotsingulogimine</string>
   <string name="revanced_debug_summary_on">Veaotsingulogimine on lubatud</string>
   <string name="revanced_debug_summary_off">Vea logid on keelatud</string>
+  <string name="revanced_debug_stacktrace_title">Logi stekira jäljed</string>
+  <string name="revanced_debug_stacktrace_summary_on">Silumispäevikud sisaldavad virna jäljendamise</string>
+  <string name="revanced_debug_stacktrace_summary_off">Silumispäevikud ei sisalda virna jäljendamise</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced veaga ilmumisel kuvag</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Toast kuvatakse, kui ilmneb tõrge</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toast ei kuvata, kui ilmneb tõrge</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vea teadete väljalülitamine peidab kõik ReVanced i veateadete märguanded.
+
+Teid ei teavitata ühestki ootamatust sündmusest."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Ekspordi silumislogid</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopeerib ReVanced silumislogid lõikelauale</string>
   <string name="revanced_debug_logs_disabled">Silumislogimine on keelatud</string>
@@ -151,15 +160,6 @@ Taasesitus ei pruugi töötada"</string>
 See võib aidata komponente tuvastada kohandatud filtrite loomisel.
 
 Selle lubamine logib aga ka mõningaid kasutajaandmeid, näiteks teie IP-aadressi."</string>
-  <string name="revanced_debug_stacktrace_title">Logi stekira jäljed</string>
-  <string name="revanced_debug_stacktrace_summary_on">Silumispäevikud sisaldavad virna jäljendamise</string>
-  <string name="revanced_debug_stacktrace_summary_off">Silumispäevikud ei sisalda virna jäljendamise</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced veaga ilmumisel kuvag</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Toast kuvatakse, kui ilmneb tõrge</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toast ei kuvata, kui ilmneb tõrge</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vea teadete väljalülitamine peidab kõik ReVanced i veateadete märguanded.
-
-Teid ei teavitata ühestki ootamatust sündmusest."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Peida albumikaardid</string>
@@ -586,6 +586,10 @@ Helitugevuse reguleerimiseks pühkige ekraani paremal küljel vertikaalselt"</st
   <string name="revanced_hide_stop_ads_button_title">Peida reklaamide peatamine</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Peata reklaamide nupp on peidetud</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Peata reklaamide nupp on nähtav</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Peida kommentaarid</string>
+  <string name="revanced_hide_comments_button_summary_on">Kommentaaride nupp on peidetud</string>
+  <string name="revanced_hide_comments_button_summary_off">Kommentaaride nupp on nähtav</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Peida Teata</string>
@@ -1242,8 +1246,9 @@ See muudab rakenduse välimust ja funktsioone, kuid võivad esineda tundmatud k
 
 Kui see hiljem välja lülitatakse, on soovitatav rakenduse andmed kustutada, et vältida kasutajaliidese vigu."</string>
   <string name="revanced_spoof_app_version_target_title">Võltsitud rakenduse versiooni siht</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Taastage vanad Shortsi esitajaikoonid</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Taasta vanad navigeerimisikoonid</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Taasta mittekokkuvarisenud video tegevusriba</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Taastage vanad Shortsi esitajaikoonid</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Taasta vanad navigeerimisikoonid</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Muuda alguslehte</string>
diff --git a/patches/src/main/resources/addresources/values-eu-rES/strings.xml b/patches/src/main/resources/addresources/values-eu-rES/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-eu-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-eu-rES/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-fa-rIR/strings.xml b/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
index b3632d5ff..815c5a1a3 100644
--- a/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
+++ b/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
@@ -136,6 +136,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-fi-rFI/strings.xml b/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
index 037cb4823..79792375f 100644
--- a/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
+++ b/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
@@ -107,6 +107,15 @@ Toisto ei ehkä toimi"</string>
   <string name="revanced_debug_title">Virheenkorjauksen kirjaaminen</string>
   <string name="revanced_debug_summary_on">Virheenkorjauslokit ovat käytössä</string>
   <string name="revanced_debug_summary_off">Virheenkorjauslokit eivät ole käytössä</string>
+  <string name="revanced_debug_stacktrace_title">Loki pinojäljet</string>
+  <string name="revanced_debug_stacktrace_summary_on">Vianetsintälokit sisältävät pinojäljet</string>
+  <string name="revanced_debug_stacktrace_summary_off">Vianetsintälokit eivät sisällä pinojälkiä</string>
+  <string name="revanced_debug_toast_on_error_title">Näytä ponnahdusilmoitus ReVanced-virheen tapahtuessa</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Ponnahdusilmoitus näytetään virheen tapahtuessa</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Ponnahdusilmoitusta ei näytetä virheen tapahtuessa</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Virheilmoitusten poistaminen käytöstä piilottaa kaikki ReVancedin virheilmoitukset.
+
+Et saa ilmoituksia odottamattomista tapahtumista."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Vie virheenkorjauslokit</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopioi ReVancedin virheenkorjauslokit leikepöydälle</string>
   <string name="revanced_debug_logs_disabled">Virheenkorjausloki ei ole käytössä</string>
@@ -151,15 +160,6 @@ Toisto ei ehkä toimi"</string>
 Tämä voi auttaa komponenttien tunnistamisessa, kun luot mukautettuja suodattimia.
 
 Tämän käyttöönotto kirjaa myös joitakin käyttäjätietoja, kuten IP-osoitteesi."</string>
-  <string name="revanced_debug_stacktrace_title">Loki pinojäljet</string>
-  <string name="revanced_debug_stacktrace_summary_on">Vianetsintälokit sisältävät pinojäljet</string>
-  <string name="revanced_debug_stacktrace_summary_off">Vianetsintälokit eivät sisällä pinojälkiä</string>
-  <string name="revanced_debug_toast_on_error_title">Näytä ponnahdusilmoitus ReVanced-virheen tapahtuessa</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Ponnahdusilmoitus näytetään virheen tapahtuessa</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Ponnahdusilmoitusta ei näytetä virheen tapahtuessa</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Virheilmoitusten poistaminen käytöstä piilottaa kaikki ReVancedin virheilmoitukset.
-
-Et saa ilmoituksia odottamattomista tapahtumista."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Piilota albumikortit</string>
@@ -586,6 +586,10 @@ Säädä äänenvoimakkuutta pyyhkäisemällä pystysuoraan näytön oikealta pu
   <string name="revanced_hide_stop_ads_button_title">Piilota \"Estä mainokset\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Estä mainokset -painike on piilotettu</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Estä mainokset -painike näytetään</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Piilota kommentit</string>
+  <string name="revanced_hide_comments_button_summary_on">Kommenttipainike on piilotettu</string>
+  <string name="revanced_hide_comments_button_summary_off">Kommenttipainike näytetään</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Piilota Tee ilmoitus</string>
@@ -1242,8 +1246,9 @@ Tämä muuttaa sovelluksen ulkoasua ja ominaisuuksia, mutta tuntemattomia sivuva
 
 Jos tämä poistetaan myöhemmin käytöstä, on suositeltavaa tyhjentää sovelluksen tiedot käyttöliittymävirheiden välttämiseksi."</string>
   <string name="revanced_spoof_app_version_target_title">Naamioitava kohdeversio</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Palauta vanhat Shorts-soittimen kuvakkeet</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Palauta vanhat navigointikuvakkeet</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Palauta laajennettu videon toimintopalkki</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Palauta vanhat Shorts-soittimen kuvakkeet</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Palauta vanhat navigointikuvakkeet</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Vaihda aloitussivua</string>
diff --git a/patches/src/main/resources/addresources/values-fil-rPH/strings.xml b/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
index 735bc7e49..bfb4ac8e5 100644
--- a/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
+++ b/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
@@ -107,6 +107,15 @@ Maaaring hindi gumana ang pag-playback"</string>
   <string name="revanced_debug_title">Pag-log sa pag-debug</string>
   <string name="revanced_debug_summary_on">Ang mga debug log ay pinagana</string>
   <string name="revanced_debug_summary_off">Ang mga debug log ay hindi pinagana</string>
+  <string name="revanced_debug_stacktrace_title">Mga bakas ng stack ng log</string>
+  <string name="revanced_debug_stacktrace_summary_on">Kasama sa mga debug log ang stack trace</string>
+  <string name="revanced_debug_stacktrace_summary_off">Hindi kasama sa mga debug log ang stack trace</string>
+  <string name="revanced_debug_toast_on_error_title">Ipakita ang toast sa ReVanced error</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Ipinapakita ang Toast kung may naganap na error</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Hindi ipinapakita ang Toast kung may naganap na error</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Ang pag-off ng mga toast ng error ay nagtatago ng lahat ng mga abiso ng error ng ReVanced.
+
+Hindi ka aabisuhan ng anumang hindi inaasahang mga kaganapan."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">I-export ang mga debug log</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kinokopya ang mga ReVanced debug log sa clipboard</string>
   <string name="revanced_debug_logs_disabled">Hindi pinagana ang pag-log ng debug</string>
@@ -151,15 +160,6 @@ Maaaring hindi gumana ang pag-playback"</string>
 Maaaring makatulong ito na matukoy ang mga bahagi kapag lumilikha ng mga custom na filter.
 
 Gayunpaman, ang pagpapagana nito ay magtatala rin ng ilang data ng user gaya ng iyong IP address."</string>
-  <string name="revanced_debug_stacktrace_title">Mga bakas ng stack ng log</string>
-  <string name="revanced_debug_stacktrace_summary_on">Kasama sa mga debug log ang stack trace</string>
-  <string name="revanced_debug_stacktrace_summary_off">Hindi kasama sa mga debug log ang stack trace</string>
-  <string name="revanced_debug_toast_on_error_title">Ipakita ang toast sa ReVanced error</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Ipinapakita ang Toast kung may naganap na error</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Hindi ipinapakita ang Toast kung may naganap na error</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Ang pag-off ng mga toast ng error ay nagtatago ng lahat ng mga abiso ng error ng ReVanced.
-
-Hindi ka aabisuhan ng anumang hindi inaasahang mga kaganapan."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Itago ang mga album card</string>
@@ -586,6 +586,10 @@ Ayusin ang volume sa pamamagitan ng pag-swipe nang patayo sa kanang bahagi ng sc
   <string name="revanced_hide_stop_ads_button_title">Itago ang Ihinto ang mga ad</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Nakatago ang button ng pagtigil sa mga ad</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Napakita ang button ng pagtigil sa mga ad</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Itago ang mga Komento</string>
+  <string name="revanced_hide_comments_button_summary_on">Nakatago ang pindutan ng Mga Komento</string>
+  <string name="revanced_hide_comments_button_summary_off">Ipinapakita ang pindutan ng Mga Komento</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Itago ang Ulat</string>
@@ -1240,8 +1244,9 @@ Ito ay magbabago sa hitsura at mga tampok ng app, ngunit maaaring mangyari ang m
 
 Kung mamaya ay patayin, inirerekumenda na i-clear ang data ng app upang maiwasan ang mga bug ng UI."</string>
   <string name="revanced_spoof_app_version_target_title">Target na bersyon ng Spoof app</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Ibalik ang mga lumang icon ng Shorts player</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Ibalik ang mga lumang icon ng navigation</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Ibalik ang hindi nakatiklop na video action bar</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Ibalik ang mga lumang icon ng Shorts player</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Ibalik ang mga lumang icon ng navigation</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Baguhin ang panimulang pahina</string>
diff --git a/patches/src/main/resources/addresources/values-fr-rFR/strings.xml b/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
index 0678f2e4c..62dce95f4 100644
--- a/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
+++ b/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
@@ -107,6 +107,15 @@ Il est possible que la lecture ne fonctionne pas"</string>
   <string name="revanced_debug_title">Journalisation de débogage</string>
   <string name="revanced_debug_summary_on">Les journaux de débogage sont activés</string>
   <string name="revanced_debug_summary_off">Les journaux de débogage sont désactivés</string>
+  <string name="revanced_debug_stacktrace_title">Journaliser les stack traces</string>
+  <string name="revanced_debug_stacktrace_summary_on">Les journaux de débogage incluent les stack traces</string>
+  <string name="revanced_debug_stacktrace_summary_off">Les journaux de débogage n\'incluent pas les stack traces</string>
+  <string name="revanced_debug_toast_on_error_title">Afficher un message toast en cas d\'erreur ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Un message toast est affiché en cas d\'erreur</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Aucun message toast n\'est affiché en cas d\'erreur</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"La désactivation des messages toasts d'erreur masque toutes les notifications d'erreur ReVanced.
+
+Vous ne serez pas informé des événements inattendus."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exporter les journaux de débogage</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copie les journaux de débogage ReVanced dans le presse-papiers</string>
   <string name="revanced_debug_logs_disabled">La journalisation de débogage est désactivée</string>
@@ -151,15 +160,6 @@ Il est possible que la lecture ne fonctionne pas"</string>
 Cela peut aider à identifier les composants lors de la création de filtres personnalisés.
 
 Toutefois, l'activation de cette option entraînera également l'enregistrement de certaines données utilisateur, telles que votre adresse IP."</string>
-  <string name="revanced_debug_stacktrace_title">Journaliser les stack traces</string>
-  <string name="revanced_debug_stacktrace_summary_on">Les journaux de débogage incluent les stack traces</string>
-  <string name="revanced_debug_stacktrace_summary_off">Les journaux de débogage n\'incluent pas les stack traces</string>
-  <string name="revanced_debug_toast_on_error_title">Afficher un message toast en cas d\'erreur ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Un message toast est affiché en cas d\'erreur</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Aucun message toast n\'est affiché en cas d\'erreur</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"La désactivation des messages toasts d'erreur masque toutes les notifications d'erreur ReVanced.
-
-Vous ne serez pas informé des événements inattendus."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Masquer les fiches d\'album</string>
@@ -586,6 +586,10 @@ Réglez le volume en balayant verticalement sur le côté droit de l'écran"</st
   <string name="revanced_hide_stop_ads_button_title">Masquer \"Zéro annonce\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Le bouton Zéro annonce est masqué</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Le bouton Zéro annonce est affiché</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Masquer les commentaires</string>
+  <string name="revanced_hide_comments_button_summary_on">Le bouton Commentaires est masqué</string>
+  <string name="revanced_hide_comments_button_summary_off">Le bouton Commentaires est affiché</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Masquer \"Signaler\"</string>
@@ -1243,8 +1247,9 @@ Cela modifiera l'apparence et les fonctionnalités de l'application, mais il peu
 
 Si désactivé ultérieurement, il est recommandé d'effacer les données de l'application pour éviter des bugs d'interface."</string>
   <string name="revanced_spoof_app_version_target_title">Version cible</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Restaurer les anciennes icônes du lecteur Shorts </string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Restaurer les anciennes icônes de navigation</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Restaurer la barre d\'action vidéo non réduite</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Restaurer les anciennes icônes du lecteur Shorts </string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Restaurer les anciennes icônes de navigation</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Modifier la page de démarrage</string>
diff --git a/patches/src/main/resources/addresources/values-ga-rIE/strings.xml b/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
index 739a8164a..8529535f1 100644
--- a/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
+++ b/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
@@ -107,6 +107,15 @@ Seans nach n-oibreoidh an t-athsheinm"</string>
   <string name="revanced_debug_title">Dífhabhtú logáil</string>
   <string name="revanced_debug_summary_on">Tá logaí dífhabhtaithe cumasaithe</string>
   <string name="revanced_debug_summary_off">Tá logaí dífhabhtaithe díchumasaithe</string>
+  <string name="revanced_debug_stacktrace_title">Rianta cruach logála</string>
+  <string name="revanced_debug_stacktrace_summary_on">Cuimsíonn logaí dífhabhtaithe rian cruach</string>
+  <string name="revanced_debug_stacktrace_summary_off">Ní chuimsíonn logaí dífhabhtaithe rian cruach</string>
+  <string name="revanced_debug_toast_on_error_title">Taispeáin tósta ar earráid ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Taispeántar tósta má tharlaíonn earráid</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Ní thaispeántar tósta má tharlaíonn earráid</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Má mhúchtar tóstaí earráide, folaítear gach fógra earráide ReVanced.
+
+Ní chuirfear ar an eolas thú faoi aon imeachtaí gan choinne."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Easpórtáil logaí dífhabhtaithe</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Cóipeálann sé logaí dífhabhtaithe ReVanced chuig an gearrthaisce</string>
   <string name="revanced_debug_logs_disabled">Tá logáil dífhabhtaithe díchumasaithe</string>
@@ -151,15 +160,6 @@ Seans nach n-oibreoidh an t-athsheinm"</string>
 Is féidir leis seo cabhrú le comhpháirteanna a aithint agus scagairí saincheaptha á gcruthú.
 
 Mar sin féin, logálfaidh sé seo roinnt sonraí úsáideora freisin, mar shampla do sheoladh IP."</string>
-  <string name="revanced_debug_stacktrace_title">Rianta cruach logála</string>
-  <string name="revanced_debug_stacktrace_summary_on">Cuimsíonn logaí dífhabhtaithe rian cruach</string>
-  <string name="revanced_debug_stacktrace_summary_off">Ní chuimsíonn logaí dífhabhtaithe rian cruach</string>
-  <string name="revanced_debug_toast_on_error_title">Taispeáin tósta ar earráid ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Taispeántar tósta má tharlaíonn earráid</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Ní thaispeántar tósta má tharlaíonn earráid</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Má mhúchtar tóstaí earráide, folaítear gach fógra earráide ReVanced.
-
-Ní chuirfear ar an eolas thú faoi aon imeachtaí gan choinne."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Folaigh cártaí albam</string>
@@ -586,6 +586,10 @@ Coigeartaigh an toirt trí haisceartán go hingearach ar thaobh deas an scáile
   <string name="revanced_hide_stop_ads_button_title">Folaigh Stad fógraí</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Tá cnaipe stad fógraí i bhfolach</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Tá cnaipe stad fógraí taispeánta</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Folaigh Tuairimí</string>
+  <string name="revanced_hide_comments_button_summary_on">Tá cnaipe na dTuairimí folaithe</string>
+  <string name="revanced_hide_comments_button_summary_off">Tá cnaipe na dTuairimí taispeánta</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Folaigh Tuairisc</string>
@@ -1242,8 +1246,9 @@ Athróidh sé seo cuma agus gnéithe an aip, ach d'fhéadfadh fo-iarsmaí anaith
 
 Má dhiúltaítear é níos déanaí, moltar sonraí an aip a ghlanadh chun buganna UI a chosc."</string>
   <string name="revanced_spoof_app_version_target_title">Sprioc leagan aip spoof</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Athchóirigh sean-deilbhíní imreoir Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Athchóiriú Sean Icóin Treorach</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Cuir an barra gníomhaíochta físe neamhchomhbhrúite ar ais</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Athchóirigh sean-deilbhíní imreoir Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Athchóiriú Sean Icóin Treorach</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Athraigh an leathanach tosaigh</string>
diff --git a/patches/src/main/resources/addresources/values-gl-rES/strings.xml b/patches/src/main/resources/addresources/values-gl-rES/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-gl-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-gl-rES/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-gu-rIN/strings.xml b/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-hi-rIN/strings.xml b/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-hr-rHR/strings.xml b/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
+++ b/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-hu-rHU/strings.xml b/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
index b9809e8b6..50f394e38 100644
--- a/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
+++ b/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
@@ -107,6 +107,15 @@ A lejátszás nem működhet"</string>
   <string name="revanced_debug_title">Hibakeresési naplózás</string>
   <string name="revanced_debug_summary_on">A hibakeresési naplók engedélyezve vannak</string>
   <string name="revanced_debug_summary_off">A hibakeresési naplók le vannak tiltva</string>
+  <string name="revanced_debug_stacktrace_title">Naplóverem nyomai</string>
+  <string name="revanced_debug_stacktrace_summary_on">A hibakeresési naplók tartalmazzák a verem nyomkövetését</string>
+  <string name="revanced_debug_stacktrace_summary_off">A hibakeresési naplók nem tartalmazzák a verem nyomkövetését</string>
+  <string name="revanced_debug_toast_on_error_title">Üzenet megjelenítése ReVanced hiba esetén</string>
+  <string name="revanced_debug_toast_on_error_summary_on">A \"toast\" üzenet jelenik meg, ha hiba történik</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Nem jelenik meg \"toast\" üzenet, ha hiba történik</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"A hibaüzenetek kikapcsolása elrejti az összes ReVanced hibaértesítést.
+
+Nem fog értesülni semmilyen váratlan eseményről."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Hibakeresési naplók exportálása</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">A ReVanced hibakeresési naplóit a vágólapra másolja</string>
   <string name="revanced_debug_logs_disabled">A hibakeresési naplózás ki van kapcsolva</string>
@@ -151,15 +160,6 @@ A lejátszás nem működhet"</string>
 Ez segíthet azonosítani az összetevőket egyedi szűrők létrehozásakor.
 
 Ez a funkció azonban néhány felhasználói adatot is naplóz, például az IP-címét."</string>
-  <string name="revanced_debug_stacktrace_title">Naplóverem nyomai</string>
-  <string name="revanced_debug_stacktrace_summary_on">A hibakeresési naplók tartalmazzák a verem nyomkövetését</string>
-  <string name="revanced_debug_stacktrace_summary_off">A hibakeresési naplók nem tartalmazzák a verem nyomkövetését</string>
-  <string name="revanced_debug_toast_on_error_title">Üzenet megjelenítése ReVanced hiba esetén</string>
-  <string name="revanced_debug_toast_on_error_summary_on">A \"toast\" üzenet jelenik meg, ha hiba történik</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Nem jelenik meg \"toast\" üzenet, ha hiba történik</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"A hibaüzenetek kikapcsolása elrejti az összes ReVanced hibaértesítést.
-
-Nem fog értesülni semmilyen váratlan eseményről."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Album kártyák elrejtése</string>
@@ -586,6 +586,10 @@ A hangerő a képernyő jobb oldalán függőlegesen húzva állítható be"</st
   <string name="revanced_hide_stop_ads_button_title">Hirdetések leállítása elrejtése</string>
   <string name="revanced_hide_stop_ads_button_summary_on">A hirdetésleállítás gomb rejtett</string>
   <string name="revanced_hide_stop_ads_button_summary_off">A hirdetésleállítás gomb látható</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Hozzászólások elrejtése</string>
+  <string name="revanced_hide_comments_button_summary_on">A hozzászólások gomb rejtve van</string>
+  <string name="revanced_hide_comments_button_summary_off">A hozzászólások gomb látható</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Bejelentés elrejtése</string>
@@ -1241,8 +1245,9 @@ Ez megváltoztatja az alkalmazás megjelenését és funkcióit, de előfordulha
 
 Ha később kikapcsolja, akkor ajánlott az alkalmazás adatait törölni, hogy megakadályozza a felhasználói felület hibáit."</string>
   <string name="revanced_spoof_app_version_target_title">Hamisított alkalmazásverzió célja</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - A régi Shorts lejátszó ikonok visszaállítása</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Állítsa vissza a régi navigációs ikonokat</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Nem összecsukott videó műveletsáv visszaállítása</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - A régi Shorts lejátszó ikonok visszaállítása</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Állítsa vissza a régi navigációs ikonokat</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Kezdőlap módosítása</string>
diff --git a/patches/src/main/resources/addresources/values-hy-rAM/strings.xml b/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
index b626c3ef9..91942aeee 100644
--- a/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
+++ b/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
@@ -107,6 +107,15 @@ MicroG-ի համար մարտկոցի օպտիմալացումը անջատել
   <string name="revanced_debug_title">Առաջնորդման մատնանշում</string>
   <string name="revanced_debug_summary_on">Մարմնացման առաջնորդման մատնանշումները ակտիվացված են</string>
   <string name="revanced_debug_summary_off">Մարմնացման առաջնորդման մատնանշումները անջատված են</string>
+  <string name="revanced_debug_stacktrace_title">Մուտքագրել կուտակային կետերի հետքեր</string>
+  <string name="revanced_debug_stacktrace_summary_on">Մարմնացման առաջնորդման մատնանշումները պարունակում են կուտակային կետի հետք</string>
+  <string name="revanced_debug_stacktrace_summary_off">Մարմնացման առաջնորդման մատնանշումները չեն պարունակում կուտակային կետի հետք</string>
+  <string name="revanced_debug_toast_on_error_title">Ցույց տալ  toast  ReVanced  սխալի  դեպքում</string>
+  <string name="revanced_debug_toast_on_error_summary_on">\"Toast\"-ը ցուցադրվում է, եթե սխալ է առաջանում</string>
+  <string name="revanced_debug_toast_on_error_summary_off">\"Toast\"-ը չի ցուցադրվում, եթե սխալ է առաջանում</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Սխալների տոաստի անջատումը թաքցնում է ReVanced-ի բոլոր սխալների ծանուցումները։
+
+Դուք չեք ստանա ան予期した出来事ի մասին ծանուցում։"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Արտահանել վրեժխնդրության կարգաբերման մատյանները</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Պատճենում է ReVanced-ի կարգաբերման մատյանները սեղմատախտակին</string>
   <string name="revanced_debug_logs_disabled">Վրեժխնդրության մատյանների գրանցումն անջատված է</string>
@@ -151,15 +160,6 @@ MicroG-ի համար մարտկոցի օպտիմալացումը անջատել
 Սա կարող է օգնել բացահայտել բաղադրիչները՝ հատուկ զտիչներ ստեղծելիս։
 
 Այնուամենայնիվ, սա միացնելը կգրանցի նաև օգտատիրոջ որոշ տվյալներ, ինչպիսիք են ձեր IP հասցեն:"</string>
-  <string name="revanced_debug_stacktrace_title">Մուտքագրել կուտակային կետերի հետքեր</string>
-  <string name="revanced_debug_stacktrace_summary_on">Մարմնացման առաջնորդման մատնանշումները պարունակում են կուտակային կետի հետք</string>
-  <string name="revanced_debug_stacktrace_summary_off">Մարմնացման առաջնորդման մատնանշումները չեն պարունակում կուտակային կետի հետք</string>
-  <string name="revanced_debug_toast_on_error_title">Ցույց տալ  toast  ReVanced  սխալի  դեպքում</string>
-  <string name="revanced_debug_toast_on_error_summary_on">\"Toast\"-ը ցուցադրվում է, եթե սխալ է առաջանում</string>
-  <string name="revanced_debug_toast_on_error_summary_off">\"Toast\"-ը չի ցուցադրվում, եթե սխալ է առաջանում</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Սխալների տոաստի անջատումը թաքցնում է ReVanced-ի բոլոր սխալների ծանուցումները։
-
-Դուք չեք ստանա ան予期した出来事ի մասին ծանուցում։"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Թաքցնել  ալբոմի  քարտերը</string>
@@ -586,6 +586,10 @@ MicroG-ի համար մարտկոցի օպտիմալացումը անջատել
   <string name="revanced_hide_stop_ads_button_title">Թաքցնել \"Դադարեցնել գովազդները\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Գովազդները դադարեցնելու կոճակը թաքցված է</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Գովազդները դադարեցնելու կոճակը ցուցադրված է</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Թաքցնել մեկնաբանությունները</string>
+  <string name="revanced_hide_comments_button_summary_on">Մեկնաբանությունների կոճակը թաքնված է</string>
+  <string name="revanced_hide_comments_button_summary_off">Մեկնաբանությունների կոճակը ցուցադրված է</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Թաքցնել Report</string>
@@ -1243,8 +1247,9 @@ Seekbar thumbnails-ները կօգտագործեն նույն որակը, ինչ
 
 Եթե հետագայում անջատվի, խորհուրդ է տրվում մաքրել հավելվածի տվյալները՝ UI սխալներից խուսափելու համար։"</string>
   <string name="revanced_spoof_app_version_target_title">Spoof-ի կիրառության տարբերակի նպատակ</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Վերականգնել հին Shorts պլեյերի պատկերակները</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Վերականգնել հին նավիգացիոն պատկերակները</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Վերականգնել չծալված տեսանյութի գործողությունների տողը</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Վերականգնել հին Shorts պլեյերի պատկերակները</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Վերականգնել հին նավիգացիոն պատկերակները</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Փոխել մեկնարկային էջը</string>
diff --git a/patches/src/main/resources/addresources/values-in-rID/strings.xml b/patches/src/main/resources/addresources/values-in-rID/strings.xml
index e9df0e74b..552915f40 100644
--- a/patches/src/main/resources/addresources/values-in-rID/strings.xml
+++ b/patches/src/main/resources/addresources/values-in-rID/strings.xml
@@ -107,6 +107,15 @@ Pemutaran mungkin tidak berfungsi"</string>
   <string name="revanced_debug_title">Pencatatan debug</string>
   <string name="revanced_debug_summary_on">Pencatatan debug diaktifkan</string>
   <string name="revanced_debug_summary_off">Pencatatan debug dinonaktifkan</string>
+  <string name="revanced_debug_stacktrace_title">Jejak catatan stack</string>
+  <string name="revanced_debug_stacktrace_summary_on">Pencatatan debug menyertakan jejak stack</string>
+  <string name="revanced_debug_stacktrace_summary_off">Pencatatan debug tidak menyertakan jejak stack</string>
+  <string name="revanced_debug_toast_on_error_title">Tampilkan pesan timbul pada kesalahan ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Pesan timbul ditampilkan jika terjadi kesalahan</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Pesan timbul tidak ditampilkan jika terjadi kesalahan</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Mematikan notifikasi kesalahan menyembunyikan semua notifikasi kesalahan ReVanced.
+
+Anda tidak akan diberi tahu tentang kejadian yang tidak terduga."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Ekspor catatan debug</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Salin catatan debug ReVanced ke papan klip</string>
   <string name="revanced_debug_logs_disabled">Pencatatan debug dinonaktifkan</string>
@@ -151,15 +160,6 @@ Pemutaran mungkin tidak berfungsi"</string>
 Ini dapat membantu mengidentifikasi komponen saat membuat filter khusus.
 
 Namun, mengaktifkan ini juga akan mencatat beberapa data pengguna seperti alamat IP Anda."</string>
-  <string name="revanced_debug_stacktrace_title">Jejak catatan stack</string>
-  <string name="revanced_debug_stacktrace_summary_on">Pencatatan debug menyertakan jejak stack</string>
-  <string name="revanced_debug_stacktrace_summary_off">Pencatatan debug tidak menyertakan jejak stack</string>
-  <string name="revanced_debug_toast_on_error_title">Tampilkan pesan timbul pada kesalahan ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Pesan timbul ditampilkan jika terjadi kesalahan</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Pesan timbul tidak ditampilkan jika terjadi kesalahan</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Mematikan notifikasi kesalahan menyembunyikan semua notifikasi kesalahan ReVanced.
-
-Anda tidak akan diberi tahu tentang kejadian yang tidak terduga."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Sembunyikan kartu album</string>
@@ -586,6 +586,10 @@ Menyesuaikan volume dengan mengusap secara vertikal di sisi kanan layar"</string
   <string name="revanced_hide_stop_ads_button_title">Sembunyikan Hentikan iklan</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Tombol hentikan iklan disembunyikan</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Tombol hentikan iklan ditampilkan</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Sembunyikan Komentar</string>
+  <string name="revanced_hide_comments_button_summary_on">Tombol Komentar disembunyikan</string>
+  <string name="revanced_hide_comments_button_summary_off">Tombol Komentar ditampilkan</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Sembunyikan Laporkan</string>
@@ -1241,8 +1245,9 @@ Ini akan mengubah tampilan dan fitur aplikasi, tetapi efek samping yang tidak di
 
 Jika kemudian dimatikan, disarankan untuk menghapus data aplikasi untuk mencegah bug UI."</string>
   <string name="revanced_spoof_app_version_target_title">Target versi app yang dipalsukan</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Pulihkan ikon pemutar Shorts lama</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Pulihkan ikon navigasi lama</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Pulihkan bilah tindakan video yang tidak diciutkan</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Pulihkan ikon pemutar Shorts lama</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Pulihkan ikon navigasi lama</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Ubah halaman awal</string>
@@ -1476,7 +1481,7 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_force_original_audio_summary_on">Menggunakan bahasa audio asli</string>
   <string name="revanced_force_original_audio_summary_off">Menggunakan audio bawaan</string>
   <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
-  <string name="revanced_force_original_audio_not_available">Untuk menggunakan fitur ini, ubah \'Spoof aliran video\' ke klien apa pun kecuali Android Studio</string>
+  <string name="revanced_force_original_audio_not_available">Untuk menggunakan fitur ini, ubah \'Palsukan aliran video\' ke klien apa pun kecuali Android Studio</string>
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
   <!-- Translations should use the same text as 'revanced_custom_playback_speeds_auto'. -->
@@ -1554,7 +1559,7 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_spoof_video_streams_about_android_title">Efek samping pemalsuan Android</string>
   <string name="revanced_spoof_video_streams_about_android_summary">"• Menu trek audio hilang
 • Volume stabil tidak tersedia"</string>
-  <string name="revanced_spoof_video_streams_about_ipados_summary">• Video mungkin berhenti pada menit 1:00, atau mungkin tidak tersedia di beberapa wilayah</string>
+  <string name="revanced_spoof_video_streams_about_ipados_summary">• Video mungkin berhenti pada 1:00, atau mungkin tidak tersedia di beberapa wilayah</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Klien eksperimental dan dapat berhenti berfungsi kapan saja</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Tidak ada codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Video anak-anak mungkin tidak dapat diputar saat keluar atau dalam mode penyamaran</string>
@@ -1585,9 +1590,9 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_music_play_permanent_repeat_summary_off">Pengulangan permanen dinonaktifkan</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
-  <string name="revanced_music_hide_cast_button_title">Sembunyikan tombol Transmisi</string>
-  <string name="revanced_music_hide_cast_button_summary_on">Tombol Transmisi disembunyikan</string>
-  <string name="revanced_music_hide_cast_button_summary_off">Tombol Transmisi ditampilkan</string>
+  <string name="revanced_music_hide_cast_button_title">Sembunyikan tombol transmisi</string>
+  <string name="revanced_music_hide_cast_button_summary_on">Tombol transmisi disembunyikan</string>
+  <string name="revanced_music_hide_cast_button_summary_off">Tombol transmisi ditampilkan</string>
   </patch>
   <patch id="layout.compactheader.hideCategoryBar">
   <string name="revanced_music_hide_category_bar_title">Sembunyikan bilah kategori</string>
@@ -1610,12 +1615,12 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tombol Jelajahi disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tombol Jelajahi ditampilkan</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Sembunyikan tombol Koleksi</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tombol Koleksi disembunyikan</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tombol Koleksi ditampilkan</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Sembunyikan tombol Pustaka</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tombol Pustaka disembunyikan</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tombol Pustaka ditampilkan</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sembunyikan tombol upgrade</string>
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tombol upgrade disembunyikan</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sembunyikan tombol Upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tombol Upgrade disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tombol upgrade ditampilkan</string>
   <string name="revanced_music_hide_navigation_bar_title">Sembunyikan bilah navigasi</string>
   <string name="revanced_music_hide_navigation_bar_summary_on">Bilah navigasi disembunyikan</string>
diff --git a/patches/src/main/resources/addresources/values-is-rIS/strings.xml b/patches/src/main/resources/addresources/values-is-rIS/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-is-rIS/strings.xml
+++ b/patches/src/main/resources/addresources/values-is-rIS/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-it-rIT/strings.xml b/patches/src/main/resources/addresources/values-it-rIT/strings.xml
index 11a5d47c3..debbee690 100644
--- a/patches/src/main/resources/addresources/values-it-rIT/strings.xml
+++ b/patches/src/main/resources/addresources/values-it-rIT/strings.xml
@@ -107,6 +107,15 @@ La riproduzione potrebbe non funzionare"</string>
   <string name="revanced_debug_title">Log di debug</string>
   <string name="revanced_debug_summary_on">I log di debug sono abilitati</string>
   <string name="revanced_debug_summary_off">I log di debug sono disabilitati</string>
+  <string name="revanced_debug_stacktrace_title">Registra stack trace</string>
+  <string name="revanced_debug_stacktrace_summary_on">I log di debug includono lo stack trace</string>
+  <string name="revanced_debug_stacktrace_summary_off">I log di debug non includono lo stack trace</string>
+  <string name="revanced_debug_toast_on_error_title">Mostra notifica per errore di ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Il toast viene mostrato se si verifica un errore</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Il toast non viene mostrato se si verifica un errore</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Disabilitare i toast di errore nasconde tutte le notifiche di errore di ReVanced.
+
+Non sarai notificato di eventi imprevisti."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Esporta i log di debug</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copia i log di debug di ReVanced negli Appunti</string>
   <string name="revanced_debug_logs_disabled">La registrazione di debug è disabilitata</string>
@@ -151,15 +160,6 @@ La riproduzione potrebbe non funzionare"</string>
 Questo può aiutare a identificare i componenti durante la creazione di filtri personalizzati.
 
 Tuttavia, l'abilitazione di questa opzione registrerà anche alcuni dati dell'utente come il tuo indirizzo IP."</string>
-  <string name="revanced_debug_stacktrace_title">Registra stack trace</string>
-  <string name="revanced_debug_stacktrace_summary_on">I log di debug includono lo stack trace</string>
-  <string name="revanced_debug_stacktrace_summary_off">I log di debug non includono lo stack trace</string>
-  <string name="revanced_debug_toast_on_error_title">Mostra notifica per errore di ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Il toast viene mostrato se si verifica un errore</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Il toast non viene mostrato se si verifica un errore</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Disabilitare i toast di errore nasconde tutte le notifiche di errore di ReVanced.
-
-Non sarai notificato di eventi imprevisti."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Nascondi le schede degli album</string>
@@ -586,6 +586,10 @@ Regola il volume scorrendo verticalmente sul lato destro dello schermo"</string>
   <string name="revanced_hide_stop_ads_button_title">Nascondi Interrompi annunci</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Il pulsante per interrompere gli annunci è nascosto</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Il pulsante per interrompere gli annunci è mostrato</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Nascondi commenti</string>
+  <string name="revanced_hide_comments_button_summary_on">Il pulsante Commenti è nascosto</string>
+  <string name="revanced_hide_comments_button_summary_off">Il pulsante Commenti è mostrato</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Nascondi Segnala</string>
@@ -1241,8 +1245,9 @@ Questo cambierà l'aspetto e le funzionalità dell'app, ma potrebbero verificars
 
 Se in seguito verrà disattivato, si consiglia di cancellare i dati dell'app per evitare bug dell'interfaccia."</string>
   <string name="revanced_spoof_app_version_target_title">Target della versione dell\'app desiderata</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Ripristinare le vecchie icone del player Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Ripristina le vecchie icone di navigazione</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Ripristina la barra delle azioni video non compressa</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Ripristinare le vecchie icone del player Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Ripristina le vecchie icone di navigazione</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Cambia pagina iniziale</string>
diff --git a/patches/src/main/resources/addresources/values-iw-rIL/strings.xml b/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
index 056e1b5a2..56279ac7e 100644
--- a/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
+++ b/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">רישום איתור באגים</string>
   <string name="revanced_debug_summary_on">יומני איתור באגים מופעלים</string>
   <string name="revanced_debug_summary_off">יומני איתור באגים מושבתים</string>
+  <string name="revanced_debug_stacktrace_title">רשום עקבות מחסנית</string>
+  <string name="revanced_debug_stacktrace_summary_on">יומני איתור באגים כוללים עקבות מחסנית</string>
+  <string name="revanced_debug_stacktrace_summary_off">יומני איתור באגים אינם כוללים עקבות מחסנית</string>
+  <string name="revanced_debug_toast_on_error_title">הצג הודעה קופצת בעת שגיאת ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">הודעה קופצת מוצגת אם מתרחשת שגיאה</string>
+  <string name="revanced_debug_toast_on_error_summary_off">הודעה קופצת אינה מוצגת אם מתרחשת שגיאה</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"השבתת הודעות שגיאה קופצות מסתירה את כל הודעות השגיאה של ReVanced.
+
+לא תקבל הודעה על אירועים בלתי צפויים."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">ייצוא יומני איתור באגים</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">מעתיק יומנים לאיתור באגים של Revanced ללוח ההעתקה</string>
   <string name="revanced_debug_logs_disabled">תיעוד איתור באגים מושבת</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 זה יכול לעזור לזהות רכיבים בעת יצירת מסננים מותאמים אישית.
 
 עם זאת, הפעלת הגדרה זו תתעד גם כמה נתוני משתמש כמו כתובת ה-IP שלך."</string>
-  <string name="revanced_debug_stacktrace_title">רשום עקבות מחסנית</string>
-  <string name="revanced_debug_stacktrace_summary_on">יומני איתור באגים כוללים עקבות מחסנית</string>
-  <string name="revanced_debug_stacktrace_summary_off">יומני איתור באגים אינם כוללים עקבות מחסנית</string>
-  <string name="revanced_debug_toast_on_error_title">הצג הודעה קופצת בעת שגיאת ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">הודעה קופצת מוצגת אם מתרחשת שגיאה</string>
-  <string name="revanced_debug_toast_on_error_summary_off">הודעה קופצת אינה מוצגת אם מתרחשת שגיאה</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"השבתת הודעות שגיאה קופצות מסתירה את כל הודעות השגיאה של ReVanced.
-
-לא תקבל הודעה על אירועים בלתי צפויים."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">הסתר כרטיסי אלבום</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">הסתר עצירת מודעות</string>
   <string name="revanced_hide_stop_ads_button_summary_on">לחצן עצירת מודעות מוסתר</string>
   <string name="revanced_hide_stop_ads_button_summary_off">לחצן עצירת מודעות מוצג</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">הסתר תגובות</string>
+  <string name="revanced_hide_comments_button_summary_on">הלחצן \'תגובות\' מוסתר</string>
+  <string name="revanced_hide_comments_button_summary_off">הלחצן \'תגובות\' מוצג</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">הסתר דיווח</string>
@@ -1244,8 +1248,9 @@ Second \"item\" text"</string>
 
 אם נכבה מאוחר יותר, מומלץ לנקות את נתוני היישום כדי למנוע באגים של ממשק המשתמש."</string>
   <string name="revanced_spoof_app_version_target_title">יעד גרסת יישום מזויפת</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - שחזר סמלי נגן Shorts ישנים</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - שחזר סמלי ניווט ישנים</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - שחזור סרגל פעולות וידאו לא מכווץ</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - שחזר סמלי נגן Shorts ישנים</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - שחזר סמלי ניווט ישנים</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">שנה את דף ההתחלה</string>
diff --git a/patches/src/main/resources/addresources/values-ja-rJP/strings.xml b/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
index 1a479c21f..2d4cfe159 100644
--- a/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
+++ b/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
@@ -107,6 +107,15 @@ YouTube Premium ユーザーの場合、この設定は必要ない可能性が
   <string name="revanced_debug_title">デバッグログを有効化</string>
   <string name="revanced_debug_summary_on">デバッグログは有効です</string>
   <string name="revanced_debug_summary_off">デバッグログは無効です</string>
+  <string name="revanced_debug_stacktrace_title">スタック トレースをログに記録</string>
+  <string name="revanced_debug_stacktrace_summary_on">デバッグログにスタック トレースが含まれます</string>
+  <string name="revanced_debug_stacktrace_summary_off">デバッグログにスタック トレースは含まれません</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced のエラー時にトーストを表示</string>
+  <string name="revanced_debug_toast_on_error_summary_on">エラーが発生した場合にトーストが表示されます</string>
+  <string name="revanced_debug_toast_on_error_summary_off">エラーが発生してもトーストは表示されません</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"エラートーストをオフにすると、ReVanced のすべてのエラー通知が非表示になります。
+
+予期しないイベントが発生した場合でも通知されなくなります。"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">デバッグログのエクスポート</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">ReVanced のデバッグログをクリップボードにコピーします</string>
   <string name="revanced_debug_logs_disabled">デバッグログは無効です</string>
@@ -152,15 +161,6 @@ YouTube Premium ユーザーの場合、この設定は必要ない可能性が
 これは、カスタムフィルターを作成する際にコンポーネントを識別するのに役立ちます。
 
 ただし、これを有効にすると、IP アドレスなどの一部のユーザーデータもログに記録されます。"</string>
-  <string name="revanced_debug_stacktrace_title">スタック トレースをログに記録</string>
-  <string name="revanced_debug_stacktrace_summary_on">デバッグログにスタック トレースが含まれます</string>
-  <string name="revanced_debug_stacktrace_summary_off">デバッグログにスタック トレースは含まれません</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced のエラー時にトーストを表示</string>
-  <string name="revanced_debug_toast_on_error_summary_on">エラーが発生した場合にトーストが表示されます</string>
-  <string name="revanced_debug_toast_on_error_summary_off">エラーが発生してもトーストは表示されません</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"エラートーストをオフにすると、ReVanced のすべてのエラー通知が非表示になります。
-
-予期しないイベントが発生した場合でも通知されなくなります。"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">アルバムカードを非表示</string>
@@ -588,6 +588,10 @@ YouTube Premium ユーザーの場合、この設定は必要ない可能性が
   <string name="revanced_hide_stop_ads_button_title">「広告を停止」を非表示</string>
   <string name="revanced_hide_stop_ads_button_summary_on">「広告を停止」ボタンは表示されません</string>
   <string name="revanced_hide_stop_ads_button_summary_off">「広告を停止」ボタンは表示されます</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">コメントを非表示</string>
+  <string name="revanced_hide_comments_button_summary_on">コメントボタンは表示されません</string>
+  <string name="revanced_hide_comments_button_summary_off">コメントボタンは表示されます</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">報告ボタンを非表示</string>
@@ -1245,8 +1249,9 @@ Automotive レイアウト
 
 再び偽装を無効にする場合は、UI のバグを防ぐためにアプリデータを消去することをお勧めします。"</string>
   <string name="revanced_spoof_app_version_target_title">アプリバージョンの偽装先</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - 古いショート プレーヤーのアイコンを復元</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - 古いナビゲーション アイコンを復元</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 折りたたまれていない動画アクションバーを復元</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 古いショート プレーヤーのアイコンを復元</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 古いナビゲーション アイコンを復元</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">スタート画面を変更</string>
diff --git a/patches/src/main/resources/addresources/values-ka-rGE/strings.xml b/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
+++ b/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml b/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-km-rKH/strings.xml b/patches/src/main/resources/addresources/values-km-rKH/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-km-rKH/strings.xml
+++ b/patches/src/main/resources/addresources/values-km-rKH/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-kn-rIN/strings.xml b/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
index ebdb14402..6c787a1ed 100644
--- a/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
@@ -104,6 +104,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ko-rKR/strings.xml b/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
index a2e1b0025..269194143 100644
--- a/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
+++ b/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
@@ -107,6 +107,15 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
   <string name="revanced_debug_title">디버그 로깅</string>
   <string name="revanced_debug_summary_on">디버그 로깅을 활성화합니다</string>
   <string name="revanced_debug_summary_off">디버그 로깅을 비활성화합니다</string>
+  <string name="revanced_debug_stacktrace_title">로그 스택 트레이스</string>
+  <string name="revanced_debug_stacktrace_summary_on">디버그 로그에 로그 스택 트레이스를 포함합니다</string>
+  <string name="revanced_debug_stacktrace_summary_off">디버그 로그에 로그 스택 트레이스를 포함하지 않습니다</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced 오류 메시지 표시하기</string>
+  <string name="revanced_debug_toast_on_error_summary_on">오류가 발생하면 팝업 메시지를 표시합니다</string>
+  <string name="revanced_debug_toast_on_error_summary_off">오류가 발생하면 팝업 메시지를 표시하지 않습니다</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"오류 메시지를 비활성화하면 모든 ReVanced 오류 알림이 숨겨집니다.
+
+예상되지 않은 이벤트에 대한 알림을 받지 못할 수 있습니다."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">디버그 로그 내보내기</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">ReVanced 디버그 로그를 클립보드에 복사할 수 있습니다</string>
   <string name="revanced_debug_logs_disabled">디버그 로깅이 비활성화되어 있습니다</string>
@@ -151,15 +160,6 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
 이 설정은 사용자 정의 필터를 만들 경우에 구성 요소를 식별하는 데 도움이 될 수 있습니다.
 
 그러나 이 설정을 활성화하면 IP 주소와 같은 일부 사용자 데이터도 기록됩니다."</string>
-  <string name="revanced_debug_stacktrace_title">로그 스택 트레이스</string>
-  <string name="revanced_debug_stacktrace_summary_on">디버그 로그에 로그 스택 트레이스를 포함합니다</string>
-  <string name="revanced_debug_stacktrace_summary_off">디버그 로그에 로그 스택 트레이스를 포함하지 않습니다</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced 오류 메시지 표시하기</string>
-  <string name="revanced_debug_toast_on_error_summary_on">오류가 발생하면 팝업 메시지를 표시합니다</string>
-  <string name="revanced_debug_toast_on_error_summary_off">오류가 발생하면 팝업 메시지를 표시하지 않습니다</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"오류 메시지를 비활성화하면 모든 ReVanced 오류 알림이 숨겨집니다.
-
-예상되지 않은 이벤트에 대한 알림을 받지 못할 수 있습니다."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">음악 앨범 카드 숨기기</string>
@@ -584,6 +584,10 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
   <string name="revanced_hide_stop_ads_button_title">광고 중지 버튼 숨기기</string>
   <string name="revanced_hide_stop_ads_button_summary_on">광고 중지 버튼이 숨겨집니다</string>
   <string name="revanced_hide_stop_ads_button_summary_off">광고 중지 버튼이 표시됩니다</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">댓글 숨기기</string>
+  <string name="revanced_hide_comments_button_summary_on">댓글 버튼이 숨겨집니다</string>
+  <string name="revanced_hide_comments_button_summary_off">댓글 버튼이 표시됩니다</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">신고 버튼 숨기기</string>
@@ -656,7 +660,7 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
 
 알려진 문제점:
 • 동영상 광고가 강제로 숨겨집니다"</string>
-  <string name="revanced_switch_create_with_notifications_button_summary_off">만들기 버튼과 알림 버튼의 위치를 교환하지 않습니다\n\n알려진 문제점:\n• 서버에서 더 많은 광고가 로드될 수 있습니다\n• Shorts 광고가 더 이상 숨겨지지 않습니다</string>
+  <string name="revanced_switch_create_with_notifications_button_summary_off">만들기 버튼과 알림 버튼의 위치를 교환하지 않습니다</string>
   <string name="revanced_switch_create_with_notifications_button_user_dialog_message">"이 설정을 비활성화하면 Shorts 광고가 차단되지 않습니다.
 
 이 설정을 변경해도 적용되지 않는다면 시크릿 모드로 전환해 보세요."</string>
@@ -944,7 +948,7 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
   <string name="revanced_ryd_failure_client_rate_limit_requested">싫어요 수를 표시할 수 없습니다 (클라이언트 API 제한 도달)</string>
   <string name="revanced_ryd_failure_generic">싫어요 수를 표시할 수 없습니다 (%s)</string>
   <!-- Toast shown if the user enables RYD while a video is opened, and then tries to vote for the video. -->
-  <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">ReturnYouTubeDislike를 사용하여 투표하려면 동영상을 다시 로드하세요</string>
+  <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">ReturnYouTubeDislike를 사용하여 투표하려면 동영상을 다시 불러오세요</string>
   <!-- Video likes have been set to hidden by the video uploader. -->
   <string name="revanced_ryd_video_likes_hidden_by_video_owner">소유자에 의해 숨겨짐</string>
   <string name="revanced_ryd_enabled_summary_on">싫어요 수를 표시합니다</string>
@@ -1243,8 +1247,9 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
 
 나중에 이 기능을 비활성화하면 앱 레이아웃 버그를 방지하기 위해 앱 데이터를 지우는 것이 좋습니다."</string>
   <string name="revanced_spoof_app_version_target_title">변경할 앱 버전</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - 이전 Shorts 플레이어 아이콘을 복원합니다</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - 이전 하단바 아이콘을 복원합니다</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 접히지 않은 동영상 액션 바 복원</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 이전 Shorts 플레이어 아이콘을 복원합니다</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 이전 하단바 아이콘을 복원합니다</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">앱 시작 페이지 변경하기</string>
diff --git a/patches/src/main/resources/addresources/values-ky-rKG/strings.xml b/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
+++ b/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-lo-rLA/strings.xml b/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
+++ b/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-lt-rLT/strings.xml b/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
index fbf726ab5..dc23ef9d9 100644
--- a/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
+++ b/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
@@ -107,6 +107,15 @@ Grojimas gali neveikti"</string>
   <string name="revanced_debug_title">Debugavimo žurnalas</string>
   <string name="revanced_debug_summary_on">Debugavimo žurnalai yra įgalinti</string>
   <string name="revanced_debug_summary_off">Debugavimo žurnalai yra išjungti</string>
+  <string name="revanced_debug_stacktrace_title">Žurnalų steko pėdsakai</string>
+  <string name="revanced_debug_stacktrace_summary_on">Debugavimo žurnalai apima steko pėdsaką</string>
+  <string name="revanced_debug_stacktrace_summary_off">Debugavimo žurnalai neapima steko pėdsako</string>
+  <string name="revanced_debug_toast_on_error_title">Rodyti \"toast\" apie ReVanced klaidą</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Jei įvyksta klaida, rodomas pranešimas „toast“</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Jei įvyksta klaida, pranešimas „toast“ nerodomas</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Klaidos isjungimas paslepia visus „ReVanced“ klaidu pranesimus.
+
+Apie netikėtus įvykius nebus pranešta."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Eksportuoti derinimo žurnalus</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Nukopijuoja „ReVanced“ derinimo žurnalus į mainų sritį</string>
   <string name="revanced_debug_logs_disabled">Derinimo žurnalų registravimas išjungtas</string>
@@ -151,15 +160,6 @@ Grojimas gali neveikti"</string>
 Tai gali padėti identifikuoti komponentus kuriant pasirinktinius filtrus.
 
 Tačiau įjungus šį nustatymą taip pat bus registruojami kai kurie vartotojo duomenys, pvz., jūsų IP adresas."</string>
-  <string name="revanced_debug_stacktrace_title">Žurnalų steko pėdsakai</string>
-  <string name="revanced_debug_stacktrace_summary_on">Debugavimo žurnalai apima steko pėdsaką</string>
-  <string name="revanced_debug_stacktrace_summary_off">Debugavimo žurnalai neapima steko pėdsako</string>
-  <string name="revanced_debug_toast_on_error_title">Rodyti \"toast\" apie ReVanced klaidą</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Jei įvyksta klaida, rodomas pranešimas „toast“</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Jei įvyksta klaida, pranešimas „toast“ nerodomas</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Klaidos isjungimas paslepia visus „ReVanced“ klaidu pranesimus.
-
-Apie netikėtus įvykius nebus pranešta."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Slėpti albumo korteles</string>
@@ -586,6 +586,10 @@ Reguliuokite garsumą braukdami vertikaliai dešinėje ekrano pusėje"</string>
   <string name="revanced_hide_stop_ads_button_title">Slėpti \"Stabdyti reklamą\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Skelbimų stabdymo mygtukas paslėptas</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Skelbimų stabdymo mygtukas rodomas</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Slėpti komentarus</string>
+  <string name="revanced_hide_comments_button_summary_on">Komentarų mygtukas paslėptas</string>
+  <string name="revanced_hide_comments_button_summary_off">Komentarų mygtukas rodomas</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Slėpti Pranešti</string>
@@ -1243,8 +1247,9 @@ Tai pakeis programos išvaizdą ir funkcijas, bet gali atsirasti nežinomų šal
 
 Jei vėliau išjungta, rekomenduojama išvalyti programos duomenis, kad būtų išvengta vartotojo sąsajos klaidų."</string>
   <string name="revanced_spoof_app_version_target_title">Programėlės versijos apsimetinėjimo tikslas</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Atkurti senus \"Shorts\" grotuvo piktogramas</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Atkurti senas naršymo piktogramas</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 – Atkurti neišskleistą vaizdo veiksmų juostą</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Atkurti senus \"Shorts\" grotuvo piktogramas</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Atkurti senas naršymo piktogramas</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Keisti pradžios puslapį</string>
diff --git a/patches/src/main/resources/addresources/values-lv-rLV/strings.xml b/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
index 7640b8328..64e38753c 100644
--- a/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
+++ b/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
@@ -107,6 +107,15 @@ Atskaņošana var nedarboties"</string>
   <string name="revanced_debug_title">Atkļūdošanas žurnāls</string>
   <string name="revanced_debug_summary_on">Atkļūdošanas žurnāli ir iespējoti</string>
   <string name="revanced_debug_summary_off">Atkļūdošanas žurnāli ir atspējoti</string>
+  <string name="revanced_debug_stacktrace_title">Reģistrēt steka izsekošanu</string>
+  <string name="revanced_debug_stacktrace_summary_on">Atkļūdošanas žurnāli ietver steka izsekošanu</string>
+  <string name="revanced_debug_stacktrace_summary_off">Atkļūdošanas žurnāli neietver steka izsekošanu</string>
+  <string name="revanced_debug_toast_on_error_title">Rādīt paziņojumu par ReVanced kļūdu</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Ja rodas kļūda, tiek rādīts toast</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Ja rodas kļūda, toast netiek rādīts</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Kļūdu paziņojumu izslēgšana paslēpj visus ReVanced kļūdu paziņojumus.
+
+Jūs netiksit informēts par neparedzētiem notikumiem."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Eksportēt atkļūdošanas žurnālus</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopē ReVanced atkļūdošanas žurnālus starpliktuvē</string>
   <string name="revanced_debug_logs_disabled">Atkļūdošanas žurnālu reģistrēšana ir atspējota</string>
@@ -151,15 +160,6 @@ Atskaņošana var nedarboties"</string>
 Tas var palīdzēt identificēt komponentus, veidojot pielāgotus filtrus.
 
 Tomēr, iespējojot šo iestatījumu, tiks reģistrēti arī daži lietotāja dati, piemēram, jūsu IP adrese."</string>
-  <string name="revanced_debug_stacktrace_title">Reģistrēt steka izsekošanu</string>
-  <string name="revanced_debug_stacktrace_summary_on">Atkļūdošanas žurnāli ietver steka izsekošanu</string>
-  <string name="revanced_debug_stacktrace_summary_off">Atkļūdošanas žurnāli neietver steka izsekošanu</string>
-  <string name="revanced_debug_toast_on_error_title">Rādīt paziņojumu par ReVanced kļūdu</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Ja rodas kļūda, tiek rādīts toast</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Ja rodas kļūda, toast netiek rādīts</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Kļūdu paziņojumu izslēgšana paslēpj visus ReVanced kļūdu paziņojumus.
-
-Jūs netiksit informēts par neparedzētiem notikumiem."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Paslēpt albumu kartītes</string>
@@ -586,6 +586,10 @@ Regulējiet skaļumu, velkot vertikāli ekrāna labajā pusē"</string>
   <string name="revanced_hide_stop_ads_button_title">Slēpt Pārtraukt reklāmas</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Apturēt reklāmas poga ir paslēpta</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Apturēt reklāmas poga ir redzama</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Slēpt komentārus</string>
+  <string name="revanced_hide_comments_button_summary_on">Komentāru poga ir paslēpta</string>
+  <string name="revanced_hide_comments_button_summary_off">Komentāru poga ir redzama</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Paslēpt Ziņot</string>
@@ -1243,8 +1247,9 @@ Tas mainīs lietotnes izskatu un funkcijas, taču var rasties nezināmas blakusp
 
 Ja vēlāk tiks izslēgts, ieteicams notīrīt lietotnes datus, lai novērstu lietotāja saskarnes kļūdas."</string>
   <string name="revanced_spoof_app_version_target_title">Viltot lietotnes versijas mērķis</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Atjaunot vecās Shorts spēlētāja ikonas</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Atjaunot vecās navigācijas ikonas</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Atjaunot nesaspiestu video darbību joslu</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Atjaunot vecās Shorts spēlētāja ikonas</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Atjaunot vecās navigācijas ikonas</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Mainīt sākuma lapu</string>
diff --git a/patches/src/main/resources/addresources/values-mk-rMK/strings.xml b/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
+++ b/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ml-rIN/strings.xml b/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-mn-rMN/strings.xml b/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
+++ b/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-mr-rIN/strings.xml b/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ms-rMY/strings.xml b/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
index e7a089136..dfb632767 100644
--- a/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
+++ b/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-my-rMM/strings.xml b/patches/src/main/resources/addresources/values-my-rMM/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-my-rMM/strings.xml
+++ b/patches/src/main/resources/addresources/values-my-rMM/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-nb-rNO/strings.xml b/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
+++ b/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ne-rIN/strings.xml b/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
index 54e3c3092..98e3d364c 100644
--- a/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
@@ -91,6 +91,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-nl-rNL/strings.xml b/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
index c3bd399d8..f9ee4e938 100644
--- a/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
+++ b/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
@@ -107,6 +107,15 @@ Afspeelproblemen kunnen optreden"</string>
   <string name="revanced_debug_title">Debuglogboek</string>
   <string name="revanced_debug_summary_on">Debuglogboeken zijn ingeschakeld</string>
   <string name="revanced_debug_summary_off">Debuglogboeken zijn uitgeschakeld</string>
+  <string name="revanced_debug_stacktrace_title">Stacktraces loggen</string>
+  <string name="revanced_debug_stacktrace_summary_on">Debuglogboeken bevatten stacktrace</string>
+  <string name="revanced_debug_stacktrace_summary_off">Debuglogs bevatten geen stacktrace</string>
+  <string name="revanced_debug_toast_on_error_title">Toon toastmelding bij ReVanced error</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Toastmelding wordt weergegeven als er een fout optreedt</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toastmelding wordt niet weergegeven als er een fout optreedt</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Het uitschakelen van foutmeldingen verbergt alle ReVanced-foutmeldingen.
+
+U wordt niet op de hoogte gesteld van onverwachte gebeurtenissen."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Foutopsporingslogboeken exporteren</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopieert ReVanced-foutopsporingslogboeken naar het klembord</string>
   <string name="revanced_debug_logs_disabled">Foutopsporing is uitgeschakeld</string>
@@ -151,15 +160,6 @@ Afspeelproblemen kunnen optreden"</string>
 Dit kan helpen bij het identificeren van componenten bij het maken van aangepaste filters.
 
 Als u dit inschakelt, worden echter ook bepaalde gebruikersgegevens, zoals uw IP-adres, vastgelegd."</string>
-  <string name="revanced_debug_stacktrace_title">Stacktraces loggen</string>
-  <string name="revanced_debug_stacktrace_summary_on">Debuglogboeken bevatten stacktrace</string>
-  <string name="revanced_debug_stacktrace_summary_off">Debuglogs bevatten geen stacktrace</string>
-  <string name="revanced_debug_toast_on_error_title">Toon toastmelding bij ReVanced error</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Toastmelding wordt weergegeven als er een fout optreedt</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toastmelding wordt niet weergegeven als er een fout optreedt</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Het uitschakelen van foutmeldingen verbergt alle ReVanced-foutmeldingen.
-
-U wordt niet op de hoogte gesteld van onverwachte gebeurtenissen."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Verberg albumkaarten</string>
@@ -586,6 +586,10 @@ Pas het volume aan door verticaal over de rechterkant van het scherm te vegen"</
   <string name="revanced_hide_stop_ads_button_title">Advertenties stoppen verbergen</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Knop \"Advertenties stoppen\" is verborgen</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Knop \"Advertenties stoppen\" is zichtbaar</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Reacties verbergen</string>
+  <string name="revanced_hide_comments_button_summary_on">De reactieknop is verborgen</string>
+  <string name="revanced_hide_comments_button_summary_off">De reactieknop wordt weergegeven</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Melden verbergen</string>
@@ -1242,8 +1246,9 @@ Dit zal het uiterlijk en de functies van de app veranderen, maar er kunnen onbek
 
 Als het later wordt uitgeschakeld, wordt aanbevolen om de app-gegevens te wissen om UI-fouten te voorkomen."</string>
   <string name="revanced_spoof_app_version_target_title">Doel voor vervalsen app-versie</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Herstel oude pictogrammen voor Shorts-speler</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Herstel oude navigatie-iconen</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Herstel niet-ingeklapte videobalk</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Herstel oude pictogrammen voor Shorts-speler</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Herstel oude navigatie-iconen</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Startpagina wijzigen</string>
diff --git a/patches/src/main/resources/addresources/values-or-rIN/strings.xml b/patches/src/main/resources/addresources/values-or-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-or-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-or-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-pa-rIN/strings.xml b/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-pl-rPL/strings.xml b/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
index 93b597706..81c2020e3 100644
--- a/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
+++ b/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
@@ -107,6 +107,15 @@ Odtwarzanie może nie działać"</string>
   <string name="revanced_debug_title">Logi do debugowania</string>
   <string name="revanced_debug_summary_on">Logi debugowania są włączone</string>
   <string name="revanced_debug_summary_off">Logi debugowania są wyłączone</string>
+  <string name="revanced_debug_stacktrace_title">Logi śladów stosów</string>
+  <string name="revanced_debug_stacktrace_summary_on">Logi do debugowania zawierają ślady stosów</string>
+  <string name="revanced_debug_stacktrace_summary_off">Logi do debugowania nie zawierają śladów stosów</string>
+  <string name="revanced_debug_toast_on_error_title">Komunikaty o błędach ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Wyświetlany jest toast, jeśli wystąpi błąd</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toast nie jest wyświetlany, jeśli wystąpi błąd</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Wyłączenie notyfikacji błędów ukrywa wszystkie powiadomienia o błędach ReVanced.
+
+Nie będziesz informowany o żadnych nieoczekiwanych zdarzeniach."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Eksportuj dzienniki debugowania</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopiuje dzienniki debugowania ReVanced do schowka</string>
   <string name="revanced_debug_logs_disabled">Rejestrowanie debugowania jest wyłączone</string>
@@ -147,15 +156,6 @@ Odtwarzanie może nie działać"</string>
   <string name="revanced_debug_protobuffer_summary_on">Logi do debugowania zawierają bufory</string>
   <string name="revanced_debug_protobuffer_summary_off">Logi do debugowania nie zawierają buforów</string>
   <string name="revanced_debug_protobuffer_user_dialog_message">"Włączenie tego ustawienia spowoduje rejestrowanie dodatkowych danych układu, w tym tekstu na ekranie dla niektórych komponentów interfejsu użytkownika.\n\nMoże to pomóc w identyfikacji komponentów podczas tworzenia filtrów niestandardowych.\n\nWłączenie tej opcji spowoduje jednak również rejestrowanie niektórych danych użytkownika, takich jak adres IP."</string>
-  <string name="revanced_debug_stacktrace_title">Logi śladów stosów</string>
-  <string name="revanced_debug_stacktrace_summary_on">Logi do debugowania zawierają ślady stosów</string>
-  <string name="revanced_debug_stacktrace_summary_off">Logi do debugowania nie zawierają śladów stosów</string>
-  <string name="revanced_debug_toast_on_error_title">Komunikaty o błędach ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Wyświetlany jest toast, jeśli wystąpi błąd</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toast nie jest wyświetlany, jeśli wystąpi błąd</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Wyłączenie notyfikacji błędów ukrywa wszystkie powiadomienia o błędach ReVanced.
-
-Nie będziesz informowany o żadnych nieoczekiwanych zdarzeniach."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Ukryj karty albumów</string>
@@ -582,6 +582,10 @@ Dostosuj głośność, przesuwając pionowo po prawej stronie ekranu"</string>
   <string name="revanced_hide_stop_ads_button_title">Ukryj \"Zatrzymaj reklamy\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Przycisk zatrzymania reklam jest ukryty</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Przycisk zatrzymania reklam jest widoczny</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ukryj komentarze</string>
+  <string name="revanced_hide_comments_button_summary_on">Przycisk komentarzy jest ukryty</string>
+  <string name="revanced_hide_comments_button_summary_off">Przycisk komentarzy jest widoczny</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Przycisk od zgłaszania</string>
@@ -1238,8 +1242,9 @@ Spowoduje to zmianę wyglądu i funkcjonalności aplikacji, ale mogą wystąpić
 
 Jeśli później zostanie wyłączony, zaleca się wyczyszczenie danych aplikacji, aby zapobiec błędom interfejsu użytkownika."</string>
   <string name="revanced_spoof_app_version_target_title">Docelowa oszukiwana wersja aplikacji</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Przywraca stare ikony odtwarzacza Shortsów</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Przywróć stare ikony nawigacji</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Przywróć niezwinięty pasek akcji wideo</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Przywraca stare ikony odtwarzacza Shortsów</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Przywróć stare ikony nawigacji</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Zmień stronę startową</string>
diff --git a/patches/src/main/resources/addresources/values-pt-rBR/strings.xml b/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
index a81842d78..5935ddb82 100644
--- a/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
+++ b/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
@@ -107,6 +107,15 @@ A reprodução pode não funcionar"</string>
   <string name="revanced_debug_title">Registro de depuração</string>
   <string name="revanced_debug_summary_on">Registro de depuração está ativado</string>
   <string name="revanced_debug_summary_off">Registro de depuração está desativado</string>
+  <string name="revanced_debug_stacktrace_title">Registro de rastreamento em pilha</string>
+  <string name="revanced_debug_stacktrace_summary_on">Registro de depuração incluem rastreamento em pilha</string>
+  <string name="revanced_debug_stacktrace_summary_off">Registro de depuração não incluem rastreamento em pilha</string>
+  <string name="revanced_debug_toast_on_error_title">Mostrar notificação flutuante de erro do ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">O toast é exibido se ocorrer um erro</string>
+  <string name="revanced_debug_toast_on_error_summary_off">O toast não é exibido se ocorrer um erro</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Desligar as notificações de erro oculta todas as notificações de erro do ReVanced. 
+
+Você não será notificado sobre nenhum evento inesperado."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportar registros de depuração</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copia os registros de depuração do ReVanced para a área de transferência</string>
   <string name="revanced_debug_logs_disabled">O registro de depuração está desativado</string>
@@ -151,15 +160,6 @@ A reprodução pode não funcionar"</string>
 Isso pode ajudar a identificar componentes ao criar filtros personalizados.
 
 No entanto, ativar isso também registrará alguns dados do usuário, como seu endereço IP."</string>
-  <string name="revanced_debug_stacktrace_title">Registro de rastreamento em pilha</string>
-  <string name="revanced_debug_stacktrace_summary_on">Registro de depuração incluem rastreamento em pilha</string>
-  <string name="revanced_debug_stacktrace_summary_off">Registro de depuração não incluem rastreamento em pilha</string>
-  <string name="revanced_debug_toast_on_error_title">Mostrar notificação flutuante de erro do ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">O toast é exibido se ocorrer um erro</string>
-  <string name="revanced_debug_toast_on_error_summary_off">O toast não é exibido se ocorrer um erro</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Desligar as notificações de erro oculta todas as notificações de erro do ReVanced. 
-
-Você não será notificado sobre nenhum evento inesperado."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Ocultar cartões de álbum</string>
@@ -586,6 +586,10 @@ Ajuste o volume deslizando verticalmente no lado direito da tela"</string>
   <string name="revanced_hide_stop_ads_button_title">Ocultar \"Parar anúncios\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">O botão Parar anúncios está oculto</string>
   <string name="revanced_hide_stop_ads_button_summary_off">O botão Parar anúncios é exibido</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ocultar Comentários</string>
+  <string name="revanced_hide_comments_button_summary_on">Botão de comentários está oculto</string>
+  <string name="revanced_hide_comments_button_summary_off">Botão de comentários está visível</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Ocultar Denúncia</string>
@@ -1239,8 +1243,9 @@ Isso mudará a aparência e os recursos do aplicativo, mas podem ocorrer efeitos
 
 Se posteriormente desativado, é recomendável limpar os dados do aplicativo para evitar bugs na IU."</string>
   <string name="revanced_spoof_app_version_target_title">Versão de spoofing alvo</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Restaurar ícones antigos do player dos Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Restaurar ícones de navegação antigos</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Restaurar barra de ações de vídeo não recolhida</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Restaurar ícones antigos do player dos Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Restaurar ícones de navegação antigos</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Alterar página inicial</string>
diff --git a/patches/src/main/resources/addresources/values-pt-rPT/strings.xml b/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
index f840c6ccb..e46ba445c 100644
--- a/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
+++ b/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
@@ -107,6 +107,15 @@ A reprodução pode não funcionar"</string>
   <string name="revanced_debug_title">Registo da depuração</string>
   <string name="revanced_debug_summary_on">Os registos da depuração estão ativados</string>
   <string name="revanced_debug_summary_off">Os registos da depuração estão desativados</string>
+  <string name="revanced_debug_stacktrace_title">Pilha de registos</string>
+  <string name="revanced_debug_stacktrace_summary_on">Os registos da depuração incluem stack trace</string>
+  <string name="revanced_debug_stacktrace_summary_off">Os registos da depuração não incluem stack trace</string>
+  <string name="revanced_debug_toast_on_error_title">Mostrar toast com erro de ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">O toast é exibido se ocorrer um erro</string>
+  <string name="revanced_debug_toast_on_error_summary_off">O toast não é exibido se ocorrer um erro</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"A desativação dos erros toasts oculta todas as notificações de erro do ReVanced.
+
+Não será notificado de quaisquer eventos inesperados."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportar registos de depuração</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copia os registos de depuração do ReVanced para a área de transferência</string>
   <string name="revanced_debug_logs_disabled">O registo de depuração está desativado</string>
@@ -151,15 +160,6 @@ A reprodução pode não funcionar"</string>
 Isto pode ajudar a identificar componentes ao criar filtros personalizados.
 
 No entanto, ativar isto também irá registar alguns dados do utilizador, como o seu endereço IP."</string>
-  <string name="revanced_debug_stacktrace_title">Pilha de registos</string>
-  <string name="revanced_debug_stacktrace_summary_on">Os registos da depuração incluem stack trace</string>
-  <string name="revanced_debug_stacktrace_summary_off">Os registos da depuração não incluem stack trace</string>
-  <string name="revanced_debug_toast_on_error_title">Mostrar toast com erro de ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">O toast é exibido se ocorrer um erro</string>
-  <string name="revanced_debug_toast_on_error_summary_off">O toast não é exibido se ocorrer um erro</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"A desativação dos erros toasts oculta todas as notificações de erro do ReVanced.
-
-Não será notificado de quaisquer eventos inesperados."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Esconder cartões de álbuns</string>
@@ -586,6 +586,10 @@ Ajuste o volume deslizando verticalmente no lado direito da tela"</string>
   <string name="revanced_hide_stop_ads_button_title">Ocultar Parar anúncios</string>
   <string name="revanced_hide_stop_ads_button_summary_on">O botão Parar anúncios está oculto</string>
   <string name="revanced_hide_stop_ads_button_summary_off">O botão Parar anúncios está exibido</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ocultar Comentários</string>
+  <string name="revanced_hide_comments_button_summary_on">O botão de comentários está oculto</string>
+  <string name="revanced_hide_comments_button_summary_off">O botão de comentários está exibido</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Esconder relatório</string>
@@ -1242,8 +1246,9 @@ Layout automotivo
 
 Nếu sau này tắt, bạn nên xóa dữ liệu ứng dụng để tránh lỗi UI."</string>
   <string name="revanced_spoof_app_version_target_title">Destaque de versão do app</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Restaurar os icones antigos do reprodutor dos Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Restaurar ícones antigos de navegação</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Restaurar barra de ação de vídeo não recolhida</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Restaurar os icones antigos do reprodutor dos Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Restaurar ícones antigos de navegação</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Alterar página inicial</string>
diff --git a/patches/src/main/resources/addresources/values-ro-rRO/strings.xml b/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
index ff7331b28..70d4c9abc 100644
--- a/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
+++ b/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
@@ -107,6 +107,15 @@ Redarea poate să nu funcționeze"</string>
   <string name="revanced_debug_title">Jurnal depanare</string>
   <string name="revanced_debug_summary_on">Jurnalele de depanare sunt activate</string>
   <string name="revanced_debug_summary_off">Jurnalele de depanare sunt dezactivate</string>
+  <string name="revanced_debug_stacktrace_title">Urme stive de jurnal</string>
+  <string name="revanced_debug_stacktrace_summary_on">Jurnalele depanării includ urmărirea stivelor</string>
+  <string name="revanced_debug_stacktrace_summary_off">Jurnalele de depanare nu includ urmărirea stivelor</string>
+  <string name="revanced_debug_toast_on_error_title">Arată toast la eroare ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Se afișează un toast dacă apare o eroare</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Nu se afișează un toast dacă apare o eroare</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Oprirea toasturilor de eroare ascunde toate notificările de eroare ReVanced.
+
+Nu veți fi notificat de niciun eveniment neașteptat."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportare jurnale de depanare</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Copiază jurnalele de depanare ReVanced în clipboard</string>
   <string name="revanced_debug_logs_disabled">Înregistrarea în jurnal de depanare este dezactivată</string>
@@ -151,15 +160,6 @@ Redarea poate să nu funcționeze"</string>
 Acest lucru poate ajuta la identificarea componentelor atunci când creați filtre personalizate.
 
 Cu toate acestea, activarea acestei opțiuni va înregistra și unele date ale utilizatorului, cum ar fi adresa dvs. IP."</string>
-  <string name="revanced_debug_stacktrace_title">Urme stive de jurnal</string>
-  <string name="revanced_debug_stacktrace_summary_on">Jurnalele depanării includ urmărirea stivelor</string>
-  <string name="revanced_debug_stacktrace_summary_off">Jurnalele de depanare nu includ urmărirea stivelor</string>
-  <string name="revanced_debug_toast_on_error_title">Arată toast la eroare ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Se afișează un toast dacă apare o eroare</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Nu se afișează un toast dacă apare o eroare</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Oprirea toasturilor de eroare ascunde toate notificările de eroare ReVanced.
-
-Nu veți fi notificat de niciun eveniment neașteptat."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Ascundeți cardurile de album</string>
@@ -586,6 +586,10 @@ Reglați volumul glisând vertical pe partea dreaptă a ecranului"</string>
   <string name="revanced_hide_stop_ads_button_title">Ascunde \'Oprește anunțurile\'</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Butonul de oprire a reclamelor este ascuns</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Butonul de oprire a reclamelor este afișat</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ascunde comentariile</string>
+  <string name="revanced_hide_comments_button_summary_on">Butonul de comentarii este ascuns</string>
+  <string name="revanced_hide_comments_button_summary_off">Butonul de comentarii este afișat</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Ascunde raportul</string>
@@ -1241,8 +1245,9 @@ Acest lucru va schimba aspectul și caracteristicile aplicației, dar pot apăre
 
 Dacă este dezactivat ulterior, se recomandă să ștergeți datele aplicației pentru a preveni erorile UI."</string>
   <string name="revanced_spoof_app_version_target_title">Țintă versiune falsificată a aplicației</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Restaurează pictogramele vechi ale playerului Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Restaurați pictogramele de navigare vechi</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Restabiliți bara de acțiune video necolapsată</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Restaurează pictogramele vechi ale playerului Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Restaurați pictogramele de navigare vechi</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Schimbă pagina de start</string>
diff --git a/patches/src/main/resources/addresources/values-ru-rRU/strings.xml b/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
index 2f7d3ef57..b0443ed38 100644
--- a/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
+++ b/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Включить журналы отладки</string>
   <string name="revanced_debug_summary_on">Журналы отладки включены</string>
   <string name="revanced_debug_summary_off">Журналы отладки отключены</string>
+  <string name="revanced_debug_stacktrace_title">Журнал трассировки стека</string>
+  <string name="revanced_debug_stacktrace_summary_on">В журналы отладки включена трассировка стека</string>
+  <string name="revanced_debug_stacktrace_summary_off">В журналы отладки не включена трассировка стека</string>
+  <string name="revanced_debug_toast_on_error_title">Показать всплывающее уведомление при ошибке Revanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Всплывающее уведомление при возникновении ошибки Revanced показано</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Всплывающее уведомление при возникновении ошибки Revanced скрыто</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Отключение всплывающих уведомлений об ошибках скроет все сообщения об ошибках ReVanced.
+
+Вы не будете уведомлены о каких-либо непредвиденных событиях."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Экспортировать журналы отладки</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Копирует журналы отладки ReVanced в буфер обмена</string>
   <string name="revanced_debug_logs_disabled">Журналы отладки отключены</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Это может помочь определить компоненты при создании пользовательских фильтров.
 
 Однако включение этой функции также приведет к регистрации некоторых пользовательских данных, таких как ваш IP-адрес."</string>
-  <string name="revanced_debug_stacktrace_title">Журнал трассировки стека</string>
-  <string name="revanced_debug_stacktrace_summary_on">В журналы отладки включена трассировка стека</string>
-  <string name="revanced_debug_stacktrace_summary_off">В журналы отладки не включена трассировка стека</string>
-  <string name="revanced_debug_toast_on_error_title">Показать всплывающее уведомление при ошибке Revanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Всплывающее уведомление при возникновении ошибки Revanced показано</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Всплывающее уведомление при возникновении ошибки Revanced скрыто</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Отключение всплывающих уведомлений об ошибках скроет все сообщения об ошибках ReVanced.
-
-Вы не будете уведомлены о каких-либо непредвиденных событиях."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Скрыть карточки альбомов</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Скрыть кнопку \"Не показывать рекламу\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Кнопка \"Не показывать рекламу\" скрыта</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Кнопка \"Не показывать рекламу\" показана</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Скрыть комментарии</string>
+  <string name="revanced_hide_comments_button_summary_on">Кнопка \"Комментарии\" в Shorts скрыта</string>
+  <string name="revanced_hide_comments_button_summary_off">Кнопка \"Комментарии\" в Shorts показана</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Скрыть кнопку \"Пожаловаться\"</string>
@@ -1244,8 +1248,9 @@ Second \"item\" text"</string>
 
 Если позже данный параметр будет отключен, рекомендуется очистить данные приложения для предотвращения проблем с пользовательским интерфейсом."</string>
   <string name="revanced_spoof_app_version_target_title">Подменить версию приложения на</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Восстановление старых иконок плеера Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Восстановление старых иконок панели навигации</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Восстановить не свернутую панель действий видео</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Восстановление старых иконок плеера Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Восстановление старых иконок панели навигации</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Изменить начальную страницу</string>
diff --git a/patches/src/main/resources/addresources/values-si-rLK/strings.xml b/patches/src/main/resources/addresources/values-si-rLK/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-si-rLK/strings.xml
+++ b/patches/src/main/resources/addresources/values-si-rLK/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-sk-rSK/strings.xml b/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
index c8a22c223..8fdb4d3c5 100644
--- a/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
+++ b/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
@@ -105,6 +105,15 @@ Prehrávanie nemusí fungovať"</string>
   <string name="revanced_debug_title">Debug logovanie</string>
   <string name="revanced_debug_summary_on">Denníky ladenia sú povolené</string>
   <string name="revanced_debug_summary_off">Denníky ladenia sú zakázané</string>
+  <string name="revanced_debug_stacktrace_title">Zaznamenať stopy zásobníka</string>
+  <string name="revanced_debug_stacktrace_summary_on">Denníky ladenia obsahujú sledovanie zásobníka</string>
+  <string name="revanced_debug_stacktrace_summary_off">Denníky ladenia neobsahujú sledovanie zásobníka</string>
+  <string name="revanced_debug_toast_on_error_title">Zobraziť toast pri chybe ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Ak sa vyskytne chyba, zobrazí sa upozornenie toast</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Ak sa vyskytne chyba, nezobrazí sa upozornenie toast</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vypnutie upozornení o chybách skryje všetky upozornenia o chybách v ReVanced.
+
+Nebudete informovaní o žiadnych nepredvídaných udalostiach."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportovať protokoly ladenia</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Skopíruje protokoly ladenia ReVanced do schránky</string>
   <string name="revanced_debug_logs_disabled">Protokolovanie ladenia je vypnuté</string>
@@ -149,15 +158,6 @@ Prehrávanie nemusí fungovať"</string>
 Toto môže pomôcť identifikovať komponenty pri vytváraní vlastných filtrov.
 
 Povolením tejto funkcie sa však budú zaznamenávať aj niektoré používateľské údaje, ako napríklad vaša IP adresa."</string>
-  <string name="revanced_debug_stacktrace_title">Zaznamenať stopy zásobníka</string>
-  <string name="revanced_debug_stacktrace_summary_on">Denníky ladenia obsahujú sledovanie zásobníka</string>
-  <string name="revanced_debug_stacktrace_summary_off">Denníky ladenia neobsahujú sledovanie zásobníka</string>
-  <string name="revanced_debug_toast_on_error_title">Zobraziť toast pri chybe ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Ak sa vyskytne chyba, zobrazí sa upozornenie toast</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Ak sa vyskytne chyba, nezobrazí sa upozornenie toast</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Vypnutie upozornení o chybách skryje všetky upozornenia o chybách v ReVanced.
-
-Nebudete informovaní o žiadnych nepredvídaných udalostiach."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Skryť karty albumov</string>
@@ -584,6 +584,10 @@ Upravte hlasitosť posúvaním vertikálne na pravej strane obrazovky"</string>
   <string name="revanced_hide_stop_ads_button_title">Skryť Zastaviť reklamy</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Tlačidlo Zastaviť reklamy je skryté</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Tlačidlo Zastaviť reklamy je zobrazené</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Skryť komentáre</string>
+  <string name="revanced_hide_comments_button_summary_on">Tlačidlo komentárov je skryté</string>
+  <string name="revanced_hide_comments_button_summary_off">Tlačidlo komentárov je zobrazené</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Skryť prehľad</string>
@@ -1237,8 +1241,9 @@ Zmení sa vzhľad a funkcie aplikácie, ale môžu sa vyskytnúť neznáme vedľ
 
 Ak sa neskôr vypne, odporúča sa vymazať údaje aplikácie, aby sa zabránilo chybám používateľského rozhrania."</string>
   <string name="revanced_spoof_app_version_target_title">Falošná cieľová verzia aplikácie</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Obnoviť staré ikony Shorts prehrávača</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Obnoviť staré ikony navigácie</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Obnoviť nerozbalený panel akcií videa</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Obnoviť staré ikony Shorts prehrávača</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Obnoviť staré ikony navigácie</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Zmeniť úvodnú stránku</string>
diff --git a/patches/src/main/resources/addresources/values-sl-rSI/strings.xml b/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
index 7c423d2e7..b57d8291a 100644
--- a/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
+++ b/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
@@ -107,6 +107,15 @@ Predvajanje morda ne bo delovalo"</string>
   <string name="revanced_debug_title">Dnevnik napak</string>
   <string name="revanced_debug_summary_on">Dnevniki napak so omogočeni</string>
   <string name="revanced_debug_summary_off">Dnevniki napak so onemogočeni</string>
+  <string name="revanced_debug_stacktrace_title">Dnevnik sledov steka</string>
+  <string name="revanced_debug_stacktrace_summary_on">Dnevniki napak vključujejo sled sledov</string>
+  <string name="revanced_debug_stacktrace_summary_off">Dnevniki napak ne vključujejo sledi sledov</string>
+  <string name="revanced_debug_toast_on_error_title">Prikaži obvestilo pri napaki ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Če pride do napake, se prikaže toast</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Če pride do napake, se toast ne prikaže</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Onemogočanje obvestil o napakah skrije vsa obvestila o napakah v ReVancedu.
+
+Ne boste obveščeni o nobenih nepričakovanih dogodkih."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Izvozi dnevnike napak</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopira dnevnike napak ReVanced v odložišče</string>
   <string name="revanced_debug_logs_disabled">Beleženje napak je onemogočeno</string>
@@ -151,15 +160,6 @@ Predvajanje morda ne bo delovalo"</string>
 To lahko pomaga prepoznati komponente pri ustvarjanju filtrov po meri.
 
 Vendar pa bo omogočitev tega beležila tudi nekatere uporabniške podatke, kot je vaš naslov IP."</string>
-  <string name="revanced_debug_stacktrace_title">Dnevnik sledov steka</string>
-  <string name="revanced_debug_stacktrace_summary_on">Dnevniki napak vključujejo sled sledov</string>
-  <string name="revanced_debug_stacktrace_summary_off">Dnevniki napak ne vključujejo sledi sledov</string>
-  <string name="revanced_debug_toast_on_error_title">Prikaži obvestilo pri napaki ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Če pride do napake, se prikaže toast</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Če pride do napake, se toast ne prikaže</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Onemogočanje obvestil o napakah skrije vsa obvestila o napakah v ReVancedu.
-
-Ne boste obveščeni o nobenih nepričakovanih dogodkih."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Skrij kartice albuma</string>
@@ -586,6 +586,10 @@ Prilagodite glasnost s potegom navpično na desni strani zaslona"</string>
   <string name="revanced_hide_stop_ads_button_title">Skrij Ustavi oglase</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Gumb za zaustavitev oglasov je skrit</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Gumb za zaustavitev oglasov je prikazan</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Skrij komentarje</string>
+  <string name="revanced_hide_comments_button_summary_on">Gumb za komentarje je skrit</string>
+  <string name="revanced_hide_comments_button_summary_off">Gumb za komentarje je prikazan</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Skrij Prijavi</string>
@@ -1241,8 +1245,9 @@ To bo spremenilo videz in funkcije aplikacije, vendar se lahko pojavijo neznani
 
 Če ga kasneje izklopite, je priporočljivo počistiti podatke aplikacije, da preprečite napake uporabniškega vmesnika."</string>
   <string name="revanced_spoof_app_version_target_title">Cilj spoofa različice aplikacije</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Obnovi stare ikone predvajalnika Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Obnovi stare ikone za krmarjenje</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Obnovi nezloženo video akcijsko vrstico</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Obnovi stare ikone predvajalnika Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Obnovi stare ikone za krmarjenje</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Spremeni začetno stran</string>
diff --git a/patches/src/main/resources/addresources/values-sq-rAL/strings.xml b/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
index 20ff26be3..d0a7b7f31 100644
--- a/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
+++ b/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
@@ -107,6 +107,15 @@ Riprodhimi mund të mos funksionojë"</string>
   <string name="revanced_debug_title">Regjistrimi i depurimit</string>
   <string name="revanced_debug_summary_on">Regjistrimet e depurimit janë të aktivizuara</string>
   <string name="revanced_debug_summary_off">Regjistrimet e depurimit janë të çaktivizuara</string>
+  <string name="revanced_debug_stacktrace_title">Regjistro gjurmët e grumbullimit</string>
+  <string name="revanced_debug_stacktrace_summary_on">Regjistrimet e depurimit përfshijnë gjurmë grumbullimi</string>
+  <string name="revanced_debug_stacktrace_summary_off">Regjistrimet e depurimit nuk përfshijnë gjurmë grumbullimi</string>
+  <string name="revanced_debug_toast_on_error_title">Shfaqni toast për gabimet e ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Shfaqet një toast nëse ndodh një gabim</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Nuk shfaqet toast nëse ndodh një gabim</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Fshirja e toast-eve të gabimit fsheh të gjitha njoftimet e gabimeve të ReVanced.
+
+Ju nuk do të njoftoheni për ndonjë ngjarje të papritur."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Eksporto regjistrat e korrigjimit</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopjon regjistrat e korrigjimit të ReVanced në kujtesën e shkurtër</string>
   <string name="revanced_debug_logs_disabled">Regjistrimi i korrigjimeve është çaktivizuar</string>
@@ -151,15 +160,6 @@ Riprodhimi mund të mos funksionojë"</string>
 Kjo mund të ndihmojë në identifikimin e komponentëve kur krijoni filtra të personalizuar.
 
 Gjithsesi, aktivizimi i këtij opsioni do të regjistrojë edhe disa të dhëna të përdoruesit, siç është adresa juaj IP."</string>
-  <string name="revanced_debug_stacktrace_title">Regjistro gjurmët e grumbullimit</string>
-  <string name="revanced_debug_stacktrace_summary_on">Regjistrimet e depurimit përfshijnë gjurmë grumbullimi</string>
-  <string name="revanced_debug_stacktrace_summary_off">Regjistrimet e depurimit nuk përfshijnë gjurmë grumbullimi</string>
-  <string name="revanced_debug_toast_on_error_title">Shfaqni toast për gabimet e ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Shfaqet një toast nëse ndodh një gabim</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Nuk shfaqet toast nëse ndodh një gabim</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Fshirja e toast-eve të gabimit fsheh të gjitha njoftimet e gabimeve të ReVanced.
-
-Ju nuk do të njoftoheni për ndonjë ngjarje të papritur."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Fshih kartat e albumit</string>
@@ -586,6 +586,10 @@ Përshtate shkëlqimin duke rrëshqitur vertikalisht në anën e majtë të ekra
   <string name="revanced_hide_stop_ads_button_title">Fshih \"Ndalo reklamat\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Butoni Ndalo reklamat është i fshehur</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Butoni Ndalo reklamat është i shfaqur</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Fshih Komentet</string>
+  <string name="revanced_hide_comments_button_summary_on">Butoni i komenteve është i fshehur</string>
+  <string name="revanced_hide_comments_button_summary_off">Butoni i komenteve është shfaqur</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Fsheh \"Raporton\"</string>
@@ -1240,8 +1244,9 @@ Kjo do të ndryshojë pamjen dhe veçoritë e aplikacionit, por mund të ndodhin
 
 Nëse më vonë është çaktivizuar, është e rekomanduar të fshiheni të dhënat e aplikacionit për të parandaluar gabimet e UI."</string>
   <string name="revanced_spoof_app_version_target_title">Shënjestër e versionit të aplikacionit të mashtuar</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Rikthe ikonat e vjetra të lojtarit Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Ristauro ikonave te vjetra te navigimit</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Rivendos shiritin e veprimeve të videos jo të palosur</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Rikthe ikonat e vjetra të lojtarit Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Ristauro ikonave te vjetra te navigimit</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Ndrysho faqen e fillimit</string>
diff --git a/patches/src/main/resources/addresources/values-sr-rCS/strings.xml b/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
index fb81b0167..0b09d6b4f 100644
--- a/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
+++ b/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
@@ -107,6 +107,15 @@ Reprodukcija možda neće raditi"</string>
   <string name="revanced_debug_title">Evidentiranje otklanjanja grešaka</string>
   <string name="revanced_debug_summary_on">Evidencije otklanjanja grešaka su omogućene</string>
   <string name="revanced_debug_summary_off">Evidencije otklanjanja grešaka su onemogućene</string>
+  <string name="revanced_debug_stacktrace_title">Evidentiranje praćenja steka</string>
+  <string name="revanced_debug_stacktrace_summary_on">Evidencije otklanjanja grešaka sadrže praćenje steka</string>
+  <string name="revanced_debug_stacktrace_summary_off">Evidencije otklanjanja grešaka ne sadrže praćenje steka</string>
+  <string name="revanced_debug_toast_on_error_title">Prikaži iskačuće obaveštenje pri grešci s ReVancedom</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Iskačuće obaveštenje je prikazano, ako dođe do greške</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Iskačuće obaveštenje nije prikazano, ako dođe do greške</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Isključivanje iskačućih obaveštenja o greškama sakriva sve obaveštenja o greškama u ReVancedu.
+
+Nećete biti obavešteni ni o kakvim neočekivanim događajima."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Izvezi evidencije otklanjanja grešaka</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopira evidencije otklanjanja grešaka ReVanceda u privremenu memoriju</string>
   <string name="revanced_debug_logs_disabled">Evidentiranje otklanjanja grešaka je onemogućeno</string>
@@ -151,15 +160,6 @@ Reprodukcija možda neće raditi"</string>
 Ovo može pomoći u identifikaciji komponenti prilikom pravljenja prilagođenih filtera.
 
 Međutim, omogućavanje ovoga će takođe evidentirati neke korisničke podatke, kao što je vaša IP adresa."</string>
-  <string name="revanced_debug_stacktrace_title">Evidentiranje praćenja steka</string>
-  <string name="revanced_debug_stacktrace_summary_on">Evidencije otklanjanja grešaka sadrže praćenje steka</string>
-  <string name="revanced_debug_stacktrace_summary_off">Evidencije otklanjanja grešaka ne sadrže praćenje steka</string>
-  <string name="revanced_debug_toast_on_error_title">Prikaži iskačuće obaveštenje pri grešci s ReVancedom</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Iskačuće obaveštenje je prikazano, ako dođe do greške</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Iskačuće obaveštenje nije prikazano, ako dođe do greške</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Isključivanje iskačućih obaveštenja o greškama sakriva sve obaveštenja o greškama u ReVancedu.
-
-Nećete biti obavešteni ni o kakvim neočekivanim događajima."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Sakrij kartice albuma</string>
@@ -586,6 +586,10 @@ Podesite jačinu zvuka prevlačenjem vertikalno na desnoj strani ekrana"</string
   <string name="revanced_hide_stop_ads_button_title">Sakrij dugme „Zaustavi oglase”</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Dugme „Zaustavi oglase” je skriveno</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Dugme „Zaustavi oglase” je prikazano</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Sakrij komentare</string>
+  <string name="revanced_hide_comments_button_summary_on">Dugme za komentare je skriveno</string>
+  <string name="revanced_hide_comments_button_summary_off">Dugme za komentare je prikazano</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Sakrij dugme „Prijavi”</string>
@@ -1241,8 +1245,9 @@ Ovo će promeniti izgled i funkcije aplikacije, ali se mogu pojaviti i nepoznati
 
 Ako se kasnije isključi, preporučuje se da izbrišete podatke aplikacije da biste sprečili greške u korisničkom interfejsu."</string>
   <string name="revanced_spoof_app_version_target_title">Ciljna verzija aplikacije za lažiranje</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Vraća stare ikonice Shorts plejera</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Vraća stare ikonice navigacije</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Vrati nesakupljenu akcionu traku za video</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Vraća stare ikonice Shorts plejera</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Vraća stare ikonice navigacije</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Promena polazne stranice</string>
diff --git a/patches/src/main/resources/addresources/values-sr-rSP/strings.xml b/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
index fd0da35ea..3c1f753ed 100644
--- a/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
+++ b/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Евидентирање отклањања грешака</string>
   <string name="revanced_debug_summary_on">Евиденције отклањања грешака су омогућене</string>
   <string name="revanced_debug_summary_off">Евиденције отклањања грешака су онемогућене</string>
+  <string name="revanced_debug_stacktrace_title">Евидентирање праћења стека</string>
+  <string name="revanced_debug_stacktrace_summary_on">Евиденције отклањања грешака садрже праћење стека</string>
+  <string name="revanced_debug_stacktrace_summary_off">Евиденције отклањања грешака не садрже праћење стека</string>
+  <string name="revanced_debug_toast_on_error_title">Прикажи искачуће обавештење при грешци с ReVanced-ом</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Искачуће обавештење је приказано, ако дође до грешке</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Искачуће обавештење није приказано, ако дође до грешке</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Искључивање искачућих обавештења о грешкама сакрива сва обавештења о грешкама у ReVanced-у.
+
+Нећете бити обавештени ни о каквим неочекиваним догађајима."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Извези евиденције отклањања грешака</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Копира евиденције отклањања грешака ReVanced-а у привремену меморију</string>
   <string name="revanced_debug_logs_disabled">Евидентирање отклањања грешака је онемогућено</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Ово може помоћи у идентификацији компоненти приликом прављења прилагођених филтера.
 
 Међутим, омогућавање овога ће такође евидентирати неке корисничке податке, као што је ваша IP адреса."</string>
-  <string name="revanced_debug_stacktrace_title">Евидентирање праћења стека</string>
-  <string name="revanced_debug_stacktrace_summary_on">Евиденције отклањања грешака садрже праћење стека</string>
-  <string name="revanced_debug_stacktrace_summary_off">Евиденције отклањања грешака не садрже праћење стека</string>
-  <string name="revanced_debug_toast_on_error_title">Прикажи искачуће обавештење при грешци с ReVanced-ом</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Искачуће обавештење је приказано, ако дође до грешке</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Искачуће обавештење није приказано, ако дође до грешке</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Искључивање искачућих обавештења о грешкама сакрива сва обавештења о грешкама у ReVanced-у.
-
-Нећете бити обавештени ни о каквим неочекиваним догађајима."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Сакриј картице албума</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Сакриј дугме „Заустави огласе”</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Дугме „Заустави огласе” је скривено</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Дугме „Заустави огласе” је приказано</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Сакриј коментаре</string>
+  <string name="revanced_hide_comments_button_summary_on">Дугме „Коментари” је скривено</string>
+  <string name="revanced_hide_comments_button_summary_off">Дугме „Коментари” је приказано</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Сакриј дугме „Пријави”</string>
@@ -1241,8 +1245,9 @@ Second \"item\" text"</string>
 
 Ако се касније искључи, препоручује се да избришете податке апликације да бисте спречили грешке у корисничком интерфејсу."</string>
   <string name="revanced_spoof_app_version_target_title">Циљна верзија апликације за лажирање</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Враћа старе иконице Shorts плејера</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Враћа старе иконице навигације</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Врати нескупљену траку радњи видеа</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Враћа старе иконице Shorts плејера</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Враћа старе иконице навигације</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Промена полазне странице</string>
diff --git a/patches/src/main/resources/addresources/values-sv-rSE/strings.xml b/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
index 62901c1e7..c5b85ebf7 100644
--- a/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
+++ b/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
@@ -107,6 +107,15 @@ Uppspelning kanske inte fungerar"</string>
   <string name="revanced_debug_title">Felsökningsloggning</string>
   <string name="revanced_debug_summary_on">Felsökningsloggar är aktiverade</string>
   <string name="revanced_debug_summary_off">Felsökningsloggar är inaktiverade</string>
+  <string name="revanced_debug_stacktrace_title">Logga stackspårning</string>
+  <string name="revanced_debug_stacktrace_summary_on">Felsökningsloggar inkluderar stackspårning</string>
+  <string name="revanced_debug_stacktrace_summary_off">Felsökningsloggar inkluderar inte stackspårning</string>
+  <string name="revanced_debug_toast_on_error_title">Visa ett popup-meddelande om det uppstår fel med ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Popup-meddelande visas om det uppstår fel</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Popup-meddelande visas inte om det uppstår fel</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Om du stänger av popup-felmeddelanden döljs alla ReVanced-felmeddelanden.
+
+Du kommer inte att bli meddelad om oväntade händelser."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Exportera felsökningsloggar</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Kopierar ReVanced-felsökningsloggar till urklipp</string>
   <string name="revanced_debug_logs_disabled">Felsökningsloggar är inaktiverade</string>
@@ -151,15 +160,6 @@ Uppspelning kanske inte fungerar"</string>
 Detta kan hjälpa till att identifiera komponenter när du skapar anpassade filter.
 
 Men om du aktiverar detta kommer även vissa användardata, t.ex. din IP-adress, att loggas."</string>
-  <string name="revanced_debug_stacktrace_title">Logga stackspårning</string>
-  <string name="revanced_debug_stacktrace_summary_on">Felsökningsloggar inkluderar stackspårning</string>
-  <string name="revanced_debug_stacktrace_summary_off">Felsökningsloggar inkluderar inte stackspårning</string>
-  <string name="revanced_debug_toast_on_error_title">Visa ett popup-meddelande om det uppstår fel med ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Popup-meddelande visas om det uppstår fel</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Popup-meddelande visas inte om det uppstår fel</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Om du stänger av popup-felmeddelanden döljs alla ReVanced-felmeddelanden.
-
-Du kommer inte att bli meddelad om oväntade händelser."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Dölj albumkort</string>
@@ -586,6 +586,10 @@ Justera volymen genom att svepa vertikalt till höger på skärmen"</string>
   <string name="revanced_hide_stop_ads_button_title">Dölj Stoppa annonser</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Knappen Stoppa annonser är dold</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Knappen Stoppa annonser visas</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Dölj kommentarer</string>
+  <string name="revanced_hide_comments_button_summary_on">Knappen Kommentarer är dold</string>
+  <string name="revanced_hide_comments_button_summary_off">Knappen Kommentarer visas</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Dölj Rapportera</string>
@@ -1241,8 +1245,9 @@ Detta kommer att ändra utseendet och funktionerna i appen, men okända bieffekt
 
 Om du senare inaktiverar det rekommenderar vi att rensa appens data för att förhindra fel i användargränssnittet."</string>
   <string name="revanced_spoof_app_version_target_title">Mål för Förfalska appversionen</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 – Återställ gamla ikoner i Shorts-spelaren</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 – Återställ gamla navigeringsikoner</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Återställ icke-komprimerad handlingsfält för video</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 – Återställ gamla ikoner i Shorts-spelaren</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 – Återställ gamla navigeringsikoner</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Byt startsida</string>
diff --git a/patches/src/main/resources/addresources/values-sw-rKE/strings.xml b/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
+++ b/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-ta-rIN/strings.xml b/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-te-rIN/strings.xml b/patches/src/main/resources/addresources/values-te-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-te-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-te-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-th-rTH/strings.xml b/patches/src/main/resources/addresources/values-th-rTH/strings.xml
index c8783aed1..59748a83d 100644
--- a/patches/src/main/resources/addresources/values-th-rTH/strings.xml
+++ b/patches/src/main/resources/addresources/values-th-rTH/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">การบันทึกการแก้ไขข้อบกพร่อง</string>
   <string name="revanced_debug_summary_on">การบันทึกการแก้ไขข้อบกพร่องถูกเปิดใช้งาน</string>
   <string name="revanced_debug_summary_off">การบันทึกการแก้ไขข้อบกพร่องถูกปิดใช้งาน</string>
+  <string name="revanced_debug_stacktrace_title">บันทึกการติดตามสแต็ก</string>
+  <string name="revanced_debug_stacktrace_summary_on">การบันทึกการแก้ไขข้อบกพร่องรวมถึงการติดตามสแต็ก</string>
+  <string name="revanced_debug_stacktrace_summary_off">การบันทึกการแก้ไขข้อบกพร่องไม่รวมการติดตามสแต็ก</string>
+  <string name="revanced_debug_toast_on_error_title">แสดง  toast  เมื่อเกิดข้อผิดพลาดของ ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Toast จะปรากฏขึ้นหากเกิดข้อผิดพลาด</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Toast จะไม่ปรากฏขึ้นหากเกิดข้อผิดพลาด</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"การปิดการแจ้งเตือนข้อผิดพลาดจะซ่อนการแจ้งเตือนข้อผิดพลาดของ ReVanced ทั้งหมด
+
+คุณจะไม่ได้รับแจ้งเกี่ยวกับเหตุการณ์ที่ไม่คาดคิดใดๆ"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">ส่งออกบันทึกการแก้ไขข้อบกพร่อง</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">คัดลอกบันทึกการแก้ไขข้อบกพร่องของ ReVanced ไปยังคลิปบอร์ด</string>
   <string name="revanced_debug_logs_disabled">ปิดใช้งานการบันทึกการแก้ไขข้อบกพร่อง</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 ซึ่งจะช่วยระบุส่วนประกอบเมื่อสร้างตัวกรองที่กำหนดเองได้
 
 อย่างไรก็ตาม การเปิดใช้งานนี้จะบันทึกข้อมูลผู้ใช้บางอย่าง เช่น ที่อยู่ IP ของคุณด้วย"</string>
-  <string name="revanced_debug_stacktrace_title">บันทึกการติดตามสแต็ก</string>
-  <string name="revanced_debug_stacktrace_summary_on">การบันทึกการแก้ไขข้อบกพร่องรวมถึงการติดตามสแต็ก</string>
-  <string name="revanced_debug_stacktrace_summary_off">การบันทึกการแก้ไขข้อบกพร่องไม่รวมการติดตามสแต็ก</string>
-  <string name="revanced_debug_toast_on_error_title">แสดง  toast  เมื่อเกิดข้อผิดพลาดของ ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Toast จะปรากฏขึ้นหากเกิดข้อผิดพลาด</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Toast จะไม่ปรากฏขึ้นหากเกิดข้อผิดพลาด</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"การปิดการแจ้งเตือนข้อผิดพลาดจะซ่อนการแจ้งเตือนข้อผิดพลาดของ ReVanced ทั้งหมด
-
-คุณจะไม่ได้รับแจ้งเกี่ยวกับเหตุการณ์ที่ไม่คาดคิดใดๆ"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">ซ่อนการ์ดอัลบั้ม</string>
@@ -584,6 +584,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">ซ่อนหยุดโฆษณา</string>
   <string name="revanced_hide_stop_ads_button_summary_on">ปุ่มหยุดโฆษณาถูกซ่อน</string>
   <string name="revanced_hide_stop_ads_button_summary_off">ปุ่มหยุดโฆษณาถูกแสดง</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">ซ่อนความคิดเห็น</string>
+  <string name="revanced_hide_comments_button_summary_on">ปุ่มความคิดเห็นถูกซ่อน</string>
+  <string name="revanced_hide_comments_button_summary_off">ปุ่มความคิดเห็นแสดงอยู่</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">ซ่อนรายงาน</string>
@@ -1241,8 +1245,9 @@ User id ของคุณเหมือนกับรหัสผ่าน 
 
 ถ้าปิดในภายหลัง ขอแนะนําให้ล้างข้อมูลแอปเพื่อป้องกันข้อผิดพลาดของ UI"</string>
   <string name="revanced_spoof_app_version_target_title">เป้าหมายการปลอมแปลงเวอร์ชันแอป</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - คืนค่าไอคอนเครื่องเล่น Shorts เก่า</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - กู้คืนไอคอนการนำทางแบบเก่า</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - กู้คืนแถบการทำงานของวิดีโอที่ไม่ได้ยุบ</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - คืนค่าไอคอนเครื่องเล่น Shorts เก่า</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - กู้คืนไอคอนการนำทางแบบเก่า</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">เปลี่ยนหน้าเริ่มต้น</string>
diff --git a/patches/src/main/resources/addresources/values-tr-rTR/strings.xml b/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
index e38a3a8d8..e03febe3e 100644
--- a/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
+++ b/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
@@ -107,6 +107,15 @@ Oynatma çalışmayabilir"</string>
   <string name="revanced_debug_title">Hata ayıklama kayıtları</string>
   <string name="revanced_debug_summary_on">Hata ayıklama kayıtları etkin</string>
   <string name="revanced_debug_summary_off">Hata ayıklama kayıtları devre dışı</string>
+  <string name="revanced_debug_stacktrace_title">Stack traces\'in kaydını tut</string>
+  <string name="revanced_debug_stacktrace_summary_on">Hata ayıklama kayıtları stack traces\'i içerir</string>
+  <string name="revanced_debug_stacktrace_summary_off">Hata ayıklama kayıtları stack traces\'i içermez</string>
+  <string name="revanced_debug_toast_on_error_title">ReVanced hatası durumunda uyarı göster</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Hata oluşursa uyarı gösterilir</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Hata oluşursa uyarı gösterilmez</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Hata bildirimlerini kapatmak, tüm ReVanced hata bildirimlerini gizler.
+
+Beklenmedik olaylar hakkında bilgilendirilmeyeceksiniz."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Hata ayıklama kayıtlarını dışa aktar</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">ReVanced hata ayıklama kayıtlarını panoya kopyalar</string>
   <string name="revanced_debug_logs_disabled">Hata ayıklama kayıtları devre dışı</string>
@@ -151,15 +160,6 @@ Oynatma çalışmayabilir"</string>
 Bu, özel filtreler oluştururken bileşenlerin belirlenmesine yardımcı olabilir.
 
 Ancak, bunun etkinleştirilmesi IP adresiniz gibi bazı kullanıcı verilerini de günlüğe kaydeder."</string>
-  <string name="revanced_debug_stacktrace_title">Stack traces\'in kaydını tut</string>
-  <string name="revanced_debug_stacktrace_summary_on">Hata ayıklama kayıtları stack traces\'i içerir</string>
-  <string name="revanced_debug_stacktrace_summary_off">Hata ayıklama kayıtları stack traces\'i içermez</string>
-  <string name="revanced_debug_toast_on_error_title">ReVanced hatası durumunda uyarı göster</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Hata oluşursa uyarı gösterilir</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Hata oluşursa uyarı gösterilmez</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Hata bildirimlerini kapatmak, tüm ReVanced hata bildirimlerini gizler.
-
-Beklenmedik olaylar hakkında bilgilendirilmeyeceksiniz."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Albüm kartlarını gizle</string>
@@ -586,6 +586,10 @@ Ekranın sağ tarafında dikey olarak kaydırarak sesi ayarlayın"</string>
   <string name="revanced_hide_stop_ads_button_title">Reklamları durdur\'u Gizle</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Reklamları durdur düğmesi gizli</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Reklamları durdur düğmesi görünür</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Yorumları gizle</string>
+  <string name="revanced_hide_comments_button_summary_on">Yorumlar düğmesi gizli</string>
+  <string name="revanced_hide_comments_button_summary_off">Yorumlar düğmesi görünür</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Bildir\'i gizle</string>
@@ -1244,8 +1248,9 @@ Bu, uygulamanın görünümünü ve özelliklerini değiştirecektir, ancak bili
 
 Daha sonra kapatılırsa, arayüz hatalarını önlemek için uygulama verilerinin temizlenmesi önerilir."</string>
   <string name="revanced_spoof_app_version_target_title">Uygulama sürümü taklidi hedefi</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Eski Shorts oynatıcı simgelerini geri getir</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Eski gezinti simgelerini geri getir</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Daraltılmamış video eylem çubuğunu geri getir</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Eski Shorts oynatıcı simgelerini geri getir</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Eski gezinti simgelerini geri getir</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Başlangıç sayfasını değiştir</string>
diff --git a/patches/src/main/resources/addresources/values-uk-rUA/strings.xml b/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
index 3267b6222..5765c04b8 100644
--- a/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
+++ b/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">Журнал налагодження</string>
   <string name="revanced_debug_summary_on">Журнали налагодження ввімкнено</string>
   <string name="revanced_debug_summary_off">Журнали налагодження вимкнено</string>
+  <string name="revanced_debug_stacktrace_title">Реєструвати трасування стека</string>
+  <string name="revanced_debug_stacktrace_summary_on">Журнали налагодження містять трасування стека</string>
+  <string name="revanced_debug_stacktrace_summary_off">Журнали налагодження не містять трасування стека</string>
+  <string name="revanced_debug_toast_on_error_title">Показувати тост при помилці ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Тост показується, якщо сталася помилка</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Тост не показується, якщо сталася помилка</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Вимкнення сповіщень про помилки приховує всі сповіщення про помилки ReVanced.
+
+Ви не будете отримувати сповіщення про будь-які непередбачувані події."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Експортувати журнали налагодження</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Копіює журнали налагодження ReVanced до буфера обміну</string>
   <string name="revanced_debug_logs_disabled">Журнали налагодження вимкнено</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 Це може допомогти визначити компоненти під час створення користувацьких фільтрів.
 
 Однак, увімкнувши це, також буде записано деякі дані користувача, наприклад Вашу IP-адресу."</string>
-  <string name="revanced_debug_stacktrace_title">Реєструвати трасування стека</string>
-  <string name="revanced_debug_stacktrace_summary_on">Журнали налагодження містять трасування стека</string>
-  <string name="revanced_debug_stacktrace_summary_off">Журнали налагодження не містять трасування стека</string>
-  <string name="revanced_debug_toast_on_error_title">Показувати тост при помилці ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Тост показується, якщо сталася помилка</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Тост не показується, якщо сталася помилка</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Вимкнення сповіщень про помилки приховує всі сповіщення про помилки ReVanced.
-
-Ви не будете отримувати сповіщення про будь-які непередбачувані події."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Приховати картки альбому</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">Приховати \"Зупинити показ оголошень\"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Кнопку \"Зупинити показ оголошень\" приховано</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Кнопка \"Зупинити показ оголошень\" показується</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Приховати \"Коментарі\"</string>
+  <string name="revanced_hide_comments_button_summary_on">Кнопку \"Коментарі\" приховано</string>
+  <string name="revanced_hide_comments_button_summary_off">Кнопка \"Коментарі\" показується</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Приховати \"Поскаржитися\"</string>
@@ -1241,8 +1245,9 @@ Second \"item\" text"</string>
 
 Якщо пізніше вимкнути, рекомендується очистити дані застосунку, щоб запобігти помилкам інтерфейсу."</string>
   <string name="revanced_spoof_app_version_target_title">Підробити версію програми на</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Відновлення старих іконок плеєра Shorts</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Відновлення старих іконок панелі навігації</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Відновити незгорнуту панель дій відео</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Відновлення старих іконок плеєра Shorts</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Відновлення старих іконок панелі навігації</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Змінити початкову сторінку</string>
@@ -1586,8 +1591,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
   <string name="revanced_music_hide_cast_button_title">Приховати кнопку трансляції</string>
-  <string name="revanced_music_hide_cast_button_summary_on">Кнопку \"Трансляція\" у відеоплеєрі приховано</string>
-  <string name="revanced_music_hide_cast_button_summary_off">Кнопка \"Трансляція\" у відеоплеєрі показується</string>
+  <string name="revanced_music_hide_cast_button_summary_on">Кнопку трансляції приховано</string>
+  <string name="revanced_music_hide_cast_button_summary_off">Кнопка трансляції показується</string>
   </patch>
   <patch id="layout.compactheader.hideCategoryBar">
   <string name="revanced_music_hide_category_bar_title">Приховати панель категорій</string>
@@ -1599,16 +1604,16 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_summary">Приховати або змінити кнопки панелі навігації</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
   <string name="revanced_music_hide_navigation_bar_home_button_title">Приховати кнопку \"Головна\"</string>
-  <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Кнопку \"Головна\" приховано на панелі навігації</string>
-  <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Кнопка \"Головна\" показується на панелі навігації</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Кнопку \"Головна\" приховано</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Кнопка \"Головна\" показується</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Приховати кнопку \"Зразки\"</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Кнопку \"Зразки\" приховано</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Кнопка \"Зразки\" показується</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Приховати кнопку \"Семпли\"</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Кнопку \"Семпли\" приховано</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Кнопка \"Семпли\" показується</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Приховати кнопку \"Огляд\"</string>
-  <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Кнопку \"Огляд\" приховано</string>
-  <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Кнопка \"Огляд\" показується</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Приховати кнопку \"Навігація\"</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Кнопку \"Навігація\" приховано</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Кнопка \"Навігація\" показується</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
   <string name="revanced_music_hide_navigation_bar_library_button_title">Приховати кнопку \"Бібліотека\"</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Кнопку \"Бібліотека\" приховано</string>
diff --git a/patches/src/main/resources/addresources/values-ur-rIN/strings.xml b/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml b/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
diff --git a/patches/src/main/resources/addresources/values-vi-rVN/strings.xml b/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
index 4bf3abc1a..48a8145bc 100644
--- a/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
+++ b/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
@@ -37,7 +37,7 @@ Second \"item\" text"</string>
   <string name="revanced_settings_reset">Đặt lại</string>
   <string name="revanced_settings_reset_color">Đặt lại màu</string>
   <string name="revanced_settings_color_invalid">Màu không hợp lệ</string>
-  <string name="revanced_settings_restart_title">Cần khởi động lại</string>
+  <string name="revanced_settings_restart_title">Yêu cầu khởi động lại</string>
   <string name="revanced_settings_restart_dialog_message">Khởi động lại ứng dụng để thay đổi này có hiệu lực.</string>
   <string name="revanced_settings_restart">Khởi động lại</string>
   <string name="revanced_settings_import">Nhập</string>
@@ -72,18 +72,18 @@ Second \"item\" text"</string>
   <string name="microg_settings_summary">Các cài đặt cho GmsCore</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   <string name="gms_core_toast_not_installed_message">MicroG GmsCore chưa được cài đặt. Hãy cài đặt ngay.</string>
-  <string name="gms_core_dialog_title">Cần thực hiện</string>
+  <string name="gms_core_dialog_title">Yêu cầu thực hiện</string>
   <string name="gms_core_dialog_not_whitelisted_not_allowed_in_background_message">"MicroG GmsCore không có quyền chạy nền.
 
 Hãy làm theo hướng dẫn \"Don't kill my app\" dành cho điện thoại của bạn và áp dụng các bước đó để cài đặt MicroG.
 
 Cấp quyền chạy nền là bắt buộc để ứng dụng hoạt động."</string>
   <string name="gms_core_dialog_open_website_text">Mở trang web</string>
-  <string name="gms_core_dialog_not_whitelisted_using_battery_optimizations_message">"Cần phải tắt tối ưu hóa pin cho MicroG GmsCore để tránh sự cố.
+  <string name="gms_core_dialog_not_whitelisted_using_battery_optimizations_message">"Để microG GmsCore hoạt động ổn định, bạn cần phải tắt tối ưu hoá pin cho ứng dụng này.
 
-Tắt tối ưu hóa pin cho MicroG sẽ không ảnh hưởng đáng kể đến hiệu suất sử dụng pin.
+Đừng lo, tắt tối ưu hóa pin cho microG sẽ không làm hao pin hơn.
 
-Nhấn nút tiếp tục và cho phép thay đổi lựa chọn tối ưu hóa."</string>
+Nhấn tiếp tục để thay đổi lựa chọn tối ưu hóa."</string>
   <string name="gms_core_dialog_continue_text">Tiếp tục</string>
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
@@ -107,6 +107,15 @@ Có thể gặp lỗi khi phát."</string>
   <string name="revanced_debug_title">Nhật ký gỡ lỗi</string>
   <string name="revanced_debug_summary_on">Nhật ký gỡ lỗi đã bật</string>
   <string name="revanced_debug_summary_off">Nhật ký gỡ lỗi đã tắt</string>
+  <string name="revanced_debug_stacktrace_title">Ghi nhật ký truy vết ngăn xếp</string>
+  <string name="revanced_debug_stacktrace_summary_on">Nhật ký gỡ lỗi bao gồm truy vết ngăn xếp</string>
+  <string name="revanced_debug_stacktrace_summary_off">Nhật ký gỡ lỗi không bao gồm truy vết ngăn xếp</string>
+  <string name="revanced_debug_toast_on_error_title">Hiện thông báo ngắn về lỗi ReVanced</string>
+  <string name="revanced_debug_toast_on_error_summary_on">Thông báo ngắn sẽ hiện nếu xảy ra lỗi</string>
+  <string name="revanced_debug_toast_on_error_summary_off">Thông báo ngắn không hiện nếu xảy ra lỗi</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"Tắt thông báo lỗi sẽ ẩn mọi thông báo lỗi từ ReVanced.
+
+Bạn sẽ không được thông báo khi xẩy ra lỗi bất ngờ."</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">Xuất nhật ký gỡ lỗi</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">Sao chép nhật ký gỡ lỗi ReVanced vào bảng nhớ tạm</string>
   <string name="revanced_debug_logs_disabled">Tính năng ghi nhật ký gỡ lỗi đã tắt</string>
@@ -151,15 +160,6 @@ Có thể gặp lỗi khi phát."</string>
 Điều này có thể giúp xác định các thành phần khi tạo bộ lọc tùy chỉnh.
 
 Tuy nhiên, bật tính năng này cũng sẽ ghi lại một số dữ liệu người dùng, chẳng hạn như địa chỉ IP của bạn."</string>
-  <string name="revanced_debug_stacktrace_title">Ghi nhật ký truy vết ngăn xếp</string>
-  <string name="revanced_debug_stacktrace_summary_on">Nhật ký gỡ lỗi bao gồm truy vết ngăn xếp</string>
-  <string name="revanced_debug_stacktrace_summary_off">Nhật ký gỡ lỗi không bao gồm truy vết ngăn xếp</string>
-  <string name="revanced_debug_toast_on_error_title">Hiện thông báo ngắn về lỗi ReVanced</string>
-  <string name="revanced_debug_toast_on_error_summary_on">Thông báo ngắn sẽ hiện nếu xảy ra lỗi</string>
-  <string name="revanced_debug_toast_on_error_summary_off">Thông báo ngắn không hiện nếu xảy ra lỗi</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"Tắt thông báo lỗi sẽ ẩn mọi thông báo lỗi từ ReVanced.
-
-Bạn sẽ không được thông báo khi xẩy ra lỗi bất ngờ."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Ẩn thẻ đĩa nhạc</string>
@@ -586,6 +586,10 @@ Vui lòng kiểm tra lại tên gói và đảm bảo ứng dụng đã được
   <string name="revanced_hide_stop_ads_button_title">Ẩn Ngừng quảng cáo</string>
   <string name="revanced_hide_stop_ads_button_summary_on">Nút ngừng quảng cáo đã bị ẩn</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Nút ngừng quảng cáo được hiển thị</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Ẩn bình luận</string>
+  <string name="revanced_hide_comments_button_summary_on">Nút bình luận đã bị ẩn</string>
+  <string name="revanced_hide_comments_button_summary_off">Nút bình luận được hiển thị</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">Ẩn Báo cáo</string>
@@ -1243,8 +1247,9 @@ Bố cục màn hình ô tô
 
 Nếu tắt đi sau đó, bạn nên xóa dữ liệu ứng dụng để tránh phát sinh lỗi giao diện."</string>
   <string name="revanced_spoof_app_version_target_title">Mục tiêu phiên bản giả mạo</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Khôi phục biểu tượng trình phát Shorts cũ</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Khôi phục biểu tượng điều hướng cũ</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Khôi phục thanh hành động video không bị thu gọn</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Khôi phục biểu tượng trình phát Shorts cũ</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Khôi phục biểu tượng điều hướng cũ</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">Thay đổi trang bắt đầu</string>
@@ -1589,7 +1594,7 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <patch id="interaction.permanentrepeat.permanentRepeatPatch">
   <string name="revanced_music_play_permanent_repeat_title">Bật lặp lại vĩnh viễn</string>
   <string name="revanced_music_play_permanent_repeat_summary_on">Lặp lại vĩnh viễn đã được bật</string>
-  <string name="revanced_music_play_permanent_repeat_summary_off">Lặp lại vĩnh viễn đã bị tắt</string>
+  <string name="revanced_music_play_permanent_repeat_summary_off">Lặp lại vĩnh viễn đã tắt</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
   <string name="revanced_music_hide_cast_button_title">Ẩn nút truyền</string>
@@ -1609,9 +1614,9 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Nút Trang chủ đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Nút Trang chủ được hiển thị</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ẩn nút Mẫu</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Nút Mẫu đã bị ẩn</string>
-  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Nút Mẫu được hiển thị</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ẩn nút Đoạn nhạc</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Nút Đoạn nhạc đã bị ẩn</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Nút Đoạn nhạc được hiển thị</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
   <string name="revanced_music_hide_navigation_bar_explore_button_title">Ẩn nút Khám phá</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Nút Khám phá đã bị ẩn</string>
@@ -1627,14 +1632,14 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_music_hide_navigation_bar_title">Ẩn thanh điều hướng</string>
   <string name="revanced_music_hide_navigation_bar_summary_on">Thanh điều hướng đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_summary_off">Thanh điều hướng được hiển thị</string>
-  <string name="revanced_music_hide_navigation_bar_labels_title">Ẩn nhãn nút điều hướng</string>
-  <string name="revanced_music_hide_navigation_bar_labels_summary_on">Nhãn đã bị ẩn</string>
-  <string name="revanced_music_hide_navigation_bar_labels_summary_off">Nhãn được hiển thị</string>
+  <string name="revanced_music_hide_navigation_bar_labels_title">Ẩn tên nút điều hướng</string>
+  <string name="revanced_music_hide_navigation_bar_labels_summary_on">Tên nút đã bị ẩn</string>
+  <string name="revanced_music_hide_navigation_bar_labels_summary_off">Tên nút được hiển thị</string>
   </patch>
   <patch id="layout.premium.hideGetPremiumPatch">
-  <string name="revanced_music_hide_get_premium_label_title">Ẩn nhãn \'Nhận Music Premium\'</string>
-  <string name="revanced_music_hide_get_premium_label_summary_on">Nhãn đã bị ẩn</string>
-  <string name="revanced_music_hide_get_premium_label_summary_off">Nhãn được hiển thị</string>
+  <string name="revanced_music_hide_get_premium_label_title">Ẩn trình đơn \'Mua Music Premium\'</string>
+  <string name="revanced_music_hide_get_premium_label_summary_on">Trình đơn này đã bị ẩn</string>
+  <string name="revanced_music_hide_get_premium_label_summary_off">Trình đơn này được hiển thị</string>
   </patch>
   <patch id="layout.upgradebutton.hideUpgradeButtonPatch">
   <string name="revanced_music_hide_upgrade_button_title">Ẩn nút nâng cấp</string>
diff --git a/patches/src/main/resources/addresources/values-zh-rCN/strings.xml b/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
index 3acec7405..0056f068a 100644
--- a/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
+++ b/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">调试日志</string>
   <string name="revanced_debug_summary_on">已启用调试日志记录</string>
   <string name="revanced_debug_summary_off">已禁用调试日志记录</string>
+  <string name="revanced_debug_stacktrace_title">记录堆栈跟踪</string>
+  <string name="revanced_debug_stacktrace_summary_on">调试日志包括堆栈跟踪</string>
+  <string name="revanced_debug_stacktrace_summary_off">调试日志不包括堆栈跟踪</string>
+  <string name="revanced_debug_toast_on_error_title">在发生 ReVanced 错误时显示 Toast</string>
+  <string name="revanced_debug_toast_on_error_summary_on">发生错误时显示Toast</string>
+  <string name="revanced_debug_toast_on_error_summary_off">发生错误时不显示Toast</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"关闭错误 Toast 会隐藏所有 ReVanced 错误通知。
+
+您不会收到任何意外事件的通知。"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">导出调试日志</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">将 ReVanced 调试日志复制到剪贴板</string>
   <string name="revanced_debug_logs_disabled">调试日志记录已禁用</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 这有助于在创建自定义过滤器时识别组件。
 
 但是，启用此设置也会记录一些用户数据，例如您的 IP 地址。"</string>
-  <string name="revanced_debug_stacktrace_title">记录堆栈跟踪</string>
-  <string name="revanced_debug_stacktrace_summary_on">调试日志包括堆栈跟踪</string>
-  <string name="revanced_debug_stacktrace_summary_off">调试日志不包括堆栈跟踪</string>
-  <string name="revanced_debug_toast_on_error_title">在发生 ReVanced 错误时显示 Toast</string>
-  <string name="revanced_debug_toast_on_error_summary_on">发生错误时显示Toast</string>
-  <string name="revanced_debug_toast_on_error_summary_off">发生错误时不显示Toast</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"关闭错误 Toast 会隐藏所有 ReVanced 错误通知。
-
-您不会收到任何意外事件的通知。"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">隐藏专辑卡片</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">隐藏停止广告</string>
   <string name="revanced_hide_stop_ads_button_summary_on">停止广告按钮已隐藏</string>
   <string name="revanced_hide_stop_ads_button_summary_off">停止广告按钮已显示</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">隐藏评论</string>
+  <string name="revanced_hide_comments_button_summary_on">评论按钮已隐藏</string>
+  <string name="revanced_hide_comments_button_summary_off">评论按钮已显示</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">隐藏「举报」</string>
@@ -1247,8 +1251,9 @@ Second \"item\" text"</string>
 
 如果稍后关闭，建议清除应用程序数据以防止 UI 错误。"</string>
   <string name="revanced_spoof_app_version_target_title">伪装应用程序版本为</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - 恢复旧的 Shorts 播放器图标</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - 还原旧的导航图标</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 恢复未折叠的视频操作栏</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 恢复旧的 Shorts 播放器图标</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 还原旧的导航图标</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">更改起始页</string>
diff --git a/patches/src/main/resources/addresources/values-zh-rTW/strings.xml b/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
index b1430178b..886fb42c0 100644
--- a/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
+++ b/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
@@ -107,6 +107,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_title">偵錯記錄</string>
   <string name="revanced_debug_summary_on">已啟用偵錯記錄檔</string>
   <string name="revanced_debug_summary_off">已停用偵錯記錄檔</string>
+  <string name="revanced_debug_stacktrace_title">記錄檔堆疊追蹤</string>
+  <string name="revanced_debug_stacktrace_summary_on">除錯記錄檔會包含堆疊追蹤</string>
+  <string name="revanced_debug_stacktrace_summary_off">除錯記錄檔不會包含堆疊追蹤</string>
+  <string name="revanced_debug_toast_on_error_title">在 ReVanced 發生錯誤時顯示提示訊息</string>
+  <string name="revanced_debug_toast_on_error_summary_on">如果發生錯誤，則顯示提示訊息</string>
+  <string name="revanced_debug_toast_on_error_summary_off">如果發生錯誤，則不會顯示提示訊息</string>
+  <string name="revanced_debug_toast_on_error_user_dialog_message">"關閉錯誤提示訊息會隱藏所有 ReVanced 的錯誤通知。
+
+你將不會收到任何非預期的事件通知。"</string>
   <string name="revanced_debug_export_logs_to_clipboard_title">匯出偵錯記錄</string>
   <string name="revanced_debug_export_logs_to_clipboard_summary">將 ReVanced 偵錯記錄複製到剪貼簿</string>
   <string name="revanced_debug_logs_disabled">偵錯記錄已停用</string>
@@ -151,15 +160,6 @@ Second \"item\" text"</string>
 這有助於在建立自訂過濾器時識別元件。
 
 不過，啟用此功能也會記錄部分使用者資料，例如您的 IP 位址。"</string>
-  <string name="revanced_debug_stacktrace_title">記錄檔堆疊追蹤</string>
-  <string name="revanced_debug_stacktrace_summary_on">除錯記錄檔會包含堆疊追蹤</string>
-  <string name="revanced_debug_stacktrace_summary_off">除錯記錄檔不會包含堆疊追蹤</string>
-  <string name="revanced_debug_toast_on_error_title">在 ReVanced 發生錯誤時顯示提示訊息</string>
-  <string name="revanced_debug_toast_on_error_summary_on">如果發生錯誤，則顯示提示訊息</string>
-  <string name="revanced_debug_toast_on_error_summary_off">如果發生錯誤，則不會顯示提示訊息</string>
-  <string name="revanced_debug_toast_on_error_user_dialog_message">"關閉錯誤提示訊息會隱藏所有 ReVanced 的錯誤通知。
-
-你將不會收到任何非預期的事件通知。"</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">隱藏專輯資訊卡</string>
@@ -376,13 +376,13 @@ Second \"item\" text"</string>
   <string name="revanced_hide_keyword_content_screen_title">隱藏關鍵字內容</string>
   <string name="revanced_hide_keyword_content_screen_summary">透過關鍵字篩選，隱藏搜尋結果與推薦內容中的影片</string>
   <string name="revanced_hide_keyword_content_home_title">依關鍵字隱藏首頁影片</string>
-  <string name="revanced_hide_keyword_content_home_summary_on">首頁影片將會被關鍵字篩選</string>
+  <string name="revanced_hide_keyword_content_home_summary_on">首頁分頁的影片會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_home_summary_off">首頁影片將不會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_search_title">依關鍵字隱藏搜尋結果</string>
   <string name="revanced_hide_keyword_content_search_summary_on">搜尋結果將會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_search_summary_off">搜尋結果將不會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_subscriptions_title">依關鍵字隱藏訂閱內容影片</string>
-  <string name="revanced_hide_keyword_content_subscriptions_summary_on">訂閱內容分頁的影片將會被關鍵字篩選</string>
+  <string name="revanced_hide_keyword_content_subscriptions_summary_on">訂閱內容分頁的影片會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_subscriptions_summary_off">訂閱內容分頁的影片將不會被關鍵字篩選</string>
   <string name="revanced_hide_keyword_content_phrases_title">要隱藏的關鍵字</string>
   <!-- For localization, it is preferred, but not required, if 'LeBlanc' is replaced with a localized name or a familiar word that has upper case letters in the middle of the word.
@@ -472,9 +472,9 @@ Second \"item\" text"</string>
   <string name="revanced_remove_viewer_discretion_dialog_user_dialog_message">這不會繞過年齡限制，只會自動按下同意。</string>
   </patch>
   <patch id="layout.hide.signintotv.disableSignInToTvPopupPatch">
-  <string name="revanced_disable_signin_to_tv_popup_title">停用「登入電視」彈出視窗  </string>
-  <string name="revanced_disable_signin_to_tv_popup_summary_on">「登入電視」彈出視窗已停用  </string>
-  <string name="revanced_disable_signin_to_tv_popup_summary_off">「登入電視」彈出視窗已啟用  </string>
+  <string name="revanced_disable_signin_to_tv_popup_title">停用「登入電視」彈出視窗</string>
+  <string name="revanced_disable_signin_to_tv_popup_summary_on">「登入電視」彈出視窗已停用</string>
+  <string name="revanced_disable_signin_to_tv_popup_summary_off">「登入電視」彈出視窗已啟用</string>
   </patch>
   <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
   <string name="revanced_disable_chapter_skip_double_tap_title">停用按兩下跳過章節功能</string>
@@ -586,6 +586,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_title">隱藏「停止廣告」</string>
   <string name="revanced_hide_stop_ads_button_summary_on">「停止廣告」按鈕已隱藏</string>
   <string name="revanced_hide_stop_ads_button_summary_off">「停止廣告」按鈕已顯示</string>
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">隱藏留言</string>
+  <string name="revanced_hide_comments_button_summary_on">留言按鈕已隱藏</string>
+  <string name="revanced_hide_comments_button_summary_off">留言按鈕已顯示</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">隱藏檢舉</string>
@@ -658,7 +662,7 @@ Second \"item\" text"</string>
 
 注意：啟用此功能也會強制隱藏影片廣告"</string>
   <string name="revanced_switch_create_with_notifications_button_summary_off">「建立」按鈕不與「通知」按鈕對調</string>
-  <string name="revanced_switch_create_with_notifications_button_user_dialog_message">"停用此設定也會停用Shorts 的廣告攔截功能。
+  <string name="revanced_switch_create_with_notifications_button_user_dialog_message">"停用此設定也會停用 Shorts 的廣告攔截功能。
 
 如果變更此設定沒有生效，請試試看切換到無痕模式。"</string>
   <string name="revanced_hide_navigation_button_labels_title">隱藏導覽列按鈕標籤</string>
@@ -684,23 +688,23 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_captions_summary_off">已顯示「字幕」選單</string>
   <!-- 'Additional settings' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_additional_settings_title">隱藏「其他設定」</string>
-  <string name="revanced_hide_player_flyout_additional_settings_summary_on">已隱藏「其他設定」</string>
-  <string name="revanced_hide_player_flyout_additional_settings_summary_off">已顯示「其他設定」</string>
+  <string name="revanced_hide_player_flyout_additional_settings_summary_on">已隱藏「其他設定」選單</string>
+  <string name="revanced_hide_player_flyout_additional_settings_summary_off">已顯示「其他設定」選單</string>
   <!-- 'Sleep timer' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_sleep_timer_title">隱藏「睡眠計時器」</string>
-  <string name="revanced_hide_player_flyout_sleep_timer_summary_on">已隱藏「睡眠計時器」</string>
-  <string name="revanced_hide_player_flyout_sleep_timer_summary_off">已顯示「睡眠計時器」</string>
+  <string name="revanced_hide_player_flyout_sleep_timer_summary_on">已隱藏「睡眠計時器」選單</string>
+  <string name="revanced_hide_player_flyout_sleep_timer_summary_off">已顯示「睡眠計時器」選單</string>
   <!-- 'Loop video' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_loop_video_title">隱藏「循環播放影片」</string>
-  <string name="revanced_hide_player_flyout_loop_video_summary_on">已隱藏「循環播放」選單</string>
-  <string name="revanced_hide_player_flyout_loop_video_summary_off">已顯示「循環播放」選單</string>
+  <string name="revanced_hide_player_flyout_loop_video_summary_on">已隱藏「循環播放影片」選單</string>
+  <string name="revanced_hide_player_flyout_loop_video_summary_off">已顯示「循環播放影片」選單</string>
   <!-- 'Ambient mode' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_ambient_mode_title">隱藏「微光效果」</string>
-  <string name="revanced_hide_player_flyout_ambient_mode_summary_on">已隱藏「微光模式」選單</string>
+  <string name="revanced_hide_player_flyout_ambient_mode_summary_on">已隱藏「微光效果」選單</string>
   <string name="revanced_hide_player_flyout_ambient_mode_summary_off">已顯示「微光效果」選單</string>
   <string name="revanced_hide_player_flyout_stable_volume_title">隱藏「平衡音量」</string>
-  <string name="revanced_hide_player_flyout_stable_volume_summary_off">已顯示「平衡音量」</string>
-  <string name="revanced_hide_player_flyout_stable_volume_summary_on">已隱藏「平衡音量」</string>
+  <string name="revanced_hide_player_flyout_stable_volume_summary_off">已顯示「平衡音量」選單</string>
+  <string name="revanced_hide_player_flyout_stable_volume_summary_on">已隱藏「平衡音量」選單</string>
   <!-- 'Help & feedback' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_help_title">隱藏「說明和意見回饋」</string>
   <string name="revanced_hide_player_flyout_help_summary_on">已隱藏「說明和意見回饋」選單</string>
@@ -761,7 +765,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_endscreen_cards_summary_off">已顯示片尾資訊卡</string>
   </patch>
   <patch id="layout.hide.fullscreenambientmode.disableFullscreenAmbientModePatch">
-  <string name="revanced_disable_fullscreen_ambient_mode_title">在全螢幕狀態下停用微光模式</string>
+  <string name="revanced_disable_fullscreen_ambient_mode_title">在全螢幕狀態下停用微光效果</string>
   <string name="revanced_disable_fullscreen_ambient_mode_summary_on">已停用微光效果</string>
   <string name="revanced_disable_fullscreen_ambient_mode_summary_off">已啟用微光效果</string>
   </patch>
@@ -1028,7 +1032,7 @@ Second \"item\" text"</string>
   <string name="revanced_sb_general_skiptoast">顯示「取消跳過」提示</string>
   <string name="revanced_sb_general_skiptoast_sum_on">當片段自動跳過時會顯示提示。點擊提示通知可取消跳過</string>
   <string name="revanced_sb_general_skiptoast_sum_off">不顯示提示</string>
-  <string name="revanced_sb_toast_on_skip_duration">「取消跳過」提示顯示時間</string>
+  <string name="revanced_sb_toast_on_skip_duration">跳過提示時長</string>
   <string name="revanced_sb_toast_on_skip_duration_sum">「取消跳過」提示顯示多久</string>
   <string name="revanced_sb_duration_1s">1 秒</string>
   <string name="revanced_sb_duration_2s">2 秒</string>
@@ -1243,8 +1247,9 @@ Second \"item\" text"</string>
 
 如果之後關閉此設定，建議清除應用程式資料以避免 UI 錯誤。"</string>
   <string name="revanced_spoof_app_version_target_title">應用程式偽裝目標版本</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - 還原舊版 Shorts 播放圖示</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - 還原舊版導覽圖示</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 還原未收合的影片操作列</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 還原舊版 Shorts 播放圖示</string>
+  <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 還原舊版導覽圖示</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">變更起始頁面</string>
@@ -1273,9 +1278,9 @@ Second \"item\" text"</string>
   <string name="revanced_change_start_page_entry_watch_later">稍後觀看</string>
   <string name="revanced_change_start_page_entry_your_clips">你的剪輯</string>
   <string name="revanced_change_start_page_always_title">一律變更起始頁面</string>
-  <string name="revanced_change_start_page_always_summary_on">"開始頁面總是變更
+  <string name="revanced_change_start_page_always_summary_on">"開始頁面一律變更
 
-限制： 使用工具列上的返回按鈕可能無法運作"</string>
+限制：工具列上的返回按鈕可能無法運作"</string>
   <string name="revanced_change_start_page_always_summary_off">起始頁面僅在應用程式啟動時變更</string>
   </patch>
   <patch id="layout.startupshortsreset.disableResumingShortsOnStartupPatch">
@@ -1596,9 +1601,9 @@ Second \"item\" text"</string>
   <string name="revanced_music_play_permanent_repeat_summary_off">永久重複播放已停用</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
-  <string name="revanced_music_hide_cast_button_title">隱藏投放按鈕</string>
-  <string name="revanced_music_hide_cast_button_summary_on">投放按鈕已隱藏</string>
-  <string name="revanced_music_hide_cast_button_summary_off">投放按鈕已顯示</string>
+  <string name="revanced_music_hide_cast_button_title">隱藏「投放」按鈕</string>
+  <string name="revanced_music_hide_cast_button_summary_on">「投放」按鈕已隱藏</string>
+  <string name="revanced_music_hide_cast_button_summary_off">「投放」按鈕已顯示</string>
   </patch>
   <patch id="layout.compactheader.hideCategoryBar">
   <string name="revanced_music_hide_category_bar_title">隱藏類別列</string>
diff --git a/patches/src/main/resources/addresources/values-zu-rZA/strings.xml b/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
index bad4f0c2d..08705f06e 100644
--- a/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
+++ b/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
@@ -89,6 +89,7 @@ Second \"item\" text"</string>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
+  <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->

From 01c0f1bd1ac6edb8aea758f88ffffcdea74a29b7 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 20 Sep 2025 20:09:52 +0400
Subject: [PATCH 03/16] feat(YouTube Music): Support version `8.10.52` (#5941)

---
 .../music/patches/HideUpgradeButtonPatch.java |  14 ---
 .../extension/music/settings/Settings.java    |   1 -
 .../patches/music/ad/video/HideVideoAds.kt    |   3 +-
 .../EnableExclusiveAudioPlayback.kt           |   3 +-
 .../permanentrepeat/PermanentRepeatPatch.kt   |   3 +-
 .../permanentshuffle/PermanentShufflePatch.kt |   3 +-
 .../music/layout/castbutton/HideCastButton.kt |   3 +-
 .../layout/compactheader/HideCategoryBar.kt   |   5 +-
 .../navigationbar/NavigationBarPatch.kt       |   3 +-
 .../layout/premium/HideGetPremiumPatch.kt     |   3 +-
 .../layout/upgradebutton/Fingerprints.kt      |  18 ----
 .../upgradebutton/HideUpgradeButtonPatch.kt   | 100 +-----------------
 .../BypassCertificateChecksPatch.kt           |   3 +-
 .../BackgroundPlaybackPatch.kt                |   3 +-
 .../misc/spoof/SpoofVideoStreamsPatch.kt      |   3 +-
 15 files changed, 26 insertions(+), 142 deletions(-)
 delete mode 100644 extensions/music/src/main/java/app/revanced/extension/music/patches/HideUpgradeButtonPatch.java
 delete mode 100644 patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/Fingerprints.kt

diff --git a/extensions/music/src/main/java/app/revanced/extension/music/patches/HideUpgradeButtonPatch.java b/extensions/music/src/main/java/app/revanced/extension/music/patches/HideUpgradeButtonPatch.java
deleted file mode 100644
index 8d3e022b1..000000000
--- a/extensions/music/src/main/java/app/revanced/extension/music/patches/HideUpgradeButtonPatch.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.extension.music.patches;
-
-import app.revanced.extension.music.settings.Settings;
-
-@SuppressWarnings("unused")
-public class HideUpgradeButtonPatch {
-
-    /**
-     * Injection point
-     */
-    public static boolean hideUpgradeButton() {
-        return Settings.HIDE_UPGRADE_BUTTON.get();
-    }
-}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
index 431ec7de0..832118829 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
@@ -15,7 +15,6 @@ public class Settings extends BaseSettings {
     // Ads
     public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);
     public static final BooleanSetting HIDE_GET_PREMIUM_LABEL = new BooleanSetting("revanced_music_hide_get_premium_label", TRUE, true);
-    public static final BooleanSetting HIDE_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_upgrade_button", TRUE, true);
 
     // General
     public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, false);
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt b/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt
index fd417bb5d..cd5150c16 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt
@@ -24,7 +24,8 @@ val hideVideoAdsPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt b/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt
index 4d598e402..f0b1974c3 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt
@@ -17,7 +17,8 @@ val enableExclusiveAudioPlaybackPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt
index 559bacc39..addf737f8 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt
@@ -27,7 +27,8 @@ val permanentRepeatPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt
index 39ffa319a..359ede662 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt
@@ -11,7 +11,8 @@ val permanentShufflePatch = bytecodePatch(
 ) {
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/castbutton/HideCastButton.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/castbutton/HideCastButton.kt
index 4e18e6305..2c1fbdea8 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/castbutton/HideCastButton.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/castbutton/HideCastButton.kt
@@ -33,7 +33,8 @@ val hideCastButton = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt
index 883be02a6..7668c9dc7 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.music.layout.compactheader
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
@@ -10,7 +9,6 @@ import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.settings.PreferenceScreen
 import app.revanced.patches.music.misc.settings.settingsPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.util.addInstructionsAtControlFlowLabel
 import app.revanced.util.findFreeRegister
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
@@ -29,7 +27,8 @@ val hideCategoryBar = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/navigationbar/NavigationBarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/navigationbar/NavigationBarPatch.kt
index d3af09f24..e9598f576 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/navigationbar/NavigationBarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/navigationbar/NavigationBarPatch.kt
@@ -40,7 +40,8 @@ val navigationBarPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt
index beea72673..13a50c54f 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt
@@ -28,7 +28,8 @@ val hideGetPremiumPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/Fingerprints.kt
deleted file mode 100644
index f3c96dc44..000000000
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/Fingerprints.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.music.layout.upgradebutton
-
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.AccessFlags
-import app.revanced.patcher.fingerprint
-
-internal val pivotBarConstructorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    returns("V")
-    parameters("L", "Z")
-    opcodes(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.IPUT_OBJECT,
-        Opcode.RETURN_VOID
-    )
-}
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/HideUpgradeButtonPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/HideUpgradeButtonPatch.kt
index f06eda341..0b0f24497 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/HideUpgradeButtonPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/HideUpgradeButtonPatch.kt
@@ -1,104 +1,12 @@
 package app.revanced.patches.music.layout.upgradebutton
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.newLabel
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.util.smali.toInstructions
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.music.misc.extension.sharedExtensionPatch
-import app.revanced.patches.music.misc.settings.PreferenceScreen
-import app.revanced.patches.music.misc.settings.settingsPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.util.getReference
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22t
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import app.revanced.patches.music.layout.navigationbar.navigationBarPatch
 
-private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/music/patches/HideUpgradeButtonPatch;"
-
-@Deprecated("This patch will be removed in the future.")
+@Deprecated("Patch is obsolete and was replaced by navigation bar patch", ReplaceWith("navigationBarPatch"))
 @Suppress("unused")
-val hideUpgradeButton = bytecodePatch(
-    description = "Hides the upgrade tab from the pivot bar.",
-) {
-    dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
-        addResourcesPatch,
-    )
-
-    compatibleWith(
-        "com.google.android.apps.youtube.music"(
-            "7.29.52"
-        )
-    )
-
-    execute {
-        addResources("music", "layout.upgradebutton.hideUpgradeButtonPatch")
-
-        // TODO: Add an extension patch to allow this to be enabled/disabled in app.
-        if (false) {
-            PreferenceScreen.ADS.addPreferences(
-                SwitchPreference("revanced_music_hide_upgrade_button")
-            )
-        }
-
-        pivotBarConstructorFingerprint.method.apply {
-            val pivotBarElementFieldReference =
-                getInstruction(pivotBarConstructorFingerprint.patternMatch!!.endIndex - 1)
-                    .getReference<FieldReference>()
-
-            val register = getInstruction<FiveRegisterInstruction>(0).registerC
-
-            // First compile all the needed instructions.
-            val instructionList = """
-                invoke-interface { v0 }, Ljava/util/List;->size()I
-                move-result v1
-                const/4 v2, 0x4
-                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-                iput-object v0, v$register, $pivotBarElementFieldReference
-            """.toInstructions().toMutableList()
-
-            val endIndex = pivotBarConstructorFingerprint.patternMatch!!.endIndex
-
-            // Replace the instruction to retain the label at given index.
-            replaceInstruction(
-                endIndex - 1,
-                instructionList[0], // invoke-interface.
-            )
-            // Do not forget to remove this instruction since we added it already.
-            instructionList.removeFirst()
-
-            val exitInstruction = instructionList.last() // iput-object
-            addInstruction(
-                endIndex,
-                exitInstruction,
-            )
-            // Do not forget to remove this instruction since we added it already.
-            instructionList.removeLast()
-
-            // Add the necessary if statement to remove the upgrade tab button in case it exists.
-            instructionList.add(
-                2, // if-le.
-                BuilderInstruction22t(
-                    Opcode.IF_LE,
-                    1,
-                    2,
-                    newLabel(endIndex),
-                ),
-            )
-
-            addInstructions(
-                endIndex,
-                instructionList,
-            )
-        }
-    }
+val hideUpgradeButton = bytecodePatch{
+    dependsOn(navigationBarPatch)
 }
 
 @Deprecated("Patch was renamed", ReplaceWith("hideUpgradeButton"))
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt
index 70e707fbb..245569d9e 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt
@@ -17,7 +17,8 @@ val bypassCertificateChecksPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt
index 3d81296a7..bf35b24d5 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt
@@ -17,7 +17,8 @@ val backgroundPlaybackPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
-            "7.29.52"
+            "7.29.52",
+            "8.10.52"
         )
     )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt
index 0452bc3cf..b01f74cca 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt
@@ -33,7 +33,8 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch(
 
         compatibleWith(
             "com.google.android.apps.youtube.music"(
-                "7.29.52"
+                "7.29.52",
+                "8.10.52"
             )
         )
     },

From 3d986e67164f0941032b2dd37eec6a5fc2c79444 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sat, 20 Sep 2025 16:12:57 +0000
Subject: [PATCH 04/16] chore: Release v5.40.0-dev.9 [skip ci]

# [5.40.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.8...v5.40.0-dev.9) (2025-09-20)

### Features

* **YouTube Music:** Support version `8.10.52` ([#5941](https://github.com/ReVanced/revanced-patches/issues/5941)) ([01c0f1b](https://github.com/ReVanced/revanced-patches/commit/01c0f1bd1ac6edb8aea758f88ffffcdea74a29b7))
---
 CHANGELOG.md      | 7 +++++++
 gradle.properties | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efe394880..275ddf09c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.40.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.8...v5.40.0-dev.9) (2025-09-20)
+
+
+### Features
+
+* **YouTube Music:** Support version `8.10.52` ([#5941](https://github.com/ReVanced/revanced-patches/issues/5941)) ([01c0f1b](https://github.com/ReVanced/revanced-patches/commit/01c0f1bd1ac6edb8aea758f88ffffcdea74a29b7))
+
 # [5.40.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.7...v5.40.0-dev.8) (2025-09-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index 8110ad013..f87e0b9e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0-dev.8
+version = 5.40.0-dev.9

From f97d33206b4c97244f0bd0c672c4b91eaf477b0b Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 20 Sep 2025 22:08:50 +0400
Subject: [PATCH 05/16] fix(YouTube - Spoof video streams): Add "Force original
 audio" disclaimer for Android Studio client

---
 .../preference/SpoofStreamingDataSideEffectsPreference.java     | 1 +
 patches/src/main/resources/addresources/values/strings.xml      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
index ae84c9dc2..ddc4d23da 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
@@ -95,6 +95,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
                     + '\n' + str("revanced_spoof_video_streams_about_kids_videos");
         } else if (clientType == ClientType.ANDROID_CREATOR) {
             summary += '\n' + str("revanced_spoof_video_streams_about_no_av1")
+                    + '\n' + str("revanced_spoof_video_streams_about_no_force_original_audio")
                     + '\n' + str("revanced_spoof_video_streams_about_kids_videos");
         }
 
diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index bb17ed6fc..d6313cba5 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -1642,6 +1642,8 @@ Enabling this can unlock higher video qualities"</string>
             <string name="revanced_spoof_video_streams_about_experimental">• Experimental client and may stop working anytime</string>
             <string name="revanced_spoof_video_streams_about_no_av1">• No AV1 video codec</string>
             <string name="revanced_spoof_video_streams_about_kids_videos">• Kids videos may not play when logged out or in incognito mode</string>
+            <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+            <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Force original audio is not available</string>
             <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Show in Stats for nerds</string>
             <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Client type is shown in Stats for nerds</string>
             <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Client is hidden in Stats for nerds</string>

From 7651ef088131e1b310eb104bd313b243430f8fa5 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sat, 20 Sep 2025 18:13:06 +0000
Subject: [PATCH 06/16] chore: Release v5.40.0-dev.10 [skip ci]

# [5.40.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.9...v5.40.0-dev.10) (2025-09-20)

### Bug Fixes

* **YouTube - Spoof video streams:** Add "Force original audio" disclaimer for Android Studio client ([f97d332](https://github.com/ReVanced/revanced-patches/commit/f97d33206b4c97244f0bd0c672c4b91eaf477b0b))
---
 CHANGELOG.md      | 7 +++++++
 gradle.properties | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 275ddf09c..f51f75364 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.40.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.9...v5.40.0-dev.10) (2025-09-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add "Force original audio" disclaimer for Android Studio client ([f97d332](https://github.com/ReVanced/revanced-patches/commit/f97d33206b4c97244f0bd0c672c4b91eaf477b0b))
+
 # [5.40.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.8...v5.40.0-dev.9) (2025-09-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index f87e0b9e0..b1610f96a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0-dev.9
+version = 5.40.0-dev.10

From a8a410708d50f34ac4bd2ca29bbbc3cde00bbf93 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 20 Sep 2025 23:15:41 +0400
Subject: [PATCH 07/16] fix(YouTube - Spoof video streams): Add stream audio
 selector disclaimer for Android Studio client

---
 .../preference/SpoofAudioSelectorListPreference.java   | 10 ++++++++--
 .../src/main/resources/addresources/values/strings.xml |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofAudioSelectorListPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofAudioSelectorListPreference.java
index d27230421..00c3f2007 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofAudioSelectorListPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofAudioSelectorListPreference.java
@@ -6,7 +6,9 @@ import android.content.Context;
 import android.util.AttributeSet;
 
 import app.revanced.extension.shared.settings.preference.SortedListPreference;
+import app.revanced.extension.shared.spoof.ClientType;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
+import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings({"deprecation", "unused"})
 public class SpoofAudioSelectorListPreference extends SortedListPreference {
@@ -14,10 +16,14 @@ public class SpoofAudioSelectorListPreference extends SortedListPreference {
     private final boolean available;
 
     {
-        if (SpoofVideoStreamsPatch.getLanguageOverride() != null) {
+        final boolean isAndroidStudio = Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_CREATOR;
+
+        if (isAndroidStudio || SpoofVideoStreamsPatch.getLanguageOverride() != null) {
             available = false;
             super.setEnabled(false);
-            super.setSummary(str("revanced_spoof_video_streams_language_not_available"));
+            super.setSummary(str(isAndroidStudio
+                    ? "revanced_spoof_video_streams_language_android_studio"
+                    : "revanced_spoof_video_streams_language_not_available"));
         } else {
             available = true;
         }
diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index d6313cba5..151c9e799 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -1650,6 +1650,7 @@ Enabling this can unlock higher video qualities"</string>
             <string name="revanced_spoof_video_streams_language_title">Audio stream language</string>
             <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
             <string name="revanced_spoof_video_streams_language_not_available">To select a specific audio language, turn off \'Force original audio language\'</string>
+            <string name="revanced_spoof_video_streams_language_android_studio">Stream language selection is not available with Android Studio</string>
         </patch>
     </app>
     <app id="music">

From 1f371c81566b81996c741f7817d9a4fbb01e8e98 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sat, 20 Sep 2025 19:20:13 +0000
Subject: [PATCH 08/16] chore: Release v5.40.0-dev.11 [skip ci]

# [5.40.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.10...v5.40.0-dev.11) (2025-09-20)

### Bug Fixes

* **YouTube - Spoof video streams:** Add stream audio selector disclaimer for Android Studio client ([a8a4107](https://github.com/ReVanced/revanced-patches/commit/a8a410708d50f34ac4bd2ca29bbbc3cde00bbf93))
---
 CHANGELOG.md      | 7 +++++++
 gradle.properties | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f51f75364..674b1860c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.40.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.10...v5.40.0-dev.11) (2025-09-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add stream audio selector disclaimer for Android Studio client ([a8a4107](https://github.com/ReVanced/revanced-patches/commit/a8a410708d50f34ac4bd2ca29bbbc3cde00bbf93))
+
 # [5.40.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.9...v5.40.0-dev.10) (2025-09-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index b1610f96a..53e5677b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0-dev.10
+version = 5.40.0-dev.11

From 966727ca2d08a09b16e7818b29d2ec396923624a Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 20 Sep 2025 23:31:01 +0400
Subject: [PATCH 09/16] chore(YouTube Music): Use string language similar to
 YouTube

---
 .../src/main/resources/addresources/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index 151c9e799..32679a243 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -1685,23 +1685,23 @@ Enabling this can unlock higher video qualities"</string>
             <string name="revanced_music_navigation_bar_screen_title">Navigation bar</string>
             <string name="revanced_music_navigation_bar_screen_summary">Hide or change navigation bar buttons</string>
             <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-            <string name="revanced_music_hide_navigation_bar_home_button_title">Hide Home button</string>
+            <string name="revanced_music_hide_navigation_bar_home_button_title">Hide Home</string>
             <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Home button is hidden</string>
             <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Home button is shown</string>
             <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-            <string name="revanced_music_hide_navigation_bar_samples_button_title">Hide Samples button</string>
+            <string name="revanced_music_hide_navigation_bar_samples_button_title">Hide Samples</string>
             <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Samples button is hidden</string>
             <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Samples button is shown</string>
             <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-            <string name="revanced_music_hide_navigation_bar_explore_button_title">Hide Explore button</string>
+            <string name="revanced_music_hide_navigation_bar_explore_button_title">Hide Explore</string>
             <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Explore button is hidden</string>
             <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Explore button is shown</string>
             <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-            <string name="revanced_music_hide_navigation_bar_library_button_title">Hide Library button</string>
+            <string name="revanced_music_hide_navigation_bar_library_button_title">Hide Library</string>
             <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Library button is hidden</string>
             <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Library button is shown</string>
             <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-            <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Hide Upgrade button</string>
+            <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Hide Upgrade</string>
             <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Upgrade button is hidden</string>
             <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Upgrade button is shown</string>
             <string name="revanced_music_hide_navigation_bar_title">Hide navigation bar</string>

From 43dbb4710bce3666b5051871a493f285074f26c1 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 21 Sep 2025 10:42:02 +0400
Subject: [PATCH 10/16] docs: Add new issue links to the FAQ and
 troubleshooting guide (#5929)

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 1 +
 .github/ISSUE_TEMPLATE/feature_request.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f623d8a57..98b14a097 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -72,6 +72,7 @@ body:
 
         - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Bug+report%22).
         - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Check the troubleshooting guide**: A solution to your issue might be found in the [FAQ](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/questions.md) or the [troubleshooting guide](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/troubleshooting.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index f49436ec6..13d436ba2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -72,6 +72,7 @@ body:
 
         - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Feature+request%22).
         - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Check the troubleshooting guide**: Information about your issue might be found in the [FAQ](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/questions.md) or the [troubleshooting guide](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/troubleshooting.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

From 6330773bfced51653da2b67eca38e947db4c1d94 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 21 Sep 2025 10:50:35 +0400
Subject: [PATCH 11/16] chore(YouTube Music): Add missing target version

---
 .../patches/music/misc/debugging/EnableDebuggingPatch.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/debugging/EnableDebuggingPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/debugging/EnableDebuggingPatch.kt
index f4747b2fc..76ee0e060 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/debugging/EnableDebuggingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/debugging/EnableDebuggingPatch.kt
@@ -15,7 +15,8 @@ val enableDebuggingPatch = enableDebuggingPatch(
 
         compatibleWith(
             "com.google.android.apps.youtube.music"(
-                "7.29.52"
+                "7.29.52",
+                "8.10.52"
             )
         )
     },

From 092a72c7743a9d247858e9f4a43f97546f5364b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 10:52:29 +0400
Subject: [PATCH 12/16] chore: Sync translations (#5946)

---
 .../addresources/values-af-rZA/strings.xml    |  1 +
 .../addresources/values-am-rET/strings.xml    |  1 +
 .../addresources/values-ar-rSA/strings.xml    | 13 +++--
 .../addresources/values-as-rIN/strings.xml    |  1 +
 .../addresources/values-az-rAZ/strings.xml    | 33 +++++++++++++
 .../addresources/values-be-rBY/strings.xml    | 13 +++--
 .../addresources/values-bg-rBG/strings.xml    | 13 +++--
 .../addresources/values-bn-rBD/strings.xml    | 13 +++--
 .../addresources/values-bs-rBA/strings.xml    |  1 +
 .../addresources/values-ca-rES/strings.xml    |  1 +
 .../addresources/values-cs-rCZ/strings.xml    | 13 +++--
 .../addresources/values-da-rDK/strings.xml    | 13 +++--
 .../addresources/values-de-rDE/strings.xml    | 13 +++--
 .../addresources/values-el-rGR/strings.xml    | 11 +++--
 .../addresources/values-es-rES/strings.xml    | 13 +++--
 .../addresources/values-et-rEE/strings.xml    | 13 +++--
 .../addresources/values-eu-rES/strings.xml    |  1 +
 .../addresources/values-fa-rIR/strings.xml    |  1 +
 .../addresources/values-fi-rFI/strings.xml    | 13 +++--
 .../addresources/values-fil-rPH/strings.xml   | 13 +++--
 .../addresources/values-fr-rFR/strings.xml    | 13 +++--
 .../addresources/values-ga-rIE/strings.xml    | 13 +++--
 .../addresources/values-gl-rES/strings.xml    |  1 +
 .../addresources/values-gu-rIN/strings.xml    |  1 +
 .../addresources/values-hi-rIN/strings.xml    |  3 ++
 .../addresources/values-hr-rHR/strings.xml    |  2 +
 .../addresources/values-hu-rHU/strings.xml    | 13 +++--
 .../addresources/values-hy-rAM/strings.xml    | 13 +++--
 .../addresources/values-in-rID/strings.xml    | 19 ++++----
 .../addresources/values-is-rIS/strings.xml    |  1 +
 .../addresources/values-it-rIT/strings.xml    | 13 +++--
 .../addresources/values-iw-rIL/strings.xml    | 13 +++--
 .../addresources/values-ja-rJP/strings.xml    | 47 ++++++++++---------
 .../addresources/values-ka-rGE/strings.xml    |  1 +
 .../addresources/values-kk-rKZ/strings.xml    |  1 +
 .../addresources/values-km-rKH/strings.xml    |  1 +
 .../addresources/values-kn-rIN/strings.xml    |  1 +
 .../addresources/values-ko-rKR/strings.xml    | 15 +++---
 .../addresources/values-ky-rKG/strings.xml    |  1 +
 .../addresources/values-lo-rLA/strings.xml    |  1 +
 .../addresources/values-lt-rLT/strings.xml    | 13 +++--
 .../addresources/values-lv-rLV/strings.xml    | 13 +++--
 .../addresources/values-mk-rMK/strings.xml    |  1 +
 .../addresources/values-ml-rIN/strings.xml    |  1 +
 .../addresources/values-mn-rMN/strings.xml    |  1 +
 .../addresources/values-mr-rIN/strings.xml    |  1 +
 .../addresources/values-ms-rMY/strings.xml    |  1 +
 .../addresources/values-my-rMM/strings.xml    |  1 +
 .../addresources/values-nb-rNO/strings.xml    |  1 +
 .../addresources/values-ne-rIN/strings.xml    |  1 +
 .../addresources/values-nl-rNL/strings.xml    | 13 +++--
 .../addresources/values-or-rIN/strings.xml    |  1 +
 .../addresources/values-pa-rIN/strings.xml    |  1 +
 .../addresources/values-pl-rPL/strings.xml    | 13 +++--
 .../addresources/values-pt-rBR/strings.xml    | 13 +++--
 .../addresources/values-pt-rPT/strings.xml    | 13 +++--
 .../addresources/values-ro-rRO/strings.xml    | 13 +++--
 .../addresources/values-ru-rRU/strings.xml    | 11 +++--
 .../addresources/values-si-rLK/strings.xml    |  1 +
 .../addresources/values-sk-rSK/strings.xml    | 13 +++--
 .../addresources/values-sl-rSI/strings.xml    | 13 +++--
 .../addresources/values-sq-rAL/strings.xml    | 13 +++--
 .../addresources/values-sr-rCS/strings.xml    | 13 +++--
 .../addresources/values-sr-rSP/strings.xml    | 13 +++--
 .../addresources/values-sv-rSE/strings.xml    | 13 +++--
 .../addresources/values-sw-rKE/strings.xml    |  1 +
 .../addresources/values-ta-rIN/strings.xml    |  1 +
 .../addresources/values-te-rIN/strings.xml    |  1 +
 .../addresources/values-th-rTH/strings.xml    | 13 +++--
 .../addresources/values-tr-rTR/strings.xml    | 13 +++--
 .../addresources/values-uk-rUA/strings.xml    | 13 +++--
 .../addresources/values-ur-rIN/strings.xml    |  1 +
 .../addresources/values-uz-rUZ/strings.xml    |  1 +
 .../addresources/values-vi-rVN/strings.xml    | 47 ++++++++++---------
 .../addresources/values-zh-rCN/strings.xml    | 13 +++--
 .../addresources/values-zh-rTW/strings.xml    | 13 +++--
 .../addresources/values-zu-rZA/strings.xml    |  1 +
 77 files changed, 435 insertions(+), 241 deletions(-)

diff --git a/patches/src/main/resources/addresources/values-af-rZA/strings.xml b/patches/src/main/resources/addresources/values-af-rZA/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-af-rZA/strings.xml
+++ b/patches/src/main/resources/addresources/values-af-rZA/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-am-rET/strings.xml b/patches/src/main/resources/addresources/values-am-rET/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-am-rET/strings.xml
+++ b/patches/src/main/resources/addresources/values-am-rET/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
index 372761c83..996d7def4 100644
--- a/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
+++ b/patches/src/main/resources/addresources/values-ar-rSA/strings.xml
@@ -1564,12 +1564,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• عميل تجريبي وقد يتوقف عن العمل في أي وقت</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• لا يوجد ترميز الفيديو AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• قد لا يتم تشغيل الفيديوهات المخصصة للأطفال عند تسجيل الخروج أو عند استخدام وضع التصفح المتخفي</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• فرض الصوت الأصلي غير متاح</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">عرض في إحصاءات تقنية</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">يتم عرض نوع العميل في إحصاءات تقنية</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">تم إخفاء نوع العميل في إحصاءات تقنية</string>
   <string name="revanced_spoof_video_streams_language_title">لغة بث الصوت</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">لتحديد لغة صوتية معينة، قم بإيقاف تشغيل \"فرض لغة الصوت الأصلية\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">اختيار لغة البث غير متاح مع Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">شريط التنقل</string>
   <string name="revanced_music_navigation_bar_screen_summary">إخفاء أزرار شريط التنقل أو تغييرها</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">إخفاء زر \"الرئيسية\"</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">إخفاء الرئيسية</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">زر \"الرئيسية\" مخفي</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">زر \"الرئيسية\" ظاهر</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">إخفاء زر \"المقتطفات\"</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">إخفاء المقاطع</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">زر \"المقتطفات\" مخفي</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">زر \"المقتطفات\" ظاهر</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">إخفاء زر \"استكشاف\"</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">إخفاء استكشاف</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">زر \"استكشاف\" مخفي</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">زر \"استكشاف\" ظاهر</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">إخفاء زر \"المكتبة\"</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">إخفاء المكتبة</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">زر \"المكتبة\" مخفي</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">زر \"المكتبة\" ظاهر</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">إخفاء زر \"الترقية\"</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">إخفاء ترقية</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">زر \"الترقية\" مخفي</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">زر \"الترقية\" ظاهر</string>
   <string name="revanced_music_hide_navigation_bar_title">إخفاء شريط التنقل</string>
diff --git a/patches/src/main/resources/addresources/values-as-rIN/strings.xml b/patches/src/main/resources/addresources/values-as-rIN/strings.xml
index 9ba0d2bf2..a1f6341bd 100644
--- a/patches/src/main/resources/addresources/values-as-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-as-rIN/strings.xml
@@ -246,6 +246,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-az-rAZ/strings.xml b/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
index 380716891..b3ed48ac1 100644
--- a/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-az-rAZ/strings.xml
@@ -587,6 +587,9 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_hide_stop_ads_button_summary_on">Reklamları dayandır düyməsi gizlidir</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Reklamları dayandır düyməsi görünür</string>
   <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
+  <string name="revanced_hide_comments_button_title">Şərhləri Gizlət</string>
+  <string name="revanced_hide_comments_button_summary_on">Şərhlər düyməsi gizlidir</string>
+  <string name="revanced_hide_comments_button_summary_off">Şərhlər düyməsi görünür</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually only shows on live streams. -->
   <string name="revanced_hide_report_button_title">\"Xəbər verin\"i gizlət</string>
@@ -1242,6 +1245,7 @@ Bu tətbiqin görünüşün və xüsusiyyətlərin dəyişdirəcək, lakin bilin
 
 Sonradan qapadılarsa, UI səhvlərin önləmək üçün tətbiq məlumatların silmək tövsiyə olunur."</string>
   <string name="revanced_spoof_app_version_target_title">Saxta tətbiq versiyası hədəfi</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Yığılmayan video fəaliyyət cizgisin bərpa et</string>
   <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Köhnə Shorts oynadıcı işarələrin bərpa et</string>
   <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Köhnə fəaliyyət simvolların bərpa et</string>
   </patch>
@@ -1559,12 +1563,15 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_spoof_video_streams_about_experimental">• Təcrübi qəbuledici və hər vaxt işləməyi dayandıra bilər</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• AV1 video kodlayıcı yoxdur</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Giriş edilməyəndə və ya gizli rejimdə uşaq videoları oynadıla bilməz</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• \"Orijinal səsi zorla\" əlçatmazdır</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">İstək üçün Statistikada göstər</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Qəbuledici növü İstək üçün statistikada göstərilir</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Qəbuledici nerd üçün Statistikada gizlidir</string>
   <string name="revanced_spoof_video_streams_language_title">Səs yayım dili</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Xüsusi səs dilini seçmək üçün \"Orijinal səs dilini zorlanı\" qapat</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Yayım dili seçimi Android Studio ilə əlçatmazdır</string>
   </patch>
   </app>
   <app id="music">
@@ -1586,6 +1593,9 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_music_play_permanent_repeat_summary_off">Kəsintisiz təkrarlama qapalıdır</string>
   </patch>
   <patch id="layout.castbutton.hideCastButton">
+  <string name="revanced_music_hide_cast_button_title">Yayım düyməsini gizlət</string>
+  <string name="revanced_music_hide_cast_button_summary_on">Yayım düyməsi gizlidir</string>
+  <string name="revanced_music_hide_cast_button_summary_off">Yayım düyməsi göstərilir</string>
   </patch>
   <patch id="layout.compactheader.hideCategoryBar">
   <string name="revanced_music_hide_category_bar_title">Kateqoriya cizgisin gizlət</string>
@@ -1593,11 +1603,34 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_music_hide_category_bar_summary_off">Kateqoriya cizgisi görünür</string>
   </patch>
   <patch id="layout.navigationbar.navigationBarPatch">
+  <string name="revanced_music_navigation_bar_screen_title">Fəaliyyət cizgisi</string>
+  <string name="revanced_music_navigation_bar_screen_summary">Fəaliyyət cizgisi düymələrini gizlət və ya dəyiş</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ev-i Gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Ev düyməsi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Ev düyməsi görünür</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Nümunələri Gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Nümunələr düyməsi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Nümunələr düyməsi görünür</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Kəşf edin-i gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Kəşf et düyməsi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Kəşf et düyməsi görünür</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Kitabxananı gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Kitabxana düyməsi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Kitabxana düyməsi görünür</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Təkmilləşdirməni Gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Təkmilləşdirmə düyməsi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Təkmilləşdirmə düyməsi görünür</string>
+  <string name="revanced_music_hide_navigation_bar_title">Fəaliyyət cizgisin gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_summary_on">Fəaliyyət cizgisi gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_summary_off">Fəaliyyət cizgisi görünür</string>
+  <string name="revanced_music_hide_navigation_bar_labels_title">Fəaliyyət düyməsi etiketlərini gizlət</string>
+  <string name="revanced_music_hide_navigation_bar_labels_summary_on">Etiketlər gizlidir</string>
+  <string name="revanced_music_hide_navigation_bar_labels_summary_off">Etiketlər görünür</string>
   </patch>
   <patch id="layout.premium.hideGetPremiumPatch">
   <string name="revanced_music_hide_get_premium_label_title"> \'Musiqi Premiumu Əldə et\' etiketini gizlət</string>
diff --git a/patches/src/main/resources/addresources/values-be-rBY/strings.xml b/patches/src/main/resources/addresources/values-be-rBY/strings.xml
index 194341e8d..2088ba77a 100644
--- a/patches/src/main/resources/addresources/values-be-rBY/strings.xml
+++ b/patches/src/main/resources/addresources/values-be-rBY/strings.xml
@@ -1565,12 +1565,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Эксперыментальны кліент і можа спыніць працу ў любы час</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Няма відэакідавання AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Дзіцячыя відэа могуць не прайгравацца ў стане выхаду з акаўнта або ў рэжыме інкогніта</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Прымусовы арыгінальны аўдыё недаступны</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Паказаць у статыстыцы для спецыялістаў</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Тып кліента адлюстроўваецца ў статыстыцы для спецыялістаў</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Кліент схаваны ў статыстыцы для спецыялістаў</string>
   <string name="revanced_spoof_video_streams_language_title">Мова аўдыяпатоку</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Каб выбраць пэўную мову аўдыё, адключыце \'Прымусовая арыгінальная мова аўдыё\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Выбар мовы трансляцыі недаступны ў Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1605,23 +1608,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">Панэль навігацыі</string>
   <string name="revanced_music_navigation_bar_screen_summary">Схаваць або змяніць кнопкі панэлі навігацыі</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Схаваць кнопку \"Галоўная\"</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Схаваць Галоўную</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Кнопка \"Галоўная\" схавана</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Кнопка \"Галоўная\" паказана</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Схаваць кнопку \"Узоры\"</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Схаваць Узоры</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Кнопка \"Узоры\" схавана</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Кнопка \"Узоры\" паказана</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Схаваць кнопку \"Агляд\"</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Схаваць Агляд</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Кнопка \"Агляд\" схавана</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Кнопка \"Агляд\" паказана</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Схаваць кнопку \"Бібліятэка\"</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Схаваць Бібліятэку</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Кнопка \"Бібліятэка\" схавана</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Кнопка \"Бібліятэка\" паказана</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Схаваць кнопку \"Абнавіць\"</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Схаваць Прэміум</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Кнопка \"Абнавіць\" схавана</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Кнопка \"Абнавіць\" паказана</string>
   <string name="revanced_music_hide_navigation_bar_title">Схаваць панэль навігацыі</string>
diff --git a/patches/src/main/resources/addresources/values-bg-rBG/strings.xml b/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
index 6d2437fc1..21234bbc7 100644
--- a/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
+++ b/patches/src/main/resources/addresources/values-bg-rBG/strings.xml
@@ -1564,12 +1564,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Експериментален клиент и може да спре да работи по всяко време</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Без AV1 видео кодек</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Детските видеоклипове може да не се възпроизвеждат, когато сте излезли от профила си или в режим \"инкогнито\"</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Принудителният оригинален звук не е наличен</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Poka6i v Statistiki za nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Tipът na klienta se poka6va v Statistiki za nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klientът e skriт v Statistiki za nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Език на аудио потока</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">За да изберете конкретен аудио език, изключете \'Принудително оригинален аудио език\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Изборът на език на потока не е наличен с Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">Навигационна лента</string>
   <string name="revanced_music_navigation_bar_screen_summary">Скриване или промяна на бутоните на навигационната лента</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Скриване на бутона Начало</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Скриване на Начало</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Бутонът Начало е скрит</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Бутонът Начало е показан</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Скриване на бутона Мостри</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Скриване на Мостри</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Бутонът Мостри е скрит</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Бутонът Мостри е показан</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Скриване на бутона Проучване</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Скриване на Разглеждане</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Бутонът Проучване е скрит</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Бутонът Проучване е показан</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Скриване на бутона Библиотека</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Скриване на Библиотека</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Бутонът Библиотека е скрит</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Бутонът Библиотека е показан</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Скриване на бутона Надграждане</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Скриване на Надстройка</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Бутонът Надграждане е скрит</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Бутонът Надграждане е показан</string>
   <string name="revanced_music_hide_navigation_bar_title">Скриване на навигационната лента</string>
diff --git a/patches/src/main/resources/addresources/values-bn-rBD/strings.xml b/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
index 4f6420605..8876b2690 100644
--- a/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
+++ b/patches/src/main/resources/addresources/values-bn-rBD/strings.xml
@@ -1560,12 +1560,15 @@ DeArrow সম্পর্কে আরও জানতে এখানে ট
   <string name="revanced_spoof_video_streams_about_experimental">• পরীক্ষামূলক ক্লায়েন্ট এবং যেকোনো সময় কাজ করা বন্ধ করতে পারে</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• কোনো AV1 ভিডিও কোডেক নেই</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• লগআউট করা হলে বা ছদ্মবেশী মোডে বাচ্চাদের ভিডিও চলতে নাও পারে</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• মূল অডিও জোরপূর্বক উপলব্ধ নেই</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">স্ট্যাটস ফর নার্ডসে দেখান</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">স্ট্যাটস ফর নার্ডসে ক্লায়েন্ট প্রকার দেখানো হবে</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">স্ট্যাটস ফর নার্ডসে ক্লায়েন্ট লুকানো হবে</string>
   <string name="revanced_spoof_video_streams_language_title">অডিও স্ট্রিম ভাষা</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">একটি নির্দিষ্ট অডিও ভাষা নির্বাচন করতে, \'মূল অডিও ভাষা জোর করে চালু রাখুন\' বন্ধ করুন</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">অ্যান্ড্রয়েড স্টুডিও সহ স্ট্রিম ভাষার নির্বাচন উপলব্ধ নেই</string>
   </patch>
   </app>
   <app id="music">
@@ -1600,23 +1603,23 @@ DeArrow সম্পর্কে আরও জানতে এখানে ট
   <string name="revanced_music_navigation_bar_screen_title">নেভিগেশন বার</string>
   <string name="revanced_music_navigation_bar_screen_summary">নেভিগেশন বারের বোতামগুলি লুকান বা পরিবর্তন করুন</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">হোম বোতাম লুকান</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">হোম লুকান</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">হোম বোতাম লুকানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">হোম বোতাম দেখানো আছে</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">স্যাম্পল বোতাম লুকান</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">স্যাম্পল লুকান</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">স্যাম্পল বোতাম লুকানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">স্যাম্পল বোতাম দেখানো আছে</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">অনুসন্ধান বোতাম লুকান</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">এক্সপ্লোর লুকান</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">অনুসন্ধান বোতাম লুকানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">অনুসন্ধান বোতাম দেখানো আছে</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">লাইব্রেরি বোতাম লুকান</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">লাইব্রেরি লুকান</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">লাইব্রেরি বোতাম লুকানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">লাইব্রেরি বোতাম দেখানো আছে</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">আপগ্রেড বোতাম লুকান</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">আপগ্রেড লুকান</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">আপগ্রেড বোতাম লুকানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">আপগ্রেড বোতাম দেখানো আছে</string>
   <string name="revanced_music_hide_navigation_bar_title">নেভিগেশন বার লুকান</string>
diff --git a/patches/src/main/resources/addresources/values-bs-rBA/strings.xml b/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
+++ b/patches/src/main/resources/addresources/values-bs-rBA/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ca-rES/strings.xml b/patches/src/main/resources/addresources/values-ca-rES/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ca-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-ca-rES/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml b/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
index c2dc16b0a..7001dccee 100644
--- a/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-cs-rCZ/strings.xml
@@ -1564,12 +1564,15 @@ Povolením této funkce lze odemknout vyšší kvality videa"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Experimentální klient a může kdykoli přestat fungovat</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Žádný video kodek AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Dětská videa se nemusí přehrávat, když jste odhlášení nebo v anonymním režimu</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Vynutit původní zvuk není k dispozici</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Zobrazit ve statistikách pro nadšence</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Typ klienta se zobrazuje ve statistikách pro nadšence</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klient je skrytý ve statistikách pro nadšence</string>
   <string name="revanced_spoof_video_streams_language_title">Jazyk zvukového streamu</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Chcete-li vybrat konkrétní zvukový jazyk, vypněte „Vynutit původní zvukový jazyk“</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Volba jazyka streamu není k dispozici s Android Studiem</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Povolením této funkce lze odemknout vyšší kvality videa"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigační panel</string>
   <string name="revanced_music_navigation_bar_screen_summary">Skrýt nebo změnit tlačítka navigačního panelu</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Skrýt tlačítko Domů</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Skrýt Domů</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Tlačítko Domů je skryté</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Tlačítko Domů je zobrazeno</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skrýt tlačítko Ukázky</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skrýt Ukázky</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Tlačítko Ukázky je skryté</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Tlačítko Ukázky je zobrazeno</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skrýt tlačítko Prozkoumat</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skrýt Prozkoumat</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tlačítko Prozkoumat je skryté</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tlačítko Prozkoumat je zobrazeno</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Skrýt tlačítko Knihovna</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Skrýt Knihovnu</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tlačítko Knihovna je skryté</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tlačítko Knihovna je zobrazeno</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skrýt tlačítko Vylepšit</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skrýt Upgradovat</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tlačítko Vylepšit je skryté</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tlačítko Vylepšit je zobrazeno</string>
   <string name="revanced_music_hide_navigation_bar_title">Skrýt navigační panel</string>
diff --git a/patches/src/main/resources/addresources/values-da-rDK/strings.xml b/patches/src/main/resources/addresources/values-da-rDK/strings.xml
index 89b84e2ed..282a112d2 100644
--- a/patches/src/main/resources/addresources/values-da-rDK/strings.xml
+++ b/patches/src/main/resources/addresources/values-da-rDK/strings.xml
@@ -1566,12 +1566,15 @@ Aktivering af dette kan låse op for højere videokvalitet"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentel klient og kan stoppe med at fungere når som helst</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Intet AV1-videokodek</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Videoer til børn afspilles muligvis ikke, når du er logget ud eller i inkognitotilstand</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Tving original lyd er ikke tilgængelig</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Vis i Statistik for nørder</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Klienttypen vises i Statistik for nørder</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klienten er skjult i Statistik for nørder</string>
   <string name="revanced_spoof_video_streams_language_title">Lydstreamsprog</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">For at vælge et specifikt lydsprog, slå \'Gennemtving originalt lydsprog\' fra</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Valg af streaming-sprog er ikke tilgængeligt med Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1606,23 +1609,23 @@ Aktivering af dette kan låse op for højere videokvalitet"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigationslinje</string>
   <string name="revanced_music_navigation_bar_screen_summary">Skjul eller skift navigationslinjeknapper</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Skjul Startside-knap</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Skjul Startside</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Startside-knappen er skjult</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Startside-knappen vises</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skjul Kortklip-knap</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skjul Uddrag</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Kortklip-knappen er skjult</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Kortklip-knappen vises</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skjul Udforsk-knap</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skjul Udforsk</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Udforsk-knappen er skjult</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Udforsk-knappen vises</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Skjul Bibliotek-knap</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Skjul Bibliotek</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Bibliotek-knappen er skjult</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Bibliotek-knappen vises</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skjul Opgrader-knap</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skjul Opgrader</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Opgrader-knappen er skjult</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Opgrader-knappen vises</string>
   <string name="revanced_music_hide_navigation_bar_title">Skjul navigationslinje</string>
diff --git a/patches/src/main/resources/addresources/values-de-rDE/strings.xml b/patches/src/main/resources/addresources/values-de-rDE/strings.xml
index e6e92e7bc..d7fe3ac5c 100644
--- a/patches/src/main/resources/addresources/values-de-rDE/strings.xml
+++ b/patches/src/main/resources/addresources/values-de-rDE/strings.xml
@@ -1561,12 +1561,15 @@ Durch Aktivieren dieser Option können höhere Videoqualitäten freigeschaltet w
   <string name="revanced_spoof_video_streams_about_experimental">• Experimenteller Client und kann jederzeit aufhören zu funktionieren</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Kein AV1-Videocodec</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Kinder-Videos werden möglicherweise nicht abgespielt, wenn du abgemeldet bist oder den Inkognito-Modus verwendest.</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Originalton erzwingen ist nicht verfügbar</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">In Statistiken für Nerds anzeigen</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Der Client-Typ wird in den Statistiken für Nerds angezeigt</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Der Client wird in den Statistiken für Nerds ausgeblendet</string>
   <string name="revanced_spoof_video_streams_language_title">Audiodatenstromsprache</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Um eine bestimmte Audiosprache auszuwählen, deaktivieren Sie „Original-Audiosprache erzwingen“</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Die Auswahl der Stream-Sprache ist mit Android Studio nicht verfügbar.</string>
   </patch>
   </app>
   <app id="music">
@@ -1601,23 +1604,23 @@ Durch Aktivieren dieser Option können höhere Videoqualitäten freigeschaltet w
   <string name="revanced_music_navigation_bar_screen_title">Navigationsleiste</string>
   <string name="revanced_music_navigation_bar_screen_summary">Navigationsleisten-Schaltflächen ausblenden oder ändern</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Start-Schaltfläche ausblenden</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Startseite ausblenden</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Start-Schaltfläche ist ausgeblendet</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Start-Schaltfläche wird angezeigt</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Samples-Schaltfläche ausblenden</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Kurzvideos ausblenden</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Samples-Schaltfläche ist ausgeblendet</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Samples-Schaltfläche wird angezeigt</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Entdecken-Schaltfläche ausblenden</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Erkunden ausblenden</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Entdecken-Schaltfläche ist ausgeblendet</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Entdecken-Schaltfläche wird angezeigt</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Mediathek-Schaltfläche ausblenden</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Mediathek ausblenden</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Mediathek-Schaltfläche ist ausgeblendet</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Mediathek-Schaltfläche wird angezeigt</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Upgrade-Schaltfläche ausblenden</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Upgrade ausblenden</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Upgrade-Schaltfläche ist ausgeblendet</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Upgrade-Schaltfläche wird angezeigt</string>
   <string name="revanced_music_hide_navigation_bar_title">Navigationsleiste ausblenden</string>
diff --git a/patches/src/main/resources/addresources/values-el-rGR/strings.xml b/patches/src/main/resources/addresources/values-el-rGR/strings.xml
index 9bbf30c50..cd9670794 100644
--- a/patches/src/main/resources/addresources/values-el-rGR/strings.xml
+++ b/patches/src/main/resources/addresources/values-el-rGR/strings.xml
@@ -1563,12 +1563,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Πειραματικός πελάτης και μπορεί να σταματήσει να λειτουργεί ανά πάσα στιγμή</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Δεν υπάρχει ο κωδικοποιητής βίντεο AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Τα βίντεο για παιδιά ενδέχεται να μην αναπαράγονται αν είστε αποσυνδεδεμένοι ή σε λειτουργία ανώνυμης περιήγησης</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Ο εξαναγκασμός αρχικής γλώσσας ήχου δεν είναι διαθέσιμος</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Εμφάνιση στο μενού «Στατιστικά για σπασίκλες»</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Το πρόγραμμα πελάτη εμφανίζεται στο μενού «Στατιστικά για σπασίκλες»</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Το πρόγραμμα πελάτη δεν εμφανίζεται στο μενού «Στατιστικά για σπασίκλες»</string>
   <string name="revanced_spoof_video_streams_language_title">Γλώσσα ροής ήχου</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Για να επιλέξετε μια συγκεκριμένη γλώσσα ήχου, απενεργοποιήστε το «Εξαναγκασμός αρχικής γλώσσας ήχου»</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Η επιλογή γλώσσας ροής δεν είναι διαθέσιμη με το Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1607,19 +1610,19 @@ Second \"item\" text"</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Εμφανίζεται</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Κουμπί «Δείγματα»</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Απόκρυψη δειγμάτων</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Εμφανίζεται</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Κουμπί «Εξερεύνηση»</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Απόκρυψη «Εξερεύνηση»</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Εμφανίζεται</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Κουμπί «Βιβλιοθήκη»</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Απόκρυψη «Βιβλιοθήκη»</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Εμφανίζεται</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Κουμπί «Αναβάθμιση»</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Απόκρυψη «Αναβάθμιση»</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Κρυμμένο</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Εμφανίζεται</string>
   <string name="revanced_music_hide_navigation_bar_title">Γραμμή πλοήγησης</string>
diff --git a/patches/src/main/resources/addresources/values-es-rES/strings.xml b/patches/src/main/resources/addresources/values-es-rES/strings.xml
index dd8a21277..35390a52d 100644
--- a/patches/src/main/resources/addresources/values-es-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-es-rES/strings.xml
@@ -1555,12 +1555,15 @@ Habilitar esto puede desbloquear calidades de vídeo más altas"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• El cliente es experimental y puede dejar de funcionar en cualquier momento</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Sin códec de vídeo AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Es posible que los vídeos infantiles no se reproduzcan cuando se cierra la sesión o se está en modo incógnito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forzar audio original no está disponible</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostrar en Estadísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">El tipo de cliente se muestra en Estadísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">El cliente está oculto en Estadísticas para nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Idioma de la transmisión de audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Para seleccionar un idioma de audio específico, desactiva \"Forzar idioma de audio original\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">La selección de idioma de transmisión no está disponible con Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1595,23 +1598,23 @@ Habilitar esto puede desbloquear calidades de vídeo más altas"</string>
   <string name="revanced_music_navigation_bar_screen_title">Barra de navegación</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ocultar o cambiar los botones de la barra de navegación</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar el botón Inicio</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar pestaña \'Inicio\'</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">El botón Inicio está oculto</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">El botón Inicio es visible</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar el botón Muestras</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar muestras</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">El botón Muestras está oculto</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">El botón Muestras es visible</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar el botón Explorar</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar Explorar</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">El botón Explorar está oculto</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">El botón Explorar es visible</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar el botón Biblioteca</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar Biblioteca</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">El botón Biblioteca está oculto</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">El botón Biblioteca es visible</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar el botón Actualizar</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar Premium</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">El botón Actualizar está oculto</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">El botón Actualizar es visible</string>
   <string name="revanced_music_hide_navigation_bar_title">Ocultar la barra de navegación</string>
diff --git a/patches/src/main/resources/addresources/values-et-rEE/strings.xml b/patches/src/main/resources/addresources/values-et-rEE/strings.xml
index ea644518c..82c512c94 100644
--- a/patches/src/main/resources/addresources/values-et-rEE/strings.xml
+++ b/patches/src/main/resources/addresources/values-et-rEE/strings.xml
@@ -1564,12 +1564,15 @@ Selle lubamine võib avada kõrgema video kvaliteedi"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentaalne klient ja võib igal ajal töötamast lakata</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Puuduv AV1 videokoodek</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Video lastele ei pruugi taasesitada, kui olete välja logitud või inkognito režiimis</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Sunni algne heli pole saadaval</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Kuva statistikas \"Nerdide jaoks\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Klienditüüp on statistikas \"Nerdide jaoks\" nähtav</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klient on statistikas \"Nerdide jaoks\" peidetud</string>
   <string name="revanced_spoof_video_streams_language_title">Helivoo keel</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Konkreetse helikeele valimiseks lülita välja \"Sunni algne helikeel\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Voogedastuse keelevalik ei ole Android Studioga saadaval</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Selle lubamine võib avada kõrgema video kvaliteedi"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigeerimisriba</string>
   <string name="revanced_music_navigation_bar_screen_summary">Peida või muuda navigeerimisriba nuppe</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Peida Avalehe nupp</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Peida Avaleht</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Avalehe nupp on peidetud</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Avalehe nupp on nähtav</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Peida Näidiste nupp</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Peida Näidised</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Näidiste nupp on peidetud</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Näidiste nupp on nähtav</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Peida Avasta nupp</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Peida Avasta</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Avasta nupp on peidetud</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Avasta nupp on nähtav</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Peida Kogu nupp</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Peida Kogu</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Kogu nupp on peidetud</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Kogu nupp on nähtav</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Peida Uuenda nupp</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Peida Uuenda</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Uuenda nupp on peidetud</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Uuenda nupp on nähtav</string>
   <string name="revanced_music_hide_navigation_bar_title">Peida navigeerimisriba</string>
diff --git a/patches/src/main/resources/addresources/values-eu-rES/strings.xml b/patches/src/main/resources/addresources/values-eu-rES/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-eu-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-eu-rES/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-fa-rIR/strings.xml b/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
index 815c5a1a3..8967c9990 100644
--- a/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
+++ b/patches/src/main/resources/addresources/values-fa-rIR/strings.xml
@@ -294,6 +294,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-fi-rFI/strings.xml b/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
index 79792375f..6b0d2a917 100644
--- a/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
+++ b/patches/src/main/resources/addresources/values-fi-rFI/strings.xml
@@ -1564,12 +1564,15 @@ Tämä voi avata korkealaatuisemmat videot"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Kokeellinen asiakasohjelma, joka saattaa lakata toimimasta milloin tahansa</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Ei AV1-videokoodekkia</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Lasten videot eivät ehkä toistu, kun olet kirjautunut ulos tai incognito-tilassa</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Pakota alkuperäinen ääni ei ole käytettävissä</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Näytä teknisissä tiedoissa</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Asiakastyyppi näytetään teknisissä tiedoissa</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Asiakastyyppi on piilotettu teknisissä tiedoissa</string>
   <string name="revanced_spoof_video_streams_language_title">Äänivirran kieli</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Valitaksesi tietyn äänikielen, poista käytöstä \'Pakota alkuperäinen äänikieli\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Striimin kielivalinta ei ole käytettävissä Android Studion kanssa</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Tämä voi avata korkealaatuisemmat videot"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigointipalkki</string>
   <string name="revanced_music_navigation_bar_screen_summary">Piilota tai muuta navigointipalkin painikkeita</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Piilota Etusivu-painike</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Piilota Koti</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Etusivu-painike on piilotettu</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Etusivu-painike näytetään</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Piilota Näytteet-painike</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Piilota Näytteet</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Näytteet-painike on piilotettu</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Näytteet-painike näytetään</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Piilota Tutustu-painike</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Piilota Tutki</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tutustu-painike on piilotettu</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tutustu-painike näytetään</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Piilota Kirjasto-painike</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Piilota kirjasto</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Kirjasto-painike on piilotettu</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Kirjasto-painike näytetään</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Piilota Päivitä-painike</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Piilota Päivitä</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Päivitä-painike on piilotettu</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Päivitä-painike näytetään</string>
   <string name="revanced_music_hide_navigation_bar_title">Piilota navigointipalkki</string>
diff --git a/patches/src/main/resources/addresources/values-fil-rPH/strings.xml b/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
index bfb4ac8e5..d38b503dd 100644
--- a/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
+++ b/patches/src/main/resources/addresources/values-fil-rPH/strings.xml
@@ -1562,12 +1562,15 @@ Ang pagpapagana nito ay maaaring magbukas ng mas mataas na kalidad ng video"</st
   <string name="revanced_spoof_video_streams_about_experimental">• Pang-eksperimentong kliyente at maaaring huminto sa paggana anumang oras</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Walang AV1 video codec</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Mga video ng mga bata ay maaaring hindi ma-play kapag naka-log out o nasa incognito mode</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Ang Pilitin ang orihinal na audio ay hindi magagamit</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Ipakita sa Mga Istatistika para sa mga nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Ipinapakita ang uri ng kliyente sa Mga Istatistika para sa mga nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Nakatago ang kliyente sa Mga Istatistika para sa mga nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Wika ng audio stream</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Upang pumili ng isang partikular na wika ng audio, i-off ang \'Puwersahin ang orihinal na wika ng audio\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Hindi available ang pagpili ng wika ng stream sa Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1602,23 +1605,23 @@ Ang pagpapagana nito ay maaaring magbukas ng mas mataas na kalidad ng video"</st
   <string name="revanced_music_navigation_bar_screen_title">Navigation bar</string>
   <string name="revanced_music_navigation_bar_screen_summary">Itago o baguhin ang mga pindutan ng navigation bar</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Itago ang pindutan ng Home</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Itago ang Tahanan</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Nakatago ang pindutan ng Home</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Nakalabas ang pindutan ng Home</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Itago ang pindutan ng Samples</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Itago ang Mga Sample</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Nakatago ang pindutan ng Samples</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Nakalabas ang pindutan ng Samples</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Itago ang pindutan ng Explore</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Itago ang Galugarin</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Nakatago ang pindutan ng Explore</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Nakalabas ang pindutan ng Explore</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Itago ang pindutan ng Library</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Itago ang Aklatan</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Nakatago ang pindutan ng Library</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Nakalabas ang pindutan ng Library</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Itago ang pindutan ng Upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Itago ang I-upgrade</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Nakatago ang pindutan ng Upgrade</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Nakalabas ang pindutan ng Upgrade</string>
   <string name="revanced_music_hide_navigation_bar_title">Itago ang navigation bar</string>
diff --git a/patches/src/main/resources/addresources/values-fr-rFR/strings.xml b/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
index 62dce95f4..6cc1a414f 100644
--- a/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
+++ b/patches/src/main/resources/addresources/values-fr-rFR/strings.xml
@@ -1565,12 +1565,15 @@ Activer cette option peut déverrouiller des qualités vidéo supérieures"</str
   <string name="revanced_spoof_video_streams_about_experimental">• Client expérimental, peut cesser de fonctionner à tout moment</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Codec vidéo AV1 indisponible</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• La lecture des vidéos pour enfants peut ne pas fonctionner lorsque vous êtes déconnecté ou en mode navigation privée</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forcer l\'audio original n\'est pas disponible</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Afficher dans les Statistiques avancées</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Le type de client est affiché dans les Statistiques avancées</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Le client est caché dans les Statistiques avancées</string>
   <string name="revanced_spoof_video_streams_language_title">Langue du flux audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Pour sélectionner une langue audio spécifique, désactivez \"Forcer la langue audio d\'origine\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">La sélection de la langue du flux n\'est pas disponible avec Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1605,23 +1608,23 @@ Activer cette option peut déverrouiller des qualités vidéo supérieures"</str
   <string name="revanced_music_navigation_bar_screen_title">Barre de navigation</string>
   <string name="revanced_music_navigation_bar_screen_summary">Masquer ou modifier les boutons de la barre de navigation</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Masquer le bouton Accueil</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Masquer Accueil</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Le bouton Accueil est masqué</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Le bouton Accueil est affiché</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Masquer le bouton Extraits</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Masquer Extraits</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Le bouton Extraits est masqué</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Le bouton Extraits est affiché</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Masquer le bouton Explorer</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Masquer Explorer</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Le bouton Explorer est masqué</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Le bouton Explorer est affiché</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Masquer le bouton Bibliothèque</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Masquer Bibliothèque</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Le bouton Bibliothèque est masqué</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Le bouton Bibliothèque est affiché</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Masquer le bouton S\'abonner</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Masquer Premium</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Le bouton S\'abonner est masqué</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Le bouton S\'abonner est affiché</string>
   <string name="revanced_music_hide_navigation_bar_title">Masquer la barre de navigation</string>
diff --git a/patches/src/main/resources/addresources/values-ga-rIE/strings.xml b/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
index 8529535f1..3aaa3b244 100644
--- a/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
+++ b/patches/src/main/resources/addresources/values-ga-rIE/strings.xml
@@ -1564,12 +1564,15 @@ Is féidir le seo caighdeáin físeáin níos airde a dhíghlasáil"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Cliant turgnamhach é seo agus féadfaidh sé stop a chur ag obair ag am ar bith</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Níl aon chóidéir físe AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Videos faoi phaistí uaireanta nach imreoidh nuair a bhíonn tú logáilte amach nó i mod incognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Níl Éigean fuaime bunaidh ar fáil</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Taispeáin i Staitisticí do nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Taispeántar cineál an chliaint i Staitisticí do nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Tá an cliant curtha i bhfolach i Staitisticí do nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Teanga an tsrutha fuaime</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Chun teanga fuaime shonrach a roghnú, múch \'Cuir iallach ar bhunteanga fuaime\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Níl roghnú theanga an tsrutha ar fáil le Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Is féidir le seo caighdeáin físeáin níos airde a dhíghlasáil"</string>
   <string name="revanced_music_navigation_bar_screen_title">Barra nascleanúna</string>
   <string name="revanced_music_navigation_bar_screen_summary">Folaigh nó athraigh cnaipí an bharra nascleanúna</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Folaigh cnaipe Baile</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Folaigh Baile</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Tá cnaipe Baile folaithe</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Tá cnaipe Baile taispeánta</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Folaigh cnaipe Samplaí</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Folaigh Samplaí</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Tá cnaipe Samplaí folaithe</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Tá cnaipe Samplaí taispeánta</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Folaigh cnaipe Fionnachtana</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Folaigh Scrúdaigh</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tá cnaipe Fionnachtana folaithe</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tá cnaipe Fionnachtana taispeánta</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Folaigh cnaipe Leabharlann</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Folaigh Leabharlann</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tá cnaipe Leabharlann folaithe</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tá cnaipe Leabharlann taispeánta</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Folaigh cnaipe Uasghrádú</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Folaigh Uasghrádaigh</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tá cnaipe Uasghrádú folaithe</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tá cnaipe Uasghrádú taispeánta</string>
   <string name="revanced_music_hide_navigation_bar_title">Folaigh barra nascleanúna</string>
diff --git a/patches/src/main/resources/addresources/values-gl-rES/strings.xml b/patches/src/main/resources/addresources/values-gl-rES/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-gl-rES/strings.xml
+++ b/patches/src/main/resources/addresources/values-gl-rES/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-gu-rIN/strings.xml b/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-gu-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-hi-rIN/strings.xml b/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
index 08705f06e..905532c0b 100644
--- a/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-hi-rIN/strings.xml
@@ -31,6 +31,8 @@ Second \"item\" text"</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <string name="revanced_spoof_video_streams_screen_summary">प्लेबैक समस्याओं को रोकने के लिए क्लाइंट वीडियो स्ट्रीम को स्पूफ करें</string>
+  <string name="revanced_spoof_video_streams_screen_summary">प्लेबैक समस्याओं को रोकने के लिए क्लाइंट वीडियो स्ट्रीम को स्पूफ करें</string>
   </patch>
   <patch id="misc.debugging.enableDebuggingPatch">
   </patch>
@@ -244,6 +246,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-hr-rHR/strings.xml b/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
index 08705f06e..4f74c1712 100644
--- a/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
+++ b/patches/src/main/resources/addresources/values-hr-rHR/strings.xml
@@ -21,6 +21,7 @@ Second \"item\" text"</string>
 <resources>
   <app id="shared">
   <patch id="misc.checks.checkEnvironmentPatch">
+  <string name="revanced_check_environment_failed_title">Provjere nisu uspjele</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <!-- Settings about dialog. -->
@@ -244,6 +245,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-hu-rHU/strings.xml b/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
index 50f394e38..a90935daa 100644
--- a/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
+++ b/patches/src/main/resources/addresources/values-hu-rHU/strings.xml
@@ -1561,12 +1561,15 @@ Ez a beállítás lehetővé teszi a magasabb videóminőségek feloldását"</s
   <string name="revanced_spoof_video_streams_about_experimental">• Kísérleti kliens, és bármikor leállhat</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nincs AV1 videokodek</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• A gyermekeknek szóló videók nem játszódnak le, ha a felhasználó kijelentkezett, vagy inkognitómódban van.</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Eredeti hang kényszerítése nem érhető el</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Megjelenítés a Statisztikákban</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">A kliens típusa a Statisztikákban látható</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">A kliens el van rejtve a Statisztikákban</string>
   <string name="revanced_spoof_video_streams_language_title">Hangfolyam nyelve</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Egy adott hangsáv nyelv kiválasztásához kapcsold ki az \"Eredeti hangsáv nyelv kikényszerítése\" opciót</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Az Android Studio-val nem érhető el a stream nyelvének kiválasztása</string>
   </patch>
   </app>
   <app id="music">
@@ -1601,23 +1604,23 @@ Ez a beállítás lehetővé teszi a magasabb videóminőségek feloldását"</s
   <string name="revanced_music_navigation_bar_screen_title">Navigációs sáv</string>
   <string name="revanced_music_navigation_bar_screen_summary">Navigációs sáv gombjainak elrejtése vagy módosítása</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Kezdőlap gomb elrejtése</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Főoldal elrejtése</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">A Kezdőlap gomb elrejtve</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">A Kezdőlap gomb látható</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Minták gomb elrejtése</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Minták elrejtése</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">A Minták gomb elrejtve</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">A Minták gomb látható</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Felfedezés gomb elrejtése</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Felfedezés elrejtése</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">A Felfedezés gomb elrejtve</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">A Felfedezés gomb látható</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Könyvtár gomb elrejtése</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Könyvtár elrejtése</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">A Könyvtár gomb elrejtve</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">A Könyvtár gomb látható</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Frissítés gomb elrejtése</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Frissítés elrejtése</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">A Frissítés gomb elrejtve</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">A Frissítés gomb látható</string>
   <string name="revanced_music_hide_navigation_bar_title">Navigációs sáv elrejtése</string>
diff --git a/patches/src/main/resources/addresources/values-hy-rAM/strings.xml b/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
index 91942aeee..69bfed040 100644
--- a/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
+++ b/patches/src/main/resources/addresources/values-hy-rAM/strings.xml
@@ -1565,12 +1565,15 @@ Mini-player-ը կարող է գրավվել էկրանից դուրս՝ դեպի
   <string name="revanced_spoof_video_streams_about_experimental">• Փորձնական հաճախորդ է և կարող է ցանկացած պահի դադարել աշխատել</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Հեռացված բոլոր AV1 վիդեո կոդեկները</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">Երեխաների տեսանյութերը կարող են չհամապատասխանել հետևյալ պահանջներին՝ եթե արտոնագրման խախտումներ կան։</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Բնօրինակ ձայնի պարտադրումը հասանելի չէ</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Ցուցադրել վիճակագրության ակնոցներում</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Հաճախորդի տեսակը ցուցադրվում է վիճակագրության ակնոցներում</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Հաճախորդը թաքնված է վիճակագրության ակնոցներում</string>
   <string name="revanced_spoof_video_streams_language_title">Ձայնային հոսքի լեզուն</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Որոշակի ձայնային լեզու ընտրելու համար անջատեք \'Պարտադրել բնօրինակ ձայնային լեզուն\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Հոսքի լեզվի ընտրությունը հասանելի չէ Android Studio-ի հետ</string>
   </patch>
   </app>
   <app id="music">
@@ -1605,23 +1608,23 @@ Mini-player-ը կարող է գրավվել էկրանից դուրս՝ դեպի
   <string name="revanced_music_navigation_bar_screen_title">Նավիգացիոն գիծ</string>
   <string name="revanced_music_navigation_bar_screen_summary">Թաքցնել կամ փոխել նավիգացիոն գծի կոճակները</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Թաքցնել «Գլխավոր» կոճակը</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Թաքցնել Գլխավորը</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">«Գլխավոր» կոճակը թաքնված է</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">«Գլխավոր» կոճակը ցուցադրված է</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Թաքցնել «Նմուշներ» կոճակը</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Թաքցնել Նմուշները</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">«Նմուշներ» կոճակը թաքնված է</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">«Նմուշներ» կոճակը ցուցադրված է</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Թաքցնել «Բացահայտել» կոճակը</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Թաքցնել Ուսումնասիրելը</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">«Բացահայտել» կոճակը թաքնված է</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">«Բացահայտել» կոճակը ցուցադրված է</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Թաքցնել «Գրադարան» կոճակը</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Թաքցնել Գրադարանը</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">«Գրադարան» կոճակը թաքնված է</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">«Գրադարան» կոճակը ցուցադրված է</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Թաքցնել «Արդիականացնել» կոճակը</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Թաքցնել Թարմացումը</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">«Արդիականացնել» կոճակը թաքնված է</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">«Արդիականացնել» կոճակը ցուցադրված է</string>
   <string name="revanced_music_hide_navigation_bar_title">Թաքցնել նավիգացիոն գիծը</string>
diff --git a/patches/src/main/resources/addresources/values-in-rID/strings.xml b/patches/src/main/resources/addresources/values-in-rID/strings.xml
index 552915f40..28b4467e5 100644
--- a/patches/src/main/resources/addresources/values-in-rID/strings.xml
+++ b/patches/src/main/resources/addresources/values-in-rID/strings.xml
@@ -98,7 +98,7 @@ Jika Anda adalah pengguna YouTube Premium, setelan ini mungkin tidak diperlukan"
   <string name="revanced_spoof_video_streams_summary_off">"Aliran video tidak dipalsukan
 
 Pemutaran mungkin tidak berfungsi"</string>
-  <string name="revanced_spoof_video_streams_user_dialog_message">Menonaktifkan pengaturan ini mungkin menyebabkan masalah pemutaran.</string>
+  <string name="revanced_spoof_video_streams_user_dialog_message">Mematikan pengaturan ini dapat menyebabkan masalah pemutaran.</string>
   <string name="revanced_spoof_video_streams_client_type_title">Klien bawaan</string>
   </patch>
   <patch id="misc.debugging.enableDebuggingPatch">
@@ -1563,12 +1563,15 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Klien eksperimental dan dapat berhenti berfungsi kapan saja</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Tidak ada codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Video anak-anak mungkin tidak dapat diputar saat keluar atau dalam mode penyamaran</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Paksa audio asli tidak tersedia</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Tampilkan di Statistik untuk nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Jenis klien ditampilkan di Statistik untuk nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klien disembunyikan di Statistik untuk nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Bahasa aliran audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Untuk memilih bahasa audio tertentu, matikan \'Paksa bahasa audio asli\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Pilihan bahasa streaming tidak tersedia dengan Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,25 +1606,25 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_music_navigation_bar_screen_title">Bilah navigasi</string>
   <string name="revanced_music_navigation_bar_screen_summary">Sembunyikan atau ubah tombol bilah navigasi</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Sembunyikan tombol Beranda</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Sembunyikan Beranda</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Tombol Beranda disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Tombol Beranda ditampilkan</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Sembunyikan tombol Cuplikan</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Sembunyikan Cuplikan</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Tombol Cuplikan disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Tombol Cuplikan ditampilkan</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Sembunyikan tombol Jelajahi</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Sembunyikan Jelajahi</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tombol Jelajahi disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tombol Jelajahi ditampilkan</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Sembunyikan tombol Pustaka</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Sembunyikan Pustaka</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tombol Pustaka disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tombol Pustaka ditampilkan</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sembunyikan tombol Upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sembunyikan Upgrade</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tombol Upgrade disembunyikan</string>
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tombol upgrade ditampilkan</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tombol Upgrade ditampilkan</string>
   <string name="revanced_music_hide_navigation_bar_title">Sembunyikan bilah navigasi</string>
   <string name="revanced_music_hide_navigation_bar_summary_on">Bilah navigasi disembunyikan</string>
   <string name="revanced_music_hide_navigation_bar_summary_off">Bilah navigasi ditampilkan</string>
@@ -1635,7 +1638,7 @@ Mengaktifkan ini dapat membuka kualitas video yang lebih tinggi"</string>
   <string name="revanced_music_hide_get_premium_label_summary_off">Label ditampilkan</string>
   </patch>
   <patch id="layout.upgradebutton.hideUpgradeButtonPatch">
-  <string name="revanced_music_hide_upgrade_button_title">Sembunyikan tombol upgrade</string>
+  <string name="revanced_music_hide_upgrade_button_title">Sembunyikan tombol Upgrade</string>
   <string name="revanced_music_hide_upgrade_button_summary_on">Tombol disembunyikan</string>
   <string name="revanced_music_hide_upgrade_button_summary_off">Tombol ditampilkan</string>
   </patch>
diff --git a/patches/src/main/resources/addresources/values-is-rIS/strings.xml b/patches/src/main/resources/addresources/values-is-rIS/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-is-rIS/strings.xml
+++ b/patches/src/main/resources/addresources/values-is-rIS/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-it-rIT/strings.xml b/patches/src/main/resources/addresources/values-it-rIT/strings.xml
index debbee690..ac465053a 100644
--- a/patches/src/main/resources/addresources/values-it-rIT/strings.xml
+++ b/patches/src/main/resources/addresources/values-it-rIT/strings.xml
@@ -1563,12 +1563,15 @@ Abilitare questa opzione può sbloccare qualità video più elevate"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Client sperimentale e potrebbe smettere di funzionare in qualsiasi momento</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nessun codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• I video dei bambini potrebbero non essere riprodotti quando si è disconnessi o in modalità di navigazione in incognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• L\'audio originale forzato non è disponibile</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostra nelle statistiche per nerd</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Il tipo di client è mostrato nelle statistiche per nerd</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Il client è nascosto nelle statistiche per nerd</string>
   <string name="revanced_spoof_video_streams_language_title">Lingua del flusso audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Per selezionare una lingua audio specifica, disattiva \'Forza lingua audio originale\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">La selezione della lingua dello stream non è disponibile con Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,23 +1606,23 @@ Abilitare questa opzione può sbloccare qualità video più elevate"</string>
   <string name="revanced_music_navigation_bar_screen_title">Barra di navigazione</string>
   <string name="revanced_music_navigation_bar_screen_summary">Nascondi o modifica i pulsanti della barra di navigazione</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Nascondi il pulsante Home</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Nascondi Home</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Il pulsante Home è nascosto</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Il pulsante Home è mostrato</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Nascondi il pulsante Campioni</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Nascondi Esempi</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Il pulsante Campioni è nascosto</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Il pulsante Campioni è mostrato</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Nascondi il pulsante Esplora</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Nascondi Esplora</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Il pulsante Esplora è nascosto</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Il pulsante Esplora è mostrato</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Nascondi il pulsante Libreria</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Nascondi Libreria</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Il pulsante Libreria è nascosto</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Il pulsante Libreria è mostrato</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Nascondi il pulsante Aggiorna</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Nascondi Aggiorna</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Il pulsante Aggiorna è nascosto</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Il pulsante Aggiorna è mostrato</string>
   <string name="revanced_music_hide_navigation_bar_title">Nascondi la barra di navigazione</string>
diff --git a/patches/src/main/resources/addresources/values-iw-rIL/strings.xml b/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
index 56279ac7e..910332f9a 100644
--- a/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
+++ b/patches/src/main/resources/addresources/values-iw-rIL/strings.xml
@@ -1566,12 +1566,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• לקוח ניסיוני ועשוי להפסיק לפעול בכל עת</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• אין קודק וידאו מסוג AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• ייתכן שסרטוני Kids לא יופעלו כשאתה מנותק או במצב פרטי</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• כפיית שמע מקורי אינה זמינה</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">הצג בנתונים לגיקים</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">סוג הלקוח מוצג בנתונים לגיקים</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">הלקוח מוסתר בנתונים לגיקים</string>
   <string name="revanced_spoof_video_streams_language_title">שפת זרם השמע</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">כדי לבחור שפת שמע ספציפית, כבה את \'אכוף שפת שמע מקורית\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">בחירת שפת הזרם אינה זמינה עם אנדרואיד סטודיו</string>
   </patch>
   </app>
   <app id="music">
@@ -1606,23 +1609,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">סרגל ניווט</string>
   <string name="revanced_music_navigation_bar_screen_summary">הסתר או שנה לחצני סרגל ניווט</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">הסתר לחצן \'דף הבית\'</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">הסתר דף הבית</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">לחצן \'דף הבית\' מוסתר</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">לחצן \'דף הבית\' מוצג</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">הסתר לחצן \'דוגמיות\'</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">הסתר דוגמאות</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">לחצן \'דוגמיות\' מוסתר</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">לחצן \'דוגמיות\' מוצג</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">הסתר לחצן \'גלו\'</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">הסתר גלו</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">לחצן \'גלו\' מוסתר</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">לחצן \'גלו\' מוצג</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">הסתר לחצן \'ספרייה\'</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">הסתר ספרייה</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">לחצן \'ספרייה\' מוסתר</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">לחצן \'ספרייה\' מוצג</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">הסתר לחצן \'שדרוג\'</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">הסתר שדרוג</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">לחצן \'שדרוג\' מוסתר</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">לחצן \'שדרוג\' מוצג</string>
   <string name="revanced_music_hide_navigation_bar_title">הסתר סרגל ניווט</string>
diff --git a/patches/src/main/resources/addresources/values-ja-rJP/strings.xml b/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
index 2d4cfe159..c416cb942 100644
--- a/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
+++ b/patches/src/main/resources/addresources/values-ja-rJP/strings.xml
@@ -589,7 +589,7 @@ YouTube Premium ユーザーの場合、この設定は必要ない可能性が
   <string name="revanced_hide_stop_ads_button_summary_on">「広告を停止」ボタンは表示されません</string>
   <string name="revanced_hide_stop_ads_button_summary_off">「広告を停止」ボタンは表示されます</string>
   <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
-  <string name="revanced_hide_comments_button_title">コメントを非表示</string>
+  <string name="revanced_hide_comments_button_title">コメントボタンを非表示</string>
   <string name="revanced_hide_comments_button_summary_on">コメントボタンは表示されません</string>
   <string name="revanced_hide_comments_button_summary_off">コメントボタンは表示されます</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
@@ -745,15 +745,15 @@ YouTube Premium ユーザーの場合、この設定は必要ない可能性が
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
   <string name="revanced_hide_autoplay_button_title">自動再生ボタンを非表示</string>
-  <string name="revanced_hide_autoplay_button_summary_on">プレーヤー オーバーレイの自動再生ボタンは表示されません</string>
-  <string name="revanced_hide_autoplay_button_summary_off">プレーヤー オーバーレイの自動再生ボタンは表示されます</string>
+  <string name="revanced_hide_autoplay_button_summary_on">自動再生ボタンはプレーヤー オーバーレイに表示されません</string>
+  <string name="revanced_hide_autoplay_button_summary_off">自動再生ボタンはプレーヤー オーバーレイに表示されます</string>
   <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
   <string name="revanced_hide_captions_button_title">字幕ボタンを非表示</string>
-  <string name="revanced_hide_captions_button_summary_on">プレーヤー オーバーレイの字幕ボタンは表示されません</string>
-  <string name="revanced_hide_captions_button_summary_off">プレーヤー オーバーレイの字幕ボタンは表示されます</string>
+  <string name="revanced_hide_captions_button_summary_on">字幕ボタンはプレーヤー オーバーレイに表示されません</string>
+  <string name="revanced_hide_captions_button_summary_off">字幕ボタンはプレーヤー オーバーレイに表示されます</string>
   <string name="revanced_hide_cast_button_title">キャストボタンを非表示</string>
-  <string name="revanced_hide_cast_button_summary_on">プレーヤー オーバーレイのキャストボタンは表示されません</string>
-  <string name="revanced_hide_cast_button_summary_off">プレーヤー オーバーレイのキャストボタンは表示されます</string>
+  <string name="revanced_hide_cast_button_summary_on">キャストボタンはプレーヤー オーバーレイに表示されません</string>
+  <string name="revanced_hide_cast_button_summary_off">キャストボタンはプレーヤー オーバーレイに表示されます</string>
   <string name="revanced_hide_player_control_buttons_background_title">プレーヤー コントロールの背景を非表示</string>
   <string name="revanced_hide_player_control_buttons_background_summary_on">プレーヤー コントロールの背景は表示されません</string>
   <string name="revanced_hide_player_control_buttons_background_summary_off">プレーヤー コントロールの背景は表示されます</string>
@@ -1249,7 +1249,7 @@ Automotive レイアウト
 
 再び偽装を無効にする場合は、UI のバグを防ぐためにアプリデータを消去することをお勧めします。"</string>
   <string name="revanced_spoof_app_version_target_title">アプリバージョンの偽装先</string>
-  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 折りたたまれていない動画アクションバーを復元</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - アクション ボタンの文字表示を復元</string>
   <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 古いショート プレーヤーのアイコンを復元</string>
   <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 古いナビゲーション アイコンを復元</string>
   </patch>
@@ -1566,12 +1566,15 @@ Automotive レイアウト
   <string name="revanced_spoof_video_streams_about_experimental">• 実験的なクライアントであり、いつでも動作しなくなる可能性がある</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• AV1 コーデックが利用できない</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• ログアウト時またはシークレット モード時に、子ども向け動画が再生されない可能性がある</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">•「オリジナルの音声を強制的に使用」が利用できない</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">統計情報に表示する</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">統計情報に現在のクライアントが表示されます</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">統計情報に現在のクライアントは表示されません</string>
   <string name="revanced_spoof_video_streams_language_title">音声ストリームの言語</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">特定の音声言語を選択するには、「オリジナルの音声を強制的に使用」を無効にしてください</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Android Studio では、ストリームの言語を選択できません</string>
   </patch>
   </app>
   <app id="music">
@@ -1594,8 +1597,8 @@ Automotive レイアウト
   </patch>
   <patch id="layout.castbutton.hideCastButton">
   <string name="revanced_music_hide_cast_button_title">キャストボタンを非表示</string>
-  <string name="revanced_music_hide_cast_button_summary_on">プレーヤー オーバーレイのキャストボタンは表示されません</string>
-  <string name="revanced_music_hide_cast_button_summary_off">プレーヤー オーバーレイのキャストボタンは表示されます</string>
+  <string name="revanced_music_hide_cast_button_summary_on">キャストボタンはプレーヤー オーバーレイに表示されません</string>
+  <string name="revanced_music_hide_cast_button_summary_off">キャストボタンはプレーヤー オーバーレイに表示されます</string>
   </patch>
   <patch id="layout.compactheader.hideCategoryBar">
   <string name="revanced_music_hide_category_bar_title">カテゴリバーを非表示</string>
@@ -1603,31 +1606,31 @@ Automotive レイアウト
   <string name="revanced_music_hide_category_bar_summary_off">カテゴリバーは表示されます</string>
   </patch>
   <patch id="layout.navigationbar.navigationBarPatch">
-  <string name="revanced_music_navigation_bar_screen_title">ナビゲーションバー</string>
-  <string name="revanced_music_navigation_bar_screen_summary">ナビゲーションバーのボタンを非表示または変更</string>
+  <string name="revanced_music_navigation_bar_screen_title">ナビゲーション バー</string>
+  <string name="revanced_music_navigation_bar_screen_summary">ナビゲーション バーのボタンを変更または非表示にします</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">ホームボタンを非表示</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">「ホーム」を非表示</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">ホームボタンは表示されません</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">ホームボタンは表示されます</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">サンプルボタンを非表示</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">「サンプル」を非表示</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">サンプルボタンは表示されません</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">サンプルボタンは表示されます</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">探索ボタンを非表示</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">「探索」を非表示</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">探索ボタンは表示されません</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">探索ボタンは表示されます</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">ライブラリボタンを非表示</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">ライブラリボタンは表示されません</string>
-  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">ライブラリボタンは表示されます</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">「ライブラリ」を非表示</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_on">ライブラリ ボタンは表示されません</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_summary_off">ライブラリ ボタンは表示されます</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">アップグレード ボタンを非表示</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">「アップグレード」を非表示</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">アップグレード ボタンは表示されません</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">アップグレード ボタンは表示されます</string>
-  <string name="revanced_music_hide_navigation_bar_title">ナビゲーションバーを非表示</string>
-  <string name="revanced_music_hide_navigation_bar_summary_on">ナビゲーションバーは表示されません</string>
-  <string name="revanced_music_hide_navigation_bar_summary_off">ナビゲーションバーは表示されます</string>
+  <string name="revanced_music_hide_navigation_bar_title">ナビゲーション バーを非表示</string>
+  <string name="revanced_music_hide_navigation_bar_summary_on">ナビゲーション バーは表示されません</string>
+  <string name="revanced_music_hide_navigation_bar_summary_off">ナビゲーション バーは表示されます</string>
   <string name="revanced_music_hide_navigation_bar_labels_title">ボタンをアイコンのみで表示</string>
   <string name="revanced_music_hide_navigation_bar_labels_summary_on">ナビゲーション ボタンはアイコンのみで表示されます</string>
   <string name="revanced_music_hide_navigation_bar_labels_summary_off">ナビゲーション ボタンはアイコンと文字で表示されます</string>
diff --git a/patches/src/main/resources/addresources/values-ka-rGE/strings.xml b/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
+++ b/patches/src/main/resources/addresources/values-ka-rGE/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml b/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-kk-rKZ/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-km-rKH/strings.xml b/patches/src/main/resources/addresources/values-km-rKH/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-km-rKH/strings.xml
+++ b/patches/src/main/resources/addresources/values-km-rKH/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-kn-rIN/strings.xml b/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
index 6c787a1ed..949a2d95b 100644
--- a/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-kn-rIN/strings.xml
@@ -259,6 +259,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ko-rKR/strings.xml b/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
index 269194143..e9ee33505 100644
--- a/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
+++ b/patches/src/main/resources/addresources/values-ko-rKR/strings.xml
@@ -585,7 +585,7 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
   <string name="revanced_hide_stop_ads_button_summary_on">광고 중지 버튼이 숨겨집니다</string>
   <string name="revanced_hide_stop_ads_button_summary_off">광고 중지 버튼이 표시됩니다</string>
   <!-- Button does not have any text and is only shown as an icon, and only when the video information area is collapsed to a compact state. -->
-  <string name="revanced_hide_comments_button_title">댓글 숨기기</string>
+  <string name="revanced_hide_comments_button_title">댓글 버튼 숨기기</string>
   <string name="revanced_hide_comments_button_summary_on">댓글 버튼이 숨겨집니다</string>
   <string name="revanced_hide_comments_button_summary_off">댓글 버튼이 표시됩니다</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
@@ -1247,7 +1247,7 @@ YouTube Premium 사용자라면 이 설정은 필요하지 않을 수 있습니
 
 나중에 이 기능을 비활성화하면 앱 레이아웃 버그를 방지하기 위해 앱 데이터를 지우는 것이 좋습니다."</string>
   <string name="revanced_spoof_app_version_target_title">변경할 앱 버전</string>
-  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 접히지 않은 동영상 액션 바 복원</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - 접히지 않은 동영상 동작바를 복원합니다</string>
   <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - 이전 Shorts 플레이어 아이콘을 복원합니다</string>
   <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - 이전 하단바 아이콘을 복원합니다</string>
   </patch>
@@ -1485,9 +1485,9 @@ DeArrow에 대해 자세히 알아보려면 여기를 탭하세요"</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">링크를 공유할 경우에 URL에서 추적 쿼리 매개변수를 삭제하지 않습니다</string>
   </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
-  <string name="revanced_force_original_audio_title">원본 오디오 스트림 언어 강제로 활성화하기</string>
-  <string name="revanced_force_original_audio_summary_on">원본 오디오 스트림 언어를 사용 중입니다</string>
-  <string name="revanced_force_original_audio_summary_off">기본 오디오 스트림 언어를 사용 중입니다</string>
+  <string name="revanced_force_original_audio_title">원본 오디오 언어 강제로 활성화하기</string>
+  <string name="revanced_force_original_audio_summary_on">원본 오디오 언어를 사용 중입니다</string>
+  <string name="revanced_force_original_audio_summary_off">기본 오디오 언어를 사용 중입니다</string>
   <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <string name="revanced_force_original_audio_not_available">이 기능을 사용하려면, \'동영상 스트림 변경하기\'에서 기본 클라이언트를 Android Studio를 제외한 다른 클라이언트로 변경하세요</string>
   </patch>
@@ -1571,12 +1571,15 @@ DeArrow에 대해 자세히 알아보려면 여기를 탭하세요"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• 실험용 클라이언트이며 언제든지 작동이 중단될 수 있습니다</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• AV1 코덱이 지원되지 않습니다</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Kids 동영상은 로그인을 하지 않았거나 시크릿 모드에서는 재생되지 않을 수 있습니다</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• 원본 오디오를 강제로 활성화할 수 없습니다</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">전문 통계에서 표시하기</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">동영상 스트림을 가져오는 데 사용되는 클라이언트가 전문 통계에서 표시됩니다</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">동영상 스트림을 가져오는 데 사용되는 클라이언트가 전문 통계에서 표시되지 않습니다</string>
   <string name="revanced_spoof_video_streams_language_title">오디오 스트림 언어</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
-  <string name="revanced_spoof_video_streams_language_not_available">특정 오디오 스트림 언어를 선택하려면, \'원본 오디오 스트림 언어 강제로 활성화하기\'를 끄세요</string>
+  <string name="revanced_spoof_video_streams_language_not_available">특정 오디오 언어를 선택하려면, \'원본 오디오 언어 강제로 활성화하기\'를 끄세요</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Android Studio에서는 스트림 언어를 선택할 수 없습니다</string>
   </patch>
   </app>
   <app id="music">
diff --git a/patches/src/main/resources/addresources/values-ky-rKG/strings.xml b/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
+++ b/patches/src/main/resources/addresources/values-ky-rKG/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-lo-rLA/strings.xml b/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
+++ b/patches/src/main/resources/addresources/values-lo-rLA/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-lt-rLT/strings.xml b/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
index dc23ef9d9..1add49b0d 100644
--- a/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
+++ b/patches/src/main/resources/addresources/values-lt-rLT/strings.xml
@@ -1565,12 +1565,15 @@ Gali būti atrakinta aukštesnės vaizdo įrašų kokybės, bet galite patirti v
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentinis klientas ir bet kada gali nustoti veikti</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nėra AV1 vaizdo kodeko</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Vaikų vaizdo įrašai gali būti neatkuriami, kai atsijungiama arba naudojamas inkognito režimas</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Priverstinai naudoti originalų garsą nepasiekiama</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Rodyti statistinėje informacijoje \"tik profesionalams\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Kliento tipas rodomas statistinėje informacijoje \"tik profesionalams\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klientas paslėptas statistinėje informacijoje \"tik profesionalams\"</string>
   <string name="revanced_spoof_video_streams_language_title">Garso srauto kalba</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Norėdami pasirinkti konkrečią garso kalbą, išjunkite „Priverstinė originali garso kalba“.</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Transliacijos kalbos pasirinkimas nepasiekiamas naudojant „Android Studio“</string>
   </patch>
   </app>
   <app id="music">
@@ -1605,23 +1608,23 @@ Gali būti atrakinta aukštesnės vaizdo įrašų kokybės, bet galite patirti v
   <string name="revanced_music_navigation_bar_screen_title">Naršymo juosta</string>
   <string name="revanced_music_navigation_bar_screen_summary">Slėpti arba keisti naršymo juostos mygtukus</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Slėpti mygtuką „Pagrindinis“</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Slėpti Pagrindinį</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Mygtukas „Pagrindinis“ yra paslėptas</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Mygtukas „Pagrindinis“ yra rodomas</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Slėpti mygtuką „Pavyzdžiai“</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Slėpti Pavyzdžius</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Mygtukas „Pavyzdžiai“ yra paslėptas</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Mygtukas „Pavyzdžiai“ yra rodomas</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Slėpti mygtuką „Naršyti“</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Slėpti Naršyti</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Mygtukas „Naršyti“ yra paslėptas</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Mygtukas „Naršyti“ yra rodomas</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Slėpti mygtuką „Biblioteka“</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Slėpti Biblioteką</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Mygtukas „Biblioteka“ yra paslėptas</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Mygtukas „Biblioteka“ yra rodomas</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Slėpti mygtuką „Naujinti“</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Slėpti Atnaujinti</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Mygtukas „Naujinti“ yra paslėptas</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Mygtukas „Naujinti“ yra rodomas</string>
   <string name="revanced_music_hide_navigation_bar_title">Slėpti naršymo juostą</string>
diff --git a/patches/src/main/resources/addresources/values-lv-rLV/strings.xml b/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
index 64e38753c..6cdd5e4b1 100644
--- a/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
+++ b/patches/src/main/resources/addresources/values-lv-rLV/strings.xml
@@ -1565,12 +1565,15 @@ Var tikt atbloķētas augstākas video kvalitātes, taču var rasties video atsk
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentāls klients un jebkurā brīdī var pārtraukt darbu</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nav pieejams AV1 video kodeks</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Bērnu videoklipi var netikt atskaņoti, kad esat izrakstījies vai inkognito režīmā.</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Piespiest oriģinālo skaņu nav pieejams</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Rādīt statistiskos datos entuziastiem</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Klienta tips tiek rādīts statistiskos datos entuziastiem</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klients ir paslēpts statistiskos datos entuziastiem</string>
   <string name="revanced_spoof_video_streams_language_title">Audio straumes valoda</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Lai atlasītu konkrētu audio valodu, izslēdziet “Piespiest oriģinālo audio valodu”</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Straumju valodas izvēle nav pieejama ar Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1605,23 +1608,23 @@ Var tikt atbloķētas augstākas video kvalitātes, taču var rasties video atsk
   <string name="revanced_music_navigation_bar_screen_title">Navigācijas josla</string>
   <string name="revanced_music_navigation_bar_screen_summary">Slēpt vai mainīt navigācijas joslas pogas</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Slēpt pogu Sākums</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Paslēpt Sākumlapu</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Poga Sākums ir paslēpta</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Poga Sākums ir redzama</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Slēpt pogu Paraugi</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Paslēpt Īsos klipus</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Poga Paraugi ir paslēpta</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Poga Paraugi ir redzama</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Slēpt pogu Izpētīt</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Slēpt Izpētīt</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Poga Izpētīt ir paslēpta</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Poga Izpētīt ir redzama</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Slēpt pogu Bibliotēka</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Slēpt bibliotēku</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Poga Bibliotēka ir paslēpta</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Poga Bibliotēka ir redzama</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Slēpt pogu Jaunināt</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Slēpt jaunināšanu</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Poga Jaunināt ir paslēpta</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Poga Jaunināt ir redzama</string>
   <string name="revanced_music_hide_navigation_bar_title">Slēpt navigācijas joslu</string>
diff --git a/patches/src/main/resources/addresources/values-mk-rMK/strings.xml b/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
+++ b/patches/src/main/resources/addresources/values-mk-rMK/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ml-rIN/strings.xml b/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ml-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-mn-rMN/strings.xml b/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
+++ b/patches/src/main/resources/addresources/values-mn-rMN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-mr-rIN/strings.xml b/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-mr-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ms-rMY/strings.xml b/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
index dfb632767..aea3c57e7 100644
--- a/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
+++ b/patches/src/main/resources/addresources/values-ms-rMY/strings.xml
@@ -245,6 +245,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-my-rMM/strings.xml b/patches/src/main/resources/addresources/values-my-rMM/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-my-rMM/strings.xml
+++ b/patches/src/main/resources/addresources/values-my-rMM/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-nb-rNO/strings.xml b/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
+++ b/patches/src/main/resources/addresources/values-nb-rNO/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ne-rIN/strings.xml b/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
index 98e3d364c..31a443ec9 100644
--- a/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ne-rIN/strings.xml
@@ -246,6 +246,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-nl-rNL/strings.xml b/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
index f9ee4e938..89a289c2d 100644
--- a/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
+++ b/patches/src/main/resources/addresources/values-nl-rNL/strings.xml
@@ -1562,12 +1562,15 @@ Het inschakelen hiervan kan hogere videokwaliteiten ontgrendelen"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Experimentele client en kan elk moment stoppen met werken</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Geen AV1-videocodec</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• \"Kinder\"​-Video’s worden mogelijk niet afgespeeld wanneer u bent uitgelogd of de incognitomodus gebruikt</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Oorspronkelijke audio forceren is niet beschikbaar</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Weergeven in Stats for nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Het clienttype wordt getoond in Stats for nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Client is verborgen in Stats for nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Audiostreamtaal</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Om een specifieke audiotaal te selecteren, schakel \"Oorspronkelijke audiotaal forceren\" uit</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Streamtaalselectie is niet beschikbaar met Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1602,23 +1605,23 @@ Het inschakelen hiervan kan hogere videokwaliteiten ontgrendelen"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigatiebalk</string>
   <string name="revanced_music_navigation_bar_screen_summary">Navigatiebalkknoppen verbergen of wijzigen</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Startknop verbergen</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Startpagina verbergen</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Startknop is verborgen</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Startknop wordt weergegeven</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Knop Voorbeelden verbergen</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Fragmenten verbergen</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Knop Voorbeelden is verborgen</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Knop Voorbeelden wordt weergegeven</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Knop Ontdekken verbergen</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Verberg Ontdekken</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Knop Ontdekken is verborgen</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Knop Ontdekken wordt weergegeven</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Knop Bibliotheek verbergen</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Verberg Bibliotheek</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Knop Bibliotheek is verborgen</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Knop Bibliotheek wordt weergegeven</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Upgrade-knop verbergen</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Verberg Upgraden</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Upgrade-knop is verborgen</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Upgrade-knop wordt weergegeven</string>
   <string name="revanced_music_hide_navigation_bar_title">Navigatiebalk verbergen</string>
diff --git a/patches/src/main/resources/addresources/values-or-rIN/strings.xml b/patches/src/main/resources/addresources/values-or-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-or-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-or-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-pa-rIN/strings.xml b/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-pa-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-pl-rPL/strings.xml b/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
index 81c2020e3..ca5a642a6 100644
--- a/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
+++ b/patches/src/main/resources/addresources/values-pl-rPL/strings.xml
@@ -1560,12 +1560,15 @@ Włączenie tego może odblokować wyższe jakości wideo"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperymentalny klient i może przestać działać w każdej chwili</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Žádný video kodek AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Filmy dla dzieci mogą nie być odtwarzane po wylogowaniu lub w trybie incognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Wymuś oryginalny dźwięk jest niedostępny</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Pokaż w statystykach dla nerdów</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Typ klienta jest wyświetlany w Statystykach dla nerdów</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klient jest ukryty w statystykach dla nerdów</string>
   <string name="revanced_spoof_video_streams_language_title">Język strumienia audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Aby wybrać konkretny język audio, wyłącz \"Wymuś oryginalny język audio\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Wybór języka strumienia nie jest dostępny w przypadku Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1600,23 +1603,23 @@ Włączenie tego może odblokować wyższe jakości wideo"</string>
   <string name="revanced_music_navigation_bar_screen_title">Pasek nawigacji</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ukryj lub zmień przyciski paska nawigacji</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ukryj przycisk Główna</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ukryj Główną</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Przycisk Główna jest ukryty</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Przycisk Główna jest pokazany</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ukryj przycisk Wycinki</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ukryj Fragmenty</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Przycisk Wycinki jest ukryty</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Przycisk Wycinki jest pokazany</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ukryj przycisk Przeglądaj</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ukryj Odkrywaj</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Przycisk Przeglądaj jest ukryty</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Przycisk Przeglądaj jest pokazany</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ukryj przycisk Biblioteka</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ukryj Bibliotekę</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Przycisk Biblioteka jest ukryty</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Przycisk Biblioteka jest pokazany</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ukryj przycisk Ulepsz</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ukryj Ulepsz</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Przycisk Ulepsz jest ukryty</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Przycisk Ulepsz jest pokazany</string>
   <string name="revanced_music_hide_navigation_bar_title">Ukryj pasek nawigacji</string>
diff --git a/patches/src/main/resources/addresources/values-pt-rBR/strings.xml b/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
index 5935ddb82..ccd4ea1c0 100644
--- a/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
+++ b/patches/src/main/resources/addresources/values-pt-rBR/strings.xml
@@ -1561,12 +1561,15 @@ Habilitar isso pode desbloquear qualidades de vídeo mais altas"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Cliente experimental e pode parar de funcionar a qualquer momento</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Sem codec de vídeo AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Vídeos infantis podem não ser reproduzidos quando estiver desconectado ou no modo de navegação anônima</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forçar áudio original não está disponível</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostrar em Estatísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">O tipo de cliente é mostrado em Estatísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">O cliente está oculto em Estatísticas para nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Idioma do fluxo de áudio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Para selecionar um idioma de áudio específico, desative \"Forçar idioma de áudio original\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">A seleção de idioma do stream não está disponível com o Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1601,23 +1604,23 @@ Habilitar isso pode desbloquear qualidades de vídeo mais altas"</string>
   <string name="revanced_music_navigation_bar_screen_title">Barra de navegação</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ocultar ou alterar botões da barra de navegação</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar botão Início</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar Início</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Botão Início oculto</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Botão Início visível</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar botão Amostras</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar Amostras</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Botão Amostras oculto</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Botão Amostras visível</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar botão Explorar</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar Explorar</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Botão Explorar oculto</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Botão Explorar visível</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar botão Biblioteca</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar Biblioteca</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Botão Biblioteca oculto</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Botão Biblioteca visível</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar botão Fazer upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar Atualizar</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Botão Fazer upgrade oculto</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Botão Fazer upgrade visível</string>
   <string name="revanced_music_hide_navigation_bar_title">Ocultar barra de navegação</string>
diff --git a/patches/src/main/resources/addresources/values-pt-rPT/strings.xml b/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
index e46ba445c..2de0a67b4 100644
--- a/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
+++ b/patches/src/main/resources/addresources/values-pt-rPT/strings.xml
@@ -1564,12 +1564,15 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_spoof_video_streams_about_experimental">• Cliente experimental e pode parar de funcionar a qualquer momento</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nenhum codec de vídeo AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Vídeos infantis podem não ser reproduzidos quando desconectado ou no modo anônimo</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forçar áudio original não está disponível</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostrar em Estatísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">O tipo de cliente é mostrado em Estatísticas para nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">O cliente está oculto em Estatísticas para nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Idioma do fluxo de áudio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Para selecionar um idioma de áudio específico, desative \'Forçar idioma de áudio original\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">A seleção do idioma do stream não está disponível com o Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_music_navigation_bar_screen_title">Barra de navegação</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ocultar ou alterar botões da barra de navegação</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar botão Início</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ocultar Início</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Botão Início está oculto</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Botão Início está exibido</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar botão Amostras</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ocultar Curtos</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Botão Amostras está oculto</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Botão Amostras está exibido</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar botão Explorar</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ocultar Explorar</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Botão Explorar está oculto</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Botão Explorar está exibido</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar botão Biblioteca</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ocultar Biblioteca</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Botão Biblioteca está oculto</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Botão Biblioteca está exibido</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar botão Fazer upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ocultar Premium</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Botão Fazer upgrade está oculto</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Botão Fazer upgrade está exibido</string>
   <string name="revanced_music_hide_navigation_bar_title">Ocultar barra de navegação</string>
diff --git a/patches/src/main/resources/addresources/values-ro-rRO/strings.xml b/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
index 70d4c9abc..04025e4b5 100644
--- a/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
+++ b/patches/src/main/resources/addresources/values-ro-rRO/strings.xml
@@ -1563,12 +1563,15 @@ Activarea acestei opțiuni poate debloca calități video mai mari"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Client experimental și se poate opri din funcționare oricând</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Fara codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Copiii nu pot urmări videoclipuri atunci când sunt deconectați sau în modul incognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forțarea sunetului original nu este disponibilă</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Afișează în Statistici pentru pasionați</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Tipul clientului este afișat în Statistici pentru pasionați</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Clientul este ascuns în Statistici pentru pasionați</string>
   <string name="revanced_spoof_video_streams_language_title">Limba fluxului audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Pentru a selecta o limbă audio specifică, dezactivați „Forțează limba audio originală”</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Selecția limbii fluxului nu este disponibilă cu Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,23 +1606,23 @@ Activarea acestei opțiuni poate debloca calități video mai mari"</string>
   <string name="revanced_music_navigation_bar_screen_title">Bară de navigare</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ascundeți sau modificați butoanele barei de navigare</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ascundeți butonul Acasă</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ascunde Acasă</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Butonul Acasă este ascuns</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Butonul Acasă este afișat</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ascundeți butonul Mostre</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ascunde Mostre</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Butonul Mostre este ascuns</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Butonul Mostre este afișat</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ascundeți butonul Explorare</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ascundeți Explorare</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Butonul Explorare este ascuns</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Butonul Explorare este afișat</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ascundeți butonul Bibliotecă</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ascundeți Bibliotecă</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Butonul Bibliotecă este ascuns</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Butonul Bibliotecă este afișat</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ascundeți butonul Upgrade</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ascundeți Upgrade</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Butonul Upgrade este ascuns</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Butonul Upgrade este afișat</string>
   <string name="revanced_music_hide_navigation_bar_title">Ascundeți bara de navigare</string>
diff --git a/patches/src/main/resources/addresources/values-ru-rRU/strings.xml b/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
index b0443ed38..b1feb2931 100644
--- a/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
+++ b/patches/src/main/resources/addresources/values-ru-rRU/strings.xml
@@ -1571,12 +1571,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Экспериментальный клиент и может перестать работать в любое время</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Отсутствует видеокодек AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Видео для детей могут не воспроизводиться при выходе из системы или в режиме инкогнито</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Принудительная оригинальная звуковая дорожка недоступна</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показать в \"Статистике для сисадминов\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Тип клиента в \"Статистике для сисадминов\" показан</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Тип клиента в \"Статистике для сисадминов\" скрыт</string>
   <string name="revanced_spoof_video_streams_language_title">Язык аудиопотока</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Чтобы выбрать определенный язык аудио, отключите \"Принудительный язык оригинального аудио\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Выбор языка трансляции недоступен в Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1615,19 +1618,19 @@ Second \"item\" text"</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Кнопка \"Главная\" в панели навигации скрыта</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Кнопка \"Главная\" в панели навигации показана</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Скрыть кнопку \"Семплы\"</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Скрыть Сэмплы</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Кнопка \"Семплы\" скрыта</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Кнопка \"Семплы\" показана</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Скрыть кнопку \"Обзор\"</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Скрыть Обзор</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Кнопка \"Обзор\" скрыта</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Кнопка \"Обзор\" показана</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Скрыть кнопку \"Библиотека\"</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Скрыть Библиотеку</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Кнопка \"Библиотека\" скрыта</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Кнопка \"Библиотека\" показана</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Скрыть кнопку \"Премиум\"</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Скрыть Премиум</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Кнопка \"Премиум\" скрыта</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Кнопка \"Премиум\" показана</string>
   <string name="revanced_music_hide_navigation_bar_title">Скрыть панель навигации</string>
diff --git a/patches/src/main/resources/addresources/values-si-rLK/strings.xml b/patches/src/main/resources/addresources/values-si-rLK/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-si-rLK/strings.xml
+++ b/patches/src/main/resources/addresources/values-si-rLK/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-sk-rSK/strings.xml b/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
index 8fdb4d3c5..4fe16b2ee 100644
--- a/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
+++ b/patches/src/main/resources/addresources/values-sk-rSK/strings.xml
@@ -1557,12 +1557,15 @@ Povolením tejto možnosti môžete odomknúť vyššie kvality videa"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Experimentálny klient a môže kedykoľvek prestať fungovať</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Žiadny video kodek AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Videá pre deti sa nemusia prehrávať, keď ste odhlásení alebo v režime inkognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Vynútenie pôvodného zvuku nie je k dispozícii</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Zobraziť v štatistike pre expertov</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Typ klienta sa zobrazuje v štatistikách pre expertov</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klient je skrytý v štatistikách pre expertov</string>
   <string name="revanced_spoof_video_streams_language_title">Jazyk zvukového streamu</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Ak chcete vybrať konkrétny jazyk zvuku, vypnite „Vynútiť pôvodný jazyk zvuku“</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Výber jazyka streamu nie je k dispozícii v aplikácii Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1597,23 +1600,23 @@ Povolením tejto možnosti môžete odomknúť vyššie kvality videa"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigačný panel</string>
   <string name="revanced_music_navigation_bar_screen_summary">Skryť alebo zmeniť tlačidlá navigačného panela</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Skryť tlačidlo Domov</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Skryť Domov</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Tlačidlo Domov je skryté</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Tlačidlo Domov je zobrazené</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skryť tlačidlo Ukážky</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skryť Ukážky</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Tlačidlo Ukážky je skryté</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Tlačidlo Ukážky je zobrazené</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skryť tlačidlo Preskúmať</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skryť Preskúmať</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Tlačidlo Preskúmať je skryté</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Tlačidlo Preskúmať je zobrazené</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Skryť tlačidlo Knižnica</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Skryť Knižnicu</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Tlačidlo Knižnica je skryté</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Tlačidlo Knižnica je zobrazené</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skryť tlačidlo Inovovať</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skryť Vylepšiť</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Tlačidlo Inovovať je skryté</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Tlačidlo Inovovať je zobrazené</string>
   <string name="revanced_music_hide_navigation_bar_title">Skryť navigačný panel</string>
diff --git a/patches/src/main/resources/addresources/values-sl-rSI/strings.xml b/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
index b57d8291a..94c12a856 100644
--- a/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
+++ b/patches/src/main/resources/addresources/values-sl-rSI/strings.xml
@@ -1564,12 +1564,15 @@ Omogočanje tega lahko odklene višje kakovosti videa"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentalni odjemalec in lahko kadar koli preneha delovati</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Brez kodeka videa AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Posnetki za otroke se mogoče ne bodo predvajali, ko ste odjavljeni ali v načinu brez beleženja zgodovine</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Vsili izvirni zvok ni na voljo</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Pokaži v statistiki za piflarje</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Vrsta odjemalca je prikazana v statistiki za piflarje</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Odjemalec je skrit v statistiki za piflarje</string>
   <string name="revanced_spoof_video_streams_language_title">Jezik zvočnega toka</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Za izbiro določenega zvočnega jezika izklopite \'Vsili izvirni zvočni jezik\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Izbira jezika pretakanja ni na voljo z Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1604,23 +1607,23 @@ Omogočanje tega lahko odklene višje kakovosti videa"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigacijska vrstica</string>
   <string name="revanced_music_navigation_bar_screen_summary">Skrij ali spremeni gumbe navigacijske vrstice</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Skrij gumb Domov</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Skrij Domov</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Gumb Domov je skrit</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Gumb Domov je prikazan</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skrij gumb Vzorci</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Skrij Vzorci</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Gumb Vzorci je skrit</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Gumb Vzorci je prikazan</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skrij gumb Raziskovanje</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Skrij Raziskovanje</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Gumb Raziskovanje je skrit</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Gumb Raziskovanje je prikazan</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Skrij gumb Knjižnica</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Skrij Knjižnico</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Gumb Knjižnica je skrit</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Gumb Knjižnica je prikazan</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skrij gumb Nadgradi</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Skrij Nadgradnjo</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Gumb Nadgradi je skrit</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Gumb Nadgradi je prikazan</string>
   <string name="revanced_music_hide_navigation_bar_title">Skrij navigacijsko vrstico</string>
diff --git a/patches/src/main/resources/addresources/values-sq-rAL/strings.xml b/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
index d0a7b7f31..316c17bbc 100644
--- a/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
+++ b/patches/src/main/resources/addresources/values-sq-rAL/strings.xml
@@ -1562,12 +1562,15 @@ Aktivizimi i kësaj mund të zhbllokojë cilësi më të larta video"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Klient eksperimental dhe mund të ndalojë së funksionuari në çdo kohë</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nuk ka codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Video për fëmijë mund të mos luajnë kur jeni jashtë llogarisë ose në modalitetin incognito</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Detyro audio origjinale nuk është i disponueshëm</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Shfaqni në Statistikat për nerdës</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Lloji i klientit shfaqet në Statistikat për nerds</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klienti është fshehur në statistikat për nerds</string>
   <string name="revanced_spoof_video_streams_language_title">Gjuha e transmetimit audio</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Për të zgjedhur një gjuhë specifike audio, çaktivizoni \"Detyro gjuhën origjinale audio\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Zgjedhja e gjuhës së transmetimit nuk është e disponueshme me Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1602,23 +1605,23 @@ Aktivizimi i kësaj mund të zhbllokojë cilësi më të larta video"</string>
   <string name="revanced_music_navigation_bar_screen_title">Shiriti i navigimit</string>
   <string name="revanced_music_navigation_bar_screen_summary">Fshih ose ndrysho butonat e shiritit të navigimit</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Fshih butonin Kryesore</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Fshih Kreun</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Butoni Kryesore është fshehur</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Butoni Kryesore është shfaqur</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Fshih butonin Mostra</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Fshih Mostrat</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Butoni Mostra është fshehur</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Butoni Mostra është shfaqur</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Fshih butonin Eksploro</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Fshih Eksplorimin</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Butoni Eksploro është fshehur</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Butoni Eksploro është shfaqur</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Fshih butonin Biblioteka</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Fshih Bibliotekën</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Butoni Biblioteka është fshehur</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Butoni Biblioteka është shfaqur</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Fshih butonin Azhorno</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Fshih përmirësimin</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Butoni Azhorno është fshehur</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Butoni Azhorno është shfaqur</string>
   <string name="revanced_music_hide_navigation_bar_title">Fshih shiritin e navigimit</string>
diff --git a/patches/src/main/resources/addresources/values-sr-rCS/strings.xml b/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
index 0b09d6b4f..1dc952d8f 100644
--- a/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
+++ b/patches/src/main/resources/addresources/values-sr-rCS/strings.xml
@@ -1563,12 +1563,15 @@ Ako ovo omogućite, mogu biti otključani viši kvaliteti videa"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Eksperimentalni klijent i može prestati da radi bilo kada</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Nema video kodeka AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Videi za decu se možda neće puštati kada ste odjavljeni ili u režimu bez arhiviranja</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Forsiranje originalnog zvuka nije dostupno</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Prikaži u „Statistici za znalce”</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Tip klijenta je prikazan u „Statistici za znalce”</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Tip klijenta je skriven u „Statistici za znalce”</string>
   <string name="revanced_spoof_video_streams_language_title">Jezik audio strima</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Da biste izabrali određeni jezik zvuka, isključite opciju „Prisili originalni jezik zvuka”</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Izbor jezika strima nije dostupan sa Android Studijem</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,23 +1606,23 @@ Ako ovo omogućite, mogu biti otključani viši kvaliteti videa"</string>
   <string name="revanced_music_navigation_bar_screen_title">Traka za navigaciju</string>
   <string name="revanced_music_navigation_bar_screen_summary">Sakrijte ili promenite dugmad trake za navigaciju</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Sakrij dugme „Početna”</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Sakrij Početnu</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Dugme „Početna” je skriveno</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Dugme „Početna” je prikazano</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Sakrij dugme „Uzorci”</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Sakrij Uzorke</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Dugme „Uzorci” je skriveno</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Dugme „Uzorci” je prikazano</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Sakrij dugme „Istražite”</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Sakrij Istražite</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Dugme „Istražite” je skriveno</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Dugme „Istražite” je prikazano</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Sakrij dugme „Biblioteka”</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Sakrij Biblioteku</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Dugme „Biblioteka” je skriveno</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Dugme „Biblioteka” je prikazano</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sakrij dugme „Nadogradite”</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Sakrij Nadogradi</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Dugme „Nadogradite” je skriveno</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Dugme „Nadogradite” je prikazano</string>
   <string name="revanced_music_hide_navigation_bar_title">Sakrij traku za navigaciju</string>
diff --git a/patches/src/main/resources/addresources/values-sr-rSP/strings.xml b/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
index 3c1f753ed..2a04d4762 100644
--- a/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
+++ b/patches/src/main/resources/addresources/values-sr-rSP/strings.xml
@@ -1566,12 +1566,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Експериментални клијент и може престати да ради било када</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Нема видео кодека AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Видеи за децу се можда неће пуштати када сте одјављени или у режиму без архивирања</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Форсирање оригиналног звука није доступно</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Прикажи у „Статистици за зналце”</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Тип клијента је приказан у „Статистици за зналце”</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Тип клијента је скривен у „Статистици за зналце”</string>
   <string name="revanced_spoof_video_streams_language_title">Језик аудио стрима</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Да бисте изабрали одређени језик звука, искључите опцију „Присили оригинални језик звука”</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Избор језика стрима није доступан са Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1606,23 +1609,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">Трака за навигацију</string>
   <string name="revanced_music_navigation_bar_screen_summary">Сакријте или промените дугмад траке за навигацију</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Сакриј дугме „Почетна”</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Сакриј Почетну</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Дугме „Почетна” је скривено</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Дугме „Почетна” је приказано</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Сакриј дугме „Узорци”</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Сакриј Узорке</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Дугме „Узорци” је скривено</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Дугме „Узорци” је приказано</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Сакриј дугме „Истражи”</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Сакриј Истражи</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Дугме „Истражи” је скривено</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Дугме „Истражи” је приказано</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Сакриј дугме „Библиотека”</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Сакриј Библиотеку</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Дугме „Библиотека” је скривено</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Дугме „Библиотека” је приказано</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Сакриј дугме „Надогради”</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Сакриј Надогради</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Дугме „Надогради” је скривено</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Дугме „Надогради” је приказано</string>
   <string name="revanced_music_hide_navigation_bar_title">Сакриј траку за навигацију</string>
diff --git a/patches/src/main/resources/addresources/values-sv-rSE/strings.xml b/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
index c5b85ebf7..e91a7a77c 100644
--- a/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
+++ b/patches/src/main/resources/addresources/values-sv-rSE/strings.xml
@@ -1563,12 +1563,15 @@ Om du aktiverar detta kan högre videokvaliteter låsas upp"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Experimentell klient och kan sluta fungera när som helst</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Ingen AV1-videokodek</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Videor för barn kanske inte spelas upp när du är utloggad eller i inkognitoläge</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Tvinga ursprungligt ljud är inte tillgängligt</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Visa i Statistik för nördar</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Klienttypen visas i Statistik för nördar</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Klienten är dold i Statistik för nördar</string>
   <string name="revanced_spoof_video_streams_language_title">Ljudströmmens språk</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">För att välja ett specifikt ljudspråk, inaktivera \"Tvinga originalspråk för ljud\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Val av strömspråk är inte tillgängligt med Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,23 +1606,23 @@ Om du aktiverar detta kan högre videokvaliteter låsas upp"</string>
   <string name="revanced_music_navigation_bar_screen_title">Navigationsfältet</string>
   <string name="revanced_music_navigation_bar_screen_summary">Dölj eller ändra knappar i navigeringsfältet</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Dölj Hem-knappen</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Dölj Hem</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Knappen Hem är dold</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Knappen Hem visas</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Dölj Klipp-knappen</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Dölj Kortfilmer</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Klipp-knappen är dold</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Klipp-knappen visas</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Dölj Utforska-knappen</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Dölj Utforska</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Utforska-knappen är dold</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Utforska-knappen visas</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Dölj Bibliotek-knappen</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Dölj Bibliotek</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Bibliotek-knappen är dold</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Bibliotek-knappen visas</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Dölj Uppgradera-knappen</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Dölj Uppgradera</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Uppgradera-knappen är dold</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Uppgradera-knappen visas</string>
   <string name="revanced_music_hide_navigation_bar_title">Dölj navigeringsfältet</string>
diff --git a/patches/src/main/resources/addresources/values-sw-rKE/strings.xml b/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
+++ b/patches/src/main/resources/addresources/values-sw-rKE/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-ta-rIN/strings.xml b/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ta-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-te-rIN/strings.xml b/patches/src/main/resources/addresources/values-te-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-te-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-te-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-th-rTH/strings.xml b/patches/src/main/resources/addresources/values-th-rTH/strings.xml
index 59748a83d..38d38fb1f 100644
--- a/patches/src/main/resources/addresources/values-th-rTH/strings.xml
+++ b/patches/src/main/resources/addresources/values-th-rTH/strings.xml
@@ -1566,12 +1566,15 @@ User id ของคุณเหมือนกับรหัสผ่าน 
   <string name="revanced_spoof_video_streams_about_experimental">• ไคลเอนต์ทดลองและอาจหยุดทำงานได้ตลอดเวลา</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• ไม่มีตัวแปลงสัญญาณวิดีโอ AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• วิดีโอเด็กอาจไม่เล่นเมื่อลงชื่อออกหรืออยู่ในโหมดไม่ระบุตัวตน</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• บังคับใช้เสียงต้นฉบับไม่พร้อมใช้งาน</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">แสดงในสถิติสำหรับพวกเนิร์ด</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">แสดงชนิดไคลเอ็นต์ในสถิติสำหรับพวกเนิร์ด</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">ซ่อนไคลเอ็นต์ในสถิติสำหรับพวกเนิร์ด</string>
   <string name="revanced_spoof_video_streams_language_title">ภาษาของสตรีมเสียง</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">หากต้องการเลือกภาษาเสียงที่ต้องการ ให้ปิด \'บังคับใช้ภาษาเสียงต้นฉบับ\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">การเลือกภาษาของสตรีมไม่พร้อมใช้งานกับ Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1606,23 +1609,23 @@ User id ของคุณเหมือนกับรหัสผ่าน 
   <string name="revanced_music_navigation_bar_screen_title">แถบนำทาง</string>
   <string name="revanced_music_navigation_bar_screen_summary">ซ่อนหรือเปลี่ยนปุ่มแถบนำทาง</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">ซ่อนปุ่มหน้าแรก</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">ซ่อนหน้าแรก</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">ซ่อนปุ่มหน้าแรกแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">แสดงปุ่มหน้าแรกแล้ว</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">ซ่อนปุ่มตัวอย่าง</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">ซ่อนตัวอย่าง</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">ซ่อนปุ่มตัวอย่างแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">แสดงปุ่มตัวอย่างแล้ว</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">ซ่อนปุ่มสำรวจ</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">ซ่อนสำรวจ</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">ซ่อนปุ่มสำรวจแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">แสดงปุ่มสำรวจแล้ว</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">ซ่อนปุ่มคลัง</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">ซ่อนคลัง</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">ซ่อนปุ่มคลังแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">แสดงปุ่มคลังแล้ว</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">ซ่อนปุ่มอัปเกรด</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">ซ่อนอัปเกรด</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">ซ่อนปุ่มอัปเกรดแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">แสดงปุ่มอัปเกรดแล้ว</string>
   <string name="revanced_music_hide_navigation_bar_title">ซ่อนแถบนำทาง</string>
diff --git a/patches/src/main/resources/addresources/values-tr-rTR/strings.xml b/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
index e03febe3e..893799845 100644
--- a/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
+++ b/patches/src/main/resources/addresources/values-tr-rTR/strings.xml
@@ -1571,12 +1571,15 @@ Bunu etkinleştirmek daha yüksek video kalitelerini açabilir"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Deneysel istemci ve her an çalışmayı durdurabilir</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• AV1 video kodeği yok</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Çocuk videoları oturum açılmadığında veya gizli modda oynatılamayabilir</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Orijinal sesi zorlama mevcut değil</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Meraklısı için istatistiklerde göster</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">İstemci tipi meraklısı için istatistiklerde gösterilir</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">İstemci, meraklısı için istatistiklerde gizli</string>
   <string name="revanced_spoof_video_streams_language_title">Ses akışı dili</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Belirli bir ses dilini seçmek için \'Orijinal ses dilini zorla\' seçeneğini kapatın</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Yayın dili seçimi Android Studio ile kullanılamıyor</string>
   </patch>
   </app>
   <app id="music">
@@ -1611,23 +1614,23 @@ Bunu etkinleştirmek daha yüksek video kalitelerini açabilir"</string>
   <string name="revanced_music_navigation_bar_screen_title">Gezinme çubuğu</string>
   <string name="revanced_music_navigation_bar_screen_summary">Gezinme çubuğundaki düğmeleri gizle veya değiştir</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ana Sayfa düğmesini gizle</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ana Sayfa\'yı gizle</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Ana Sayfa düğmesi gizli</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Ana Sayfa düğmesi görünür</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Sana Özel düğmesini gizle</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Örnekleri Gizle</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Sana Özel düğmesi gizli</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Sana Özel düğmesi görünür</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Keşfet düğmesini gizle</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Keşfet\'i Gizle</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Keşfet düğmesi gizli</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Keşfet düğmesi görünür</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Kitaplık düğmesini gizle</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Kitaplık\'ı Gizle</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Kitaplık düğmesi gizli</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Kitaplık düğmesi görünür</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Yükselt düğmesini gizle</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Yükselt\'i Gizle</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Yükselt düğmesi gizli</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Yükselt düğmesi görünür</string>
   <string name="revanced_music_hide_navigation_bar_title">Gezinme çubuğunu gizle</string>
diff --git a/patches/src/main/resources/addresources/values-uk-rUA/strings.xml b/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
index 5765c04b8..ab6f7a0de 100644
--- a/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
+++ b/patches/src/main/resources/addresources/values-uk-rUA/strings.xml
@@ -1563,12 +1563,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• Експериментальний клієнт, який може припинити працювати будь-якої миті</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Відсутній відеокодек AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Відео для дітей можуть не відтворюватися, якщо вийти з облікового запису або перейти в анонімний режим</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• \"Примусово оригінальна мова звукової доріжки\" недоступна</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показувати у \"Статистиці для сисадмінів\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Тип клієнта відображається у вікні \"Статистика для сисадмінів\"</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Тип клієнта приховано у вікні \"Статистика для сисадмінів\"</string>
   <string name="revanced_spoof_video_streams_language_title">Мова звукової доріжки</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Щоб вибрати певну звукову доріжку, вимкніть \"Примусово оригінальна мова звукової доріжки\"</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Вибір мови потоку недоступний з Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1603,23 +1606,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">Панель навігації</string>
   <string name="revanced_music_navigation_bar_screen_summary">Приховати або змінити кнопки панелі навігації</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Приховати кнопку \"Головна\"</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Приховати \"Головна\"</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Кнопку \"Головна\" приховано</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Кнопка \"Головна\" показується</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Приховати кнопку \"Семпли\"</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Приховати Семпли</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Кнопку \"Семпли\" приховано</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Кнопка \"Семпли\" показується</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Приховати кнопку \"Навігація\"</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Приховати Огляд</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Кнопку \"Навігація\" приховано</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Кнопка \"Навігація\" показується</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Приховати кнопку \"Бібліотека\"</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Приховати Бібліотеку</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Кнопку \"Бібліотека\" приховано</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Кнопка \"Бібліотека\" показується</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Приховати кнопку \"Підписка\"</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Приховати Підписку</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Кнопку \"Підписка\" приховано</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Кнопка \"Підписка\" показується</string>
   <string name="revanced_music_hide_navigation_bar_title">Приховати панель навігації</string>
diff --git a/patches/src/main/resources/addresources/values-ur-rIN/strings.xml b/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
+++ b/patches/src/main/resources/addresources/values-ur-rIN/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml b/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
+++ b/patches/src/main/resources/addresources/values-uz-rUZ/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>
diff --git a/patches/src/main/resources/addresources/values-vi-rVN/strings.xml b/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
index 48a8145bc..f92ef7d9e 100644
--- a/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
+++ b/patches/src/main/resources/addresources/values-vi-rVN/strings.xml
@@ -68,8 +68,8 @@ Second \"item\" text"</string>
                  and changes made here must also be made there. -->
   </patch>
   <patch id="misc.gms.gmsCoreSupportResourcePatch">
-  <string name="microg_settings_title">Cài đặt GmsCore</string>
-  <string name="microg_settings_summary">Các cài đặt cho GmsCore</string>
+  <string name="microg_settings_title">GmsCore</string>
+  <string name="microg_settings_summary">Chuyển hướng tới GmsCore và thiết lập</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   <string name="gms_core_toast_not_installed_message">MicroG GmsCore chưa được cài đặt. Hãy cài đặt ngay.</string>
   <string name="gms_core_dialog_title">Yêu cầu thực hiện</string>
@@ -88,9 +88,9 @@ Nhấn tiếp tục để thay đổi lựa chọn tối ưu hóa."</string>
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
   <string name="revanced_spoof_video_streams_screen_title">Giả mạo luồng video</string>
-  <string name="revanced_spoof_video_streams_screen_summary">Giả mạo luồng video của thiết bị nhằm ngăn chặn lỗi khi phát</string>
+  <string name="revanced_spoof_video_streams_screen_summary">Giả mạo luồng video của ứng dụng khách nhằm ngăn chặn lỗi khi phát</string>
   <string name="revanced_spoof_video_streams_screen_title">Giả mạo luồng video</string>
-  <string name="revanced_spoof_video_streams_screen_summary">Giả mạo luồng video của thiết bị nhằm ngăn chặn lỗi khi phát</string>
+  <string name="revanced_spoof_video_streams_screen_summary">Giả mạo luồng video của ứng dụng khách nhằm ngăn chặn lỗi khi phát</string>
   <string name="revanced_spoof_video_streams_title">Giả mạo luồng video</string>
   <string name="revanced_spoof_video_streams_summary_on">"Luồng video đã được giả mạo
 
@@ -99,7 +99,7 @@ Nếu bạn là người dùng YouTube Premium, thì cài đặt này có thể
 
 Có thể gặp lỗi khi phát."</string>
   <string name="revanced_spoof_video_streams_user_dialog_message">Tắt cài đặt này có thể gây ra lỗi khi phát.</string>
-  <string name="revanced_spoof_video_streams_client_type_title">Loại thiết bị mặc định</string>
+  <string name="revanced_spoof_video_streams_client_type_title">Ứng dụng khách mặc định</string>
   </patch>
   <patch id="misc.debugging.enableDebuggingPatch">
   <string name="revanced_debug_screen_title">Gỡ lỗi</string>
@@ -186,15 +186,15 @@ Tuy nhiên, bật tính năng này cũng sẽ ghi lại một số dữ liệu n
   <string name="revanced_hide_floating_microphone_button_title">Ẩn nút micrô nổi</string>
   <string name="revanced_hide_floating_microphone_button_summary_on">Nút micro nổi trong tìm kiếm bị ẩn</string>
   <string name="revanced_hide_floating_microphone_button_summary_off">Nút micro nổi trong tìm kiếm đang hiển thị</string>
-  <string name="revanced_hide_horizontal_shelves_title">Ẩn kệ ngang</string>
-  <string name="revanced_hide_horizontal_shelves_summary_on">"Các kệ ngang đã bị ẩn, chẳng hạn như:
+  <string name="revanced_hide_horizontal_shelves_title">Ẩn kệ cá nhân hoá</string>
+  <string name="revanced_hide_horizontal_shelves_summary_on">"Các kệ cá nhân hoá đã bị ẩn, chẳng hạn như:
 • Tin nổi bật
 • Tiếp tục xem
 • Khám phá các chủ đề khác
 • Phù hợp nhất
 • Mua sắm
 • Xem lại"</string>
-  <string name="revanced_hide_horizontal_shelves_summary_off">Kệ ngang được hiển thị</string>
+  <string name="revanced_hide_horizontal_shelves_summary_off">Kệ cá nhân hoá được hiển thị</string>
   <string name="revanced_hide_image_shelf_title">Ẩn kệ hình ảnh</string>
   <string name="revanced_hide_image_shelf_summary_on">Kệ hình ảnh trong kết quả tìm kiếm đã bị ẩn</string>
   <string name="revanced_hide_image_shelf_summary_off">Kệ hình ảnh trong kết quả tìm kiếm được hiển thị</string>
@@ -626,9 +626,9 @@ Vui lòng kiểm tra lại tên gói và đảm bảo ứng dụng đã được
   <string name="revanced_hide_clip_button_summary_on">Nút tạo đoạn video đã bị ẩn</string>
   <string name="revanced_hide_clip_button_summary_off">Nút tạo đoạn video được hiển thị</string>
   <!-- 'Shop' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_shop_button_title">Ẩn Cửa hàng</string>
-  <string name="revanced_hide_shop_button_summary_on">Nút Cửa hàng đã bị ẩn</string>
-  <string name="revanced_hide_shop_button_summary_off">Nút Cửa hàng được hiển thị</string>
+  <string name="revanced_hide_shop_button_title">Ẩn Mua sắm</string>
+  <string name="revanced_hide_shop_button_summary_on">Nút Mua sắm đã bị ẩn</string>
+  <string name="revanced_hide_shop_button_summary_off">Nút Mua sắm được hiển thị</string>
   <!-- 'Save' should be translated with the same localized wording that YouTube displays. -->
   <string name="revanced_hide_save_button_title">Ẩn Lưu</string>
   <string name="revanced_hide_save_button_summary_on">Nút Lưu đã bị ẩn</string>
@@ -839,7 +839,7 @@ Nếu thay đổi cài đặt này không có hiệu lực, hãy thử chuyển
   <string name="revanced_hide_shorts_search_suggestions_title">Ẩn đề xuất tìm kiếm</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_on">Đề xuất tìm kiếm đã bị ẩn</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_off">Đề xuất tìm kiếm được hiển thị</string>
-  <string name="revanced_hide_shorts_shop_button_title">Ẩn nút Cửa hàng</string>
+  <string name="revanced_hide_shorts_shop_button_title">Ẩn nút Mua sắm</string>
   <string name="revanced_hide_shorts_shop_button_summary_on">Nút mua sắm đã bị ẩn</string>
   <string name="revanced_hide_shorts_shop_button_summary_off">Nút mua sắm được hiển thị</string>
   <string name="revanced_hide_shorts_stickers_title">Ẩn nhãn dán</string>
@@ -1247,7 +1247,7 @@ Bố cục màn hình ô tô
 
 Nếu tắt đi sau đó, bạn nên xóa dữ liệu ứng dụng để tránh phát sinh lỗi giao diện."</string>
   <string name="revanced_spoof_app_version_target_title">Mục tiêu phiên bản giả mạo</string>
-  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Khôi phục thanh hành động video không bị thu gọn</string>
+  <string name="revanced_spoof_app_version_target_entry_1">20.13.41 - Khôi phục thanh thao tác video mở rộng</string>
   <string name="revanced_spoof_app_version_target_entry_2">19.35.36 - Khôi phục biểu tượng trình phát Shorts cũ</string>
   <string name="revanced_spoof_app_version_target_entry_3">19.01.34 - Khôi phục biểu tượng điều hướng cũ</string>
   </patch>
@@ -1567,15 +1567,18 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_spoof_video_streams_about_android_summary">"• Trình đơn bản âm thanh bị thiếu
 • Âm lượng ổn định không khả dụng"</string>
   <string name="revanced_spoof_video_streams_about_ipados_summary">• Video có thể dừng ở 1:00, hoặc có thể không khả dụng ở một số khu vực</string>
-  <string name="revanced_spoof_video_streams_about_experimental">• Ứng dụng thử nghiệm và có thể ngừng hoạt động bất cứ lúc nào</string>
+  <string name="revanced_spoof_video_streams_about_experimental">• Ứng dụng khách đang trong giai đoạn thử nghiệm và có thể ngừng hoạt động bất cứ lúc nào</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• Không có codec video AV1</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• Video dành cho trẻ em có thể không phát được khi đăng xuất hoặc ở chế độ ẩn danh</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• Buộc âm thanh gốc không khả dụng</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Hiện trong Thống kê chi tiết</string>
-  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Loại máy khách đã được hiển thị trong Thống kê chi tiết</string>
-  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Loại thiết bị đã ẩn trong Thống kê chi tiết</string>
+  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Ứng dụng khách đã được hiển thị trong Thống kê chi tiết</string>
+  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Ứng dụng khách đã ẩn trong Thống kê chi tiết</string>
   <string name="revanced_spoof_video_streams_language_title">Ngôn ngữ luồng âm thanh</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">Để chọn ngôn ngữ âm thanh cụ thể, hãy tắt \'Buộc ngôn ngữ âm thanh gốc\'</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Chọn ngôn ngữ luồng không khả dụng với Android Studio</string>
   </patch>
   </app>
   <app id="music">
@@ -1610,23 +1613,23 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_music_navigation_bar_screen_title">Thanh điều hướng</string>
   <string name="revanced_music_navigation_bar_screen_summary">Ẩn hoặc thay đổi các nút trên thanh điều hướng</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">Ẩn nút Trang chủ</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">Ẩn Trang chủ</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">Nút Trang chủ đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">Nút Trang chủ được hiển thị</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ẩn nút Đoạn nhạc</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">Ẩn Đoạn nhạc</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">Nút Đoạn nhạc đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">Nút Đoạn nhạc được hiển thị</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ẩn nút Khám phá</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">Ẩn Khám phá</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">Nút Khám phá đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">Nút Khám phá được hiển thị</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">Ẩn nút Thư viện</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">Ẩn Thư viện</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">Nút Thư viện đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">Nút Thư viện được hiển thị</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ẩn nút Nâng cấp</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">Ẩn Nâng cấp</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">Nút Nâng cấp đã bị ẩn</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">Nút Nâng cấp được hiển thị</string>
   <string name="revanced_music_hide_navigation_bar_title">Ẩn thanh điều hướng</string>
@@ -1696,7 +1699,7 @@ Bật tính năng này có thể mở khóa chất lượng video cao hơn"</str
   <string name="revanced_misc_screen_summary">Cài đặt linh tinh</string>
   <string name="revanced_general_category_title">Cài đặt chung</string>
   <string name="revanced_other_category_title">Cài đặt khác</string>
-  <string name="revanced_client_ads_category_title">Quảng cáo phía máy khách</string>
+  <string name="revanced_client_ads_category_title">Quảng cáo phía ứng dụng</string>
   <string name="revanced_surestream_ads_category_title">Quảng cáo luồng đảm bảo phía máy khách</string>
   <string name="revanced_twitch_debug_title">Nhật ký gỡ lỗi</string>
   <string name="revanced_twitch_debug_summary_on">Nhật ký gỡ lỗi đã bật</string>
diff --git a/patches/src/main/resources/addresources/values-zh-rCN/strings.xml b/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
index 0056f068a..46ae6549c 100644
--- a/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
+++ b/patches/src/main/resources/addresources/values-zh-rCN/strings.xml
@@ -1569,12 +1569,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• 实验性客户端，可能随时停止工作</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• 不支持 AV1 视频编解码器</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• 注销或使用无痕模式时，儿童视频可能无法播放</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• 强制原始音频不可用</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">显示在 Stats for nerds 中</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">客户端类型显示在 Stats for nerds 中</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">客户端隐藏在 Stats for nerds 中</string>
   <string name="revanced_spoof_video_streams_language_title">音频流语言</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">要选择特定的音频语言，请关闭“强制原始音频语言”</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">Android Studio 不支持选择流语言</string>
   </patch>
   </app>
   <app id="music">
@@ -1609,23 +1612,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">导航栏</string>
   <string name="revanced_music_navigation_bar_screen_summary">隐藏或更改导航栏按钮</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">隐藏主页按钮</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">隐藏主页</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">主页按钮已隐藏</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">主页按钮已显示</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">隐藏精选按钮</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">隐藏短片</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">精选按钮已隐藏</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">精选按钮已显示</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">隐藏探索按钮</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">隐藏探索</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">探索按钮已隐藏</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">探索按钮已显示</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">隐藏媒体库按钮</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">隐藏媒体库</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">媒体库按钮已隐藏</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">媒体库按钮已显示</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">隐藏升级按钮</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">隐藏升级</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">升级按钮已隐藏</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">升级按钮已显示</string>
   <string name="revanced_music_hide_navigation_bar_title">隐藏导航栏</string>
diff --git a/patches/src/main/resources/addresources/values-zh-rTW/strings.xml b/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
index 886fb42c0..a62c677f4 100644
--- a/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
+++ b/patches/src/main/resources/addresources/values-zh-rTW/strings.xml
@@ -1574,12 +1574,15 @@ Second \"item\" text"</string>
   <string name="revanced_spoof_video_streams_about_experimental">• 實驗性用戶端，隨時可能停止運作</string>
   <string name="revanced_spoof_video_streams_about_no_av1">• 沒有 AV1 影片解碼器</string>
   <string name="revanced_spoof_video_streams_about_kids_videos">• 在登出或無痕模式下，兒童影片可能無法播放</string>
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
+  <string name="revanced_spoof_video_streams_about_no_force_original_audio">• 強制原始音訊不可用</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_title">顯示統計資料</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">已在統計資料中顯示用戶端類型</string>
   <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">已在統計資料中隱藏用戶端類型</string>
   <string name="revanced_spoof_video_streams_language_title">音訊串流語言</string>
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   <string name="revanced_spoof_video_streams_language_not_available">若要選擇特定的音訊語言，請關閉「強制使用原始音訊語言」</string>
+  <string name="revanced_spoof_video_streams_language_android_studio">無法使用 Android Studio 選擇串流語言</string>
   </patch>
   </app>
   <app id="music">
@@ -1614,23 +1617,23 @@ Second \"item\" text"</string>
   <string name="revanced_music_navigation_bar_screen_title">導覽列</string>
   <string name="revanced_music_navigation_bar_screen_summary">隱藏或變更導覽列按鈕</string>
   <!-- 'Home' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_home_button_title">隱藏「首頁」按鈕</string>
+  <string name="revanced_music_hide_navigation_bar_home_button_title">隱藏「首頁」</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_on">「首頁」按鈕已隱藏</string>
   <string name="revanced_music_hide_navigation_bar_home_button_summary_off">「首頁」按鈕已顯示</string>
   <!-- 'Samples' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_samples_button_title">隱藏「取樣」按鈕</string>
+  <string name="revanced_music_hide_navigation_bar_samples_button_title">隱藏「取樣」</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_on">「取樣」按鈕已隱藏</string>
   <string name="revanced_music_hide_navigation_bar_samples_button_summary_off">「取樣」按鈕已顯示</string>
   <!-- 'Explore' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_explore_button_title">隱藏「探索」按鈕</string>
+  <string name="revanced_music_hide_navigation_bar_explore_button_title">隱藏探索</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_on">「探索」按鈕已隱藏</string>
   <string name="revanced_music_hide_navigation_bar_explore_button_summary_off">「探索」按鈕已顯示</string>
   <!-- 'Library' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_library_button_title">隱藏「媒體庫」按鈕</string>
+  <string name="revanced_music_hide_navigation_bar_library_button_title">隱藏媒體庫</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_on">「媒體庫」按鈕已隱藏</string>
   <string name="revanced_music_hide_navigation_bar_library_button_summary_off">「媒體庫」按鈕已顯示</string>
   <!-- 'Upgrade' should be translated using the same localized wording YouTube Music displays for the tab. -->
-  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">隱藏「升級」按鈕</string>
+  <string name="revanced_music_hide_navigation_bar_upgrade_button_title">隱藏升級</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_on">「升級」按鈕已隱藏</string>
   <string name="revanced_music_hide_navigation_bar_upgrade_button_summary_off">「升級」按鈕已顯示</string>
   <string name="revanced_music_hide_navigation_bar_title">隱藏導覽列</string>
diff --git a/patches/src/main/resources/addresources/values-zu-rZA/strings.xml b/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
index 08705f06e..f697cddf7 100644
--- a/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
+++ b/patches/src/main/resources/addresources/values-zu-rZA/strings.xml
@@ -244,6 +244,7 @@ Second \"item\" text"</string>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- "Force original audio" should use the same text as revanced_force_original_audio_title -->
   <!-- 'Force original audio language' should use the same text as revanced_force_original_audio_title -->
   </patch>
   </app>

From ebb446b22ac518bd458aeae77d3018a5bb843a70 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sun, 21 Sep 2025 06:58:02 +0000
Subject: [PATCH 13/16] chore: Release v5.40.0 [skip ci]

# [5.40.0](https://github.com/ReVanced/revanced-patches/compare/v5.39.0...v5.40.0) (2025-09-21)

### Bug Fixes

* **Instagram - Limit feed to followed profiles:** Change patch to default off ([767f1e3](https://github.com/ReVanced/revanced-patches/commit/767f1e3695327bdbc4daea8b50a80d4c0a38456a))
* **Spoof video streams:** Resolve occasional playback stuttering ([5c7c8b5](https://github.com/ReVanced/revanced-patches/commit/5c7c8b536416ec53cd98f7d59d11850aa1b70f11))
* **YouTube - Force original audio:** Show UI setting summary if spoofing to Android Studio ([b7026b7](https://github.com/ReVanced/revanced-patches/commit/b7026b70865bc44de07b30f84ba8b8b608930d5b))
* **YouTube - Spoof video streams:** Add "Force original audio" disclaimer for Android Studio client ([f97d332](https://github.com/ReVanced/revanced-patches/commit/f97d33206b4c97244f0bd0c672c4b91eaf477b0b))
* **YouTube - Spoof video streams:** Add stream audio selector disclaimer for Android Studio client ([a8a4107](https://github.com/ReVanced/revanced-patches/commit/a8a410708d50f34ac4bd2ca29bbbc3cde00bbf93))

### Features

* **Instagram:** Add `Limit feed to followed profiles` patch ([#5908](https://github.com/ReVanced/revanced-patches/issues/5908)) ([8ba9a19](https://github.com/ReVanced/revanced-patches/commit/8ba9a19ade24c5fe9bd6d4e49772b7663522780e))
* **Viber - Hide ads:** Support latest app target ([#5863](https://github.com/ReVanced/revanced-patches/issues/5863)) ([e6cce85](https://github.com/ReVanced/revanced-patches/commit/e6cce8554116df3c0ea6dbb7440c59c9e73d8334))
* **YouTube - Hide video action buttons:** Add "Hide comments" button ([db796fb](https://github.com/ReVanced/revanced-patches/commit/db796fb8830b813e1ed626d491c4a797171e69e7))
* **YouTube Music:** Add `Enable debugging` patch ([#5939](https://github.com/ReVanced/revanced-patches/issues/5939)) ([418f594](https://github.com/ReVanced/revanced-patches/commit/418f5945c213313f9a77cac9a5c326d89c754dfd))
* **YouTube Music:** Add `Hide cast button` and `Navigation bar` patches ([#5934](https://github.com/ReVanced/revanced-patches/issues/5934)) ([651d358](https://github.com/ReVanced/revanced-patches/commit/651d3580967a252b57cbf4afbba02d6a4601ccfe))
* **YouTube Music:** Support version `8.10.52` ([#5941](https://github.com/ReVanced/revanced-patches/issues/5941)) ([01c0f1b](https://github.com/ReVanced/revanced-patches/commit/01c0f1bd1ac6edb8aea758f88ffffcdea74a29b7))
* **YouTube:** Support version `20.14.43` ([#5940](https://github.com/ReVanced/revanced-patches/issues/5940)) ([f7f4a1b](https://github.com/ReVanced/revanced-patches/commit/f7f4a1b0f0186598266b41a2c6a781fdee49e440))
---
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 gradle.properties |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674b1860c..1e8dcd5b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+# [5.40.0](https://github.com/ReVanced/revanced-patches/compare/v5.39.0...v5.40.0) (2025-09-21)
+
+
+### Bug Fixes
+
+* **Instagram - Limit feed to followed profiles:** Change patch to default off ([767f1e3](https://github.com/ReVanced/revanced-patches/commit/767f1e3695327bdbc4daea8b50a80d4c0a38456a))
+* **Spoof video streams:** Resolve occasional playback stuttering ([5c7c8b5](https://github.com/ReVanced/revanced-patches/commit/5c7c8b536416ec53cd98f7d59d11850aa1b70f11))
+* **YouTube - Force original audio:** Show UI setting summary if spoofing to Android Studio ([b7026b7](https://github.com/ReVanced/revanced-patches/commit/b7026b70865bc44de07b30f84ba8b8b608930d5b))
+* **YouTube - Spoof video streams:** Add "Force original audio" disclaimer for Android Studio client ([f97d332](https://github.com/ReVanced/revanced-patches/commit/f97d33206b4c97244f0bd0c672c4b91eaf477b0b))
+* **YouTube - Spoof video streams:** Add stream audio selector disclaimer for Android Studio client ([a8a4107](https://github.com/ReVanced/revanced-patches/commit/a8a410708d50f34ac4bd2ca29bbbc3cde00bbf93))
+
+
+### Features
+
+* **Instagram:** Add `Limit feed to followed profiles` patch ([#5908](https://github.com/ReVanced/revanced-patches/issues/5908)) ([8ba9a19](https://github.com/ReVanced/revanced-patches/commit/8ba9a19ade24c5fe9bd6d4e49772b7663522780e))
+* **Viber - Hide ads:** Support latest app target ([#5863](https://github.com/ReVanced/revanced-patches/issues/5863)) ([e6cce85](https://github.com/ReVanced/revanced-patches/commit/e6cce8554116df3c0ea6dbb7440c59c9e73d8334))
+* **YouTube - Hide video action buttons:** Add "Hide comments" button ([db796fb](https://github.com/ReVanced/revanced-patches/commit/db796fb8830b813e1ed626d491c4a797171e69e7))
+* **YouTube Music:** Add `Enable debugging` patch ([#5939](https://github.com/ReVanced/revanced-patches/issues/5939)) ([418f594](https://github.com/ReVanced/revanced-patches/commit/418f5945c213313f9a77cac9a5c326d89c754dfd))
+* **YouTube Music:** Add `Hide cast button` and `Navigation bar` patches ([#5934](https://github.com/ReVanced/revanced-patches/issues/5934)) ([651d358](https://github.com/ReVanced/revanced-patches/commit/651d3580967a252b57cbf4afbba02d6a4601ccfe))
+* **YouTube Music:** Support version `8.10.52` ([#5941](https://github.com/ReVanced/revanced-patches/issues/5941)) ([01c0f1b](https://github.com/ReVanced/revanced-patches/commit/01c0f1bd1ac6edb8aea758f88ffffcdea74a29b7))
+* **YouTube:** Support version `20.14.43` ([#5940](https://github.com/ReVanced/revanced-patches/issues/5940)) ([f7f4a1b](https://github.com/ReVanced/revanced-patches/commit/f7f4a1b0f0186598266b41a2c6a781fdee49e440))
+
 # [5.40.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.10...v5.40.0-dev.11) (2025-09-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index 53e5677b3..111867218 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0-dev.11
+version = 5.40.0

From ece8076f7cefd752b97515014bc50fe4fd80171e Mon Sep 17 00:00:00 2001
From: MarcaD <152095496+MarcaDian@users.noreply.github.com>
Date: Sun, 21 Sep 2025 16:19:29 +0300
Subject: [PATCH 14/16] fix(YouTube - Settings): Use an overlay to show search
 results (#5806)

Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
---
 .../music/settings/GoogleApiActivityHook.java |  87 ---
 .../music/settings/MusicActivityHook.java     | 126 ++++
 .../extension/music/settings/Settings.java    |   1 -
 .../preference/MusicPreferenceFragment.java   |  80 +++
 .../ReVancedPreferenceFragment.java           |  38 -
 .../search/MusicSearchResultsAdapter.java     |  28 +
 .../search/MusicSearchViewController.java     |  71 ++
 .../extension/shared/GmsCoreSupport.java      |  17 +-
 .../app/revanced/extension/shared/Utils.java  | 477 ++-----------
 .../extension/shared/checks/Check.java        |  11 +-
 .../shared/settings/BaseActivityHook.java     |  33 +-
 .../shared/settings/BaseSettings.java         |   3 +
 .../extension/shared/settings/Setting.java    | 102 ++-
 .../AbstractPreferenceFragment.java           |   9 +-
 .../preference/BulletPointPreference.java     |  78 +++
 .../BulletPointSwitchPreference.java          |  45 ++
 .../preference/ColorPickerPreference.java     | 349 +++++-----
 .../settings/preference/ColorPickerView.java  | 283 ++++++--
 ...olorPickerWithOpacitySliderPreference.java |  34 +
 .../CustomDialogListPreference.java           | 133 +++-
 .../preference/ImportExportPreference.java    |  27 +-
 .../preference/ReVancedAboutPreference.java   |   5 +-
 .../ResettableEditTextPreference.java         |   4 +-
 .../preference/ToolbarPreferenceFragment.java |   2 +-
 .../preference/UrlLinkPreference.java         |   2 +-
 .../settings/search/BaseSearchResultItem.java | 365 ++++++++++
 .../search/BaseSearchResultsAdapter.java      | 621 +++++++++++++++++
 .../search/BaseSearchViewController.java      | 653 ++++++++++++++++++
 .../settings/search/SearchHistoryManager.java | 377 ++++++++++
 .../extension/shared/ui/ColorDot.java         |  61 ++
 .../extension/shared/ui/CustomDialog.java     | 472 +++++++++++++
 .../shared/ui/SheetBottomDialog.java          | 463 +++++++++++++
 ...ivityHook.java => TikTokActivityHook.java} |  18 +-
 .../preference/DownloadPathPreference.java    |   2 +-
 .../ReVancedTikTokAboutPreference.java        |   2 +-
 ...ent.java => TikTokPreferenceFragment.java} |   2 +-
 ...ivityHook.java => TwitchActivityHook.java} |  47 +-
 .../preference/CustomPreferenceCategory.java  |   1 +
 ...ent.java => TwitchPreferenceFragment.java} |   4 +-
 .../patches/AlternativeThumbnailsPatch.java   |  61 +-
 .../youtube/patches/ChangeStartPagePatch.java |   7 +
 ...WatchHistoryDomainNameResolutionPatch.java |   3 +-
 .../youtube/patches/DownloadsPatch.java       |   4 +-
 .../HidePlayerOverlayButtonsPatch.java        |  10 +-
 .../youtube/patches/MiniplayerPatch.java      |  64 +-
 .../patches/SeekbarThumbnailsPatch.java       |   7 +
 .../announcements/AnnouncementsPatch.java     |   3 +-
 .../PlayerFlyoutMenuItemsFilter.java          |   8 +
 .../speed/CustomPlaybackSpeedPatch.java       | 569 ++++++---------
 .../patches/theme/SeekbarColorPatch.java      |   5 +-
 .../ReturnYouTubeDislikeAboutPreference.java  |   2 +-
 .../settings/SearchViewController.java        | 414 -----------
 .../extension/youtube/settings/Settings.java  | 122 ++--
 ...vityHook.java => YouTubeActivityHook.java} |  65 +-
 ...ativeThumbnailsAboutDeArrowPreference.java |   1 +
 .../ExternalDownloaderPreference.java         |   9 +-
 .../ReVancedPreferenceFragment.java           | 483 -------------
 ...oofStreamingDataSideEffectsPreference.java |   4 +-
 .../preference/YouTubePreferenceFragment.java |  80 +++
 .../search/YouTubeSearchResultsAdapter.java   |  28 +
 .../search/YouTubeSearchViewController.java   |  70 ++
 .../SegmentPlaybackController.java            |  25 +-
 .../sponsorblock/SponsorBlockSettings.java    |  58 +-
 .../sponsorblock/SponsorBlockUtils.java       |  24 +-
 .../sponsorblock/objects/SegmentCategory.java | 224 +++---
 .../SegmentCategoryListPreference.java        | 371 ----------
 .../objects/SegmentCategoryPreference.java    | 165 +++++
 .../sponsorblock/objects/SponsorSegment.java  |   9 +-
 .../sponsorblock/ui/NewSegmentLayout.java     |  14 +-
 .../sponsorblock/ui/SkipSponsorButton.java    |   7 +-
 .../ui/SponsorBlockAboutPreference.java       |   2 +-
 .../ui/SponsorBlockPreferenceGroup.java       | 321 ++++-----
 .../SponsorBlockStatsPreferenceCategory.java  |  30 +-
 .../ui/SponsorBlockViewController.java        |  17 +-
 .../SwipeControlsConfigurationProvider.kt     |  11 +-
 .../videoplayer/PlayerControlButton.java      |  11 +-
 .../videoplayer/VideoQualityDialogButton.java | 200 ++----
 .../music/misc/settings/SettingsPatch.kt      |  66 +-
 .../shared/misc/settings/SettingsPatch.kt     |  13 +-
 .../tiktok/misc/settings/SettingsPatch.kt     |   2 +-
 .../twitch/misc/settings/SettingsPatch.kt     |   2 +-
 .../swipecontrols/SwipeControlsPatch.kt       |   4 +-
 .../hide/general/HideLayoutComponentsPatch.kt |  10 +-
 .../youtube/misc/settings/SettingsPatch.kt    | 189 +++--
 .../youtube/video/speed/PlaybackSpeedPatch.kt |   2 +-
 .../resources/addresources/values/arrays.xml  |  30 +-
 .../resources/addresources/values/strings.xml |  26 +-
 .../revanced_settings_circle_background.xml   |   8 -
 .../revanced_settings_custom_checkmark.xml    |   2 +-
 .../revanced_settings_search_remove.xml       |   9 +
 .../layout/revanced_color_dot_widget.xml      |   8 +-
 .../revanced_custom_list_item_checked.xml     |   4 +-
 .../revanced_music_settings_with_toolbar.xml  |  40 --
 ...evanced_preference_search_history_item.xml |  50 ++
 ...anced_preference_search_history_screen.xml | 132 ++++
 .../revanced_preference_search_no_result.xml  |  57 ++
 ...evanced_preference_search_result_color.xml |  47 ++
 ..._preference_search_result_group_header.xml |  19 +
 ...revanced_preference_search_result_list.xml |  38 +
 ...anced_preference_search_result_regular.xml |  38 +
 ...anced_preference_search_result_switch.xml} |  46 +-
 .../revanced_search_suggestion_item.xml       |  31 -
 .../settings/music/values/styles.xml          |   5 +
 .../{host => youtube}/values/styles.xml       |   0
 104 files changed, 6066 insertions(+), 3453 deletions(-)
 delete mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java
 create mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
 create mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java
 delete mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
 create mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java
 create mode 100644 extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointPreference.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointSwitchPreference.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerWithOpacitySliderPreference.java
 rename extensions/{youtube/src/main/java/app/revanced/extension/youtube => shared/library/src/main/java/app/revanced/extension/shared}/settings/preference/UrlLinkPreference.java (95%)
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchViewController.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/ColorDot.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/CustomDialog.java
 create mode 100644 extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/SheetBottomDialog.java
 rename extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/{AdPersonalizationActivityHook.java => TikTokActivityHook.java} (86%)
 rename extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/{ReVancedPreferenceFragment.java => TikTokPreferenceFragment.java} (97%)
 rename extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/{AppCompatActivityHook.java => TwitchActivityHook.java} (70%)
 rename extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/{ReVancedPreferenceFragment.java => TwitchPreferenceFragment.java} (82%)
 delete mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java
 rename extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/{LicenseActivityHook.java => YouTubeActivityHook.java} (66%)
 delete mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
 create mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/YouTubePreferenceFragment.java
 create mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchResultsAdapter.java
 create mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchViewController.java
 delete mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java
 create mode 100644 extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryPreference.java
 delete mode 100644 patches/src/main/resources/settings/drawable/revanced_settings_circle_background.xml
 create mode 100644 patches/src/main/resources/settings/drawable/revanced_settings_search_remove.xml
 delete mode 100644 patches/src/main/resources/settings/layout/revanced_music_settings_with_toolbar.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_history_item.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_history_screen.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_no_result.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_result_color.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_result_group_header.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_result_list.xml
 create mode 100644 patches/src/main/resources/settings/layout/revanced_preference_search_result_regular.xml
 rename patches/src/main/resources/settings/layout/{revanced_preference_with_icon_no_search_result.xml => revanced_preference_search_result_switch.xml} (56%)
 delete mode 100644 patches/src/main/resources/settings/layout/revanced_search_suggestion_item.xml
 rename patches/src/main/resources/settings/{host => youtube}/values/styles.xml (100%)

diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java
deleted file mode 100644
index 336ea890f..000000000
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package app.revanced.extension.music.settings;
-
-import android.app.Activity;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.preference.PreferenceFragment;
-import android.view.View;
-
-import app.revanced.extension.music.settings.preference.ReVancedPreferenceFragment;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.BaseActivityHook;
-
-/**
- * Hooks GoogleApiActivity to inject a custom ReVancedPreferenceFragment with a toolbar.
- */
-public class GoogleApiActivityHook extends BaseActivityHook {
-    /**
-     * Injection point
-     * <p>
-     * Creates an instance of GoogleApiActivityHook for use in static initialization.
-     */
-    @SuppressWarnings("unused")
-    public static GoogleApiActivityHook createInstance() {
-        // Must touch the Music settings to ensure the class is loaded and
-        // the values can be found when setting the UI preferences.
-        // Logging anything under non debug ensures this is set.
-        Logger.printInfo(() -> "Permanent repeat enabled: " + Settings.PERMANENT_REPEAT.get());
-
-        // YT Music always uses dark mode.
-        Utils.setIsDarkModeEnabled(true);
-
-        return new GoogleApiActivityHook();
-    }
-
-    /**
-     * Sets the fixed theme for the activity.
-     */
-    @Override
-    protected void customizeActivityTheme(Activity activity) {
-        // Override the default YouTube Music theme to increase start padding of list items.
-        // Custom style located in resources/music/values/style.xml
-        activity.setTheme(Utils.getResourceIdentifier("Theme.ReVanced.YouTubeMusic.Settings", "style"));
-    }
-
-    /**
-     * Returns the resource ID for the YouTube Music settings layout.
-     */
-    @Override
-    protected int getContentViewResourceId() {
-        return Utils.getResourceIdentifier("revanced_music_settings_with_toolbar", "layout");
-    }
-
-    /**
-     * Returns the fixed background color for the toolbar.
-     */
-    @Override
-    protected int getToolbarBackgroundColor() {
-        return Utils.getResourceColor("ytm_color_black");
-    }
-
-    /**
-     * Returns the navigation icon with a color filter applied.
-     */
-    @Override
-    protected Drawable getNavigationIcon() {
-        Drawable navigationIcon = ReVancedPreferenceFragment.getBackButtonDrawable();
-        navigationIcon.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
-        return navigationIcon;
-    }
-
-    /**
-     * Returns the click listener that finishes the activity when the navigation icon is clicked.
-     */
-    @Override
-    protected View.OnClickListener getNavigationClickListener(Activity activity) {
-        return view -> activity.finish();
-    }
-
-    /**
-     * Creates a new ReVancedPreferenceFragment for the activity.
-     */
-    @Override
-    protected PreferenceFragment createPreferenceFragment() {
-        return new ReVancedPreferenceFragment();
-    }
-}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
new file mode 100644
index 000000000..bb19d2497
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
@@ -0,0 +1,126 @@
+package app.revanced.extension.music.settings;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceFragment;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.music.settings.search.MusicSearchViewController;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseActivityHook;
+
+/**
+ * Hooks GoogleApiActivity to inject a custom {@link MusicPreferenceFragment} with a toolbar and search.
+ */
+public class MusicActivityHook extends BaseActivityHook {
+
+    @SuppressLint("StaticFieldLeak")
+    public static MusicSearchViewController searchViewController;
+
+    /**
+     * Injection point.
+     */
+    @SuppressWarnings("unused")
+    public static void initialize(Activity parentActivity) {
+        // Must touch the Music settings to ensure the class is loaded and
+        // the values can be found when setting the UI preferences.
+        // Logging anything under non debug ensures this is set.
+        Logger.printInfo(() -> "Permanent repeat enabled: " + Settings.PERMANENT_REPEAT.get());
+
+        // YT Music always uses dark mode.
+        Utils.setIsDarkModeEnabled(true);
+
+        BaseActivityHook.initialize(new MusicActivityHook(), parentActivity);
+    }
+
+    /**
+     * Sets the fixed theme for the activity.
+     */
+    @Override
+    protected void customizeActivityTheme(Activity activity) {
+        // Override the default YouTube Music theme to increase start padding of list items.
+        // Custom style located in resources/music/values/style.xml
+        activity.setTheme(Utils.getResourceIdentifierOrThrow(
+                "Theme.ReVanced.YouTubeMusic.Settings", "style"));
+    }
+
+    /**
+     * Returns the resource ID for the YouTube Music settings layout.
+     */
+    @Override
+    protected int getContentViewResourceId() {
+        return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
+    }
+
+    /**
+     * Returns the fixed background color for the toolbar.
+     */
+    @Override
+    protected int getToolbarBackgroundColor() {
+        return Utils.getResourceColor("ytm_color_black");
+    }
+
+    /**
+     * Returns the navigation icon with a color filter applied.
+     */
+    @Override
+    protected Drawable getNavigationIcon() {
+        Drawable navigationIcon = MusicPreferenceFragment.getBackButtonDrawable();
+        navigationIcon.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
+        return navigationIcon;
+    }
+
+    /**
+     * Returns the click listener that finishes the activity when the navigation icon is clicked.
+     */
+    @Override
+    protected View.OnClickListener getNavigationClickListener(Activity activity) {
+        return view -> {
+            if (searchViewController != null && searchViewController.isSearchActive()) {
+                searchViewController.closeSearch();
+            } else {
+                activity.finish();
+            }
+        };
+    }
+
+    /**
+     * Adds search view components to the toolbar for {@link MusicPreferenceFragment}.
+     *
+     * @param activity The activity hosting the toolbar.
+     * @param toolbar  The configured toolbar.
+     * @param fragment The PreferenceFragment associated with the activity.
+     */
+    @Override
+    protected void onPostToolbarSetup(Activity activity, Toolbar toolbar, PreferenceFragment fragment) {
+        if (fragment instanceof MusicPreferenceFragment) {
+            searchViewController = MusicSearchViewController.addSearchViewComponents(
+                    activity, toolbar, (MusicPreferenceFragment) fragment);
+        }
+    }
+
+    /**
+     * Creates a new {@link MusicPreferenceFragment} for the activity.
+     */
+    @Override
+    protected PreferenceFragment createPreferenceFragment() {
+        return new MusicPreferenceFragment();
+    }
+
+    /**
+     * Injection point.
+     * <p>
+     * Overrides {@link Activity#finish()} of the injection Activity.
+     *
+     * @return if the original activity finish method should be allowed to run.
+     */
+    @SuppressWarnings("unused")
+    public static boolean handleFinish() {
+        return MusicSearchViewController.handleFinish(searchViewController);
+    }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
index 832118829..4feb13d9c 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
@@ -2,7 +2,6 @@ package app.revanced.extension.music.settings;
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
-
 import static app.revanced.extension.shared.settings.Setting.parent;
 
 import app.revanced.extension.shared.settings.BaseSettings;
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java
new file mode 100644
index 000000000..1ebae16df
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java
@@ -0,0 +1,80 @@
+package app.revanced.extension.music.settings.preference;
+
+import android.app.Dialog;
+import android.preference.PreferenceScreen;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.MusicActivityHook;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+
+/**
+ * Preference fragment for ReVanced settings.
+ */
+@SuppressWarnings("deprecation")
+public class MusicPreferenceFragment extends ToolbarPreferenceFragment {
+    /**
+     * The main PreferenceScreen used to display the current set of preferences.
+     */
+    private PreferenceScreen preferenceScreen;
+
+    /**
+     * Initializes the preference fragment.
+     */
+    @Override
+    protected void initialize() {
+        super.initialize();
+
+        try {
+            preferenceScreen = getPreferenceScreen();
+            Utils.sortPreferenceGroups(preferenceScreen);
+            setPreferenceScreenToolbar(preferenceScreen);
+        } catch (Exception ex) {
+            Logger.printException(() -> "initialize failure", ex);
+        }
+    }
+
+    /**
+     * Called when the fragment starts.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+        try {
+            // Initialize search controller if needed
+            if (MusicActivityHook.searchViewController != null) {
+                // Trigger search data collection after fragment is ready.
+                MusicActivityHook.searchViewController.initializeSearchData();
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onStart failure", ex);
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
+    @Override
+    protected void customizeToolbar(Toolbar toolbar) {
+        MusicActivityHook.setToolbarLayoutParams(toolbar);
+    }
+
+    /**
+     * Perform actions after toolbar setup.
+     */
+    @Override
+    protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {
+        if (MusicActivityHook.searchViewController != null
+                && MusicActivityHook.searchViewController.isSearchActive()) {
+            toolbar.post(() -> MusicActivityHook.searchViewController.closeSearch());
+        }
+    }
+
+    /**
+     * Returns the preference screen for external access by SearchViewController.
+     */
+    public PreferenceScreen getPreferenceScreenForSearch() {
+        return preferenceScreen;
+    }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
deleted file mode 100644
index 67ca69ba4..000000000
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package app.revanced.extension.music.settings.preference;
-
-import android.widget.Toolbar;
-
-import app.revanced.extension.music.settings.GoogleApiActivityHook;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
-
-/**
- * Preference fragment for ReVanced settings.
- */
-@SuppressWarnings({"deprecation", "NewApi"})
-public class ReVancedPreferenceFragment extends ToolbarPreferenceFragment {
-
-    /**
-     * Initializes the preference fragment.
-     */
-    @Override
-    protected void initialize() {
-        super.initialize();
-
-        try {
-            Utils.sortPreferenceGroups(getPreferenceScreen());
-            setPreferenceScreenToolbar(getPreferenceScreen());
-        } catch (Exception ex) {
-            Logger.printException(() -> "initialize failure", ex);
-        }
-    }
-
-    /**
-     * Sets toolbar for all nested preference screens.
-     */
-    @Override
-    protected void customizeToolbar(Toolbar toolbar) {
-        GoogleApiActivityHook.setToolbarLayoutParams(toolbar);
-    }
-}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java
new file mode 100644
index 000000000..65ccd4ea1
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java
@@ -0,0 +1,28 @@
+package app.revanced.extension.music.settings.search;
+
+import android.content.Context;
+import android.preference.PreferenceScreen;
+
+import app.revanced.extension.shared.settings.search.BaseSearchResultsAdapter;
+import app.revanced.extension.shared.settings.search.BaseSearchViewController;
+import app.revanced.extension.shared.settings.search.BaseSearchResultItem;
+
+import java.util.List;
+
+/**
+ * Music-specific search results adapter.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchResultsAdapter extends BaseSearchResultsAdapter {
+
+    public MusicSearchResultsAdapter(Context context, List<BaseSearchResultItem> items,
+                                     BaseSearchViewController.BasePreferenceFragment fragment,
+                                     BaseSearchViewController searchViewController) {
+        super(context, items, fragment, searchViewController);
+    }
+
+    @Override
+    protected PreferenceScreen getMainPreferenceScreen() {
+        return fragment.getPreferenceScreenForSearch();
+    }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java
new file mode 100644
index 000000000..6681a2f02
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java
@@ -0,0 +1,71 @@
+package app.revanced.extension.music.settings.search;
+
+import android.app.Activity;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.shared.settings.search.*;
+
+/**
+ * Music-specific search view controller implementation.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchViewController extends BaseSearchViewController {
+
+    public static MusicSearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar,
+                                                                    MusicPreferenceFragment fragment) {
+        return new MusicSearchViewController(activity, toolbar, fragment);
+    }
+
+    private MusicSearchViewController(Activity activity, Toolbar toolbar, MusicPreferenceFragment fragment) {
+        super(activity, toolbar, new PreferenceFragmentAdapter(fragment));
+    }
+
+    @Override
+    protected BaseSearchResultsAdapter createSearchResultsAdapter() {
+        return new MusicSearchResultsAdapter(activity, filteredSearchItems, fragment, this);
+    }
+
+    @Override
+    protected boolean isSpecialPreferenceGroup(Preference preference) {
+        // Music doesn't have SponsorBlock, so no special groups.
+        return false;
+    }
+
+    @Override
+    protected void setupSpecialPreferenceListeners(BaseSearchResultItem item) {
+        // Music doesn't have special preferences.
+        // This method can be empty or handle music-specific preferences if any.
+    }
+
+    // Static method for handling Activity finish
+    public static boolean handleFinish(MusicSearchViewController searchViewController) {
+        if (searchViewController != null && searchViewController.isSearchActive()) {
+            searchViewController.closeSearch();
+            return true;
+        }
+        return false;
+    }
+
+    // Adapter to wrap MusicPreferenceFragment to BasePreferenceFragment interface.
+    private record PreferenceFragmentAdapter(MusicPreferenceFragment fragment) implements BasePreferenceFragment {
+
+        @Override
+        public PreferenceScreen getPreferenceScreenForSearch() {
+            return fragment.getPreferenceScreenForSearch();
+        }
+
+        @Override
+        public View getView() {
+            return fragment.getView();
+        }
+
+        @Override
+        public Activity getActivity() {
+            return fragment.getActivity();
+        }
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
index 3f9f0af11..978ee7131 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
@@ -27,6 +27,7 @@ import java.util.Locale;
 
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("unused")
 public class GmsCoreSupport {
@@ -80,17 +81,17 @@ public class GmsCoreSupport {
         // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
         Utils.runOnMainThreadDelayed(() -> {
             // Create the custom dialog.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     str("gms_core_dialog_title"), // Title.
-                    str(dialogMessageRef),        // Message.
-                    null,                         // No EditText.
-                    str(positiveButtonTextRef),   // OK button text.
+                    str(dialogMessageRef), // Message.
+                    null, // No EditText.
+                    str(positiveButtonTextRef), // OK button text.
                     () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
-                    null,                         // No Cancel button action.
-                    null,                         // No Neutral button text.
-                    null,                         // No Neutral button action.
-                    true                          // Dismiss dialog when onNeutralClick.
+                    null, // No Cancel button action.
+                    null, // No Neutral button text.
+                    null, // No Neutral button action.
+                    true // Dismiss dialog when onNeutralClick.
             );
 
             Dialog dialog = dialogPair.first;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
index 6fbdc233a..0f976ea10 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -12,9 +14,6 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,9 +22,6 @@ import android.os.Looper;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
 import android.util.DisplayMetrics;
 import android.util.Pair;
 import android.util.TypedValue;
@@ -37,13 +33,9 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
@@ -69,6 +61,7 @@ import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
 
+@SuppressWarnings("NewApi")
 public class Utils {
 
     @SuppressLint("StaticFieldLeak")
@@ -278,41 +271,63 @@ public class Utils {
      * @return zero, if the resource is not found.
      */
     @SuppressLint("DiscouragedApi")
-    public static int getResourceIdentifier(Context context, String resourceIdentifierName, String type) {
+    public static int getResourceIdentifier(Context context, String resourceIdentifierName, @Nullable String type) {
         return context.getResources().getIdentifier(resourceIdentifierName, type, context.getPackageName());
     }
 
+    public static int getResourceIdentifierOrThrow(Context context, String resourceIdentifierName, @Nullable String type) {
+        final int resourceId = getResourceIdentifier(context, resourceIdentifierName, type);
+        if (resourceId == 0) {
+            throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+                    + " type: " + type);
+        }
+        return resourceId;
+    }
+
     /**
      * @return zero, if the resource is not found.
+     * @see #getResourceIdentifierOrThrow(String, String)
      */
-    public static int getResourceIdentifier(String resourceIdentifierName, String type) {
+    public static int getResourceIdentifier(String resourceIdentifierName, @Nullable String type) {
         return getResourceIdentifier(getContext(), resourceIdentifierName, type);
     }
 
+    /**
+     * @return The resource identifier, or throws an exception if not found.
+     */
+    public static int getResourceIdentifierOrThrow(String resourceIdentifierName, @Nullable String type) {
+        final int resourceId = getResourceIdentifier(getContext(), resourceIdentifierName, type);
+        if (resourceId == 0) {
+            throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+                    + " type: " + type);
+        }
+        return resourceId;
+    }
+
     public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getInteger(getResourceIdentifier(resourceIdentifierName, "integer"));
+        return getContext().getResources().getInteger(getResourceIdentifierOrThrow(resourceIdentifierName, "integer"));
     }
 
     public static Animation getResourceAnimation(String resourceIdentifierName) throws Resources.NotFoundException {
-        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifier(resourceIdentifierName, "anim"));
+        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(resourceIdentifierName, "anim"));
     }
 
     @ColorInt
     public static int getResourceColor(String resourceIdentifierName) throws Resources.NotFoundException {
         //noinspection deprecation
-        return getContext().getResources().getColor(getResourceIdentifier(resourceIdentifierName, "color"));
+        return getContext().getResources().getColor(getResourceIdentifierOrThrow(resourceIdentifierName, "color"));
     }
 
     public static int getResourceDimensionPixelSize(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimensionPixelSize(getResourceIdentifier(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
     }
 
     public static float getResourceDimension(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimension(getResourceIdentifier(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimension(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
     }
 
     public static String[] getResourceStringArray(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getStringArray(getResourceIdentifier(resourceIdentifierName, "array"));
+        return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(resourceIdentifierName, "array"));
     }
 
     public interface MatchFilter<T> {
@@ -323,13 +338,9 @@ public class Utils {
      * Includes sub children.
      */
     public static <R extends View> R getChildViewByResourceName(View view, String str) {
-        var child = view.findViewById(Utils.getResourceIdentifier(str, "id"));
-        if (child != null) {
-            //noinspection unchecked
-            return (R) child;
-        }
-
-        throw new IllegalArgumentException("View with resource name not found: " + str);
+        var child = view.findViewById(Utils.getResourceIdentifierOrThrow(str, "id"));
+        //noinspection unchecked
+        return (R) child;
     }
 
     /**
@@ -415,9 +426,9 @@ public class Utils {
     }
 
     public static void setClipboard(CharSequence text) {
-        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context
+        ClipboardManager clipboard = (ClipboardManager) context
                 .getSystemService(Context.CLIPBOARD_SERVICE);
-        android.content.ClipData clip = android.content.ClipData.newPlainText("ReVanced", text);
+        ClipData clip = ClipData.newPlainText("ReVanced", text);
         clipboard.setPrimaryClip(clip);
     }
 
@@ -747,396 +758,32 @@ public class Utils {
     }
 
     /**
-     * Creates a custom dialog with a styled layout, including a title, message, buttons, and an
-     * optional EditText. The dialog's appearance adapts to the app's dark mode setting, with
-     * rounded corners and customizable button actions. Buttons adjust dynamically to their text
-     * content and are arranged in a single row if they fit within 80% of the screen width,
-     * with the Neutral button aligned to the left and OK/Cancel buttons centered on the right.
-     * If buttons do not fit, each is placed on a separate row, all aligned to the right.
+     * Configures the parameters of a dialog window, including its width, gravity, vertical offset and background dimming.
+     * The width is calculated as a percentage of the screen's portrait width and the vertical offset is specified in DIP.
+     * The default dialog background is removed to allow for custom styling.
      *
-     * @param context           Context used to create the dialog.
-     * @param title             Title text of the dialog.
-     * @param message           Message text of the dialog (supports Spanned for HTML), or null if replaced by EditText.
-     * @param editText          EditText to include in the dialog, or null if no EditText is needed.
-     * @param okButtonText      OK button text, or null to use the default "OK" string.
-     * @param onOkClick         Action to perform when the OK button is clicked.
-     * @param onCancelClick     Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
-     * @param neutralButtonText Neutral button text, or null if no Neutral button is needed.
-     * @param onNeutralClick    Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
-     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
-     * @return The Dialog and its main LinearLayout container.
+     * @param window The {@link Window} object to configure.
+     * @param gravity The gravity for positioning the dialog (e.g., {@link Gravity#BOTTOM}).
+     * @param yOffsetDip The vertical offset from the gravity position in DIP.
+     * @param widthPercentage The width of the dialog as a percentage of the screen's portrait width (0-100).
+     * @param dimAmount If true, sets the background dim amount to 0 (no dimming); if false, leaves the default dim amount.
      */
-    @SuppressWarnings("ExtractMethodRecommender")
-    public static Pair<Dialog, LinearLayout> createCustomDialog(
-            Context context, String title, CharSequence message, @Nullable EditText editText,
-            String okButtonText, Runnable onOkClick, Runnable onCancelClick,
-            @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
-            boolean dismissDialogOnNeutralClick
-    ) {
-        Logger.printDebug(() -> "Creating custom dialog with title: " + title);
-
-        Dialog dialog = new Dialog(context);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
-
-        // Preset size constants.
-        final int dip4 = dipToPixels(4);
-        final int dip8 = dipToPixels(8);
-        final int dip16 = dipToPixels(16);
-        final int dip24 = dipToPixels(24);
-
-        // Create main layout.
-        LinearLayout mainLayout = new LinearLayout(context);
-        mainLayout.setOrientation(LinearLayout.VERTICAL);
-        mainLayout.setPadding(dip24, dip16, dip24, dip24);
-        // Set rounded rectangle background.
-        ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
-                createCornerRadii(28), null, null));
-        mainBackground.getPaint().setColor(getDialogBackgroundColor()); // Dialog background.
-        mainLayout.setBackground(mainBackground);
-
-        // Title.
-        if (!TextUtils.isEmpty(title)) {
-            TextView titleView = new TextView(context);
-            titleView.setText(title);
-            titleView.setTypeface(Typeface.DEFAULT_BOLD);
-            titleView.setTextSize(18);
-            titleView.setTextColor(getAppForegroundColor());
-            titleView.setGravity(Gravity.CENTER);
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            );
-            layoutParams.setMargins(0, 0, 0, dip16);
-            titleView.setLayoutParams(layoutParams);
-            mainLayout.addView(titleView);
-        }
-
-        // Create content container (message/EditText) inside a ScrollView only if message or editText is provided.
-        ScrollView contentScrollView = null;
-        LinearLayout contentContainer;
-        if (message != null || editText != null) {
-            contentScrollView = new ScrollView(context);
-            contentScrollView.setVerticalScrollBarEnabled(false); // Disable the vertical scrollbar.
-            contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
-            if (editText != null) {
-                ShapeDrawable scrollViewBackground = new ShapeDrawable(new RoundRectShape(
-                        createCornerRadii(10), null, null));
-                scrollViewBackground.getPaint().setColor(getEditTextBackground());
-                contentScrollView.setPadding(dip8, dip8, dip8, dip8);
-                contentScrollView.setBackground(scrollViewBackground);
-                contentScrollView.setClipToOutline(true);
-            }
-            LinearLayout.LayoutParams contentParams = new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1.0f // Weight to take available space.
-            );
-            contentScrollView.setLayoutParams(contentParams);
-            contentContainer = new LinearLayout(context);
-            contentContainer.setOrientation(LinearLayout.VERTICAL);
-            contentScrollView.addView(contentContainer);
-
-            // Message (if not replaced by EditText).
-            if (editText == null) {
-                TextView messageView = new TextView(context);
-                messageView.setText(message); // Supports Spanned (HTML).
-                messageView.setTextSize(16);
-                messageView.setTextColor(getAppForegroundColor());
-                // Enable HTML link clicking if the message contains links.
-                if (message instanceof Spanned) {
-                    messageView.setMovementMethod(LinkMovementMethod.getInstance());
-                }
-                LinearLayout.LayoutParams messageParams = new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                );
-                messageView.setLayoutParams(messageParams);
-                contentContainer.addView(messageView);
-            }
-
-            // EditText (if provided).
-            if (editText != null) {
-                // Remove EditText from its current parent, if any.
-                ViewGroup parent = (ViewGroup) editText.getParent();
-                if (parent != null) {
-                    parent.removeView(editText);
-                }
-                // Style the EditText to match the dialog theme.
-                editText.setTextColor(getAppForegroundColor());
-                editText.setBackgroundColor(Color.TRANSPARENT);
-                editText.setPadding(0, 0, 0, 0);
-                LinearLayout.LayoutParams editTextParams = new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT
-                );
-                contentContainer.addView(editText, editTextParams);
-            }
-        }
-
-        // Button container.
-        LinearLayout buttonContainer = new LinearLayout(context);
-        buttonContainer.setOrientation(LinearLayout.VERTICAL);
-        buttonContainer.removeAllViews();
-        LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        buttonContainerParams.setMargins(0, dip16, 0, 0);
-        buttonContainer.setLayoutParams(buttonContainerParams);
-
-        // Lists to track buttons.
-        List<Button> buttons = new ArrayList<>();
-        List<Integer> buttonWidths = new ArrayList<>();
-
-        // Create buttons in order: Neutral, Cancel, OK.
-        if (neutralButtonText != null && onNeutralClick != null) {
-            Button neutralButton = addButton(
-                    context,
-                    neutralButtonText,
-                    onNeutralClick,
-                    false,
-                    dismissDialogOnNeutralClick,
-                    dialog
-            );
-            buttons.add(neutralButton);
-            neutralButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(neutralButton.getMeasuredWidth());
-        }
-
-        if (onCancelClick != null) {
-            Button cancelButton = addButton(
-                    context,
-                    context.getString(android.R.string.cancel),
-                    onCancelClick,
-                    false,
-                    true,
-                    dialog
-            );
-            buttons.add(cancelButton);
-            cancelButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(cancelButton.getMeasuredWidth());
-        }
-
-        if (onOkClick != null) {
-            Button okButton = addButton(
-                    context,
-                    okButtonText != null ? okButtonText : context.getString(android.R.string.ok),
-                    onOkClick,
-                    true,
-                    true,
-                    dialog
-            );
-            buttons.add(okButton);
-            okButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(okButton.getMeasuredWidth());
-        }
-
-        // Handle button layout.
-        int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
-        int totalWidth = 0;
-        for (Integer width : buttonWidths) {
-            totalWidth += width;
-        }
-        if (buttonWidths.size() > 1) {
-            totalWidth += (buttonWidths.size() - 1) * dip8; // Add margins for gaps.
-        }
-
-        if (buttons.size() == 1) {
-            // Single button: stretch to full width.
-            Button singleButton = buttons.get(0);
-            LinearLayout singleContainer = new LinearLayout(context);
-            singleContainer.setOrientation(LinearLayout.HORIZONTAL);
-            singleContainer.setGravity(Gravity.CENTER);
-            ViewGroup parent = (ViewGroup) singleButton.getParent();
-            if (parent != null) {
-                parent.removeView(singleButton);
-            }
-            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    dipToPixels(36)
-            );
-            params.setMargins(0, 0, 0, 0);
-            singleButton.setLayoutParams(params);
-            singleContainer.addView(singleButton);
-            buttonContainer.addView(singleContainer);
-        } else if (buttons.size() > 1) {
-            // Check if buttons fit in one row.
-            if (totalWidth <= screenWidth * 0.8) {
-                // Single row: Neutral, Cancel, OK.
-                LinearLayout rowContainer = new LinearLayout(context);
-                rowContainer.setOrientation(LinearLayout.HORIZONTAL);
-                rowContainer.setGravity(Gravity.CENTER);
-                rowContainer.setLayoutParams(new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT
-                ));
-
-                // Add all buttons with proportional weights and specific margins.
-                for (int i = 0; i < buttons.size(); i++) {
-                    Button button = buttons.get(i);
-                    ViewGroup parent = (ViewGroup) button.getParent();
-                    if (parent != null) {
-                        parent.removeView(button);
-                    }
-                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                            0,
-                            dipToPixels(36),
-                            buttonWidths.get(i) // Use measured width as weight.
-                    );
-                    // Set margins based on button type and combination.
-                    if (buttons.size() == 2) {
-                        // Neutral + OK or Cancel + OK.
-                        if (i == 0) { // Neutral or Cancel.
-                            params.setMargins(0, 0, dip4, 0);
-                        } else { // OK
-                            params.setMargins(dip4, 0, 0, 0);
-                        }
-                    } else if (buttons.size() == 3) {
-                        if (i == 0) { // Neutral.
-                            params.setMargins(0, 0, dip4, 0);
-                        } else if (i == 1) { // Cancel
-                            params.setMargins(dip4, 0, dip4, 0);
-                        } else { // OK
-                            params.setMargins(dip4, 0, 0, 0);
-                        }
-                    }
-                    button.setLayoutParams(params);
-                    rowContainer.addView(button);
-                }
-                buttonContainer.addView(rowContainer);
-            } else {
-                // Multiple rows: OK, Cancel, Neutral.
-                List<Button> reorderedButtons = new ArrayList<>();
-                // Reorder: OK, Cancel, Neutral.
-                if (onOkClick != null) {
-                    reorderedButtons.add(buttons.get(buttons.size() - 1));
-                }
-                if (onCancelClick != null) {
-                    reorderedButtons.add(buttons.get((neutralButtonText != null && onNeutralClick != null) ? 1 : 0));
-                }
-                if (neutralButtonText != null && onNeutralClick != null) {
-                    reorderedButtons.add(buttons.get(0));
-                }
-
-                // Add each button in its own row with spacers.
-                for (int i = 0; i < reorderedButtons.size(); i++) {
-                    Button button = reorderedButtons.get(i);
-                    LinearLayout singleContainer = new LinearLayout(context);
-                    singleContainer.setOrientation(LinearLayout.HORIZONTAL);
-                    singleContainer.setGravity(Gravity.CENTER);
-                    singleContainer.setLayoutParams(new LinearLayout.LayoutParams(
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            dipToPixels(36)
-                    ));
-                    ViewGroup parent = (ViewGroup) button.getParent();
-                    if (parent != null) {
-                        parent.removeView(button);
-                    }
-                    LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            dipToPixels(36)
-                    );
-                    buttonParams.setMargins(0, 0, 0, 0);
-                    button.setLayoutParams(buttonParams);
-                    singleContainer.addView(button);
-                    buttonContainer.addView(singleContainer);
-
-                    // Add a spacer between the buttons (except the last one).
-                    // Adding a margin between buttons is not suitable, as it conflicts with the single row layout.
-                    if (i < reorderedButtons.size() - 1) {
-                        View spacer = new View(context);
-                        LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
-                                LinearLayout.LayoutParams.MATCH_PARENT,
-                                dipToPixels(8)
-                        );
-                        spacer.setLayoutParams(spacerParams);
-                        buttonContainer.addView(spacer);
-                    }
-                }
-            }
-        }
-
-        // Add ScrollView to main layout only if content exist.
-        if (contentScrollView != null) {
-            mainLayout.addView(contentScrollView);
-        }
-        mainLayout.addView(buttonContainer);
-        dialog.setContentView(mainLayout);
-
-        // Set dialog window attributes.
-        Window window = dialog.getWindow();
-        if (window != null) {
-            setDialogWindowParameters(window);
-        }
-
-        return new Pair<>(dialog, mainLayout);
-    }
-
-    public static void setDialogWindowParameters(Window window) {
+    public static void setDialogWindowParameters(Window window, int gravity, int yOffsetDip, int widthPercentage, boolean dimAmount) {
         WindowManager.LayoutParams params = window.getAttributes();
 
         DisplayMetrics displayMetrics = Resources.getSystem().getDisplayMetrics();
-        int portraitWidth = (int) (displayMetrics.widthPixels * 0.9);
+        int portraitWidth = Math.min(displayMetrics.widthPixels, displayMetrics.heightPixels);
 
-        if (Resources.getSystem().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            portraitWidth = (int) Math.min(portraitWidth, displayMetrics.heightPixels * 0.9);
-        }
-        params.width = portraitWidth;
+        params.width = (int) (portraitWidth * (widthPercentage / 100.0f)); // Set width based on parameters.
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.CENTER;
-        window.setAttributes(params);
-        window.setBackgroundDrawable(null); // Remove default dialog background.
-    }
+        params.gravity = gravity;
+        params.y = yOffsetDip > 0 ? dipToPixels(yOffsetDip) : 0;
+        if (dimAmount) {
+            params.dimAmount = 0f;
+        }
 
-    /**
-     * Adds a styled button to a dialog's button container with customizable text, click behavior, and appearance.
-     * The button's background and text colors adapt to the app's dark mode setting. Buttons stretch to full width
-     * when on separate rows or proportionally based on content when in a single row (Neutral, Cancel, OK order).
-     * When wrapped to separate rows, buttons are ordered OK, Cancel, Neutral.
-     *
-     * @param context         Context to create the button and access resources.
-     * @param buttonText      Button text to display.
-     * @param onClick         Action to perform when the button is clicked, or null if no action is required.
-     * @param isOkButton      If this is the OK button, which uses distinct background and text colors.
-     * @param dismissDialog   If the dialog should be dismissed when the button is clicked.
-     * @param dialog          The Dialog to dismiss when the button is clicked.
-     * @return The created Button.
-     */
-    private static Button addButton(Context context, String buttonText, Runnable onClick,
-                                    boolean isOkButton, boolean dismissDialog, Dialog dialog) {
-        Button button = new Button(context, null, 0);
-        button.setText(buttonText);
-        button.setTextSize(14);
-        button.setAllCaps(false);
-        button.setSingleLine(true);
-        button.setEllipsize(android.text.TextUtils.TruncateAt.END);
-        button.setGravity(Gravity.CENTER);
-
-        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(createCornerRadii(20), null, null));
-        int backgroundColor = isOkButton
-                ? getOkButtonBackgroundColor() // Background color for OK button (inversion).
-                : getCancelOrNeutralButtonBackgroundColor(); // Background color for Cancel or Neutral buttons.
-        background.getPaint().setColor(backgroundColor);
-        button.setBackground(background);
-
-        button.setTextColor(isDarkModeEnabled()
-                ? (isOkButton ? Color.BLACK : Color.WHITE)
-                : (isOkButton ? Color.WHITE : Color.BLACK));
-
-        // Set internal padding.
-        final int dip16 = dipToPixels(16);
-        button.setPadding(dip16, 0, dip16, 0);
-
-        button.setOnClickListener(v -> {
-            if (onClick != null) {
-                onClick.run();
-            }
-            if (dismissDialog) {
-                dialog.dismiss();
-            }
-        });
-
-        return button;
+        window.setAttributes(params); // Apply window attributes.
+        window.setBackgroundDrawable(null); // Remove default dialog background
     }
 
     /**
@@ -1323,9 +970,9 @@ public class Utils {
 
     /**
      * Sort a PreferenceGroup and all it's sub groups by title or key.
-     *
+     * <p>
      * Sort order is determined by the preferences key {@link Sort} suffix.
-     *
+     * <p>
      * If a preference has no key or no {@link Sort} suffix,
      * then the preferences are left unsorted.
      */
@@ -1388,7 +1035,7 @@ public class Utils {
      * Set all preferences to multiline titles if the device is not using an English variant.
      * The English strings are heavily scrutinized and all titles fit on screen
      * except 2 or 3 preference strings and those do not affect readability.
-     *
+     * <p>
      * Allowing multiline for those 2 or 3 English preferences looks weird and out of place,
      * and visually it looks better to clip the text and keep all titles 1 line.
      */
@@ -1497,9 +1144,9 @@ public class Utils {
             blue = Math.round(blue + (255 - blue) * t);
         } else {
             // Darken or no change: Scale toward black.
-            red *= factor;
-            green *= factor;
-            blue *= factor;
+            red = Math.round(red * factor);
+            green = Math.round(green * factor);
+            blue = Math.round(blue * factor);
         }
 
         // Ensure values are within [0, 255].
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
index 7c0c09a0f..ccb7c9262 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
@@ -3,7 +3,6 @@ package app.revanced.extension.shared.checks;
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.DialogFragmentOnStartAction;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -26,6 +25,7 @@ import java.util.Collection;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 abstract class Check {
     private static final int NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING = 2;
@@ -93,7 +93,7 @@ abstract class Check {
 
         Utils.runOnMainThreadDelayed(() -> {
             // Create the custom dialog.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     activity,
                     str("revanced_check_environment_failed_title"), // Title.
                     message, // Message.
@@ -127,7 +127,8 @@ abstract class Check {
 
             // Add icon to the dialog.
             ImageView iconView = new ImageView(activity);
-            iconView.setImageResource(Utils.getResourceIdentifier("revanced_ic_dialog_alert", "drawable"));
+            iconView.setImageResource(Utils.getResourceIdentifierOrThrow(
+                    "revanced_ic_dialog_alert", "drawable"));
             iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
             iconView.setPadding(0, 0, 0, 0);
             LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(
@@ -158,8 +159,8 @@ abstract class Check {
                     Button ignoreButton;
 
                     // Check if buttons are in a single-row layout (buttonContainer has one child: rowContainer).
-                    if (buttonContainer.getChildCount() == 1 && buttonContainer.getChildAt(0) instanceof LinearLayout) {
-                        LinearLayout rowContainer = (LinearLayout) buttonContainer.getChildAt(0);
+                    if (buttonContainer.getChildCount() == 1
+                            && buttonContainer.getChildAt(0) instanceof LinearLayout rowContainer) {
                         // Neutral button is the first child (index 0).
                         ignoreButton = (Button) rowContainer.getChildAt(0);
                         // OK button is the last child.
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
index a24897ca5..062949db7 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
@@ -1,7 +1,10 @@
 package app.revanced.extension.shared.settings;
 
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceFragment;
 import android.util.TypedValue;
@@ -21,6 +24,15 @@ import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragme
 @SuppressWarnings({"deprecation", "NewApi"})
 public abstract class BaseActivityHook extends Activity {
 
+    private static final int ID_REVANCED_SETTINGS_FRAGMENTS =
+            getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+    private static final int ID_REVANCED_TOOLBAR_PARENT =
+            getResourceIdentifierOrThrow("revanced_toolbar_parent", "id");
+    public static final int LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR =
+            getResourceIdentifierOrThrow("revanced_settings_with_toolbar", "layout");
+    private static final int STRING_REVANCED_SETTINGS_TITLE =
+            getResourceIdentifierOrThrow("revanced_settings_title", "string");
+
     /**
      * Layout parameters for the toolbar, extracted from the dummy toolbar.
      */
@@ -55,13 +67,27 @@ public abstract class BaseActivityHook extends Activity {
 
             activity.getFragmentManager()
                     .beginTransaction()
-                    .replace(Utils.getResourceIdentifier("revanced_settings_fragments", "id"), fragment)
+                    .replace(ID_REVANCED_SETTINGS_FRAGMENTS, fragment)
                     .commit();
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);
         }
     }
 
+    /**
+     * Injection point.
+     * Overrides the ReVanced settings language.
+     */
+    @SuppressWarnings("unused")
+    public static Context getAttachBaseContext(Context original) {
+        AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
+        if (language == AppLanguage.DEFAULT) {
+            return original;
+        }
+
+        return Utils.getContext();
+    }
+
     /**
      * Creates and configures a toolbar for the activity, replacing a dummy placeholder.
      */
@@ -69,8 +95,7 @@ public abstract class BaseActivityHook extends Activity {
     protected void createToolbar(Activity activity, PreferenceFragment fragment) {
         // Replace dummy placeholder toolbar.
         // This is required to fix submenu title alignment issue with Android ASOP 15+
-        ViewGroup toolBarParent = activity.findViewById(
-                Utils.getResourceIdentifier("revanced_toolbar_parent", "id"));
+        ViewGroup toolBarParent = activity.findViewById(ID_REVANCED_TOOLBAR_PARENT);
         ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent, "revanced_toolbar");
         toolbarLayoutParams = dummyToolbar.getLayoutParams();
         toolBarParent.removeView(dummyToolbar);
@@ -82,7 +107,7 @@ public abstract class BaseActivityHook extends Activity {
         toolbar.setBackgroundColor(getToolbarBackgroundColor());
         toolbar.setNavigationIcon(getNavigationIcon());
         toolbar.setNavigationOnClickListener(getNavigationClickListener(activity));
-        toolbar.setTitle(Utils.getResourceIdentifier("revanced_settings_title", "string"));
+        toolbar.setTitle(STRING_REVANCED_SETTINGS_TITLE);
 
         final int margin = Utils.dipToPixels(16);
         toolbar.setTitleMarginStart(margin);
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
index be4b58227..0dd948aa8 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
@@ -25,6 +25,9 @@ public class BaseSettings {
      */
     public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
 
+    public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
+    public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "");
+
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
     public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
index bbb590558..1f24a7489 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
@@ -1,18 +1,27 @@
 package app.revanced.extension.shared.settings;
 
+import static app.revanced.extension.shared.StringRef.str;
+
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.*;
-
-import static app.revanced.extension.shared.StringRef.str;
 
 public abstract class Setting<T> {
 
@@ -23,24 +32,49 @@ public abstract class Setting<T> {
      */
     public interface Availability {
         boolean isAvailable();
+
+        /**
+         * @return parent settings (dependencies) of this availability.
+         */
+        default List<Setting<?>> getParentSettings() {
+            return Collections.emptyList();
+        }
     }
 
     /**
      * Availability based on a single parent setting being enabled.
      */
     public static Availability parent(BooleanSetting parent) {
-        return parent::get;
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                return parent.get();
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.singletonList(parent);
+            }
+        };
     }
 
     /**
      * Availability based on all parents being enabled.
      */
     public static Availability parentsAll(BooleanSetting... parents) {
-        return () -> {
-            for (BooleanSetting parent : parents) {
-                if (!parent.get()) return false;
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                for (BooleanSetting parent : parents) {
+                    if (!parent.get()) return false;
+                }
+                return true;
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.unmodifiableList(Arrays.asList(parents));
             }
-            return true;
         };
     }
 
@@ -48,11 +82,19 @@ public abstract class Setting<T> {
      * Availability based on any parent being enabled.
      */
     public static Availability parentsAny(BooleanSetting... parents) {
-        return () -> {
-            for (BooleanSetting parent : parents) {
-                if (parent.get()) return true;
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                for (BooleanSetting parent : parents) {
+                    if (parent.get()) return true;
+                }
+                return false;
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.unmodifiableList(Arrays.asList(parents));
             }
-            return false;
         };
     }
 
@@ -112,6 +154,7 @@ public abstract class Setting<T> {
      * @return All settings that have been created, sorted by keys.
      */
     private static List<Setting<?>> allLoadedSettingsSorted() {
+        //noinspection ComparatorCombinators
         Collections.sort(SETTINGS, (Setting<?> o1, Setting<?> o2) -> o1.key.compareTo(o2.key));
         return allLoadedSettings();
     }
@@ -207,9 +250,7 @@ public abstract class Setting<T> {
 
         SETTINGS.add(this);
         if (PATH_TO_SETTINGS.put(key, this) != null) {
-            // Debug setting may not be created yet so using Logger may cause an initialization crash.
-            // Show a toast instead.
-            Utils.showToastLong(this.getClass().getSimpleName()
+            Logger.printException(() -> this.getClass().getSimpleName()
                     + " error: Duplicate Setting key found: " + key);
         }
 
@@ -231,10 +272,10 @@ public abstract class Setting<T> {
 
     /**
      * Migrate an old Setting value previously stored in a different SharedPreference.
-     *
+     * <p>
      * This method will be deleted in the future.
      */
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({"rawtypes", "NewApi"})
     public static void migrateFromOldPreferences(SharedPrefCategory oldPrefs, Setting setting, String settingKey) {
         if (!oldPrefs.preferences.contains(settingKey)) {
             return; // Nothing to do.
@@ -254,7 +295,7 @@ public abstract class Setting<T> {
             migratedValue = oldPrefs.getString(settingKey, (String) newValue);
         } else {
             Logger.printException(() -> "Unknown setting: " + setting);
-            // Remove otherwise it'll show a toast on every launch
+            // Remove otherwise it'll show a toast on every launch.
             oldPrefs.preferences.edit().remove(settingKey).apply();
             return;
         }
@@ -273,7 +314,7 @@ public abstract class Setting<T> {
     /**
      * Sets, but does _not_ persistently save the value.
      * This method is only to be used by the Settings preference code.
-     *
+     * <p>
      * This intentionally is a static method to deter
      * accidental usage when {@link #save(Object)} was intended.
      */
@@ -349,6 +390,14 @@ public abstract class Setting<T> {
         return availability == null || availability.isAvailable();
     }
 
+    /**
+     * Get the parent Settings that this setting depends on.
+     * @return List of parent Settings (e.g., BooleanSetting or EnumSetting), or empty list if no dependencies exist.
+     */
+    public List<Setting<?>> getParentSettings() {
+        return availability == null ? Collections.emptyList() : availability.getParentSettings();
+    }
+
     /**
      * @return if the currently set value is the same as {@link #defaultValue}
      */
@@ -467,9 +516,12 @@ public abstract class Setting<T> {
                 callback.settingsImported(alertDialogContext);
             }
 
-            Utils.showToastLong(numberOfSettingsImported == 0
-                    ? str("revanced_settings_import_reset")
-                    : str("revanced_settings_import_success", numberOfSettingsImported));
+            // Use a delay, otherwise the toast can move about on screen from the dismissing dialog.
+            final int numberOfSettingsImportedFinal = numberOfSettingsImported;
+            Utils.runOnMainThreadDelayed(() -> Utils.showToastLong(numberOfSettingsImportedFinal == 0
+                            ? str("revanced_settings_import_reset")
+                            : str("revanced_settings_import_success", numberOfSettingsImportedFinal)),
+                    150);
 
             return rebootSettingChanged;
         } catch (JSONException | IllegalArgumentException ex) {
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
index dc592b488..1b778d338 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
@@ -27,6 +27,7 @@ import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("deprecation")
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
@@ -124,7 +125,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
         showingUserDialogMessage = true;
 
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 confirmDialogTitle, // Title.
                 Objects.requireNonNull(setting.userDialogMessage).toString(), // No message.
@@ -248,7 +249,8 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 Setting.privateSetValueFromString(setting, listPref.getValue());
             }
             updateListPreferenceSummary(listPref, setting);
-        } else {
+        } else if (!pref.getClass().equals(Preference.class)) {
+            // Ignore root preference class because there is no data to sync.
             Logger.printException(() -> "Setting cannot be handled: " + pref.getClass() + ": " + pref);
         }
     }
@@ -302,7 +304,8 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
             restartDialogButtonText = str("revanced_settings_restart");
         }
 
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(context,
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                context,
                 restartDialogTitle,              // Title.
                 restartDialogMessage,            // Message.
                 null,                            // No EditText.
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointPreference.java
new file mode 100644
index 000000000..204697228
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointPreference.java
@@ -0,0 +1,78 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.SpannedString;
+import android.text.TextUtils;
+import android.text.style.BulletSpan;
+import android.util.AttributeSet;
+
+/**
+ * Formats the summary text bullet points into Spanned text for better presentation.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class BulletPointPreference extends Preference {
+
+    public static SpannedString formatIntoBulletPoints(CharSequence source) {
+        SpannableStringBuilder builder = new SpannableStringBuilder(source);
+
+        int lineStart = 0;
+        int length = builder.length();
+
+        while (lineStart < length) {
+            int lineEnd = TextUtils.indexOf(builder, '\n', lineStart);
+            if (lineEnd < 0) lineEnd = length;
+
+            // Apply BulletSpan only if the line starts with the '•' character.
+            if (lineEnd > lineStart && builder.charAt(lineStart) == '•') {
+                int deleteEnd = lineStart + 1; // remove the bullet itself
+
+                // If there's a single space right after the bullet, remove that too.
+                if (deleteEnd < builder.length() && builder.charAt(deleteEnd) == ' ') {
+                    deleteEnd++;
+                }
+
+                builder.delete(lineStart, deleteEnd);
+
+                // Apply the BulletSpan to the remainder of that line.
+                builder.setSpan(new BulletSpan(20),
+                        lineStart,
+                        lineEnd - (deleteEnd - lineStart), // adjust for deleted chars.
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                );
+
+                // Update total length and lineEnd after deletion.
+                length = builder.length();
+                final int removed = deleteEnd - lineStart;
+                lineEnd -= removed;
+            }
+
+            lineStart = lineEnd + 1;
+        }
+
+        return new SpannedString(builder);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BulletPointPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        super.setSummary(formatIntoBulletPoints(summary));
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointSwitchPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointSwitchPreference.java
new file mode 100644
index 000000000..ccbbf1eef
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointSwitchPreference.java
@@ -0,0 +1,45 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.settings.preference.BulletPointPreference.formatIntoBulletPoints;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+/**
+ * Formats the summary text bullet points into Spanned text for better presentation.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class BulletPointSwitchPreference extends SwitchPreference {
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BulletPointSwitchPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        super.setSummary(formatIntoBulletPoints(summary));
+    }
+
+    @Override
+    public void setSummaryOn(CharSequence summaryOn) {
+        super.setSummaryOn(formatIntoBulletPoints(summaryOn));
+    }
+
+    @Override
+    public void setSummaryOff(CharSequence summaryOff) {
+        super.setSummaryOff(formatIntoBulletPoints(summaryOff));
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
index a70a66e72..63cf5eb0f 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
@@ -1,8 +1,8 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -13,20 +13,20 @@ import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.SpannableString;
-import android.text.Spanned;
 import android.text.TextWatcher;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.RelativeSizeSpan;
 import android.util.AttributeSet;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import android.widget.*;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -35,6 +35,8 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.StringSetting;
+import app.revanced.extension.shared.ui.ColorDot;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 /**
  * A custom preference for selecting a color via a hexadecimal code or a color picker dialog.
@@ -43,100 +45,98 @@ import app.revanced.extension.shared.settings.StringSetting;
  */
 @SuppressWarnings({"unused", "deprecation"})
 public class ColorPickerPreference extends EditTextPreference {
+    /** Length of a valid color string of format #RRGGBB (without alpha) or #AARRGGBB (with alpha). */
+    public static final int COLOR_STRING_LENGTH_WITHOUT_ALPHA = 7;
+    public static final int COLOR_STRING_LENGTH_WITH_ALPHA = 9;
 
-    /**
-     * Character to show the color appearance.
-     */
-    public static final String COLOR_DOT_STRING = "⬤";
-
-    /**
-     * Length of a valid color string of format #RRGGBB.
-     */
-    public static final int COLOR_STRING_LENGTH = 7;
-
-    /**
-     * Matches everything that is not a hex number/letter.
-     */
+    /** Matches everything that is not a hex number/letter. */
     private static final Pattern PATTERN_NOT_HEX = Pattern.compile("[^0-9A-Fa-f]");
 
-    /**
-     * Alpha for dimming when the preference is disabled.
-     */
-    private static final float DISABLED_ALPHA = 0.5f; // 50%
+    /** Alpha for dimming when the preference is disabled. */
+    public static final float DISABLED_ALPHA = 0.5f; // 50%
 
-    /**
-     * View displaying a colored dot in the widget area.
-     */
+    /** View displaying a colored dot in the widget area. */
     private View widgetColorDot;
 
-    /**
-     * Current color in RGB format (without alpha).
-     */
+    /** Dialog View displaying a colored dot for the selected color preview in the dialog. */
+    private View dialogColorDot;
+
+    /** Current color, including alpha channel if opacity slider is enabled. */
     @ColorInt
     private int currentColor;
 
-    /**
-     * Associated setting for storing the color value.
-     */
+    /** Associated setting for storing the color value. */
     private StringSetting colorSetting;
 
-    /**
-     * Dialog TextWatcher for the EditText to monitor color input changes.
-     */
+    /** Dialog TextWatcher for the EditText to monitor color input changes. */
     private TextWatcher colorTextWatcher;
 
-    /**
-     * Dialog TextView displaying a colored dot for the selected color preview in the dialog.
-     */
-    private TextView dialogColorPreview;
+    /** Dialog color picker view. */
+    protected ColorPickerView dialogColorPickerView;
 
-    /**
-     * Dialog color picker view.
-     */
-    private ColorPickerView dialogColorPickerView;
+    /** Listener for color changes. */
+    protected OnColorChangeListener colorChangeListener;
+
+    /** Whether the opacity slider is enabled. */
+    private boolean opacitySliderEnabled = false;
+
+    public static final int ID_REVANCED_COLOR_PICKER_VIEW =
+            getResourceIdentifierOrThrow("revanced_color_picker_view", "id");
+    public static final int ID_PREFERENCE_COLOR_DOT =
+            getResourceIdentifierOrThrow("preference_color_dot", "id");
+    public static final int LAYOUT_REVANCED_COLOR_DOT_WIDGET =
+            getResourceIdentifierOrThrow("revanced_color_dot_widget", "layout");
+    public static final int LAYOUT_REVANCED_COLOR_PICKER =
+            getResourceIdentifierOrThrow("revanced_color_picker", "layout");
 
     /**
      * Removes non valid hex characters, converts to all uppercase,
      * and adds # character to the start if not present.
      */
-    public static String cleanupColorCodeString(String colorString) {
-        // Remove non-hex chars, convert to uppercase, and ensure correct length
+    public static String cleanupColorCodeString(String colorString, boolean includeAlpha) {
         String result = "#" + PATTERN_NOT_HEX.matcher(colorString)
                 .replaceAll("").toUpperCase(Locale.ROOT);
 
-        if (result.length() < COLOR_STRING_LENGTH) {
+        int maxLength = includeAlpha ? COLOR_STRING_LENGTH_WITH_ALPHA : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+        if (result.length() < maxLength) {
             return result;
         }
 
-        return result.substring(0, COLOR_STRING_LENGTH);
+        return result.substring(0, maxLength);
     }
 
     /**
-     * @param color RGB color, without an alpha channel.
-     * @return #RRGGBB hex color string
+     * @param color Color, with or without alpha channel.
+     * @param includeAlpha Whether to include the alpha channel in the output string.
+     * @return #RRGGBB or #AARRGGBB hex color string
      */
-    public static String getColorString(@ColorInt int color) {
-        String colorString = String.format("#%06X", color);
-        if ((color & 0xFF000000) != 0) {
-            // Likely a bug somewhere.
-            Logger.printException(() -> "getColorString: color has alpha channel: " + colorString);
+    public static String getColorString(@ColorInt int color, boolean includeAlpha) {
+        if (includeAlpha) {
+            return String.format("#%08X", color);
         }
-        return colorString;
+        color = color & 0x00FFFFFF; // Mask to strip alpha.
+        return String.format("#%06X", color);
     }
 
     /**
-     * Creates a Spanned object for a colored dot using SpannableString.
-     *
-     * @param color The RGB color (without alpha).
-     * @return A Spanned object with the colored dot.
+     * Interface for notifying color changes.
      */
-    public static Spanned getColorDot(@ColorInt int color) {
-        SpannableString spannable = new SpannableString(COLOR_DOT_STRING);
-        spannable.setSpan(new ForegroundColorSpan(color | 0xFF000000), 0, COLOR_DOT_STRING.length(),
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        spannable.setSpan(new RelativeSizeSpan(1.5f), 0, 1,
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        return spannable;
+    public interface OnColorChangeListener {
+        void onColorChanged(String key, int newColor);
+    }
+
+    /**
+     * Sets the listener for color changes.
+     */
+    public void setOnColorChangeListener(OnColorChangeListener listener) {
+        this.colorChangeListener = listener;
+    }
+
+    /**
+     * Enables or disables the opacity slider in the color picker dialog.
+     */
+    public void setOpacitySliderEnabled(boolean enabled) {
+        this.opacitySliderEnabled = enabled;
     }
 
     public ColorPickerPreference(Context context) {
@@ -158,9 +158,13 @@ public class ColorPickerPreference extends EditTextPreference {
      * Initializes the preference by setting up the EditText, loading the color, and set the widget layout.
      */
     private void init() {
-        colorSetting = (StringSetting) Setting.getSettingFromPath(getKey());
-        if (colorSetting == null) {
-            Logger.printException(() -> "Could not find color setting for: " + getKey());
+        if (getKey() != null) {
+            colorSetting = (StringSetting) Setting.getSettingFromPath(getKey());
+            if (colorSetting == null) {
+                Logger.printException(() -> "Could not find color setting for: " + getKey());
+            }
+        } else {
+            Logger.printDebug(() -> "initialized without key, settings will be loaded later");
         }
 
         EditText editText = getEditText();
@@ -171,27 +175,29 @@ public class ColorPickerPreference extends EditTextPreference {
         }
 
         // Set the widget layout to a custom layout containing the colored dot.
-        setWidgetLayoutResource(getResourceIdentifier("revanced_color_dot_widget", "layout"));
+        setWidgetLayoutResource(LAYOUT_REVANCED_COLOR_DOT_WIDGET);
     }
 
     /**
      * Sets the selected color and updates the UI and settings.
-     *
-     * @param colorString The color in hexadecimal format (e.g., "#RRGGBB").
-     * @throws IllegalArgumentException If the color string is invalid.
      */
     @Override
-    public final void setText(String colorString) {
+    public void setText(String colorString) {
         try {
             Logger.printDebug(() -> "setText: " + colorString);
             super.setText(colorString);
 
-            currentColor = Color.parseColor(colorString) & 0x00FFFFFF;
+            currentColor = Color.parseColor(colorString);
             if (colorSetting != null) {
-                colorSetting.save(getColorString(currentColor));
+                colorSetting.save(getColorString(currentColor, opacitySliderEnabled));
             }
-            updateColorPreview();
+            updateDialogColorDot();
             updateWidgetColorDot();
+
+            // Notify the listener about the color change.
+            if (colorChangeListener != null) {
+                colorChangeListener.onColorChanged(getKey(), currentColor);
+            }
         } catch (IllegalArgumentException ex) {
             // This code is reached if the user pastes settings json with an invalid color
             // since this preference is updated with the new setting text.
@@ -203,38 +209,8 @@ public class ColorPickerPreference extends EditTextPreference {
         }
     }
 
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        widgetColorDot = view.findViewById(getResourceIdentifier(
-                "revanced_color_dot_widget", "id"));
-        widgetColorDot.setBackgroundResource(getResourceIdentifier(
-                "revanced_settings_circle_background", "drawable"));
-        widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
-        widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
-    }
-
-    /**
-     * Updates the color preview TextView with a colored dot.
-     */
-    private void updateColorPreview() {
-        if (dialogColorPreview != null) {
-            dialogColorPreview.setText(getColorDot(currentColor));
-        }
-    }
-
-    private void updateWidgetColorDot() {
-        if (widgetColorDot != null) {
-            widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
-            widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
-        }
-    }
-
     /**
      * Creates a TextWatcher to monitor changes in the EditText for color input.
-     *
-     * @return A TextWatcher that updates the color preview on valid input.
      */
     private TextWatcher createColorTextWatcher(ColorPickerView colorPickerView) {
         return new TextWatcher() {
@@ -250,15 +226,16 @@ public class ColorPickerPreference extends EditTextPreference {
             public void afterTextChanged(Editable edit) {
                 try {
                     String colorString = edit.toString();
-
-                    String sanitizedColorString = cleanupColorCodeString(colorString);
+                    String sanitizedColorString = cleanupColorCodeString(colorString, opacitySliderEnabled);
                     if (!sanitizedColorString.equals(colorString)) {
                         edit.replace(0, colorString.length(), sanitizedColorString);
                         return;
                     }
 
-                    if (sanitizedColorString.length() != COLOR_STRING_LENGTH) {
-                        // User is still typing out the color.
+                    int expectedLength = opacitySliderEnabled
+                            ? COLOR_STRING_LENGTH_WITH_ALPHA
+                            : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+                    if (sanitizedColorString.length() != expectedLength) {
                         return;
                     }
 
@@ -266,7 +243,7 @@ public class ColorPickerPreference extends EditTextPreference {
                     if (currentColor != newColor) {
                         Logger.printDebug(() -> "afterTextChanged: " + sanitizedColorString);
                         currentColor = newColor;
-                        updateColorPreview();
+                        updateDialogColorDot();
                         updateWidgetColorDot();
                         colorPickerView.setColor(newColor);
                     }
@@ -279,32 +256,68 @@ public class ColorPickerPreference extends EditTextPreference {
     }
 
     /**
-     * Creates a Dialog with a color preview and EditText for hex color input.
+     * Hook for subclasses to add a custom view to the top of the dialog.
      */
+    @Nullable
+    protected View createExtraDialogContentView(Context context) {
+        return null; // Default implementation returns no extra view.
+    }
+
+    /**
+     * Hook for subclasses to handle the OK button click.
+     */
+    protected void onDialogOkClicked() {
+        // Default implementation does nothing.
+    }
+
+    /**
+     * Hook for subclasses to handle the Neutral button click.
+     */
+    protected void onDialogNeutralClicked() {
+        // Default implementation.
+        try {
+            final int defaultColor = Color.parseColor(colorSetting.defaultValue);
+            dialogColorPickerView.setColor(defaultColor);
+        } catch (Exception ex) {
+            Logger.printException(() -> "Reset button failure", ex);
+        }
+    }
+
     @Override
     protected void showDialog(Bundle state) {
         Context context = getContext();
 
+        // Create content container for all dialog views.
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+
+        // Add extra view from subclass if it exists.
+        View extraView = createExtraDialogContentView(context);
+        if (extraView != null) {
+            contentContainer.addView(extraView);
+        }
+
         // Inflate color picker view.
-        View colorPicker = LayoutInflater.from(context).inflate(
-                getResourceIdentifier("revanced_color_picker", "layout"), null);
-        dialogColorPickerView = colorPicker.findViewById(
-                getResourceIdentifier("revanced_color_picker_view", "id"));
+        View colorPicker = LayoutInflater.from(context).inflate(LAYOUT_REVANCED_COLOR_PICKER, null);
+        dialogColorPickerView = colorPicker.findViewById(ID_REVANCED_COLOR_PICKER_VIEW);
+        dialogColorPickerView.setOpacitySliderEnabled(opacitySliderEnabled);
         dialogColorPickerView.setColor(currentColor);
+        contentContainer.addView(colorPicker);
 
         // Horizontal layout for preview and EditText.
         LinearLayout inputLayout = new LinearLayout(context);
         inputLayout.setOrientation(LinearLayout.HORIZONTAL);
+        inputLayout.setGravity(Gravity.CENTER_VERTICAL);
 
-        dialogColorPreview = new TextView(context);
+        dialogColorDot = new View(context);
         LinearLayout.LayoutParams previewParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
+                dipToPixels(20),
+                dipToPixels(20)
         );
-        previewParams.setMargins(dipToPixels(15), 0, dipToPixels(10), 0); // text dot has its own indents so 15, instead 16.
-        dialogColorPreview.setLayoutParams(previewParams);
-        inputLayout.addView(dialogColorPreview);
-        updateColorPreview();
+        previewParams.setMargins(dipToPixels(16), 0, dipToPixels(10), 0);
+        dialogColorDot.setLayoutParams(previewParams);
+        inputLayout.addView(dialogColorDot);
+        updateDialogColorDot();
 
         EditText editText = getEditText();
         ViewParent parent = editText.getParent();
@@ -315,7 +328,7 @@ public class ColorPickerPreference extends EditTextPreference {
                 LinearLayout.LayoutParams.WRAP_CONTENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT
         ));
-        String currentColorString = getColorString(currentColor);
+        String currentColorString = getColorString(currentColor, opacitySliderEnabled);
         editText.setText(currentColorString);
         editText.setSelection(currentColorString.length());
         editText.setTypeface(Typeface.MONOSPACE);
@@ -334,16 +347,12 @@ public class ColorPickerPreference extends EditTextPreference {
         paddingView.setLayoutParams(params);
         inputLayout.addView(paddingView);
 
-        // Create content container for color picker and input layout.
-        LinearLayout contentContainer = new LinearLayout(context);
-        contentContainer.setOrientation(LinearLayout.VERTICAL);
-        contentContainer.addView(colorPicker);
         contentContainer.addView(inputLayout);
 
         // Create ScrollView to wrap the content container.
         ScrollView contentScrollView = new ScrollView(context);
-        contentScrollView.setVerticalScrollBarEnabled(false); // Disable vertical scrollbar.
-        contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER); // Disable overscroll effect.
+        contentScrollView.setVerticalScrollBarEnabled(false);
+        contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
         LinearLayout.LayoutParams scrollViewParams = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 0,
@@ -352,51 +361,43 @@ public class ColorPickerPreference extends EditTextPreference {
         contentScrollView.setLayoutParams(scrollViewParams);
         contentScrollView.addView(contentContainer);
 
-        // Create custom dialog.
-        final int originalColor = currentColor & 0x00FFFFFF;
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        final int originalColor = currentColor;
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
-                getTitle() != null ? getTitle().toString() : str("revanced_settings_color_picker_title"), // Title.
-                null, // No message.
-                null, // No EditText.
-                null, // OK button text.
-                () -> {
-                    // OK button action.
+                getTitle() != null ? getTitle().toString() : str("revanced_settings_color_picker_title"),
+                null,
+                null,
+                null,
+                () -> { // OK button action.
                     try {
                         String colorString = editText.getText().toString();
-                        if (colorString.length() != COLOR_STRING_LENGTH) {
+                        int expectedLength = opacitySliderEnabled
+                                ? COLOR_STRING_LENGTH_WITH_ALPHA
+                                : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+                        if (colorString.length() != expectedLength) {
                             Utils.showToastShort(str("revanced_settings_color_invalid"));
-                            setText(getColorString(originalColor));
+                            setText(getColorString(originalColor, opacitySliderEnabled));
                             return;
                         }
                         setText(colorString);
+
+                        onDialogOkClicked();
                     } catch (Exception ex) {
                         // Should never happen due to a bad color string,
                         // since the text is validated and fixed while the user types.
                         Logger.printException(() -> "OK button failure", ex);
                     }
                 },
-                () -> {
-                    // Cancel button action.
+                () -> { // Cancel button action.
                     try {
-                        // Restore the original color.
-                        setText(getColorString(originalColor));
+                        setText(getColorString(originalColor, opacitySliderEnabled));
                     } catch (Exception ex) {
                         Logger.printException(() -> "Cancel button failure", ex);
                     }
                 },
                 str("revanced_settings_reset_color"), // Neutral button text.
-                () -> {
-                    // Neutral button action.
-                    try {
-                        final int defaultColor = Color.parseColor(colorSetting.defaultValue) & 0x00FFFFFF;
-                        // Setting view color causes listener callback into this class.
-                        dialogColorPickerView.setColor(defaultColor);
-                    } catch (Exception ex) {
-                        Logger.printException(() -> "Reset button failure", ex);
-                    }
-                },
-                false // Do not dismiss dialog when onNeutralClick.
+                this::onDialogNeutralClicked, // Neutral button action.
+                false // Do not dismiss dialog.
         );
 
         // Add the ScrollView to the dialog's main layout.
@@ -412,13 +413,13 @@ public class ColorPickerPreference extends EditTextPreference {
                 return;
             }
 
-            String updatedColorString = getColorString(color);
+            String updatedColorString = getColorString(color, opacitySliderEnabled);
             Logger.printDebug(() -> "onColorChanged: " + updatedColorString);
             currentColor = color;
             editText.setText(updatedColorString);
             editText.setSelection(updatedColorString.length());
 
-            updateColorPreview();
+            updateDialogColorDot();
             updateWidgetColorDot();
         });
 
@@ -437,7 +438,7 @@ public class ColorPickerPreference extends EditTextPreference {
             colorTextWatcher = null;
         }
 
-        dialogColorPreview = null;
+        dialogColorDot = null;
         dialogColorPickerView = null;
     }
 
@@ -446,4 +447,32 @@ public class ColorPickerPreference extends EditTextPreference {
         super.setEnabled(enabled);
         updateWidgetColorDot();
     }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        widgetColorDot = view.findViewById(ID_PREFERENCE_COLOR_DOT);
+        updateWidgetColorDot();
+    }
+
+    private void updateWidgetColorDot() {
+        if (widgetColorDot == null) return;
+
+        ColorDot.applyColorDot(
+                widgetColorDot,
+                currentColor,
+                widgetColorDot.isEnabled()
+        );
+    }
+
+    private void updateDialogColorDot() {
+        if (dialogColorDot == null) return;
+
+        ColorDot.applyColorDot(
+                dialogColorDot,
+                currentColor,
+                true
+        );
+    }
 }
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerView.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerView.java
index 4d8efb2d2..810ddb3a6 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerView.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerView.java
@@ -23,57 +23,73 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 
 /**
- * A custom color picker view that allows the user to select a color using a hue slider and a saturation-value selector.
+ * A custom color picker view that allows the user to select a color using a hue slider, a saturation-value selector
+ * and an optional opacity slider.
  * This implementation is density-independent and responsive across different screen sizes and DPIs.
- *
  * <p>
- * This view displays two main components for color selection:
+ * This view displays three main components for color selection:
  * <ul>
  *     <li><b>Hue Bar:</b> A horizontal bar at the bottom that allows the user to select the hue component of the color.
- *     <li><b>Saturation-Value Selector:</b> A rectangular area above the hue bar that allows the user to select the saturation and value (brightness)
- *     components of the color based on the selected hue.
+ *     <li><b>Saturation-Value Selector:</b> A rectangular area above the hue bar that allows the user to select the
+ *     saturation and value (brightness) components of the color based on the selected hue.
+ *     <li><b>Opacity Slider:</b> An optional horizontal bar below the hue bar that allows the user to adjust
+ *     the opacity (alpha channel) of the color.
  * </ul>
- *
  * <p>
- * The view uses {@link LinearGradient} and {@link ComposeShader} to create the color gradients for the hue bar and the
- * saturation-value selector. It also uses {@link Paint} to draw the selectors (draggable handles).
- *
+ * The view uses {@link LinearGradient} and {@link ComposeShader} to create the color gradients for the hue bar,
+ * opacity slider, and the saturation-value selector. It also uses {@link Paint} to draw the selectors (draggable handles).
  * <p>
  * The selected color can be retrieved using {@link #getColor()} and can be set using {@link #setColor(int)}.
  * An {@link OnColorChangedListener} can be registered to receive notifications when the selected color changes.
  */
 public class ColorPickerView extends View {
-
     /**
      * Interface definition for a callback to be invoked when the selected color changes.
      */
     public interface OnColorChangedListener {
         /**
          * Called when the selected color has changed.
-         *
-         * Important: Callback color uses RGB format with zero alpha channel.
-         *
-         * @param color The new selected color.
          */
         void onColorChanged(@ColorInt int color);
     }
 
-    /** Expanded touch area for the hue bar to increase the touch-sensitive area. */
+    /** Expanded touch area for the hue and opacity bars to increase the touch-sensitive area. */
     public static final float TOUCH_EXPANSION = dipToPixels(20f);
 
+    /** Margin between different areas of the view (saturation-value selector, hue bar, and opacity slider). */
     private static final float MARGIN_BETWEEN_AREAS = dipToPixels(24);
+
+    /** Padding around the view. */
     private static final float VIEW_PADDING = dipToPixels(16);
+
+    /** Height of the hue bar. */
     private static final float HUE_BAR_HEIGHT = dipToPixels(12);
+
+    /** Height of the opacity slider. */
+    private static final float OPACITY_BAR_HEIGHT = dipToPixels(12);
+
+    /** Corner radius for the hue bar. */
     private static final float HUE_CORNER_RADIUS = dipToPixels(6);
+
+    /** Corner radius for the opacity slider. */
+    private static final float OPACITY_CORNER_RADIUS = dipToPixels(6);
+
+    /** Radius of the selector handles. */
     private static final float SELECTOR_RADIUS = dipToPixels(12);
+
+    /** Stroke width for the selector handle outlines. */
     private static final float SELECTOR_STROKE_WIDTH = 8;
+
     /**
-     * Hue fill radius. Use slightly smaller radius for the selector handle fill,
+     * Hue and opacity fill radius. Use slightly smaller radius for the selector handle fill,
      * otherwise the anti-aliasing causes the fill color to bleed past the selector outline.
      */
     private static final float SELECTOR_FILL_RADIUS = SELECTOR_RADIUS - SELECTOR_STROKE_WIDTH / 2;
+
     /** Thin dark outline stroke width for the selector rings. */
     private static final float SELECTOR_EDGE_STROKE_WIDTH = 1;
+
+    /** Radius for the outer edge of the selector rings, including stroke width. */
     public static final float SELECTOR_EDGE_RADIUS =
             SELECTOR_RADIUS + SELECTOR_STROKE_WIDTH / 2 + SELECTOR_EDGE_STROKE_WIDTH / 2;
 
@@ -85,6 +101,7 @@ public class ColorPickerView extends View {
     @ColorInt
     private static final int SELECTOR_EDGE_COLOR = Color.parseColor("#CFCFCF");
 
+    /** Precomputed array of hue colors for the hue bar (0-360 degrees). */
     private static final int[] HUE_COLORS = new int[361];
     static {
         for (int i = 0; i < 361; i++) {
@@ -92,11 +109,16 @@ public class ColorPickerView extends View {
         }
     }
 
-    /** Hue bar. */
+    /** Paint for the hue bar. */
     private final Paint huePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    /** Saturation-value selector. */
+
+    /** Paint for the opacity slider. */
+    private final Paint opacityPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    /** Paint for the saturation-value selector. */
     private final Paint saturationValuePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    /** Draggable selector. */
+
+    /** Paint for the draggable selector handles. */
     private final Paint selectorPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     {
         selectorPaint.setStrokeWidth(SELECTOR_STROKE_WIDTH);
@@ -104,6 +126,10 @@ public class ColorPickerView extends View {
 
     /** Bounds of the hue bar. */
     private final RectF hueRect = new RectF();
+
+    /** Bounds of the opacity slider. */
+    private final RectF opacityRect = new RectF();
+
     /** Bounds of the saturation-value selector. */
     private final RectF saturationValueRect = new RectF();
 
@@ -112,21 +138,35 @@ public class ColorPickerView extends View {
 
     /** Current hue value (0-360). */
     private float hue = 0f;
+
     /** Current saturation value (0-1). */
     private float saturation = 1f;
+
     /** Current value (brightness) value (0-1). */
     private float value = 1f;
 
-    /** The currently selected color in RGB format with no alpha channel. */
+    /** Current opacity value (0-1). */
+    private float opacity = 1f;
+
+    /** The currently selected color, including alpha channel if opacity slider is enabled. */
     @ColorInt
     private int selectedColor;
 
+    /** Listener for color change events. */
     private OnColorChangedListener colorChangedListener;
 
-    /** Track if we're currently dragging the hue or saturation handle. */
+    /** Tracks if the hue selector is being dragged. */
     private boolean isDraggingHue;
+
+    /** Tracks if the saturation-value selector is being dragged. */
     private boolean isDraggingSaturation;
 
+    /** Tracks if the opacity selector is being dragged. */
+    private boolean isDraggingOpacity;
+
+    /** Flag to enable/disable the opacity slider. */
+    private boolean opacitySliderEnabled = false;
+
     public ColorPickerView(Context context) {
         super(context);
     }
@@ -139,12 +179,32 @@ public class ColorPickerView extends View {
         super(context, attrs, defStyleAttr);
     }
 
+    /**
+     * Enables or disables the opacity slider.
+     */
+    public void setOpacitySliderEnabled(boolean enabled) {
+        if (opacitySliderEnabled != enabled) {
+            opacitySliderEnabled = enabled;
+            if (!enabled) {
+                opacity = 1f; // Reset to fully opaque when disabled.
+                updateSelectedColor();
+            }
+            updateOpacityShader();
+            requestLayout(); // Trigger re-measure to account for opacity slider.
+            invalidate();
+        }
+    }
+
+    /**
+     * Measures the view, ensuring a consistent aspect ratio and minimum dimensions.
+     */
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final float DESIRED_ASPECT_RATIO = 0.8f; // height = width * 0.8
 
-        final int minWidth = Utils.dipToPixels(250);
-        final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS);
+        final int minWidth = dipToPixels(250);
+        final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS)
+                + (opacitySliderEnabled ? (int) (OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS) : 0);
 
         int width = resolveSize(minWidth, widthMeasureSpec);
         int height = resolveSize(minHeight, heightMeasureSpec);
@@ -154,7 +214,8 @@ public class ColorPickerView extends View {
         height = Math.max(height, minHeight);
 
         // Adjust height to maintain desired aspect ratio if possible.
-        final int desiredHeight = (int) (width * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS);
+        final int desiredHeight = (int) (width * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS)
+                + (opacitySliderEnabled ? (int) (OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS) : 0);
         if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY) {
             height = desiredHeight;
         }
@@ -163,17 +224,16 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Called when the size of the view changes.
-     * This method calculates and sets the bounds of the hue bar and saturation-value selector.
-     * It also creates the necessary shaders for the gradients.
+     * Updates the view's layout when its size changes, recalculating bounds and shaders.
      */
     @Override
     protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
         super.onSizeChanged(width, height, oldWidth, oldHeight);
 
-        // Calculate bounds with hue bar at the bottom.
+        // Calculate bounds with hue bar and optional opacity bar at the bottom.
         final float effectiveWidth = width - (2 * VIEW_PADDING);
-        final float effectiveHeight = height - (2 * VIEW_PADDING) - HUE_BAR_HEIGHT - MARGIN_BETWEEN_AREAS;
+        final float effectiveHeight = height - (2 * VIEW_PADDING) - HUE_BAR_HEIGHT - MARGIN_BETWEEN_AREAS
+                - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0);
 
         // Adjust rectangles to account for padding and density-independent dimensions.
         saturationValueRect.set(
@@ -185,18 +245,28 @@ public class ColorPickerView extends View {
 
         hueRect.set(
                 VIEW_PADDING,
-                height - VIEW_PADDING - HUE_BAR_HEIGHT,
+                height - VIEW_PADDING - HUE_BAR_HEIGHT - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0),
                 VIEW_PADDING + effectiveWidth,
-                height - VIEW_PADDING
+                height - VIEW_PADDING - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0)
         );
 
+        if (opacitySliderEnabled) {
+            opacityRect.set(
+                    VIEW_PADDING,
+                    height - VIEW_PADDING - OPACITY_BAR_HEIGHT,
+                    VIEW_PADDING + effectiveWidth,
+                    height - VIEW_PADDING
+            );
+        }
+
         // Update the shaders.
         updateHueShader();
         updateSaturationValueShader();
+        updateOpacityShader();
     }
 
     /**
-     * Updates the hue full spectrum (0-360 degrees).
+     * Updates the shader for the hue bar to reflect the color gradient.
      */
     private void updateHueShader() {
         LinearGradient hueShader = new LinearGradient(
@@ -211,8 +281,29 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Updates the shader for the saturation-value selector based on the currently selected hue.
-     * This method creates a combined shader that blends a saturation gradient with a value gradient.
+     * Updates the shader for the opacity slider to reflect the current RGB color with varying opacity.
+     */
+    private void updateOpacityShader() {
+        if (!opacitySliderEnabled) {
+            opacityPaint.setShader(null);
+            return;
+        }
+
+        // Create a linear gradient for opacity from transparent to opaque, using the current RGB color.
+        int rgbColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        LinearGradient opacityShader = new LinearGradient(
+                opacityRect.left, opacityRect.top,
+                opacityRect.right, opacityRect.top,
+                rgbColor & 0x00FFFFFF, // Fully transparent
+                rgbColor | 0xFF000000, // Fully opaque
+                Shader.TileMode.CLAMP
+        );
+
+        opacityPaint.setShader(opacityShader);
+    }
+
+    /**
+     * Updates the shader for the saturation-value selector to reflect the current hue.
      */
     private void updateSaturationValueShader() {
         // Create a saturation-value gradient based on the current hue.
@@ -232,7 +323,6 @@ public class ColorPickerView extends View {
         );
 
         // Create a linear gradient for the value (brightness) from white to black (vertical).
-        //noinspection ExtractMethodRecommender
         LinearGradient valShader = new LinearGradient(
                 saturationValueRect.left, saturationValueRect.top,
                 saturationValueRect.left, saturationValueRect.bottom,
@@ -249,11 +339,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Draws the color picker view on the canvas.
-     * This method draws the saturation-value selector, the hue bar with rounded corners,
-     * and the draggable handles.
-     *
-     * @param canvas The canvas on which to draw.
+     * Draws the color picker components, including the saturation-value selector, hue bar, opacity slider, and their respective handles.
      */
     @Override
     protected void onDraw(Canvas canvas) {
@@ -263,49 +349,67 @@ public class ColorPickerView extends View {
         // Draw the hue bar.
         canvas.drawRoundRect(hueRect, HUE_CORNER_RADIUS, HUE_CORNER_RADIUS, huePaint);
 
+        // Draw the opacity bar if enabled.
+        if (opacitySliderEnabled) {
+            canvas.drawRoundRect(opacityRect, OPACITY_CORNER_RADIUS, OPACITY_CORNER_RADIUS, opacityPaint);
+        }
+
         final float hueSelectorX = hueRect.left + (hue / 360f) * hueRect.width();
         final float hueSelectorY = hueRect.centerY();
 
         final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
         final float satSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
 
-        // Draw the saturation and hue selector handle filled with the selected color.
+        // Draw the saturation and hue selector handles filled with their respective colors (fully opaque).
         hsvArray[0] = hue;
-        final int hueHandleColor = Color.HSVToColor(0xFF, hsvArray);
+        final int hueHandleColor = Color.HSVToColor(0xFF, hsvArray); // Force opaque for hue handle.
+        final int satHandleColor = Color.HSVToColor(0xFF, new float[]{hue, saturation, value}); // Force opaque for sat-val handle.
         selectorPaint.setStyle(Paint.Style.FILL_AND_STROKE);
 
         selectorPaint.setColor(hueHandleColor);
         canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
 
-        selectorPaint.setColor(selectedColor | 0xFF000000);
+        selectorPaint.setColor(satHandleColor);
         canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
 
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            selectorPaint.setColor(selectedColor); // Use full ARGB color to show opacity.
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
+        }
+
         // Draw white outlines for the handles.
         selectorPaint.setColor(SELECTOR_OUTLINE_COLOR);
         selectorPaint.setStyle(Paint.Style.STROKE);
         selectorPaint.setStrokeWidth(SELECTOR_STROKE_WIDTH);
         canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_RADIUS, selectorPaint);
         canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_RADIUS, selectorPaint);
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, SELECTOR_RADIUS, selectorPaint);
+        }
 
         // Draw thin dark outlines for the handles at the outer edge of the white outline.
         selectorPaint.setColor(SELECTOR_EDGE_COLOR);
         selectorPaint.setStrokeWidth(SELECTOR_EDGE_STROKE_WIDTH);
         canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_EDGE_RADIUS, selectorPaint);
         canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_EDGE_RADIUS, selectorPaint);
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, SELECTOR_EDGE_RADIUS, selectorPaint);
+        }
     }
 
     /**
-     * Handles touch events on the view.
-     * This method determines whether the touch event occurred within the hue bar or the saturation-value selector,
-     * updates the corresponding values (hue, saturation, value), and invalidates the view to trigger a redraw.
-     * <p>
-     * In addition to testing if the touch is within the strict rectangles, an expanded hit area (by selectorRadius)
-     * is used so that the draggable handles remain active even when half of the handle is outside the drawn bounds.
+     * Handles touch events to allow dragging of the hue, saturation-value, and opacity selectors.
      *
      * @param event The motion event.
      * @return True if the event was handled, false otherwise.
      */
-    @SuppressLint("ClickableViewAccessibility") // performClick is not overridden, but not needed in this case.
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         try {
@@ -314,13 +418,19 @@ public class ColorPickerView extends View {
             final int action = event.getAction();
             Logger.printDebug(() -> "onTouchEvent action: " + action + " x: " + x + " y: " + y);
 
-            // Define touch expansion for the hue bar.
+            // Define touch expansion for the hue and opacity bars.
             RectF expandedHueRect = new RectF(
                     hueRect.left,
                     hueRect.top - TOUCH_EXPANSION,
                     hueRect.right,
                     hueRect.bottom + TOUCH_EXPANSION
             );
+            RectF expandedOpacityRect = opacitySliderEnabled ? new RectF(
+                    opacityRect.left,
+                    opacityRect.top - TOUCH_EXPANSION,
+                    opacityRect.right,
+                    opacityRect.bottom + TOUCH_EXPANSION
+            ) : new RectF();
 
             switch (action) {
                 case MotionEvent.ACTION_DOWN:
@@ -331,7 +441,10 @@ public class ColorPickerView extends View {
                     final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
                     final float valSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
 
-                    // Create hit areas for both handles.
+                    final float opacitySelectorX = opacitySliderEnabled ? opacityRect.left + opacity * opacityRect.width() : 0;
+                    final float opacitySelectorY = opacitySliderEnabled ? opacityRect.centerY() : 0;
+
+                    // Create hit areas for all handles.
                     RectF hueHitRect = new RectF(
                             hueSelectorX - SELECTOR_RADIUS,
                             hueSelectorY - SELECTOR_RADIUS,
@@ -344,14 +457,23 @@ public class ColorPickerView extends View {
                             satSelectorX + SELECTOR_RADIUS,
                             valSelectorY + SELECTOR_RADIUS
                     );
+                    RectF opacityHitRect = opacitySliderEnabled ? new RectF(
+                            opacitySelectorX - SELECTOR_RADIUS,
+                            opacitySelectorY - SELECTOR_RADIUS,
+                            opacitySelectorX + SELECTOR_RADIUS,
+                            opacitySelectorY + SELECTOR_RADIUS
+                    ) : new RectF();
 
-                    // Check if the touch started on a handle or within the expanded hue bar area.
+                    // Check if the touch started on a handle or within the expanded bar areas.
                     if (hueHitRect.contains(x, y)) {
                         isDraggingHue = true;
                         updateHueFromTouch(x);
                     } else if (satValHitRect.contains(x, y)) {
                         isDraggingSaturation = true;
                         updateSaturationValueFromTouch(x, y);
+                    } else if (opacitySliderEnabled && opacityHitRect.contains(x, y)) {
+                        isDraggingOpacity = true;
+                        updateOpacityFromTouch(x);
                     } else if (expandedHueRect.contains(x, y)) {
                         // Handle touch within the expanded hue bar area.
                         isDraggingHue = true;
@@ -359,6 +481,9 @@ public class ColorPickerView extends View {
                     } else if (saturationValueRect.contains(x, y)) {
                         isDraggingSaturation = true;
                         updateSaturationValueFromTouch(x, y);
+                    } else if (opacitySliderEnabled && expandedOpacityRect.contains(x, y)) {
+                        isDraggingOpacity = true;
+                        updateOpacityFromTouch(x);
                     }
                     break;
 
@@ -368,6 +493,8 @@ public class ColorPickerView extends View {
                         updateHueFromTouch(x);
                     } else if (isDraggingSaturation) {
                         updateSaturationValueFromTouch(x, y);
+                    } else if (isDraggingOpacity) {
+                        updateOpacityFromTouch(x);
                     }
                     break;
 
@@ -375,6 +502,7 @@ public class ColorPickerView extends View {
                 case MotionEvent.ACTION_CANCEL:
                     isDraggingHue = false;
                     isDraggingSaturation = false;
+                    isDraggingOpacity = false;
                     break;
             }
         } catch (Exception ex) {
@@ -385,9 +513,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Updates the hue value based on touch position, clamping to valid range.
-     *
-     * @param x The x-coordinate of the touch position.
+     * Updates the hue value based on a touch event.
      */
     private void updateHueFromTouch(float x) {
         // Clamp x to the hue rectangle bounds.
@@ -399,14 +525,12 @@ public class ColorPickerView extends View {
 
         hue = updatedHue;
         updateSaturationValueShader();
+        updateOpacityShader();
         updateSelectedColor();
     }
 
     /**
-     * Updates saturation and value based on touch position, clamping to valid range.
-     *
-     * @param x The x-coordinate of the touch position.
-     * @param y The y-coordinate of the touch position.
+     * Updates the saturation and value based on a touch event.
      */
     private void updateSaturationValueFromTouch(float x, float y) {
         // Clamp x and y to the saturation-value rectangle bounds.
@@ -421,14 +545,34 @@ public class ColorPickerView extends View {
         }
         saturation = updatedSaturation;
         value = updatedValue;
+        updateOpacityShader();
         updateSelectedColor();
     }
 
     /**
-     * Updates the selected color and notifies listeners.
+     * Updates the opacity value based on a touch event.
+     */
+    private void updateOpacityFromTouch(float x) {
+        if (!opacitySliderEnabled) {
+            return;
+        }
+        final float clampedX = Utils.clamp(x, opacityRect.left, opacityRect.right);
+        final float updatedOpacity = (clampedX - opacityRect.left) / opacityRect.width();
+        if (opacity == updatedOpacity) {
+            return;
+        }
+        opacity = updatedOpacity;
+        updateSelectedColor();
+    }
+
+    /**
+     * Updates the selected color based on the current hue, saturation, value, and opacity.
      */
     private void updateSelectedColor() {
-        final int updatedColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        final int rgbColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        final int updatedColor = opacitySliderEnabled
+                ? (rgbColor & 0x00FFFFFF) | (((int) (opacity * 255)) << 24)
+                : (rgbColor & 0x00FFFFFF) | 0xFF000000;
 
         if (selectedColor != updatedColor) {
             selectedColor = updatedColor;
@@ -444,19 +588,16 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Sets the currently selected color.
-     *
-     * @param color The color to set in either ARGB or RGB format.
+     * Sets the selected color, updating the hue, saturation, value and opacity sliders accordingly.
      */
     public void setColor(@ColorInt int color) {
-        color &= 0x00FFFFFF;
         if (selectedColor == color) {
             return;
         }
 
         // Update the selected color.
         selectedColor = color;
-        Logger.printDebug(() -> "setColor: " + getColorString(selectedColor));
+        Logger.printDebug(() -> "setColor: " + getColorString(selectedColor, opacitySliderEnabled));
 
         // Convert the ARGB color to HSV values.
         float[] hsv = new float[3];
@@ -466,9 +607,11 @@ public class ColorPickerView extends View {
         hue = hsv[0];
         saturation = hsv[1];
         value = hsv[2];
+        opacity = opacitySliderEnabled ? ((color >> 24) & 0xFF) / 255f : 1f;
 
         // Update the saturation-value shader based on the new hue.
         updateSaturationValueShader();
+        updateOpacityShader();
 
         // Notify the listener if it's set.
         if (colorChangedListener != null) {
@@ -481,8 +624,6 @@ public class ColorPickerView extends View {
 
     /**
      * Gets the currently selected color.
-     *
-     * @return The selected color in RGB format with no alpha channel.
      */
     @ColorInt
     public int getColor() {
@@ -490,9 +631,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Sets the listener to be notified when the selected color changes.
-     *
-     * @param listener The listener to set.
+     * Sets a listener to be notified when the selected color changes.
      */
     public void setOnColorChangedListener(OnColorChangedListener listener) {
         colorChangedListener = listener;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerWithOpacitySliderPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerWithOpacitySliderPreference.java
new file mode 100644
index 000000000..5e24f7bf3
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerWithOpacitySliderPreference.java
@@ -0,0 +1,34 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Extended ColorPickerPreference that enables the opacity slider for color selection.
+ */
+@SuppressWarnings("unused")
+public class ColorPickerWithOpacitySliderPreference extends ColorPickerPreference {
+
+    public ColorPickerWithOpacitySliderPreference(Context context) {
+        super(context);
+        init();
+    }
+
+    public ColorPickerWithOpacitySliderPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ColorPickerWithOpacitySliderPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    /**
+     * Initialize the preference with opacity slider enabled.
+     */
+    private void init() {
+        // Enable the opacity slider for alpha channel support.
+        setOpacitySliderEnabled(true);
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
index 4d0c1d5c1..ff728838b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -9,18 +11,86 @@ import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 /**
- * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator.
+ * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator,
+ * supports a static summary and highlighted entries for search functionality.
  */
 @SuppressWarnings({"unused", "deprecation"})
 public class CustomDialogListPreference extends ListPreference {
 
+    public static final int ID_REVANCED_CHECK_ICON =
+            getResourceIdentifierOrThrow("revanced_check_icon", "id");
+    public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER =
+            getResourceIdentifierOrThrow("revanced_check_icon_placeholder", "id");
+    public static final int ID_REVANCED_ITEM_TEXT =
+            getResourceIdentifierOrThrow("revanced_item_text", "id");
+    public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED =
+            getResourceIdentifierOrThrow("revanced_custom_list_item_checked", "layout");
+
+    private String staticSummary = null;
+    private CharSequence[] highlightedEntriesForDialog = null;
+
+    /**
+     * Set a static summary that will not be overwritten by value changes.
+     */
+    public void setStaticSummary(String summary) {
+        this.staticSummary = summary;
+    }
+
+    /**
+     * Returns the static summary if set, otherwise null.
+     */
+    @Nullable
+    public String getStaticSummary() {
+        return staticSummary;
+    }
+
+    /**
+     * Always return static summary if set.
+     */
+    @Override
+    public CharSequence getSummary() {
+        if (staticSummary != null) {
+            return staticSummary;
+        }
+        return super.getSummary();
+    }
+
+    /**
+     * Sets highlighted entries for display in the dialog.
+     * These entries are used only for the current dialog and are automatically cleared.
+     */
+    public void setHighlightedEntriesForDialog(CharSequence[] highlightedEntries) {
+        this.highlightedEntriesForDialog = highlightedEntries;
+    }
+
+    /**
+     * Clears highlighted entries after the dialog is closed.
+     */
+    public void clearHighlightedEntriesForDialog() {
+        this.highlightedEntriesForDialog = null;
+    }
+
+    /**
+     * Returns entries for display in the dialog.
+     * If highlighted entries exist, they are used; otherwise, the original entries are returned.
+     */
+    private CharSequence[] getEntriesForDialog() {
+        return highlightedEntriesForDialog != null ? highlightedEntriesForDialog : getEntries();
+    }
+
     /**
      * Custom ArrayAdapter to handle checkmark visibility.
      */
@@ -35,8 +105,10 @@ public class CustomDialogListPreference extends ListPreference {
         final CharSequence[] entryValues;
         String selectedValue;
 
-        public ListPreferenceArrayAdapter(Context context, int resource, CharSequence[] entries,
-                                          CharSequence[] entryValues, String selectedValue) {
+        public ListPreferenceArrayAdapter(Context context, int resource,
+                                          CharSequence[] entries,
+                                          CharSequence[] entryValues,
+                                          String selectedValue) {
             super(context, resource, entries);
             this.layoutResourceId = resource;
             this.entryValues = entryValues;
@@ -53,19 +125,16 @@ public class CustomDialogListPreference extends ListPreference {
                 LayoutInflater inflater = LayoutInflater.from(getContext());
                 view = inflater.inflate(layoutResourceId, parent, false);
                 holder = new SubViewDataContainer();
-                holder.checkIcon = view.findViewById(Utils.getResourceIdentifier(
-                        "revanced_check_icon", "id"));
-                holder.placeholder = view.findViewById(Utils.getResourceIdentifier(
-                        "revanced_check_icon_placeholder", "id"));
-                holder.itemText = view.findViewById(Utils.getResourceIdentifier(
-                        "revanced_item_text", "id"));
+                holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
+                holder.placeholder = view.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER);
+                holder.itemText = view.findViewById(ID_REVANCED_ITEM_TEXT);
                 view.setTag(holder);
             } else {
                 holder = (SubViewDataContainer) view.getTag();
             }
 
-            // Set text.
-            holder.itemText.setText(getItem(position));
+            CharSequence itemText = getItem(position);
+            holder.itemText.setText(itemText);
             holder.itemText.setTextColor(Utils.getAppForegroundColor());
 
             // Show or hide checkmark and placeholder.
@@ -103,6 +172,9 @@ public class CustomDialogListPreference extends ListPreference {
     protected void showDialog(Bundle state) {
         Context context = getContext();
 
+        CharSequence[] entriesToShow = getEntriesForDialog();
+        CharSequence[] entryValues = getEntryValues();
+
         // Create ListView.
         ListView listView = new ListView(context);
         listView.setId(android.R.id.list);
@@ -111,9 +183,9 @@ public class CustomDialogListPreference extends ListPreference {
         // Create custom adapter for the ListView.
         ListPreferenceArrayAdapter adapter = new ListPreferenceArrayAdapter(
                 context,
-                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
-                getEntries(),
-                getEntryValues(),
+                LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED,
+                entriesToShow,
+                entryValues,
                 getValue()
         );
         listView.setAdapter(adapter);
@@ -121,7 +193,6 @@ public class CustomDialogListPreference extends ListPreference {
         // Set checked item.
         String currentValue = getValue();
         if (currentValue != null) {
-            CharSequence[] entryValues = getEntryValues();
             for (int i = 0, length = entryValues.length; i < length; i++) {
                 if (currentValue.equals(entryValues[i].toString())) {
                     listView.setItemChecked(i, true);
@@ -132,19 +203,23 @@ public class CustomDialogListPreference extends ListPreference {
         }
 
         // Create the custom dialog without OK button.
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 getTitle() != null ? getTitle().toString() : "",
                 null,
                 null,
-                null, // No OK button text.
-                null, // No OK button action.
-                () -> {}, // Cancel button action (just dismiss).
+                null,
+                null,
+                this::clearHighlightedEntriesForDialog, // Cancel button action.
                 null,
                 null,
                 true
         );
 
+        Dialog dialog = dialogPair.first;
+        // Add a listener to clear when the dialog is closed in any way.
+        dialog.setOnDismissListener(dialogInterface -> clearHighlightedEntriesForDialog());
+
         // Add the ListView to the main layout.
         LinearLayout mainLayout = dialogPair.second;
         LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
@@ -156,16 +231,28 @@ public class CustomDialogListPreference extends ListPreference {
 
         // Handle item click to select value and dismiss dialog.
         listView.setOnItemClickListener((parent, view, position, id) -> {
-            String selectedValue = getEntryValues()[position].toString();
+            String selectedValue = entryValues[position].toString();
             if (callChangeListener(selectedValue)) {
                 setValue(selectedValue);
+
+                // Update summaries from the original entries (without highlighting).
+                if (staticSummary == null) {
+                    CharSequence[] originalEntries = getEntries();
+                    if (originalEntries != null && position < originalEntries.length) {
+                        setSummary(originalEntries[position]);
+                    }
+                }
+
                 adapter.setSelectedValue(selectedValue);
                 adapter.notifyDataSetChanged();
             }
-            dialogPair.first.dismiss();
+
+            // Clear highlighted entries before closing.
+            clearHighlightedEntriesForDialog();
+            dialog.dismiss();
         });
 
         // Show the dialog.
-        dialogPair.first.show();
+        dialog.show();
     }
 }
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java
index 45c1d36b4..1c8580241 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java
@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -10,21 +9,17 @@ import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.text.InputType;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.graphics.Color;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {
@@ -82,7 +77,7 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
             EditText editText = getEditText();
 
             // Create a custom dialog with the EditText.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     str("revanced_pref_import_export_title"), // Title.
                     null,     // No message (EditText replaces it).
@@ -98,6 +93,20 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
                     true // Dismiss dialog when onNeutralClick.
             );
 
+            // If there are no settings yet, then show the on screen keyboard and bring focus to
+            // the edit text. This makes it easier to paste saved settings after a reinstall.
+             dialogPair.first.setOnShowListener(dialogInterface -> {
+                 if (existingSettings.isEmpty()) {
+                     editText.postDelayed(() -> {
+                         editText.requestFocus();
+
+                         InputMethodManager inputMethodManager = (InputMethodManager)
+                                 editText.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                         inputMethodManager.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
+                     }, 100);
+                 }
+             });
+
             // Show the dialog.
             dialogPair.first.show();
         } catch (Exception ex) {
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java
index d639d39be..be14e4a63 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java
@@ -17,6 +17,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.preference.Preference;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.webkit.WebView;
@@ -228,10 +229,10 @@ class WebViewDialog extends Dialog {
 
         setContentView(mainLayout);
 
-        // Set dialog window attributes
+        // Set dialog window attributes.
         Window window = getWindow();
         if (window != null) {
-            Utils.setDialogWindowParameters(window);
+            Utils.setDialogWindowParameters(window, Gravity.CENTER, 0, 90, false);
         }
     }
 
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java
index 13de26bfa..c6f323ceb 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java
@@ -16,8 +16,8 @@ import androidx.annotation.Nullable;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
@@ -66,7 +66,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
 
             // Create custom dialog.
             String neutralButtonText = (setting != null) ? str("revanced_settings_reset") : null;
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     getTitle() != null ? getTitle().toString() : "", // Title.
                     null,     // Message is replaced by EditText.
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
index 05a1fddcc..8f1d0975a 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
@@ -115,7 +115,7 @@ public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
      */
     @SuppressLint("UseCompatLoadingForDrawables")
     public static Drawable getBackButtonDrawable() {
-        final int backButtonResource = Utils.getResourceIdentifier(
+        final int backButtonResource = Utils.getResourceIdentifierOrThrow(
                 "revanced_settings_toolbar_arrow_left", "drawable");
         Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
         customizeBackButtonDrawable(drawable);
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/UrlLinkPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java
similarity index 95%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/UrlLinkPreference.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java
index 9570883cb..8b9a76f03 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/UrlLinkPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java
@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.settings.preference;
+package app.revanced.extension.shared.settings.preference;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
new file mode 100644
index 000000000..9b5c9464c
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
@@ -0,0 +1,365 @@
+package app.revanced.extension.shared.settings.search;
+
+import android.graphics.Color;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.SwitchPreference;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.BackgroundColorSpan;
+
+import androidx.annotation.ColorInt;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+
+/**
+ * Abstract base class for search result items, defining common fields and behavior.
+ */
+public abstract class BaseSearchResultItem {
+    // Enum to represent view types.
+    public enum ViewType {
+        REGULAR,
+        SWITCH,
+        LIST,
+        COLOR_PICKER,
+        GROUP_HEADER,
+        NO_RESULTS,
+        URL_LINK;
+
+        // Get the corresponding layout resource ID.
+        public int getLayoutResourceId() {
+            return switch (this) {
+                case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular");
+                case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch");
+                case LIST   -> getResourceIdentifier("revanced_preference_search_result_list");
+                case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color");
+                case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header");
+                case NO_RESULTS   -> getResourceIdentifier("revanced_preference_search_no_result");
+            };
+        }
+
+        private static int getResourceIdentifier(String name) {
+            // Placeholder for actual resource identifier retrieval.
+            return Utils.getResourceIdentifierOrThrow(name, "layout");
+        }
+    }
+
+    final String navigationPath;
+    final List<String> navigationKeys;
+    final ViewType preferenceType;
+    CharSequence highlightedTitle;
+    CharSequence highlightedSummary;
+    boolean highlightingApplied;
+
+    BaseSearchResultItem(String navPath, List<String> navKeys, ViewType type) {
+        this.navigationPath = navPath;
+        this.navigationKeys = new ArrayList<>(navKeys != null ? navKeys : Collections.emptyList());
+        this.preferenceType = type;
+        this.highlightedTitle = "";
+        this.highlightedSummary = "";
+        this.highlightingApplied = false;
+    }
+
+    abstract boolean matchesQuery(String query);
+    abstract void applyHighlighting(Pattern queryPattern);
+    abstract void clearHighlighting();
+
+    // Shared method for highlighting text with search query.
+    protected static CharSequence highlightSearchQuery(CharSequence text, Pattern queryPattern) {
+        if (TextUtils.isEmpty(text)) return text;
+
+        final int adjustedColor = Utils.adjustColorBrightness(
+                Utils.getAppBackgroundColor(), 0.95f, 1.20f);
+        BackgroundColorSpan highlightSpan = new BackgroundColorSpan(adjustedColor);
+        SpannableStringBuilder spannable = new SpannableStringBuilder(text);
+
+        Matcher matcher = queryPattern.matcher(text);
+        while (matcher.find()) {
+            spannable.setSpan(highlightSpan, matcher.start(), matcher.end(),
+                    SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        return spannable;
+    }
+
+    /**
+     * Search result item for group headers (navigation path only).
+     */
+    public static class GroupHeaderItem extends BaseSearchResultItem {
+        GroupHeaderItem(String navPath, List<String> navKeys) {
+            super(navPath, navKeys, ViewType.GROUP_HEADER);
+            this.highlightedTitle = navPath;
+        }
+
+        @Override
+        boolean matchesQuery(String query) {
+            return false; // Headers are not directly searchable.
+        }
+
+        @Override
+        void applyHighlighting(Pattern queryPattern) {}
+
+        @Override
+        void clearHighlighting() {}
+    }
+
+    /**
+     * Search result item for preferences, handling type-specific data and search text.
+     */
+    @SuppressWarnings("deprecation")
+    public static class PreferenceSearchItem extends BaseSearchResultItem {
+        public final Preference preference;
+        final String searchableText;
+        final CharSequence originalTitle;
+        final CharSequence originalSummary;
+        final CharSequence originalSummaryOn;
+        final CharSequence originalSummaryOff;
+        final CharSequence[] originalEntries;
+        private CharSequence[] highlightedEntries;
+        private boolean entriesHighlightingApplied;
+
+        @ColorInt
+        private int color;
+
+        // Store last applied highlighting pattern to reapply when needed.
+        Pattern lastQueryPattern;
+
+        PreferenceSearchItem(Preference pref, String navPath, List<String> navKeys) {
+            super(navPath, navKeys, determineType(pref));
+            this.preference = pref;
+            this.originalTitle = pref.getTitle() != null ? pref.getTitle() : "";
+            this.originalSummary = pref.getSummary();
+            this.highlightedTitle = this.originalTitle;
+            this.highlightedSummary = this.originalSummary != null ? this.originalSummary : "";
+            this.color = 0;
+            this.lastQueryPattern = null;
+
+            // Initialize type-specific fields.
+            FieldInitializationResult result = initTypeSpecificFields(pref);
+            this.originalSummaryOn = result.summaryOn;
+            this.originalSummaryOff = result.summaryOff;
+            this.originalEntries = result.entries;
+
+            // Build searchable text.
+            this.searchableText = buildSearchableText(pref);
+        }
+
+        private static class FieldInitializationResult {
+            CharSequence summaryOn = null;
+            CharSequence summaryOff = null;
+            CharSequence[] entries = null;
+        }
+
+        private static ViewType determineType(Preference pref) {
+            if (pref instanceof SwitchPreference) return ViewType.SWITCH;
+            if (pref instanceof ListPreference) return ViewType.LIST;
+            if (pref instanceof ColorPickerPreference) return ViewType.COLOR_PICKER;
+            if (pref instanceof UrlLinkPreference) return ViewType.URL_LINK;
+            if ("no_results_placeholder".equals(pref.getKey())) return ViewType.NO_RESULTS;
+            return ViewType.REGULAR;
+        }
+
+        private FieldInitializationResult initTypeSpecificFields(Preference pref) {
+            FieldInitializationResult result = new FieldInitializationResult();
+
+            if (pref instanceof SwitchPreference switchPref) {
+                result.summaryOn = switchPref.getSummaryOn();
+                result.summaryOff = switchPref.getSummaryOff();
+            } else if (pref instanceof ColorPickerPreference colorPref) {
+                String colorString = colorPref.getText();
+                this.color = TextUtils.isEmpty(colorString) ? 0 : Color.parseColor(colorString);
+            } else if (pref instanceof ListPreference listPref) {
+                result.entries = listPref.getEntries();
+                if (result.entries != null) {
+                    this.highlightedEntries = new CharSequence[result.entries.length];
+                    System.arraycopy(result.entries, 0, this.highlightedEntries, 0, result.entries.length);
+                }
+            }
+
+            this.entriesHighlightingApplied = false;
+            return result;
+        }
+
+        private String buildSearchableText(Preference pref) {
+            StringBuilder searchBuilder = new StringBuilder();
+            String key = pref.getKey();
+            String normalizedKey = "";
+            if (key != null) {
+                // Normalize preference key by removing the common "revanced_" prefix
+                // so that users can search by the meaningful part only.
+                normalizedKey = key.startsWith("revanced_")
+                        ? key.substring("revanced_".length())
+                        : key;
+            }
+            appendText(searchBuilder, normalizedKey);
+            appendText(searchBuilder, originalTitle);
+            appendText(searchBuilder, originalSummary);
+
+            // Add type-specific searchable content.
+            if (pref instanceof ListPreference) {
+                if (originalEntries != null) {
+                    for (CharSequence entry : originalEntries) {
+                        appendText(searchBuilder, entry);
+                    }
+                }
+            } else if (pref instanceof SwitchPreference) {
+                appendText(searchBuilder, originalSummaryOn);
+                appendText(searchBuilder, originalSummaryOff);
+            } else if (pref instanceof ColorPickerPreference) {
+                appendText(searchBuilder, ColorPickerPreference.getColorString(color, false));
+            }
+
+            // Include navigation path in searchable text.
+            appendText(searchBuilder, navigationPath);
+
+            return searchBuilder.toString();
+        }
+
+        private void appendText(StringBuilder builder, CharSequence text) {
+            if (!TextUtils.isEmpty(text)) {
+                if (builder.length() > 0) builder.append(" ");
+                builder.append(Utils.removePunctuationToLowercase(text));
+            }
+        }
+
+        /**
+         * Gets the current effective summary for this preference, considering state-dependent summaries.
+         */
+        public CharSequence getCurrentEffectiveSummary() {
+            if (preference instanceof CustomDialogListPreference customPref) {
+                String staticSum = customPref.getStaticSummary();
+                if (staticSum != null) {
+                    return staticSum;
+                }
+            }
+            if (preference instanceof SwitchPreference switchPref) {
+                boolean currentState = switchPref.isChecked();
+                return currentState
+                        ? (originalSummaryOn != null ? originalSummaryOn :
+                        originalSummary != null ? originalSummary : "")
+                        : (originalSummaryOff != null ? originalSummaryOff :
+                        originalSummary != null ? originalSummary : "");
+            } else if (preference instanceof ListPreference listPref) {
+                String value = listPref.getValue();
+                CharSequence[] entries = listPref.getEntries();
+                CharSequence[] entryValues = listPref.getEntryValues();
+                if (value != null && entries != null && entryValues != null) {
+                    for (int i = 0, length = entries.length; i < length; i++) {
+                        if (value.equals(entryValues[i].toString())) {
+                            return originalEntries != null && i < originalEntries.length && originalEntries[i] != null
+                                    ? originalEntries[i]
+                                    : originalSummary != null ? originalSummary : "";
+                        }
+                    }
+                }
+                return originalSummary != null ? originalSummary : "";
+            }
+            return originalSummary != null ? originalSummary : "";
+        }
+
+        /**
+         * Checks if this search result item matches the provided query.
+         * Uses case-insensitive matching against the searchable text.
+         */
+        @Override
+        boolean matchesQuery(String query) {
+            return searchableText.contains(Utils.removePunctuationToLowercase(query));
+        }
+
+        /**
+         * Get highlighted entries to show in dialog.
+         */
+        public CharSequence[] getHighlightedEntries() {
+            return highlightedEntries;
+        }
+
+        /**
+         * Whether highlighting is applied to entries.
+         */
+        public boolean isEntriesHighlightingApplied() {
+            return entriesHighlightingApplied;
+        }
+
+        /**
+         * Highlights the search query in the title and summary.
+         */
+        @Override
+        void applyHighlighting(Pattern queryPattern) {
+            this.lastQueryPattern = queryPattern;
+            // Highlight the title.
+            highlightedTitle = highlightSearchQuery(originalTitle, queryPattern);
+
+            // Get the current effective summary and highlight it.
+            CharSequence currentSummary = getCurrentEffectiveSummary();
+            highlightedSummary = highlightSearchQuery(currentSummary, queryPattern);
+
+            // Highlight the entries.
+            if (preference instanceof ListPreference && originalEntries != null) {
+                highlightedEntries = new CharSequence[originalEntries.length];
+                for (int i = 0, length = originalEntries.length; i < length; i++) {
+                    if (originalEntries[i] != null) {
+                        highlightedEntries[i] = highlightSearchQuery(originalEntries[i], queryPattern);
+                    } else {
+                        highlightedEntries[i] = null;
+                    }
+                }
+                entriesHighlightingApplied = true;
+            }
+
+            highlightingApplied = true;
+        }
+
+        /**
+         * Clears all search query highlighting and restores original state completely.
+         */
+        @Override
+        void clearHighlighting() {
+            if (!highlightingApplied) return;
+
+            // Restore original title.
+            highlightedTitle = originalTitle;
+
+            // Restore current effective summary without highlighting.
+            highlightedSummary = getCurrentEffectiveSummary();
+
+            // Restore original entries.
+            if (originalEntries != null && highlightedEntries != null) {
+                System.arraycopy(originalEntries, 0, highlightedEntries, 0,
+                        Math.min(originalEntries.length, highlightedEntries.length));
+            }
+
+            entriesHighlightingApplied = false;
+            highlightingApplied = false;
+            lastQueryPattern = null;
+        }
+
+        /**
+         * Refreshes highlighting for dynamic summaries (like switch preferences).
+         * Should be called when the preference state changes.
+         */
+        public void refreshHighlighting() {
+            if (highlightingApplied && lastQueryPattern != null) {
+                CharSequence currentSummary = getCurrentEffectiveSummary();
+                highlightedSummary = highlightSearchQuery(currentSummary, lastQueryPattern);
+            }
+        }
+
+        public void setColor(int newColor) {
+            this.color = newColor;
+        }
+
+        @ColorInt
+        public int getColor() {
+            return color;
+        }
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
new file mode 100644
index 000000000..f1893a232
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
@@ -0,0 +1,621 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+import static app.revanced.extension.shared.settings.search.BaseSearchViewController.DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON;
+
+import android.animation.AnimatorSet;
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.ui.ColorDot;
+
+/**
+ * Abstract adapter for displaying search results in overlay ListView with ViewHolder pattern.
+ */
+@SuppressWarnings("deprecation")
+public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchResultItem> {
+    protected final LayoutInflater inflater;
+    protected final BaseSearchViewController.BasePreferenceFragment fragment;
+    protected final BaseSearchViewController searchViewController;
+    protected AnimatorSet currentAnimator;
+    protected abstract PreferenceScreen getMainPreferenceScreen();
+
+    protected static final int BLINK_DURATION = 400;
+    protected static final int PAUSE_BETWEEN_BLINKS = 100;
+
+    protected static final int ID_PREFERENCE_TITLE = getResourceIdentifierOrThrow(
+            "preference_title", "id");
+    protected static final int ID_PREFERENCE_SUMMARY = getResourceIdentifierOrThrow(
+            "preference_summary", "id");
+    protected static final int ID_PREFERENCE_PATH = getResourceIdentifierOrThrow(
+            "preference_path", "id");
+    protected static final int ID_PREFERENCE_SWITCH = getResourceIdentifierOrThrow(
+            "preference_switch", "id");
+    protected static final int ID_PREFERENCE_COLOR_DOT = getResourceIdentifierOrThrow(
+            "preference_color_dot", "id");
+
+    protected static class RegularViewHolder {
+        TextView titleView;
+        TextView summaryView;
+    }
+
+    protected static class SwitchViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        Switch switchWidget;
+    }
+
+    protected static class ColorViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        View colorDot;
+    }
+
+    protected static class GroupHeaderViewHolder {
+        TextView pathView;
+    }
+
+    protected static class NoResultsViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        ImageView iconView;
+    }
+
+    public BaseSearchResultsAdapter(Context context, List<BaseSearchResultItem> items,
+                                    BaseSearchViewController.BasePreferenceFragment fragment,
+                                    BaseSearchViewController searchViewController) {
+        super(context, 0, items);
+        this.inflater = LayoutInflater.from(context);
+        this.fragment = fragment;
+        this.searchViewController = searchViewController;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        BaseSearchResultItem item = getItem(position);
+        return item == null ? 0 : item.preferenceType.ordinal();
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return BaseSearchResultItem.ViewType.values().length;
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+        BaseSearchResultItem item = getItem(position);
+        if (item == null) return new View(getContext());
+        // Use the ViewType enum.
+        BaseSearchResultItem.ViewType viewType = item.preferenceType;
+        // Create or reuse preference view based on type.
+        return createPreferenceView(item, convertView, viewType, parent);
+    }
+
+    @Override
+    public boolean isEnabled(int position) {
+        BaseSearchResultItem item = getItem(position);
+        // Disable for NO_RESULTS items to prevent ripple/selection.
+        return item != null && item.preferenceType != BaseSearchResultItem.ViewType.NO_RESULTS;
+    }
+
+    /**
+     * Creates or reuses a view for the given SearchResultItem.
+     * <p>
+     * Thanks to {@link #getItemViewType(int)} and {@link #getViewTypeCount()}, ListView knows
+     * how many different row types exist and keeps a separate "recycling pool" for each.
+     * That means convertView passed here is ALWAYS of the correct type for this position.
+     * So only need to check if (view == null), and if so – inflate a new layout and create the proper ViewHolder.
+     */
+    protected View createPreferenceView(BaseSearchResultItem item, View convertView,
+                                        BaseSearchResultItem.ViewType viewType, ViewGroup parent) {
+        View view = convertView;
+        if (view == null) {
+            view = inflateViewForType(viewType, parent);
+            createViewHolderForType(view, viewType);
+        }
+
+        // Retrieve the cached ViewHolder.
+        Object holder = view.getTag();
+        bindDataToViewHolder(item, holder, viewType, view);
+        return view;
+    }
+
+    protected View inflateViewForType(BaseSearchResultItem.ViewType viewType, ViewGroup parent) {
+        return inflater.inflate(viewType.getLayoutResourceId(), parent, false);
+    }
+
+    protected void createViewHolderForType(View view, BaseSearchResultItem.ViewType viewType) {
+        switch (viewType) {
+            case REGULAR, LIST, URL_LINK -> {
+                RegularViewHolder regularHolder = new RegularViewHolder();
+                regularHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                regularHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                view.setTag(regularHolder);
+            }
+            case SWITCH -> {
+                SwitchViewHolder switchHolder = new SwitchViewHolder();
+                switchHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                switchHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                switchHolder.switchWidget = view.findViewById(ID_PREFERENCE_SWITCH);
+                view.setTag(switchHolder);
+            }
+            case COLOR_PICKER -> {
+                ColorViewHolder colorHolder = new ColorViewHolder();
+                colorHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                colorHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                colorHolder.colorDot = view.findViewById(ID_PREFERENCE_COLOR_DOT);
+                view.setTag(colorHolder);
+            }
+            case GROUP_HEADER -> {
+                GroupHeaderViewHolder groupHolder = new GroupHeaderViewHolder();
+                groupHolder.pathView = view.findViewById(ID_PREFERENCE_PATH);
+                view.setTag(groupHolder);
+            }
+            case NO_RESULTS -> {
+                NoResultsViewHolder noResultsHolder = new NoResultsViewHolder();
+                noResultsHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                noResultsHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                noResultsHolder.iconView = view.findViewById(android.R.id.icon);
+                view.setTag(noResultsHolder);
+            }
+            default -> throw new IllegalStateException("Unknown viewType: " + viewType);
+        }
+    }
+
+    protected void bindDataToViewHolder(BaseSearchResultItem item, Object holder,
+                                        BaseSearchResultItem.ViewType viewType, View view) {
+        switch (viewType) {
+            case REGULAR, URL_LINK, LIST -> bindRegularViewHolder(item, (RegularViewHolder) holder, view);
+            case SWITCH -> bindSwitchViewHolder(item, (SwitchViewHolder) holder, view);
+            case COLOR_PICKER -> bindColorViewHolder(item, (ColorViewHolder) holder, view);
+            case GROUP_HEADER -> bindGroupHeaderViewHolder(item, (GroupHeaderViewHolder) holder, view);
+            case NO_RESULTS -> bindNoResultsViewHolder(item, (NoResultsViewHolder) holder);
+            default -> throw new IllegalStateException("Unknown viewType: " + viewType);
+        }
+    }
+
+    protected void bindRegularViewHolder(BaseSearchResultItem item, RegularViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        prefItem.refreshHighlighting();
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        setupPreferenceView(view, holder.titleView, holder.summaryView, prefItem.preference,
+                () -> {
+                    handlePreferenceClick(prefItem.preference);
+                    if (prefItem.preference instanceof ListPreference) {
+                        prefItem.refreshHighlighting();
+                        holder.summaryView.setText(prefItem.getCurrentEffectiveSummary());
+                        holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+                        notifyDataSetChanged();
+                    }
+                },
+                () -> navigateAndScrollToPreference(item));
+    }
+
+    protected void bindSwitchViewHolder(BaseSearchResultItem item, SwitchViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        SwitchPreference switchPref = (SwitchPreference) prefItem.preference;
+        holder.titleView.setText(item.highlightedTitle);
+        holder.switchWidget.setBackground(null); // Remove ripple/highlight.
+        // Sync switch state with preference without animation.
+        boolean currentState = switchPref.isChecked();
+        if (holder.switchWidget.isChecked() != currentState) {
+            holder.switchWidget.setChecked(currentState);
+            holder.switchWidget.jumpDrawablesToCurrentState();
+        }
+        prefItem.refreshHighlighting();
+        holder.summaryView.setText(prefItem.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+        setupPreferenceView(view, holder.titleView, holder.summaryView, switchPref,
+                () -> {
+                    boolean newState = !switchPref.isChecked();
+                    switchPref.setChecked(newState);
+                    holder.switchWidget.setChecked(newState);
+                    prefItem.refreshHighlighting();
+                    holder.summaryView.setText(prefItem.getCurrentEffectiveSummary());
+                    holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+                    if (switchPref.getOnPreferenceChangeListener() != null) {
+                        switchPref.getOnPreferenceChangeListener().onPreferenceChange(switchPref, newState);
+                    }
+                    notifyDataSetChanged();
+                },
+                () -> navigateAndScrollToPreference(item));
+        holder.switchWidget.setEnabled(switchPref.isEnabled());
+    }
+
+    protected void bindColorViewHolder(BaseSearchResultItem item, ColorViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        ColorDot.applyColorDot(holder.colorDot, prefItem.getColor(), prefItem.preference.isEnabled());
+        setupPreferenceView(view, holder.titleView, holder.summaryView, prefItem.preference,
+                () -> handlePreferenceClick(prefItem.preference),
+                () -> navigateAndScrollToPreference(item));
+    }
+
+    protected void bindGroupHeaderViewHolder(BaseSearchResultItem item, GroupHeaderViewHolder holder, View view) {
+        holder.pathView.setText(item.highlightedTitle);
+        view.setOnClickListener(v -> navigateToTargetScreen(item));
+    }
+
+    protected void bindNoResultsViewHolder(BaseSearchResultItem item, NoResultsViewHolder holder) {
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        holder.iconView.setImageResource(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+    }
+
+    /**
+     * Sets up a preference view with click listeners and proper enabled state handling.
+     */
+    protected void setupPreferenceView(View view, TextView titleView, TextView summaryView, Preference preference,
+                                       Runnable onClickAction, Runnable onLongClickAction) {
+        boolean enabled = preference.isEnabled();
+
+        // To enable long-click navigation for disabled settings, manually control the enabled state of the title
+        // and summary and disable the ripple effect instead of using 'view.setEnabled(enabled)'.
+
+        titleView.setEnabled(enabled);
+        summaryView.setEnabled(enabled);
+
+        if (!enabled) view.setBackground(null); // Disable ripple effect.
+
+        // In light mode, alpha 0.5 is applied to a disabled title automatically,
+        // but in dark mode it needs to be applied manually.
+        if (Utils.isDarkModeEnabled()) {
+            titleView.setAlpha(enabled ? 1.0f : ColorPickerPreference.DISABLED_ALPHA);
+        }
+        // Set up click and long-click listeners.
+        view.setOnClickListener(enabled ? v -> onClickAction.run() : null);
+        view.setOnLongClickListener(v -> {
+            onLongClickAction.run();
+            return true;
+        });
+    }
+
+    /**
+     * Navigates to the settings screen containing the given search result item and triggers scrolling.
+     */
+    protected void navigateAndScrollToPreference(BaseSearchResultItem item) {
+        // No navigation for URL_LINK items.
+        if (item.preferenceType == BaseSearchResultItem.ViewType.URL_LINK) return;
+
+        PreferenceScreen targetScreen = navigateToTargetScreen(item);
+        if (targetScreen == null) return;
+        if (!(item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem)) return;
+
+        Preference targetPreference = prefItem.preference;
+
+        fragment.getView().post(() -> {
+            ListView listView = targetScreen == getMainPreferenceScreen()
+                    ? getPreferenceListView()
+                    : targetScreen.getDialog().findViewById(android.R.id.list);
+
+            if (listView == null) return;
+
+            int targetPosition = findPreferencePosition(targetPreference, listView);
+            if (targetPosition == -1) return;
+
+            int firstVisible = listView.getFirstVisiblePosition();
+            int lastVisible = listView.getLastVisiblePosition();
+
+            if (targetPosition >= firstVisible && targetPosition <= lastVisible) {
+                // The preference is already visible, but still scroll it to the bottom of the list for consistency.
+                View child = listView.getChildAt(targetPosition - firstVisible);
+                if (child != null) {
+                    // Calculate how much to scroll so the item is aligned at the bottom.
+                    int scrollAmount = child.getBottom() - listView.getHeight();
+                    if (scrollAmount > 0) {
+                        // Perform smooth scroll animation for better user experience.
+                        listView.smoothScrollBy(scrollAmount, 300);
+                    }
+                }
+                // Highlight the preference once it is positioned.
+                highlightPreferenceAtPosition(listView, targetPosition);
+            } else {
+                // The preference is outside of the current visible range, scroll to it from the top.
+                listView.smoothScrollToPositionFromTop(targetPosition, 0);
+
+                Handler handler = new Handler(Looper.getMainLooper());
+                // Fallback runnable in case the OnScrollListener does not trigger.
+                Runnable fallback = () -> {
+                    listView.setOnScrollListener(null);
+                    highlightPreferenceAtPosition(listView, targetPosition);
+                };
+                // Post fallback with a small delay.
+                handler.postDelayed(fallback, 350);
+
+                listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                    private boolean isScrolling = false;
+
+                    @Override
+                    public void onScrollStateChanged(AbsListView view, int scrollState) {
+                        if (scrollState == SCROLL_STATE_TOUCH_SCROLL || scrollState == SCROLL_STATE_FLING) {
+                            // Mark that scrolling has started.
+                            isScrolling = true;
+                        }
+                        if (scrollState == SCROLL_STATE_IDLE && isScrolling) {
+                            // Scrolling is finished, cleanup listener and cancel fallback.
+                            isScrolling = false;
+                            listView.setOnScrollListener(null);
+                            handler.removeCallbacks(fallback);
+                            // Highlight the target preference when scrolling is done.
+                            highlightPreferenceAtPosition(listView, targetPosition);
+                        }
+                    }
+
+                    @Override
+                    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {}
+                });
+            }
+        });
+    }
+
+    /**
+     * Navigates to the final PreferenceScreen using preference keys or titles as fallback.
+     */
+    protected PreferenceScreen navigateToTargetScreen(BaseSearchResultItem item) {
+        PreferenceScreen currentScreen = getMainPreferenceScreen();
+        Preference targetPref = null;
+
+        // Try key-based navigation first.
+        if (item.navigationKeys != null && !item.navigationKeys.isEmpty()) {
+            String finalKey = item.navigationKeys.get(item.navigationKeys.size() - 1);
+            targetPref = findPreferenceByKey(currentScreen, finalKey);
+        }
+
+        // Fallback to title-based navigation.
+        if (targetPref == null && !TextUtils.isEmpty(item.navigationPath)) {
+            String[] pathSegments = item.navigationPath.split(" > ");
+            String finalSegment = pathSegments[pathSegments.length - 1].trim();
+            if (!TextUtils.isEmpty(finalSegment)) {
+                targetPref = findPreferenceByTitle(currentScreen, finalSegment);
+            }
+        }
+
+        if (targetPref instanceof PreferenceScreen targetScreen) {
+            handlePreferenceClick(targetScreen);
+            return targetScreen;
+        }
+
+        return currentScreen;
+    }
+
+    /**
+     * Recursively searches for a preference by title in a preference group.
+     */
+    protected Preference findPreferenceByTitle(PreferenceGroup group, String title) {
+        for (int i = 0; i < group.getPreferenceCount(); i++) {
+            Preference pref = group.getPreference(i);
+            CharSequence prefTitle = pref.getTitle();
+            if (prefTitle != null && (prefTitle.toString().trim().equalsIgnoreCase(title)
+                    || normalizeString(prefTitle.toString()).equals(normalizeString(title)))) {
+                return pref;
+            }
+            if (pref instanceof PreferenceGroup) {
+                Preference found = findPreferenceByTitle((PreferenceGroup) pref, title);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Normalizes string for comparison (removes extra characters, spaces etc).
+     */
+    protected String normalizeString(String input) {
+        if (TextUtils.isEmpty(input)) return "";
+        return input.trim().toLowerCase().replaceAll("\\s+", " ").replaceAll("[^\\w\\s]", "");
+    }
+
+    /**
+     * Gets the ListView from the PreferenceFragment.
+     */
+    protected ListView getPreferenceListView() {
+        View fragmentView = fragment.getView();
+        if (fragmentView != null) {
+            ListView listView = findListViewInViewGroup(fragmentView);
+            if (listView != null) {
+                return listView;
+            }
+        }
+        return fragment.getActivity().findViewById(android.R.id.list);
+    }
+
+    /**
+     * Recursively searches for a ListView in a ViewGroup.
+     */
+    protected ListView findListViewInViewGroup(View view) {
+        if (view instanceof ListView) {
+            return (ListView) view;
+        }
+        if (view instanceof ViewGroup group) {
+            for (int i = 0; i < group.getChildCount(); i++) {
+                ListView result = findListViewInViewGroup(group.getChildAt(i));
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Finds the position of a preference in the ListView adapter.
+     */
+    protected int findPreferencePosition(Preference targetPreference, ListView listView) {
+        ListAdapter adapter = listView.getAdapter();
+        if (adapter == null) {
+            return -1;
+        }
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            Object item = adapter.getItem(i);
+            if (item == targetPreference) {
+                return i;
+            }
+            if (item instanceof Preference pref && targetPreference.getKey() != null) {
+                if (targetPreference.getKey().equals(pref.getKey())) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Highlights a preference at the specified position with a blink effect.
+     */
+    protected void highlightPreferenceAtPosition(ListView listView, int position) {
+        int firstVisible = listView.getFirstVisiblePosition();
+        if (position < firstVisible || position > listView.getLastVisiblePosition()) {
+            return;
+        }
+
+        View itemView = listView.getChildAt(position - firstVisible);
+        if (itemView != null) {
+            blinkView(itemView);
+        }
+    }
+
+    /**
+     * Creates a smooth double-blink effect on a view's background without affecting the text.
+     * @param view The View to apply the animation to.
+     */
+    protected void blinkView(View view) {
+        // If a previous animation is still running, cancel it to prevent conflicts.
+        if (currentAnimator != null && currentAnimator.isRunning()) {
+            currentAnimator.cancel();
+        }
+        int startColor = Utils.getAppBackgroundColor();
+        int highlightColor = Utils.adjustColorBrightness(
+                startColor,
+                Utils.isDarkModeEnabled() ? 1.25f : 0.8f
+        );
+        // Animator for transitioning from the start color to the highlight color.
+        ObjectAnimator fadeIn = ObjectAnimator.ofObject(
+                view,
+                "backgroundColor",
+                new ArgbEvaluator(),
+                startColor,
+                highlightColor
+        );
+        fadeIn.setDuration(BLINK_DURATION);
+        // Animator to return to the start color.
+        ObjectAnimator fadeOut = ObjectAnimator.ofObject(
+                view,
+                "backgroundColor",
+                new ArgbEvaluator(),
+                highlightColor,
+                startColor
+        );
+        fadeOut.setDuration(BLINK_DURATION);
+
+        currentAnimator = new AnimatorSet();
+        // Create the sequence: fadeIn -> fadeOut -> (pause) -> fadeIn -> fadeOut.
+        AnimatorSet firstBlink = new AnimatorSet();
+        firstBlink.playSequentially(fadeIn, fadeOut);
+        AnimatorSet secondBlink = new AnimatorSet();
+        secondBlink.playSequentially(fadeIn.clone(), fadeOut.clone()); // Use clones for the second blink.
+
+        currentAnimator.play(secondBlink).after(firstBlink).after(PAUSE_BETWEEN_BLINKS);
+        currentAnimator.start();
+    }
+
+    /**
+     * Recursively finds a preference by key in a preference group.
+     */
+    protected Preference findPreferenceByKey(PreferenceGroup group, String key) {
+        if (group == null || TextUtils.isEmpty(key)) {
+            return null;
+        }
+
+        // First search on current level.
+        for (int i = 0; i < group.getPreferenceCount(); i++) {
+            Preference pref = group.getPreference(i);
+            if (key.equals(pref.getKey())) {
+                return pref;
+            }
+            if (pref instanceof PreferenceGroup) {
+                Preference found = findPreferenceByKey((PreferenceGroup) pref, key);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Handles preference click actions by invoking the preference's performClick method via reflection.
+     */
+    @SuppressWarnings("all")
+    private void handlePreferenceClick(Preference preference) {
+        try {
+            if (preference instanceof CustomDialogListPreference listPref) {
+                BaseSearchResultItem.PreferenceSearchItem searchItem =
+                        searchViewController.findSearchItemByPreference(preference);
+                if (searchItem != null && searchItem.isEntriesHighlightingApplied()) {
+                    listPref.setHighlightedEntriesForDialog(searchItem.getHighlightedEntries());
+                }
+            }
+
+            Method m = Preference.class.getDeclaredMethod("performClick", PreferenceScreen.class);
+            m.setAccessible(true);
+            m.invoke(preference, fragment.getPreferenceScreenForSearch());
+        } catch (Exception e) {
+            Logger.printException(() -> "Failed to invoke performClick()", e);
+        }
+    }
+
+    /**
+     * Checks if a preference has navigation capability (can open a new screen).
+     */
+    boolean hasNavigationCapability(Preference preference) {
+        // PreferenceScreen always allows navigation.
+        if (preference instanceof PreferenceScreen) return true;
+        // UrlLinkPreference does not navigate to a new screen, it opens an external URL.
+        if (preference instanceof UrlLinkPreference) return false;
+        // Other group types that might have their own screens.
+        if (preference instanceof PreferenceGroup) {
+            // Check if it has its own fragment or intent.
+            return preference.getIntent() != null || preference.getFragment() != null;
+        }
+        return false;
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchViewController.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchViewController.java
new file mode 100644
index 000000000..814ae29c3
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchViewController.java
@@ -0,0 +1,653 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.SearchView;
+import android.widget.Toolbar;
+
+import androidx.annotation.ColorInt;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.AppLanguage;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
+
+/**
+ * Abstract controller for managing the overlay search view in ReVanced settings.
+ * Subclasses must implement app-specific preference handling.
+ */
+@SuppressWarnings("deprecation")
+public abstract class BaseSearchViewController {
+    protected SearchView searchView;
+    protected FrameLayout searchContainer;
+    protected FrameLayout overlayContainer;
+    protected final Toolbar toolbar;
+    protected final Activity activity;
+    protected final BasePreferenceFragment fragment;
+    protected final CharSequence originalTitle;
+    protected BaseSearchResultsAdapter searchResultsAdapter;
+    protected final List<BaseSearchResultItem> allSearchItems;
+    protected final List<BaseSearchResultItem> filteredSearchItems;
+    protected final Map<String, BaseSearchResultItem> keyToSearchItem;
+    protected final InputMethodManager inputMethodManager;
+    protected SearchHistoryManager searchHistoryManager;
+    protected boolean isSearchActive;
+    protected boolean isShowingSearchHistory;
+
+    protected static final int MAX_SEARCH_RESULTS = 50; // Maximum number of search results displayed.
+
+    protected static final int ID_REVANCED_SEARCH_VIEW = getResourceIdentifierOrThrow("revanced_search_view", "id");
+    protected static final int ID_REVANCED_SEARCH_VIEW_CONTAINER = getResourceIdentifierOrThrow("revanced_search_view_container", "id");
+    protected static final int ID_ACTION_SEARCH = getResourceIdentifierOrThrow("action_search", "id");
+    protected static final int ID_REVANCED_SETTINGS_FRAGMENTS = getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+    public static final int DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON =
+            getResourceIdentifierOrThrow("revanced_settings_search_icon", "drawable");
+    protected static final int MENU_REVANCED_SEARCH_MENU =
+            getResourceIdentifierOrThrow("revanced_search_menu", "menu");
+
+    /**
+     * Constructs a new BaseSearchViewController instance.
+     *
+     * @param activity The activity hosting the search view.
+     * @param toolbar  The toolbar containing the search action.
+     * @param fragment The preference fragment to manage search preferences.
+     */
+    protected BaseSearchViewController(Activity activity, Toolbar toolbar, BasePreferenceFragment fragment) {
+        this.activity = activity;
+        this.toolbar = toolbar;
+        this.fragment = fragment;
+        this.originalTitle = toolbar.getTitle();
+        this.allSearchItems = new ArrayList<>();
+        this.filteredSearchItems = new ArrayList<>();
+        this.keyToSearchItem = new HashMap<>();
+        this.inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        this.isShowingSearchHistory = false;
+
+        // Initialize components
+        initializeSearchView();
+        initializeOverlayContainer();
+        initializeSearchHistoryManager();
+        setupToolbarMenu();
+        setupListeners();
+    }
+
+    /**
+     * Initializes the search view with proper configurations, such as background, query hint, and RTL support.
+     */
+    private void initializeSearchView() {
+        // Retrieve SearchView and container from XML.
+        searchView = activity.findViewById(ID_REVANCED_SEARCH_VIEW);
+        EditText searchEditText = searchView.findViewById(Utils.getResourceIdentifierOrThrow(
+                "android:id/search_src_text", null));
+        // Disable fullscreen keyboard mode.
+        searchEditText.setImeOptions(searchEditText.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        searchContainer = activity.findViewById(ID_REVANCED_SEARCH_VIEW_CONTAINER);
+
+        // Set background and query hint.
+        searchView.setBackground(createBackgroundDrawable());
+        searchView.setQueryHint(str("revanced_settings_search_hint"));
+
+        // Configure RTL support based on app language.
+        AppLanguage appLanguage = BaseSettings.REVANCED_LANGUAGE.get();
+        if (Utils.isRightToLeftLocale(appLanguage.getLocale())) {
+            searchView.setTextDirection(View.TEXT_DIRECTION_RTL);
+            searchView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+        }
+    }
+
+    /**
+     * Initializes the overlay container for displaying search results and history.
+     */
+    private void initializeOverlayContainer() {
+        // Create overlay container for search results and history.
+        overlayContainer = new FrameLayout(activity);
+        overlayContainer.setVisibility(View.GONE);
+        overlayContainer.setBackgroundColor(Utils.getAppBackgroundColor());
+        overlayContainer.setElevation(Utils.dipToPixels(8));
+
+        // Container for search results.
+        FrameLayout searchResultsContainer = new FrameLayout(activity);
+        searchResultsContainer.setVisibility(View.VISIBLE);
+
+        // Create a ListView for the results.
+        ListView searchResultsListView = new ListView(activity);
+        searchResultsListView.setDivider(null);
+        searchResultsListView.setDividerHeight(0);
+        searchResultsAdapter = createSearchResultsAdapter();
+        searchResultsListView.setAdapter(searchResultsAdapter);
+
+        // Add results list into container.
+        searchResultsContainer.addView(searchResultsListView, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add results container into overlay.
+        overlayContainer.addView(searchResultsContainer, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add overlay to the main content container.
+        FrameLayout mainContainer = activity.findViewById(ID_REVANCED_SETTINGS_FRAGMENTS);
+        if (mainContainer != null) {
+            FrameLayout.LayoutParams overlayParams = new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT);
+            overlayParams.gravity = Gravity.TOP;
+            mainContainer.addView(overlayContainer, overlayParams);
+        }
+    }
+
+    /**
+     * Initializes the search history manager with the specified overlay container and listener.
+     */
+    private void initializeSearchHistoryManager() {
+        searchHistoryManager = new SearchHistoryManager(activity, overlayContainer, query -> {
+            searchView.setQuery(query, true);
+            hideSearchHistory();
+        });
+    }
+
+    // Abstract methods that subclasses must implement.
+    protected abstract BaseSearchResultsAdapter createSearchResultsAdapter();
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    protected abstract boolean isSpecialPreferenceGroup(Preference preference);
+    protected abstract void setupSpecialPreferenceListeners(BaseSearchResultItem item);
+
+    // Abstract interface for preference fragments.
+    public interface BasePreferenceFragment {
+        PreferenceScreen getPreferenceScreenForSearch();
+        android.view.View getView();
+        Activity getActivity();
+    }
+
+    /**
+     * Determines whether a preference should be included in the search index.
+     *
+     * @param preference   The preference to evaluate.
+     * @param currentDepth The current depth in the preference hierarchy.
+     * @param includeDepth The maximum depth to include in the search index.
+     * @return True if the preference should be included, false otherwise.
+     */
+    protected boolean shouldIncludePreference(Preference preference, int currentDepth, int includeDepth) {
+        return includeDepth <= currentDepth
+                && !(preference instanceof PreferenceCategory)
+                && !isSpecialPreferenceGroup(preference)
+                && !(preference instanceof PreferenceScreen);
+    }
+
+    /**
+     * Sets up the toolbar menu for the search action.
+     */
+    protected void setupToolbarMenu() {
+        toolbar.inflateMenu(MENU_REVANCED_SEARCH_MENU);
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == ID_ACTION_SEARCH && !isSearchActive) {
+                openSearch();
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * Configures listeners for the search view and toolbar navigation.
+     */
+    protected void setupListeners() {
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                try {
+                    String queryTrimmed = query.trim();
+                    if (!queryTrimmed.isEmpty()) {
+                        searchHistoryManager.saveSearchQuery(queryTrimmed);
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextSubmit failure", ex);
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                try {
+                    Logger.printDebug(() -> "Search query: " + newText);
+
+                    String trimmedText = newText.trim();
+                    if (!isSearchActive) {
+                        Logger.printDebug(() -> "Search is not active, skipping query processing");
+                        return true;
+                    }
+
+                    if (trimmedText.isEmpty()) {
+                        // If empty query: show history.
+                        hideSearchResults();
+                        showSearchHistory();
+                    } else {
+                        // If has search text: hide history and show search results.
+                        hideSearchHistory();
+                        filterAndShowResults(newText);
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextChange failure", ex);
+                }
+                return true;
+            }
+        });
+        // Set navigation click listener.
+        toolbar.setNavigationOnClickListener(view -> {
+            if (isSearchActive) {
+                closeSearch();
+            } else {
+                activity.finish();
+            }
+        });
+    }
+
+    /**
+     * Initializes search data by collecting all searchable preferences from the fragment.
+     * This method should be called after the preference fragment is fully loaded.
+     * Runs on the UI thread to ensure proper access to preference components.
+     */
+    public void initializeSearchData() {
+        allSearchItems.clear();
+        keyToSearchItem.clear();
+        // Wait until fragment is properly initialized.
+        activity.runOnUiThread(() -> {
+            try {
+                PreferenceScreen screen = fragment.getPreferenceScreenForSearch();
+                if (screen != null) {
+                    collectSearchablePreferences(screen);
+                    for (BaseSearchResultItem item : allSearchItems) {
+                        if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                            String key = prefItem.preference.getKey();
+                            if (key != null) {
+                                keyToSearchItem.put(key, item);
+                            }
+                        }
+                    }
+                    setupPreferenceListeners();
+                    Logger.printDebug(() -> "Collected " + allSearchItems.size() + " searchable preferences");
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "Failed to initialize search data", ex);
+            }
+        });
+    }
+
+    /**
+     * Sets up listeners for preferences to keep search results in sync when preference values change.
+     */
+    protected void setupPreferenceListeners() {
+        for (BaseSearchResultItem item : allSearchItems) {
+            // Skip non-preference items.
+            if (!(item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem)) continue;
+            Preference pref = prefItem.preference;
+
+            if (pref instanceof ColorPickerPreference colorPref) {
+                colorPref.setOnColorChangeListener((prefKey, newColor) -> {
+                    BaseSearchResultItem.PreferenceSearchItem searchItem =
+                            (BaseSearchResultItem.PreferenceSearchItem) keyToSearchItem.get(prefKey);
+                    if (searchItem != null) {
+                        searchItem.setColor(newColor);
+                        refreshSearchResults();
+                    }
+                });
+            } else if (pref instanceof CustomDialogListPreference listPref) {
+                listPref.setOnPreferenceChangeListener((preference, newValue) -> {
+                    BaseSearchResultItem.PreferenceSearchItem searchItem =
+                            (BaseSearchResultItem.PreferenceSearchItem) keyToSearchItem.get(preference.getKey());
+                    if (searchItem == null) return true;
+
+                    int index = listPref.findIndexOfValue(newValue.toString());
+                    if (index >= 0) {
+                        // Check if a static summary is set.
+                        boolean isStaticSummary = listPref.getStaticSummary() != null;
+                        if (!isStaticSummary) {
+                            // Only update summary if it is not static.
+                            CharSequence newSummary = listPref.getEntries()[index];
+                            listPref.setSummary(newSummary);
+                        }
+                    }
+
+                    listPref.clearHighlightedEntriesForDialog();
+                    searchItem.refreshHighlighting();
+                    refreshSearchResults();
+                    return true;
+                });
+            }
+
+            // Let subclasses handle special preferences.
+            setupSpecialPreferenceListeners(item);
+        }
+    }
+
+    /**
+     * Collects searchable preferences from a preference group.
+     */
+    protected void collectSearchablePreferences(PreferenceGroup group) {
+        collectSearchablePreferencesWithKeys(group, "", new ArrayList<>(), 1, 0);
+    }
+
+    /**
+     * Collects searchable preferences with their navigation paths and keys.
+     *
+     * @param group        The preference group to collect from.
+     * @param parentPath   The navigation path of the parent group.
+     * @param parentKeys   The keys of parent preferences.
+     * @param includeDepth The maximum depth to include in the search index.
+     * @param currentDepth The current depth in the preference hierarchy.
+     */
+    protected void collectSearchablePreferencesWithKeys(PreferenceGroup group, String parentPath,
+                                                        List<String> parentKeys, int includeDepth, int currentDepth) {
+        if (group == null) return;
+
+        for (int i = 0, count = group.getPreferenceCount(); i < count; i++) {
+            Preference preference = group.getPreference(i);
+
+            // Add to search results only if it is not a category, special group, or PreferenceScreen.
+            if (shouldIncludePreference(preference, currentDepth, includeDepth)) {
+                allSearchItems.add(new BaseSearchResultItem.PreferenceSearchItem(
+                        preference, parentPath, parentKeys));
+            }
+
+            // If the preference is a group, recurse into it.
+            if (preference instanceof PreferenceGroup subGroup) {
+                String newPath = parentPath;
+                List<String> newKeys = new ArrayList<>(parentKeys);
+
+                // Append the group title to the path and save key for navigation.
+                if (!isSpecialPreferenceGroup(preference)
+                        && !(preference instanceof NoTitlePreferenceCategory)) {
+                    CharSequence title = preference.getTitle();
+                    if (!TextUtils.isEmpty(title)) {
+                        newPath = TextUtils.isEmpty(parentPath)
+                                ? title.toString()
+                                : parentPath + " > " + title;
+                    }
+
+                    // Add key for navigation if this is a PreferenceScreen or group with navigation capability.
+                    String key = preference.getKey();
+                    if (!TextUtils.isEmpty(key) && (preference instanceof PreferenceScreen
+                            || searchResultsAdapter.hasNavigationCapability(preference))) {
+                        newKeys.add(key);
+                    }
+                }
+
+                collectSearchablePreferencesWithKeys(subGroup, newPath, newKeys, includeDepth, currentDepth + 1);
+            }
+        }
+    }
+
+    /**
+     * Filters all search items based on the provided query and displays results in the overlay.
+     * Applies highlighting to matching text and shows a "no results" message if nothing matches.
+     */
+    protected void filterAndShowResults(String query) {
+        hideSearchHistory();
+        // Keep track of the previously displayed items to clear their highlights.
+        List<BaseSearchResultItem> previouslyDisplayedItems = new ArrayList<>(filteredSearchItems);
+
+        filteredSearchItems.clear();
+
+        String queryLower = Utils.removePunctuationToLowercase(query);
+        Pattern queryPattern = Pattern.compile(Pattern.quote(queryLower), Pattern.CASE_INSENSITIVE);
+
+        // Clear highlighting only for items that were previously visible.
+        // This avoids iterating through all items on every keystroke during filtering.
+        for (BaseSearchResultItem item : previouslyDisplayedItems) {
+            item.clearHighlighting();
+        }
+
+        // Collect matched items first.
+        List<BaseSearchResultItem> matched = new ArrayList<>();
+        int matchCount = 0;
+        for (BaseSearchResultItem item : allSearchItems) {
+            if (matchCount >= MAX_SEARCH_RESULTS) break; // Stop after collecting max results.
+            if (item.matchesQuery(queryLower)) {
+                item.applyHighlighting(queryPattern);
+                matched.add(item);
+                matchCount++;
+            }
+        }
+
+        // Build filteredSearchItems, inserting parent enablers for disabled dependents.
+        Set<String> addedParentKeys = new HashSet<>(2 * matched.size());
+        for (BaseSearchResultItem item : matched) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                String key = prefItem.preference.getKey();
+                Setting<?> setting = (key != null) ? Setting.getSettingFromPath(key) : null;
+                if (setting != null && !setting.isAvailable()) {
+                    List<Setting<?>> parentSettings = setting.getParentSettings();
+                    for (Setting<?> parentSetting : parentSettings) {
+                        BaseSearchResultItem parentItem = keyToSearchItem.get(parentSetting.key);
+                        if (parentItem != null && !addedParentKeys.contains(parentSetting.key)) {
+                            if (!parentItem.matchesQuery(queryLower)) {
+                                // Apply highlighting to parent items even if they don't match the query.
+                                // This ensures they get their current effective summary calculated.
+                                parentItem.applyHighlighting(queryPattern);
+                                filteredSearchItems.add(parentItem);
+                            }
+                            addedParentKeys.add(parentSetting.key);
+                        }
+                    }
+                }
+                filteredSearchItems.add(item);
+                if (key != null) {
+                    addedParentKeys.add(key);
+                }
+            }
+        }
+
+        if (!filteredSearchItems.isEmpty()) {
+            //noinspection ComparatorCombinators
+            Collections.sort(filteredSearchItems, (o1, o2) ->
+                    o1.navigationPath.compareTo(o2.navigationPath)
+            );
+            List<BaseSearchResultItem> displayItems = new ArrayList<>();
+            String currentPath = null;
+            for (BaseSearchResultItem item : filteredSearchItems) {
+                if (!item.navigationPath.equals(currentPath)) {
+                    BaseSearchResultItem header = new BaseSearchResultItem.GroupHeaderItem(item.navigationPath, item.navigationKeys);
+                    displayItems.add(header);
+                    currentPath = item.navigationPath;
+                }
+                displayItems.add(item);
+            }
+            filteredSearchItems.clear();
+            filteredSearchItems.addAll(displayItems);
+        }
+        // Show "No results found" if search results are empty.
+        if (filteredSearchItems.isEmpty()) {
+            Preference noResultsPreference = new Preference(activity);
+            noResultsPreference.setKey("no_results_placeholder");
+            noResultsPreference.setTitle(str("revanced_settings_search_no_results_title", query));
+            noResultsPreference.setSummary(str("revanced_settings_search_no_results_summary"));
+            noResultsPreference.setSelectable(false);
+            noResultsPreference.setIcon(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+            filteredSearchItems.add(new BaseSearchResultItem.PreferenceSearchItem(noResultsPreference, "", Collections.emptyList()));
+        }
+
+        searchResultsAdapter.notifyDataSetChanged();
+        overlayContainer.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Opens the search interface by showing the search view and hiding the menu item.
+     * Configures the UI for search mode, shows the keyboard, and displays search suggestions.
+     */
+    protected void openSearch() {
+        isSearchActive = true;
+        toolbar.getMenu().findItem(ID_ACTION_SEARCH).setVisible(false);
+        toolbar.setTitle("");
+        searchContainer.setVisibility(View.VISIBLE);
+        searchView.requestFocus();
+        // Configure soft input mode to adjust layout and show keyboard.
+        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN
+                | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        inputMethodManager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
+        // Always show search history when opening search.
+        showSearchHistory();
+    }
+
+    /**
+     * Closes the search interface and restores the normal UI state.
+     * Hides the overlay, clears search results, dismisses the keyboard, and removes highlighting.
+     */
+    public void closeSearch() {
+        isSearchActive = false;
+        isShowingSearchHistory = false;
+
+        searchHistoryManager.hideSearchHistoryContainer();
+        overlayContainer.setVisibility(View.GONE);
+
+        filteredSearchItems.clear();
+
+        searchContainer.setVisibility(View.GONE);
+        toolbar.getMenu().findItem(ID_ACTION_SEARCH).setVisible(true);
+        toolbar.setTitle(originalTitle);
+        searchView.setQuery("", false);
+        // Hide keyboard and reset soft input mode.
+        inputMethodManager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
+        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        // Clear highlighting for all search items.
+        for (BaseSearchResultItem item : allSearchItems) {
+            item.clearHighlighting();
+        }
+
+        searchResultsAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Shows the search history if enabled.
+     */
+    protected void showSearchHistory() {
+        if (searchHistoryManager.isSearchHistoryEnabled()) {
+            overlayContainer.setVisibility(View.VISIBLE);
+            searchHistoryManager.showSearchHistory();
+            isShowingSearchHistory = true;
+        } else {
+            hideAllOverlays();
+        }
+    }
+
+    /**
+     * Hides the search history container.
+     */
+    protected void hideSearchHistory() {
+        searchHistoryManager.hideSearchHistoryContainer();
+        isShowingSearchHistory = false;
+    }
+
+    /**
+     * Hides all overlay containers, including search results and history.
+     */
+    protected void hideAllOverlays() {
+        hideSearchHistory();
+        hideSearchResults();
+    }
+
+    /**
+     * Hides the search results overlay and clears the filtered results.
+     */
+    protected void hideSearchResults() {
+        overlayContainer.setVisibility(View.GONE);
+        filteredSearchItems.clear();
+        searchResultsAdapter.notifyDataSetChanged();
+        for (BaseSearchResultItem item : allSearchItems) {
+            item.clearHighlighting();
+        }
+    }
+
+    /**
+     * Refreshes the search results display if the search is active and history is not shown.
+     */
+    protected void refreshSearchResults() {
+        if (isSearchActive && !isShowingSearchHistory) {
+            searchResultsAdapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * Finds a search item corresponding to the given preference.
+     *
+     * @param preference The preference to find a search item for.
+     * @return The corresponding PreferenceSearchItem, or null if not found.
+     */
+    public BaseSearchResultItem.PreferenceSearchItem findSearchItemByPreference(Preference preference) {
+        // First, search in filtered results.
+        for (BaseSearchResultItem item : filteredSearchItems) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                if (prefItem.preference == preference) {
+                    return prefItem;
+                }
+            }
+        }
+        // If not found, search in all items.
+        for (BaseSearchResultItem item : allSearchItems) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                if (prefItem.preference == preference) {
+                    return prefItem;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the background color for search view components based on current theme.
+     */
+    @ColorInt
+    public static int getSearchViewBackground() {
+        return Utils.adjustColorBrightness(Utils.getDialogBackgroundColor(), Utils.isDarkModeEnabled() ? 1.11f : 0.95f);
+    }
+
+    /**
+     * Creates a rounded background drawable for the main search view.
+     */
+    protected static GradientDrawable createBackgroundDrawable() {
+        GradientDrawable background = new GradientDrawable();
+        background.setShape(GradientDrawable.RECTANGLE);
+        background.setCornerRadius(Utils.dipToPixels(28));
+        background.setColor(getSearchViewBackground());
+        return background;
+    }
+
+    /**
+     * Return if a search is currently active.
+     */
+    public boolean isSearchActive() {
+        return isSearchActive;
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java
new file mode 100644
index 000000000..41fb20d97
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java
@@ -0,0 +1,377 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+import static app.revanced.extension.shared.settings.BaseSettings.SETTINGS_SEARCH_ENTRIES;
+import static app.revanced.extension.shared.settings.BaseSettings.SETTINGS_SEARCH_HISTORY;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.LinkedList;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.preference.BulletPointPreference;
+import app.revanced.extension.shared.ui.CustomDialog;
+
+/**
+ * Manager for search history functionality.
+ */
+public class SearchHistoryManager {
+    /**
+     * Interface for handling history item selection.
+     */
+    private static final int MAX_HISTORY_SIZE = 5;  // Maximum history items stored.
+
+    private static final int ID_CLEAR_HISTORY_BUTTON = getResourceIdentifierOrThrow(
+            "clear_history_button", "id");
+    private static final int ID_HISTORY_TEXT = getResourceIdentifierOrThrow(
+            "history_text", "id");
+    private static final int ID_DELETE_ICON = getResourceIdentifierOrThrow(
+            "delete_icon", "id");
+    private static final int ID_EMPTY_HISTORY_TITLE = getResourceIdentifierOrThrow(
+            "empty_history_title", "id");
+    private static final int ID_EMPTY_HISTORY_SUMMARY = getResourceIdentifierOrThrow(
+            "empty_history_summary", "id");
+    private static final int ID_SEARCH_HISTORY_HEADER = getResourceIdentifierOrThrow(
+            "search_history_header", "id");
+    private static final int ID_SEARCH_TIPS_SUMMARY = getResourceIdentifierOrThrow(
+            "revanced_settings_search_tips_summary", "id");
+    private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN = getResourceIdentifierOrThrow(
+            "revanced_preference_search_history_screen", "layout");
+    private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM = getResourceIdentifierOrThrow(
+            "revanced_preference_search_history_item", "layout");
+    private static final int ID_SEARCH_HISTORY_LIST = getResourceIdentifierOrThrow(
+            "search_history_list", "id");
+
+    private final Deque<String> searchHistory;
+    private final Activity activity;
+    private final SearchHistoryAdapter searchHistoryAdapter;
+    private final boolean showSettingsSearchHistory;
+    private final FrameLayout searchHistoryContainer;
+
+    public interface OnSelectHistoryItemListener {
+        void onSelectHistoryItem(String query);
+    }
+
+    /**
+     * Constructor for SearchHistoryManager.
+     *
+     * @param activity                  The parent activity.
+     * @param overlayContainer          The overlay container to hold the search history container.
+     * @param onSelectHistoryItemAction Callback for when a history item is selected.
+     */
+    SearchHistoryManager(Activity activity, FrameLayout overlayContainer,
+                         OnSelectHistoryItemListener onSelectHistoryItemAction) {
+        this.activity = activity;
+        this.showSettingsSearchHistory = SETTINGS_SEARCH_HISTORY.get();
+        this.searchHistory = new LinkedList<>();
+
+        // Initialize search history from settings.
+        if (showSettingsSearchHistory) {
+            String entries = SETTINGS_SEARCH_ENTRIES.get();
+            if (!entries.isBlank()) {
+                searchHistory.addAll(Arrays.asList(entries.split("\n")));
+            }
+        } else {
+            // Clear old saved history if the feature is disabled.
+            SETTINGS_SEARCH_ENTRIES.resetToDefault();
+        }
+
+        // Create search history container.
+        this.searchHistoryContainer = new FrameLayout(activity);
+        searchHistoryContainer.setVisibility(View.GONE);
+
+        // Inflate search history layout.
+        LayoutInflater inflater = LayoutInflater.from(activity);
+        View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, searchHistoryContainer, false);
+        searchHistoryContainer.addView(historyView, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add history container to overlay.
+        FrameLayout.LayoutParams overlayParams = new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT);
+        overlayParams.gravity = Gravity.TOP;
+        overlayContainer.addView(searchHistoryContainer, overlayParams);
+
+        // Find the LinearLayout for the history list within the container.
+        LinearLayout searchHistoryListView = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_LIST);
+        if (searchHistoryListView == null) {
+            throw new IllegalStateException("Search history list view not found in container");
+        }
+
+        // Set up history adapter. Use a copy of the search history.
+        this.searchHistoryAdapter = new SearchHistoryAdapter(activity, searchHistoryListView,
+                new ArrayList<>(searchHistory), onSelectHistoryItemAction);
+
+        // Set up clear history button.
+        TextView clearHistoryButton = searchHistoryContainer.findViewById(ID_CLEAR_HISTORY_BUTTON);
+        clearHistoryButton.setOnClickListener(v -> createAndShowDialog(
+                str("revanced_settings_search_clear_history"),
+                str("revanced_settings_search_clear_history_message"),
+                this::clearAllSearchHistory
+        ));
+
+        // Set up search tips summary.
+        CharSequence text = BulletPointPreference.formatIntoBulletPoints(
+                str("revanced_settings_search_tips_summary"));
+        TextView tipsSummary = historyView.findViewById(ID_SEARCH_TIPS_SUMMARY);
+        tipsSummary.setText(text);
+    }
+
+    /**
+     * Shows search history screen - either with history items or empty history message.
+     */
+    public void showSearchHistory() {
+        if (!showSettingsSearchHistory) {
+            return;
+        }
+
+        // Find all view elements.
+        TextView emptyHistoryTitle = searchHistoryContainer.findViewById(ID_EMPTY_HISTORY_TITLE);
+        TextView emptyHistorySummary = searchHistoryContainer.findViewById(ID_EMPTY_HISTORY_SUMMARY);
+        TextView historyHeader = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_HEADER);
+        LinearLayout historyList = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_LIST);
+        TextView clearHistoryButton = searchHistoryContainer.findViewById(ID_CLEAR_HISTORY_BUTTON);
+
+        if (searchHistory.isEmpty()) {
+            // Show empty history state.
+            showEmptyHistoryViews(emptyHistoryTitle, emptyHistorySummary);
+            hideHistoryViews(historyHeader, historyList, clearHistoryButton);
+        } else {
+            // Show history list state.
+            hideEmptyHistoryViews(emptyHistoryTitle, emptyHistorySummary);
+            showHistoryViews(historyHeader, historyList, clearHistoryButton);
+
+            // Update adapter with current history.
+            searchHistoryAdapter.clear();
+            searchHistoryAdapter.addAll(searchHistory);
+            searchHistoryAdapter.notifyDataSetChanged();
+        }
+
+        // Show the search history container.
+        showSearchHistoryContainer();
+    }
+
+    /**
+     * Saves a search query to the history, maintaining the size limit.
+     */
+    public void saveSearchQuery(String query) {
+        if (!showSettingsSearchHistory) return;
+
+        searchHistory.remove(query); // Remove if already exists to update position.
+        searchHistory.addFirst(query); // Add to the most recent.
+
+        // Remove extra old entries.
+        while (searchHistory.size() > MAX_HISTORY_SIZE) {
+            String last = searchHistory.removeLast();
+            Logger.printDebug(() -> "Removing search history query: " + last);
+        }
+
+        saveSearchHistory();
+    }
+
+    /**
+     * Saves the search history to shared preferences.
+     */
+    protected void saveSearchHistory() {
+        Logger.printDebug(() -> "Saving search history: " + searchHistory);
+        SETTINGS_SEARCH_ENTRIES.save(String.join("\n", searchHistory));
+    }
+
+    /**
+     * Removes a search query from the history.
+     */
+    public void removeSearchQuery(String query) {
+        searchHistory.remove(query);
+        saveSearchHistory();
+    }
+
+    /**
+     * Clears all search history.
+     */
+    public void clearAllSearchHistory() {
+        searchHistory.clear();
+        saveSearchHistory();
+        searchHistoryAdapter.clear();
+        searchHistoryAdapter.notifyDataSetChanged();
+        showSearchHistory();
+    }
+
+    /**
+     * Checks if search history feature is enabled.
+     */
+    public boolean isSearchHistoryEnabled() {
+        return showSettingsSearchHistory;
+    }
+
+    /**
+     * Shows the search history container and overlay.
+     */
+    public void showSearchHistoryContainer() {
+        searchHistoryContainer.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Hides the search history container.
+     */
+    public void hideSearchHistoryContainer() {
+        searchHistoryContainer.setVisibility(View.GONE);
+    }
+
+    /**
+     * Helper method to show empty history views.
+     */
+    protected void showEmptyHistoryViews(TextView emptyTitle, TextView emptySummary) {
+        emptyTitle.setVisibility(View.VISIBLE);
+        emptyTitle.setText(str("revanced_settings_search_empty_history_title"));
+        emptySummary.setVisibility(View.VISIBLE);
+        emptySummary.setText(str("revanced_settings_search_empty_history_summary"));
+    }
+
+    /**
+     * Helper method to hide empty history views.
+     */
+    protected void hideEmptyHistoryViews(TextView emptyTitle, TextView emptySummary) {
+        emptyTitle.setVisibility(View.GONE);
+        emptySummary.setVisibility(View.GONE);
+    }
+
+    /**
+     * Helper method to show history list views.
+     */
+    protected void showHistoryViews(TextView header, LinearLayout list, TextView clearButton) {
+        header.setVisibility(View.VISIBLE);
+        list.setVisibility(View.VISIBLE);
+        clearButton.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Helper method to hide history list views.
+     */
+    protected void hideHistoryViews(TextView header, LinearLayout list, TextView clearButton) {
+        header.setVisibility(View.GONE);
+        list.setVisibility(View.GONE);
+        clearButton.setVisibility(View.GONE);
+    }
+
+    /**
+     * Creates and shows a dialog with the specified title, message, and confirmation action.
+     *
+     * @param title            The title of the dialog.
+     * @param message          The message to display in the dialog.
+     * @param confirmAction    The action to perform when the dialog is confirmed.
+     */
+    protected void createAndShowDialog(String title, String message, Runnable confirmAction) {
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                activity,
+                title,
+                message,
+                null,
+                null,
+                confirmAction,
+                () -> {},
+                null,
+                null,
+                false
+        );
+
+        Dialog dialog = dialogPair.first;
+        dialog.setCancelable(true);
+        dialog.show();
+    }
+
+
+    /**
+     * Custom adapter for search history items.
+     */
+    protected class SearchHistoryAdapter {
+        protected final Collection<String> history;
+        protected final LayoutInflater inflater;
+        protected final LinearLayout container;
+        protected final OnSelectHistoryItemListener onSelectHistoryItemListener;
+
+        public SearchHistoryAdapter(Context context, LinearLayout container, Collection<String> history,
+                                    OnSelectHistoryItemListener listener) {
+            this.history = history;
+            this.inflater = LayoutInflater.from(context);
+            this.container = container;
+            this.onSelectHistoryItemListener = listener;
+        }
+
+        /**
+         * Updates the container with current history items.
+         */
+        public void notifyDataSetChanged() {
+            container.removeAllViews();
+            for (String query : history) {
+                View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, container, false);
+
+                TextView historyText = view.findViewById(ID_HISTORY_TEXT);
+                ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
+
+                historyText.setText(query);
+
+                // Set click listener for main item (select query).
+                view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query));
+
+                // Set click listener for delete icon.
+                deleteIcon.setOnClickListener(v -> createAndShowDialog(
+                        query,
+                        str("revanced_settings_search_remove_message"),
+                        () -> {
+                            removeSearchQuery(query);
+                            remove(query);
+                            notifyDataSetChanged();
+                        }
+                ));
+
+                container.addView(view);
+            }
+        }
+
+        /**
+         * Clears all views from the container and history list.
+         */
+        public void clear() {
+            history.clear();
+            container.removeAllViews();
+        }
+
+        /**
+         * Adds all provided history items to the container.
+         */
+        public void addAll(Collection<String> items) {
+            history.addAll(items);
+            notifyDataSetChanged();
+        }
+
+        /**
+         * Removes a query from the history and updates the container.
+         */
+        public void remove(String query) {
+            history.remove(query);
+            if (history.isEmpty()) {
+                // If history is now empty, show the empty history state.
+                showSearchHistory();
+            } else {
+                notifyDataSetChanged();
+            }
+        }
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/ColorDot.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/ColorDot.java
new file mode 100644
index 000000000..f0eeef408
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/ColorDot.java
@@ -0,0 +1,61 @@
+package app.revanced.extension.shared.ui;
+
+import static app.revanced.extension.shared.Utils.adjustColorBrightness;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.shared.Utils.getAppBackgroundColor;
+import static app.revanced.extension.shared.Utils.isDarkModeEnabled;
+import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.DISABLED_ALPHA;
+
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
+import android.view.View;
+
+import androidx.annotation.ColorInt;
+
+public class ColorDot {
+    private static final int STROKE_WIDTH = dipToPixels(1.5f); // Stroke width in dp.
+
+    /**
+     * Creates a circular drawable with a main fill and a stroke.
+     * Stroke adapts to dark/light theme and transparency, applied only when color is transparent or matches app background.
+     */
+    public static GradientDrawable createColorDotDrawable(@ColorInt int color) {
+        final boolean isDarkTheme = isDarkModeEnabled();
+        final boolean isTransparent = Color.alpha(color) == 0;
+        final int opaqueColor = color | 0xFF000000;
+        final int appBackground = getAppBackgroundColor();
+        final int strokeColor;
+        final int strokeWidth;
+
+        // Determine stroke color.
+        if (isTransparent || (opaqueColor == appBackground)) {
+            final int baseColor = isTransparent ? appBackground : opaqueColor;
+            strokeColor = adjustColorBrightness(baseColor, isDarkTheme ? 1.2f : 0.8f);
+            strokeWidth = STROKE_WIDTH;
+        } else {
+            strokeColor = 0;
+            strokeWidth = 0;
+        }
+
+        // Create circular drawable with conditional stroke.
+        GradientDrawable circle = new GradientDrawable();
+        circle.setShape(GradientDrawable.OVAL);
+        circle.setColor(color);
+        circle.setStroke(strokeWidth, strokeColor);
+
+        return circle;
+    }
+
+    /**
+     * Applies the color dot drawable to the target view.
+     */
+    public static void applyColorDot(View targetView, @ColorInt int color, boolean enabled) {
+        if (targetView == null) return;
+        targetView.setBackground(createColorDotDrawable(color));
+        targetView.setAlpha(enabled ? 1.0f : DISABLED_ALPHA);
+        if (!isDarkModeEnabled()) {
+            targetView.setClipToOutline(true);
+            targetView.setElevation(dipToPixels(2));
+        }
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/CustomDialog.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/CustomDialog.java
new file mode 100644
index 000000000..43a698ed1
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/CustomDialog.java
@@ -0,0 +1,472 @@
+package app.revanced.extension.shared.ui;
+
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A utility class for creating a customizable dialog with a title, message or EditText, and up to three buttons (OK, Cancel, Neutral).
+ * The dialog supports themed colors, rounded corners, and dynamic button layout based on screen width. It is dismissible by default.
+ */
+public class CustomDialog {
+    private final Context context;
+    private final Dialog dialog;
+    private final LinearLayout mainLayout;
+    private final int dip4, dip8, dip16, dip24, dip36;
+
+    /**
+     * Creates a custom dialog with a styled layout, including a title, message, buttons, and an optional EditText.
+     * The dialog's appearance adapts to the app's dark mode setting, with rounded corners and customizable button actions.
+     * Buttons adjust dynamically to their text content and are arranged in a single row if they fit within 80% of the
+     * screen width, with the Neutral button aligned to the left and OK/Cancel buttons centered on the right.
+     * If buttons do not fit, each is placed on a separate row, all aligned to the right.
+     *
+     * @param context                     Context used to create the dialog.
+     * @param title                       Title text of the dialog.
+     * @param message                     Message text of the dialog (supports Spanned for HTML), or null if replaced by EditText.
+     * @param editText                    EditText to include in the dialog, or null if no EditText is needed.
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action to perform when the OK button is clicked.
+     * @param onCancelClick               Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button is needed.
+     * @param onNeutralClick              Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
+     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
+     * @return The Dialog and its main LinearLayout container.
+     */
+    public static Pair<Dialog, LinearLayout> create(Context context, String title, CharSequence message,
+                                                    @Nullable EditText editText, String okButtonText,
+                                                    Runnable onOkClick, Runnable onCancelClick,
+                                                    @Nullable String neutralButtonText,
+                                                    @Nullable Runnable onNeutralClick,
+                                                    boolean dismissDialogOnNeutralClick) {
+        Logger.printDebug(() -> "Creating custom dialog with title: " + title);
+        CustomDialog customDialog = new CustomDialog(context, title, message, editText,
+                okButtonText, onOkClick, onCancelClick,
+                neutralButtonText, onNeutralClick, dismissDialogOnNeutralClick);
+        return new Pair<>(customDialog.dialog, customDialog.mainLayout);
+    }
+
+    /**
+     * Initializes a custom dialog with the specified parameters.
+     *
+     * @param context                     Context used to create the dialog.
+     * @param title                       Title text of the dialog.
+     * @param message                     Message text of the dialog, or null if replaced by EditText.
+     * @param editText                    EditText to include in the dialog, or null if no EditText is needed.
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action to perform when the OK button is clicked.
+     * @param onCancelClick               Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button is needed.
+     * @param onNeutralClick              Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
+     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
+     */
+    private CustomDialog(Context context, String title, CharSequence message, @Nullable EditText editText,
+                         String okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                         @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
+                         boolean dismissDialogOnNeutralClick) {
+        this.context = context;
+        this.dialog = new Dialog(context);
+        this.dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
+
+        // Preset size constants.
+        dip4 = dipToPixels(4);
+        dip8 = dipToPixels(8);
+        dip16 = dipToPixels(16);
+        dip24 = dipToPixels(24);
+        dip36 = dipToPixels(36);
+
+        // Create main layout.
+        mainLayout = createMainLayout();
+        addTitle(title);
+        addContent(message, editText);
+        addButtons(okButtonText, onOkClick, onCancelClick, neutralButtonText, onNeutralClick, dismissDialogOnNeutralClick);
+
+        // Set dialog content and window attributes.
+        dialog.setContentView(mainLayout);
+        Window window = dialog.getWindow();
+        if (window != null) {
+            Utils.setDialogWindowParameters(window, Gravity.CENTER, 0, 90, false);
+        }
+    }
+
+    /**
+     * Creates the main layout for the dialog with vertical orientation and rounded corners.
+     *
+     * @return The configured LinearLayout for the dialog.
+     */
+    private LinearLayout createMainLayout() {
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(dip24, dip16, dip24, dip24);
+
+        // Set rounded rectangle background.
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(28), null, null));
+        // Dialog background.
+        background.getPaint().setColor(Utils.getDialogBackgroundColor());
+        layout.setBackground(background);
+
+        return layout;
+    }
+
+    /**
+     * Adds a title to the dialog if provided.
+     *
+     * @param title The title text to display.
+     */
+    private void addTitle(String title) {
+        if (TextUtils.isEmpty(title)) return;
+
+        TextView titleView = new TextView(context);
+        titleView.setText(title);
+        titleView.setTypeface(Typeface.DEFAULT_BOLD);
+        titleView.setTextSize(18);
+        titleView.setTextColor(Utils.getAppForegroundColor());
+        titleView.setGravity(Gravity.CENTER);
+
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0, 0, 0, dip16);
+        titleView.setLayoutParams(params);
+
+        mainLayout.addView(titleView);
+    }
+
+    /**
+     * Adds a message or EditText to the dialog within a ScrollView.
+     *
+     * @param message  The message text to display (supports Spanned for HTML), or null if replaced by EditText.
+     * @param editText The EditText to include, or null if no EditText is needed.
+     */
+    private void addContent(CharSequence message, @Nullable EditText editText) {
+        // Create content container (message/EditText) inside a ScrollView only if message or editText is provided.
+        if (message == null && editText == null) return;
+
+        ScrollView scrollView = new ScrollView(context);
+        // Disable the vertical scrollbar.
+        scrollView.setVerticalScrollBarEnabled(false);
+        scrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+        scrollView.addView(contentContainer);
+
+        // EditText (if provided).
+        if (editText != null) {
+            ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                    Utils.createCornerRadii(10), null, null));
+            background.getPaint().setColor(Utils.getEditTextBackground());
+            scrollView.setPadding(dip8, dip8, dip8, dip8);
+            scrollView.setBackground(background);
+            scrollView.setClipToOutline(true);
+
+            // Remove EditText from its current parent, if any.
+            ViewGroup parent = (ViewGroup) editText.getParent();
+            if (parent != null) parent.removeView(editText);
+            // Style the EditText to match the dialog theme.
+            editText.setTextColor(Utils.getAppForegroundColor());
+            editText.setBackgroundColor(Color.TRANSPARENT);
+            editText.setPadding(0, 0, 0, 0);
+            contentContainer.addView(editText, new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT));
+            // Message (if not replaced by EditText).
+        } else {
+            TextView messageView = new TextView(context);
+            // Supports Spanned (HTML).
+            messageView.setText(message);
+            messageView.setTextSize(16);
+            messageView.setTextColor(Utils.getAppForegroundColor());
+            // Enable HTML link clicking if the message contains links.
+            if (message instanceof Spanned) {
+                messageView.setMovementMethod(LinkMovementMethod.getInstance());
+            }
+            contentContainer.addView(messageView, new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+        }
+
+        // Weight to take available space.
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                0,
+                1.0f);
+        scrollView.setLayoutParams(params);
+        // Add ScrollView to main layout only if content exist.
+        mainLayout.addView(scrollView);
+    }
+
+    /**
+     * Adds buttons to the dialog, arranging them dynamically based on their widths.
+     *
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action for the OK button click.
+     * @param onCancelClick               Action for the Cancel button click, or null if no Cancel button.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button.
+     * @param onNeutralClick              Action for the Neutral button click, or null if no Neutral button.
+     * @param dismissDialogOnNeutralClick If the dialog should dismiss on Neutral button click.
+     */
+    private void addButtons(String okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                            @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
+                            boolean dismissDialogOnNeutralClick) {
+        // Button container.
+        LinearLayout buttonContainer = new LinearLayout(context);
+        buttonContainer.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        buttonContainerParams.setMargins(0, dip16, 0, 0);
+        buttonContainer.setLayoutParams(buttonContainerParams);
+
+        List<Button> buttons = new ArrayList<>();
+        List<Integer> buttonWidths = new ArrayList<>();
+
+        // Create buttons in order: Neutral, Cancel, OK.
+        if (neutralButtonText != null && onNeutralClick != null) {
+            Button neutralButton = createButton(neutralButtonText, onNeutralClick, false, dismissDialogOnNeutralClick);
+            buttons.add(neutralButton);
+            buttonWidths.add(measureButtonWidth(neutralButton));
+        }
+        if (onCancelClick != null) {
+            Button cancelButton = createButton(context.getString(android.R.string.cancel), onCancelClick, false, true);
+            buttons.add(cancelButton);
+            buttonWidths.add(measureButtonWidth(cancelButton));
+        }
+        if (onOkClick != null) {
+            Button okButton = createButton(
+                    okButtonText != null ? okButtonText : context.getString(android.R.string.ok),
+                    onOkClick, true, true);
+            buttons.add(okButton);
+            buttonWidths.add(measureButtonWidth(okButton));
+        }
+
+        // Handle button layout.
+        layoutButtons(buttonContainer, buttons, buttonWidths);
+        mainLayout.addView(buttonContainer);
+    }
+
+    /**
+     * Creates a styled button with customizable text, click behavior, and appearance.
+     *
+     * @param text         The button text to display.
+     * @param onClick      The action to perform on button click.
+     * @param isOkButton   If this is the OK button, which uses distinct styling.
+     * @param dismissDialog If the dialog should dismiss when the button is clicked.
+     * @return The created Button.
+     */
+    private Button createButton(String text, Runnable onClick, boolean isOkButton, boolean dismissDialog) {
+        Button button = new Button(context, null, 0);
+        button.setText(text);
+        button.setTextSize(14);
+        button.setAllCaps(false);
+        button.setSingleLine(true);
+        button.setEllipsize(TextUtils.TruncateAt.END);
+        button.setGravity(Gravity.CENTER);
+        // Set internal padding.
+        button.setPadding(dip16, 0, dip16, 0);
+
+        // Background color for OK button (inversion).
+        // Background color for Cancel or Neutral buttons.
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(20), null, null));
+        background.getPaint().setColor(isOkButton
+                ? Utils.getOkButtonBackgroundColor()
+                : Utils.getCancelOrNeutralButtonBackgroundColor());
+        button.setBackground(background);
+
+        button.setTextColor(Utils.isDarkModeEnabled()
+                ? (isOkButton ? Color.BLACK : Color.WHITE)
+                : (isOkButton ? Color.WHITE : Color.BLACK));
+
+        button.setOnClickListener(v -> {
+            if (onClick != null) onClick.run();
+            if (dismissDialog) dialog.dismiss();
+        });
+
+        return button;
+    }
+
+    /**
+     * Measures the width of a button.
+     */
+    private int measureButtonWidth(Button button) {
+        button.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+        return button.getMeasuredWidth();
+    }
+
+    /**
+     * Arranges buttons in the dialog, either in a single row or multiple rows based on their total width.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     * @param buttonWidths    The measured widths of the buttons.
+     */
+    private void layoutButtons(LinearLayout buttonContainer, List<Button> buttons, List<Integer> buttonWidths) {
+        if (buttons.isEmpty()) return;
+
+        // Check if buttons fit in one row.
+        int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
+        int totalWidth = 0;
+        for (Integer width : buttonWidths) {
+            totalWidth += width;
+        }
+        if (buttonWidths.size() > 1) {
+            // Add margins for gaps.
+            totalWidth += (buttonWidths.size() - 1) * dip8;
+        }
+
+        // Single button: stretch to full width.
+        if (buttons.size() == 1) {
+            layoutSingleButton(buttonContainer, buttons.get(0));
+        } else if (totalWidth <= screenWidth * 0.8) {
+            // Single row: Neutral, Cancel, OK.
+            layoutButtonsInRow(buttonContainer, buttons, buttonWidths);
+        } else {
+            // Multiple rows: OK, Cancel, Neutral.
+            layoutButtonsInColumns(buttonContainer, buttons);
+        }
+    }
+
+    /**
+     * Arranges a single button, stretching it to full width.
+     *
+     * @param buttonContainer The container for the button.
+     * @param button          The button to arrange.
+     */
+    private void layoutSingleButton(LinearLayout buttonContainer, Button button) {
+        LinearLayout singleContainer = new LinearLayout(context);
+        singleContainer.setOrientation(LinearLayout.HORIZONTAL);
+        singleContainer.setGravity(Gravity.CENTER);
+
+        ViewGroup parent = (ViewGroup) button.getParent();
+        if (parent != null) parent.removeView(button);
+
+        button.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                dip36));
+        singleContainer.addView(button);
+        buttonContainer.addView(singleContainer);
+    }
+
+    /**
+     * Arranges buttons in a single horizontal row with proportional widths.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     * @param buttonWidths    The measured widths of the buttons.
+     */
+    private void layoutButtonsInRow(LinearLayout buttonContainer, List<Button> buttons, List<Integer> buttonWidths) {
+        LinearLayout rowContainer = new LinearLayout(context);
+        rowContainer.setOrientation(LinearLayout.HORIZONTAL);
+        rowContainer.setGravity(Gravity.CENTER);
+        rowContainer.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        // Add all buttons with proportional weights and specific margins.
+        for (int i = 0; i < buttons.size(); i++) {
+            Button button = getButton(buttons, buttonWidths, i);
+            rowContainer.addView(button);
+        }
+
+        buttonContainer.addView(rowContainer);
+    }
+
+    @NotNull
+    private Button getButton(List<Button> buttons, List<Integer> buttonWidths, int i) {
+        Button button = buttons.get(i);
+        ViewGroup parent = (ViewGroup) button.getParent();
+        if (parent != null) parent.removeView(button);
+
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                0, dip36, buttonWidths.get(i));
+
+        // Set margins based on button type and combination.
+        if (buttons.size() == 2) {
+            // Neutral + OK or Cancel + OK.
+            params.setMargins(i == 0 ? 0 : dip4, 0, i == 0 ? dip4 : 0, 0);
+        } else if (buttons.size() == 3) {
+            // Neutral.
+            // Cancel.
+            // OK.
+            params.setMargins(i == 0 ? 0 : dip4, 0, i == 2 ? 0 : dip4, 0);
+        }
+
+        button.setLayoutParams(params);
+        return button;
+    }
+
+    /**
+     * Arranges buttons in separate rows, ordered OK, Cancel, Neutral.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     */
+    private void layoutButtonsInColumns(LinearLayout buttonContainer, List<Button> buttons) {
+        // Reorder: OK, Cancel, Neutral.
+        List<Button> reorderedButtons = new ArrayList<>();
+        if (buttons.size() == 3) {
+            reorderedButtons.add(buttons.get(2)); // OK
+            reorderedButtons.add(buttons.get(1)); // Cancel
+            reorderedButtons.add(buttons.get(0)); // Neutral
+        } else if (buttons.size() == 2) {
+            reorderedButtons.add(buttons.get(1)); // OK or Cancel
+            reorderedButtons.add(buttons.get(0)); // Neutral or Cancel
+        }
+
+        for (int i = 0; i < reorderedButtons.size(); i++) {
+            Button button = reorderedButtons.get(i);
+            LinearLayout singleContainer = new LinearLayout(context);
+            singleContainer.setOrientation(LinearLayout.HORIZONTAL);
+            singleContainer.setGravity(Gravity.CENTER);
+            singleContainer.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dip36));
+
+            ViewGroup parent = (ViewGroup) button.getParent();
+            if (parent != null) parent.removeView(button);
+
+            button.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dip36));
+            singleContainer.addView(button);
+            buttonContainer.addView(singleContainer);
+
+            // Add a spacer between the buttons (except the last one).
+            if (i < reorderedButtons.size() - 1) {
+                View spacer = new View(context);
+                LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT,
+                        dip8);
+                spacer.setLayoutParams(spacerParams);
+                buttonContainer.addView(spacer);
+            }
+        }
+    }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/SheetBottomDialog.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/SheetBottomDialog.java
new file mode 100644
index 000000000..483d413b2
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/SheetBottomDialog.java
@@ -0,0 +1,463 @@
+package app.revanced.extension.shared.ui;
+
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.LinearLayout;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.widget.ScrollView;
+import android.widget.ListView;
+import android.widget.Scroller;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Utils;
+
+/**
+ * A utility class for creating a bottom sheet dialog that slides up from the bottom of the screen.
+ * The dialog supports drag-to-dismiss functionality, animations, and nested scrolling for scrollable content.
+ */
+public class SheetBottomDialog {
+
+    /**
+     * Creates a {@link SlideDialog} that slides up from the bottom of the screen with a specified content view.
+     * The dialog supports drag-to-dismiss functionality, allowing the user to drag it downward to close it,
+     * with proper handling of nested scrolling for scrollable content (e.g., {@link ListView}).
+     * It includes side margins, a top spacer for drag interaction, and can be dismissed by touching outside.
+     *
+     * @param context           The context used to create the dialog.
+     * @param contentView       The {@link View} to be displayed inside the dialog, such as a {@link LinearLayout}
+     *                          containing a {@link ListView}, buttons, or other UI elements.
+     * @param animationDuration The duration of the slide-in and slide-out animations in milliseconds.
+     * @return A configured {@link SlideDialog} instance ready to be shown.
+     * @throws IllegalArgumentException If contentView is null.
+     */
+    public static SlideDialog createSlideDialog(@NonNull Context context, @NonNull View contentView, int animationDuration) {
+        SlideDialog dialog = new SlideDialog(context);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setCanceledOnTouchOutside(true);
+        dialog.setCancelable(true);
+
+        // Create wrapper layout for side margins.
+        LinearLayout wrapperLayout = new LinearLayout(context);
+        wrapperLayout.setOrientation(LinearLayout.VERTICAL);
+
+        // Create drag container.
+        DraggableLinearLayout dragContainer = new DraggableLinearLayout(context, animationDuration);
+        dragContainer.setOrientation(LinearLayout.VERTICAL);
+        dragContainer.setDialog(dialog);
+
+        // Add top spacer.
+        View spacer = new View(context);
+        final int dip40 = dipToPixels(40);
+        LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, dip40);
+        spacer.setLayoutParams(spacerParams);
+        spacer.setClickable(true);
+        dragContainer.addView(spacer);
+
+        // Add content view.
+        ViewGroup parent = (ViewGroup) contentView.getParent();
+        if (parent != null) parent.removeView(contentView);
+        dragContainer.addView(contentView);
+
+        // Add drag container to wrapper layout.
+        wrapperLayout.addView(dragContainer);
+
+        dialog.setContentView(wrapperLayout);
+
+        // Configure dialog window.
+        Window window = dialog.getWindow();
+        if (window != null) {
+            Utils.setDialogWindowParameters(window, Gravity.BOTTOM, 0, 100, false);
+        }
+
+        // Set up animation on drag container.
+        dialog.setAnimView(dragContainer);
+        dialog.setAnimationDuration(animationDuration);
+
+        return dialog;
+    }
+
+    /**
+     * Creates a {@link DraggableLinearLayout} with a rounded background and a centered handle bar,
+     * styled for use as the main layout in a {@link SlideDialog}. The layout has vertical orientation,
+     * includes padding, and supports drag-to-dismiss functionality with proper handling of nested scrolling
+     * for scrollable content (e.g., {@link ListView}) or clickable elements (e.g., buttons, {@link android.widget.SeekBar}).
+     *
+     * @param context         The context used to create the layout.
+     * @param backgroundColor The background color for the layout as an {@link Integer}, or null to use
+     *                        the default dialog background color.
+     * @return A configured {@link DraggableLinearLayout} with a handle bar and styled background.
+     */
+    public static DraggableLinearLayout createMainLayout(@NonNull Context context, @Nullable Integer backgroundColor) {
+        // Preset size constants.
+        final int dip4 = dipToPixels(4);   // Handle bar height.
+        final int dip8 = dipToPixels(8);   // Dialog padding.
+        final int dip40 = dipToPixels(40); // Handle bar width.
+
+        DraggableLinearLayout mainLayout = new DraggableLinearLayout(context);
+        mainLayout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        layoutParams.setMargins(dip8, 0, dip8, dip8);
+        mainLayout.setLayoutParams(layoutParams);
+
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(12), null, null));
+        int color = (backgroundColor != null) ? backgroundColor : Utils.getDialogBackgroundColor();
+        background.getPaint().setColor(color);
+        mainLayout.setBackground(background);
+
+        // Add handle bar.
+        LinearLayout handleContainer = new LinearLayout(context);
+        LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        containerParams.setMargins(0, dip8, 0, 0);
+        handleContainer.setLayoutParams(containerParams);
+        handleContainer.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
+        View handleBar = new View(context);
+        ShapeDrawable handleBackground = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(4), null, null));
+        handleBackground.getPaint().setColor(Utils.adjustColorBrightness(color, 0.9f, 1.25f));
+        LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(dip40, dip4);
+        handleBar.setLayoutParams(handleParams);
+        handleBar.setBackground(handleBackground);
+
+        handleContainer.addView(handleBar);
+        mainLayout.addView(handleContainer);
+
+        return mainLayout;
+    }
+
+    /**
+     * A custom {@link LinearLayout} that provides drag-to-dismiss functionality for a {@link SlideDialog}.
+     * This layout intercepts touch events to allow dragging the dialog downward to dismiss it when the
+     * content cannot scroll upward. It ensures compatibility with scrollable content (e.g., {@link ListView},
+     * {@link ScrollView}) and clickable elements (e.g., buttons, {@link android.widget.SeekBar}) by prioritizing
+     * their touch events to prevent conflicts.
+     *
+     * <p>Dragging is enabled only after the dialog's slide-in animation completes. The dialog is dismissed
+     * if dragged beyond 50% of its height or with a downward fling velocity exceeding 800 px/s.</p>
+     */
+    public static class DraggableLinearLayout extends LinearLayout {
+        private static final int MIN_FLING_VELOCITY = 800; // px/s
+        private static final float DISMISS_HEIGHT_FRACTION = 0.5f; // 50% of height.
+
+        private float initialTouchRawY; // Raw Y on ACTION_DOWN.
+        private float dragOffset; // Current drag translation.
+        private boolean isDragging;
+        private boolean isDragEnabled;
+
+        private final int animationDuration;
+        private final Scroller scroller;
+        private final VelocityTracker velocityTracker;
+        private final Runnable settleRunnable;
+
+        private SlideDialog dialog;
+        private float dismissThreshold;
+
+        /**
+         * Constructs a new {@link DraggableLinearLayout} with the specified context.
+         */
+        public DraggableLinearLayout(@NonNull Context context) {
+            this(context, 0);
+        }
+
+        /**
+         * Constructs a new {@link DraggableLinearLayout} with the specified context and animation duration.
+         *
+         * @param context      The context used to initialize the layout.
+         * @param animDuration The duration of the drag animation in milliseconds.
+         */
+        public DraggableLinearLayout(@NonNull Context context, int animDuration) {
+            super(context);
+            scroller = new Scroller(context, new DecelerateInterpolator());
+            velocityTracker = VelocityTracker.obtain();
+            animationDuration = animDuration;
+            settleRunnable = this::runSettleAnimation;
+
+            setClickable(true);
+
+            // Enable drag only after slide-in animation finishes.
+            isDragEnabled = false;
+            postDelayed(() -> isDragEnabled = true, animationDuration + 50);
+        }
+
+        /**
+         * Sets the {@link SlideDialog} associated with this layout for dismissal.
+         */
+        public void setDialog(@NonNull SlideDialog dialog) {
+            this.dialog = dialog;
+        }
+
+        /**
+         * Updates the dismissal threshold when the layout's size changes.
+         */
+        @Override
+        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+            super.onSizeChanged(w, h, oldw, oldh);
+            dismissThreshold = h * DISMISS_HEIGHT_FRACTION;
+        }
+
+        /**
+         * Intercepts touch events to initiate dragging when the content cannot scroll upward and the
+         * touch movement exceeds the system's touch slop.
+         */
+        @Override
+        public boolean onInterceptTouchEvent(MotionEvent ev) {
+            if (!isDragEnabled) return false;
+
+            switch (ev.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN:
+                    initialTouchRawY = ev.getRawY();
+                    isDragging = false;
+                    scroller.forceFinished(true);
+                    removeCallbacks(settleRunnable);
+                    velocityTracker.clear();
+                    velocityTracker.addMovement(ev);
+                    dragOffset = getTranslationY();
+                    break;
+
+                case MotionEvent.ACTION_MOVE:
+                    float dy = ev.getRawY() - initialTouchRawY;
+                    if (dy > ViewConfiguration.get(getContext()).getScaledTouchSlop()
+                            && !canChildScrollUp()) {
+                        isDragging = true;
+                        return true; // Intercept touches for drag.
+                    }
+                    break;
+            }
+            return false;
+        }
+
+        /**
+         * Handles touch events to perform dragging or trigger dismissal/return animations based on
+         * drag distance or fling velocity.
+         */
+        @SuppressLint("ClickableViewAccessibility")
+        @Override
+        public boolean onTouchEvent(MotionEvent ev) {
+            if (!isDragEnabled) return super.onTouchEvent(ev);
+            velocityTracker.addMovement(ev);
+
+            switch (ev.getActionMasked()) {
+                case MotionEvent.ACTION_MOVE:
+                    if (isDragging) {
+                        float deltaY = ev.getRawY() - initialTouchRawY;
+                        dragOffset = Math.max(0, deltaY); // Prevent upward drag.
+                        setTranslationY(dragOffset); // 1:1 following finger.
+                    }
+                    return true;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    velocityTracker.computeCurrentVelocity(1000);
+                    float velocityY = velocityTracker.getYVelocity();
+
+                    if (dragOffset > dismissThreshold || velocityY > MIN_FLING_VELOCITY) {
+                        startDismissAnimation();
+                    } else {
+                        startReturnAnimation();
+                    }
+                    isDragging = false;
+                    return true;
+            }
+            // Consume the touch event to prevent focus changes on child views.
+            return true;
+        }
+
+        /**
+         * Starts an animation to dismiss the dialog by sliding it downward.
+         */
+        private void startDismissAnimation() {
+            scroller.startScroll(0, (int) dragOffset,
+                    0, getHeight() - (int) dragOffset, animationDuration);
+            post(settleRunnable);
+        }
+
+        /**
+         * Starts an animation to return the dialog to its original position.
+         */
+        private void startReturnAnimation() {
+            scroller.startScroll(0, (int) dragOffset,
+                    0, -(int) dragOffset, animationDuration);
+            post(settleRunnable);
+        }
+
+        /**
+         * Runs the settle animation, updating the layout's translation until the animation completes.
+         * Dismisses the dialog if the drag offset reaches the view's height.
+         */
+        private void runSettleAnimation() {
+            if (scroller.computeScrollOffset()) {
+                dragOffset = scroller.getCurrY();
+                setTranslationY(dragOffset);
+
+                if (dragOffset >= getHeight() && dialog != null) {
+                    dialog.dismiss();
+                    scroller.forceFinished(true);
+                } else {
+                    post(settleRunnable);
+                }
+            } else {
+                dragOffset = getTranslationY();
+            }
+        }
+
+        /**
+         * Checks if any child view can scroll upward, preventing drag if scrolling is possible.
+         *
+         * @return True if a child can scroll upward, false otherwise.
+         */
+        private boolean canChildScrollUp() {
+            View target = findScrollableChild(this);
+            return target != null && target.canScrollVertically(-1);
+        }
+
+        /**
+         * Recursively searches for a scrollable child view within the given view group.
+         *
+         * @param group The view group to search.
+         * @return The scrollable child view, or null if none found.
+         */
+        private View findScrollableChild(ViewGroup group) {
+            for (int i = 0; i < group.getChildCount(); i++) {
+                View child = group.getChildAt(i);
+                if (child.canScrollVertically(-1)) return child;
+                if (child instanceof ViewGroup) {
+                    View scroll = findScrollableChild((ViewGroup) child);
+                    if (scroll != null) return scroll;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * A custom dialog that slides up from the bottom of the screen with animation. It supports
+     * drag-to-dismiss functionality and ensures smooth dismissal animations without overlapping
+     * dismiss calls. The dialog animates a specified view during show and dismiss operations.
+     */
+    public static class SlideDialog extends Dialog {
+        private View animView;
+        private boolean isDismissing = false;
+        private int duration;
+        private final int screenHeight;
+
+        /**
+         * Constructs a new {@link SlideDialog} with the specified context.
+         */
+        public SlideDialog(@NonNull Context context) {
+            super(context);
+            screenHeight = context.getResources().getDisplayMetrics().heightPixels;
+        }
+
+        /**
+         * Sets the view to animate during show and dismiss operations.
+         */
+        public void setAnimView(@NonNull View view) {
+            this.animView = view;
+        }
+
+        /**
+         * Sets the duration of the slide-in and slide-out animations.
+         */
+        public void setAnimationDuration(int duration) {
+            this.duration = duration;
+        }
+
+        /**
+         * Displays the dialog with a slide-up animation for the animated view, if set.
+         */
+        @Override
+        public void show() {
+            super.show();
+            if (animView == null) return;
+
+            animView.setTranslationY(screenHeight);
+            animView.animate()
+                    .translationY(0)
+                    .setDuration(duration)
+                    .setListener(null)
+                    .start();
+        }
+
+        /**
+         * Cancels the dialog, triggering a dismissal animation.
+         */
+        @Override
+        public void cancel() {
+            dismiss();
+        }
+
+        /**
+         * Dismisses the dialog with a slide-down animation for the animated view, if set.
+         * Ensures that dismissal is not triggered multiple times concurrently.
+         */
+        @Override
+        public void dismiss() {
+            if (isDismissing) return;
+            isDismissing = true;
+
+            Window window = getWindow();
+            if (window == null) {
+                super.dismiss();
+                isDismissing = false;
+                return;
+            }
+
+            WindowManager.LayoutParams params = window.getAttributes();
+            float startDim = params != null ? params.dimAmount : 0f;
+
+            // Animate dimming effect.
+            ValueAnimator dimAnimator = ValueAnimator.ofFloat(startDim, 0f);
+            dimAnimator.setDuration(duration);
+            dimAnimator.addUpdateListener(animation -> {
+                if (params != null) {
+                    params.dimAmount = (float) animation.getAnimatedValue();
+                    window.setAttributes(params);
+                }
+            });
+
+            if (animView == null) {
+                dimAnimator.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        SlideDialog.super.dismiss();
+                        isDismissing = false;
+                    }
+                });
+                dimAnimator.start();
+                return;
+            }
+
+            dimAnimator.start();
+            animView.animate()
+                    .translationY(screenHeight)
+                    .setDuration(duration)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            SlideDialog.super.dismiss();
+                            isDismissing = false;
+                        }
+                    })
+                    .start();
+        }
+    }
+}
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
similarity index 86%
rename from extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java
rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
index 11304eb1e..b9d6bc8ec 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/AdPersonalizationActivityHook.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
@@ -7,29 +7,29 @@ import android.preference.PreferenceFragment;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.tiktok.settings.preference.ReVancedPreferenceFragment;
+import app.revanced.extension.tiktok.settings.preference.TikTokPreferenceFragment;
+
 import com.bytedance.ies.ugc.aweme.commercialize.compliance.personalization.AdPersonalizationActivity;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 /**
- * Hooks AdPersonalizationActivity.
- * <p>
- * This class is responsible for injecting our own fragment by replacing the AdPersonalizationActivity.
- *
- * @noinspection unused
+ * Hooks AdPersonalizationActivity to inject a custom {@link TikTokPreferenceFragment}.
  */
-public class AdPersonalizationActivityHook {
+@SuppressWarnings({"deprecation", "NewApi", "unused"})
+public class TikTokActivityHook {
     public static Object createSettingsEntry(String entryClazzName, String entryInfoClazzName) {
         try {
             Class<?> entryClazz = Class.forName(entryClazzName);
             Class<?> entryInfoClazz = Class.forName(entryInfoClazzName);
             Constructor<?> entryConstructor = entryClazz.getConstructor(entryInfoClazz);
             Constructor<?> entryInfoConstructor = entryInfoClazz.getDeclaredConstructors()[0];
-            Object buttonInfo = entryInfoConstructor.newInstance("ReVanced settings", null, (View.OnClickListener) view -> startSettingsActivity(), "revanced");
+            Object buttonInfo = entryInfoConstructor.newInstance(
+                    "ReVanced settings", null, (View.OnClickListener) view -> startSettingsActivity(), "revanced");
             return entryConstructor.newInstance(buttonInfo);
         } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException |
                  InstantiationException e) {
@@ -62,7 +62,7 @@ public class AdPersonalizationActivityHook {
         linearLayout.addView(fragment);
         base.setContentView(linearLayout);
 
-        PreferenceFragment preferenceFragment = new ReVancedPreferenceFragment();
+        PreferenceFragment preferenceFragment = new TikTokPreferenceFragment();
         base.getFragmentManager().beginTransaction().replace(fragmentId, preferenceFragment).commit();
 
         return true;
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java
index f387c68f5..5f090f7cd 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/DownloadPathPreference.java
@@ -121,7 +121,7 @@ public class DownloadPathPreference extends DialogPreference {
     }
 
     private int findIndexOf(String str) {
-        for (int i = 0; i < entryValues.length; i++) {
+        for (int i = 0, length = entryValues.length; i < length; i++) {
             if (str.equals(entryValues[i])) return i;
         }
         return -1;
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java
index 7348ccc70..14b2f1a72 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedTikTokAboutPreference.java
@@ -15,7 +15,7 @@ public class ReVancedTikTokAboutPreference extends ReVancedAboutPreference {
     /**
      * Because resources cannot be added to TikTok,
      * these strings are copied from the shared strings.xml file.
-     *
+     * <p>
      * Changes here must also be made in strings.xml
      */
     private final Map<String, String> aboutStrings = Map.of(
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java
similarity index 97%
rename from extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java
rename to extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java
index c1c48b04c..cf7223333 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java
@@ -14,7 +14,7 @@ import app.revanced.extension.tiktok.settings.preference.categories.SimSpoofPref
  * Preference fragment for ReVanced settings
  */
 @SuppressWarnings("deprecation")
-public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
+public class TikTokPreferenceFragment extends AbstractPreferenceFragment {
 
     @Override
     protected void syncSettingWithPreference(@NonNull Preference pref,
diff --git a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
similarity index 70%
rename from extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java
rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
index e617cf9b2..edf8571db 100644
--- a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/AppCompatActivityHook.java
+++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
@@ -1,11 +1,16 @@
 package app.revanced.extension.twitch.settings;
 
+import static app.revanced.extension.twitch.Utils.getStringId;
+
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.twitch.settings.preference.ReVancedPreferenceFragment;
+import app.revanced.extension.twitch.settings.preference.TwitchPreferenceFragment;
+
 import tv.twitch.android.feature.settings.menu.SettingsMenuGroup;
 import tv.twitch.android.settings.SettingsActivity;
 
@@ -13,17 +18,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Hooks AppCompatActivity.
- * <p>
- * This class is responsible for injecting our own fragment by replacing the AppCompatActivity.
- * @noinspection unused
+ * Hooks AppCompatActivity to inject a custom {@link TwitchPreferenceFragment}.
  */
-public class AppCompatActivityHook {
+@SuppressWarnings({"deprecation", "NewApi", "unused"})
+public class TwitchActivityHook {
     private static final int REVANCED_SETTINGS_MENU_ITEM_ID = 0x7;
     private static final String EXTRA_REVANCED_SETTINGS = "app.revanced.twitch.settings";
 
     /**
-     * Launches SettingsActivity and show ReVanced settings
+     * Launches SettingsActivity and show ReVanced settings.
      */
     public static void startSettingsActivity() {
         Logger.printDebug(() -> "Launching ReVanced settings");
@@ -41,27 +44,27 @@ public class AppCompatActivityHook {
     }
 
     /**
-     * Helper for easy access in smali
-     * @return Returns string resource id
+     * Helper for easy access in smali.
+     * @return Returns string resource id.
      */
     public static int getReVancedSettingsString() {
-        return app.revanced.extension.twitch.Utils.getStringId("revanced_settings");
+        return getStringId("revanced_settings");
     }
 
     /**
-     * Intercepts settings menu group list creation in SettingsMenuPresenter$Event.MenuGroupsUpdated
-     * @return Returns a modified list of menu groups
+     * Intercepts settings menu group list creation in SettingsMenuPresenter$Event.MenuGroupsUpdated.
+     * @return Returns a modified list of menu groups.
      */
     public static List<SettingsMenuGroup> handleSettingMenuCreation(List<SettingsMenuGroup> settingGroups, Object revancedEntry) {
         List<SettingsMenuGroup> groups = new ArrayList<>(settingGroups);
 
         if (groups.isEmpty()) {
-            // Create new menu group if none exist yet
+            // Create new menu group if none exist yet.
             List<Object> items = new ArrayList<>();
             items.add(revancedEntry);
             groups.add(new SettingsMenuGroup(items));
         } else {
-            // Add to last menu group
+            // Add to last menu group.
             int groupIdx = groups.size() - 1;
             List<Object> items = new ArrayList<>(groups.remove(groupIdx).getSettingsMenuItems());
             items.add(revancedEntry);
@@ -73,8 +76,8 @@ public class AppCompatActivityHook {
     }
 
     /**
-     * Intercepts settings menu group onclick events
-     * @return Returns true if handled, otherwise false
+     * Intercepts settings menu group onclick events.
+     * @return Returns true if handled, otherwise false.
      */
     @SuppressWarnings("rawtypes")
     public static boolean handleSettingMenuOnClick(Enum item) {
@@ -88,20 +91,20 @@ public class AppCompatActivityHook {
     }
 
     /**
-     * Intercepts fragment loading in SettingsActivity.onCreate
-     * @return Returns true if the revanced settings have been requested by the user, otherwise false
+     * Intercepts fragment loading in SettingsActivity.onCreate.
+     * @return Returns true if the ReVanced settings have been requested by the user, otherwise false.
      */
-    public static boolean handleSettingsCreation(androidx.appcompat.app.AppCompatActivity base) {
+    public static boolean handleSettingsCreation(AppCompatActivity base) {
         if (!base.getIntent().getBooleanExtra(EXTRA_REVANCED_SETTINGS, false)) {
             Logger.printDebug(() -> "Revanced settings not requested");
-            return false; // User wants to enter another settings fragment
+            return false; // User wants to enter another settings fragment.
         }
         Logger.printDebug(() -> "ReVanced settings requested");
 
-        ReVancedPreferenceFragment fragment = new ReVancedPreferenceFragment();
+        TwitchPreferenceFragment fragment = new TwitchPreferenceFragment();
         ActionBar supportActionBar = base.getSupportActionBar();
         if (supportActionBar != null)
-            supportActionBar.setTitle(app.revanced.extension.twitch.Utils.getStringId("revanced_settings"));
+            supportActionBar.setTitle(getStringId("revanced_settings"));
 
         base.getFragmentManager()
                 .beginTransaction()
diff --git a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java
index 5cef4a0b7..0b6cb1af1 100644
--- a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java
+++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/CustomPreferenceCategory.java
@@ -7,6 +7,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
+@SuppressWarnings({"deprecation", "unused"})
 public class CustomPreferenceCategory extends PreferenceCategory {
     public CustomPreferenceCategory(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/TwitchPreferenceFragment.java
similarity index 82%
rename from extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java
rename to extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/TwitchPreferenceFragment.java
index d77d06e19..4be39aaae 100644
--- a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/ReVancedPreferenceFragment.java
+++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/preference/TwitchPreferenceFragment.java
@@ -5,9 +5,9 @@ import app.revanced.extension.shared.settings.preference.AbstractPreferenceFragm
 import app.revanced.extension.twitch.settings.Settings;
 
 /**
- * Preference fragment for ReVanced settings
+ * Preference fragment for ReVanced settings.
  */
-public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
+public class TwitchPreferenceFragment extends AbstractPreferenceFragment {
 
     @Override
     protected void initialize() {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
index a4dd50fcc..5fa4836cc 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
@@ -19,6 +19,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
@@ -65,6 +66,17 @@ public final class AlternativeThumbnailsPatch {
         public boolean isAvailable() {
             return usingDeArrowAnywhere();
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(
+                    ALT_THUMBNAIL_HOME,
+                    ALT_THUMBNAIL_SUBSCRIPTIONS,
+                    ALT_THUMBNAIL_LIBRARY,
+                    ALT_THUMBNAIL_PLAYER,
+                    ALT_THUMBNAIL_SEARCH
+            );
+        }
     }
 
     public static final class StillImagesAvailability implements Setting.Availability {
@@ -80,6 +92,17 @@ public final class AlternativeThumbnailsPatch {
         public boolean isAvailable() {
             return usingStillImagesAnywhere();
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(
+                    ALT_THUMBNAIL_HOME,
+                    ALT_THUMBNAIL_SUBSCRIPTIONS,
+                    ALT_THUMBNAIL_LIBRARY,
+                    ALT_THUMBNAIL_PLAYER,
+                    ALT_THUMBNAIL_SEARCH
+            );
+        }
     }
 
     public enum ThumbnailOption {
@@ -451,29 +474,29 @@ public final class AlternativeThumbnailsPatch {
             }
 
             final boolean useFastQuality = Settings.ALT_THUMBNAIL_STILLS_FAST.get();
-            switch (quality) {
-                case SDDEFAULT:
-                    // SD alt images have somewhat worse quality with washed out color and poor contrast.
-                    // But the 720 images look much better and don't suffer from these issues.
-                    // For unknown reasons, the 720 thumbnails are used only for the home feed,
-                    // while SD is used for the search and subscription feed
-                    // (even though search and subscriptions use the exact same layout as the home feed).
-                    // Of note, this image quality issue only appears with the alt thumbnail images,
-                    // and the regular thumbnails have identical color/contrast quality for all sizes.
-                    // Fix this by falling thru and upgrading SD to 720.
-                case HQ720:
+            return switch (quality) {
+                // SD alt images have somewhat worse quality with washed out color and poor contrast.
+                // But the 720 images look much better and don't suffer from these issues.
+                // For unknown reasons, the 720 thumbnails are used only for the home feed,
+                // while SD is used for the search and subscription feed
+                // (even though search and subscriptions use the exact same layout as the home feed).
+                // Of note, this image quality issue only appears with the alt thumbnail images,
+                // and the regular thumbnails have identical color/contrast quality for all sizes.
+                // Fix this by falling thru and upgrading SD to 720.
+                case SDDEFAULT, HQ720 -> {  // SD is max resolution for fast alt images.
                     if (useFastQuality) {
-                        return SDDEFAULT; // SD is max resolution for fast alt images.
+                        yield SDDEFAULT;
                     }
-                    return HQ720;
-                case MAXRESDEFAULT:
+                    yield HQ720;
+                }
+                case MAXRESDEFAULT -> {
                     if (useFastQuality) {
-                        return SDDEFAULT;
+                        yield SDDEFAULT;
                     }
-                    return MAXRESDEFAULT;
-                default:
-                    return quality;
-            }
+                    yield MAXRESDEFAULT;
+                }
+                default -> quality;
+            };
         }
 
         final String originalName;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
index 14872dcfc..9748a3d68 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
@@ -12,6 +12,8 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
+import java.util.List;
+
 @SuppressWarnings("unused")
 public final class ChangeStartPagePatch {
 
@@ -87,6 +89,11 @@ public final class ChangeStartPagePatch {
         public boolean isAvailable() {
             return Settings.CHANGE_START_PAGE.get() != StartPage.DEFAULT;
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(Settings.CHANGE_START_PAGE);
+        }
     }
 
     /**
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java
index 5a7acdd37..62a0a0de8 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch.java
@@ -13,6 +13,7 @@ import java.net.UnknownHostException;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.CustomDialog;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -68,7 +69,7 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
                 Utils.runOnMainThread(() -> {
                     try {
                         // Create the custom dialog.
-                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                                 context,
                                 str("revanced_check_watch_history_domain_name_dialog_title"), // Title.
                                 Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")), // Message (HTML).
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
index 7950c8b21..e953a74cf 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
@@ -27,11 +27,11 @@ public final class DownloadsPatch {
 
     /**
      * Injection point.
-     *
+     * <p>
      * Called from the in app download hook,
      * for both the player action button (below the video)
      * and the 'Download video' flyout option for feed videos.
-     *
+     * <p>
      * Appears to always be called from the main thread.
      */
     public static boolean inAppDownloadButtonOnClick(String videoId) {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
index 070c330d0..7bf99f479 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
@@ -1,5 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -37,11 +39,11 @@ public final class HidePlayerOverlayButtonsPatch {
     private static final boolean HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS_ENABLED
             = Settings.HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS.get();
 
-    private static final int PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID =
-            Utils.getResourceIdentifier("player_control_previous_button_touch_area", "id");
+    private static final int PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
+            "player_control_previous_button_touch_area", "id");
 
-    private static final int PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID =
-            Utils.getResourceIdentifier("player_control_next_button_touch_area", "id");
+    private static final int PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
+            "player_control_next_button_touch_area", "id");
 
     /**
      * Injection point.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
index 7a7571162..c19edb08d 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
@@ -12,12 +12,14 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
+import java.util.List;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
-@SuppressWarnings({"unused", "SpellCheckingInspection"})
+@SuppressWarnings("SpellCheckingInspection")
 public final class MiniplayerPatch {
 
     /**
@@ -173,6 +175,14 @@ public final class MiniplayerPatch {
         public boolean isAvailable() {
             return Settings.MINIPLAYER_TYPE.get().isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(
+                    Settings.MINIPLAYER_TYPE,
+                    Settings.MINIPLAYER_DRAG_AND_DROP
+            );
+        }
     }
 
     public static final class MiniplayerHideOverlayButtonsAvailability implements Setting.Availability {
@@ -185,11 +195,59 @@ public final class MiniplayerPatch {
                     && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
                     || (IS_19_29_OR_GREATER && type == MODERN_3);
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(
+                    Settings.MINIPLAYER_TYPE,
+                    Settings.MINIPLAYER_DOUBLE_TAP_ACTION,
+                    Settings.MINIPLAYER_DRAG_AND_DROP
+            );
+        }
+    }
+
+    public static final class MiniplayerAnyModernAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
+            return type == MODERN_1 || type == MODERN_2 || type == MODERN_3 || type == MODERN_4;
+        }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(Settings.MINIPLAYER_TYPE);
+        }
+    }
+
+    public static final class MiniplayerHideSubtextsAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
+            return type == MODERN_3 || type == MODERN_4;
+        }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(Settings.MINIPLAYER_TYPE);
+        }
+    }
+
+    public static final class MiniplayerHideRewindOrOverlayOpacityAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
+            return type == MODERN_1;
+        }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(Settings.MINIPLAYER_TYPE);
+        }
     }
 
     /**
      * Injection point.
-     *
+     * <p>
      * Enables a handler that immediately closes the miniplayer when the video is minimized,
      * effectively disabling the miniplayer.
      */
@@ -378,4 +436,4 @@ public final class MiniplayerPatch {
             Logger.printException(() -> "playerOverlayGroupCreated failure", ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java
index e9a469026..30722c087 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java
@@ -3,6 +3,8 @@ package app.revanced.extension.youtube.patches;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
+import java.util.List;
+
 @SuppressWarnings("unused")
 public class SeekbarThumbnailsPatch {
 
@@ -11,6 +13,11 @@ public class SeekbarThumbnailsPatch {
         public boolean isAvailable() {
             return VersionCheckPatch.IS_19_17_OR_GREATER || !Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS.get();
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS);
+        }
     }
 
     private static final boolean SEEKBAR_THUMBNAILS_HIGH_QUALITY_ENABLED
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
index 8358824f4..1cf7e4d16 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import app.revanced.extension.shared.ui.CustomDialog;
 import org.json.JSONArray;
 
 import java.io.IOException;
@@ -125,7 +126,7 @@ public final class AnnouncementsPatch {
 
                 Utils.runOnMainThread(() -> {
                     // Create the custom dialog and show the announcement.
-                    Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                             context,
                             finalTitle,                           // Title.
                             finalMessage,                         // Message.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
index cbf2930bb..0cdf7b873 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
@@ -1,10 +1,13 @@
 package app.revanced.extension.youtube.patches.components;
 
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
+import java.util.List;
+
 @SuppressWarnings("unused")
 public class PlayerFlyoutMenuItemsFilter extends Filter {
 
@@ -17,6 +20,11 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
             // without a restart the setting will show as available when it's not.
             return AVAILABLE_ON_LAUNCH && !SpoofVideoStreamsPatch.spoofingToClientWithNoMultiAudioStreams();
         }
+
+        @Override
+        public List<Setting<?>> getParentSettings() {
+            return List.of(BaseSettings.SPOOF_VIDEO_STREAMS);
+        }
     }
 
     private final ByteArrayFilterGroupList flyoutFilterGroupList = new ByteArrayFilterGroupList();
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java
index 52e977e34..ba4aaa6e6 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java
@@ -2,11 +2,11 @@ package app.revanced.extension.youtube.patches.playback.speed;
 
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.youtube.videoplayer.PlayerControlButton.fadeInDuration;
+import static app.revanced.extension.youtube.videoplayer.PlayerControlButton.getDialogBackgroundColor;
 
 import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
@@ -20,19 +20,9 @@ import android.graphics.drawable.shapes.RoundRectShape;
 import android.icu.text.NumberFormat;
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.GridLayout;
-import android.widget.LinearLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
+import android.widget.*;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
@@ -40,6 +30,7 @@ import java.util.function.Function;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.SheetBottomDialog;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.components.PlaybackSpeedMenuFilter;
 import app.revanced.extension.youtube.settings.Settings;
@@ -97,7 +88,7 @@ public class CustomPlaybackSpeedPatch {
     /**
      * Weak reference to the currently open dialog.
      */
-    private static WeakReference<Dialog> currentDialog = new WeakReference<>(null);
+    private static WeakReference<SheetBottomDialog.SlideDialog> currentDialog;
 
     static {
         // Use same 2 digit format as built in speed picker,
@@ -268,368 +259,239 @@ public class CustomPlaybackSpeedPatch {
      */
     @SuppressLint("SetTextI18n")
     public static void showModernCustomPlaybackSpeedDialog(Context context) {
-        // Create a dialog without a theme for custom appearance.
-        Dialog dialog = new Dialog(context);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
+        try {
+            // Create main layout.
+            SheetBottomDialog.DraggableLinearLayout mainLayout =
+                    SheetBottomDialog.createMainLayout(context, getDialogBackgroundColor());
 
-        // Store the dialog reference.
-        currentDialog = new WeakReference<>(dialog);
+            // Preset size constants.
+            final int dip4 = dipToPixels(4);
+            final int dip8 = dipToPixels(8);
+            final int dip12 = dipToPixels(12);
+            final int dip20 = dipToPixels(20);
+            final int dip32 = dipToPixels(32);
+            final int dip60 = dipToPixels(60);
 
-        // Enable dismissing the dialog when tapping outside.
-        dialog.setCanceledOnTouchOutside(true);
+            // Display current playback speed.
+            TextView currentSpeedText = new TextView(context);
+            float currentSpeed = VideoInformation.getPlaybackSpeed();
+            // Initially show with only 0 minimum digits, so 1.0 shows as 1x.
+            currentSpeedText.setText(formatSpeedStringX(currentSpeed));
+            currentSpeedText.setTextColor(Utils.getAppForegroundColor());
+            currentSpeedText.setTextSize(16);
+            currentSpeedText.setTypeface(Typeface.DEFAULT_BOLD);
+            currentSpeedText.setGravity(Gravity.CENTER);
+            LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            textParams.setMargins(0, dip20, 0, 0);
+            currentSpeedText.setLayoutParams(textParams);
+            // Add current speed text view to main layout.
+            mainLayout.addView(currentSpeedText);
 
-        // Create main vertical LinearLayout for dialog content.
-        LinearLayout mainLayout = new LinearLayout(context);
-        mainLayout.setOrientation(LinearLayout.VERTICAL);
+            // Create horizontal layout for slider and +/- buttons.
+            LinearLayout sliderLayout = new LinearLayout(context);
+            sliderLayout.setOrientation(LinearLayout.HORIZONTAL);
+            sliderLayout.setGravity(Gravity.CENTER_VERTICAL);
 
-        // Preset size constants.
-        final int dip4 = dipToPixels(4);   // Height for handle bar.
-        final int dip5 = dipToPixels(5);
-        final int dip6 = dipToPixels(6);   // Padding for mainLayout from bottom.
-        final int dip8 = dipToPixels(8);   // Padding for mainLayout from left and right.
-        final int dip20 = dipToPixels(20);
-        final int dip32 = dipToPixels(32); // Height for in-rows speed buttons.
-        final int dip36 = dipToPixels(36); // Height for minus and plus buttons.
-        final int dip40 = dipToPixels(40); // Width for handle bar.
-        final int dip60 = dipToPixels(60); // Height for speed button container.
+            // Create +/- buttons.
+            Button minusButton = createStyledButton(context, false, dip8, dip8);
+            Button plusButton = createStyledButton(context, true, dip8, dip8);
 
-        mainLayout.setPadding(dip5, dip8, dip5, dip8);
+            // Create slider for speed adjustment.
+            SeekBar speedSlider = new SeekBar(context);
+            speedSlider.setFocusable(true);
+            speedSlider.setFocusableInTouchMode(true);
+            speedSlider.setMax(speedToProgressValue(customPlaybackSpeedsMax));
+            speedSlider.setProgress(speedToProgressValue(currentSpeed));
+            speedSlider.getProgressDrawable().setColorFilter(
+                    Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme progress bar.
+            speedSlider.getThumb().setColorFilter(
+                    Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme slider thumb.
+            LinearLayout.LayoutParams sliderParams = new LinearLayout.LayoutParams(
+                    0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
+            speedSlider.setLayoutParams(sliderParams);
 
-        // Set rounded rectangle background for the main layout.
-        RoundRectShape roundRectShape = new RoundRectShape(
-                Utils.createCornerRadii(12), null, null);
-        ShapeDrawable background = new ShapeDrawable(roundRectShape);
-        background.getPaint().setColor(Utils.getDialogBackgroundColor());
-        mainLayout.setBackground(background);
+            // Add -/+ and slider views to slider layout.
+            sliderLayout.addView(minusButton);
+            sliderLayout.addView(speedSlider);
+            sliderLayout.addView(plusButton);
 
-        // Add handle bar at the top.
-        View handleBar = new View(context);
-        ShapeDrawable handleBackground = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(4), null, null));
-        handleBackground.getPaint().setColor(getAdjustedBackgroundColor(true));
-        handleBar.setBackground(handleBackground);
-        LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(
-                dip40, // handle bar width.
-                dip4   // handle bar height.
-        );
-        handleParams.gravity = Gravity.CENTER_HORIZONTAL; // Center horizontally.
-        handleParams.setMargins(0, 0, 0, dip20); // 20dp bottom margins.
-        handleBar.setLayoutParams(handleParams);
-        // Add handle bar view to main layout.
-        mainLayout.addView(handleBar);
+            // Add slider layout to main layout.
+            mainLayout.addView(sliderLayout);
 
-        // Display current playback speed.
-        TextView currentSpeedText = new TextView(context);
-        float currentSpeed = VideoInformation.getPlaybackSpeed();
-        // Initially show with only 0 minimum digits, so 1.0 shows as 1x
-        currentSpeedText.setText(formatSpeedStringX(currentSpeed));
-        currentSpeedText.setTextColor(Utils.getAppForegroundColor());
-        currentSpeedText.setTextSize(16);
-        currentSpeedText.setTypeface(Typeface.DEFAULT_BOLD);
-        currentSpeedText.setGravity(Gravity.CENTER);
-        LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-        textParams.setMargins(0, 0, 0, 0);
-        currentSpeedText.setLayoutParams(textParams);
-        // Add current speed text view to main layout.
-        mainLayout.addView(currentSpeedText);
+            Function<Float, Void> userSelectedSpeed = newSpeed -> {
+                final float roundedSpeed = roundSpeedToNearestIncrement(newSpeed);
+                if (VideoInformation.getPlaybackSpeed() == roundedSpeed) {
+                    // Nothing has changed. New speed rounds to the current speed.
+                    return null;
+                }
 
-        // Create horizontal layout for slider and +/- buttons.
-        LinearLayout sliderLayout = new LinearLayout(context);
-        sliderLayout.setOrientation(LinearLayout.HORIZONTAL);
-        sliderLayout.setGravity(Gravity.CENTER_VERTICAL);
-        sliderLayout.setPadding(dip5, dip5, dip5, dip5); // 5dp padding.
+                currentSpeedText.setText(formatSpeedStringX(roundedSpeed)); // Update display.
+                speedSlider.setProgress(speedToProgressValue(roundedSpeed)); // Update slider.
 
-        // Create minus button.
-        Button minusButton = new Button(context, null, 0); // Disable default theme style.
-        minusButton.setText(""); // No text on button.
-        ShapeDrawable minusBackground = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(20), null, null));
-        minusBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
-        minusButton.setBackground(minusBackground);
-        OutlineSymbolDrawable minusDrawable = new OutlineSymbolDrawable(false); // Minus symbol.
-        minusButton.setForeground(minusDrawable);
-        LinearLayout.LayoutParams minusParams = new LinearLayout.LayoutParams(dip36, dip36);
-        minusParams.setMargins(0, 0, dip5, 0); // 5dp to slider.
-        minusButton.setLayoutParams(minusParams);
-
-        // Create slider for speed adjustment.
-        SeekBar speedSlider = new SeekBar(context);
-        speedSlider.setMax(speedToProgressValue(customPlaybackSpeedsMax));
-        speedSlider.setProgress(speedToProgressValue(currentSpeed));
-        speedSlider.getProgressDrawable().setColorFilter(
-                Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme progress bar.
-        speedSlider.getThumb().setColorFilter(
-                Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme slider thumb.
-        LinearLayout.LayoutParams sliderParams = new LinearLayout.LayoutParams(
-                0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
-        sliderParams.setMargins(dip5, 0, dip5, 0); // 5dp to -/+ buttons.
-        speedSlider.setLayoutParams(sliderParams);
-
-        // Create plus button.
-        Button plusButton = new Button(context, null, 0); // Disable default theme style.
-        plusButton.setText(""); // No text on button.
-        ShapeDrawable plusBackground = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(20), null, null));
-        plusBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
-        plusButton.setBackground(plusBackground);
-        OutlineSymbolDrawable plusDrawable = new OutlineSymbolDrawable(true); // Plus symbol.
-        plusButton.setForeground(plusDrawable);
-        LinearLayout.LayoutParams plusParams = new LinearLayout.LayoutParams(dip36, dip36);
-        plusParams.setMargins(dip5, 0, 0, 0); // 5dp to slider.
-        plusButton.setLayoutParams(plusParams);
-
-        // Add -/+ and slider views to slider layout.
-        sliderLayout.addView(minusButton);
-        sliderLayout.addView(speedSlider);
-        sliderLayout.addView(plusButton);
-
-        LinearLayout.LayoutParams sliderLayoutParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-        sliderLayoutParams.setMargins(0, 0, 0, dip5); // 5dp bottom margin.
-        sliderLayout.setLayoutParams(sliderLayoutParams);
-
-        // Add slider layout to main layout.
-        mainLayout.addView(sliderLayout);
-
-        Function<Float, Void> userSelectedSpeed = newSpeed -> {
-            final float roundedSpeed = roundSpeedToNearestIncrement(newSpeed);
-            if (VideoInformation.getPlaybackSpeed() == roundedSpeed) {
-                // Nothing has changed. New speed rounds to the current speed.
+                RememberPlaybackSpeedPatch.userSelectedPlaybackSpeed(roundedSpeed);
+                VideoInformation.overridePlaybackSpeed(roundedSpeed);
                 return null;
-            }
+            };
 
-            currentSpeedText.setText(formatSpeedStringX(roundedSpeed)); // Update display.
-            speedSlider.setProgress(speedToProgressValue(roundedSpeed)); // Update slider.
-
-            RememberPlaybackSpeedPatch.userSelectedPlaybackSpeed(roundedSpeed);
-            VideoInformation.overridePlaybackSpeed(roundedSpeed);
-            return null;
-        };
-
-        // Set listener for slider to update playback speed.
-        speedSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                if (fromUser) {
-                    // Convert from progress value to video playback speed.
-                    userSelectedSpeed.apply(customPlaybackSpeedsMin + (progress / PROGRESS_BAR_VALUE_SCALE));
+            // Set listener for slider to update playback speed.
+            speedSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    if (fromUser) {
+                        // Convert from progress value to video playback speed.
+                        userSelectedSpeed.apply(customPlaybackSpeedsMin + (progress / PROGRESS_BAR_VALUE_SCALE));
+                    }
                 }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {}
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {}
+            });
+
+            minusButton.setOnClickListener(v -> userSelectedSpeed.apply(
+                    (float) (VideoInformation.getPlaybackSpeed() - SPEED_ADJUSTMENT_CHANGE)));
+            plusButton.setOnClickListener(v -> userSelectedSpeed.apply(
+                    (float) (VideoInformation.getPlaybackSpeed() + SPEED_ADJUSTMENT_CHANGE)));
+
+            // Create GridLayout for preset speed buttons.
+            GridLayout gridLayout = new GridLayout(context);
+            gridLayout.setColumnCount(5); // 5 columns for speed buttons.
+            gridLayout.setAlignmentMode(GridLayout.ALIGN_BOUNDS);
+            gridLayout.setRowCount((int) Math.ceil(customPlaybackSpeeds.length / 5.0));
+            LinearLayout.LayoutParams gridParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            gridParams.setMargins(dip4, dip12, dip4, dip12); // Speed buttons container.
+            gridLayout.setLayoutParams(gridParams);
+
+            // For button use 1 digit minimum.
+            speedFormatter.setMinimumFractionDigits(1);
+
+            // Add buttons for each preset playback speed.
+            for (float speed : customPlaybackSpeeds) {
+                // Container for button and optional label.
+                FrameLayout buttonContainer = new FrameLayout(context);
+
+                // Set layout parameters for each grid cell.
+                GridLayout.LayoutParams containerParams = new GridLayout.LayoutParams();
+                containerParams.width = 0; // Equal width for columns.
+                containerParams.columnSpec = GridLayout.spec(GridLayout.UNDEFINED, 1, 1f);
+                containerParams.setMargins(dip4, 0, dip4, 0); // Button margins.
+                containerParams.height = dip60; // Fixed height for button and label.
+                buttonContainer.setLayoutParams(containerParams);
+
+                // Create speed button.
+                Button speedButton = new Button(context, null, 0);
+                speedButton.setText(speedFormatter.format(speed));
+                speedButton.setTextColor(Utils.getAppForegroundColor());
+                speedButton.setTextSize(12);
+                speedButton.setAllCaps(false);
+                speedButton.setGravity(Gravity.CENTER);
+
+                ShapeDrawable buttonBackground = new ShapeDrawable(new RoundRectShape(
+                        Utils.createCornerRadii(20), null, null));
+                buttonBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
+                speedButton.setBackground(buttonBackground);
+                speedButton.setPadding(dip4, dip4, dip4, dip4);
+
+                // Center button vertically and stretch horizontally in container.
+                FrameLayout.LayoutParams buttonParams = new FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT, dip32, Gravity.CENTER);
+                speedButton.setLayoutParams(buttonParams);
+
+                // Add speed buttons view to buttons container layout.
+                buttonContainer.addView(speedButton);
+
+                // Add "Normal" label for 1.0x speed.
+                if (speed == 1.0f) {
+                    TextView normalLabel = new TextView(context);
+                    // Use same 'Normal' string as stock YouTube.
+                    normalLabel.setText(str("normal_playback_rate_label"));
+                    normalLabel.setTextColor(Utils.getAppForegroundColor());
+                    normalLabel.setTextSize(10);
+                    normalLabel.setGravity(Gravity.CENTER);
+
+                    FrameLayout.LayoutParams labelParams = new FrameLayout.LayoutParams(
+                            FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT,
+                            Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);
+                    labelParams.bottomMargin = 0; // Position label below button.
+                    normalLabel.setLayoutParams(labelParams);
+
+                    buttonContainer.addView(normalLabel);
+                }
+
+                speedButton.setOnClickListener(v -> userSelectedSpeed.apply(speed));
+
+                gridLayout.addView(buttonContainer);
             }
 
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {}
+            // Restore 2 digit minimum.
+            speedFormatter.setMinimumFractionDigits(2);
 
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {}
-        });
+            // Add in-rows speed buttons layout to main layout.
+            mainLayout.addView(gridLayout);
 
-        minusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                (float) (VideoInformation.getPlaybackSpeed() - SPEED_ADJUSTMENT_CHANGE)));
-        plusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                (float) (VideoInformation.getPlaybackSpeed() + SPEED_ADJUSTMENT_CHANGE)));
+            // Create dialog.
+            SheetBottomDialog.SlideDialog dialog = SheetBottomDialog.createSlideDialog(context, mainLayout, fadeInDuration);
+            currentDialog = new WeakReference<>(dialog);
 
-        // Create GridLayout for preset speed buttons.
-        GridLayout gridLayout = new GridLayout(context);
-        gridLayout.setColumnCount(5); // 5 columns for speed buttons.
-        gridLayout.setAlignmentMode(GridLayout.ALIGN_BOUNDS);
-        gridLayout.setRowCount((int) Math.ceil(customPlaybackSpeeds.length / 5.0));
-        LinearLayout.LayoutParams gridParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-        gridParams.setMargins(0, 0, 0, 0); // No margins around GridLayout.
-        gridLayout.setLayoutParams(gridParams);
+            // Create observer for PlayerType changes.
+            Function1<PlayerType, Unit> playerTypeObserver = new Function1<>() {
+                @Override
+                public Unit invoke(PlayerType type) {
+                    SheetBottomDialog.SlideDialog current = currentDialog.get();
+                    if (current == null || !current.isShowing()) {
+                        // Should never happen.
+                        PlayerType.getOnChange().removeObserver(this);
+                        Logger.printException(() -> "Removing player type listener as dialog is null or closed");
+                    } else if (type == PlayerType.WATCH_WHILE_PICTURE_IN_PICTURE) {
+                        current.dismiss();
+                        Logger.printDebug(() -> "Playback speed dialog dismissed due to PiP mode");
+                    }
+                    return Unit.INSTANCE;
+                }
+            };
 
-        // For button use 1 digit minimum.
-        speedFormatter.setMinimumFractionDigits(1);
+            // Add observer to dismiss dialog when entering PiP mode.
+            PlayerType.getOnChange().addObserver(playerTypeObserver);
 
-        // Add buttons for each preset playback speed.
-        for (float speed : customPlaybackSpeeds) {
-            // Container for button and optional label.
-            FrameLayout buttonContainer = new FrameLayout(context);
+            // Remove observer when dialog is dismissed.
+            dialog.setOnDismissListener(d -> {
+                PlayerType.getOnChange().removeObserver(playerTypeObserver);
+                Logger.printDebug(() -> "PlayerType observer removed on dialog dismiss");
+            });
 
-            // Set layout parameters for each grid cell.
-            GridLayout.LayoutParams containerParams = new GridLayout.LayoutParams();
-            containerParams.width = 0; // Equal width for columns.
-            containerParams.columnSpec = GridLayout.spec(GridLayout.UNDEFINED, 1, 1f);
-            containerParams.setMargins(dip5, 0, dip5, 0); // Button margins.
-            containerParams.height = dip60; // Fixed height for button and label.
-            buttonContainer.setLayoutParams(containerParams);
+            dialog.show(); // Show the dialog.
 
-            // Create speed button.
-            Button speedButton = new Button(context, null, 0);
-            speedButton.setText(speedFormatter.format(speed));
-            speedButton.setTextColor(Utils.getAppForegroundColor());
-            speedButton.setTextSize(12);
-            speedButton.setAllCaps(false);
-            speedButton.setGravity(Gravity.CENTER);
-
-            ShapeDrawable buttonBackground = new ShapeDrawable(new RoundRectShape(
-                    Utils.createCornerRadii(20), null, null));
-            buttonBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
-            speedButton.setBackground(buttonBackground);
-            speedButton.setPadding(dip5, dip5, dip5, dip5);
-
-            // Center button vertically and stretch horizontally in container.
-            FrameLayout.LayoutParams buttonParams = new FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT, dip32, Gravity.CENTER);
-            speedButton.setLayoutParams(buttonParams);
-
-            // Add speed buttons view to buttons container layout.
-            buttonContainer.addView(speedButton);
-
-            // Add "Normal" label for 1.0x speed.
-            if (speed == 1.0f) {
-                TextView normalLabel = new TextView(context);
-                // Use same 'Normal' string as stock YouTube.
-                normalLabel.setText(str("normal_playback_rate_label"));
-                normalLabel.setTextColor(Utils.getAppForegroundColor());
-                normalLabel.setTextSize(10);
-                normalLabel.setGravity(Gravity.CENTER);
-
-                FrameLayout.LayoutParams labelParams = new FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT,
-                        Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);
-                labelParams.bottomMargin = 0; // Position label below button.
-                normalLabel.setLayoutParams(labelParams);
-
-                buttonContainer.addView(normalLabel);
-            }
-
-            speedButton.setOnClickListener(v -> userSelectedSpeed.apply(speed));
-
-            gridLayout.addView(buttonContainer);
+        } catch (Exception ex) {
+            Logger.printException(() -> "showModernCustomPlaybackSpeedDialog failure", ex);
         }
+    }
 
-        // Restore 2 digit minimum.
-        speedFormatter.setMinimumFractionDigits(2);
-
-        // Add in-rows speed buttons layout to main layout.
-        mainLayout.addView(gridLayout);
-
-        // Wrap mainLayout in another LinearLayout for side margins.
-        LinearLayout wrapperLayout = new LinearLayout(context);
-        wrapperLayout.setOrientation(LinearLayout.VERTICAL);
-        wrapperLayout.setPadding(dip8, 0, dip8, 0); // 8dp side margins.
-        wrapperLayout.addView(mainLayout);
-        dialog.setContentView(wrapperLayout);
-
-        // Configure dialog window to appear at the bottom.
-        Window window = dialog.getWindow();
-        if (window != null) {
-            WindowManager.LayoutParams params = window.getAttributes();
-            params.gravity = Gravity.BOTTOM; // Position at bottom of screen.
-            params.y = dip6; // 6dp margin from bottom.
-            // In landscape, use the smaller dimension (height) as portrait width.
-            int portraitWidth = context.getResources().getDisplayMetrics().widthPixels;
-            if (context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                portraitWidth = Math.min(
-                        portraitWidth,
-                        context.getResources().getDisplayMetrics().heightPixels);
-            }
-            params.width = portraitWidth; // Use portrait width.
-            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            window.setAttributes(params);
-            window.setBackgroundDrawable(null); // Remove default dialog background.
-        }
-
-        // Apply slide-in animation when showing the dialog.
-        final int fadeDurationFast = Utils.getResourceInteger("fade_duration_fast");
-        Animation slideInABottomAnimation = Utils.getResourceAnimation("slide_in_bottom");
-        slideInABottomAnimation.setDuration(fadeDurationFast);
-        mainLayout.startAnimation(slideInABottomAnimation);
-
-        // Set touch listener on mainLayout to enable drag-to-dismiss.
-        //noinspection ClickableViewAccessibility
-        mainLayout.setOnTouchListener(new View.OnTouchListener() {
-            /** Threshold for dismissing the dialog. */
-            final float dismissThreshold = dipToPixels(100); // Distance to drag to dismiss.
-            /** Store initial Y position of touch. */
-            float touchY;
-            /** Track current translation. */
-            float translationY;
-
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN:
-                        // Capture initial Y position of touch.
-                        touchY = event.getRawY();
-                        translationY = mainLayout.getTranslationY();
-                        return true;
-                    case MotionEvent.ACTION_MOVE:
-                        // Calculate drag distance and apply translation downwards only.
-                        final float deltaY = event.getRawY() - touchY;
-                        // Only allow downward drag (positive deltaY).
-                        if (deltaY >= 0) {
-                            mainLayout.setTranslationY(translationY + deltaY);
-                        }
-                        return true;
-                    case MotionEvent.ACTION_UP:
-                    case MotionEvent.ACTION_CANCEL:
-                        // Check if dialog should be dismissed based on drag distance.
-                        if (mainLayout.getTranslationY() > dismissThreshold) {
-                            // Animate dialog off-screen and dismiss.
-                            //noinspection ExtractMethodRecommender
-                            final float remainingDistance = context.getResources().getDisplayMetrics().heightPixels
-                                    - mainLayout.getTop();
-                            TranslateAnimation slideOut = new TranslateAnimation(
-                                    0, 0, mainLayout.getTranslationY(), remainingDistance);
-                            slideOut.setDuration(fadeDurationFast);
-                            slideOut.setAnimationListener(new Animation.AnimationListener() {
-                                @Override
-                                public void onAnimationStart(Animation animation) {}
-
-                                @Override
-                                public void onAnimationEnd(Animation animation) {
-                                    dialog.dismiss();
-                                }
-
-                                @Override
-                                public void onAnimationRepeat(Animation animation) {}
-                            });
-                            mainLayout.startAnimation(slideOut);
-                        } else {
-                            // Animate back to original position if not dragged far enough.
-                            TranslateAnimation slideBack = new TranslateAnimation(
-                                    0, 0, mainLayout.getTranslationY(), 0);
-                            slideBack.setDuration(fadeDurationFast);
-                            mainLayout.startAnimation(slideBack);
-                            mainLayout.setTranslationY(0);
-                        }
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-        });
-
-        // Create observer for PlayerType changes.
-        Function1<PlayerType, Unit> playerTypeObserver = new Function1<>() {
-            @Override
-            public Unit invoke(PlayerType type) {
-                Dialog current = currentDialog.get();
-                if (current == null || !current.isShowing()) {
-                    // Should never happen.
-                    PlayerType.getOnChange().removeObserver(this);
-                    Logger.printException(() -> "Removing player type listener as dialog is null or closed");
-                } else if (type == PlayerType.WATCH_WHILE_PICTURE_IN_PICTURE) {
-                    current.dismiss();
-                    Logger.printDebug(() -> "Playback speed dialog dismissed due to PiP mode");
-                }
-                return Unit.INSTANCE;
-            }
-        };
-
-        // Add observer to dismiss dialog when entering PiP mode.
-        PlayerType.getOnChange().addObserver(playerTypeObserver);
-
-        // Remove observer when dialog is dismissed.
-        dialog.setOnDismissListener(d -> {
-            PlayerType.getOnChange().removeObserver(playerTypeObserver);
-            Logger.printDebug(() -> "PlayerType observer removed on dialog dismiss");
-        });
-
-        dialog.show(); // Display the dialog.
+    /**
+     * Creates a styled button with a plus or minus symbol.
+     *
+     * @param context The Android context used to create the button.
+     * @param isPlus  True to display a plus symbol, false to display a minus symbol.
+     * @param marginStart The start margin in pixels (left for LTR, right for RTL).
+     * @param marginEnd The end margin in pixels (right for LTR, left for RTL).
+     * @return A configured {@link Button} with the specified styling and layout parameters.
+     */
+    private static Button createStyledButton(Context context, boolean isPlus, int marginStart, int marginEnd) {
+        Button button = new Button(context, null, 0); // Disable default theme style.
+        button.setText(""); // No text on button.
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(20), null, null));
+        background.getPaint().setColor(getAdjustedBackgroundColor(false));
+        button.setBackground(background);
+        button.setForeground(new OutlineSymbolDrawable(isPlus)); // Plus or minus symbol.
+        final int dip36 = dipToPixels(36);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(dip36, dip36);
+        params.setMargins(marginStart, 0, marginEnd, 0); // Set margins.
+        button.setLayoutParams(params);
+        return button;
     }
 
     /**
@@ -674,10 +536,9 @@ public class CustomPlaybackSpeedPatch {
      *         for light themes to ensure visual contrast.
      */
     public static int getAdjustedBackgroundColor(boolean isHandleBar) {
-        final int baseColor = Utils.getDialogBackgroundColor();
         final float darkThemeFactor = isHandleBar ? 1.25f : 1.115f; // 1.25f for handleBar, 1.115f for others in dark theme.
         final float lightThemeFactor = isHandleBar ? 0.9f : 0.95f; // 0.9f for handleBar, 0.95f for others in light theme.
-        return Utils.adjustColorBrightness(baseColor, lightThemeFactor, darkThemeFactor);
+        return Utils.adjustColorBrightness(getDialogBackgroundColor(), lightThemeFactor, darkThemeFactor);
     }
 }
 
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java
index 965b16364..72b74fc94 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java
@@ -151,13 +151,10 @@ public final class SeekbarColorPatch {
             String seekbarStyle = get9BitStyleIdentifier(customSeekbarColor);
             Logger.printDebug(() -> "Using splash seekbar style: " + seekbarStyle);
 
-            final int styleIdentifierDefault = Utils.getResourceIdentifier(
+            final int styleIdentifierDefault = Utils.getResourceIdentifierOrThrow(
                     seekbarStyle,
                     "style"
             );
-            if (styleIdentifierDefault == 0) {
-                throw new RuntimeException("Seekbar style not found: " + seekbarStyle);
-            }
 
             Resources.Theme theme = Utils.getContext().getResources().newTheme();
             theme.applyStyle(styleIdentifierDefault, true);
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeAboutPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeAboutPreference.java
index c37b472d3..8aa739d20 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeAboutPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeAboutPreference.java
@@ -3,7 +3,7 @@ package app.revanced.extension.youtube.returnyoutubedislike.ui;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import app.revanced.extension.youtube.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
 
 /**
  * Allows tapping the RYD about preference to open the website.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java
deleted file mode 100644
index 10be641f7..000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package app.revanced.extension.youtube.settings;
-
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.drawable.GradientDrawable;
-import android.util.Pair;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.SearchView;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.List;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.AppLanguage;
-import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
-
-/**
- * Controller for managing the search view in ReVanced settings.
- */
-@SuppressWarnings({"deprecated", "DiscouragedApi"})
-public class SearchViewController {
-    private static final int MAX_HISTORY_SIZE = 5;
-
-    private final SearchView searchView;
-    private final FrameLayout searchContainer;
-    private final Toolbar toolbar;
-    private final Activity activity;
-    private boolean isSearchActive;
-    private final CharSequence originalTitle;
-    private final Deque<String> searchHistory;
-    private final AutoCompleteTextView autoCompleteTextView;
-    private final boolean showSettingsSearchHistory;
-    private int currentOrientation;
-
-    /**
-     * Creates a background drawable for the SearchView with rounded corners.
-     */
-    private static GradientDrawable createBackgroundDrawable(Context context) {
-        GradientDrawable background = new GradientDrawable();
-        background.setShape(GradientDrawable.RECTANGLE);
-        background.setCornerRadius(28 * context.getResources().getDisplayMetrics().density); // 28dp corner radius.
-        background.setColor(getSearchViewBackground());
-        return background;
-    }
-
-    /**
-     * Creates a background drawable for suggestion items with rounded corners.
-     */
-    private static GradientDrawable createSuggestionBackgroundDrawable(Context context) {
-        GradientDrawable background = new GradientDrawable();
-        background.setShape(GradientDrawable.RECTANGLE);
-        background.setColor(getSearchViewBackground());
-        return background;
-    }
-
-    @ColorInt
-    public static int getSearchViewBackground() {
-        return Utils.isDarkModeEnabled()
-                ? Utils.adjustColorBrightness(Utils.getDialogBackgroundColor(), 1.11f)
-                : Utils.adjustColorBrightness(Utils.getThemeLightColor(), 0.95f);
-    }
-
-    /**
-     * Adds search view components to the activity.
-     */
-    public static SearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
-        return new SearchViewController(activity, toolbar, fragment);
-    }
-
-    private SearchViewController(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
-        this.activity = activity;
-        this.toolbar = toolbar;
-        this.originalTitle = toolbar.getTitle();
-        this.showSettingsSearchHistory = Settings.SETTINGS_SEARCH_HISTORY.get();
-        this.searchHistory = new LinkedList<>();
-        this.currentOrientation = activity.getResources().getConfiguration().orientation;
-        StringSetting searchEntries = Settings.SETTINGS_SEARCH_ENTRIES;
-        if (showSettingsSearchHistory) {
-            String entries = searchEntries.get();
-            if (!entries.isBlank()) {
-                searchHistory.addAll(Arrays.asList(entries.split("\n")));
-            }
-        } else {
-            // Clear old saved history if the user turns off the feature.
-            searchEntries.resetToDefault();
-        }
-
-        // Retrieve SearchView and container from XML.
-        searchView = activity.findViewById(getResourceIdentifier(
-                "revanced_search_view", "id"));
-        searchContainer = activity.findViewById(getResourceIdentifier(
-                "revanced_search_view_container", "id"));
-
-        // Initialize AutoCompleteTextView.
-        autoCompleteTextView = searchView.findViewById(
-                searchView.getContext().getResources().getIdentifier(
-                        "android:id/search_src_text", null, null));
-
-        // Disable fullscreen keyboard mode.
-        autoCompleteTextView.setImeOptions(autoCompleteTextView.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
-
-        // Set background and query hint.
-        searchView.setBackground(createBackgroundDrawable(toolbar.getContext()));
-        searchView.setQueryHint(str("revanced_settings_search_hint"));
-
-        // Configure RTL support based on app language.
-        AppLanguage appLanguage = BaseSettings.REVANCED_LANGUAGE.get();
-        if (Utils.isRightToLeftLocale(appLanguage.getLocale())) {
-            searchView.setTextDirection(View.TEXT_DIRECTION_RTL);
-            searchView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
-        }
-
-        // Set up search history suggestions.
-        if (showSettingsSearchHistory) {
-            setupSearchHistory();
-        }
-
-        // Set up query text listener.
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                try {
-                    String queryTrimmed = query.trim();
-                    if (!queryTrimmed.isEmpty()) {
-                        saveSearchQuery(queryTrimmed);
-                    }
-                    // Hide suggestions on submit.
-                    if (showSettingsSearchHistory && autoCompleteTextView != null) {
-                        autoCompleteTextView.dismissDropDown();
-                    }
-                } catch (Exception ex) {
-                    Logger.printException(() -> "onQueryTextSubmit failure", ex);
-                }
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                try {
-                    Logger.printDebug(() -> "Search query: " + newText);
-                    fragment.filterPreferences(newText);
-                    // Prevent suggestions from showing during text input.
-                    if (showSettingsSearchHistory && autoCompleteTextView != null) {
-                        if (!newText.isEmpty()) {
-                            autoCompleteTextView.dismissDropDown();
-                            autoCompleteTextView.setThreshold(Integer.MAX_VALUE); // Disable autocomplete suggestions.
-                        } else {
-                            autoCompleteTextView.setThreshold(1); // Re-enable for empty input.
-                        }
-                    }
-                } catch (Exception ex) {
-                    Logger.printException(() -> "onQueryTextChange failure", ex);
-                }
-                return true;
-            }
-        });
-
-        // Set menu and search icon.
-        final int actionSearchId = getResourceIdentifier("action_search", "id");
-        toolbar.inflateMenu(getResourceIdentifier("revanced_search_menu", "menu"));
-        MenuItem searchItem = toolbar.getMenu().findItem(actionSearchId);
-
-        // Set menu item click listener.
-        toolbar.setOnMenuItemClickListener(item -> {
-            try {
-                if (item.getItemId() == actionSearchId) {
-                    if (!isSearchActive) {
-                        openSearch();
-                    }
-                    return true;
-                }
-            } catch (Exception ex) {
-                Logger.printException(() -> "menu click failure", ex);
-            }
-            return false;
-        });
-
-        // Set navigation click listener.
-        toolbar.setNavigationOnClickListener(view -> {
-            try {
-                if (isSearchActive) {
-                    closeSearch();
-                } else {
-                    activity.finish();
-                }
-            } catch (Exception ex) {
-                Logger.printException(() -> "navigation click failure", ex);
-            }
-        });
-    }
-
-    /**
-     * Sets up the search history suggestions for the SearchView with custom adapter.
-     */
-    private void setupSearchHistory() {
-        if (autoCompleteTextView != null) {
-            SearchHistoryAdapter adapter = new SearchHistoryAdapter(activity, new ArrayList<>(searchHistory));
-            autoCompleteTextView.setAdapter(adapter);
-            autoCompleteTextView.setThreshold(1); // Initial threshold for empty input.
-            autoCompleteTextView.setLongClickable(true);
-
-            // Show suggestions only when search bar is active and query is empty.
-            autoCompleteTextView.setOnFocusChangeListener((v, hasFocus) -> {
-                if (hasFocus && isSearchActive && autoCompleteTextView.getText().length() == 0) {
-                    autoCompleteTextView.showDropDown();
-                }
-            });
-        }
-    }
-
-    /**
-     * Saves a search query to the search history.
-     * @param query The search query to save.
-     */
-    private void saveSearchQuery(String query) {
-        if (!showSettingsSearchHistory) {
-            return;
-        }
-        searchHistory.remove(query); // Remove if already exists to update position.
-        searchHistory.addFirst(query); // Add to the most recent.
-
-        // Remove extra old entries.
-        while (searchHistory.size() > MAX_HISTORY_SIZE) {
-            String last = searchHistory.removeLast();
-            Logger.printDebug(() -> "Removing search history query: " + last);
-        }
-
-        saveSearchHistory();
-
-        updateSearchHistoryAdapter();
-    }
-
-    /**
-     * Removes a search query from the search history.
-     * @param query The search query to remove.
-     */
-    private void removeSearchQuery(String query) {
-        searchHistory.remove(query);
-
-        saveSearchHistory();
-
-        updateSearchHistoryAdapter();
-    }
-
-    /**
-     * Save the search history to the shared preferences.
-     */
-    private void saveSearchHistory() {
-        Logger.printDebug(() -> "Saving search history: " + searchHistory);
-
-        Settings.SETTINGS_SEARCH_ENTRIES.save(
-                String.join("\n", searchHistory)
-        );
-    }
-
-    /**
-     * Updates the search history adapter with the latest history.
-     */
-    private void updateSearchHistoryAdapter() {
-        if (autoCompleteTextView == null) {
-            return;
-        }
-
-        SearchHistoryAdapter adapter = (SearchHistoryAdapter) autoCompleteTextView.getAdapter();
-        if (adapter != null) {
-            adapter.clear();
-            adapter.addAll(searchHistory);
-            adapter.notifyDataSetChanged();
-        }
-    }
-
-    public void handleOrientationChange(int newOrientation) {
-        if (newOrientation != currentOrientation) {
-            currentOrientation = newOrientation;
-            if (autoCompleteTextView != null) {
-                autoCompleteTextView.dismissDropDown();
-                Logger.printDebug(() -> "Orientation changed, search history dismissed");
-            }
-        }
-    }
-
-    /**
-     * Opens the search view and shows the keyboard.
-     */
-    private void openSearch() {
-        isSearchActive = true;
-        toolbar.getMenu().findItem(getResourceIdentifier(
-                "action_search", "id")).setVisible(false);
-        toolbar.setTitle("");
-        searchContainer.setVisibility(View.VISIBLE);
-        searchView.requestFocus();
-
-        // Show keyboard.
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
-
-        // Show suggestions with a slight delay.
-        if (showSettingsSearchHistory && autoCompleteTextView != null && autoCompleteTextView.getText().length() == 0) {
-            searchView.postDelayed(() -> {
-                if (isSearchActive && autoCompleteTextView.getText().length() == 0) {
-                    autoCompleteTextView.showDropDown();
-                }
-            }, 100); // 100ms delay to ensure focus is stable.
-        }
-    }
-
-    /**
-     * Closes the search view and hides the keyboard.
-     */
-    public void closeSearch() {
-        isSearchActive = false;
-        toolbar.getMenu().findItem(getResourceIdentifier(
-                "action_search", "id")).setVisible(true);
-        toolbar.setTitle(originalTitle);
-        searchContainer.setVisibility(View.GONE);
-        searchView.setQuery("", false);
-
-        // Hide keyboard.
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
-    }
-
-    public static boolean handleBackPress() {
-        if (LicenseActivityHook.searchViewController != null
-                && LicenseActivityHook.searchViewController.isSearchActive()) {
-            LicenseActivityHook.searchViewController.closeSearch();
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isSearchActive() {
-        return isSearchActive;
-    }
-
-    /**
-     * Custom ArrayAdapter for search history.
-     */
-    private class SearchHistoryAdapter extends ArrayAdapter<String> {
-        public SearchHistoryAdapter(Context context, List<String> history) {
-            super(context, 0, history);
-        }
-
-        @NonNull
-        @Override
-        public View getView(int position, View convertView, @NonNull android.view.ViewGroup parent) {
-            if (convertView == null) {
-                convertView = LinearLayout.inflate(getContext(), getResourceIdentifier(
-                        "revanced_search_suggestion_item", "layout"), null);
-            }
-
-            // Apply rounded corners programmatically.
-            convertView.setBackground(createSuggestionBackgroundDrawable(getContext()));
-            String query = getItem(position);
-
-            // Set query text.
-            TextView textView = convertView.findViewById(getResourceIdentifier(
-                    "suggestion_text", "id"));
-            if (textView != null) {
-                textView.setText(query);
-            }
-
-            // Set click listener for inserting query into SearchView.
-            convertView.setOnClickListener(v -> {
-                searchView.setQuery(query, true); // Insert selected query and submit.
-            });
-
-            // Set long click listener for deletion confirmation.
-            convertView.setOnLongClickListener(v -> {
-                Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
-                        activity,
-                        query,                                // Title.
-                        str("revanced_settings_search_remove_message"), // Message.
-                        null,                                 // No EditText.
-                        null,                                 // OK button text.
-                        () -> removeSearchQuery(query),       // OK button action.
-                        () -> {},                             // Cancel button action (dismiss only).
-                        null,                                 // No Neutral button text.
-                        () -> {},                             // Neutral button action (dismiss only).
-                        true                                  // Dismiss dialog when onNeutralClick.
-                );
-
-                Dialog dialog = dialogPair.first;
-                dialog.setCancelable(true); // Allow dismissal via back button.
-                dialog.show(); // Show the dialog.
-                return true;
-            });
-
-            return convertView;
-        }
-    }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
index 461ac3fe6..916be8723 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -2,7 +2,6 @@ package app.revanced.extension.youtube.settings;
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
-import static app.revanced.extension.shared.settings.Setting.Availability;
 import static app.revanced.extension.shared.settings.Setting.migrateOldSettingToNew;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAll;
@@ -15,10 +14,6 @@ import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.Fullscr
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_1;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_2;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_3;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_4;
 import static app.revanced.extension.youtube.patches.OpenShortsInRegularPlayerPatch.ShortsPlayerType;
 import static app.revanced.extension.youtube.patches.SeekbarThumbnailsPatch.SeekbarThumbnailsHighQualityAvailability;
 import static app.revanced.extension.youtube.patches.components.PlayerFlyoutMenuItemsFilter.HideAudioFlyoutMenuAvailability;
@@ -179,16 +174,15 @@ public class Settings extends BaseSettings {
 
     // Miniplayer
     public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true);
-    private static final Availability MINIPLAYER_ANY_MODERN = MINIPLAYER_TYPE.availability(MODERN_1, MODERN_2, MODERN_3, MODERN_4);
-    public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, MINIPLAYER_ANY_MODERN);
-    public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, MINIPLAYER_ANY_MODERN);
+    public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
+    public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
     public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
     public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability());
-    public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
-    public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, MINIPLAYER_TYPE.availability(MODERN_1));
-    public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
-    public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, MINIPLAYER_ANY_MODERN);
-    public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, MINIPLAYER_TYPE.availability(MODERN_1));
+    public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, new MiniplayerPatch.MiniplayerHideSubtextsAvailability());
+    public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
+    public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
+    public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
+    public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
 
     // External downloader
     public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE);
@@ -254,8 +248,6 @@ public class Settings extends BaseSettings {
 
     // General layout
     public static final BooleanSetting RESTORE_OLD_SETTINGS_MENUS = new BooleanSetting("revanced_restore_old_settings_menus", FALSE, true);
-    public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
-    public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "", true);
     public static final EnumSetting<FormFactor> CHANGE_FORM_FACTOR = new EnumSetting<>("revanced_change_form_factor", FormFactor.DEFAULT, true, "revanced_change_form_factor_user_dialog_message");
     public static final BooleanSetting BYPASS_IMAGE_REGION_RESTRICTIONS = new BooleanSetting("revanced_bypass_image_region_restrictions", FALSE, true);
     public static final BooleanSetting GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_gradient_loading_screen", FALSE, true);
@@ -381,9 +373,9 @@ public class Settings extends BaseSettings {
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_OVERLAY_OPACITY = new IntegerSetting("revanced_swipe_overlay_background_opacity", 60, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    public static final StringSetting SWIPE_OVERLAY_BRIGHTNESS_COLOR = new StringSetting("revanced_swipe_overlay_progress_brightness_color", "#FFFFFF", true,
+    public static final StringSetting SWIPE_OVERLAY_BRIGHTNESS_COLOR = new StringSetting("revanced_swipe_overlay_progress_brightness_color", "#BFFFFFFF", true,
             parent(SWIPE_BRIGHTNESS));
-    public static final StringSetting SWIPE_OVERLAY_VOLUME_COLOR = new StringSetting("revanced_swipe_overlay_progress_volume_color", "#FFFFFF", true,
+    public static final StringSetting SWIPE_OVERLAY_VOLUME_COLOR = new StringSetting("revanced_swipe_overlay_progress_volume_color", "#BFFFFFFF", true,
             parent(SWIPE_VOLUME));
     public static final LongSetting SWIPE_OVERLAY_TIMEOUT = new LongSetting("revanced_swipe_overlay_timeout", 500L, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
@@ -405,7 +397,7 @@ public class Settings extends BaseSettings {
     // SponsorBlock
     public static final BooleanSetting SB_ENABLED = new BooleanSetting("sb_enabled", TRUE);
     /** Do not use id setting directly. Instead use {@link SponsorBlockSettings}. */
-    public static final StringSetting SB_PRIVATE_USER_ID = new StringSetting("sb_private_user_id_Do_Not_Share", "");
+    public static final StringSetting SB_PRIVATE_USER_ID = new StringSetting("sb_private_user_id_Do_Not_Share", "", parent(SB_ENABLED));
     public static final IntegerSetting SB_CREATE_NEW_SEGMENT_STEP = new IntegerSetting("sb_create_new_segment_step", 150, parent(SB_ENABLED));
     public static final BooleanSetting SB_VOTING_BUTTON = new BooleanSetting("sb_voting_button", FALSE, parent(SB_ENABLED));
     public static final BooleanSetting SB_CREATE_NEW_SEGMENT = new BooleanSetting("sb_create_new_segment", FALSE, parent(SB_ENABLED));
@@ -421,46 +413,36 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SB_TRACK_SKIP_COUNT = new BooleanSetting("sb_track_skip_count", TRUE, parent(SB_ENABLED));
     public static final FloatSetting SB_SEGMENT_MIN_DURATION = new FloatSetting("sb_min_segment_duration", 0F, parent(SB_ENABLED));
     public static final BooleanSetting SB_VIDEO_LENGTH_WITHOUT_SEGMENTS = new BooleanSetting("sb_video_length_without_segments", FALSE, parent(SB_ENABLED));
-    public static final StringSetting SB_API_URL = new StringSetting("sb_api_url", "https://sponsor.ajay.app");
+    public static final StringSetting SB_API_URL = new StringSetting("sb_api_url", "https://sponsor.ajay.app", parent(SB_ENABLED));
     public static final BooleanSetting SB_USER_IS_VIP = new BooleanSetting("sb_user_is_vip", FALSE);
-    public static final IntegerSetting SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS = new IntegerSetting("sb_local_time_saved_number_segments", 0);
-    public static final LongSetting SB_LOCAL_TIME_SAVED_MILLISECONDS = new LongSetting("sb_local_time_saved_milliseconds", 0L);
+    public static final IntegerSetting SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS = new IntegerSetting("sb_local_time_saved_number_segments", 0, parent(SB_ENABLED));
+    public static final LongSetting SB_LOCAL_TIME_SAVED_MILLISECONDS = new LongSetting("sb_local_time_saved_milliseconds", 0L, parent(SB_ENABLED));
     public static final LongSetting SB_LAST_VIP_CHECK = new LongSetting("sb_last_vip_check", 0L, false, false);
     public static final BooleanSetting SB_HIDE_EXPORT_WARNING = new BooleanSetting("sb_hide_export_warning", FALSE, false, false);
     public static final BooleanSetting SB_SEEN_GUIDELINES = new BooleanSetting("sb_seen_guidelines", FALSE, false, false);
-    public static final StringSetting SB_CATEGORY_SPONSOR = new StringSetting("sb_sponsor", SKIP_AUTOMATICALLY_ONCE.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_SPONSOR_COLOR = new StringSetting("sb_sponsor_color", "#00D400");
-    public static final FloatSetting  SB_CATEGORY_SPONSOR_OPACITY = new FloatSetting("sb_sponsor_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_SELF_PROMO = new StringSetting("sb_selfpromo", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_SELF_PROMO_COLOR = new StringSetting("sb_selfpromo_color", "#FFFF00");
-    public static final FloatSetting  SB_CATEGORY_SELF_PROMO_OPACITY = new FloatSetting("sb_selfpromo_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_INTERACTION = new StringSetting("sb_interaction", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_INTERACTION_COLOR = new StringSetting("sb_interaction_color", "#CC00FF");
-    public static final FloatSetting  SB_CATEGORY_INTERACTION_OPACITY = new FloatSetting("sb_interaction_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_HIGHLIGHT = new StringSetting("sb_highlight", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_HIGHLIGHT_COLOR = new StringSetting("sb_highlight_color", "#FF1684");
-    public static final FloatSetting  SB_CATEGORY_HIGHLIGHT_OPACITY = new FloatSetting("sb_highlight_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_HOOK = new StringSetting("sb_hook", IGNORE.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_HOOK_COLOR = new StringSetting("sb_hook_color", "#395699");
-    public static final FloatSetting  SB_CATEGORY_HOOK_OPACITY = new FloatSetting("sb_hook_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_INTRO = new StringSetting("sb_intro", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_INTRO_COLOR = new StringSetting("sb_intro_color", "#00FFFF");
-    public static final FloatSetting  SB_CATEGORY_INTRO_OPACITY = new FloatSetting("sb_intro_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_OUTRO = new StringSetting("sb_outro", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_OUTRO_COLOR = new StringSetting("sb_outro_color", "#0202ED");
-    public static final FloatSetting  SB_CATEGORY_OUTRO_OPACITY = new FloatSetting("sb_outro_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_PREVIEW = new StringSetting("sb_preview", IGNORE.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_PREVIEW_COLOR = new StringSetting("sb_preview_color", "#008FD6");
-    public static final FloatSetting  SB_CATEGORY_PREVIEW_OPACITY = new FloatSetting("sb_preview_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_FILLER = new StringSetting("sb_filler", IGNORE.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_FILLER_COLOR = new StringSetting("sb_filler_color", "#7300FF");
-    public static final FloatSetting  SB_CATEGORY_FILLER_OPACITY = new FloatSetting("sb_filler_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC = new StringSetting("sb_music_offtopic", MANUAL_SKIP.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC_COLOR = new StringSetting("sb_music_offtopic_color", "#FF9900");
-    public static final FloatSetting  SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY = new FloatSetting("sb_music_offtopic_opacity", 0.8f);
-    public static final StringSetting SB_CATEGORY_UNSUBMITTED = new StringSetting("sb_unsubmitted", SKIP_AUTOMATICALLY.reVancedKeyValue);
-    public static final StringSetting SB_CATEGORY_UNSUBMITTED_COLOR = new StringSetting("sb_unsubmitted_color", "#FFFFFF");
-    public static final FloatSetting  SB_CATEGORY_UNSUBMITTED_OPACITY = new FloatSetting("sb_unsubmitted_opacity", 1.0f);
+    public static final StringSetting SB_CATEGORY_SPONSOR = new StringSetting("sb_sponsor", SKIP_AUTOMATICALLY_ONCE.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_SPONSOR_COLOR = new StringSetting("sb_sponsor_color", "#CC00D400");
+    public static final StringSetting SB_CATEGORY_SELF_PROMO = new StringSetting("sb_selfpromo", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_SELF_PROMO_COLOR = new StringSetting("sb_selfpromo_color", "#CCFFFF00");
+    public static final StringSetting SB_CATEGORY_INTERACTION = new StringSetting("sb_interaction", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_INTERACTION_COLOR = new StringSetting("sb_interaction_color", "#CCCC00FF");
+    public static final StringSetting SB_CATEGORY_HIGHLIGHT = new StringSetting("sb_highlight", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_HIGHLIGHT_COLOR = new StringSetting("sb_highlight_color", "#CCFF1684");
+    public static final StringSetting SB_CATEGORY_HOOK = new StringSetting("sb_hook", IGNORE.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_HOOK_COLOR = new StringSetting("sb_hook_color", "#CC395699");
+    public static final StringSetting SB_CATEGORY_INTRO = new StringSetting("sb_intro", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_INTRO_COLOR = new StringSetting("sb_intro_color", "#CC00FFFF");
+    public static final StringSetting SB_CATEGORY_OUTRO = new StringSetting("sb_outro", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_OUTRO_COLOR = new StringSetting("sb_outro_color", "#CC0202ED");
+    public static final StringSetting SB_CATEGORY_PREVIEW = new StringSetting("sb_preview", IGNORE.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_PREVIEW_COLOR = new StringSetting("sb_preview_color", "#CC008FD6");
+    public static final StringSetting SB_CATEGORY_FILLER = new StringSetting("sb_filler", IGNORE.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_FILLER_COLOR = new StringSetting("sb_filler_color", "#CC7300FF");
+    public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC = new StringSetting("sb_music_offtopic", MANUAL_SKIP.reVancedKeyValue, parent(SB_ENABLED));
+    public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC_COLOR = new StringSetting("sb_music_offtopic_color", "#CCFF9900");
+    // Dummy setting. Category is not exposed in the UI nor does it ever change.
+    public static final StringSetting SB_CATEGORY_UNSUBMITTED = new StringSetting("sb_unsubmitted", SKIP_AUTOMATICALLY.reVancedKeyValue, false, false);
+    public static final StringSetting SB_CATEGORY_UNSUBMITTED_COLOR = new StringSetting("sb_unsubmitted_color", "#FFFFFFFF", false, false);
 
     // Deprecated migrations
     private static final BooleanSetting DEPRECATED_HIDE_PLAYER_BUTTONS = new BooleanSetting("revanced_hide_player_buttons", FALSE, true);
@@ -471,6 +453,17 @@ public class Settings extends BaseSettings {
     private static final BooleanSetting DEPRECATED_RESTORE_OLD_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_restore_old_video_quality_menu", TRUE);
     private static final BooleanSetting DEPRECATED_AUTO_CAPTIONS = new BooleanSetting("revanced_auto_captions", FALSE);
 
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_SPONSOR_OPACITY = new FloatSetting("sb_sponsor_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_SELF_PROMO_OPACITY = new FloatSetting("sb_selfpromo_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_INTERACTION_OPACITY = new FloatSetting("sb_interaction_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_HIGHLIGHT_OPACITY = new FloatSetting("sb_highlight_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_HOOK_OPACITY = new FloatSetting("sb_hook_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_INTRO_OPACITY = new FloatSetting("sb_intro_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_OUTRO_OPACITY = new FloatSetting("sb_outro_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_PREVIEW_OPACITY = new FloatSetting("sb_preview_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_FILLER_OPACITY = new FloatSetting("sb_filler_opacity", 0.8f, false, false);
+    public static final FloatSetting DEPRECATED_SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY = new FloatSetting("sb_music_offtopic_opacity", 0.8f, false, false);
+
     static {
         // region Migration
 
@@ -535,6 +528,18 @@ public class Settings extends BaseSettings {
         Setting.migrateFromOldPreferences(revancedPrefs, RYD_ESTIMATED_LIKE, "ryd_estimated_like");
         Setting.migrateFromOldPreferences(revancedPrefs, RYD_TOAST_ON_CONNECTION_ERROR, "ryd_toast_on_connection_error");
 
+        // Migrate old saved data. Must be done here before the settings can be used by any other code.
+        applyOldSbOpacityToColor(SB_CATEGORY_SPONSOR_COLOR, DEPRECATED_SB_CATEGORY_SPONSOR_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_SELF_PROMO_COLOR, DEPRECATED_SB_CATEGORY_SELF_PROMO_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_INTERACTION_COLOR, DEPRECATED_SB_CATEGORY_INTERACTION_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_HIGHLIGHT_COLOR, DEPRECATED_SB_CATEGORY_HIGHLIGHT_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_HOOK_COLOR, DEPRECATED_SB_CATEGORY_HOOK_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_INTRO_COLOR, DEPRECATED_SB_CATEGORY_INTRO_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_OUTRO_COLOR, DEPRECATED_SB_CATEGORY_OUTRO_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_PREVIEW_COLOR, DEPRECATED_SB_CATEGORY_PREVIEW_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_FILLER_COLOR, DEPRECATED_SB_CATEGORY_FILLER_OPACITY);
+        applyOldSbOpacityToColor(SB_CATEGORY_MUSIC_OFFTOPIC_COLOR, DEPRECATED_SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY);
+
         // endregion
 
         // region SB import/export callbacks
@@ -543,4 +548,13 @@ public class Settings extends BaseSettings {
 
         // endregion
     }
+
+    private static void applyOldSbOpacityToColor(StringSetting colorSetting, FloatSetting opacitySetting) {
+        String colorString = colorSetting.get();
+        if (colorString.length() >= 8) {
+            return; // Color is already #ARGB
+        }
+
+        colorSetting.save(SponsorBlockSettings.migrateOldColorString(colorString, opacitySetting.get()));
+    }
 }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java
similarity index 66%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java
index 5c4d3ca77..6801cc8a4 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java
@@ -2,26 +2,23 @@ package app.revanced.extension.youtube.settings;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceFragment;
 import android.view.View;
 import android.widget.Toolbar;
 
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseActivityHook;
-import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.youtube.patches.VersionCheckPatch;
 import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
-import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
+import app.revanced.extension.youtube.settings.preference.YouTubePreferenceFragment;
+import app.revanced.extension.youtube.settings.search.YouTubeSearchViewController;
 
 /**
- * Hooks LicenseActivity to inject a custom ReVancedPreferenceFragment with a toolbar and search functionality.
+ * Hooks LicenseActivity to inject a custom {@link YouTubePreferenceFragment} with a toolbar and search functionality.
  */
 @SuppressWarnings("deprecation")
-public class LicenseActivityHook extends BaseActivityHook {
+public class YouTubeActivityHook extends BaseActivityHook {
 
     private static int currentThemeValueOrdinal = -1; // Must initially be a non-valid enum ordinal value.
 
@@ -29,16 +26,14 @@ public class LicenseActivityHook extends BaseActivityHook {
      * Controller for managing search view components in the toolbar.
      */
     @SuppressLint("StaticFieldLeak")
-    public static SearchViewController searchViewController;
+    public static YouTubeSearchViewController searchViewController;
 
     /**
-     * Injection point
-     * <p>
-     * Creates an instance of LicenseActivityHook for use in static initialization.
+     * Injection point.
      */
     @SuppressWarnings("unused")
-    public static LicenseActivityHook createInstance() {
-        return new LicenseActivityHook();
+    public static void initialize(Activity parentActivity) {
+        BaseActivityHook.initialize(new YouTubeActivityHook(), parentActivity);
     }
 
     /**
@@ -49,7 +44,7 @@ public class LicenseActivityHook extends BaseActivityHook {
         final var theme = Utils.isDarkModeEnabled()
                 ? "Theme.YouTube.Settings.Dark"
                 : "Theme.YouTube.Settings";
-        activity.setTheme(Utils.getResourceIdentifier(theme, "style"));
+        activity.setTheme(Utils.getResourceIdentifierOrThrow(theme, "style"));
     }
 
     /**
@@ -57,7 +52,7 @@ public class LicenseActivityHook extends BaseActivityHook {
      */
     @Override
     protected int getContentViewResourceId() {
-        return Utils.getResourceIdentifier("revanced_settings_with_toolbar", "layout");
+        return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
     }
 
     /**
@@ -76,7 +71,7 @@ public class LicenseActivityHook extends BaseActivityHook {
      */
     @Override
     protected Drawable getNavigationIcon() {
-        return ReVancedPreferenceFragment.getBackButtonDrawable();
+        return YouTubePreferenceFragment.getBackButtonDrawable();
     }
 
     /**
@@ -88,7 +83,7 @@ public class LicenseActivityHook extends BaseActivityHook {
     }
 
     /**
-     * Adds search view components to the toolbar for ReVancedPreferenceFragment.
+     * Adds search view components to the toolbar for {@link YouTubePreferenceFragment}.
      *
      * @param activity The activity hosting the toolbar.
      * @param toolbar  The configured toolbar.
@@ -96,32 +91,18 @@ public class LicenseActivityHook extends BaseActivityHook {
      */
     @Override
     protected void onPostToolbarSetup(Activity activity, Toolbar toolbar, PreferenceFragment fragment) {
-        if (fragment instanceof ReVancedPreferenceFragment) {
-            searchViewController = SearchViewController.addSearchViewComponents(
-                    activity, toolbar, (ReVancedPreferenceFragment) fragment);
+        if (fragment instanceof YouTubePreferenceFragment) {
+            searchViewController = YouTubeSearchViewController.addSearchViewComponents(
+                    activity, toolbar, (YouTubePreferenceFragment) fragment);
         }
     }
 
     /**
-     * Creates a new ReVancedPreferenceFragment for the activity.
+     * Creates a new {@link YouTubePreferenceFragment} for the activity.
      */
     @Override
     protected PreferenceFragment createPreferenceFragment() {
-        return new ReVancedPreferenceFragment();
-    }
-
-    /**
-     * Injection point.
-     * Overrides the ReVanced settings language.
-     */
-    @SuppressWarnings("unused")
-    public static Context getAttachBaseContext(Context original) {
-        AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
-        if (language == AppLanguage.DEFAULT) {
-            return original;
-        }
-
-        return Utils.getContext();
+        return new YouTubePreferenceFragment();
     }
 
     /**
@@ -164,12 +145,14 @@ public class LicenseActivityHook extends BaseActivityHook {
     }
 
     /**
-     * Handles configuration changes, such as orientation, to update the search view.
+     * Injection point.
+     * <p>
+     * Overrides {@link Activity#finish()} of the injection Activity.
+     *
+     * @return if the original activity finish method should be allowed to run.
      */
     @SuppressWarnings("unused")
-    public static void handleConfigurationChanged(Activity activity, Configuration newConfig) {
-        if (searchViewController != null) {
-            searchViewController.handleOrientationChange(newConfig.orientation);
-        }
+    public static boolean handleFinish() {
+        return YouTubeSearchViewController.handleFinish(searchViewController);
     }
 }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java
index e5a16947f..fd213ca0e 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/AlternativeThumbnailsAboutDeArrowPreference.java
@@ -2,6 +2,7 @@ package app.revanced.extension.youtube.settings.preference;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
 
 /**
  * Allows tapping the DeArrow about preference to open the DeArrow website.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExternalDownloaderPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExternalDownloaderPreference.java
index 0165e1376..4ed2198ee 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExternalDownloaderPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExternalDownloaderPreference.java
@@ -36,6 +36,7 @@ import java.util.function.Function;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.ui.CustomDialog;
 import app.revanced.extension.youtube.settings.Settings;
 
 /**
@@ -210,7 +211,7 @@ public class ExternalDownloaderPreference extends CustomDialogListPreference {
         final boolean usingCustomDownloader = Downloader.findByPackageName(packageName) == null;
         adapter = new CustomDialogListPreference.ListPreferenceArrayAdapter(
                 context,
-                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
+                LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED,
                 getEntries(),
                 getEntryValues(),
                 usingCustomDownloader
@@ -302,7 +303,7 @@ public class ExternalDownloaderPreference extends CustomDialogListPreference {
         contentLayout.addView(editText);
 
         // Create the custom dialog.
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 getTitle() != null ? getTitle().toString() : "",
                 null,
@@ -312,7 +313,7 @@ public class ExternalDownloaderPreference extends CustomDialogListPreference {
                     String newValue = editText.getText().toString().trim();
                     if (newValue.isEmpty()) {
                         // Show dialog if EditText is empty.
-                        Utils.createCustomDialog(
+                        CustomDialog.create(
                                 context,
                                 str("revanced_external_downloader_name_title"),
                                 str("revanced_external_downloader_empty_warning"),
@@ -415,7 +416,7 @@ public class ExternalDownloaderPreference extends CustomDialogListPreference {
                 ? str("revanced_external_downloader_not_installed_warning", downloader.name)
                 : str("revanced_external_downloader_package_not_found_warning", packageName);
 
-        Utils.createCustomDialog(
+        CustomDialog.create(
                 context,
                 str("revanced_external_downloader_not_found_title"),
                 message,
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
deleted file mode 100644
index c96ed26ed..000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
+++ /dev/null
@@ -1,483 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
-
-import android.app.Dialog;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.style.BackgroundColorSpan;
-import android.widget.Toolbar;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
-import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
-import app.revanced.extension.youtube.settings.LicenseActivityHook;
-import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
-
-/**
- * Preference fragment for ReVanced settings.
- */
-@SuppressWarnings({"deprecation", "NewApi"})
-public class ReVancedPreferenceFragment extends ToolbarPreferenceFragment {
-
-    /**
-     * The main PreferenceScreen used to display the current set of preferences.
-     * This screen is manipulated during initialization and filtering to show or hide preferences.
-     */
-    private PreferenceScreen preferenceScreen;
-
-    /**
-     * A copy of the original PreferenceScreen created during initialization.
-     * Used to restore the preference structure to its initial state after filtering or other modifications.
-     */
-    private PreferenceScreen originalPreferenceScreen;
-
-    /**
-     * Used for searching preferences. A Collection of all preferences including nested preferences.
-     * Root preferences are excluded (no need to search what's on the root screen),
-     * but their sub preferences are included.
-     */
-    private final List<AbstractPreferenceSearchData<?>> allPreferences = new ArrayList<>();
-
-    /**
-     * Initializes the preference fragment, copying the original screen to allow full restoration.
-     */
-    @Override
-    protected void initialize() {
-        super.initialize();
-
-        try {
-            preferenceScreen = getPreferenceScreen();
-            Utils.sortPreferenceGroups(preferenceScreen);
-
-            // Store the original structure for restoration after filtering.
-            originalPreferenceScreen = getPreferenceManager().createPreferenceScreen(getContext());
-            for (int i = 0, count = preferenceScreen.getPreferenceCount(); i < count; i++) {
-                originalPreferenceScreen.addPreference(preferenceScreen.getPreference(i));
-            }
-
-            setPreferenceScreenToolbar(preferenceScreen);
-        } catch (Exception ex) {
-            Logger.printException(() -> "initialize failure", ex);
-        }
-    }
-
-    /**
-     * Called when the fragment starts, ensuring all preferences are collected after initialization.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-        try {
-            if (allPreferences.isEmpty()) {
-                // Must collect preferences on start and not in initialize since
-                // legacy SB settings are not loaded yet.
-                Logger.printDebug(() -> "Collecting preferences to search");
-
-                // Do not show root menu preferences in search results.
-                // Instead search for everything that's not shown when search is not active.
-                collectPreferences(preferenceScreen, 1, 0);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "onStart failure", ex);
-        }
-    }
-
-    /**
-     * Sets toolbar for all nested preference screens.
-     */
-    @Override
-    protected void customizeToolbar(Toolbar toolbar) {
-        LicenseActivityHook.setToolbarLayoutParams(toolbar);
-    }
-
-    /**
-     * Perform actions after toolbar setup.
-     */
-    @Override
-    protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {
-        if (LicenseActivityHook.searchViewController != null
-                && LicenseActivityHook.searchViewController.isSearchActive()) {
-            toolbar.post(() -> LicenseActivityHook.searchViewController.closeSearch());
-        }
-    }
-
-    /**
-     * Recursively collects all preferences from the screen or group.
-     *
-     * @param includeDepth Menu depth to start including preferences.
-     *                     A value of 0 adds all preferences.
-     */
-    private void collectPreferences(PreferenceGroup group, int includeDepth, int currentDepth) {
-        for (int i = 0, count = group.getPreferenceCount(); i < count; i++) {
-            Preference preference = group.getPreference(i);
-            if (includeDepth <= currentDepth && !(preference instanceof PreferenceCategory)
-                    && !(preference instanceof SponsorBlockPreferenceGroup)) {
-
-                AbstractPreferenceSearchData<?> data;
-                if (preference instanceof SwitchPreference switchPref) {
-                    data = new SwitchPreferenceSearchData(switchPref);
-                } else if (preference instanceof ListPreference listPref) {
-                    data = new ListPreferenceSearchData(listPref);
-                } else {
-                    data = new PreferenceSearchData(preference);
-                }
-
-                allPreferences.add(data);
-            }
-
-            if (preference instanceof PreferenceGroup subGroup) {
-                collectPreferences(subGroup, includeDepth, currentDepth + 1);
-            }
-        }
-    }
-
-    /**
-     * Filters the preferences using the given query string and applies highlighting.
-     */
-    public void filterPreferences(String query) {
-        preferenceScreen.removeAll();
-
-        if (TextUtils.isEmpty(query)) {
-            // Restore original preferences and their titles/summaries/entries.
-            for (int i = 0, count = originalPreferenceScreen.getPreferenceCount(); i < count; i++) {
-                preferenceScreen.addPreference(originalPreferenceScreen.getPreference(i));
-            }
-
-            for (AbstractPreferenceSearchData<?> data : allPreferences) {
-                data.clearHighlighting();
-            }
-
-            return;
-        }
-
-        // Navigation path -> Category
-        Map<String, PreferenceCategory> categoryMap = new HashMap<>();
-        String queryLower = Utils.removePunctuationToLowercase(query);
-
-        Pattern queryPattern = Pattern.compile(Pattern.quote(Utils.removePunctuationToLowercase(query)),
-                Pattern.CASE_INSENSITIVE);
-
-        for (AbstractPreferenceSearchData<?> data : allPreferences) {
-            if (data.matchesSearchQuery(queryLower)) {
-                data.applyHighlighting(queryLower, queryPattern);
-
-                String navigationPath = data.navigationPath;
-                PreferenceCategory group = categoryMap.computeIfAbsent(navigationPath, key -> {
-                    PreferenceCategory newGroup = new PreferenceCategory(preferenceScreen.getContext());
-                    newGroup.setTitle(navigationPath);
-                    preferenceScreen.addPreference(newGroup);
-                    return newGroup;
-                });
-                group.addPreference(data.preference);
-            }
-        }
-
-        // Show 'No results found' if search results are empty.
-        if (categoryMap.isEmpty()) {
-            Preference noResultsPreference = new Preference(preferenceScreen.getContext());
-            noResultsPreference.setTitle(str("revanced_settings_search_no_results_title", query));
-            noResultsPreference.setSummary(str("revanced_settings_search_no_results_summary"));
-            noResultsPreference.setSelectable(false);
-            // Set icon for the placeholder preference.
-            noResultsPreference.setLayoutResource(getResourceIdentifier(
-                    "revanced_preference_with_icon_no_search_result", "layout"));
-            noResultsPreference.setIcon(getResourceIdentifier("revanced_settings_search_icon", "drawable"));
-            preferenceScreen.addPreference(noResultsPreference);
-        }
-    }
-}
-
-@SuppressWarnings("deprecation")
-class AbstractPreferenceSearchData<T extends Preference> {
-    /**
-     * @return The navigation path for the given preference, such as "Player > Action buttons".
-     */
-    private static String getPreferenceNavigationString(Preference preference) {
-        Deque<CharSequence> pathElements = new ArrayDeque<>();
-
-        while (true) {
-            preference = preference.getParent();
-
-            if (preference == null) {
-                if (pathElements.isEmpty()) {
-                    return "";
-                }
-                Locale locale = BaseSettings.REVANCED_LANGUAGE.get().getLocale();
-                return Utils.getTextDirectionString(locale) + String.join(" > ", pathElements);
-            }
-
-            if (!(preference instanceof NoTitlePreferenceCategory)
-                    && !(preference instanceof SponsorBlockPreferenceGroup)) {
-                CharSequence title = preference.getTitle();
-                if (title != null && title.length() > 0) {
-                    pathElements.addFirst(title);
-                }
-            }
-        }
-    }
-
-    /**
-     * Highlights the search query in the given text by applying color span.
-     * @param text The original text to process.
-     * @param queryPattern The search query to highlight.
-     * @return The text with highlighted query matches as a SpannableStringBuilder.
-     */
-    static CharSequence highlightSearchQuery(CharSequence text, Pattern queryPattern) {
-        if (TextUtils.isEmpty(text)) {
-            return text;
-        }
-
-        final int adjustedColor = Utils.adjustColorBrightness(Utils.getAppBackgroundColor(),
-                0.95f, 1.20f);
-        BackgroundColorSpan highlightSpan = new BackgroundColorSpan(adjustedColor);
-
-        SpannableStringBuilder spannable = new SpannableStringBuilder(text);
-        Matcher matcher = queryPattern.matcher(text);
-
-        while (matcher.find()) {
-            spannable.setSpan(
-                    highlightSpan,
-                    matcher.start(),
-                    matcher.end(),
-                    SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE
-            );
-        }
-
-        return spannable;
-    }
-
-    final T preference;
-    final String key;
-    final String navigationPath;
-    boolean highlightingApplied;
-
-    @Nullable
-    CharSequence originalTitle;
-    @Nullable
-    String searchTitle;
-
-    AbstractPreferenceSearchData(T pref) {
-        preference = pref;
-        key = Utils.removePunctuationToLowercase(pref.getKey());
-        navigationPath = getPreferenceNavigationString(pref);
-    }
-
-    @CallSuper
-    void updateSearchDataIfNeeded() {
-        if (highlightingApplied) {
-            // Must clear, otherwise old highlighting is still applied.
-            clearHighlighting();
-        }
-
-        CharSequence title = preference.getTitle();
-        if (originalTitle != title) { // Check using reference equality.
-            originalTitle = title;
-            searchTitle = Utils.removePunctuationToLowercase(title);
-        }
-    }
-
-    @CallSuper
-    boolean matchesSearchQuery(String query) {
-        updateSearchDataIfNeeded();
-
-        return key.contains(query)
-                || searchTitle != null && searchTitle.contains(query);
-    }
-
-    @CallSuper
-    void applyHighlighting(String query, Pattern queryPattern) {
-        preference.setTitle(highlightSearchQuery(originalTitle, queryPattern));
-        highlightingApplied = true;
-    }
-
-    @CallSuper
-    void clearHighlighting() {
-        if (highlightingApplied) {
-            preference.setTitle(originalTitle);
-            highlightingApplied = false;
-        }
-    }
-}
-
-/**
- * Regular preference type that only uses the base preference summary.
- * Should only be used if a more specific data class does not exist.
- */
-@SuppressWarnings("deprecation")
-class PreferenceSearchData extends AbstractPreferenceSearchData<Preference> {
-    @Nullable
-    CharSequence originalSummary;
-    @Nullable
-    String searchSummary;
-
-    PreferenceSearchData(Preference pref) {
-        super(pref);
-    }
-
-    void updateSearchDataIfNeeded() {
-        super.updateSearchDataIfNeeded();
-
-        CharSequence summary = preference.getSummary();
-        if (originalSummary != summary) {
-            originalSummary = summary;
-            searchSummary = Utils.removePunctuationToLowercase(summary);
-        }
-    }
-
-    boolean matchesSearchQuery(String query) {
-        return super.matchesSearchQuery(query)
-                || searchSummary != null && searchSummary.contains(query);
-    }
-
-    @Override
-    void applyHighlighting(String query, Pattern queryPattern) {
-        super.applyHighlighting(query, queryPattern);
-
-        preference.setSummary(highlightSearchQuery(originalSummary, queryPattern));
-    }
-
-    @CallSuper
-    void clearHighlighting() {
-        if (highlightingApplied) {
-            preference.setSummary(originalSummary);
-        }
-
-        super.clearHighlighting();
-    }
-}
-
-/**
- * Switch preference type that uses summaryOn and summaryOff.
- */
-@SuppressWarnings("deprecation")
-class SwitchPreferenceSearchData extends AbstractPreferenceSearchData<SwitchPreference> {
-    @Nullable
-    CharSequence originalSummaryOn, originalSummaryOff;
-    @Nullable
-    String searchSummaryOn, searchSummaryOff;
-
-    SwitchPreferenceSearchData(SwitchPreference pref) {
-        super(pref);
-    }
-
-    void updateSearchDataIfNeeded() {
-        super.updateSearchDataIfNeeded();
-
-        CharSequence summaryOn = preference.getSummaryOn();
-        if (originalSummaryOn != summaryOn) {
-            originalSummaryOn = summaryOn;
-            searchSummaryOn = Utils.removePunctuationToLowercase(summaryOn);
-        }
-
-        CharSequence summaryOff = preference.getSummaryOff();
-        if (originalSummaryOff != summaryOff) {
-            originalSummaryOff = summaryOff;
-            searchSummaryOff = Utils.removePunctuationToLowercase(summaryOff);
-        }
-    }
-
-    boolean matchesSearchQuery(String query) {
-        return super.matchesSearchQuery(query)
-                || searchSummaryOn != null && searchSummaryOn.contains(query)
-                || searchSummaryOff != null && searchSummaryOff.contains(query);
-    }
-
-    @Override
-    void applyHighlighting(String query, Pattern queryPattern) {
-        super.applyHighlighting(query, queryPattern);
-
-        preference.setSummaryOn(highlightSearchQuery(originalSummaryOn, queryPattern));
-        preference.setSummaryOff(highlightSearchQuery(originalSummaryOff, queryPattern));
-    }
-
-    @CallSuper
-    void clearHighlighting() {
-        if (highlightingApplied) {
-            preference.setSummaryOn(originalSummaryOn);
-            preference.setSummaryOff(originalSummaryOff);
-        }
-
-        super.clearHighlighting();
-    }
-}
-
-/**
- * List preference type that uses entries.
- */
-@SuppressWarnings("deprecation")
-class ListPreferenceSearchData extends AbstractPreferenceSearchData<ListPreference> {
-    @Nullable
-    CharSequence[] originalEntries;
-    @Nullable
-    String searchEntries;
-
-    ListPreferenceSearchData(ListPreference pref) {
-        super(pref);
-    }
-
-    void updateSearchDataIfNeeded() {
-        super.updateSearchDataIfNeeded();
-
-        CharSequence[] entries = preference.getEntries();
-        if (originalEntries != entries) {
-            originalEntries = entries;
-            searchEntries = Utils.removePunctuationToLowercase(String.join(" ", entries));
-        }
-    }
-
-    boolean matchesSearchQuery(String query) {
-        return super.matchesSearchQuery(query)
-                || searchEntries != null && searchEntries.contains(query);
-    }
-
-    @Override
-    void applyHighlighting(String query, Pattern queryPattern) {
-        super.applyHighlighting(query, queryPattern);
-
-        if (originalEntries != null) {
-            final int length = originalEntries.length;
-            CharSequence[] highlightedEntries = new CharSequence[length];
-
-            for (int i = 0; i < length; i++) {
-                highlightedEntries[i] = highlightSearchQuery(originalEntries[i], queryPattern);
-
-                // Cannot highlight the summary text, because ListPreference uses
-                // the toString() of the summary CharSequence which strips away all formatting.
-            }
-
-            preference.setEntries(highlightedEntries);
-        }
-    }
-
-    @CallSuper
-    void clearHighlighting() {
-        if (highlightingApplied) {
-            preference.setEntries(originalEntries);
-        }
-
-        super.clearHighlighting();
-    }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
index ddc4d23da..b1e5471cf 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
@@ -14,6 +14,7 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.preference.BulletPointPreference;
 import app.revanced.extension.shared.spoof.ClientType;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -99,6 +100,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
                     + '\n' + str("revanced_spoof_video_streams_about_kids_videos");
         }
 
-        setSummary(summary);
+        // Use better formatting for bullet points.
+        setSummary(BulletPointPreference.formatIntoBulletPoints(summary));
     }
 }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/YouTubePreferenceFragment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/YouTubePreferenceFragment.java
new file mode 100644
index 000000000..1cd1c80c4
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/YouTubePreferenceFragment.java
@@ -0,0 +1,80 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import android.app.Dialog;
+import android.preference.PreferenceScreen;
+import android.widget.Toolbar;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+import app.revanced.extension.youtube.settings.YouTubeActivityHook;
+
+/**
+ * Preference fragment for ReVanced settings.
+ */
+@SuppressWarnings("deprecation")
+public class YouTubePreferenceFragment extends ToolbarPreferenceFragment {
+    /**
+     * The main PreferenceScreen used to display the current set of preferences.
+     */
+    private PreferenceScreen preferenceScreen;
+
+    /**
+     * Initializes the preference fragment.
+     */
+    @Override
+    protected void initialize() {
+        super.initialize();
+
+        try {
+            preferenceScreen = getPreferenceScreen();
+            Utils.sortPreferenceGroups(preferenceScreen);
+            setPreferenceScreenToolbar(preferenceScreen);
+        } catch (Exception ex) {
+            Logger.printException(() -> "initialize failure", ex);
+        }
+    }
+
+    /**
+     * Called when the fragment starts.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+        try {
+            // Initialize search controller if needed.
+            if (YouTubeActivityHook.searchViewController != null) {
+                // Trigger search data collection after fragment is ready.
+                YouTubeActivityHook.searchViewController.initializeSearchData();
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onStart failure", ex);
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
+    @Override
+    protected void customizeToolbar(Toolbar toolbar) {
+        YouTubeActivityHook.setToolbarLayoutParams(toolbar);
+    }
+
+    /**
+     * Perform actions after toolbar setup.
+     */
+    @Override
+    protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {
+        if (YouTubeActivityHook.searchViewController != null
+                && YouTubeActivityHook.searchViewController.isSearchActive()) {
+            toolbar.post(() -> YouTubeActivityHook.searchViewController.closeSearch());
+        }
+    }
+
+    /**
+     * Returns the preference screen for external access by SearchViewController.
+     */
+    public PreferenceScreen getPreferenceScreenForSearch() {
+        return preferenceScreen;
+    }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchResultsAdapter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchResultsAdapter.java
new file mode 100644
index 000000000..e5497c60a
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchResultsAdapter.java
@@ -0,0 +1,28 @@
+package app.revanced.extension.youtube.settings.search;
+
+import android.content.Context;
+import android.preference.PreferenceScreen;
+
+import app.revanced.extension.shared.settings.search.BaseSearchResultsAdapter;
+import app.revanced.extension.shared.settings.search.BaseSearchViewController;
+import app.revanced.extension.shared.settings.search.BaseSearchResultItem;
+
+import java.util.List;
+
+/**
+ * YouTube-specific search results adapter.
+ */
+@SuppressWarnings("deprecation")
+public class YouTubeSearchResultsAdapter extends BaseSearchResultsAdapter {
+
+    public YouTubeSearchResultsAdapter(Context context, List<BaseSearchResultItem> items,
+                                       BaseSearchViewController.BasePreferenceFragment fragment,
+                                       BaseSearchViewController searchViewController) {
+        super(context, items, fragment, searchViewController);
+    }
+
+    @Override
+    protected PreferenceScreen getMainPreferenceScreen() {
+        return fragment.getPreferenceScreenForSearch();
+    }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchViewController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchViewController.java
new file mode 100644
index 000000000..b979994ea
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/search/YouTubeSearchViewController.java
@@ -0,0 +1,70 @@
+package app.revanced.extension.youtube.settings.search;
+
+import android.app.Activity;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.shared.settings.search.BaseSearchResultItem;
+import app.revanced.extension.shared.settings.search.BaseSearchResultsAdapter;
+import app.revanced.extension.shared.settings.search.BaseSearchViewController;
+import app.revanced.extension.youtube.settings.preference.YouTubePreferenceFragment;
+import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
+
+/**
+ * YouTube-specific search view controller implementation.
+ */
+@SuppressWarnings("deprecation")
+public class YouTubeSearchViewController extends BaseSearchViewController {
+
+    public static YouTubeSearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar,
+                                                                      YouTubePreferenceFragment fragment) {
+        return new YouTubeSearchViewController(activity, toolbar, fragment);
+    }
+
+    private YouTubeSearchViewController(Activity activity, Toolbar toolbar, YouTubePreferenceFragment fragment) {
+        super(activity, toolbar, new PreferenceFragmentAdapter(fragment));
+    }
+
+    @Override
+    protected BaseSearchResultsAdapter createSearchResultsAdapter() {
+        return new YouTubeSearchResultsAdapter(activity, filteredSearchItems, fragment, this);
+    }
+
+    @Override
+    protected boolean isSpecialPreferenceGroup(Preference preference) {
+        return preference instanceof SponsorBlockPreferenceGroup;
+    }
+
+    @Override
+    protected void setupSpecialPreferenceListeners(BaseSearchResultItem item) {
+    }
+
+    // Static method for Activity finish.
+    public static boolean handleFinish(YouTubeSearchViewController searchViewController) {
+        if (searchViewController != null && searchViewController.isSearchActive()) {
+            searchViewController.closeSearch();
+            return true;
+        }
+        return false;
+    }
+
+    // Adapter to wrap YouTubePreferenceFragment to BasePreferenceFragment interface.
+    private record PreferenceFragmentAdapter(YouTubePreferenceFragment fragment) implements BasePreferenceFragment {
+        @Override
+        public PreferenceScreen getPreferenceScreenForSearch() {
+            return fragment.getPreferenceScreenForSearch();
+        }
+
+        @Override
+        public View getView() {
+            return fragment.getView();
+        }
+
+        @Override
+        public Activity getActivity() {
+            return fragment.getActivity();
+        }
+    }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java
index 570496a07..1ca2fe09e 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java
@@ -4,10 +4,9 @@ import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY;
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.ShapeDrawable;
@@ -48,9 +47,10 @@ import kotlin.Unit;
 
 /**
  * Handles showing, scheduling, and skipping of all {@link SponsorSegment} for the current video.
- *
+ * <p>
  * Class is not thread safe. All methods must be called on the main thread unless otherwise specified.
  */
+@SuppressLint("NewApi")
 public class SegmentPlaybackController {
 
     /**
@@ -122,7 +122,6 @@ public class SegmentPlaybackController {
     /**
      * Used to prevent re-showing a previously hidden skip button when exiting an embedded segment.
      * Only used when {@link Settings#SB_AUTO_HIDE_SKIP_BUTTON} is enabled.
-     *
      * A collection of segments that have automatically hidden the skip button for, and all segments in this list
      * contain the current video time.  Segment are removed when playback exits the segment.
      */
@@ -867,23 +866,11 @@ public class SegmentPlaybackController {
 
         Window window = dialog.getWindow();
         if (window != null) {
-            // Remove window animations and use custom fade animation.
-            window.setWindowAnimations(0);
-
-            WindowManager.LayoutParams params = window.getAttributes();
-            params.gravity = Gravity.BOTTOM;
-            params.y = dipToPixels(72);
-            int portraitWidth = Utils.percentageWidthToPixels(60); // 60% of the screen width.
-
-            if (Resources.getSystem().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                portraitWidth = Math.min(portraitWidth, Utils.percentageHeightToPixels(60)); // 60% of the screen height.
-            }
-            params.width = portraitWidth;
-            params.dimAmount = 0.0f;
-            window.setAttributes(params);
-            window.setBackgroundDrawable(null);
+            window.setWindowAnimations(0); // Remove window animations and use custom fade animation.
             window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
             window.addFlags(WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);
+
+            Utils.setDialogWindowParameters(window, Gravity.BOTTOM, 72, 60, true);
         }
 
         if (dismissUndoToast()) {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java
index 20a5f3af5..a8c76628c 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java
@@ -14,16 +14,19 @@ import androidx.annotation.Nullable;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.Locale;
 import java.util.UUID;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
 import app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour;
 import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory;
+import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
 
+@SuppressWarnings("NewApi")
 public class SponsorBlockSettings {
     /**
      * Minimum length a SB user id must be, as set by SB API.
@@ -50,11 +53,15 @@ public class SponsorBlockSettings {
             JSONArray categorySelectionsArray = settingsJson.getJSONArray("categorySelections");
 
             for (SegmentCategory category : SegmentCategory.categoriesWithoutUnsubmitted()) {
-                // clear existing behavior, as browser plugin exports no behavior for ignored categories
+                // Clear existing behavior, as browser plugin exports no behavior for ignored categories.
                 category.setBehaviour(CategoryBehaviour.IGNORE);
                 if (barTypesObject.has(category.keyValue)) {
                     JSONObject categoryObject = barTypesObject.getJSONObject(category.keyValue);
-                    category.setColor(categoryObject.getString("color"));
+                    // Older ReVanced SB exports lack an opacity value.
+                    if (categoryObject.has("color") && categoryObject.has("opacity")) {
+                        category.setColorWithOpacity(categoryObject.getString("color"));
+                        category.setOpacity((float) categoryObject.getDouble("opacity"));
+                    }
                 }
             }
 
@@ -64,7 +71,7 @@ public class SponsorBlockSettings {
                 String categoryKey = categorySelectionObject.getString("name");
                 SegmentCategory category = SegmentCategory.byCategoryKey(categoryKey);
                 if (category == null) {
-                    continue; // unsupported category, ignore
+                    continue; // Unsupported category, ignore.
                 }
 
                 final int desktopValue = categorySelectionObject.getInt("option");
@@ -73,7 +80,7 @@ public class SponsorBlockSettings {
                     Utils.showToastLong(categoryKey + " unknown behavior key: " + categoryKey);
                 } else if (category == SegmentCategory.HIGHLIGHT && behaviour == CategoryBehaviour.SKIP_AUTOMATICALLY_ONCE) {
                     Utils.showToastLong("Skip-once behavior not allowed for " + category.keyValue);
-                    category.setBehaviour(CategoryBehaviour.SKIP_AUTOMATICALLY); // use closest match
+                    category.setBehaviour(CategoryBehaviour.SKIP_AUTOMATICALLY); // Use closest match.
                 } else {
                     category.setBehaviour(behaviour);
                 }
@@ -93,7 +100,7 @@ public class SponsorBlockSettings {
             Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.save(settingsJson.getBoolean("showTimeWithSkips"));
 
             String serverAddress = settingsJson.getString("serverAddress");
-            if (isValidSBServerAddress(serverAddress)) { // Old versions of ReVanced exported wrong url format
+            if (isValidSBServerAddress(serverAddress)) { // Old versions of ReVanced exported wrong url format.
                 Settings.SB_API_URL.save(serverAddress);
             }
 
@@ -103,7 +110,7 @@ public class SponsorBlockSettings {
             }
             Settings.SB_SEGMENT_MIN_DURATION.save(minDuration);
 
-            if (settingsJson.has("skipCount")) { // Value not exported in old versions of ReVanced
+            if (settingsJson.has("skipCount")) { // Value not exported in old versions of ReVanced.
                 int skipCount = settingsJson.getInt("skipCount");
                 if (skipCount < 0) {
                     throw new IllegalArgumentException("invalid skipCount: " + skipCount);
@@ -121,7 +128,7 @@ public class SponsorBlockSettings {
 
             Utils.showToastLong(str("revanced_sb_settings_import_successful"));
         } catch (Exception ex) {
-            Logger.printInfo(() -> "failed to import settings", ex); // use info level, as we are showing our own toast
+            Logger.printInfo(() -> "failed to import settings", ex); // Use info level, as we are showing our own toast.
             Utils.showToastLong(str("revanced_sb_settings_import_failed", ex.getMessage()));
         }
     }
@@ -133,14 +140,16 @@ public class SponsorBlockSettings {
             Logger.printDebug(() -> "Creating SponsorBlock export settings string");
             JSONObject json = new JSONObject();
 
-            JSONObject barTypesObject = new JSONObject(); // categories' colors
-            JSONArray categorySelectionsArray = new JSONArray(); // categories' behavior
+            JSONObject barTypesObject = new JSONObject(); // Categories' colors.
+            JSONArray categorySelectionsArray = new JSONArray(); // Categories' behavior.
 
             SegmentCategory[] categories = SegmentCategory.categoriesWithoutUnsubmitted();
             for (SegmentCategory category : categories) {
                 JSONObject categoryObject = new JSONObject();
                 String categoryKey = category.keyValue;
-                categoryObject.put("color", category.getColorString());
+                // SB settings use separate color and opacity.
+                categoryObject.put("color", category.getColorStringWithoutOpacity());
+                categoryObject.put("opacity", category.getOpacity());
                 barTypesObject.put(categoryKey, categoryObject);
 
                 if (category.behaviour != CategoryBehaviour.IGNORE) {
@@ -167,7 +176,7 @@ public class SponsorBlockSettings {
 
             return json.toString(2);
         } catch (Exception ex) {
-            Logger.printInfo(() -> "failed to export settings", ex); // use info level, as we are showing our own toast
+            Logger.printInfo(() -> "failed to export settings", ex); // Use info level, as we are showing our own toast.
             Utils.showToastLong(str("revanced_sb_settings_export_failed", ex));
             return "";
         }
@@ -184,7 +193,7 @@ public class SponsorBlockSettings {
         if (dialogContext != null && SponsorBlockSettings.userHasSBPrivateId()
                 && !Settings.SB_HIDE_EXPORT_WARNING.get()) {
             // Create the custom dialog.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     dialogContext,
                     null, // No title.
                     str("revanced_sb_settings_revanced_export_user_id_warning"), // Message.
@@ -217,15 +226,12 @@ public class SponsorBlockSettings {
             return false;
         }
         // Verify url is only the server address and does not contain a path such as: "https://sponsor.ajay.app/api/"
-        // Could use Patterns.compile, but this is simpler
+        // Could use Patterns.compile, but this is simpler.
         final int lastDotIndex = serverAddress.lastIndexOf('.');
-        if (lastDotIndex != -1 && serverAddress.substring(lastDotIndex).contains("/")) {
-            return false;
-        }
+        return lastDotIndex > 0 && !serverAddress.substring(lastDotIndex).contains("/");
         // Optionally, could also verify the domain exists using "InetAddress.getByName(serverAddress)"
         // but that should not be done on the main thread.
         // Instead, assume the domain exists and the user knows what they're doing.
-        return true;
     }
 
     /**
@@ -251,6 +257,22 @@ public class SponsorBlockSettings {
         return uuid;
     }
 
+    public static String migrateOldColorString(String colorString, float opacity) {
+        if (colorString.length() >= 8) {
+            return colorString;
+        }
+
+        // Change color string from #RGB to #ARGB using default alpha.
+        if (colorString.startsWith("#")) {
+            colorString = colorString.substring(1);
+        }
+
+        String alphaHex = String.format(Locale.US, "%02X", (int)(opacity * 255));
+        String argbColorString = '#' + alphaHex + colorString.substring(0, 6);
+        Logger.printDebug(() -> "Migrating old color string with default opacity: " + argbColorString);
+        return argbColorString;
+    }
+
     private static boolean initialized;
 
     public static void initialize() {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java
index 59ee84544..cf74549e4 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java
@@ -13,8 +13,6 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.widget.EditText;
 
-import androidx.annotation.NonNull;
-
 import java.lang.ref.WeakReference;
 import java.text.NumberFormat;
 import java.time.Duration;
@@ -53,11 +51,11 @@ public class SponsorBlockUtils {
         public void onClick(DialogInterface dialog, int which) {
             switch (which) {
                 case DialogInterface.BUTTON_NEGATIVE:
-                    // start
+                    // Start.
                     newSponsorSegmentStartMillis = newSponsorSegmentDialogShownMillis;
                     break;
                 case DialogInterface.BUTTON_POSITIVE:
-                    // end
+                    // End.
                     newSponsorSegmentEndMillis = newSponsorSegmentDialogShownMillis;
                     break;
             }
@@ -98,7 +96,7 @@ public class SponsorBlockUtils {
                 SegmentCategory[] categories = SegmentCategory.categoriesWithoutHighlights();
                 CharSequence[] titles = new CharSequence[categories.length];
                 for (int i = 0, length = categories.length; i < length; i++) {
-                    titles[i] = categories[i].getTitleWithColorDot();
+                    titles[i] = categories[i].getTitle().toString();
                 }
 
                 newUserCreatedSegmentCategory = null;
@@ -163,7 +161,7 @@ public class SponsorBlockUtils {
             SponsorSegment segment = segments[which];
 
             SegmentVote[] voteOptions = (segment.category == SegmentCategory.HIGHLIGHT)
-                    ? SegmentVote.voteTypesWithoutCategoryChange // highlight segments cannot change category
+                    ? SegmentVote.voteTypesWithoutCategoryChange // Highlight segments cannot change category.
                     : SegmentVote.values();
             final int voteOptionsLength = voteOptions.length;
             final boolean userIsVip = Settings.SB_USER_IS_VIP.get();
@@ -282,7 +280,7 @@ public class SponsorBlockUtils {
         }
     }
 
-    public static void onVotingClicked(@NonNull Context context) {
+    public static void onVotingClicked(Context context) {
         try {
             Utils.verifyOnMainThread();
             SponsorSegment[] segments = SegmentPlaybackController.getSegments();
@@ -304,7 +302,7 @@ public class SponsorBlockUtils {
 
                 SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
 
-                spannableBuilder.append(segment.category.getTitleWithColorDot());
+                spannableBuilder.append(segment.category.getTitle().toString());
                 spannableBuilder.append('\n');
 
                 String startTime = formatSegmentTime(segment.start);
@@ -317,7 +315,7 @@ public class SponsorBlockUtils {
                 }
 
                 if (i + 1 != numberOfSegments) {
-                    // prevents trailing new line after last segment
+                    // Prevents trailing new line after last segment.
                     spannableBuilder.append('\n');
                 }
 
@@ -333,13 +331,13 @@ public class SponsorBlockUtils {
         }
     }
 
-    private static void onNewCategorySelect(@NonNull SponsorSegment segment, @NonNull Context context) {
+    private static void onNewCategorySelect(SponsorSegment segment, Context context) {
         try {
             Utils.verifyOnMainThread();
             final SegmentCategory[] values = SegmentCategory.categoriesWithoutHighlights();
             CharSequence[] titles = new CharSequence[values.length];
-            for (int i = 0; i < values.length; i++) {
-                titles[i] = values[i].getTitleWithColorDot();
+            for (int i = 0, length = values.length; i < length; i++) {
+                titles[i] = values[i].getTitle().toString();
             }
 
             new AlertDialog.Builder(context)
@@ -370,7 +368,6 @@ public class SponsorBlockUtils {
         }
     }
 
-
     static void sendViewRequestAsync(SponsorSegment segment) {
         if (segment.recordedAsSkipped || segment.category == SegmentCategory.UNSUBMITTED) {
             return;
@@ -424,7 +421,6 @@ public class SponsorBlockUtils {
         String secondsStr = matcher.group(4);
         String millisecondsStr = matcher.group(6); // Milliseconds is optional.
 
-
         try {
             final int hours = (hoursStr != null) ? Integer.parseInt(hoursStr) : 0;
             //noinspection ConstantConditions
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java
index fadc61d64..ce7ef84ed 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java
@@ -1,16 +1,11 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
 import static app.revanced.extension.shared.StringRef.sf;
-import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.COLOR_DOT_STRING;
 import static app.revanced.extension.youtube.settings.Settings.*;
 
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.RelativeSizeSpan;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -26,40 +21,39 @@ import java.util.Objects;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.FloatSetting;
 import app.revanced.extension.shared.settings.StringSetting;
 import app.revanced.extension.youtube.settings.Settings;
 
 public enum SegmentCategory {
     SPONSOR("sponsor", sf("revanced_sb_segments_sponsor"), sf("revanced_sb_segments_sponsor_sum"), sf("revanced_sb_skip_button_sponsor"), sf("revanced_sb_skipped_sponsor"),
-            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR, SB_CATEGORY_SPONSOR_OPACITY),
+            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR),
     SELF_PROMO("selfpromo", sf("revanced_sb_segments_selfpromo"), sf("revanced_sb_segments_selfpromo_sum"), sf("revanced_sb_skip_button_selfpromo"), sf("revanced_sb_skipped_selfpromo"),
-            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR, SB_CATEGORY_SELF_PROMO_OPACITY),
+            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR),
     INTERACTION("interaction", sf("revanced_sb_segments_interaction"), sf("revanced_sb_segments_interaction_sum"), sf("revanced_sb_skip_button_interaction"), sf("revanced_sb_skipped_interaction"),
-            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR, SB_CATEGORY_INTERACTION_OPACITY),
+            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR),
     /**
      * Unique category that is treated differently than the rest.
      */
     HIGHLIGHT("poi_highlight", sf("revanced_sb_segments_highlight"), sf("revanced_sb_segments_highlight_sum"), sf("revanced_sb_skip_button_highlight"), sf("revanced_sb_skipped_highlight"),
-            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR, SB_CATEGORY_HIGHLIGHT_OPACITY),
+            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR),
     INTRO("intro", sf("revanced_sb_segments_intro"), sf("revanced_sb_segments_intro_sum"),
             sf("revanced_sb_skip_button_intro_beginning"), sf("revanced_sb_skip_button_intro_middle"), sf("revanced_sb_skip_button_intro_end"),
             sf("revanced_sb_skipped_intro_beginning"), sf("revanced_sb_skipped_intro_middle"), sf("revanced_sb_skipped_intro_end"),
-            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR, SB_CATEGORY_INTRO_OPACITY),
+            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR),
     OUTRO("outro", sf("revanced_sb_segments_outro"), sf("revanced_sb_segments_outro_sum"), sf("revanced_sb_skip_button_outro"), sf("revanced_sb_skipped_outro"),
-            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR, SB_CATEGORY_OUTRO_OPACITY),
+            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR),
     PREVIEW("preview", sf("revanced_sb_segments_preview"), sf("revanced_sb_segments_preview_sum"),
             sf("revanced_sb_skip_button_preview_beginning"), sf("revanced_sb_skip_button_preview_middle"), sf("revanced_sb_skip_button_preview_end"),
             sf("revanced_sb_skipped_preview_beginning"), sf("revanced_sb_skipped_preview_middle"), sf("revanced_sb_skipped_preview_end"),
-            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR, SB_CATEGORY_PREVIEW_OPACITY),
+            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR),
     HOOK("hook", sf("revanced_sb_segments_hook"), sf("revanced_sb_segments_hook_sum"), sf("revanced_sb_skip_button_hook"), sf("revanced_sb_skipped_hook"),
-            SB_CATEGORY_HOOK, SB_CATEGORY_HOOK_COLOR, SB_CATEGORY_HOOK_OPACITY),
+            SB_CATEGORY_HOOK, SB_CATEGORY_HOOK_COLOR),
     FILLER("filler", sf("revanced_sb_segments_filler"), sf("revanced_sb_segments_filler_sum"), sf("revanced_sb_skip_button_filler"), sf("revanced_sb_skipped_filler"),
-            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR, SB_CATEGORY_FILLER_OPACITY),
+            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR),
     MUSIC_OFFTOPIC("music_offtopic", sf("revanced_sb_segments_nomusic"), sf("revanced_sb_segments_nomusic_sum"), sf("revanced_sb_skip_button_nomusic"), sf("revanced_sb_skipped_nomusic"),
-            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR, SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY),
+            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR),
     UNSUBMITTED("unsubmitted", StringRef.empty, StringRef.empty, sf("revanced_sb_skip_button_unsubmitted"), sf("revanced_sb_skipped_unsubmitted"),
-            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR, SB_CATEGORY_UNSUBMITTED_OPACITY);
+            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR);
 
     private static final StringRef skipSponsorTextCompact = sf("revanced_sb_skip_button_compact");
     private static final StringRef skipSponsorTextCompactHighlight = sf("revanced_sb_skip_button_compact_highlight");
@@ -88,10 +82,13 @@ public enum SegmentCategory {
             FILLER,
             MUSIC_OFFTOPIC,
     };
+
+    public static final float CATEGORY_DEFAULT_OPACITY = 0.7f;
+
     private static final Map<String, SegmentCategory> mValuesMap = new HashMap<>(2 * categoriesWithoutUnsubmitted.length);
 
     /**
-     * Categories currently enabled, formatted for an API call
+     * Categories currently enabled, formatted for an API call.
      */
     public static String sponsorBlockAPIFetchCategories = "[]";
 
@@ -100,21 +97,30 @@ public enum SegmentCategory {
             mValuesMap.put(value.keyValue, value);
     }
 
+    /**
+     * Returns an array of categories excluding the unsubmitted category.
+     */
     public static SegmentCategory[] categoriesWithoutUnsubmitted() {
         return categoriesWithoutUnsubmitted;
     }
 
+    /**
+     * Returns an array of categories excluding the highlight category.
+     */
     public static SegmentCategory[] categoriesWithoutHighlights() {
         return categoriesWithoutHighlights;
     }
 
+    /**
+     * Retrieves a category by its key.
+     */
     @Nullable
     public static SegmentCategory byCategoryKey(@NonNull String key) {
         return mValuesMap.get(key);
     }
 
     /**
-     * Must be called if behavior of any category is changed.
+     * Updates the list of enabled categories for API calls. Must be called when any category's behavior changes.
      */
     public static void updateEnabledCategories() {
         Utils.verifyOnMainThread();
@@ -134,6 +140,9 @@ public enum SegmentCategory {
             sponsorBlockAPIFetchCategories = "[%22" + TextUtils.join("%22,%22", enabledCategories) + "%22]";
     }
 
+    /**
+     * Loads all category settings from persistent storage.
+     */
     public static void loadAllCategoriesFromSettings() {
         for (SegmentCategory category : values()) {
             category.loadFromSettings();
@@ -141,45 +150,35 @@ public enum SegmentCategory {
         updateEnabledCategories();
     }
 
-    @ColorInt
-    public static int applyOpacityToColor(@ColorInt int color, float opacity) {
-        if (opacity < 0 || opacity > 1.0f) {
-            throw new IllegalArgumentException("Invalid opacity: " + opacity);
-        }
-        final int opacityInt = (int) (255 * opacity);
-        return (color & 0x00FFFFFF) | (opacityInt << 24);
-    }
-
     public final String keyValue;
-    public final StringSetting behaviorSetting; // TODO: Replace with EnumSetting.
-    private final StringSetting colorSetting;
-    private final FloatSetting opacitySetting;
+    public final StringSetting behaviorSetting;
+    public final StringSetting colorSetting;
 
     public final StringRef title;
     public final StringRef description;
 
     /**
-     * Skip button text, if the skip occurs in the first quarter of the video
+     * Skip button text, if the skip occurs in the first quarter of the video.
      */
     public final StringRef skipButtonTextBeginning;
     /**
-     * Skip button text, if the skip occurs in the middle half of the video
+     * Skip button text, if the skip occurs in the middle half of the video.
      */
     public final StringRef skipButtonTextMiddle;
     /**
-     * Skip button text, if the skip occurs in the last quarter of the video
+     * Skip button text, if the skip occurs in the last quarter of the video.
      */
     public final StringRef skipButtonTextEnd;
     /**
-     * Skipped segment toast, if the skip occurred in the first quarter of the video
+     * Skipped segment toast, if the skip occurred in the first quarter of the video.
      */
     public final StringRef skippedToastBeginning;
     /**
-     * Skipped segment toast, if the skip occurred in the middle half of the video
+     * Skipped segment toast, if the skip occurred in the middle half of the video.
      */
     public final StringRef skippedToastMiddle;
     /**
-     * Skipped segment toast, if the skip occurred in the last quarter of the video
+     * Skipped segment toast, if the skip occurred in the last quarter of the video.
      */
     public final StringRef skippedToastEnd;
 
@@ -193,7 +192,7 @@ public enum SegmentCategory {
 
     /**
      * Value must be changed using {@link #setBehaviour(CategoryBehaviour)}.
-     * Caller must also {@link #updateEnabledCategories()}.
+     * Caller must also call {@link #updateEnabledCategories()}.
      */
     public CategoryBehaviour behaviour = CategoryBehaviour.IGNORE;
 
@@ -201,19 +200,19 @@ public enum SegmentCategory {
                     StringRef skipButtonText,
                     StringRef skippedToastText,
                     StringSetting behavior,
-                    StringSetting color, FloatSetting opacity) {
+                    StringSetting color) {
         this(keyValue, title, description,
                 skipButtonText, skipButtonText, skipButtonText,
                 skippedToastText, skippedToastText, skippedToastText,
                 behavior,
-                color, opacity);
+                color);
     }
 
     SegmentCategory(String keyValue, StringRef title, StringRef description,
                     StringRef skipButtonTextBeginning, StringRef skipButtonTextMiddle, StringRef skipButtonTextEnd,
                     StringRef skippedToastBeginning, StringRef skippedToastMiddle, StringRef skippedToastEnd,
                     StringSetting behavior,
-                    StringSetting color, FloatSetting opacity) {
+                    StringSetting color) {
         this.keyValue = Objects.requireNonNull(keyValue);
         this.title = Objects.requireNonNull(title);
         this.description = Objects.requireNonNull(description);
@@ -225,11 +224,13 @@ public enum SegmentCategory {
         this.skippedToastEnd = Objects.requireNonNull(skippedToastEnd);
         this.behaviorSetting = Objects.requireNonNull(behavior);
         this.colorSetting = Objects.requireNonNull(color);
-        this.opacitySetting = Objects.requireNonNull(opacity);
         this.paint = new Paint();
         loadFromSettings();
     }
 
+    /**
+     * Loads the category's behavior and color from settings.
+     */
     private void loadFromSettings() {
         String behaviorString = behaviorSetting.get();
         CategoryBehaviour savedBehavior = CategoryBehaviour.byReVancedKeyValue(behaviorString);
@@ -242,118 +243,93 @@ public enum SegmentCategory {
         this.behaviour = savedBehavior;
 
         String colorString = colorSetting.get();
-        final float opacity = opacitySetting.get();
         try {
-            setColor(colorString);
-            setOpacity(opacity);
+            setColorWithOpacity(colorString);
         } catch (Exception ex) {
-            Logger.printException(() -> "Invalid color: " + colorString + " opacity: " + opacity, ex);
+            Logger.printException(() -> "Invalid color: " + colorString, ex);
             colorSetting.resetToDefault();
-            opacitySetting.resetToDefault();
             loadFromSettings();
         }
     }
 
+    /**
+     * Sets the behavior of the category and saves it to settings.
+     */
     public void setBehaviour(CategoryBehaviour behaviour) {
         this.behaviour = Objects.requireNonNull(behaviour);
         this.behaviorSetting.save(behaviour.reVancedKeyValue);
     }
 
-    private void updateColor() {
-        color = applyOpacityToColor(color, opacitySetting.get());
+    /**
+     * Sets the segment color with opacity from a color string in #AARRGGBB format.
+     */
+    public void setColorWithOpacity(String colorString) throws IllegalArgumentException {
+        int colorWithOpacity = Color.parseColor(colorString);
+        colorSetting.save(String.format(Locale.US, "#%08X", colorWithOpacity));
+        color = colorWithOpacity;
         paint.setColor(color);
     }
 
     /**
-     * @param opacity Segment color opacity between [0, 1].
+     * @param opacity [0, 1] opacity value.
      */
-    public void setOpacity(float opacity) throws IllegalArgumentException {
-        if (opacity < 0 || opacity > 1) {
-            throw new IllegalArgumentException("Invalid opacity: " + opacity);
-        }
-
-        opacitySetting.save(opacity);
-        updateColor();
-    }
-
-    public float getOpacity() {
-        return opacitySetting.get();
-    }
-
-    public float getOpacityDefault() {
-        return opacitySetting.defaultValue;
-    }
-
-    public void resetColorAndOpacity() {
-        setColor(colorSetting.defaultValue);
-        setOpacity(opacitySetting.defaultValue);
+    public void setOpacity(double opacity) {
+        color = Color.argb((int) (opacity * 255), Color.red(color), Color.green(color), Color.blue(color));
+        paint.setColor(color);
     }
 
     /**
-     * @param colorString Segment color with #RRGGBB format.
-     */
-    public void setColor(String colorString) throws IllegalArgumentException {
-        color = Color.parseColor(colorString);
-        colorSetting.save(colorString);
-
-        updateColor();
-    }
-
-    /**
-     * @return Integer color of #RRGGBB format.
+     * Gets the color with opacity applied (ARGB).
      */
     @ColorInt
-    public int getColorNoOpacity() {
-        return color & 0x00FFFFFF;
+    public int getColorWithOpacity() {
+        return color;
     }
 
     /**
-     * @return Integer color of #RRGGBB format.
+     * @return The default color with opacity applied.
      */
     @ColorInt
-    public int getColorNoOpacityDefault() {
-        return Color.parseColor(colorSetting.defaultValue) & 0x00FFFFFF;
+    public int getDefaultColorWithOpacity() {
+        return Color.parseColor(colorSetting.defaultValue);
     }
 
     /**
-     * @return Hex color string of #RRGGBB format with no opacity level.
+     * Gets the color as a hex string with opacity (#AARRGGBB).
      */
-    public String getColorString() {
-        return String.format(Locale.US, "#%06X", getColorNoOpacity());
-    }
-
-    private static SpannableString getCategoryColorDotSpan(String text, @ColorInt int color) {
-        SpannableString dotSpan = new SpannableString(COLOR_DOT_STRING + text);
-        dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        return dotSpan;
-    }
-
-    public static SpannableString getCategoryColorDot(@ColorInt int color) {
-        SpannableString dotSpan = new SpannableString(COLOR_DOT_STRING);
-        dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        dotSpan.setSpan(new RelativeSizeSpan(1.5f), 0, 1,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        return dotSpan;
-    }
-
-    public SpannableString getCategoryColorDot() {
-        return getCategoryColorDot(color);
-    }
-
-    public SpannableString getTitleWithColorDot(@ColorInt int categoryColor) {
-        return getCategoryColorDotSpan(" " + title, categoryColor);
-    }
-
-    public SpannableString getTitleWithColorDot() {
-        return getTitleWithColorDot(color);
+    public String getColorStringWithOpacity() {
+        return String.format(Locale.US, "#%08X", getColorWithOpacity());
     }
 
     /**
-     * @param segmentStartTime video time the segment category started
-     * @param videoLength      length of the video
-     * @return the skip button text
+     * @return The color as a hex string without opacity (#RRGGBB).
+     */
+    public String getColorStringWithoutOpacity() {
+        final int colorNoOpacity = getColorWithOpacity() & 0x00FFFFFF;
+        return String.format(Locale.US, "#%06X", colorNoOpacity);
+    }
+
+    /**
+     * @return [0, 1] opacity value.
+     */
+    public double getOpacity() {
+        double opacity = Color.alpha(color) / 255.0;
+        return Math.round(opacity * 100.0) / 100.0; // Round to 2 decimal digits.
+    }
+
+    /**
+     * Gets the title of the category.
+     */
+    public StringRef getTitle() {
+        return title;
+    }
+
+    /**
+     * Gets the skip button text based on segment position.
+     *
+     * @param segmentStartTime Video time the segment category started.
+     * @param videoLength      Length of the video.
+     * @return The skip button text.
      */
     StringRef getSkipButtonText(long segmentStartTime, long videoLength) {
         if (Settings.SB_COMPACT_SKIP_BUTTON.get()) {
@@ -375,9 +351,11 @@ public enum SegmentCategory {
     }
 
     /**
-     * @param segmentStartTime video time the segment category started
-     * @param videoLength      length of the video
-     * @return 'skipped segment' toast message
+     * Gets the skipped segment toast message based on segment position.
+     *
+     * @param segmentStartTime Video time the segment category started.
+     * @param videoLength      Length of the video.
+     * @return The skipped segment toast message.
      */
     StringRef getSkippedToastText(long segmentStartTime, long videoLength) {
         if (videoLength == 0) {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java
deleted file mode 100644
index ee3c1c138..000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package app.revanced.extension.youtube.sponsorblock.objects;
-
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
-import static app.revanced.extension.shared.Utils.dipToPixels;
-import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.getColorString;
-import static app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory.applyOpacityToColor;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.*;
-
-import androidx.annotation.ColorInt;
-
-import java.util.Locale;
-import java.util.Objects;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
-import app.revanced.extension.shared.settings.preference.ColorPickerView;
-
-@SuppressWarnings("deprecation")
-public class SegmentCategoryListPreference extends ListPreference {
-    private final SegmentCategory category;
-
-    /**
-     * RGB format (no alpha).
-     */
-    @ColorInt
-    private int categoryColor;
-    /**
-     * [0, 1]
-     */
-    private float categoryOpacity;
-    private int selectedDialogEntryIndex;
-
-    private TextView dialogColorDotView;
-    private EditText dialogColorEditText;
-    private EditText dialogOpacityEditText;
-    private ColorPickerView dialogColorPickerView;
-    private Dialog dialog;
-
-    public SegmentCategoryListPreference(Context context, SegmentCategory category) {
-        super(context);
-        this.category = Objects.requireNonNull(category);
-
-        // Edit: Using preferences to sync together multiple pieces
-        // of code is messy and should be rethought.
-        setKey(category.behaviorSetting.key);
-        setDefaultValue(category.behaviorSetting.defaultValue);
-
-        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
-        setEntries(isHighlightCategory
-                ? CategoryBehaviour.getBehaviorDescriptionsWithoutSkipOnce()
-                : CategoryBehaviour.getBehaviorDescriptions());
-        setEntryValues(isHighlightCategory
-                ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
-                : CategoryBehaviour.getBehaviorKeyValues());
-        super.setSummary(category.description.toString());
-
-        updateUI();
-    }
-
-    @Override
-    protected void showDialog(Bundle state) {
-        try {
-            Context context = getContext();
-            categoryColor = category.getColorNoOpacity();
-            categoryOpacity = category.getOpacity();
-            selectedDialogEntryIndex = findIndexOfValue(getValue());
-
-            // Create the main layout for the dialog content.
-            LinearLayout contentLayout = new LinearLayout(context);
-            contentLayout.setOrientation(LinearLayout.VERTICAL);
-
-            // Add behavior selection radio buttons.
-            RadioGroup radioGroup = new RadioGroup(context);
-            radioGroup.setOrientation(RadioGroup.VERTICAL);
-            CharSequence[] entries = getEntries();
-            for (int i = 0; i < entries.length; i++) {
-                RadioButton radioButton = new RadioButton(context);
-                radioButton.setText(entries[i]);
-                radioButton.setId(i);
-                radioButton.setChecked(i == selectedDialogEntryIndex);
-                radioGroup.addView(radioButton);
-            }
-            radioGroup.setOnCheckedChangeListener((group, checkedId) -> selectedDialogEntryIndex = checkedId);
-            radioGroup.setPadding(dipToPixels(10), 0, 0, 0);
-            contentLayout.addView(radioGroup);
-
-            // Inflate the color picker view.
-            View colorPickerContainer = LayoutInflater.from(context)
-                    .inflate(getResourceIdentifier("revanced_color_picker", "layout"), null);
-            dialogColorPickerView = colorPickerContainer.findViewById(
-                    getResourceIdentifier("revanced_color_picker_view", "id"));
-            dialogColorPickerView.setColor(categoryColor);
-            contentLayout.addView(colorPickerContainer);
-
-            // Grid layout for color and opacity inputs.
-            GridLayout gridLayout = new GridLayout(context);
-            gridLayout.setColumnCount(3);
-            gridLayout.setRowCount(2);
-            gridLayout.setPadding(dipToPixels(16), 0, 0, 0);
-
-            GridLayout.LayoutParams gridParams = new GridLayout.LayoutParams();
-            gridParams.rowSpec = GridLayout.spec(0); // First row.
-            gridParams.columnSpec = GridLayout.spec(0); // First column.
-            TextView colorTextLabel = new TextView(context);
-            colorTextLabel.setText(str("revanced_sb_color_dot_label"));
-            colorTextLabel.setLayoutParams(gridParams);
-            gridLayout.addView(colorTextLabel);
-
-            gridParams = new GridLayout.LayoutParams();
-            gridParams.rowSpec = GridLayout.spec(0); // First row.
-            gridParams.columnSpec = GridLayout.spec(1); // Second column.
-            gridParams.setMargins(0, 0, dipToPixels(10), 0);
-            dialogColorDotView = new TextView(context);
-            dialogColorDotView.setLayoutParams(gridParams);
-            gridLayout.addView(dialogColorDotView);
-            updateCategoryColorDot();
-
-            gridParams = new GridLayout.LayoutParams();
-            gridParams.rowSpec = GridLayout.spec(0); // First row.
-            gridParams.columnSpec = GridLayout.spec(2); // Third column.
-            dialogColorEditText = new EditText(context);
-            dialogColorEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
-                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-            dialogColorEditText.setAutofillHints((String) null);
-            dialogColorEditText.setTypeface(Typeface.MONOSPACE);
-            dialogColorEditText.setTextLocale(Locale.US);
-            dialogColorEditText.setText(getColorString(categoryColor));
-            dialogColorEditText.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable edit) {
-                    try {
-                        String colorString = edit.toString();
-                        String normalizedColorString = ColorPickerPreference.cleanupColorCodeString(colorString);
-
-                        if (!normalizedColorString.equals(colorString)) {
-                            edit.replace(0, colorString.length(), normalizedColorString);
-                            return;
-                        }
-
-                        if (normalizedColorString.length() != ColorPickerPreference.COLOR_STRING_LENGTH) {
-                            // User is still typing out the color.
-                            return;
-                        }
-
-                        // Remove the alpha channel.
-                        final int newColor = Color.parseColor(colorString) & 0x00FFFFFF;
-                        // Changing view color causes callback into this class.
-                        dialogColorPickerView.setColor(newColor);
-                    } catch (Exception ex) {
-                        // Should never be reached since input is validated before using.
-                        Logger.printException(() -> "colorEditText afterTextChanged failure", ex);
-                    }
-                }
-            });
-            gridLayout.addView(dialogColorEditText, gridParams);
-
-            gridParams = new GridLayout.LayoutParams();
-            gridParams.rowSpec = GridLayout.spec(1); // Second row.
-            gridParams.columnSpec = GridLayout.spec(0, 1); // First and second column.
-            TextView opacityLabel = new TextView(context);
-            opacityLabel.setText(str("revanced_sb_color_opacity_label"));
-            opacityLabel.setLayoutParams(gridParams);
-            gridLayout.addView(opacityLabel);
-
-            gridParams = new GridLayout.LayoutParams();
-            gridParams.rowSpec = GridLayout.spec(1); // Second row.
-            gridParams.columnSpec = GridLayout.spec(2); // Third column.
-            dialogOpacityEditText = new EditText(context);
-            dialogOpacityEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL
-                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-            dialogOpacityEditText.setAutofillHints((String) null);
-            dialogOpacityEditText.setTypeface(Typeface.MONOSPACE);
-            dialogOpacityEditText.setTextLocale(Locale.US);
-            dialogOpacityEditText.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable edit) {
-                    try {
-                        String editString = edit.toString();
-                        final int opacityStringLength = editString.length();
-
-                        final int maxOpacityStringLength = 4; // [0.00, 1.00]
-                        if (opacityStringLength > maxOpacityStringLength) {
-                            edit.delete(maxOpacityStringLength, opacityStringLength);
-                            return;
-                        }
-
-                        final float opacity = opacityStringLength == 0
-                                ? 0
-                                : Float.parseFloat(editString);
-                        if (opacity < 0) {
-                            categoryOpacity = 0;
-                            edit.replace(0, opacityStringLength, "0");
-                            return;
-                        } else if (opacity > 1.0f) {
-                            categoryOpacity = 1;
-                            edit.replace(0, opacityStringLength, "1.0");
-                            return;
-                        } else if (!editString.endsWith(".")) {
-                            // Ignore "0." and "1." until the user finishes entering a valid number.
-                            categoryOpacity = opacity;
-                        }
-
-                        updateCategoryColorDot();
-                    } catch (Exception ex) {
-                        // Should never happen.
-                        Logger.printException(() -> "opacityEditText afterTextChanged failure", ex);
-                    }
-                }
-            });
-            gridLayout.addView(dialogOpacityEditText, gridParams);
-            updateOpacityText();
-
-            contentLayout.addView(gridLayout);
-
-            // Create ScrollView to wrap the content layout.
-            ScrollView contentScrollView = new ScrollView(context);
-            contentScrollView.setVerticalScrollBarEnabled(false); // Disable vertical scrollbar.
-            contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER); // Disable overscroll effect.
-            LinearLayout.LayoutParams scrollViewParams = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    0,
-                    1.0f
-            );
-            contentScrollView.setLayoutParams(scrollViewParams);
-            contentScrollView.addView(contentLayout);
-
-            // Create the custom dialog.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
-                    context,
-                    category.title.toString(), // Title.
-                    null, // No message (replaced by contentLayout).
-                    null, // No EditText.
-                    null, // OK button text.
-                    () -> {
-                        // OK button action.
-                        if (selectedDialogEntryIndex >= 0 && getEntryValues() != null) {
-                            String value = getEntryValues()[selectedDialogEntryIndex].toString();
-                            if (callChangeListener(value)) {
-                                setValue(value);
-                                category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
-                                SegmentCategory.updateEnabledCategories();
-                            }
-
-                            try {
-                                category.setColor(dialogColorEditText.getText().toString());
-                                category.setOpacity(categoryOpacity);
-                            } catch (IllegalArgumentException ex) {
-                                Utils.showToastShort(str("revanced_settings_color_invalid"));
-                            }
-
-                            updateUI();
-                        }
-                    },
-                    () -> {}, // Cancel button action (dismiss only).
-                    str("revanced_settings_reset_color"), // Neutral button text.
-                    () -> {
-                        // Neutral button action (Reset).
-                        try {
-                            // Setting view color causes callback to update the UI.
-                            dialogColorPickerView.setColor(category.getColorNoOpacityDefault());
-
-                            categoryOpacity = category.getOpacityDefault();
-                            updateOpacityText();
-                        } catch (Exception ex) {
-                            Logger.printException(() -> "resetButton onClick failure", ex);
-                        }
-                    },
-                    false // Do not dismiss dialog on Neutral button click.
-            );
-
-            // Add the ScrollView to the dialog's main layout.
-            LinearLayout dialogMainLayout = dialogPair.second;
-            dialogMainLayout.addView(contentScrollView, dialogMainLayout.getChildCount() - 1);
-
-            // Set up color picker listener.
-            // Do last to prevent listener callbacks while setting up view.
-            dialogColorPickerView.setOnColorChangedListener(color -> {
-                if (categoryColor == color) {
-                    return;
-                }
-                categoryColor = color;
-                String hexColor = getColorString(color);
-                Logger.printDebug(() -> "onColorChanged: " + hexColor);
-
-                updateCategoryColorDot();
-                dialogColorEditText.setText(hexColor);
-                dialogColorEditText.setSelection(hexColor.length());
-            });
-
-            // Show the dialog.
-            dialog = dialogPair.first;
-            dialog.show();
-        } catch (Exception ex) {
-            Logger.printException(() -> "showDialog failure", ex);
-        }
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        // Nullify dialog references.
-        dialogColorDotView = null;
-        dialogColorEditText = null;
-        dialogOpacityEditText = null;
-        dialogColorPickerView = null;
-
-        if (dialog != null) {
-            dialog.dismiss();
-            dialog = null;
-        }
-    }
-
-    @ColorInt
-    private int applyOpacityToCategoryColor() {
-        return applyOpacityToColor(categoryColor, categoryOpacity);
-    }
-
-    public void updateUI() {
-        categoryColor = category.getColorNoOpacity();
-        categoryOpacity = category.getOpacity();
-
-        setTitle(category.getTitleWithColorDot(applyOpacityToCategoryColor()));
-    }
-
-    private void updateCategoryColorDot() {
-        dialogColorDotView.setText(SegmentCategory.getCategoryColorDot(applyOpacityToCategoryColor()));
-    }
-
-    private void updateOpacityText() {
-        dialogOpacityEditText.setText(String.format(Locale.US, "%.2f", categoryOpacity));
-    }
-
-    @Override
-    public void setSummary(CharSequence summary) {
-        // Ignore calls to set the summary.
-        // Summary is always the description of the category.
-        //
-        // This is required otherwise the ReVanced preference fragment
-        // sets all ListPreference summaries to show the current selection.
-    }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryPreference.java
new file mode 100644
index 000000000..55099d508
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryPreference.java
@@ -0,0 +1,165 @@
+package app.revanced.extension.youtube.sponsorblock.objects;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings.migrateOldColorString;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.ui.ColorDot;
+
+@SuppressWarnings("deprecation")
+public class SegmentCategoryPreference extends ColorPickerPreference {
+    public final SegmentCategory category;
+
+    /**
+     * View displaying a colored dot in the widget area.
+     */
+    private View widgetColorDot;
+
+    // Fields to store dialog state for the OK button handler.
+    private int selectedDialogEntryIndex;
+    private CharSequence[] entryValues;
+
+
+    public SegmentCategoryPreference(Context context, SegmentCategory category) {
+        super(context);
+        this.category = Objects.requireNonNull(category);
+
+        // Set key to color setting for persistence.
+        // Edit: Using preferences to sync together multiple pieces of code is messy and should be rethought.
+        setKey(category.colorSetting.key);
+        setTitle(category.title.toString());
+        setSummary(category.description.toString());
+
+        // Enable opacity slider for this preference.
+        setOpacitySliderEnabled(true);
+
+        setWidgetLayoutResource(LAYOUT_REVANCED_COLOR_DOT_WIDGET);
+
+        // Sync initial color from category.
+        setText(category.getColorStringWithOpacity());
+        updateUI();
+    }
+
+    @Override
+    public final void setText(String colorString) {
+        try {
+            // Migrate old data imported in the settings UI.
+            // This migration is needed here because pasting into the settings
+            // immediately syncs the data with the preferences.
+            colorString = migrateOldColorString(colorString, SegmentCategory.CATEGORY_DEFAULT_OPACITY);
+            super.setText(colorString);
+
+            // Save to category.
+            category.setColorWithOpacity(colorString);
+            updateUI();
+
+            // Notify the listener about the color change.
+            if (colorChangeListener != null) {
+                colorChangeListener.onColorChanged(getKey(), category.getColorWithOpacity());
+            }
+        } catch (IllegalArgumentException ex) {
+            Utils.showToastShort(str("revanced_settings_color_invalid"));
+            setText(category.colorSetting.defaultValue);
+        } catch (Exception ex) {
+            String colorStringFinal = colorString;
+            Logger.printException(() -> "setText failure: " + colorStringFinal, ex);
+        }
+    }
+
+    @Nullable
+    @Override
+    protected View createExtraDialogContentView(Context context) {
+        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
+        entryValues = isHighlightCategory
+                ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
+                : CategoryBehaviour.getBehaviorKeyValues();
+
+        String currentBehavior = category.behaviorSetting.get();
+        selectedDialogEntryIndex = -1;
+        for (int i = 0; i < entryValues.length; i++) {
+            if (entryValues[i].equals(currentBehavior)) {
+                selectedDialogEntryIndex = i;
+                break;
+            }
+        }
+
+        RadioGroup radioGroup = new RadioGroup(context);
+        radioGroup.setOrientation(RadioGroup.VERTICAL);
+        CharSequence[] entries = isHighlightCategory
+                ? CategoryBehaviour.getBehaviorDescriptionsWithoutSkipOnce()
+                : CategoryBehaviour.getBehaviorDescriptions();
+
+        for (int i = 0; i < entries.length; i++) {
+            RadioButton radioButton = new RadioButton(context);
+            radioButton.setText(entries[i]);
+            radioButton.setId(i);
+            radioButton.setChecked(i == selectedDialogEntryIndex);
+            radioGroup.addView(radioButton);
+        }
+
+        radioGroup.setOnCheckedChangeListener((group, checkedId) -> selectedDialogEntryIndex = checkedId);
+        radioGroup.setPadding(dipToPixels(10), 0, dipToPixels(10), dipToPixels(10));
+        return radioGroup;
+    }
+
+    @Override
+    protected void onDialogOkClicked() {
+        if (selectedDialogEntryIndex >= 0 && entryValues != null) {
+            String value = entryValues[selectedDialogEntryIndex].toString();
+            category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
+            SegmentCategory.updateEnabledCategories();
+        }
+    }
+
+    @Override
+    protected void onDialogNeutralClicked() {
+        try {
+            final int defaultColor = category.getDefaultColorWithOpacity();
+            dialogColorPickerView.setColor(defaultColor);
+        } catch (Exception ex) {
+            Logger.printException(() -> "Reset button failure", ex);
+        }
+    }
+
+    public void updateUI() {
+        try {
+            if (category.behaviorSetting != null) {
+                setEnabled(category.behaviorSetting.isAvailable());
+            }
+
+            updateWidgetColorDot();
+        } catch (Exception ex) {
+            Logger.printException(() -> "updateUI failure for category: " + category.keyValue, ex);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        widgetColorDot = view.findViewById(ID_PREFERENCE_COLOR_DOT);
+        updateWidgetColorDot();
+    }
+
+    private void updateWidgetColorDot() {
+        if (widgetColorDot == null) return;
+
+        ColorDot.applyColorDot(
+                widgetColorDot,
+                category.getColorWithOpacity(),
+                isEnabled()
+        );
+    }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java
index 4528cfae9..b9669ec21 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java
@@ -16,7 +16,7 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
     public enum SegmentVote {
         UPVOTE(sf("revanced_sb_vote_upvote"), 1,false),
         DOWNVOTE(sf("revanced_sb_vote_downvote"), 0, true),
-        CATEGORY_CHANGE(sf("revanced_sb_vote_category"), -1, true); // apiVoteType is not used for category change
+        CATEGORY_CHANGE(sf("revanced_sb_vote_category"), -1, true); // ApiVoteType is not used for category change.
 
         public static final SegmentVote[] voteTypesWithoutCategoryChange = {
                 UPVOTE,
@@ -104,7 +104,7 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
     /**
      * @return The start/end time in range form.
      * Range times are adjusted since it uses inclusive and Segments use exclusive.
-     *
+     * <p>
      * {@link SegmentCategory#HIGHLIGHT} is unique and
      * returns a range from the start of the video until the highlight.
      */
@@ -116,7 +116,7 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
     }
 
     /**
-     * @return the length of this segment, in milliseconds.  Always a positive number.
+     * @return the length of this segment, in milliseconds. Always a positive number.
      */
     public long length() {
         return end - start;
@@ -148,8 +148,7 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof SponsorSegment)) return false;
-        SponsorSegment other = (SponsorSegment) o;
+        if (!(o instanceof SponsorSegment other)) return false;
         return Objects.equals(UUID, other.UUID)
                 && category == other.category
                 && start == other.start
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java
index 0b0793388..6a5f03231 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java
@@ -1,5 +1,9 @@
 package app.revanced.extension.youtube.sponsorblock.ui;
 
+import static app.revanced.extension.shared.Utils.getResourceColor;
+import static app.revanced.extension.shared.Utils.getResourceDimensionPixelSize;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.GradientDrawable;
@@ -10,14 +14,10 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
+import app.revanced.extension.shared.Logger;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
-import app.revanced.extension.shared.Logger;
-
-import static app.revanced.extension.shared.Utils.getResourceColor;
-import static app.revanced.extension.shared.Utils.getResourceDimensionPixelSize;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 
 public final class NewSegmentLayout extends FrameLayout {
     private static final ColorStateList rippleColorStateList = new ColorStateList(
@@ -45,7 +45,7 @@ public final class NewSegmentLayout extends FrameLayout {
         super(context, attributeSet, defStyleAttr, defStyleRes);
 
         LayoutInflater.from(context).inflate(
-                getResourceIdentifier(context, "revanced_sb_new_segment", "layout"), this, true
+                getResourceIdentifierOrThrow(context, "revanced_sb_new_segment", "layout"), this, true
         );
 
         initializeButton(
@@ -104,7 +104,7 @@ public final class NewSegmentLayout extends FrameLayout {
      */
     private void initializeButton(final Context context, final String resourceIdentifierName,
                                   final ButtonOnClickHandlerFunction handler, final String debugMessage) {
-        ImageButton button = findViewById(getResourceIdentifier(context, resourceIdentifierName, "id"));
+        ImageButton button = findViewById(getResourceIdentifierOrThrow(context, resourceIdentifierName, "id"));
 
         // Add ripple effect
         RippleDrawable rippleDrawable = new RippleDrawable(
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java
index 6ca96cd37..f7552b4cf 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java
@@ -4,6 +4,7 @@ import static app.revanced.extension.shared.Utils.getResourceColor;
 import static app.revanced.extension.shared.Utils.getResourceDimension;
 import static app.revanced.extension.shared.Utils.getResourceDimensionPixelSize;
 import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -56,9 +57,11 @@ public class SkipSponsorButton extends FrameLayout {
     public SkipSponsorButton(Context context, AttributeSet attributeSet, int defStyleAttr, int defStyleRes) {
         super(context, attributeSet, defStyleAttr, defStyleRes);
 
-        LayoutInflater.from(context).inflate(getResourceIdentifier(context, "revanced_sb_skip_sponsor_button", "layout"), this, true);  // layout:skip_ad_button
+        LayoutInflater.from(context).inflate(getResourceIdentifierOrThrow(context,
+                "revanced_sb_skip_sponsor_button", "layout"), this, true);  // layout:skip_ad_button
         setMinimumHeight(getResourceDimensionPixelSize("ad_skip_ad_button_min_height"));  // dimen:ad_skip_ad_button_min_height
-        skipSponsorBtnContainer = Objects.requireNonNull(findViewById(getResourceIdentifier(context, "revanced_sb_skip_sponsor_button_container", "id")));  // id:skip_ad_button_container
+        skipSponsorBtnContainer = Objects.requireNonNull(findViewById(getResourceIdentifierOrThrow(
+                context, "revanced_sb_skip_sponsor_button_container", "id")));  // id:skip_ad_button_container
 
         background = new Paint();
         background.setColor(getResourceColor("skip_ad_button_background_color"));  // color:skip_ad_button_background_color);
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockAboutPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockAboutPreference.java
index 098f8d599..d8c8a13fe 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockAboutPreference.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockAboutPreference.java
@@ -3,7 +3,7 @@ package app.revanced.extension.youtube.sponsorblock.ui;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import app.revanced.extension.youtube.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
 
 @SuppressWarnings("unused")
 public class SponsorBlockAboutPreference extends UrlLinkPreference {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java
index e0149f2f6..2d13bec8a 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java
@@ -10,11 +10,11 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.SwitchPreference;
-import android.text.Html;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.Pair;
@@ -29,13 +29,16 @@ import java.util.List;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BooleanSetting;
+import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
 import app.revanced.extension.shared.settings.preference.ResettableEditTextPreference;
+import app.revanced.extension.shared.ui.CustomDialog;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory;
-import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategoryListPreference;
+import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategoryPreference;
 
 /**
  * Lots of old code that could be converted to a half dozen custom preferences,
@@ -54,27 +57,9 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
      */
     private boolean preferencesInitialized;
 
-    private SwitchPreference sbEnabled;
-    private SwitchPreference addNewSegment;
-    private SwitchPreference votingEnabled;
-    private SwitchPreference autoHideSkipSegmentButton;
-    private SwitchPreference compactSkipButton;
-    private SwitchPreference squareLayout;
-    private SwitchPreference showSkipToast;
-    private SwitchPreference trackSkips;
-    private SwitchPreference showTimeWithoutSegments;
-    private SwitchPreference toastOnConnectionError;
-    private CustomDialogListPreference autoHideSkipSegmentButtonDuration;
-    private CustomDialogListPreference showSkipToastDuration;
-
-    private ResettableEditTextPreference newSegmentStep;
-    private ResettableEditTextPreference minSegmentDuration;
-    private EditTextPreference privateUserId;
     private EditTextPreference importExport;
-    private Preference apiUrl;
 
-    private PreferenceCategory segmentCategory;
-    private final List<SegmentCategoryListPreference> segmentCategories = new ArrayList<>();
+    private final List<SegmentCategoryPreference> segmentCategories = new ArrayList<>();
 
     public SponsorBlockPreferenceGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
@@ -99,60 +84,17 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
         try {
             Logger.printDebug(() -> "updateUI");
 
-            final boolean enabled = Settings.SB_ENABLED.get();
-            if (!enabled) {
+            if (!Settings.SB_ENABLED.get()) {
                 SponsorBlockViewController.hideAll();
                 SegmentPlaybackController.setCurrentVideoId(null);
             } else if (!Settings.SB_CREATE_NEW_SEGMENT.get()) {
                 SponsorBlockViewController.hideNewSegmentLayout();
             }
-            // Voting and add new segment buttons automatically show/hide themselves.
 
             SponsorBlockViewController.updateLayout();
 
-            sbEnabled.setChecked(enabled);
-
-            addNewSegment.setChecked(Settings.SB_CREATE_NEW_SEGMENT.get());
-            addNewSegment.setEnabled(enabled);
-
-            votingEnabled.setChecked(Settings.SB_VOTING_BUTTON.get());
-            votingEnabled.setEnabled(enabled);
-
-            autoHideSkipSegmentButton.setChecked(Settings.SB_AUTO_HIDE_SKIP_BUTTON.get());
-            autoHideSkipSegmentButton.setEnabled(enabled);
-
-            autoHideSkipSegmentButtonDuration.setValue(Settings.SB_AUTO_HIDE_SKIP_BUTTON_DURATION.get().toString());
-            autoHideSkipSegmentButtonDuration.setEnabled(Settings.SB_AUTO_HIDE_SKIP_BUTTON_DURATION.isAvailable());
-
-            compactSkipButton.setChecked(Settings.SB_COMPACT_SKIP_BUTTON.get());
-            compactSkipButton.setEnabled(enabled);
-
-            showSkipToast.setChecked(Settings.SB_TOAST_ON_SKIP.get());
-            showSkipToast.setEnabled(enabled);
-
-            squareLayout.setChecked(Settings.SB_SQUARE_LAYOUT.get());
-            squareLayout.setEnabled(enabled);
-
-            showSkipToastDuration.setValue(Settings.SB_TOAST_ON_SKIP_DURATION.get().toString());
-            showSkipToastDuration.setEnabled(Settings.SB_TOAST_ON_SKIP_DURATION.isAvailable());
-
-            toastOnConnectionError.setChecked(Settings.SB_TOAST_ON_CONNECTION_ERROR.get());
-            toastOnConnectionError.setEnabled(enabled);
-
-            trackSkips.setChecked(Settings.SB_TRACK_SKIP_COUNT.get());
-            trackSkips.setEnabled(enabled);
-
-            showTimeWithoutSegments.setChecked(Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.get());
-            showTimeWithoutSegments.setEnabled(enabled);
-
-            newSegmentStep.setText((Settings.SB_CREATE_NEW_SEGMENT_STEP.get()).toString());
-            newSegmentStep.setEnabled(enabled);
-
-            minSegmentDuration.setText((Settings.SB_SEGMENT_MIN_DURATION.get()).toString());
-            minSegmentDuration.setEnabled(enabled);
-
-            privateUserId.setText(Settings.SB_PRIVATE_USER_ID.get());
-            privateUserId.setEnabled(enabled);
+            // Preferences are synced by AbstractPreferenceFragment since keys are set
+            // and a Setting exist with the same key.
 
             // If the user has a private user id, then include a subtext that mentions not to share it.
             String importExportSummary = SponsorBlockSettings.userHasSBPrivateId()
@@ -160,11 +102,7 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                     : str("revanced_sb_settings_ie_sum");
             importExport.setSummary(importExportSummary);
 
-            apiUrl.setEnabled(enabled);
-            importExport.setEnabled(enabled);
-            segmentCategory.setEnabled(enabled);
-
-            for (SegmentCategoryListPreference category : segmentCategories) {
+            for (SegmentCategoryPreference category : segmentCategories) {
                 category.updateUI();
             }
         } catch (Exception ex) {
@@ -172,6 +110,50 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
         }
     }
 
+    public void updateUIDelayed() {
+        // Must use a delay, so AbstractPreferenceFragment can
+        // update the availability of the settings.
+        Utils.runOnMainThreadDelayed(this::updateUI, 50);
+    }
+
+    private void initializePreference(Preference preference, Setting<?> setting, String key) {
+        initializePreference(preference, setting, key, true);
+    }
+
+    private void initializePreference(Preference preference, Setting<?> setting,
+                                      String key, boolean setDetailedSummary) {
+        preference.setKey(setting.key);
+        preference.setTitle(str(key));
+        preference.setEnabled(setting.isAvailable());
+        boolean shouldSetSummary = true;
+
+        if (preference instanceof SwitchPreference switchPref && setting instanceof BooleanSetting boolSetting) {
+            switchPref.setChecked(boolSetting.get());
+            if (setDetailedSummary) {
+                switchPref.setSummaryOn(str(key + "_sum_on"));
+                switchPref.setSummaryOff(str(key + "_sum_off"));
+                shouldSetSummary = false;
+            }
+        } else if (preference instanceof ResettableEditTextPreference resetPref) {
+            resetPref.setText(setting.get().toString());
+        } else if (preference instanceof EditTextPreference editPref) {
+            editPref.setText(setting.get().toString());
+        } else if (preference instanceof ListPreference listPref) {
+            listPref.setEntries(Utils.getResourceStringArray(key + "_entries"));
+            listPref.setEntryValues(Utils.getResourceStringArray(key + "_entry_values"));
+            listPref.setValue(setting.get().toString());
+
+            if (preference instanceof CustomDialogListPreference dialogPref) {
+                // Sets a static summary without overwriting it.
+                dialogPref.setStaticSummary(str(key + "_sum"));
+            }
+        }
+
+        if (shouldSetSummary) {
+            preference.setSummary(str(key + "_sum"));
+        }
+    }
+
     protected void onAttachedToActivity() {
         try {
             super.onAttachedToActivity();
@@ -183,20 +165,19 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                 }
                 return;
             }
-
             preferencesInitialized = true;
 
             Logger.printDebug(() -> "Creating settings preferences");
             Context context = getContext();
             SponsorBlockSettings.initialize();
 
-            sbEnabled = new SwitchPreference(context);
-            sbEnabled.setTitle(str("revanced_sb_enable_sb"));
-            sbEnabled.setSummary(str("revanced_sb_enable_sb_sum"));
+            SwitchPreference sbEnabled = new SwitchPreference(context);
+            initializePreference(sbEnabled, Settings.SB_ENABLED,
+                    "revanced_sb_enable_sb", false);
             addPreference(sbEnabled);
             sbEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_ENABLED.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
 
@@ -204,109 +185,98 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             appearanceCategory.setTitle(str("revanced_sb_appearance_category"));
             addPreference(appearanceCategory);
 
-            votingEnabled = new SwitchPreference(context);
-            votingEnabled.setTitle(str("revanced_sb_enable_voting"));
-            votingEnabled.setSummaryOn(str("revanced_sb_enable_voting_sum_on"));
-            votingEnabled.setSummaryOff(str("revanced_sb_enable_voting_sum_off"));
+            SwitchPreference votingEnabled = new SwitchPreference(context);
+            initializePreference(votingEnabled, Settings.SB_VOTING_BUTTON,
+                    "revanced_sb_enable_voting");
             votingEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_VOTING_BUTTON.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(votingEnabled);
 
-            compactSkipButton = new SwitchPreference(context);
-            compactSkipButton.setTitle(str("revanced_sb_enable_compact_skip_button"));
-            compactSkipButton.setSummaryOn(str("revanced_sb_enable_compact_skip_button_sum_on"));
-            compactSkipButton.setSummaryOff(str("revanced_sb_enable_compact_skip_button_sum_off"));
+            SwitchPreference compactSkipButton = new SwitchPreference(context);
+            initializePreference(compactSkipButton, Settings.SB_COMPACT_SKIP_BUTTON,
+                    "revanced_sb_enable_compact_skip_button");
             compactSkipButton.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_COMPACT_SKIP_BUTTON.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(compactSkipButton);
 
-            autoHideSkipSegmentButton = new SwitchPreference(context);
-            autoHideSkipSegmentButton.setTitle(str("revanced_sb_enable_auto_hide_skip_segment_button"));
-            autoHideSkipSegmentButton.setSummaryOn(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_on"));
-            autoHideSkipSegmentButton.setSummaryOff(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_off"));
+            SwitchPreference autoHideSkipSegmentButton = new SwitchPreference(context);
+            initializePreference(autoHideSkipSegmentButton, Settings.SB_AUTO_HIDE_SKIP_BUTTON,
+                    "revanced_sb_enable_auto_hide_skip_segment_button");
             autoHideSkipSegmentButton.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_AUTO_HIDE_SKIP_BUTTON.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(autoHideSkipSegmentButton);
 
-            String[] durationEntries = Utils.getResourceStringArray("revanced_sb_duration_entries");
-            String[] durationEntryValues = Utils.getResourceStringArray("revanced_sb_duration_entry_values");
-
-            autoHideSkipSegmentButtonDuration = new CustomDialogListPreference(context);
-            autoHideSkipSegmentButtonDuration.setTitle(str("revanced_sb_auto_hide_skip_button_duration"));
-            autoHideSkipSegmentButtonDuration.setSummary(str("revanced_sb_auto_hide_skip_button_duration_sum"));
-            autoHideSkipSegmentButtonDuration.setEntries(durationEntries);
-            autoHideSkipSegmentButtonDuration.setEntryValues(durationEntryValues);
+            CustomDialogListPreference autoHideSkipSegmentButtonDuration = new CustomDialogListPreference(context);
+            initializePreference(autoHideSkipSegmentButtonDuration, Settings.SB_AUTO_HIDE_SKIP_BUTTON_DURATION,
+                    "revanced_sb_auto_hide_skip_button_duration");
             autoHideSkipSegmentButtonDuration.setOnPreferenceChangeListener((preference1, newValue) -> {
-                Settings.SB_AUTO_HIDE_SKIP_BUTTON_DURATION.save(
-                        SponsorBlockDuration.valueOf((String) newValue)
-                );
-                updateUI();
+                SponsorBlockDuration newDuration = SponsorBlockDuration.valueOf((String) newValue);
+                Settings.SB_AUTO_HIDE_SKIP_BUTTON_DURATION.save(newDuration);
+                ((CustomDialogListPreference) preference1).setValue(newDuration.name());
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(autoHideSkipSegmentButtonDuration);
 
-            showSkipToast = new SwitchPreference(context);
-            showSkipToast.setTitle(str("revanced_sb_general_skiptoast"));
-            showSkipToast.setSummaryOn(str("revanced_sb_general_skiptoast_sum_on"));
-            showSkipToast.setSummaryOff(str("revanced_sb_general_skiptoast_sum_off"));
+            SwitchPreference showSkipToast = new SwitchPreference(context);
+            initializePreference(showSkipToast, Settings.SB_TOAST_ON_SKIP,
+                    "revanced_sb_general_skiptoast");
             showSkipToast.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_TOAST_ON_SKIP.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(showSkipToast);
 
-            showSkipToastDuration = new CustomDialogListPreference(context);
-            showSkipToastDuration.setTitle(str("revanced_sb_toast_on_skip_duration"));
-            showSkipToastDuration.setSummary(str("revanced_sb_toast_on_skip_duration_sum"));
-            showSkipToastDuration.setEntries(durationEntries);
-            showSkipToastDuration.setEntryValues(durationEntryValues);
+            CustomDialogListPreference showSkipToastDuration = new CustomDialogListPreference(context);
+            initializePreference(showSkipToastDuration, Settings.SB_TOAST_ON_SKIP_DURATION,
+                    "revanced_sb_toast_on_skip_duration");
+            // Sets a static summary without overwriting it.
+            showSkipToastDuration.setStaticSummary(str("revanced_sb_toast_on_skip_duration_sum"));
             showSkipToastDuration.setOnPreferenceChangeListener((preference1, newValue) -> {
-                Settings.SB_TOAST_ON_SKIP_DURATION.save(
-                        SponsorBlockDuration.valueOf((String) newValue)
-                );
-                updateUI();
+                SponsorBlockDuration newDuration = SponsorBlockDuration.valueOf((String) newValue);
+                Settings.SB_TOAST_ON_SKIP_DURATION.save(newDuration);
+                ((CustomDialogListPreference) preference1).setValue(newDuration.name());
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(showSkipToastDuration);
 
-            showTimeWithoutSegments = new SwitchPreference(context);
-            showTimeWithoutSegments.setTitle(str("revanced_sb_general_time_without"));
-            showTimeWithoutSegments.setSummaryOn(str("revanced_sb_general_time_without_sum_on"));
-            showTimeWithoutSegments.setSummaryOff(str("revanced_sb_general_time_without_sum_off"));
+            SwitchPreference showTimeWithoutSegments = new SwitchPreference(context);
+            initializePreference(showTimeWithoutSegments, Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS,
+                    "revanced_sb_general_time_without");
             showTimeWithoutSegments.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(showTimeWithoutSegments);
 
-            squareLayout = new SwitchPreference(context);
-            squareLayout.setTitle(str("revanced_sb_square_layout"));
-            squareLayout.setSummaryOn(str("revanced_sb_square_layout_sum_on"));
-            squareLayout.setSummaryOff(str("revanced_sb_square_layout_sum_off"));
+            SwitchPreference squareLayout = new SwitchPreference(context);
+            initializePreference(squareLayout, Settings.SB_SQUARE_LAYOUT,
+                    "revanced_sb_square_layout");
             squareLayout.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_SQUARE_LAYOUT.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             appearanceCategory.addPreference(squareLayout);
 
-            segmentCategory = new PreferenceCategory(context);
+            PreferenceCategory segmentCategory = new PreferenceCategory(context);
             segmentCategory.setTitle(str("revanced_sb_diff_segments"));
             addPreference(segmentCategory);
 
             for (SegmentCategory category : SegmentCategory.categoriesWithoutUnsubmitted()) {
-                SegmentCategoryListPreference categoryPreference = new SegmentCategoryListPreference(context, category);
+                SegmentCategoryPreference categoryPreference = new SegmentCategoryPreference(context, category);
                 segmentCategories.add(categoryPreference);
                 segmentCategory.addPreference(categoryPreference);
             }
@@ -315,24 +285,23 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             createSegmentCategory.setTitle(str("revanced_sb_create_segment_category"));
             addPreference(createSegmentCategory);
 
-            addNewSegment = new SwitchPreference(context);
-            addNewSegment.setTitle(str("revanced_sb_enable_create_segment"));
-            addNewSegment.setSummaryOn(str("revanced_sb_enable_create_segment_sum_on"));
-            addNewSegment.setSummaryOff(str("revanced_sb_enable_create_segment_sum_off"));
+            SwitchPreference addNewSegment = new SwitchPreference(context);
+            initializePreference(addNewSegment, Settings.SB_CREATE_NEW_SEGMENT,
+                    "revanced_sb_enable_create_segment");
             addNewSegment.setOnPreferenceChangeListener((preference1, o) -> {
                 Boolean newValue = (Boolean) o;
                 if (newValue && !Settings.SB_SEEN_GUIDELINES.get()) {
-                    Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                             preference1.getContext(),
-                            str("revanced_sb_guidelines_popup_title"),   // Title.
-                            str("revanced_sb_guidelines_popup_content"), // Message.
-                            null,                                        // No EditText.
-                            str("revanced_sb_guidelines_popup_open"),    // OK button text.
-                            () -> openGuidelines(),                      // OK button action.
-                            null,                                        // Cancel button action.
+                            str("revanced_sb_guidelines_popup_title"),      // Title.
+                            str("revanced_sb_guidelines_popup_content"),    // Message.
+                            null,                                               // No EditText.
+                            str("revanced_sb_guidelines_popup_open"),       // OK button text.
+                            this::openGuidelines,                               // OK button action.
+                            null,                                               // Cancel button action.
                             str("revanced_sb_guidelines_popup_already_read"), // Neutral button text.
-                            () -> {},                                    // Neutral button action (dismiss only).
-                            true                                         // Dismiss dialog when onNeutralClick.
+                            () -> {},                                           // Neutral button action (dismiss only).
+                            true                                                // Dismiss dialog when onNeutralClick.
                     );
 
                     // Set dialog as non-cancelable.
@@ -344,21 +313,21 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                     dialogPair.first.show();
                 }
                 Settings.SB_CREATE_NEW_SEGMENT.save(newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             createSegmentCategory.addPreference(addNewSegment);
 
-            newSegmentStep = new ResettableEditTextPreference(context);
-            newSegmentStep.setSetting(Settings.SB_CREATE_NEW_SEGMENT_STEP);
-            newSegmentStep.setTitle(str("revanced_sb_general_adjusting"));
-            newSegmentStep.setSummary(str("revanced_sb_general_adjusting_sum"));
+            ResettableEditTextPreference newSegmentStep = new ResettableEditTextPreference(context);
+            initializePreference(newSegmentStep, Settings.SB_CREATE_NEW_SEGMENT_STEP,
+                    "revanced_sb_general_adjusting");
             newSegmentStep.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
             newSegmentStep.setOnPreferenceChangeListener((preference1, newValue) -> {
                 try {
                     final int newAdjustmentValue = Integer.parseInt(newValue.toString());
                     if (newAdjustmentValue != 0) {
                         Settings.SB_CREATE_NEW_SEGMENT_STEP.save(newAdjustmentValue);
+                        updateUIDelayed();
                         return true;
                     }
                 } catch (NumberFormatException ex) {
@@ -366,7 +335,7 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                 }
 
                 Utils.showToastLong(str("revanced_sb_general_adjusting_invalid"));
-                updateUI();
+                updateUIDelayed();
                 return false;
             });
             createSegmentCategory.addPreference(newSegmentStep);
@@ -384,49 +353,47 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             generalCategory.setTitle(str("revanced_sb_general"));
             addPreference(generalCategory);
 
-            toastOnConnectionError = new SwitchPreference(context);
-            toastOnConnectionError.setTitle(str("revanced_sb_toast_on_connection_error_title"));
-            toastOnConnectionError.setSummaryOn(str("revanced_sb_toast_on_connection_error_summary_on"));
-            toastOnConnectionError.setSummaryOff(str("revanced_sb_toast_on_connection_error_summary_off"));
+            SwitchPreference toastOnConnectionError = new SwitchPreference(context);
+            initializePreference(toastOnConnectionError, Settings.SB_TOAST_ON_CONNECTION_ERROR,
+                    "revanced_sb_toast_on_connection_error");
             toastOnConnectionError.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_TOAST_ON_CONNECTION_ERROR.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             generalCategory.addPreference(toastOnConnectionError);
 
-            trackSkips = new SwitchPreference(context);
-            trackSkips.setTitle(str("revanced_sb_general_skipcount"));
-            trackSkips.setSummaryOn(str("revanced_sb_general_skipcount_sum_on"));
-            trackSkips.setSummaryOff(str("revanced_sb_general_skipcount_sum_off"));
+            SwitchPreference trackSkips = new SwitchPreference(context);
+            initializePreference(trackSkips, Settings.SB_TRACK_SKIP_COUNT,
+                    "revanced_sb_general_skipcount");
             trackSkips.setOnPreferenceChangeListener((preference1, newValue) -> {
                 Settings.SB_TRACK_SKIP_COUNT.save((Boolean) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             generalCategory.addPreference(trackSkips);
 
-            minSegmentDuration = new ResettableEditTextPreference(context);
-            minSegmentDuration.setSetting(Settings.SB_SEGMENT_MIN_DURATION);
-            minSegmentDuration.setTitle(str("revanced_sb_general_min_duration"));
-            minSegmentDuration.setSummary(str("revanced_sb_general_min_duration_sum"));
+            ResettableEditTextPreference minSegmentDuration = new ResettableEditTextPreference(context);
+            initializePreference(minSegmentDuration, Settings.SB_SEGMENT_MIN_DURATION,
+                    "revanced_sb_general_min_duration");
             minSegmentDuration.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
             minSegmentDuration.setOnPreferenceChangeListener((preference1, newValue) -> {
                 try {
                     Float minTimeDuration = Float.valueOf(newValue.toString());
                     Settings.SB_SEGMENT_MIN_DURATION.save(minTimeDuration);
+                    updateUIDelayed();
                     return true;
                 } catch (NumberFormatException ex) {
                     Logger.printInfo(() -> "Invalid minimum segment duration", ex);
                 }
 
                 Utils.showToastLong(str("revanced_sb_general_min_duration_invalid"));
-                updateUI();
+                updateUIDelayed();
                 return false;
             });
             generalCategory.addPreference(minSegmentDuration);
 
-            privateUserId = new EditTextPreference(context) {
+            EditTextPreference privateUserId = new EditTextPreference(context) {
                 @Override
                 protected void showDialog(Bundle state) {
                     try {
@@ -439,7 +406,7 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                         editText.setSelection(initialValue.length()); // Move cursor to end.
 
                         // Create custom dialog.
-                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                                 context,
                                 getTitle() != null ? getTitle().toString() : "", // Title.
                                 null,     // Message is replaced by EditText.
@@ -475,31 +442,32 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                     }
                 }
             };
-            privateUserId.setTitle(str("revanced_sb_general_uuid"));
-            privateUserId.setSummary(str("revanced_sb_general_uuid_sum"));
+            initializePreference(privateUserId, Settings.SB_PRIVATE_USER_ID,
+                    "revanced_sb_general_uuid");
             privateUserId.setOnPreferenceChangeListener((preference1, newValue) -> {
                 String newUUID = newValue.toString();
                 if (!SponsorBlockSettings.isValidSBUserId(newUUID)) {
                     Utils.showToastLong(str("revanced_sb_general_uuid_invalid"));
+                    updateUIDelayed();
                     return false;
                 }
 
                 Settings.SB_PRIVATE_USER_ID.save(newUUID);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             generalCategory.addPreference(privateUserId);
 
-            apiUrl = new Preference(context);
-            apiUrl.setTitle(str("revanced_sb_general_api_url"));
-            apiUrl.setSummary(Html.fromHtml(str("revanced_sb_general_api_url_sum")));
+            Preference apiUrl = new Preference(context);
+            initializePreference(apiUrl, Settings.SB_API_URL,
+                    "revanced_sb_general_api_url");
             apiUrl.setOnPreferenceClickListener(preference1 -> {
                 EditText editText = new EditText(context);
                 editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
                 editText.setText(Settings.SB_API_URL.get());
 
                 // Create a custom dialog.
-                Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                         context,
                         str("revanced_sb_general_api_url"), // Title.
                         null,     // No message, EditText replaces it.
@@ -538,8 +506,11 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                         Context context = getContext();
                         EditText editText = getEditText();
 
+                        editText.setInputType(editText.getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+                        editText.setTextSize(TypedValue.COMPLEX_UNIT_PT, 7); // Use a smaller font to reduce text wrap.
+
                         // Create a custom dialog.
-                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                                 context,
                                 str("revanced_sb_settings_ie"), // Title.
                                 null,     // No message, EditText replaces it.
@@ -588,7 +559,7 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             });
             importExport.setOnPreferenceChangeListener((preference1, newValue) -> {
                 SponsorBlockSettings.importDesktopSettings((String) newValue);
-                updateUI();
+                updateUIDelayed();
                 return true;
             });
             generalCategory.addPreference(importExport);
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockStatsPreferenceCategory.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockStatsPreferenceCategory.java
index 7d7f3fbe7..6b6d7c4de 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockStatsPreferenceCategory.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockStatsPreferenceCategory.java
@@ -1,5 +1,6 @@
 package app.revanced.extension.youtube.sponsorblock.ui;
 
+import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static android.text.Html.fromHtml;
 import static app.revanced.extension.shared.StringRef.str;
 
@@ -7,7 +8,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.ResettableEditTextPreference;
+import app.revanced.extension.shared.ui.CustomDialog;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
@@ -27,7 +28,6 @@ import app.revanced.extension.youtube.sponsorblock.requests.SBRequester;
 
 /**
  * User skip stats.
- *
  * None of the preferences here show up in search results because
  * a category cannot be added to another category for the search results.
  * Additionally the stats must load remotely on a background thread which means the
@@ -48,6 +48,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
         super(context, attrs);
     }
 
+    @Override
     protected void onAttachedToActivity() {
         try {
             super.onAttachedToActivity();
@@ -97,8 +98,8 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
             if (stats.totalSegmentCountIncludingIgnored > 0) {
                 // If user has not created any segments, there's no reason to set a username.
                 String userName = stats.userName;
-                EditTextPreference preference = new ResettableEditTextPreference(context);
-                preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName)));
+                ResettableEditTextPreference preference = new ResettableEditTextPreference(context);
+                preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName), FROM_HTML_MODE_COMPACT));
                 preference.setSummary(str("revanced_sb_stats_username_change"));
                 preference.setText(userName);
                 preference.setOnPreferenceChangeListener((preference1, value) -> {
@@ -107,7 +108,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                         String errorMessage = SBRequester.setUsername(newUserName);
                         Utils.runOnMainThread(() -> {
                             if (errorMessage == null) {
-                                preference.setTitle(fromHtml(str("revanced_sb_stats_username", newUserName)));
+                                preference.setTitle(fromHtml(str("revanced_sb_stats_username", newUserName), FROM_HTML_MODE_COMPACT));
                                 preference.setText(newUserName);
                                 Utils.showToastLong(str("revanced_sb_stats_username_changed"));
                             } else {
@@ -118,6 +119,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                     });
                     return true;
                 });
+                preference.setEnabled(Settings.SB_PRIVATE_USER_ID.isAvailable()); // Sync with private user ID setting.
                 addPreference(preference);
             }
 
@@ -125,7 +127,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                 // Number of segment submissions (does not include ignored segments).
                 Preference preference = new Preference(context);
                 String formatted = SponsorBlockUtils.getNumberOfSkipsString(stats.segmentCount);
-                preference.setTitle(fromHtml(str("revanced_sb_stats_submissions", formatted)));
+                preference.setTitle(fromHtml(str("revanced_sb_stats_submissions", formatted), FROM_HTML_MODE_COMPACT));
                 preference.setSummary(str("revanced_sb_stats_submissions_sum"));
                 if (stats.totalSegmentCountIncludingIgnored == 0) {
                     preference.setSelectable(false);
@@ -137,6 +139,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                         return true;
                     });
                 }
+                preference.setEnabled(Settings.SB_ENABLED.isAvailable());
                 addPreference(preference);
             }
 
@@ -144,8 +147,9 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                 // "user reputation".  Usually not useful since it appears most users have zero reputation.
                 // But if there is a reputation then show it here.
                 Preference preference = new Preference(context);
-                preference.setTitle(fromHtml(str("revanced_sb_stats_reputation", stats.reputation)));
+                preference.setTitle(fromHtml(str("revanced_sb_stats_reputation", stats.reputation), FROM_HTML_MODE_COMPACT));
                 preference.setSelectable(false);
+                preference.setEnabled(Settings.SB_ENABLED.isAvailable());
                 if (stats.reputation != 0) {
                     addPreference(preference);
                 }
@@ -166,14 +170,15 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
                     stats_saved_sum = str("revanced_sb_stats_saved_sum",
                             SponsorBlockUtils.getTimeSavedString((long) (60 * stats.minutesSaved)));
                 }
-                preference.setTitle(fromHtml(stats_saved));
-                preference.setSummary(fromHtml(stats_saved_sum));
+                preference.setTitle(fromHtml(stats_saved, FROM_HTML_MODE_COMPACT));
+                preference.setSummary(fromHtml(stats_saved_sum, FROM_HTML_MODE_COMPACT));
                 preference.setOnPreferenceClickListener(preference1 -> {
                     Intent i = new Intent(Intent.ACTION_VIEW);
                     i.setData(Uri.parse("https://sponsor.ajay.app/stats/"));
                     preference1.getContext().startActivity(i);
                     return false;
                 });
+                preference.setEnabled(Settings.SB_ENABLED.isAvailable());
                 addPreference(preference);
             }
         } catch (Exception ex) {
@@ -187,16 +192,16 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
         Runnable updateStatsSelfSaved = () -> {
             String formatted = SponsorBlockUtils.getNumberOfSkipsString(
                     Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.get());
-            preference.setTitle(fromHtml(str("revanced_sb_stats_self_saved", formatted)));
+            preference.setTitle(fromHtml(str("revanced_sb_stats_self_saved", formatted), FROM_HTML_MODE_COMPACT));
 
             String formattedSaved = SponsorBlockUtils.getTimeSavedString(
                     Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.get() / 1000);
-            preference.setSummary(fromHtml(str("revanced_sb_stats_self_saved_sum", formattedSaved)));
+            preference.setSummary(fromHtml(str("revanced_sb_stats_self_saved_sum", formattedSaved), FROM_HTML_MODE_COMPACT));
         };
         updateStatsSelfSaved.run();
 
         preference.setOnPreferenceClickListener(preference1 -> {
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     preference.getContext(),
                     str("revanced_sb_stats_self_saved_reset_title"), // Title.
                     null, // No message.
@@ -219,6 +224,7 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
             return true;
         });
 
+        preference.setEnabled(Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.isAvailable());
         addPreference(preference);
     }
 }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
index dd753934a..a299113ee 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
@@ -1,6 +1,6 @@
 package app.revanced.extension.youtube.sponsorblock.ui;
 
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -63,7 +63,8 @@ public class SponsorBlockViewController {
             Context context = Utils.getContext();
             RelativeLayout layout = new RelativeLayout(context);
             layout.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,RelativeLayout.LayoutParams.MATCH_PARENT));
-            LayoutInflater.from(context).inflate(getResourceIdentifier("revanced_sb_inline_sponsor_overlay", "layout"), layout);
+            LayoutInflater.from(context).inflate(getResourceIdentifierOrThrow(
+                    "revanced_sb_inline_sponsor_overlay", "layout"), layout);
             inlineSponsorOverlayRef = new WeakReference<>(layout);
 
             viewGroup.addView(layout);
@@ -82,14 +83,14 @@ public class SponsorBlockViewController {
             });
             youtubeOverlaysLayoutRef = new WeakReference<>(viewGroup);
 
-            skipHighlightButtonRef = new WeakReference<>(Objects.requireNonNull(
-                    layout.findViewById(getResourceIdentifier("revanced_sb_skip_highlight_button", "id"))));
+            skipHighlightButtonRef = new WeakReference<>(layout.findViewById(getResourceIdentifierOrThrow(
+                    "revanced_sb_skip_highlight_button", "id")));
 
-            skipSponsorButtonRef = new WeakReference<>(Objects.requireNonNull(
-                    layout.findViewById(getResourceIdentifier("revanced_sb_skip_sponsor_button", "id"))));
+            skipSponsorButtonRef = new WeakReference<>(layout.findViewById(getResourceIdentifierOrThrow(
+                    "revanced_sb_skip_sponsor_button", "id")));
 
-            NewSegmentLayout newSegmentLayout = Objects.requireNonNull(
-                    layout.findViewById(getResourceIdentifier("revanced_sb_new_segment_view", "id")));
+            NewSegmentLayout newSegmentLayout = layout.findViewById(getResourceIdentifierOrThrow(
+                    "revanced_sb_new_segment_view", "id"));
             newSegmentLayoutRef = new WeakReference<>(newSegmentLayout);
             newSegmentLayout.updateLayout();
 
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt
index c5854fd2f..176238a08 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt
@@ -92,7 +92,7 @@ class SwipeControlsConfigurationProvider {
     val overlayBackgroundOpacity: Int by lazy {
         var opacity = Settings.SWIPE_OVERLAY_OPACITY.get()
 
-        if (opacity < 0 || opacity > 100) {
+        if (opacity !in 0..100) {
             Utils.showToastLong(str("revanced_swipe_overlay_background_opacity_invalid_toast"))
             opacity = Settings.SWIPE_OVERLAY_OPACITY.resetToDefault()
         }
@@ -115,14 +115,13 @@ class SwipeControlsConfigurationProvider {
      * Resets to default and shows a toast if the color string is invalid or empty.
      */
     val overlayVolumeProgressColor: Int by lazy {
+        // Use lazy to avoid repeat parsing. Changing color requires app restart.
         getSettingColor(Settings.SWIPE_OVERLAY_VOLUME_COLOR)
     }
 
     private fun getSettingColor(setting: StringSetting): Int {
-        try {
-            //noinspection UseKtx
-            val color = Color.parseColor(setting.get())
-            return (0xBF000000.toInt() or (color and 0x00FFFFFF))
+        return try {
+            Color.parseColor(setting.get())
         } catch (ex: IllegalArgumentException) {
             // This code should never be reached.
             // Color picker rejects and will not save bad colors to a setting.
@@ -151,7 +150,7 @@ class SwipeControlsConfigurationProvider {
      */
     val overlayTextSize: Int by lazy {
         val size = Settings.SWIPE_OVERLAY_TEXT_SIZE.get()
-        if (size < 1 || size > 30) {
+        if (size !in 1..30) {
             Utils.showToastLong(str("revanced_swipe_text_overlay_size_invalid_toast"))
             return@lazy Settings.SWIPE_OVERLAY_TEXT_SIZE.resetToDefault()
         }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java
index c9d61a8d3..248de966d 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java
@@ -24,7 +24,7 @@ public class PlayerControlButton {
         boolean buttonEnabled();
     }
 
-    private static final int fadeInDuration = Utils.getResourceInteger("fade_duration_fast");
+    public static final int fadeInDuration = Utils.getResourceInteger("fade_duration_fast");
     private static final int fadeOutDuration = Utils.getResourceInteger("fade_duration_scheduled");
 
     private final WeakReference<View> containerRef;
@@ -249,4 +249,13 @@ public class PlayerControlButton {
             textOverlay.setText(text);
         }
     }
+
+    /**
+     * Returns the appropriate dialog background color depending on the current theme.
+     */
+    public static int getDialogBackgroundColor() {
+        return Utils.getResourceColor(
+                Utils.isDarkModeEnabled() ? "yt_black1" : "yt_white1"
+        );
+    }
 }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java
index 0c878616c..56da6a5bc 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java
@@ -2,38 +2,30 @@ package app.revanced.extension.youtube.videoplayer;
 
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.shared.settings.preference.CustomDialogListPreference.*;
 import static app.revanced.extension.youtube.patches.VideoInformation.AUTOMATIC_VIDEO_QUALITY_VALUE;
 import static app.revanced.extension.youtube.patches.VideoInformation.VIDEO_QUALITY_PREMIUM_NAME;
+import static app.revanced.extension.youtube.videoplayer.PlayerControlButton.fadeInDuration;
+import static app.revanced.extension.youtube.videoplayer.PlayerControlButton.getDialogBackgroundColor;
 
-import android.app.Dialog;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.UnderlineSpan;
-import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
+import android.widget.*;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import app.revanced.extension.shared.ui.SheetBottomDialog;
+import app.revanced.extension.youtube.shared.PlayerType;
 import com.google.android.libraries.youtube.innertube.model.media.VideoQuality;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,6 +35,7 @@ import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.playback.quality.RememberVideoQualityPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 
 @SuppressWarnings("unused")
 public class VideoQualityDialogButton {
@@ -60,6 +53,11 @@ public class VideoQualityDialogButton {
         });
     }
 
+    /**
+     * Weak reference to the currently open dialog.
+     */
+    private static WeakReference<SheetBottomDialog.SlideDialog> currentDialog;
+
     /**
      * Injection point.
      */
@@ -216,41 +214,14 @@ public class VideoQualityDialogButton {
                 }
             }
 
-            Dialog dialog = new Dialog(context);
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-            dialog.setCanceledOnTouchOutside(true);
-            dialog.setCancelable(true);
+            // Preset size constants.
+            final int dip8 = dipToPixels(8);
+            final int dip12 = dipToPixels(12);
+            final int dip16 = dipToPixels(16);
 
-            final int dip4 = dipToPixels(4);   // Height for handle bar.
-            final int dip5 = dipToPixels(5);   // Padding for mainLayout.
-            final int dip6 = dipToPixels(6);   // Bottom margin.
-            final int dip8 = dipToPixels(8);   // Side padding.
-            final int dip16 = dipToPixels(16); // Left padding for ListView.
-            final int dip20 = dipToPixels(20); // Margin below handle.
-            final int dip40 = dipToPixels(40); // Width for handle bar.
-
-            LinearLayout mainLayout = new LinearLayout(context);
-            mainLayout.setOrientation(LinearLayout.VERTICAL);
-            mainLayout.setPadding(dip5, dip8, dip5, dip8);
-
-            ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
-                    Utils.createCornerRadii(12), null, null));
-            background.getPaint().setColor(Utils.getDialogBackgroundColor());
-            mainLayout.setBackground(background);
-
-            View handleBar = new View(context);
-            ShapeDrawable handleBackground = new ShapeDrawable(new RoundRectShape(
-                    Utils.createCornerRadii(4), null, null));
-            final int baseColor = Utils.getDialogBackgroundColor();
-            final int adjustedHandleBarBackgroundColor = Utils.adjustColorBrightness(
-                    baseColor, 0.9f, 1.25f);
-            handleBackground.getPaint().setColor(adjustedHandleBarBackgroundColor);
-            handleBar.setBackground(handleBackground);
-            LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(dip40, dip4);
-            handleParams.gravity = Gravity.CENTER_HORIZONTAL;
-            handleParams.setMargins(0, 0, 0, dip20);
-            handleBar.setLayoutParams(handleParams);
-            mainLayout.addView(handleBar);
+            // Create main layout.
+            SheetBottomDialog.DraggableLinearLayout mainLayout =
+                    SheetBottomDialog.createMainLayout(context, getDialogBackgroundColor());
 
             // Create SpannableStringBuilder for formatted text.
             SpannableStringBuilder spannableTitle = new SpannableStringBuilder();
@@ -298,16 +269,20 @@ public class VideoQualityDialogButton {
             LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT);
-            titleParams.setMargins(dip8, 0, 0, dip20);
+            titleParams.setMargins(dip12, dip16, 0, dip16);
             titleView.setLayoutParams(titleParams);
             mainLayout.addView(titleView);
 
+            // Create ListView for quality selection.
             ListView listView = new ListView(context);
             CustomQualityAdapter adapter = new CustomQualityAdapter(context, qualityLabels);
             adapter.setSelectedPosition(listViewSelectedIndex);
             listView.setAdapter(adapter);
             listView.setDivider(null);
-            listView.setPadding(dip16, 0, 0, 0);
+
+            // Create dialog.
+            SheetBottomDialog.SlideDialog dialog = SheetBottomDialog.createSlideDialog(context, mainLayout, fadeInDuration);
+            currentDialog = new WeakReference<>(dialog);
 
             listView.setOnItemClickListener((parent, view, which, id) -> {
                 try {
@@ -322,112 +297,41 @@ public class VideoQualityDialogButton {
                 }
             });
 
-            LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    LinearLayout.LayoutParams.WRAP_CONTENT);
-            listViewParams.setMargins(0, 0, 0, dip5);
-            listView.setLayoutParams(listViewParams);
             mainLayout.addView(listView);
 
-            LinearLayout wrapperLayout = new LinearLayout(context);
-            wrapperLayout.setOrientation(LinearLayout.VERTICAL);
-            wrapperLayout.setPadding(dip8, 0, dip8, 0);
-            wrapperLayout.addView(mainLayout);
-            dialog.setContentView(wrapperLayout);
-
-            Window window = dialog.getWindow();
-            if (window != null) {
-                WindowManager.LayoutParams params = window.getAttributes();
-                params.gravity = Gravity.BOTTOM;
-                params.y = dip6;
-                int portraitWidth = context.getResources().getDisplayMetrics().widthPixels;
-                if (context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                    portraitWidth = Math.min(
-                            portraitWidth,
-                            context.getResources().getDisplayMetrics().heightPixels);
-                    // Limit height in landscape mode.
-                    params.height = Utils.percentageHeightToPixels(80);
-                } else {
-                    params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-                }
-                params.width = portraitWidth;
-                window.setAttributes(params);
-                window.setBackgroundDrawable(null);
-            }
-
-            final int fadeDurationFast = Utils.getResourceInteger("fade_duration_fast");
-            Animation slideInABottomAnimation = Utils.getResourceAnimation("slide_in_bottom");
-            slideInABottomAnimation.setDuration(fadeDurationFast);
-            mainLayout.startAnimation(slideInABottomAnimation);
-
-            // noinspection ClickableViewAccessibility
-            mainLayout.setOnTouchListener(new View.OnTouchListener() {
-                final float dismissThreshold = dipToPixels(100);
-                float touchY;
-                float translationY;
-
+            // Create observer for PlayerType changes.
+            Function1<PlayerType, Unit> playerTypeObserver = new Function1<>() {
                 @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    switch (event.getAction()) {
-                        case MotionEvent.ACTION_DOWN:
-                            touchY = event.getRawY();
-                            translationY = mainLayout.getTranslationY();
-                            return true;
-                        case MotionEvent.ACTION_MOVE:
-                            final float deltaY = event.getRawY() - touchY;
-                            if (deltaY >= 0) {
-                                mainLayout.setTranslationY(translationY + deltaY);
-                            }
-                            return true;
-                        case MotionEvent.ACTION_UP:
-                        case MotionEvent.ACTION_CANCEL:
-                            if (mainLayout.getTranslationY() > dismissThreshold) {
-                                //noinspection ExtractMethodRecommender
-                                final float remainingDistance = context.getResources().getDisplayMetrics().heightPixels
-                                        - mainLayout.getTop();
-                                TranslateAnimation slideOut = new TranslateAnimation(
-                                        0, 0, mainLayout.getTranslationY(), remainingDistance);
-                                slideOut.setDuration(fadeDurationFast);
-                                slideOut.setAnimationListener(new Animation.AnimationListener() {
-                                    @Override
-                                    public void onAnimationStart(Animation animation) {}
-                                    @Override
-                                    public void onAnimationEnd(Animation animation) {
-                                        dialog.dismiss();
-                                    }
-                                    @Override
-                                    public void onAnimationRepeat(Animation animation) {}
-                                });
-                                mainLayout.startAnimation(slideOut);
-                            } else {
-                                TranslateAnimation slideBack = new TranslateAnimation(
-                                        0, 0, mainLayout.getTranslationY(), 0);
-                                slideBack.setDuration(fadeDurationFast);
-                                mainLayout.startAnimation(slideBack);
-                                mainLayout.setTranslationY(0);
-                            }
-                            return true;
-                        default:
-                            return false;
+                public Unit invoke(PlayerType type) {
+                    SheetBottomDialog.SlideDialog current = currentDialog.get();
+                    if (current == null || !current.isShowing()) {
+                        // Should never happen.
+                        PlayerType.getOnChange().removeObserver(this);
+                        Logger.printException(() -> "Removing player type listener as dialog is null or closed");
+                    } else if (type == PlayerType.WATCH_WHILE_PICTURE_IN_PICTURE) {
+                        current.dismiss();
+                        Logger.printDebug(() -> "Playback speed dialog dismissed due to PiP mode");
                     }
+                    return Unit.INSTANCE;
                 }
+            };
+
+            // Add observer to dismiss dialog when entering PiP mode.
+            PlayerType.getOnChange().addObserver(playerTypeObserver);
+
+            // Remove observer when dialog is dismissed.
+            dialog.setOnDismissListener(d -> {
+                PlayerType.getOnChange().removeObserver(playerTypeObserver);
+                Logger.printDebug(() -> "PlayerType observer removed on dialog dismiss");
             });
 
-            dialog.show();
+            dialog.show(); // Show the dialog.
         } catch (Exception ex) {
             Logger.printException(() -> "showVideoQualityDialog failure", ex);
         }
     }
 
     private static class CustomQualityAdapter extends ArrayAdapter<String> {
-        private static final int CUSTOM_LIST_ITEM_CHECKED_ID = Utils.getResourceIdentifier(
-                "revanced_custom_list_item_checked", "layout");
-        private static final int CHECK_ICON_ID = Utils.getResourceIdentifier(
-                "revanced_check_icon", "id");
-        private static final int CHECK_ICON_PLACEHOLDER_ID = Utils.getResourceIdentifier(
-                "revanced_check_icon_placeholder", "id");
-        private static final int ITEM_TEXT_ID = Utils.getResourceIdentifier(
-                "revanced_item_text", "id");
 
         private int selectedPosition = -1;
 
@@ -447,14 +351,14 @@ public class VideoQualityDialogButton {
 
             if (convertView == null) {
                 convertView = LayoutInflater.from(getContext()).inflate(
-                        CUSTOM_LIST_ITEM_CHECKED_ID,
+                        LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED,
                         parent,
                         false
                 );
                 viewHolder = new ViewHolder();
-                viewHolder.checkIcon = convertView.findViewById(CHECK_ICON_ID);
-                viewHolder.placeholder = convertView.findViewById(CHECK_ICON_PLACEHOLDER_ID);
-                viewHolder.textView = convertView.findViewById(ITEM_TEXT_ID);
+                viewHolder.checkIcon = convertView.findViewById(ID_REVANCED_CHECK_ICON);
+                viewHolder.placeholder = convertView.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER);
+                viewHolder.textView = convertView.findViewById(ID_REVANCED_ITEM_TEXT);
                 convertView.setTag(viewHolder);
             } else {
                 viewHolder = (ViewHolder) convertView.getTag();
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt
index 5d282b715..2a8ac5db4 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.music.misc.settings
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.packagename.setOrGetFallbackPackageName
@@ -10,20 +9,19 @@ import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.settings.preference.BasePreference
 import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
+import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.IntentPreference
 import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.shared.misc.settings.preference.TextPreference
 import app.revanced.patches.shared.misc.settings.settingsPatch
-import app.revanced.util.ResourceGroup
-import app.revanced.util.copyResources
+import app.revanced.patches.youtube.misc.settings.modifyActivityForSettingsInjection
 import app.revanced.util.copyXmlNode
 import app.revanced.util.inputStreamFromBundledResource
-import com.android.tools.smali.dexlib2.util.MethodUtil
 
-private const val BASE_ACTIVITY_HOOK_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/shared/settings/BaseActivityHook;"
 private const val GOOGLE_API_ACTIVITY_HOOK_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/music/settings/GoogleApiActivityHook;"
+    "Lapp/revanced/extension/music/settings/MusicActivityHook;"
 
 private val preferences = mutableSetOf<BasePreference>()
 
@@ -31,26 +29,19 @@ private val settingsResourcePatch = resourcePatch {
     dependsOn(
         resourceMappingPatch,
         settingsPatch(
-            IntentPreference(
-                titleKey = "revanced_settings_title",
-                summaryKey = null,
-                intent = newIntent("revanced_settings_intent"),
-            ) to "settings_headers",
+            listOf(
+                IntentPreference(
+                    titleKey = "revanced_settings_title",
+                    summaryKey = null,
+                    intent = newIntent("revanced_settings_intent"),
+                ) to "settings_headers",
+            ),
             preferences
         )
     )
 
     execute {
 
-        // TODO: Remove this when search will be abstract.
-        copyResources(
-            "settings",
-            ResourceGroup(
-                "layout",
-                "revanced_music_settings_with_toolbar.xml"
-            )
-        )
-
         val targetResource = "values/styles.xml"
         inputStreamFromBundledResource(
             "settings/music",
@@ -98,24 +89,25 @@ val settingsPatch = bytecodePatch(
             selectable = true,
         )
 
-        // Modify GoogleApiActivity and remove all existing layout code.
-        // Must modify an existing activity and cannot add a new activity to the manifest,
-        // as that fails for root installations.
-
-        googleApiActivityFingerprint.method.addInstructions(
-            1,
-            """
-                invoke-static { }, $GOOGLE_API_ACTIVITY_HOOK_CLASS_DESCRIPTOR->createInstance()Lapp/revanced/extension/music/settings/GoogleApiActivityHook;
-                move-result-object v0
-                invoke-static { v0, p0 }, $BASE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->initialize(Lapp/revanced/extension/shared/settings/BaseActivityHook;Landroid/app/Activity;)V
-                return-void
-            """
+        PreferenceScreen.GENERAL.addPreferences(
+            SwitchPreference("revanced_settings_search_history")
         )
 
-        // Remove other methods as they will break as the onCreate method is modified above.
-        googleApiActivityFingerprint.classDef.apply {
-            methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
-        }
+        PreferenceScreen.MISC.addPreferences(
+            TextPreference(
+                key = null,
+                titleKey = "revanced_pref_import_export_title",
+                summaryKey = "revanced_pref_import_export_summary",
+                inputType = InputType.TEXT_MULTI_LINE,
+                tag = "app.revanced.extension.shared.settings.preference.ImportExportPreference",
+            )
+        )
+
+        modifyActivityForSettingsInjection(
+            googleApiActivityFingerprint.classDef,
+            googleApiActivityFingerprint.method,
+            GOOGLE_API_ACTIVITY_HOOK_CLASS_DESCRIPTOR
+        )
     }
 
     finalize {
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt
index 828b20c12..4bf870175 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt
@@ -65,14 +65,15 @@ fun settingsPatch (
         copyResources(
             "settings",
             ResourceGroup("xml", "revanced_prefs.xml", "revanced_prefs_icons.xml"),
+            ResourceGroup("menu", "revanced_search_menu.xml"),
             ResourceGroup("drawable",
                 // CustomListPreference resources.
                 "revanced_ic_dialog_alert.xml",
                 "revanced_settings_arrow_time.xml",
-                "revanced_settings_circle_background.xml",
                 "revanced_settings_cursor.xml",
                 "revanced_settings_custom_checkmark.xml",
                 "revanced_settings_search_icon.xml",
+                "revanced_settings_search_remove.xml",
                 "revanced_settings_toolbar_arrow_left.xml",
             ),
             ResourceGroup("layout",
@@ -80,6 +81,16 @@ fun settingsPatch (
                 // Color picker.
                 "revanced_color_dot_widget.xml",
                 "revanced_color_picker.xml",
+                // Search.
+                "revanced_preference_search_history_item.xml",
+                "revanced_preference_search_history_screen.xml",
+                "revanced_preference_search_no_result.xml",
+                "revanced_preference_search_result_color.xml",
+                "revanced_preference_search_result_group_header.xml",
+                "revanced_preference_search_result_list.xml",
+                "revanced_preference_search_result_regular.xml",
+                "revanced_preference_search_result_switch.xml",
+                "revanced_settings_with_toolbar.xml"
             )
         )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt
index 5e19646e5..3b4840a83 100644
--- a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt
@@ -12,7 +12,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/tiktok/settings/AdPersonalizationActivityHook;"
+    "Lapp/revanced/extension/tiktok/settings/TikTokActivityHook;"
 
 val settingsPatch = bytecodePatch(
     name = "Settings",
diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt
index f75912e1c..66d790718 100644
--- a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt
@@ -29,7 +29,7 @@ private const val MENU_DISMISS_EVENT_CLASS_DESCRIPTOR =
     "Ltv/twitch/android/feature/settings/menu/SettingsMenuViewDelegate\$Event\$OnDismissClicked;"
 
 private const val EXTENSION_PACKAGE = "app/revanced/extension/twitch"
-private const val ACTIVITY_HOOKS_CLASS_DESCRIPTOR = "L$EXTENSION_PACKAGE/settings/AppCompatActivityHook;"
+private const val ACTIVITY_HOOKS_CLASS_DESCRIPTOR = "L$EXTENSION_PACKAGE/settings/TwitchActivityHook;"
 private const val UTILS_CLASS_DESCRIPTOR = "L$EXTENSION_PACKAGE/Utils;"
 
 private val preferences = mutableSetOf<BasePreference>()
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
index 83a553aef..023859786 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
@@ -46,10 +46,10 @@ private val swipeControlsResourcePatch = resourcePatch {
             ListPreference("revanced_swipe_overlay_style"),
             TextPreference("revanced_swipe_overlay_background_opacity", inputType = InputType.NUMBER),
             TextPreference("revanced_swipe_overlay_progress_brightness_color",
-                tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                tag = "app.revanced.extension.shared.settings.preference.ColorPickerWithOpacitySliderPreference",
                 inputType = InputType.TEXT_CAP_CHARACTERS),
             TextPreference("revanced_swipe_overlay_progress_volume_color",
-                tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                tag = "app.revanced.extension.shared.settings.preference.ColorPickerWithOpacitySliderPreference",
                 inputType = InputType.TEXT_CAP_CHARACTERS),
             TextPreference("revanced_swipe_text_overlay_size", inputType = InputType.NUMBER),
             TextPreference("revanced_swipe_overlay_timeout", inputType = InputType.NUMBER),
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
index affb18b81..1dcd9d050 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -189,7 +189,10 @@ val hideLayoutComponentsPatch = bytecodePatch(
                     SwitchPreference("revanced_hide_keyword_content_subscriptions"),
                     SwitchPreference("revanced_hide_keyword_content_search"),
                     TextPreference("revanced_hide_keyword_content_phrases", inputType = InputType.TEXT_MULTI_LINE),
-                    NonInteractivePreference("revanced_hide_keyword_content_about"),
+                    NonInteractivePreference(
+                        key = "revanced_hide_keyword_content_about",
+                        tag = "app.revanced.extension.shared.settings.preference.BulletPointPreference"
+                    ),
                     NonInteractivePreference(
                         key = "revanced_hide_keyword_content_about_whole_words",
                         tag = "app.revanced.extension.youtube.settings.preference.HtmlPreference",
@@ -223,7 +226,10 @@ val hideLayoutComponentsPatch = bytecodePatch(
             SwitchPreference("revanced_hide_chips_shelf"),
             SwitchPreference("revanced_hide_expandable_card"),
             SwitchPreference("revanced_hide_floating_microphone_button"),
-            SwitchPreference("revanced_hide_horizontal_shelves"),
+            SwitchPreference(
+                key = "revanced_hide_horizontal_shelves",
+                tag = "app.revanced.extension.shared.settings.preference.BulletPointSwitchPreference"
+            ),
             SwitchPreference("revanced_hide_image_shelf"),
             SwitchPreference("revanced_hide_latest_posts"),
             SwitchPreference("revanced_hide_mix_playlists"),
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
index a90bb9163..04135c995 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
@@ -4,6 +4,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.packagename.setOrGetFallbackPackageName
 import app.revanced.patches.all.misc.resources.addResources
@@ -31,8 +33,8 @@ import com.android.tools.smali.dexlib2.util.MethodUtil
 
 private const val BASE_ACTIVITY_HOOK_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/shared/settings/BaseActivityHook;"
-private const val LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/settings/LicenseActivityHook;"
+private const val YOUTUBE_ACTIVITY_HOOK_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/settings/YouTubeActivityHook;"
 
 internal var appearanceStringId = -1L
     private set
@@ -73,7 +75,8 @@ private val settingsResourcePatch = resourcePatch {
         // Use same colors as stock YouTube.
         overrideThemeColors("@color/yt_white1", "@color/yt_black3")
 
-        arrayOf(
+        copyResources(
+            "settings",
             ResourceGroup("drawable",
                 "revanced_settings_icon.xml",
                 "revanced_settings_screen_00_about.xml",
@@ -89,23 +92,15 @@ private val settingsResourcePatch = resourcePatch {
                 "revanced_settings_screen_10_sponsorblock.xml",
                 "revanced_settings_screen_11_misc.xml",
                 "revanced_settings_screen_12_video.xml",
-            ),
-            ResourceGroup("layout",
-                "revanced_preference_with_icon_no_search_result.xml",
-                "revanced_search_suggestion_item.xml",
-                "revanced_settings_with_toolbar.xml"
-            ),
-            ResourceGroup("menu", "revanced_search_menu.xml")
-        ).forEach { resourceGroup ->
-            copyResources("settings", resourceGroup)
-        }
+            )
+        )
 
         // Copy style properties used to fix over-sized copy menu that appear in EditTextPreference.
         // For a full explanation of how this fixes the issue, see the comments in this style file
         // and the comments in the extension code.
         val targetResource = "values/styles.xml"
         inputStreamFromBundledResource(
-            "settings/host",
+            "settings/youtube",
             targetResource,
         )!!.let { inputStream ->
             "resources".copyXmlNode(
@@ -215,92 +210,6 @@ val settingsPatch = bytecodePatch(
             )
         )
 
-
-        // Modify the license activity and remove all existing layout code.
-        // Must modify an existing activity and cannot add a new activity to the manifest,
-        // as that fails for root installations.
-
-        licenseActivityOnCreateFingerprint.method.addInstructions(
-            1,
-            """
-                invoke-static {}, $LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->createInstance()Lapp/revanced/extension/youtube/settings/LicenseActivityHook;
-                move-result-object v0
-                invoke-static { v0, p0 }, $BASE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->initialize(Lapp/revanced/extension/shared/settings/BaseActivityHook;Landroid/app/Activity;)V
-                return-void
-            """
-        )
-
-        // Remove other methods as they will break as the onCreate method is modified above.
-        licenseActivityOnCreateFingerprint.classDef.apply {
-            methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
-        }
-
-        licenseActivityOnCreateFingerprint.classDef.apply {
-            // Add attachBaseContext method to override the context for setting a specific language.
-            ImmutableMethod(
-                type,
-                "attachBaseContext",
-                listOf(ImmutableMethodParameter("Landroid/content/Context;", null, null)),
-                "V",
-                AccessFlags.PROTECTED.value,
-                null,
-                null,
-                MutableMethodImplementation(3),
-            ).toMutable().apply {
-                addInstructions(
-                    """
-                        invoke-static { p1 }, $LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->getAttachBaseContext(Landroid/content/Context;)Landroid/content/Context;
-                        move-result-object p1
-                        invoke-super { p0, p1 }, $superclass->attachBaseContext(Landroid/content/Context;)V
-                        return-void
-                    """
-                )
-            }.let(methods::add)
-
-            // Add onBackPressed method to handle back button presses, delegating to SearchViewController.
-            ImmutableMethod(
-                type,
-                "onBackPressed",
-                emptyList(),
-                "V",
-                AccessFlags.PUBLIC.value,
-                null,
-                null,
-                MutableMethodImplementation(3),
-            ).toMutable().apply {
-                addInstructions(
-                    """
-                        invoke-static {}, Lapp/revanced/extension/youtube/settings/SearchViewController;->handleBackPress()Z
-                        move-result v0
-                        if-nez v0, :search_handled
-                        invoke-virtual { p0 }, Landroid/app/Activity;->finish()V
-                        :search_handled
-                        return-void
-                    """
-                )
-            }.let(methods::add)
-
-            // Add onConfigurationChanged method to handle configuration changes (e.g., screen orientation).
-            ImmutableMethod(
-                type,
-                "onConfigurationChanged",
-                listOf(ImmutableMethodParameter("Landroid/content/res/Configuration;", null, null)),
-                "V",
-                AccessFlags.PUBLIC.value,
-                null,
-                null,
-                MutableMethodImplementation(3)
-            ).toMutable().apply {
-                addInstructions(
-                    """
-                        invoke-super { p0, p1 }, Landroid/app/Activity;->onConfigurationChanged(Landroid/content/res/Configuration;)V
-                        invoke-static { p0, p1 }, $LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->handleConfigurationChanged(Landroid/app/Activity;Landroid/content/res/Configuration;)V
-                        return-void
-                    """
-                )
-            }.let(methods::add)
-        }
-
         // Update shared dark mode status based on YT theme.
         // This is needed because YT allows forcing light/dark mode
         // which then differs from the system dark mode status.
@@ -309,7 +218,7 @@ val settingsPatch = bytecodePatch(
                 val register = getInstruction<OneRegisterInstruction>(index).registerA
                 addInstructionsAtControlFlowLabel(
                     index,
-                    "invoke-static { v$register }, ${LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR}->updateLightDarkModeStatus(Ljava/lang/Enum;)V",
+                    "invoke-static { v$register }, ${YOUTUBE_ACTIVITY_HOOK_CLASS_DESCRIPTOR}->updateLightDarkModeStatus(Ljava/lang/Enum;)V",
                 )
             }
         }
@@ -317,7 +226,13 @@ val settingsPatch = bytecodePatch(
         // Add setting to force Cairo settings fragment on/off.
         cairoFragmentConfigFingerprint.method.insertLiteralOverride(
             CAIRO_CONFIG_LITERAL_VALUE,
-            "$LICENSE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->useCairoSettingsFragment(Z)Z"
+            "$YOUTUBE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->useCairoSettingsFragment(Z)Z"
+        )
+
+        modifyActivityForSettingsInjection(
+            licenseActivityOnCreateFingerprint.classDef,
+            licenseActivityOnCreateFingerprint.method,
+            YOUTUBE_ACTIVITY_HOOK_CLASS_DESCRIPTOR
         )
     }
 
@@ -326,6 +241,76 @@ val settingsPatch = bytecodePatch(
     }
 }
 
+/**
+ * Modifies the activity to show ReVanced settings instead of it's original purpose.
+ */
+internal fun modifyActivityForSettingsInjection(
+    activityOnCreateClass: MutableClass,
+    activityOnCreateMethod: MutableMethod,
+    extensionClassType: String
+) {
+    // Modify Activity and remove all existing layout code.
+    // Must modify an existing activity and cannot add a new activity to the manifest,
+    // as that fails for root installations.
+    activityOnCreateMethod.addInstructions(
+        1,
+        """
+            invoke-static { p0 }, $extensionClassType->initialize(Landroid/app/Activity;)V
+            return-void
+        """
+    )
+
+    // Remove other methods as they will break as the onCreate method is modified above.
+    activityOnCreateClass.apply {
+        methods.removeIf { it != activityOnCreateMethod && !MethodUtil.isConstructor(it) }
+    }
+
+    // Override base context to allow using ReVanced specific settings.
+    ImmutableMethod(
+        activityOnCreateClass.type,
+        "attachBaseContext",
+        listOf(ImmutableMethodParameter("Landroid/content/Context;", null, null)),
+        "V",
+        AccessFlags.PROTECTED.value,
+        null,
+        null,
+        MutableMethodImplementation(3),
+    ).toMutable().apply {
+        addInstructions(
+            """
+                invoke-static { p1 }, $BASE_ACTIVITY_HOOK_CLASS_DESCRIPTOR->getAttachBaseContext(Landroid/content/Context;)Landroid/content/Context;
+                move-result-object p1
+                invoke-super { p0, p1 }, ${activityOnCreateClass.superclass}->attachBaseContext(Landroid/content/Context;)V
+                return-void
+            """
+        )
+    }.let(activityOnCreateClass.methods::add)
+
+    // Override finish() to intercept back gesture.
+    ImmutableMethod(
+        activityOnCreateClass.type,
+        "finish",
+        emptyList(),
+        "V",
+        AccessFlags.PUBLIC.value,
+        null,
+        null,
+        MutableMethodImplementation(3),
+    ).toMutable().apply {
+        addInstructions(
+            """
+                invoke-static {}, $extensionClassType->handleFinish()Z
+                move-result v0
+                if-nez v0, :search_handled
+                invoke-super { p0 }, Landroid/app/Activity;->finish()V
+                return-void
+                :search_handled
+                return-void
+            """
+        )
+    }.let(activityOnCreateClass.methods::add)
+}
+
 /**
  * Creates an intent to open ReVanced settings.
  */
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
index 3da73226b..b042b11a0 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -17,7 +17,7 @@ internal val settingsMenuVideoSpeedGroup = mutableSetOf<BasePreference>()
 @Suppress("unused")
 val playbackSpeedPatch = bytecodePatch(
     name = "Playback speed",
-    description = "Adds options to customize available playback speeds, set default a playback speed, " +
+    description = "Adds options to customize available playback speeds, set a default playback speed, " +
         "and show a speed dialog button in the video player.",
 ) {
     dependsOn(
diff --git a/patches/src/main/resources/addresources/values/arrays.xml b/patches/src/main/resources/addresources/values/arrays.xml
index 05513dfb4..9d03af20a 100644
--- a/patches/src/main/resources/addresources/values/arrays.xml
+++ b/patches/src/main/resources/addresources/values/arrays.xml
@@ -382,7 +382,7 @@
             </string-array>
         </patch>
         <patch id="layout.sponsorblock.sponsorBlockResourcePatch">
-            <string-array name="revanced_sb_duration_entries">
+            <string-array name="revanced_sb_auto_hide_skip_button_duration_entries">
                 <item>@string/revanced_sb_duration_1s</item>
                 <item>@string/revanced_sb_duration_2s</item>
                 <item>@string/revanced_sb_duration_3s</item>
@@ -394,7 +394,7 @@
                 <item>@string/revanced_sb_duration_9s</item>
                 <item>@string/revanced_sb_duration_10s</item>
             </string-array>
-            <string-array name="revanced_sb_duration_entry_values">
+            <string-array name="revanced_sb_auto_hide_skip_button_duration_entry_values">
                 <item>ONE_SECOND</item>
                 <item>TWO_SECONDS</item>
                 <item>THREE_SECONDS</item>
@@ -406,6 +406,32 @@
                 <item>NINE_SECONDS</item>
                 <item>TEN_SECONDS</item>
             </string-array>
+            <!-- No easy way to make an alias to another array declaration, so copy it again here. -->
+            <string-array name="revanced_sb_toast_on_skip_duration_entries">
+                <item>@string/revanced_sb_duration_1s</item>
+                <item>@string/revanced_sb_duration_2s</item>
+                <item>@string/revanced_sb_duration_3s</item>
+                <item>@string/revanced_sb_duration_4s</item>
+                <item>@string/revanced_sb_duration_5s</item>
+                <item>@string/revanced_sb_duration_6s</item>
+                <item>@string/revanced_sb_duration_7s</item>
+                <item>@string/revanced_sb_duration_8s</item>
+                <item>@string/revanced_sb_duration_9s</item>
+                <item>@string/revanced_sb_duration_10s</item>
+            </string-array>
+            <string-array name="revanced_sb_toast_on_skip_duration_entry_values">
+                <item>ONE_SECOND</item>
+                <item>TWO_SECONDS</item>
+                <item>THREE_SECONDS</item>
+                <item>FOUR_SECONDS</item>
+                <item>FIVE_SECONDS</item>
+                <item>SIX_SECONDS</item>
+                <item>SEVEN_SECONDS</item>
+                <item>EIGHT_SECONDS</item>
+                <item>NINE_SECONDS</item>
+                <item>TEN_SECONDS</item>
+            </string-array>
+
         </patch>
         <patch id="layout.shortsplayer.shortsPlayerTypePatch">
             <string-array name="revanced_shorts_player_type_legacy_entries">
diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index 32679a243..df49d0155 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -48,14 +48,28 @@ Second \"item\" text"</string>
             <string name="revanced_settings_search_hint">Search settings</string>
             <string name="revanced_settings_search_no_results_title">No results found for \'%s\'</string>
             <string name="revanced_settings_search_no_results_summary">Try another keyword</string>
+            <string name="revanced_settings_search_recent_searches">Recent searches</string>
             <string name="revanced_settings_search_remove_message">Remove from search history?</string>
+            <string name="revanced_settings_search_clear_history">Clear search history</string>
+            <string name="revanced_settings_search_clear_history_message">Are you sure you want to clear all search history?</string>
+            <string name="revanced_settings_search_tips_title">Search Tips</string>
+            <string name="revanced_settings_search_tips_summary">"• Tap a path to navigate to it
+• Long-press a setting to navigate to it
+• Press Enter to save a search query to history
+• Search ignores casing and punctuation
+• Parent settings appear above disabled child settings"</string>
+            <string name="revanced_settings_search_empty_history_title">Search history is empty</string>
+            <string name="revanced_settings_search_empty_history_summary">To save search history, type a search query and press Enter</string>
+            <string name="revanced_settings_search_history_title">Show settings search history</string>
+            <string name="revanced_settings_search_history_summary_on">Settings search history is shown</string>
+            <string name="revanced_settings_search_history_summary_off">Settings search history is not shown</string>
             <string name="revanced_show_menu_icons_title">Show ReVanced setting icons</string>
             <string name="revanced_show_menu_icons_summary_on">Setting icons are shown</string>
             <string name="revanced_show_menu_icons_summary_off">Setting icons are not shown</string>
             <string name="revanced_language_title">ReVanced language</string>
             <string name="revanced_language_user_dialog_message">"Translations for some languages may be missing or incomplete.
 
-To translate new languages visit translate.revanced.app"</string>
+To translate new languages or improve the existing translations, visit translate.revanced.app"</string>
             <string name="revanced_language_DEFAULT">App language</string>
             <string name="revanced_language_AM" translatable="false">አማርኛ</string>
             <string name="revanced_language_AR" translatable="false">العربية</string>
@@ -200,9 +214,6 @@ You will not be notified of any unexpected events."</string>
             <string name="revanced_restore_old_settings_menus_title">Restore old settings menus</string>
             <string name="revanced_restore_old_settings_menus_summary_on">Old settings menus are shown</string>
             <string name="revanced_restore_old_settings_menus_summary_off">Old settings menus are not shown</string>
-            <string name="revanced_settings_search_history_title">Show settings search history</string>
-            <string name="revanced_settings_search_history_summary_on">Settings search history is shown</string>
-            <string name="revanced_settings_search_history_summary_off">Settings search history is not shown</string>
         </patch>
         <patch id="misc.backgroundplayback.backgroundPlaybackPatch">
             <string name="revanced_shorts_disable_background_playback_title">Disable Shorts background play</string>
@@ -246,6 +257,7 @@ However, enabling this will also log some user data such as your IP address."</s
             <string name="revanced_hide_floating_microphone_button_summary_off">Floating microphone button in search is shown</string>
             <string name="revanced_hide_horizontal_shelves_title">Hide horizontal shelves</string>
             <string name="revanced_hide_horizontal_shelves_summary_on">"Horizontal shelves are hidden, such as:
+
 • Breaking news
 • Continue watching
 • Explore more channels
@@ -1128,9 +1140,9 @@ This feature works best with a video quality of 720p or lower and when using a v
             <string name="revanced_sb_guidelines_popup_already_read">Already read</string>
             <string name="revanced_sb_guidelines_popup_open">Show me</string>
             <string name="revanced_sb_general">General</string>
-            <string name="revanced_sb_toast_on_connection_error_title">Show a toast if API is not available</string>
-            <string name="revanced_sb_toast_on_connection_error_summary_on">Toast is shown if SponsorBlock is not available</string>
-            <string name="revanced_sb_toast_on_connection_error_summary_off">Toast is not shown if SponsorBlock is not available</string>
+            <string name="revanced_sb_toast_on_connection_error">Show a toast if API is not available</string>
+            <string name="revanced_sb_toast_on_connection_error_sum_on">Toast is shown if SponsorBlock is not available</string>
+            <string name="revanced_sb_toast_on_connection_error_sum_off">Toast is not shown if SponsorBlock is not available</string>
             <string name="revanced_sb_general_skipcount">Enable skip count tracking</string>
             <string name="revanced_sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
             <string name="revanced_sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_circle_background.xml b/patches/src/main/resources/settings/drawable/revanced_settings_circle_background.xml
deleted file mode 100644
index d0c8a7ae4..000000000
--- a/patches/src/main/resources/settings/drawable/revanced_settings_circle_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
-    <solid android:color="#FF0000" />
-    <size
-            android:width="20dp"
-            android:height="20dp" />
-</shape>
diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark.xml b/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark.xml
index 73a68f102..0623e325f 100644
--- a/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark.xml
+++ b/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24">
     <path
             android:fillColor="?android:attr/textColorPrimary"
-            android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+            android:pathData="M9.29446,19 L3.4,12.708 L4.24339,11.8029 L9.29446,17.1896 L20.1565,5.6 L21,6.50026 Z M9.29446,19" />
 </vector>
diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_search_remove.xml b/patches/src/main/resources/settings/drawable/revanced_settings_search_remove.xml
new file mode 100644
index 000000000..721d37885
--- /dev/null
+++ b/patches/src/main/resources/settings/drawable/revanced_settings_search_remove.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="?android:attr/textColorPrimary"
+            android:pathData="M7.61719,20 C7.16797,20,6.78516,19.8438,6.47266,19.5273 C6.15625,19.2148,6,18.832,6,18.3828 L6,6 L5,6 L5,5 L9,5 L9,4.23047 L15,4.23047 L15,5 L19,5 L19,6 L18,6 L18,18.3828 C18,18.8438,17.8477,19.2305,17.5391,19.5391 C17.2305,19.8477,16.8438,20,16.3828,20 Z M17,6 L7,6 L7,18.3828 C7,18.5625,7.05859,18.7109,7.17188,18.8281 C7.28906,18.9414,7.4375,19,7.61719,19 L16.3828,19 C16.5391,19,16.6797,18.9375,16.8086,18.8086 C16.9375,18.6797,17,18.5391,17,18.3828 Z M9.80859,17 L10.8086,17 L10.8086,8 L9.80859,8 Z M13.1914,17 L14.1914,17 L14.1914,8 L13.1914,8 Z M7,6 L7,19 Z M7,6" />
+</vector>
diff --git a/patches/src/main/resources/settings/layout/revanced_color_dot_widget.xml b/patches/src/main/resources/settings/layout/revanced_color_dot_widget.xml
index bf02245a1..b2cf7f270 100644
--- a/patches/src/main/resources/settings/layout/revanced_color_dot_widget.xml
+++ b/patches/src/main/resources/settings/layout/revanced_color_dot_widget.xml
@@ -8,13 +8,9 @@
         android:clipToPadding="false">
 
     <View
-            android:id="@+id/revanced_color_dot_widget"
+            android:id="@+id/preference_color_dot"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:background="@drawable/revanced_settings_circle_background"
-            android:elevation="2dp"
-            android:translationZ="2dp"
-            android:outlineProvider="background" />
+            android:layout_gravity="center" />
 
 </FrameLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_custom_list_item_checked.xml b/patches/src/main/resources/settings/layout/revanced_custom_list_item_checked.xml
index f0500f61a..2f2b83c14 100644
--- a/patches/src/main/resources/settings/layout/revanced_custom_list_item_checked.xml
+++ b/patches/src/main/resources/settings/layout/revanced_custom_list_item_checked.xml
@@ -14,7 +14,7 @@
             android:id="@+id/revanced_check_icon"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="24dp"
             android:src="@drawable/revanced_settings_custom_checkmark"
             android:visibility="gone"
             android:contentDescription="@null" />
@@ -23,7 +23,7 @@
             android:id="@+id/revanced_check_icon_placeholder"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="24dp"
             android:visibility="invisible" />
 
     <TextView
diff --git a/patches/src/main/resources/settings/layout/revanced_music_settings_with_toolbar.xml b/patches/src/main/resources/settings/layout/revanced_music_settings_with_toolbar.xml
deleted file mode 100644
index 09ce00ad4..000000000
--- a/patches/src/main/resources/settings/layout/revanced_music_settings_with_toolbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            android:orientation="vertical"
-            android:transitionGroup="true">
-
-        <!-- Parent container for Toolbar -->
-        <FrameLayout
-                android:id="@+id/revanced_toolbar_parent"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/action_bar_height"
-                android:background="@color/ytm_color_black"
-                android:elevation="0dp">
-
-            <!-- Toolbar -->
-            <android.support.v7.widget.Toolbar
-                    android:id="@+id/revanced_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/action_bar_height"
-                    android:background="@color/ytm_color_black"
-                    app:titleTextColor="?attr/colorOnSurface"
-                    app:navigationIcon="@drawable/revanced_settings_toolbar_arrow_left"
-                    app:title="@string/revanced_settings_title" />
-        </FrameLayout>
-
-        <!-- Preference content container -->
-        <FrameLayout
-                android:id="@+id/revanced_settings_fragments"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@color/ytm_color_black" />
-
-    </LinearLayout>
-</merge>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_history_item.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_history_item.xml
new file mode 100644
index 000000000..4dabb6de4
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_history_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true">
+
+    <!-- History icon -->
+    <ImageView
+            android:id="@+id/history_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="16dp"
+            android:src="@drawable/revanced_settings_arrow_time"
+            android:tint="?android:attr/textColorSecondary" />
+
+    <!-- Search history text -->
+    <TextView
+            android:id="@+id/history_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textSize="16sp"
+            android:textColor="?android:attr/textColorPrimary"
+            android:singleLine="true"
+            android:ellipsize="end" />
+
+    <!-- Delete icon -->
+    <ImageView
+            android:id="@+id/delete_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginStart="16dp"
+            android:src="@drawable/revanced_settings_search_remove"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:padding="4dp"
+            android:scaleType="centerInside"
+            android:tint="?android:attr/textColorSecondary"
+            android:clickable="true"
+            android:focusable="true" />
+
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_history_screen.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_history_screen.xml
new file mode 100644
index 000000000..daf925cfc
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_history_screen.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <!-- Scrollable content -->
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <!-- Empty history message (hidden by default) -->
+            <TextView
+                    android:id="@+id/empty_history_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/revanced_settings_search_empty_history_title"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:visibility="gone"
+                    android:gravity="center" />
+
+            <TextView
+                    android:id="@+id/empty_history_summary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/revanced_settings_search_empty_history_summary"
+                    android:textSize="14sp"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:paddingBottom="16dp"
+                    android:visibility="gone"
+                    android:gravity="center" />
+
+            <!-- History header -->
+            <TextView
+                    android:id="@+id/search_history_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/revanced_settings_search_recent_searches"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:clickable="false"
+                    android:focusable="false" />
+
+            <!-- History list -->
+            <LinearLayout
+                    android:id="@+id/search_history_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" />
+
+            <!-- Clear history button -->
+            <TextView
+                    android:id="@+id/clear_history_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/revanced_settings_search_clear_history"
+                    android:textSize="16sp"
+                    android:textColor="?android:attr/colorAccent"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:gravity="center"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true" />
+
+            <!-- Search Tips -->
+            <LinearLayout
+                    android:id="@+id/search_tips_card"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:clickable="false"
+                    android:focusable="false">
+
+                <!-- Content -->
+                <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                    <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/revanced_settings_search_tips_title"
+                            android:textSize="18sp"
+                            android:textStyle="bold"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:gravity="center" />
+
+                    <TextView
+                            android:id="@+id/revanced_settings_search_tips_summary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:textSize="14sp"
+                            android:textColor="?android:attr/textColorSecondary" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_no_result.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_no_result.xml
new file mode 100644
index 000000000..4e1b0cb81
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_no_result.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@android:color/transparent"
+        android:paddingRight="16dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:minHeight="48dp"
+        android:clickable="false"
+        android:focusable="false">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginHorizontal="18dp"
+                android:contentDescription="@null" />
+
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/preference_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp"
+                    android:ellipsize="end"
+                    android:maxLines="2" />
+
+            <TextView
+                    android:id="@+id/preference_summary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    android:ellipsize="end"
+                    android:maxLines="10"
+                    android:visibility="gone" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_result_color.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_result_color.xml
new file mode 100644
index 000000000..51d363049
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_result_color.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="16dp"
+        android:minHeight="48dp"
+        android:gravity="center_vertical">
+
+    <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/preference_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="16sp"
+                android:ellipsize="end"
+                android:maxLines="2" />
+
+        <TextView
+                android:id="@+id/preference_summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="14sp"
+                android:ellipsize="end"
+                android:maxLines="10"
+                android:visibility="gone" />
+    </LinearLayout>
+
+    <!-- Include color dot layout -->
+    <include
+            layout="@layout/revanced_color_dot_widget"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="16dp" />
+
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_result_group_header.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_result_group_header.xml
new file mode 100644
index 000000000..3790e436f
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_result_group_header.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/preference_path"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="14sp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textStyle="italic"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true" />
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_result_list.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_result_list.xml
new file mode 100644
index 000000000..3d4ab6163
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_result_list.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="16dp"
+        android:minHeight="48dp">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/preference_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="16sp"
+                android:ellipsize="end"
+                android:maxLines="2" />
+
+        <TextView
+                android:id="@+id/preference_summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="14sp"
+                android:ellipsize="end"
+                android:maxLines="10"
+                android:visibility="gone" />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_search_result_regular.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_result_regular.xml
new file mode 100644
index 000000000..3d4ab6163
--- /dev/null
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_result_regular.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="16dp"
+        android:minHeight="48dp">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/preference_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="16sp"
+                android:ellipsize="end"
+                android:maxLines="2" />
+
+        <TextView
+                android:id="@+id/preference_summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="14sp"
+                android:ellipsize="end"
+                android:maxLines="10"
+                android:visibility="gone" />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_preference_with_icon_no_search_result.xml b/patches/src/main/resources/settings/layout/revanced_preference_search_result_switch.xml
similarity index 56%
rename from patches/src/main/resources/settings/layout/revanced_preference_with_icon_no_search_result.xml
rename to patches/src/main/resources/settings/layout/revanced_preference_search_result_switch.xml
index b8a180f0e..9bab731e6 100644
--- a/patches/src/main/resources/settings/layout/revanced_preference_with_icon_no_search_result.xml
+++ b/patches/src/main/resources/settings/layout/revanced_preference_search_result_switch.xml
@@ -1,44 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="54dp">
-
-    <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginHorizontal="18dp"
-            android:contentDescription="@null" />
+        android:orientation="horizontal"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="16dp"
+        android:minHeight="48dp"
+        android:gravity="center_vertical">
 
     <LinearLayout
-            android:orientation="vertical"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:paddingVertical="8dp">
+            android:orientation="vertical">
 
         <TextView
-                android:id="@android:id/title"
+                android:id="@+id/preference_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textAlignment="viewStart" />
+                android:textSize="16sp"
+                android:ellipsize="end"
+                android:maxLines="2" />
 
         <TextView
-                android:id="@android:id/summary"
+                android:id="@+id/preference_summary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorSecondary"
-                android:textAlignment="viewStart"
-                android:maxLines="2"
-                android:ellipsize="end" />
-
+                android:textSize="14sp"
+                android:ellipsize="end"
+                android:maxLines="10"
+                android:visibility="gone" />
     </LinearLayout>
+
+    <Switch
+            android:id="@+id/preference_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:focusable="false"
+            android:clickable="false" />
+
 </LinearLayout>
diff --git a/patches/src/main/resources/settings/layout/revanced_search_suggestion_item.xml b/patches/src/main/resources/settings/layout/revanced_search_suggestion_item.xml
deleted file mode 100644
index 8699e56c8..000000000
--- a/patches/src/main/resources/settings/layout/revanced_search_suggestion_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp"
-        android:gravity="center_vertical">
-
-    <!-- History icon -->
-    <ImageView
-            android:id="@+id/history_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginEnd="16dp"
-            android:contentDescription="History icon"
-            android:src="@drawable/revanced_settings_arrow_time" />
-
-    <!-- Suggestion text -->
-    <TextView
-            android:id="@+id/suggestion_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textSize="16sp"
-            android:textColor="?android:attr/textColorPrimary" />
-
-</LinearLayout>
diff --git a/patches/src/main/resources/settings/music/values/styles.xml b/patches/src/main/resources/settings/music/values/styles.xml
index 4a692559a..663f9c373 100644
--- a/patches/src/main/resources/settings/music/values/styles.xml
+++ b/patches/src/main/resources/settings/music/values/styles.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Theme.ReVanced.YouTubeMusic.Settings" parent="@style/Theme.YouTubeMusic">
+        <item name="android:actionBarSize">@dimen/action_bar_height</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/item_extra_extra_large_spacing</item>
         <item name="android:listDivider">@null</item>
     </style>
+    <style name="revanced_searchbar_cursor">
+        <item name="android:textCursorDrawable">@drawable/revanced_settings_cursor</item>
+        <item name="android:textSize">16sp</item>
+    </style>
 </resources>
diff --git a/patches/src/main/resources/settings/host/values/styles.xml b/patches/src/main/resources/settings/youtube/values/styles.xml
similarity index 100%
rename from patches/src/main/resources/settings/host/values/styles.xml
rename to patches/src/main/resources/settings/youtube/values/styles.xml

From 58d088ab307440a6912a867246da799b7dd6499b Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 21 Sep 2025 17:20:13 +0400
Subject: [PATCH 15/16] fix(YouTube - Return YouTube Dislike): Do not show
 error toast if API returns 401 status (#5949)

---
 .../app/revanced/extension/shared/Utils.java  |  8 ++-
 .../ReturnYouTubeDislike.java                 |  6 ++
 .../requests/ReturnYouTubeDislikeApi.java     | 68 ++++++++++++-------
 3 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
index 0f976ea10..feeb379a7 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
@@ -588,7 +588,13 @@ public class Utils {
         showToast(messageToToast, Toast.LENGTH_LONG);
     }
 
-    private static void showToast(String messageToToast, int toastDuration) {
+    /**
+     * Safe to call from any thread.
+     *
+     * @param messageToToast Message to show.
+     * @param toastDuration Either {@link Toast#LENGTH_SHORT} or {@link Toast#LENGTH_LONG}.
+     */
+    public static void showToast(String messageToToast, int toastDuration) {
         Objects.requireNonNull(messageToToast);
         runOnMainThreadNowOrLater(() -> {
             Context currentContext = context;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
index ade422260..355d2a7ee 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
@@ -21,6 +21,7 @@ import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.text.style.ReplacementSpan;
+import android.widget.Toast;
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
@@ -507,6 +508,11 @@ public class ReturnYouTubeDislike {
         try {
             RYDVoteData votingData = getFetchData(MAX_MILLISECONDS_TO_BLOCK_UI_WAITING_FOR_FETCH);
             if (votingData == null) {
+                // Method automatically prevents showing multiple toasts if the connection failed.
+                // This call is needed here in case the api call did succeed but took too long.
+                ReturnYouTubeDislikeApi.handleConnectionError(
+                        str("revanced_ryd_failure_connection_timeout"),
+                        null, null, Toast.LENGTH_SHORT);
                 Logger.printDebug(() -> "Cannot add dislike to UI (RYD data not available)");
                 return original;
             }
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
index 1ebeea223..18d46282c 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
@@ -4,8 +4,8 @@ import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute;
 
 import android.util.Base64;
+import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.json.JSONException;
@@ -30,15 +30,15 @@ import app.revanced.extension.youtube.settings.Settings;
 
 public class ReturnYouTubeDislikeApi {
     /**
-     * {@link #fetchVotes(String)} TCP connection timeout
+     * {@link #fetchVotes(String)} TCP connection timeout.
      */
-    private static final int API_GET_VOTES_TCP_TIMEOUT_MILLISECONDS = 2 * 1000; // 2 Seconds.
+    private static final int API_GET_VOTES_TCP_TIMEOUT_MILLISECONDS = 3 * 1000; // 3 Seconds.
 
     /**
      * {@link #fetchVotes(String)} HTTP read timeout.
      * To locally debug and force timeouts, change this to a very small number (ie: 100)
      */
-    private static final int API_GET_VOTES_HTTP_TIMEOUT_MILLISECONDS = 4 * 1000; // 4 Seconds.
+    private static final int API_GET_VOTES_HTTP_TIMEOUT_MILLISECONDS = 7 * 1000; // 7 Seconds.
 
     /**
      * Default connection and response timeout for voting and registration.
@@ -53,6 +53,15 @@ public class ReturnYouTubeDislikeApi {
      */
     private static final int HTTP_STATUS_CODE_SUCCESS = 200;
 
+    /**
+     * RYD API sometimes returns 401 (authorization error), even though the user id is valid.
+     * There is no known fix for this (resetting to a different user id does not fix it),
+     * so instead just quietly ignore the error.
+     *
+     * See <a href="https://github.com/Anarios/return-youtube-dislike/issues/1153">RYD bug report</a>.
+     */
+    private static final int HTTP_STATUS_CODE_UNAUTHORIZED = 401;
+
     /**
      * Indicates a client rate limit has been reached and the client must back off.
      */
@@ -232,14 +241,20 @@ public class ReturnYouTubeDislikeApi {
         }
     }
 
-    private static void handleConnectionError(@NonNull String toastMessage,
-                                              @Nullable Exception ex,
-                                              boolean showLongToast) {
+    /**
+     * @param toastDuration Either {@link Toast#LENGTH_SHORT} or {@link Toast#LENGTH_LONG}.
+     */
+    public static void handleConnectionError(String toastMessage,
+                                             @Nullable Integer responseCode,
+                                             @Nullable Exception ex,
+                                             @Nullable Integer toastDuration) {
         if (!lastApiCallFailed && Settings.RYD_TOAST_ON_CONNECTION_ERROR.get()) {
-            if (showLongToast) {
-                Utils.showToastLong(toastMessage);
-            } else {
-                Utils.showToastShort(toastMessage);
+            if (responseCode != null && responseCode == HTTP_STATUS_CODE_UNAUTHORIZED) {
+                Logger.printInfo(() -> "Ignoring status code " + HTTP_STATUS_CODE_UNAUTHORIZED
+                        + " (API authorization erorr)");
+                return; // Do not set api failure field.
+            } else if (toastDuration != null) {
+                Utils.showToast(toastMessage, toastDuration);
             }
         }
         lastApiCallFailed = true;
@@ -297,13 +312,13 @@ public class ReturnYouTubeDislikeApi {
             } else {
                 // Unexpected response code.  Most likely RYD is temporarily broken.
                 handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
-                        null, true);
+                        responseCode, null, Toast.LENGTH_LONG);
             }
             connection.disconnect(); // Something went wrong, might as well disconnect.
         } catch (SocketTimeoutException ex) {
-            handleConnectionError((str("revanced_ryd_failure_connection_timeout")), ex, false);
+            handleConnectionError((str("revanced_ryd_failure_connection_timeout")), null, ex, Toast.LENGTH_SHORT);
         } catch (IOException ex) {
-            handleConnectionError((str("revanced_ryd_failure_generic", ex.getMessage())), ex, true);
+            handleConnectionError((str("revanced_ryd_failure_generic", ex.getMessage())), null, ex, Toast.LENGTH_LONG);
         } catch (Exception ex) {
             // should never happen
             Logger.printException(() -> "fetchVotes failure", ex);
@@ -344,13 +359,14 @@ public class ReturnYouTubeDislikeApi {
                 String solution = solvePuzzle(challenge, difficulty);
                 return confirmRegistration(userId, solution);
             }
+
             handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
-                    null, true);
+                    responseCode, null, Toast.LENGTH_LONG);
             connection.disconnect();
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), null, ex, Toast.LENGTH_SHORT);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "registration failed"), ex, true);
+            handleConnectionError(str("revanced_ryd_failure_generic", "registration failed"), null, ex, Toast.LENGTH_LONG);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to register user", ex); // should never happen
         }
@@ -393,12 +409,12 @@ public class ReturnYouTubeDislikeApi {
             Logger.printInfo(() -> "Failed to confirm registration for user: " + userId
                     + " solution: " + solution + " responseCode: " + responseCode + " response: '" + response + "''");
             handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
-                    null, true);
+                    responseCode, null, Toast.LENGTH_LONG);
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), null, ex, Toast.LENGTH_SHORT);
         } catch (IOException ex) {
             handleConnectionError(str("revanced_ryd_failure_generic", "confirm registration failed"),
-                    ex, true);
+                    null, ex, Toast.LENGTH_LONG);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to confirm registration for user: " + userId
                     + "solution: " + solution, ex);
@@ -469,12 +485,12 @@ public class ReturnYouTubeDislikeApi {
             Logger.printInfo(() -> "Failed to send vote for video: " + videoId + " vote: " + vote
                     + " response code was: " + responseCode);
             handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
-                    null, true);
+                    responseCode, null, Toast.LENGTH_LONG);
             connection.disconnect(); // something went wrong, might as well disconnect
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), null, ex, Toast.LENGTH_SHORT);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "send vote failed"), ex, true);
+            handleConnectionError(str("revanced_ryd_failure_generic", "send vote failed"), null, ex, Toast.LENGTH_LONG);
         } catch (Exception ex) {
             // should never happen
             Logger.printException(() -> "Failed to send vote for video: " + videoId + " vote: " + vote, ex);
@@ -518,12 +534,12 @@ public class ReturnYouTubeDislikeApi {
             Logger.printInfo(() -> "Failed to confirm vote for video: " + videoId
                     + " solution: " + solution + " responseCode: " + responseCode + " response: '" + response + "'");
             handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
-                    null, true);
+                    responseCode, null, Toast.LENGTH_LONG);
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), null, ex, Toast.LENGTH_SHORT);
         } catch (IOException ex) {
             handleConnectionError(str("revanced_ryd_failure_generic", "confirm vote failed"),
-                    ex, true);
+                    null, ex, Toast.LENGTH_LONG);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to confirm vote for video: " + videoId
                     + " solution: " + solution, ex); // should never happen

From c36ea22975c3552062e6c169f0f207ddbbb494e4 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Sun, 21 Sep 2025 13:25:05 +0000
Subject: [PATCH 16/16] chore: Release v5.40.1-dev.1 [skip ci]

## [5.40.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.40.0...v5.40.1-dev.1) (2025-09-21)

### Bug Fixes

* **YouTube - Return YouTube Dislike:** Do not show error toast if API returns 401 status ([#5949](https://github.com/ReVanced/revanced-patches/issues/5949)) ([58d088a](https://github.com/ReVanced/revanced-patches/commit/58d088ab307440a6912a867246da799b7dd6499b))
* **YouTube - Settings:** Use an overlay to show search results ([#5806](https://github.com/ReVanced/revanced-patches/issues/5806)) ([ece8076](https://github.com/ReVanced/revanced-patches/commit/ece8076f7cefd752b97515014bc50fe4fd80171e))
---
 CHANGELOG.md      | 8 ++++++++
 gradle.properties | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e8dcd5b1..902aa6cba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [5.40.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.40.0...v5.40.1-dev.1) (2025-09-21)
+
+
+### Bug Fixes
+
+* **YouTube - Return YouTube Dislike:** Do not show error toast if API returns 401 status ([#5949](https://github.com/ReVanced/revanced-patches/issues/5949)) ([58d088a](https://github.com/ReVanced/revanced-patches/commit/58d088ab307440a6912a867246da799b7dd6499b))
+* **YouTube - Settings:** Use an overlay to show search results ([#5806](https://github.com/ReVanced/revanced-patches/issues/5806)) ([ece8076](https://github.com/ReVanced/revanced-patches/commit/ece8076f7cefd752b97515014bc50fe4fd80171e))
+
 # [5.40.0](https://github.com/ReVanced/revanced-patches/compare/v5.39.0...v5.40.0) (2025-09-21)
 
 
diff --git a/gradle.properties b/gradle.properties
index 111867218..b8885395f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.40.0
+version = 5.40.1-dev.1