diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9a54c99a8..45a787f1b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -249,7 +249,6 @@ dependencies {
     implementation(libs.aboutlibraries.core)
 
     implementation(libs.insetter) // Dead Dependency
-    implementation(libs.bundles.rikkax)
 
     implementation(platform(libs.arrow.stack))
     implementation(libs.arrow.fx.coroutines)
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt
index e3e615c0c..1b759fa15 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt
@@ -213,7 +213,7 @@ fun EhScreen() {
                 }
             }
             SimpleMenuPreferenceInt(
-                title = stringResource(id = rikka.core.R.string.dark_theme),
+                title = stringResource(id = R.string.dark_theme),
                 entry = R.array.night_mode_entries,
                 entryValueRes = R.array.night_mode_values,
                 value = Settings::theme.observed,
diff --git a/app/src/main/kotlin/rikka/core/res/Resources.kt b/app/src/main/kotlin/rikka/core/res/Resources.kt
new file mode 100644
index 000000000..3558d35c1
--- /dev/null
+++ b/app/src/main/kotlin/rikka/core/res/Resources.kt
@@ -0,0 +1,21 @@
+package rikka.core.res
+
+import android.content.res.Resources
+import android.graphics.drawable.Drawable
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+
+@ColorInt
+fun Resources.Theme.resolveColor(@AttrRes attrId: Int): Int {
+    val a = obtainStyledAttributes(intArrayOf(attrId))
+    val res = a.getColor(0, 0)
+    a.recycle()
+    return res
+}
+
+fun Resources.Theme.resolveDrawable(@AttrRes attrId: Int): Drawable? {
+    val a = obtainStyledAttributes(intArrayOf(attrId))
+    val res = a.getDrawable(0)
+    a.recycle()
+    return res
+}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ad2ff0639..d45967f74 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -60,7 +60,7 @@
     <string name="gallery_list_search_bar_hint_e_hentai">E-Hentai durchsuchen</string>
     <string name="gallery_list_empty_hit">Die Welt ist so groß und der Panda sitzt ganz allein</string>
     <string name="search">Suchen</string>
-    <string name="keyword_search">"Suche nach dem Schlüsselwort "</string>
+    <string name="keyword_search">Suche nach dem Schlüsselwort</string>
     <string name="image_search">Suche nach einem Bild</string>
     <string name="search_normal">Normale Suche</string>
     <string name="search_advance">Erweiterte Optionen</string>
@@ -204,7 +204,7 @@
     <string name="download_remove_dialog_check_text">Bilddateien löschen</string>
     <string name="stat_download_action_stop_all">Alle stopppen</string>
     <string name="default_download_label_name">Standard</string>
-    <string name="download_move_dialog_title">"Verschieben "</string>
+    <string name="download_move_dialog_title">Verschieben</string>
     <string name="download_labels">Download-Etikette</string>
     <string name="download_start_all">Alle starten</string>
     <string name="download_stop_all">Alle stoppen</string>
@@ -347,5 +347,6 @@
     <string name="settings_eh_identity_cookies_copy">Kopieren</string>
     <string name="settings_eh_show_gallery_pages">Galerieseitenzahl anzeigen</string>
     <string name="settings_eh_show_gallery_pages_summary">Die Galerieseitenzahle in der Galerieliste anzeigen</string>
+    <string name="dark_theme_follow_system">System folgen</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a053753a8..5b84b1cb4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -433,5 +433,6 @@
     <string name="settings_privacy_secure_summary">Si habilitas esta opción no podrás hacer captura de pantalla y el sistema no mostrará una previsualización en el multitareas.\n\nDeberás reiniciar la aplicación para activar esta función.</string>
     <string name="u_config">Ajustes EHentai</string>
     <string name="apply_tip">Toca la marca de verificación para guardar los cambios</string>
+    <string name="dark_theme_follow_system">Sigue el sistema</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5454f9d22..6a33e3ffe 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -455,5 +455,9 @@
     <string name="settings_eh_identity_cookies_copy">Copier</string>
     <string name="settings_eh_show_gallery_pages">Montrer les nombres des pages des galeries</string>
     <string name="settings_eh_show_gallery_pages_summary">Montrer le nombre des pages des galerie dans la liste des galeries</string>
+    <string name="dark_theme">Thème sombre</string>
+    <string name="dark_theme_follow_system">Identique au système</string>
+    <string name="dark_theme_off">Toujours actif</string>
+    <string name="dark_theme_on">Toujours inactif</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 83a070e73..e585568fa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -453,4 +453,5 @@
     <string name="settings_eh_identity_cookies_copy">コピー</string>
     <string name="settings_eh_show_gallery_pages">ギャラリーページ数を表示</string>
     <string name="settings_eh_show_gallery_pages_summary">リストにギャラリーのページの数量を表示します</string>
+    <string name="dark_theme">暗いテーマ</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 052b98c6d..a82e925b3 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -415,4 +415,8 @@
 
     <string name="download_service">다운로드 서비스</string>
     <string name="favorite_name">즐겨찾기</string>
+    <string name="dark_theme">어두운 테마</string>
+    <string name="dark_theme_follow_system">시스템 설정</string>
+    <string name="dark_theme_off">항상 꺼짐</string>
+    <string name="dark_theme_on">항상 켜짐</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 50b5a8b57..ec516bc49 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -621,5 +621,9 @@
     <string name="disabled_nav">关闭</string>
     <string name="wide_color_gamut">使用Display P3色彩空间</string>
     <string name="settings_eh_request_news_timepicker">设置请求新闻页面的时间</string>
+    <string name="dark_theme">深色主题</string>
+    <string name="dark_theme_follow_system">跟随系统</string>
+    <string name="dark_theme_off">总是关闭</string>
+    <string name="dark_theme_on">总是开启</string>
     <!-- Tachiyomi Reader End-->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a1b9dc70b..900361124 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -590,5 +590,9 @@
     <string name="disabled_nav">停用</string>
     <string name="wide_color_gamut">使用 Display P3 色彩空間</string>
     <string name="settings_eh_request_news_timepicker">設定請求新聞頁面的時間</string>
+    <string name="dark_theme">深色主題</string>
+    <string name="dark_theme_follow_system">跟隨系統</string>
+    <string name="dark_theme_off">總是關閉</string>
+    <string name="dark_theme_on">總是開啟</string>
     <!-- Tachiyomi Reader End-->
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22157385f..202cf0c26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -538,6 +538,7 @@
     <string name="search_history_cleared">Search history cleared</string>
     <string name="download_service">Download Service</string>
     <string name="favorite_name">Favorite</string>
+    <string name="dark_theme">Dark theme</string>
     <string name="black_dark_theme">Black dark theme</string>
     <string name="harmonize_category_color">Harmonize category color for Dynamic Color</string>
     <string name="download_filter">Filter</string>
@@ -683,5 +684,8 @@
     <string name="action_save_to">Save to…</string>
     <string name="wide_color_gamut">Use Display P3 color space</string>
     <string name="settings_eh_request_news_timepicker">Set time to request news</string>
+    <string name="dark_theme_follow_system">Follow system</string>
+    <string name="dark_theme_off">Always off</string>
+    <string name="dark_theme_on">Always on</string>
     <!-- Tachiyomi Reader End-->
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 82a9e7c20..dbb141064 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -124,9 +124,6 @@ photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 
 r8 = { module = "com.android.tools:r8", version.ref = "android-tools-r8" }
 
-rikkax-core = "dev.rikka.rikkax.core:core-ktx:1.4.1"
-rikkax-layoutinflater = "dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0"
-
 splitties-appctx = { module = "com.louiscad.splitties:splitties-appctx", version.ref = "splitties" }
 splitties-arch-room = { module = "com.louiscad.splitties:splitties-arch-room", version.ref = "splitties" }
 splitties-preferences = { module = "com.louiscad.splitties:splitties-preferences", version.ref = "splitties" }
@@ -143,7 +140,6 @@ cronet = ["cronet-api", "cronet-gms"]
 kotlinx-serialization = ["kotlinx-serialization-cbor", "kotlinx-serialization-json", "kotlinx-serialization-json-okio"]
 ktor = ["ktor-io-jvm", "ktor-utils-jvm"]
 okhttp = ["okhttp-android", "okhttp-coroutines"]
-rikkax = ["rikkax-core", "rikkax-layoutinflater"]
 splitties = ["splitties-appctx", "splitties-arch-room", "splitties-preferences", "splitties-systemservices"]
 
 [plugins]