From 0eadc028b6f9daf38cae083cfdc2ff44a1836623 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Fri, 2 Jul 2021 19:44:04 +0700
Subject: [PATCH] Merge light and dark themes (#5470)

* Merge AMOLED and regular dark themes

This allows all variants of dark themes to use black backgrounds as a
separate preference.

* Merge light and dark themes

* Fix ReaderSeekBar color on Dark Blue theme

* Color fixes

* Fix Dark Blue bars ripple

* Simplify night mode check
---
 app/src/main/AndroidManifest.xml              |   4 +-
 .../data/preference/PreferenceKeys.kt         |   4 +-
 .../data/preference/PreferenceValues.kt       |  28 +-
 .../data/preference/PreferencesHelper.kt      |  16 +-
 .../ui/base/activity/BaseThemedActivity.kt    |  62 ++--
 .../tachiyomi/ui/reader/ReaderActivity.kt     |   9 +-
 .../tachiyomi/ui/reader/ReaderSeekBar.kt      |  11 +
 .../ui/setting/SettingsGeneralController.kt   |  58 +---
 .../util/system/ContextExtensions.kt          |   9 +-
 .../tachiyomi/util/view/ViewExtensions.kt     |   6 +-
 .../widget/sheet/BaseBottomSheetDialog.kt     |   6 +-
 .../main/res/layout-sw720dp/main_activity.xml |   2 -
 app/src/main/res/layout/main_activity.xml     |   2 -
 app/src/main/res/values-am/strings.xml        |   9 +-
 app/src/main/res/values-ar/strings.xml        |   9 +-
 app/src/main/res/values-b+es+419/strings.xml  |   9 +-
 app/src/main/res/values-bg/strings.xml        |   9 +-
 app/src/main/res/values-bn/strings.xml        |   9 +-
 app/src/main/res/values-ca/strings.xml        |  15 +-
 app/src/main/res/values-cs/strings.xml        |  17 +-
 app/src/main/res/values-cv/strings.xml        |   9 +-
 app/src/main/res/values-de/strings.xml        |  17 +-
 app/src/main/res/values-el/strings.xml        |  17 +-
 app/src/main/res/values-eo/strings.xml        |   9 +-
 app/src/main/res/values-es/strings.xml        |   9 +-
 app/src/main/res/values-fa/strings.xml        |   9 +-
 app/src/main/res/values-fi/strings.xml        |  17 +-
 app/src/main/res/values-fil/strings.xml       |  17 +-
 app/src/main/res/values-fr/strings.xml        |  17 +-
 app/src/main/res/values-gl/strings.xml        |   9 +-
 app/src/main/res/values-he/strings.xml        |   6 +-
 app/src/main/res/values-hi/strings.xml        |   9 +-
 app/src/main/res/values-hr/strings.xml        |  13 +-
 app/src/main/res/values-hu/strings.xml        |   9 +-
 app/src/main/res/values-in/strings.xml        |  17 +-
 app/src/main/res/values-it/strings.xml        |   9 +-
 app/src/main/res/values-ja/strings.xml        |   9 +-
 app/src/main/res/values-ka-rGE/strings.xml    |   9 +-
 app/src/main/res/values-kn/strings.xml        |   9 +-
 app/src/main/res/values-lv/strings.xml        |   9 +-
 app/src/main/res/values-mr/strings.xml        |   9 +-
 app/src/main/res/values-ms/strings.xml        |  17 +-
 app/src/main/res/values-nb-rNO/strings.xml    |   9 +-
 app/src/main/res/values-ne/strings.xml        |   9 +-
 app/src/main/res/values-night/bools.xml       |   5 +
 app/src/main/res/values-night/colors.xml      |   8 +-
 app/src/main/res/values-night/themes.xml      |  22 ++
 app/src/main/res/values-nl/strings.xml        |   9 +-
 app/src/main/res/values-pl/strings.xml        |  17 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  17 +-
 app/src/main/res/values-pt/strings.xml        |   9 +-
 app/src/main/res/values-ro/strings.xml        |   9 +-
 app/src/main/res/values-ru/strings.xml        |  17 +-
 app/src/main/res/values-sah/strings.xml       |   9 +-
 app/src/main/res/values-sc/strings.xml        |  17 +-
 app/src/main/res/values-sr/strings.xml        |   9 +-
 app/src/main/res/values-sv/strings.xml        |  17 +-
 app/src/main/res/values-th/strings.xml        |   9 +-
 app/src/main/res/values-tr/strings.xml        |  17 +-
 app/src/main/res/values-uk/strings.xml        |   9 +-
 app/src/main/res/values-v27/bools.xml         |   5 +
 app/src/main/res/values-v27/themes.xml        |   6 +-
 app/src/main/res/values-vi/strings.xml        |   9 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  17 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   9 +-
 app/src/main/res/values/attrs.xml             |   2 +
 app/src/main/res/values/bools.xml             |   5 +
 app/src/main/res/values/colors.xml            |  25 +-
 app/src/main/res/values/strings.xml           |  21 +-
 app/src/main/res/values/styles.xml            |  28 +-
 app/src/main/res/values/themes.xml            | 291 +++---------------
 71 files changed, 404 insertions(+), 781 deletions(-)
 create mode 100644 app/src/main/res/values-night/bools.xml
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values-v27/bools.xml
 create mode 100644 app/src/main/res/values/bools.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 93c221cddd..852dabecf7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Base.Light"
+        android:theme="@style/Theme.Tachiyomi"
         android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".ui.main.MainActivity"
@@ -84,7 +84,7 @@
         </activity>
         <activity
             android:name=".ui.security.UnlockActivity"
-            android:theme="@style/Theme.Base.Light" />
+            android:theme="@style/Theme.Tachiyomi" />
         <activity
             android:name=".ui.webview.WebViewActivity"
             android:configChanges="uiMode|orientation|screenSize" />
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 05046a3085..725e137b4a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -7,9 +7,9 @@ object PreferenceKeys {
 
     const val themeMode = "pref_theme_mode_key"
 
-    const val themeLight = "pref_theme_light_key"
+    const val appTheme = "pref_app_theme"
 
-    const val themeDark = "pref_theme_dark_key"
+    const val themeDarkAmoled = "pref_theme_dark_amoled_key"
 
     const val confirmExit = "pref_confirm_exit"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
index 981c279973..79b46e5319 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@@ -1,5 +1,7 @@
 package eu.kanade.tachiyomi.data.preference
 
+import eu.kanade.tachiyomi.R
+
 const val UNMETERED_NETWORK = "wifi"
 const val CHARGING = "ac"
 
@@ -17,26 +19,18 @@ object PreferenceValues {
         system,
     }
 
-    // Keys are lowercase to match legacy string values
-    enum class LightThemeVariant {
-        default,
-        blue,
-        strawberrydaiquiri,
-        yotsuba
-    }
+    /* ktlint-enable experimental:enum-entry-name-case */
 
-    // Keys are lowercase to match legacy string values
-    enum class DarkThemeVariant {
-        default,
-        blue,
-        greenapple,
-        midnightdusk,
-        amoled,
-        hotpink,
+    enum class AppTheme(val titleResId: Int) {
+        DEFAULT(R.string.theme_default),
+        DARK_BLUE(R.string.theme_darkblue),
+        GREEN_APPLE(R.string.theme_greenapple),
+        HOT_PINK(R.string.theme_hotpink),
+        MIDNIGHT_DUSK(R.string.theme_midnightdusk),
+        STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
+        YOTSUBA(R.string.theme_yotsuba)
     }
 
-    /* ktlint-enable experimental:enum-entry-name-case */
-
     enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
         NONE,
         HORIZONTAL(shouldInvertHorizontal = true),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 3c6f8997a2..bfd6559401 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.data.preference
 
 import android.content.Context
-import android.content.res.Configuration
 import android.os.Environment
 import androidx.core.content.edit
 import androidx.core.net.toUri
@@ -90,9 +89,9 @@ class PreferencesHelper(val context: Context) {
 
     fun themeMode() = flowPrefs.getEnum(Keys.themeMode, system)
 
-    fun themeLight() = flowPrefs.getEnum(Keys.themeLight, Values.LightThemeVariant.default)
+    fun appTheme() = flowPrefs.getEnum(Keys.appTheme, Values.AppTheme.DEFAULT)
 
-    fun themeDark() = flowPrefs.getEnum(Keys.themeDark, Values.DarkThemeVariant.default)
+    fun themeDarkAmoled() = flowPrefs.getBoolean(Keys.themeDarkAmoled, false)
 
     fun pageTransitions() = flowPrefs.getBoolean(Keys.enableTransitions, true)
 
@@ -325,15 +324,4 @@ class PreferencesHelper(val context: Context) {
             putInt(Keys.defaultChapterSortByAscendingOrDescending, if (manga.sortDescending()) Manga.CHAPTER_SORT_DESC else Manga.CHAPTER_SORT_ASC)
         }
     }
-
-    fun isDarkMode(): Boolean {
-        return when (themeMode().get()) {
-            light -> false
-            dark -> true
-            system -> {
-                context.applicationContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
-                    Configuration.UI_MODE_NIGHT_YES
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
index 28c9bffabb..2edd9fa7d6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
@@ -2,10 +2,10 @@ package eu.kanade.tachiyomi.ui.base.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.lifecycle.lifecycleScope
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferenceValues.DarkThemeVariant
-import eu.kanade.tachiyomi.data.preference.PreferenceValues.LightThemeVariant
+import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.util.view.setSecureScreen
@@ -19,7 +19,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
     val preferences: PreferencesHelper by injectLazy()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(getThemeResourceId(preferences))
+        applyThemePreferences(preferences)
 
         Injekt.get<PreferencesHelper>().incognitoMode()
             .asImmediateFlow {
@@ -31,23 +31,49 @@ abstract class BaseThemedActivity : AppCompatActivity() {
     }
 
     companion object {
-        fun getThemeResourceId(preferences: PreferencesHelper): Int {
-            return if (preferences.isDarkMode()) {
-                when (preferences.themeDark().get()) {
-                    DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
-                    DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
-                    DarkThemeVariant.greenapple -> R.style.Theme_Tachiyomi_Dark_GreenApple
-                    DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
-                    DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
-                    DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
+        fun AppCompatActivity.applyThemePreferences(preferences: PreferencesHelper) {
+            val resIds = mutableListOf<Int>()
+            when (preferences.appTheme().get()) {
+                PreferenceValues.AppTheme.DEFAULT -> {
+                    resIds += R.style.Theme_Tachiyomi
                 }
-            } else {
-                when (preferences.themeLight().get()) {
-                    LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
-                    LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
-                    LightThemeVariant.strawberrydaiquiri -> R.style.Theme_Tachiyomi_Light_StrawberryDaiquiri
-                    LightThemeVariant.yotsuba -> R.style.Theme_Tachiyomi_Light_Yotsuba
+                PreferenceValues.AppTheme.DARK_BLUE -> {
+                    resIds += R.style.Theme_Tachiyomi_DarkBlue
+                    resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
                 }
+                PreferenceValues.AppTheme.GREEN_APPLE -> {
+                    resIds += R.style.Theme_Tachiyomi_GreenApple
+                }
+                PreferenceValues.AppTheme.HOT_PINK -> {
+                    resIds += R.style.Theme_Tachiyomi_HotPink
+                }
+                PreferenceValues.AppTheme.MIDNIGHT_DUSK -> {
+                    resIds += R.style.Theme_Tachiyomi_MidnightDusk
+                }
+                PreferenceValues.AppTheme.STRAWBERRY_DAIQUIRI -> {
+                    resIds += R.style.Theme_Tachiyomi_StrawberryDaiquiri
+                }
+                PreferenceValues.AppTheme.YOTSUBA -> {
+                    resIds += R.style.Theme_Tachiyomi_Yotsuba
+                }
+            }
+
+            if (preferences.themeDarkAmoled().get()) {
+                resIds += R.style.ThemeOverlay_Tachiyomi_Amoled
+            }
+
+            resIds.forEach {
+                setTheme(it)
+            }
+
+            lifecycleScope.launchWhenCreated {
+                AppCompatDelegate.setDefaultNightMode(
+                    when (preferences.themeMode().get()) {
+                        PreferenceValues.ThemeMode.light -> AppCompatDelegate.MODE_NIGHT_NO
+                        PreferenceValues.ThemeMode.dark -> AppCompatDelegate.MODE_NIGHT_YES
+                        PreferenceValues.ThemeMode.system -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+                    }
+                )
             }
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 08f5e71fe7..f3bedcaefd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -44,7 +44,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.toggle
 import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
 import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity.Companion.applyThemePreferences
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.AddToLibraryFirst
@@ -61,6 +61,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
 import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.system.GLUtil
 import eu.kanade.tachiyomi.util.system.hasDisplayCutout
+import eu.kanade.tachiyomi.util.system.isNightMode
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.popupMenu
 import eu.kanade.tachiyomi.util.view.setTooltip
@@ -138,7 +139,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      * Called when the activity is created. Initializes the presenter and configuration.
      */
     override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(BaseThemedActivity.getThemeResourceId(preferences))
+        applyThemePreferences(preferences)
         super.onCreate(savedInstanceState)
 
         binding = ReaderActivityBinding.inflate(layoutInflater)
@@ -353,7 +354,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
 
         initBottomShortcuts()
 
-        val alpha = if (preferences.isDarkMode()) 230 else 242 // 90% dark 95% light
+        val alpha = if (isNightMode()) 230 else 242 // 90% dark 95% light
         val toolbarColor = ColorUtils.setAlphaComponent(getThemeColor(R.attr.colorToolbar), alpha)
         listOf(
             binding.toolbarBottom,
@@ -852,7 +853,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                     binding.readerContainer.setBackgroundResource(
                         when (preferences.readerTheme().get()) {
                             0 -> android.R.color.white
-                            2 -> R.color.background_dark
+                            2 -> R.color.reader_background_dark
                             else -> android.R.color.black
                         }
                     )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSeekBar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSeekBar.kt
index 0615c1f4f1..a1e08f4fa7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSeekBar.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSeekBar.kt
@@ -1,10 +1,13 @@
 package eu.kanade.tachiyomi.ui.reader
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Canvas
 import android.util.AttributeSet
 import android.view.MotionEvent
 import androidx.appcompat.widget.AppCompatSeekBar
+import com.mikepenz.aboutlibraries.util.getThemeColor
+import eu.kanade.tachiyomi.R
 
 /**
  * Seekbar to show current chapter progress.
@@ -41,4 +44,12 @@ class ReaderSeekBar @JvmOverloads constructor(
         }
         return super.onTouchEvent(event)
     }
+
+    init {
+        // Set color to onPrimary when ColoredBars theme is applied
+        if (context.getThemeColor(R.attr.colorToolbar) == context.getThemeColor(R.attr.colorPrimary)) {
+            thumbTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.colorOnPrimary))
+            progressTintList = thumbTintList
+        }
+    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index e5146198a6..6f887eced6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -119,62 +119,30 @@ class SettingsGeneralController : SettingsController() {
                 }
             }
             listPreference {
-                key = Keys.themeLight
-                titleRes = R.string.pref_theme_light
-                entriesRes = arrayOf(
-                    R.string.theme_light_default,
-                    R.string.theme_light_blue,
-                    R.string.theme_light_strawberrydaiquiri,
-                    R.string.theme_light_yotsuba
-                )
-                entryValues = arrayOf(
-                    Values.LightThemeVariant.default.name,
-                    Values.LightThemeVariant.blue.name,
-                    Values.LightThemeVariant.strawberrydaiquiri.name,
-                    Values.LightThemeVariant.yotsuba.name
-                )
-                defaultValue = Values.LightThemeVariant.default.name
-                summary = "%s"
+                key = Keys.appTheme
+                titleRes = R.string.pref_app_theme
 
-                preferences.themeMode().asImmediateFlow { isVisible = it != Values.ThemeMode.dark }
-                    .launchIn(viewScope)
+                val appThemes = Values.AppTheme.values()
+                entriesRes = appThemes.map { it.titleResId }.toTypedArray()
+                entryValues = appThemes.map { it.name }.toTypedArray()
+                defaultValue = appThemes[0].name
+                summary = "%s"
 
                 onChange {
-                    if (preferences.themeMode().get() != Values.ThemeMode.dark) {
-                        activity?.recreate()
-                    }
+                    activity?.recreate()
                     true
                 }
             }
-            listPreference {
-                key = Keys.themeDark
-                titleRes = R.string.pref_theme_dark
-                entriesRes = arrayOf(
-                    R.string.theme_dark_default,
-                    R.string.theme_dark_blue,
-                    R.string.theme_dark_greenapple,
-                    R.string.theme_dark_midnightdusk,
-                    R.string.theme_dark_amoled,
-                    R.string.theme_dark_amoled_hotpink
-                )
-                entryValues = arrayOf(
-                    Values.DarkThemeVariant.default.name,
-                    Values.DarkThemeVariant.blue.name,
-                    Values.DarkThemeVariant.greenapple.name,
-                    Values.DarkThemeVariant.midnightdusk.name,
-                    Values.DarkThemeVariant.amoled.name,
-                    Values.DarkThemeVariant.hotpink.name
-                )
-                defaultValue = Values.DarkThemeVariant.default.name
-                summary = "%s"
+            switchPreference {
+                key = Keys.themeDarkAmoled
+                titleRes = R.string.pref_dark_theme_pure_black
+                defaultValue = false
 
                 preferences.themeMode().asImmediateFlow { isVisible = it != Values.ThemeMode.light }
                     .launchIn(viewScope)
 
                 onChange {
-                    if (preferences.themeMode().get() != Values.ThemeMode.light) {
-                        activity?.recreate()
-                    }
+                    activity?.recreate()
                     true
                 }
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
index eedb0d90c1..563d562a06 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Color
 import android.net.ConnectivityManager
@@ -38,7 +39,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.lang.truncateCenter
 import timber.log.Timber
-import uy.kohesive.injekt.api.get
 import java.io.File
 import kotlin.math.roundToInt
 
@@ -277,3 +277,10 @@ fun Context.createFileInCacheDir(name: String): File {
 fun Context.isTablet(): Boolean {
     return resources.configuration.smallestScreenWidthDp >= 720
 }
+
+/**
+ * Returns true if current context is in night mode
+ */
+fun Context.isNightMode(): Boolean {
+    return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
index 4581241a4b..cfd6a6d3d9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
@@ -25,10 +25,8 @@ import com.google.android.material.elevation.ElevationOverlayProvider
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.system.getResourceColor
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
+import eu.kanade.tachiyomi.util.system.isNightMode
 
 /**
  * Returns coordinates of view.
@@ -186,7 +184,7 @@ inline fun ChipGroup.setChips(
  * Applies elevation overlay to a MaterialCardView
  */
 inline fun MaterialCardView.applyElevationOverlay() {
-    if (Injekt.get<PreferencesHelper>().isDarkMode()) {
+    if (context.isNightMode()) {
         val provider = ElevationOverlayProvider(context)
         setCardBackgroundColor(provider.compositeOverlay(cardBackgroundColor.defaultColor, cardElevation))
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
index 8f592af247..202dc78fd6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
@@ -9,11 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.system.displayCompat
+import eu.kanade.tachiyomi.util.system.isNightMode
 import eu.kanade.tachiyomi.util.view.setNavigationBarTransparentCompat
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 abstract class BaseBottomSheetDialog(context: Context) : BottomSheetDialog(context) {
 
@@ -45,7 +43,7 @@ abstract class BaseBottomSheetDialog(context: Context) : BottomSheetDialog(conte
             window?.setNavigationBarTransparentCompat(context)
             val bottomSheet = rootView.parent as ViewGroup
             var flags = bottomSheet.systemUiVisibility
-            flags = if (Injekt.get<PreferencesHelper>().isDarkMode()) {
+            flags = if (context.isNightMode()) {
                 flags and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
             } else {
                 flags or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml
index 60557ceded..656a2b8ae7 100644
--- a/app/src/main/res/layout-sw720dp/main_activity.xml
+++ b/app/src/main/res/layout-sw720dp/main_activity.xml
@@ -74,8 +74,6 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             app:elevation="0dp"
-            app:itemRippleColor="@color/ripple_toolbar_fainter"
-            app:labelVisibilityMode="labeled"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/incognito_mode"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index e57b5b088f..0afa597d58 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -78,8 +78,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        app:itemRippleColor="@color/ripple_toolbar_fainter"
-        app:labelVisibilityMode="labeled"
         app:layout_insetEdge="bottom"
         app:menu="@menu/main_nav" />
 
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 92fad7b91f..b5b94a49f0 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -70,13 +70,8 @@
     <string name="system_default">ነባሪ</string>
     <string name="pref_language">ቋንቋ</string>
     <string name="pref_start_screen">ማያ ገጹን ይጀምሩ</string>
-    <string name="theme_dark_amoled">AMOLED ጥቁር</string>
-    <string name="theme_dark_blue">ጥቁር ሰማያዊ</string>
-    <string name="theme_dark_default">ነባሪ</string>
-    <string name="pref_theme_dark">ጨለማ ጭብጥ</string>
-    <string name="theme_light_blue">ዉሃ ሰማያዊ</string>
-    <string name="theme_light_default">ነባሪ</string>
-    <string name="pref_theme_light">የብርሃን ጭብጥ</string>
+    <string name="theme_darkblue">ጥቁር ሰማያዊ</string>
+    <string name="theme_default">ነባሪ</string>
     <string name="theme_dark">በርቷል</string>
     <string name="theme_light">ጠፍቷል</string>
     <string name="theme_system">ስርዓት ይከተሉ</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index d1a0481cee..440b632702 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -359,13 +359,8 @@
     <string name="pref_category_security">إعدادات الأمان</string>
     <string name="pref_manage_notifications">إدارة الإشعارات</string>
     <string name="pref_date_format">صيغة التاريخ</string>
-    <string name="theme_dark_amoled">أسود AMOLED</string>
-    <string name="theme_dark_blue">أزرق غامق</string>
-    <string name="theme_dark_default">الافتراضي</string>
-    <string name="pref_theme_dark">المظهر الداكن</string>
-    <string name="theme_light_blue">أزرق فاتح</string>
-    <string name="theme_light_default">الافتراضي</string>
-    <string name="pref_theme_light">المظهر الفاتح</string>
+    <string name="theme_darkblue">أزرق غامق</string>
+    <string name="theme_default">الافتراضي</string>
     <string name="theme_system">اتبع مظهر النظام</string>
     <string name="theme_dark">مفعّل</string>
     <string name="theme_light">غير مفعّل</string>
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
index 7dd8ca2ff6..7306e6a9ac 100644
--- a/app/src/main/res/values-b+es+419/strings.xml
+++ b/app/src/main/res/values-b+es+419/strings.xml
@@ -276,13 +276,8 @@
     <string name="system_default">Predeterminado</string>
     <string name="pref_language">Idioma</string>
     <string name="pref_start_screen">Pantalla inicial</string>
-    <string name="theme_dark_amoled">AMOLED negro</string>
-    <string name="theme_dark_blue">Azul oscuro</string>
-    <string name="theme_dark_default">Predeterminado</string>
-    <string name="pref_theme_dark">Tema oscuro</string>
-    <string name="theme_light_blue">Azul claro</string>
-    <string name="theme_light_default">Predeterminado</string>
-    <string name="pref_theme_light">Tema claro</string>
+    <string name="theme_darkblue">Azul oscuro</string>
+    <string name="theme_default">Predeterminado</string>
     <string name="theme_dark">Encendido</string>
     <string name="theme_light">Apagado</string>
     <string name="theme_system">Usar el del sistema</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 6b1f330835..ef6cb5fd3c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -468,13 +468,8 @@
     <string name="pref_category_security">Сигурност</string>
     <string name="pref_manage_notifications">Уведомления</string>
     <string name="pref_confirm_exit">Потвърждение при излизане</string>
-    <string name="theme_dark_amoled">AMOLED черно</string>
-    <string name="theme_dark_blue">Тъмносин</string>
-    <string name="theme_dark_default">По подразбиране</string>
-    <string name="pref_theme_dark">Тъмна тема</string>
-    <string name="theme_light_blue">Светлосин</string>
-    <string name="theme_light_default">По подразбиране</string>
-    <string name="pref_theme_light">Светла тема</string>
+    <string name="theme_darkblue">Тъмносин</string>
+    <string name="theme_default">По подразбиране</string>
     <string name="theme_system">Система на абонаментите</string>
     <string name="theme_dark">Включено</string>
     <string name="theme_light">Изключено</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 9515f19579..3f6f4a53c9 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -366,13 +366,8 @@
     <string name="pref_manage_notifications">বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন</string>
     <string name="pref_confirm_exit">বের হতে নিশ্চিত করুন</string>
     <string name="pref_date_format">তারিখের রীতি</string>
-    <string name="theme_dark_amoled">অ্যামোলেড কালো</string>
-    <string name="theme_dark_blue">গাঢ় নীল</string>
-    <string name="theme_dark_default">প্রকৃত</string>
-    <string name="pref_theme_dark">কালো থিম</string>
-    <string name="theme_light_blue">হালকা নীল</string>
-    <string name="theme_light_default">প্রকৃত</string>
-    <string name="pref_theme_light">সাদা থিম</string>
+    <string name="theme_darkblue">গাঢ় নীল</string>
+    <string name="theme_default">প্রকৃত</string>
     <string name="theme_dark">চালু করুন</string>
     <string name="theme_light">বন্ধ করুন</string>
     <string name="theme_system">সিস্টেমকে অনুসরণ করুন</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 2649ddc52d..a34b23ffbf 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Desactivat</string>
     <string name="theme_dark">Activat</string>
     <string name="theme_system">Per defecte del sistema</string>
-    <string name="pref_theme_dark">Tema fosc</string>
-    <string name="theme_dark_default">Per defecte</string>
-    <string name="theme_dark_blue">Blau Fosc</string>
-    <string name="theme_dark_amoled">Negre AMOLED</string>
+    <string name="theme_darkblue">Blau Fosc</string>
     <string name="pref_manage_notifications">Gestiona les notificacions</string>
     <string name="pref_category_security">Seguretat</string>
     <string name="lock_with_biometrics">Requereix desbloqueig</string>
@@ -402,9 +399,7 @@
         <item quantity="one">Per a 1 títol</item>
         <item quantity="other">Per a %d títols</item>
     </plurals>
-    <string name="pref_theme_light">Tema clar</string>
-    <string name="theme_light_default">Per defecte</string>
-    <string name="theme_light_blue">Blau Clar</string>
+    <string name="theme_default">Per defecte</string>
     <string name="action_menu">Menú</string>
     <string name="action_reorganize_by">Reordena</string>
     <string name="action_newest">Els més nous</string>
@@ -645,8 +640,8 @@
     <string name="pref_library_update_refresh_trackers_summary">Actualitza els rastrejadors en actualitzar la biblioteca</string>
     <string name="pref_library_update_refresh_trackers">Actualitza els rastrejadors automàticament</string>
     <string name="pref_move_side_nav_to_bottom">Mou els botons de navegació laterals a la part inferior</string>
-    <string name="theme_dark_amoled_hotpink">Rosa calent</string>
-    <string name="theme_dark_midnightdusk">Vespre de mitjanit</string>
-    <string name="theme_light_strawberrydaiquiri">Daiquiri de maduixa</string>
+    <string name="theme_hotpink">Rosa calent</string>
+    <string name="theme_midnightdusk">Vespre de mitjanit</string>
+    <string name="theme_strawberrydaiquiri">Daiquiri de maduixa</string>
     <string name="chapter_not_found">Capítol no trobat</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cf0278145f..1834b127e8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -363,11 +363,8 @@
     <string name="lock_when_idle">Uzamknout při nečinnosti</string>
     <string name="pref_category_security">Bezpečnost</string>
     <string name="pref_manage_notifications">Spravovat oznámení</string>
-    <string name="theme_dark_blue">Tmavě modrý</string>
-    <string name="theme_dark_default">Výchozí</string>
-    <string name="pref_theme_dark">Temný vzhled</string>
-    <string name="theme_light_blue">Světle modrý</string>
-    <string name="theme_light_default">Výchozí</string>
+    <string name="theme_darkblue">Tmavě modrý</string>
+    <string name="theme_default">Výchozí</string>
     <string name="action_oldest">Nejstarší</string>
     <string name="action_newest">Nejnovější</string>
     <string name="action_view_chapters">Zobrazit kapitoly</string>
@@ -491,8 +488,6 @@
     <string name="secure_screen">Chráněná obrazovka</string>
     <string name="lock_with_biometrics">Vyžadovat odemknutí</string>
     <string name="pref_confirm_exit">Potvrdit opuštění</string>
-    <string name="theme_dark_amoled">AMOLED černý</string>
-    <string name="pref_theme_light">Světlý vzhled</string>
     <string name="theme_dark">Zapnuto</string>
     <string name="theme_light">Vypnuto</string>
     <string name="pref_theme_mode">Temný vzhled</string>
@@ -656,9 +651,9 @@
     <string name="pref_library_update_refresh_trackers">Automaticky aktualizovat sledovače</string>
     <string name="restrictions">Omezení: %s</string>
     <string name="pref_move_side_nav_to_bottom">Přesunout boční navigační tlačítka do spodní části</string>
-    <string name="theme_dark_amoled_hotpink">Žhavá Růžová</string>
-    <string name="theme_dark_midnightdusk">Půlnoční Soumrak</string>
-    <string name="theme_dark_greenapple">Zelené Jablko</string>
-    <string name="theme_light_strawberrydaiquiri">Jahodové Daiquiri</string>
+    <string name="theme_hotpink">Žhavá Růžová</string>
+    <string name="theme_midnightdusk">Půlnoční Soumrak</string>
+    <string name="theme_greenapple">Zelené Jablko</string>
+    <string name="theme_strawberrydaiquiri">Jahodové Daiquiri</string>
     <string name="action_display_local_badge">Místní odznaky</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cv/strings.xml b/app/src/main/res/values-cv/strings.xml
index 72f8cfe137..f7d693a4f4 100644
--- a/app/src/main/res/values-cv/strings.xml
+++ b/app/src/main/res/values-cv/strings.xml
@@ -71,11 +71,7 @@
     <string name="pref_date_format">Вӑхӑт формачӗ</string>
     <string name="pref_language">Чӗлхе</string>
     <string name="pref_start_screen">Пуҫламӑш экран</string>
-    <string name="theme_dark_amoled">AMOLED хура</string>
-    <string name="theme_dark_blue">Тӗксӗм кӑвак</string>
-    <string name="pref_theme_dark">Тӗксӗм тема тӗсӗ</string>
-    <string name="theme_light_blue">Шурӑ кӑвак</string>
-    <string name="pref_theme_light">Ҫутӑ тема</string>
+    <string name="theme_darkblue">Тӗксӗм кӑвак</string>
     <string name="theme_dark">Ҫутнӑ</string>
     <string name="theme_light">Сӳнтернӗ</string>
     <string name="pref_category_advanced">Тата</string>
@@ -194,8 +190,7 @@
     <string name="action_sort">Уйӑр</string>
     <string name="pref_theme_mode">Тӗксӗм тема</string>
     <string name="system_default">Яланхилле</string>
-    <string name="theme_dark_default">Яланхилле</string>
-    <string name="theme_light_default">Яланхилле</string>
+    <string name="theme_default">Яланхилле</string>
     <string name="theme_system">Сӳстемри пекех</string>
     <string name="pref_category_reader">Вулӑш</string>
     <string name="pref_category_tracking">Сӑнану</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0f5c8803e4..4f20d54ea0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Aus</string>
     <string name="theme_dark">An</string>
     <string name="theme_system">Systemeinstellung</string>
-    <string name="pref_theme_dark">Dunkeldesign</string>
-    <string name="theme_dark_default">Standard</string>
-    <string name="theme_dark_blue">Dunkelblau</string>
-    <string name="theme_dark_amoled">AMOLED Schwarz</string>
+    <string name="theme_darkblue">Dunkelblau</string>
     <string name="pref_manage_notifications">Benachrichtigungen verwalten</string>
     <string name="pref_category_security">Sicherheit</string>
     <string name="lock_with_biometrics">Entsperren erforderlich</string>
@@ -402,9 +399,7 @@
         <item quantity="one">Für 1 Titel</item>
         <item quantity="other">Für %d Titel</item>
     </plurals>
-    <string name="pref_theme_light">Helldesign</string>
-    <string name="theme_light_default">Standard</string>
-    <string name="theme_light_blue">Hellblau</string>
+    <string name="theme_default">Standard</string>
     <string name="action_menu">Menü</string>
     <string name="action_reorganize_by">Umordnen</string>
     <string name="action_newest">Neueste</string>
@@ -640,16 +635,16 @@
     <string name="unread">Ungelesen</string>
     <string name="pref_auto_add_track">Heimlich tracken, wenn neue Manga der Bibliothek hinzugefügt werden</string>
     <string name="pref_move_side_nav_to_bottom">Seitennavigations-Buttons nach unten verlegen</string>
-    <string name="theme_dark_amoled_hotpink">Heißes Pink</string>
-    <string name="theme_dark_midnightdusk">Mitternachtsdämmerung</string>
+    <string name="theme_hotpink">Heißes Pink</string>
+    <string name="theme_midnightdusk">Mitternachtsdämmerung</string>
     <string name="date">Datum</string>
     <string name="local_filter_order_by">Sortiere nach</string>
     <string name="local_invalid_format">Ungültiges Kapitelformat</string>
     <string name="chapter_not_found">Kapitel nicht gefunden</string>
     <string name="pref_library_update_refresh_trackers_summary">Tracker aktualisieren, wenn die Bibliothek aktualisiert wird</string>
     <string name="pref_library_update_refresh_trackers">Tracker automatisch aktualisieren</string>
-    <string name="theme_light_strawberrydaiquiri">Erdbeer-Daiquiri</string>
-    <string name="theme_dark_greenapple">Grüner Apfel</string>
+    <string name="theme_strawberrydaiquiri">Erdbeer-Daiquiri</string>
+    <string name="theme_greenapple">Grüner Apfel</string>
     <string name="restrictions">Einschränkungen: %s</string>
     <string name="action_display_local_badge">Lokal-Plaketten</string>
     <string name="off">Aus</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7b0505f13d..6a1b3dd346 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -426,13 +426,8 @@
     <string name="pref_manage_notifications">Διαχείριση ειδοποιήσεων</string>
     <string name="pref_confirm_exit">Επιβεβαίωση εξόδου</string>
     <string name="pref_date_format">Μορφή ημερομηνίας</string>
-    <string name="theme_dark_amoled">AMOLED Μαύρο</string>
-    <string name="theme_dark_blue">Σκούρο Μπλε</string>
-    <string name="theme_dark_default">Προεπιλογή</string>
-    <string name="pref_theme_dark">Σκοτεινό θέμα</string>
-    <string name="theme_light_blue">Γαλάζιο</string>
-    <string name="theme_light_default">Προεπιλογή</string>
-    <string name="pref_theme_light">Φωτεινό θέμα</string>
+    <string name="theme_darkblue">Σκούρο Μπλε</string>
+    <string name="theme_default">Προεπιλογή</string>
     <string name="theme_system">Ακολουθήστε το σύστημα</string>
     <string name="theme_dark">Ενεργοποιημένο</string>
     <string name="theme_light">Απενεργοποιημένο</string>
@@ -640,16 +635,16 @@
     <string name="unread">Αδιάβαστα</string>
     <string name="pref_auto_add_track">Παρακολούθηση σιωπηλά κατά την προσθήκη manga στη βιβλιοθήκη</string>
     <string name="pref_move_side_nav_to_bottom">Μετακίνηση πλευρικών κουμπιών περιήγησης στο κάτω μέρος</string>
-    <string name="theme_dark_amoled_hotpink">Καυτό Ροζ</string>
-    <string name="theme_dark_midnightdusk">Μεταμεσονύκτιο Σούρουπο</string>
+    <string name="theme_hotpink">Καυτό Ροζ</string>
+    <string name="theme_midnightdusk">Μεταμεσονύκτιο Σούρουπο</string>
     <string name="date">Ημερομηνία</string>
     <string name="local_filter_order_by">Ταξινόμηση κατά</string>
     <string name="pref_library_update_refresh_trackers_summary">Ενημέρωση των trackers κατά την ενημέρωση της βιβλιοθήκης</string>
     <string name="pref_library_update_refresh_trackers">Αυτόματη ενημέρωση των trackers</string>
     <string name="local_invalid_format">Μη έγκυρη μορφή κεφαλαίου</string>
     <string name="chapter_not_found">Το κεφάλαιο δε βρέθηκε</string>
-    <string name="theme_light_strawberrydaiquiri">Φράουλα Ντάκιρι</string>
-    <string name="theme_dark_greenapple">Πράσινο Μήλο</string>
+    <string name="theme_strawberrydaiquiri">Φράουλα Ντάκιρι</string>
+    <string name="theme_greenapple">Πράσινο Μήλο</string>
     <string name="restrictions">Περιορισμοί: %s</string>
     <string name="action_display_local_badge">Τοπικά σήματα</string>
     <string name="off">Απενεργοποιημένο</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 35073dec4d..33ae47cd4f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -72,12 +72,8 @@
     <string name="system_default">Operaciuma</string>
     <string name="pref_language">Lingvo</string>
     <string name="pref_start_screen">Hejmekrano</string>
-    <string name="theme_dark_blue">Malhelblua</string>
-    <string name="theme_dark_default">Defaŭlta</string>
-    <string name="pref_theme_dark">Malhela etoso</string>
-    <string name="theme_light_blue">Helblua</string>
-    <string name="theme_light_default">Defaŭlta</string>
-    <string name="pref_theme_light">Hela etoso</string>
+    <string name="theme_darkblue">Malhelblua</string>
+    <string name="theme_default">Defaŭlta</string>
     <string name="theme_dark">Ŝalti</string>
     <string name="theme_light">Malŝalti</string>
     <string name="theme_system">Laŭ operaciumo</string>
@@ -236,7 +232,6 @@
     <string name="pref_show_nsfw_source">Montri en fontlisto</string>
     <string name="pref_category_nsfw_content">MPL/NSFW (18+) fontoj</string>
     <string name="pref_confirm_exit">Konfirmi eliron</string>
-    <string name="theme_dark_amoled">AMOLED-a nigra</string>
     <string name="pref_category_locale">Lingvo</string>
     <string name="pref_category_general">Ĝenerala</string>
     <string name="app_not_available">Apo maldisponebla</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 065151210f..5aa9490cfa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -389,10 +389,7 @@
     <string name="theme_light">Apagado</string>
     <string name="theme_dark">Encendido</string>
     <string name="theme_system">Usar el del sistema</string>
-    <string name="pref_theme_dark">Tema oscuro</string>
-    <string name="theme_dark_default">Predeterminado</string>
-    <string name="theme_dark_blue">Negro y azul</string>
-    <string name="theme_dark_amoled">AMOLED negro</string>
+    <string name="theme_darkblue">Negro y azul</string>
     <string name="pref_manage_notifications">Gestionar notificaciones</string>
     <string name="pref_category_security">Seguridad</string>
     <string name="lock_with_biometrics">Bloquear con huella</string>
@@ -434,9 +431,7 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="pref_theme_light">Tema claro</string>
-    <string name="theme_light_default">Predeterminado</string>
-    <string name="theme_light_blue">Azul y blanco</string>
+    <string name="theme_default">Predeterminado</string>
     <string name="action_menu">Menú</string>
     <string name="action_reorganize_by">Reordenar</string>
     <string name="action_newest">Lo más nuevo</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 606be48b38..5680306119 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -344,13 +344,8 @@
     <string name="system_default">پیش‌فرض سیستم</string>
     <string name="pref_language">انتخاب زبان</string>
     <string name="pref_start_screen">صفحه اغازین</string>
-    <string name="theme_dark_amoled">AMOLED سیاه</string>
-    <string name="theme_dark_blue">تم آبی تیره</string>
-    <string name="theme_dark_default">پیش‌فرض</string>
-    <string name="pref_theme_dark">تم تیره</string>
-    <string name="theme_light_blue">تم آبی کمرنگ</string>
-    <string name="theme_light_default">پیش‌فرض</string>
-    <string name="pref_theme_light">تم روشن</string>
+    <string name="theme_darkblue">تم آبی تیره</string>
+    <string name="theme_default">پیش‌فرض</string>
     <string name="theme_dark">روشن</string>
     <string name="theme_light">خاموش</string>
     <string name="theme_system">تم پیش‌فرض سیستم</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 86ea29d958..27a3929edd 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Pois päältä</string>
     <string name="theme_dark">Päällä</string>
     <string name="theme_system">Seuraa järjestelmää</string>
-    <string name="pref_theme_dark">Tumma teema</string>
-    <string name="theme_dark_default">Oletus</string>
-    <string name="theme_dark_blue">Tummansininen</string>
-    <string name="theme_dark_amoled">AMOLED teema</string>
+    <string name="theme_darkblue">Tummansininen</string>
     <string name="pref_manage_notifications">Hallitse ilmoituksia</string>
     <string name="pref_category_security">Turvallisuus</string>
     <string name="lock_with_biometrics">Vaadi lukituksen avaaminen</string>
@@ -402,9 +399,7 @@
         <item quantity="one">Yhdelle sarjalle</item>
         <item quantity="other">%d sarjalle</item>
     </plurals>
-    <string name="pref_theme_light">Vaalea teema</string>
-    <string name="theme_light_default">Oletus</string>
-    <string name="theme_light_blue">Vaaleansininen</string>
+    <string name="theme_default">Oletus</string>
     <string name="action_menu">Valikko</string>
     <string name="action_reorganize_by">Uudelleenjärjestä</string>
     <string name="action_newest">Uusin</string>
@@ -640,11 +635,11 @@
     <string name="unread">Lukemattomat</string>
     <string name="pref_auto_add_track">Seuraa hiljaa, kun lisäät mangaa kirjastoon</string>
     <string name="pref_move_side_nav_to_bottom">Siirrä sivunavigointipainikkeet alareunaan</string>
-    <string name="theme_dark_midnightdusk">Midnight Dusk</string>
-    <string name="theme_light_strawberrydaiquiri">Mansikka Daiquiri</string>
+    <string name="theme_midnightdusk">Midnight Dusk</string>
+    <string name="theme_strawberrydaiquiri">Mansikka Daiquiri</string>
     <string name="local_invalid_format">Väärä lukuformaatti</string>
     <string name="chapter_not_found">Lukua ei löytynyt</string>
     <string name="restrictions">Rajoitukset: %s</string>
-    <string name="theme_dark_amoled_hotpink">Kuuma pinkki</string>
-    <string name="theme_dark_greenapple">Vihreä omena</string>
+    <string name="theme_hotpink">Kuuma pinkki</string>
+    <string name="theme_greenapple">Vihreä omena</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index a8d6d1e7cd..587891dc79 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -117,13 +117,8 @@
     <string name="system_default">Ipagpaubaya</string>
     <string name="pref_language">Wika</string>
     <string name="pref_start_screen">Pambungad na iskrin</string>
-    <string name="theme_dark_amoled">Itim sa AMOLED</string>
-    <string name="theme_dark_blue">Madilim na may bughaw</string>
-    <string name="theme_dark_default">Ipagpaubaya</string>
-    <string name="pref_theme_dark">Madilim na tema</string>
-    <string name="theme_light_blue">Maliwanag na may bughaw</string>
-    <string name="theme_light_default">Ipagpaubaya</string>
-    <string name="pref_theme_light">Maliwanag na tema</string>
+    <string name="theme_darkblue">Madilim na may bughaw</string>
+    <string name="theme_default">Ipagpaubaya</string>
     <string name="theme_dark">Nakabukas</string>
     <string name="theme_light">Nakasara</string>
     <string name="theme_system">Sundan ang sistema</string>
@@ -635,10 +630,10 @@
     <string name="notification_incognito_text">Isara ang incognito</string>
     <string name="automatic_background">Kusa</string>
     <string name="pref_move_side_nav_to_bottom">Ilagay ang side navigation sa ibaba</string>
-    <string name="theme_dark_amoled_hotpink">Rosas</string>
-    <string name="theme_dark_midnightdusk">Takipsilim sa Hatinggabi</string>
-    <string name="theme_dark_greenapple">Berdeng mansanas</string>
-    <string name="theme_light_strawberrydaiquiri">Presas Daiquiri</string>
+    <string name="theme_hotpink">Rosas</string>
+    <string name="theme_midnightdusk">Takipsilim sa Hatinggabi</string>
+    <string name="theme_greenapple">Berdeng mansanas</string>
+    <string name="theme_strawberrydaiquiri">Presas Daiquiri</string>
     <string name="cancel_all_for_series">Ikansela lahat para sa serye</string>
     <string name="pref_library_update_refresh_trackers_summary">Isapanahon ang sinusubaybay tuwing nagsasapanahon ng aklatan</string>
     <string name="pref_library_update_refresh_trackers">Awtomatikong ipasapanahon ang pagsusubaybay</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0d4eda7b9e..e175ec8ff7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -391,10 +391,7 @@
     <string name="theme_light">Désactivé</string>
     <string name="theme_dark">Activé</string>
     <string name="theme_system">Par défaut du système</string>
-    <string name="pref_theme_dark">Thème sombre</string>
-    <string name="theme_dark_default">Par défaut</string>
-    <string name="theme_dark_blue">Bleu foncé</string>
-    <string name="theme_dark_amoled">Noir AMOLED</string>
+    <string name="theme_darkblue">Bleu foncé</string>
     <string name="pref_manage_notifications">Notifications</string>
     <string name="pref_category_security">Sécurité</string>
     <string name="lock_with_biometrics">Déverrouillage obligatoire</string>
@@ -436,13 +433,11 @@
         <item quantity="one">Pour 1 titre</item>
         <item quantity="other">Pour %d titres</item>
     </plurals>
-    <string name="theme_light_default">Par défaut</string>
-    <string name="theme_light_blue">Bleu clair</string>
+    <string name="theme_default">Par défaut</string>
     <string name="action_menu">Menu</string>
     <string name="action_reorganize_by">Réorganiser</string>
     <string name="action_newest">Plus récent</string>
     <string name="action_oldest">Plus ancien</string>
-    <string name="pref_theme_light">Thème clair</string>
     <string name="action_move_to_top">Déplacer au début</string>
     <string name="action_move_to_bottom">Déplacer à la fin</string>
     <string name="channel_ext_updates">Mises à jour d\'extensions</string>
@@ -680,10 +675,10 @@
     <string name="pref_library_update_refresh_trackers">Mise à jour automatique des traqueurs</string>
     <string name="restrictions">Restrictions : %s</string>
     <string name="pref_move_side_nav_to_bottom">Déplacer les boutons de navigation latéraux vers le bas</string>
-    <string name="theme_dark_amoled_hotpink">Rose chaud</string>
-    <string name="theme_dark_midnightdusk">Crépuscule de minuit</string>
-    <string name="theme_dark_greenapple">Pomme verte</string>
-    <string name="theme_light_strawberrydaiquiri">Daiquiri fraise</string>
+    <string name="theme_hotpink">Rose chaud</string>
+    <string name="theme_midnightdusk">Crépuscule de minuit</string>
+    <string name="theme_greenapple">Pomme verte</string>
+    <string name="theme_strawberrydaiquiri">Daiquiri fraise</string>
     <string name="cancel_all_for_series">Tout annuler pour cette série</string>
     <string name="action_display_local_badge">Badges locaux</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index acbf248533..e2a112787a 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -171,13 +171,8 @@
     <string name="system_default">Por defecto</string>
     <string name="pref_language">Idioma</string>
     <string name="pref_start_screen">Pantalla inicial</string>
-    <string name="theme_dark_amoled">Negro AMOLED</string>
-    <string name="theme_dark_blue">Azul escuro</string>
-    <string name="theme_dark_default">Por defecto</string>
-    <string name="pref_theme_dark">Modo escuro</string>
-    <string name="theme_light_blue">Azul claro</string>
-    <string name="theme_light_default">Por defecto</string>
-    <string name="pref_theme_light">Modo claro</string>
+    <string name="theme_darkblue">Azul escuro</string>
+    <string name="theme_default">Por defecto</string>
     <string name="theme_dark">Encendido</string>
     <string name="theme_light">Apagado</string>
     <string name="theme_system">Utilizar o do sistema</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 4f956b85ce..1876dfd4f2 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -201,10 +201,8 @@
     <string name="pref_date_format">תבנית תאריך</string>
     <string name="pref_language">שפה</string>
     <string name="pref_start_screen">מסך פתיחה</string>
-    <string name="theme_dark_blue">כחול כהה</string>
-    <string name="theme_dark_default">ברירת מחדל</string>
-    <string name="theme_light_blue">כחול בהיר</string>
-    <string name="theme_light_default">ברירת מחדל</string>
+    <string name="theme_darkblue">כחול כהה</string>
+    <string name="theme_default">ברירת מחדל</string>
     <string name="theme_dark">כהה</string>
     <string name="theme_light">בהיר</string>
     <string name="pref_theme_mode">ערכת נושא של האפליקציה</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 70257b2e84..577cf03e8a 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">बंद</string>
     <string name="theme_dark">चालू करे</string>
     <string name="theme_system">सिस्टम का पालन करें</string>
-    <string name="pref_theme_dark">डार्क थीम</string>
-    <string name="theme_dark_default">डिफ़ॉल्ट</string>
-    <string name="theme_dark_blue">गहरा नीला</string>
-    <string name="theme_dark_amoled">अलौकिक गहरी थीम</string>
+    <string name="theme_darkblue">गहरा नीला</string>
     <string name="pref_manage_notifications">सूचनाओं का प्रबंधन</string>
     <string name="pref_category_security">सुरक्षा</string>
     <string name="lock_with_biometrics">बायोमेट्रिक्स के साथ लॉक करें</string>
@@ -402,9 +399,7 @@
         <item quantity="one">1 शीर्षक के लिए</item>
         <item quantity="other">%d शीर्षक के लिए</item>
     </plurals>
-    <string name="pref_theme_light">लाइट थीम</string>
-    <string name="theme_light_default">डिफ़ॉल्ट</string>
-    <string name="theme_light_blue">हल्का नीला</string>
+    <string name="theme_default">डिफ़ॉल्ट</string>
     <string name="action_menu">मेन्यू</string>
     <string name="action_reorganize_by">पुनःक्रमित</string>
     <string name="action_newest">नवीनतम</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c79d5f5d0d..acd5d042e9 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -68,13 +68,8 @@
     <string name="system_default">Standardno</string>
     <string name="pref_language">Jezik</string>
     <string name="pref_start_screen">Početni ekran</string>
-    <string name="theme_dark_amoled">AMOLED crna</string>
-    <string name="theme_dark_blue">Tamnoplava</string>
-    <string name="theme_dark_default">Standardno</string>
-    <string name="pref_theme_dark">Tamna tema</string>
-    <string name="theme_light_blue">Svjetloplava</string>
-    <string name="theme_light_default">Standardno</string>
-    <string name="pref_theme_light">Svijetla tema</string>
+    <string name="theme_darkblue">Tamnoplava</string>
+    <string name="theme_default">Standardno</string>
     <string name="theme_system">Slijedi sustav</string>
     <string name="theme_dark">Uključeno</string>
     <string name="theme_light">Isključeno</string>
@@ -647,6 +642,6 @@
     <string name="pref_create_folder_per_manga">Spremi stranice u zasebne mape</string>
     <string name="pref_reader_actions">Radnje</string>
     <string name="cancel_all_for_series">Prekini sve za ovu seriju</string>
-    <string name="theme_dark_greenapple">Zelena jabuka</string>
-    <string name="theme_light_strawberrydaiquiri">Jagoda Daikiri</string>
+    <string name="theme_greenapple">Zelena jabuka</string>
+    <string name="theme_strawberrydaiquiri">Jagoda Daikiri</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 02370b3511..3e999377f6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -147,9 +147,7 @@
     <string name="label_more">Több</string>
     <string name="label_sources">Források</string>
     <string name="pref_date_format">Dátum formátum</string>
-    <string name="theme_dark_amoled">AMOLED fekete</string>
-    <string name="theme_dark_blue">Sötétkék</string>
-    <string name="theme_light_blue">Világoskék</string>
+    <string name="theme_darkblue">Sötétkék</string>
     <string name="theme_dark">Be</string>
     <string name="theme_light">Ki</string>
     <string name="pref_category_library">Könyvtár</string>
@@ -210,10 +208,7 @@
     <string name="pref_category_security">Biztonság</string>
     <string name="pref_manage_notifications">Értesítések kezelése</string>
     <string name="pref_confirm_exit">Kilépés megerősítése</string>
-    <string name="theme_dark_default">Alapértelmezett</string>
-    <string name="pref_theme_dark">Sötét téma</string>
-    <string name="theme_light_default">Alapértelmezett</string>
-    <string name="pref_theme_light">Világos téma</string>
+    <string name="theme_default">Alapértelmezett</string>
     <string name="theme_system">Rendszerbeállítás követése</string>
     <string name="pref_theme_mode">Sötét mód</string>
     <string name="pref_category_locale">Helyszín</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 9a39a8e880..e5dda32c84 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -349,12 +349,10 @@
     <string name="theme_light">Mati</string>
     <string name="theme_dark">Nyala</string>
     <string name="theme_system">Ikuti sistem</string>
-    <string name="theme_dark_blue">Biru Gelap</string>
-    <string name="theme_dark_amoled">AMOLED Hitam</string>
+    <string name="theme_darkblue">Biru Gelap</string>
     <string name="pref_manage_notifications">Kelola notifikasi</string>
     <string name="pref_category_security">Keamanan</string>
     <string name="unlock_app">Buka Tachiyomi</string>
-    <string name="theme_light_blue">Biru Terang</string>
     <string name="action_menu">Menu</string>
     <string name="action_reorganize_by">Susun ulang</string>
     <string name="action_newest">Terbaru</string>
@@ -375,9 +373,6 @@
     <string name="secure_screen_summary">Sembunyikan konten aplikasi saat berpindah aplikasi dan blokir tangkapan layar</string>
     <string name="hide_notification_content">Sembunyikan konten notifikasi</string>
     <string name="pref_always_show_chapter_transition">Selalu tampilkan transisi bab</string>
-    <string name="pref_theme_dark">Tema gelap</string>
-    <string name="theme_dark_default">Gelap standar</string>
-    <string name="pref_theme_light">Tema terang</string>
     <string name="logout">Keluar</string>
     <string name="logout_success">Anda sudah keluar</string>
     <string name="currently_reading">Sedang dibaca</string>
@@ -390,7 +385,7 @@
     <string name="pref_disable_battery_optimization">Nonaktifkan optimisasi baterai</string>
     <string name="battery_optimization_disabled">Optimalisasi baterai sudah dimatikan</string>
     <string name="email">Alamat surel</string>
-    <string name="theme_light_default">Terang standar</string>
+    <string name="theme_default">Terang standar</string>
     <string name="secure_screen">Amankan layar</string>
     <string name="logout_title">Keluar dari %1$s\?</string>
     <string name="pref_category_display">Tampilan</string>
@@ -624,10 +619,10 @@
     <string name="pref_grayscale">Skala Abu-abu</string>
     <string name="pref_show_navigation_mode">Tampilkan tata letak navigasi</string>
     <string name="pref_library_update_categories_details">Manga dalam kategori yang dikecualikan tidak akan diperbarui meskipun masuk dalam kategori yang disertakan.</string>
-    <string name="theme_light_strawberrydaiquiri">Stroberi Daiquiri</string>
-    <string name="theme_dark_amoled_hotpink">Merah Muda Menyala</string>
-    <string name="theme_dark_midnightdusk">Malam Gelap</string>
-    <string name="theme_dark_greenapple">Apel Hijau</string>
+    <string name="theme_strawberrydaiquiri">Stroberi Daiquiri</string>
+    <string name="theme_hotpink">Merah Muda Menyala</string>
+    <string name="theme_midnightdusk">Malam Gelap</string>
+    <string name="theme_greenapple">Apel Hijau</string>
     <string name="date">Tanggal</string>
     <string name="local_filter_order_by">Urutkan berdasarkan</string>
     <string name="local_invalid_format">Format bab tidak valid</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 30eab4415b..0d108d7255 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -390,10 +390,7 @@
     <string name="theme_light">Disattivo</string>
     <string name="theme_dark">Attivo</string>
     <string name="theme_system">Segui l\'impostazione di sistema</string>
-    <string name="pref_theme_dark">Tema scuro</string>
-    <string name="theme_dark_default">Predefinito</string>
-    <string name="theme_dark_blue">Blu scuro</string>
-    <string name="theme_dark_amoled">Nero AMOLED</string>
+    <string name="theme_darkblue">Blu scuro</string>
     <string name="pref_manage_notifications">Gestisci le notifiche</string>
     <string name="pref_category_security">Sicurezza</string>
     <string name="lock_with_biometrics">Sblocco richiesto</string>
@@ -443,9 +440,7 @@
     <string name="pref_always_show_chapter_transition">Mostra sempre la transizione tra capitoli</string>
     <string name="pref_enable_automatic_extension_updates">Controlla aggiornamenti per le estensioni</string>
     <string name="hide_notification_content">Nascondi contenuto notifica</string>
-    <string name="theme_light_blue">Blu chiaro</string>
-    <string name="theme_light_default">Predefinito</string>
-    <string name="pref_theme_light">Tema chiaro</string>
+    <string name="theme_default">Predefinito</string>
     <string name="action_move_to_bottom">Muovi in fondo</string>
     <string name="action_move_to_top">Muovi in cima</string>
     <string name="action_oldest">Vecchi</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ca929ae140..3d4a3496b1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -352,10 +352,7 @@
     <string name="theme_light">オフ</string>
     <string name="theme_dark">オン</string>
     <string name="theme_system">システム設定</string>
-    <string name="pref_theme_dark">ダークテーマ</string>
-    <string name="theme_dark_default">初期設定</string>
-    <string name="theme_dark_blue">濃紺</string>
-    <string name="theme_dark_amoled">AMOLEDブラック</string>
+    <string name="theme_darkblue">濃紺</string>
     <string name="pref_manage_notifications">通知設定</string>
     <string name="pref_category_security">セキュリティ</string>
     <string name="lock_with_biometrics">アンロックを必要とする</string>
@@ -440,9 +437,7 @@
     <string name="hide_notification_content">通知コンテンツを非表示</string>
     <string name="secure_screen_summary">スクリーンショットを無効化し、「最近使ったアプリ」画面にアプリの内容を非表示します</string>
     <string name="pref_confirm_exit">終了時に確認</string>
-    <string name="theme_light_blue">水色</string>
-    <string name="theme_light_default">既定</string>
-    <string name="pref_theme_light">ライトテーマ</string>
+    <string name="theme_default">既定</string>
     <string name="action_move_to_bottom">底に移動</string>
     <string name="action_move_to_top">トップに移動</string>
     <string name="action_oldest">最古</string>
diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml
index 8ca4b6d8c1..ca4e287fa0 100644
--- a/app/src/main/res/values-ka-rGE/strings.xml
+++ b/app/src/main/res/values-ka-rGE/strings.xml
@@ -90,11 +90,7 @@
     <string name="theme_system">სისტემური</string>
     <string name="theme_light">მსუბუქი</string>
     <string name="theme_dark">ბნელი</string>
-    <string name="pref_theme_light">მსუბუქი თემა</string>
-    <string name="theme_light_blue">მოლურჯო მსუბუქი</string>
-    <string name="pref_theme_dark">ბნელი თემა</string>
-    <string name="theme_dark_blue">მოლურჯო ბნელი</string>
-    <string name="theme_dark_amoled">AMOLED ბნელი</string>
+    <string name="theme_darkblue">მოლურჯო ბნელი</string>
     <string name="pref_language">ენა</string>
     <string name="pref_date_format">თარიღის ფორმატი</string>
     <string name="pref_confirm_exit">გამოსვლის დადასტურება</string>
@@ -126,8 +122,7 @@
     <string name="pref_library_update_refresh_metadata">ავტომატურად განაახლე მეტადატა</string>
     <string name="label_migration">მიგრაცია</string>
     <string name="default_category">ნაგულისხმევი კატეგორია</string>
-    <string name="theme_light_default">ნაგულისხმევი</string>
-    <string name="theme_dark_default">ნაგულისხმევი</string>
+    <string name="theme_default">ნაგულისხმევი</string>
     <string name="system_default">ნაგულისხმევი</string>
     <string name="default_columns">ნაგულისხმევი</string>
     <string name="default_category_summary">ყოველთვის მკითხე</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index cff3518bea..84259ac353 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -22,13 +22,8 @@
     <string name="system_default">ಡೀಫಾಲ್ಟ್</string>
     <string name="pref_language">ಭಾಷೆ</string>
     <string name="pref_start_screen">ಮೊದಲ ಪುಟ</string>
-    <string name="theme_dark_amoled">ಗಾಢವಾದ್ ಕಪ್ಪು</string>
-    <string name="theme_dark_blue">ಗಾಢವಾದ್ ನೀಲಿ</string>
-    <string name="theme_dark_default">ಡೀಫಾಲ್ಟ್</string>
-    <string name="pref_theme_dark">ಡಾರ್ಕ್ ಥೀಮ್</string>
-    <string name="theme_light_blue">ತಿಳಿ ನೀಲಿ</string>
-    <string name="theme_light_default">ಡೀಫಾಲ್ಟ್</string>
-    <string name="pref_theme_light">ಲೈಟ್ ಥೀಮ್</string>
+    <string name="theme_darkblue">ಗಾಢವಾದ್ ನೀಲಿ</string>
+    <string name="theme_default">ಡೀಫಾಲ್ಟ್</string>
     <string name="theme_system">ಸಿಸ್ಟಮ್ ಅನುಕರಿಸಿ</string>
     <string name="theme_dark">ಆನ್</string>
     <string name="theme_light">ಆಫ</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 60df82ac99..ab5a971122 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -169,13 +169,8 @@
     <string name="system_default">Noklusējums</string>
     <string name="pref_language">Valoda</string>
     <string name="pref_start_screen">Sākuma ekrāns</string>
-    <string name="theme_dark_amoled">AMOLED melns</string>
-    <string name="theme_dark_blue">Tumši zils</string>
-    <string name="theme_dark_default">Noklusējums</string>
-    <string name="pref_theme_dark">Tumšais motīvs</string>
-    <string name="theme_light_blue">Gaiši zils</string>
-    <string name="theme_light_default">Noklusējums</string>
-    <string name="pref_theme_light">Gaišais režīms</string>
+    <string name="theme_darkblue">Tumši zils</string>
+    <string name="theme_default">Noklusējums</string>
     <string name="theme_dark">Ieslēgts</string>
     <string name="theme_light">Izslēgts</string>
     <string name="theme_system">Sekot sistēmu</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 9cbc0bf2eb..9f552dc125 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -115,13 +115,8 @@
     <string name="pref_date_format">तारिकेचा स्वरूप</string>
     <string name="system_default">डिफॉल्ट</string>
     <string name="pref_language">भाषा</string>
-    <string name="theme_dark_amoled">पूर्ण काडा (AMOLED)</string>
-    <string name="theme_dark_blue">गडद निडा</string>
-    <string name="theme_dark_default">डिफॉल्ट</string>
-    <string name="pref_theme_dark">गडद थीमचा प्रकार</string>
-    <string name="theme_light_blue">फिक्का निडा</string>
-    <string name="theme_light_default">डिफॉल्ट</string>
-    <string name="pref_theme_light">लाइट थीमची रुपे</string>
+    <string name="theme_darkblue">गडद निडा</string>
+    <string name="theme_default">डिफॉल्ट</string>
     <string name="theme_system">तंत्राचे अनुसरण करा</string>
     <string name="theme_dark">डार्क</string>
     <string name="theme_light">लाइट</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index b5fd5e34a0..05edc8e142 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Mati</string>
     <string name="theme_dark">Hidup</string>
     <string name="theme_system">Ikut sistem</string>
-    <string name="pref_theme_dark">Tema gelap</string>
-    <string name="theme_dark_default">Lalai</string>
-    <string name="theme_dark_blue">Biru Gelap</string>
-    <string name="theme_dark_amoled">AMOLED Hitam</string>
+    <string name="theme_darkblue">Biru Gelap</string>
     <string name="pref_manage_notifications">Uruskan pemberitahuan</string>
     <string name="pref_category_security">Keselamatan</string>
     <string name="lock_with_biometrics">Memerlukan buka kunci</string>
@@ -398,9 +395,7 @@
     <plurals name="notification_new_chapters_summary">
         <item quantity="other">Untuk %d tajuk</item>
     </plurals>
-    <string name="pref_theme_light">Tema terang</string>
-    <string name="theme_light_default">Lalai</string>
-    <string name="theme_light_blue">Biru Terang</string>
+    <string name="theme_default">Lalai</string>
     <string name="action_menu">Menu</string>
     <string name="action_reorganize_by">Susun semula</string>
     <string name="action_newest">Terbaru</string>
@@ -628,16 +623,16 @@
     <string name="source_unsupported">Sumber tidak disokong</string>
     <string name="unread">Belum dibaca</string>
     <string name="pref_move_side_nav_to_bottom">Pindahkan butang navigasi sisi ke bawah</string>
-    <string name="theme_dark_midnightdusk">Senja Tengah Malam</string>
+    <string name="theme_midnightdusk">Senja Tengah Malam</string>
     <string name="date">Tarikh</string>
     <string name="local_filter_order_by">Susun mengikut</string>
     <string name="local_invalid_format">Format bab tidak sah</string>
     <string name="chapter_not_found">Bab tidak dijumpai</string>
-    <string name="theme_dark_amoled_hotpink">Merah Jambu Panas</string>
-    <string name="theme_light_strawberrydaiquiri">Daiquiri Strawberi</string>
+    <string name="theme_hotpink">Merah Jambu Panas</string>
+    <string name="theme_strawberrydaiquiri">Daiquiri Strawberi</string>
     <string name="pref_library_update_refresh_trackers_summary">Kemas kini penjejak ketika mengemaskini pustaka</string>
     <string name="pref_library_update_refresh_trackers">Kemas kini penjejak secara automatik</string>
-    <string name="theme_dark_greenapple">Epal Hijau</string>
+    <string name="theme_greenapple">Epal Hijau</string>
     <string name="restrictions">Sekatan: %s</string>
     <string name="action_display_local_badge">Penanda setempat</string>
     <string name="off">Mati</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index fe463d6ef9..bda2a61c74 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -356,10 +356,7 @@
     <string name="theme_light">Av</string>
     <string name="theme_dark">På</string>
     <string name="theme_system">System</string>
-    <string name="pref_theme_dark">Mørk</string>
-    <string name="theme_dark_default">Forvalg</string>
-    <string name="theme_dark_blue">Mørkeblå</string>
-    <string name="theme_dark_amoled">AMOLED-sort</string>
+    <string name="theme_darkblue">Mørkeblå</string>
     <string name="pref_manage_notifications">Håndter merknader</string>
     <string name="pref_category_security">Sikkerhet</string>
     <string name="lock_with_biometrics">Krev opplåsning</string>
@@ -381,9 +378,7 @@
     <string name="webtoon_side_padding_20">20%</string>
     <string name="webtoon_side_padding_15">15%</string>
     <string name="webtoon_side_padding_10">10%</string>
-    <string name="theme_light_blue">Lyseblå</string>
-    <string name="theme_light_default">Forvalg</string>
-    <string name="pref_theme_light">Lys</string>
+    <string name="theme_default">Forvalg</string>
     <string name="action_move_to_bottom">Flytt til bunnen</string>
     <string name="action_move_to_top">Flytt til toppen</string>
     <string name="action_oldest">Eldste</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index 21f3ba4334..9991599995 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -3,13 +3,8 @@
     <string name="system_default">पूर्वनिर्धारित</string>
     <string name="pref_language">भाषा</string>
     <string name="pref_start_screen">स्क्रिनको सुरूवात</string>
-    <string name="theme_dark_amoled">AMOLED कालो</string>
-    <string name="theme_dark_blue">गाढा निलो</string>
-    <string name="theme_dark_default">पूर्वनिर्धारित</string>
-    <string name="pref_theme_dark">अँध्यारो थिम</string>
-    <string name="theme_light_blue">हल्का निलो</string>
-    <string name="theme_light_default">पूर्वनिर्धारित</string>
-    <string name="pref_theme_light">प्रकाश थिम</string>
+    <string name="theme_darkblue">गाढा निलो</string>
+    <string name="theme_default">पूर्वनिर्धारित</string>
     <string name="theme_dark">खुल्ला</string>
     <string name="theme_light">बन्द</string>
     <string name="pref_theme_mode">अँध्यारो मोड</string>
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
new file mode 100644
index 0000000000..a66e7bad2f
--- /dev/null
+++ b/app/src/main/res/values-night/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightStatusBar">false</bool>
+    <bool name="lightNavigationBar">false</bool>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f77a6ca688..7afe4f7cdf 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="splash">@color/background_dark</color>
+    <color name="splash">@color/background_default</color>
+
+    <color name="accent_default">#3399FF</color>
+    <color name="divider_default">@color/md_white_1000_12</color>
+    <color name="surface_default">#242529</color>
+    <color name="background_default">#202125</color>
+    <color name="ripple_colored_default">#1F3399FF</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..81719d09af
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--== AMOLED theme overlay ==-->
+    <style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
+        <item name="colorSurface">@color/surface_amoled</item>
+        <item name="android:colorBackground">@color/background_amoled</item>
+        <item name="android:divider">@color/divider_amoled</item>
+        <item name="colorFilterActive">@color/filterColorAmoled</item>
+    </style>
+
+    <!--== Midnight Dusk theme ==-->
+    <style name="Theme.Tachiyomi.MidnightDusk">
+        <!-- Theme colors -->
+        <item name="colorPrimary">@color/accent_midnightdusk</item>
+        <item name="colorTertiary">@color/md_blue_A400</item>
+        <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
+        <item name="colorSurface">@color/surface_midnightdusk</item>
+        <item name="android:colorBackground">@color/background_midnightdusk</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0227ebb92e..57af05a5e2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Uit</string>
     <string name="theme_dark">Aan</string>
     <string name="theme_system">Volg systeeminstelling</string>
-    <string name="pref_theme_dark">Donker thema</string>
-    <string name="theme_dark_default">Standaard</string>
-    <string name="theme_dark_blue">Donkerblauw</string>
-    <string name="theme_dark_amoled">AMOLED-zwart</string>
+    <string name="theme_darkblue">Donkerblauw</string>
     <string name="pref_manage_notifications">Meldingen beheren</string>
     <string name="pref_category_security">Beveiliging</string>
     <string name="lock_with_biometrics">Ontgrendelen vereisen</string>
@@ -455,9 +452,7 @@
     <string name="pref_enable_automatic_extension_updates">Zoeken naar updates voor extensies</string>
     <string name="hide_notification_content">Meldingsinhoud verbergen</string>
     <string name="pref_confirm_exit">Bevestig sluiten</string>
-    <string name="theme_light_blue">Lichtblauw</string>
-    <string name="theme_light_default">Standaard</string>
-    <string name="pref_theme_light">Licht thema</string>
+    <string name="theme_default">Standaard</string>
     <string name="action_move_to_top">Verplaats naar top</string>
     <string name="action_unpin">Lospinnen</string>
     <string name="viewer">Leesmodus</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 925dcd05af..f3286eb194 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -376,13 +376,8 @@
     <string name="lock_with_biometrics">Wymagaj odblokowania</string>
     <string name="pref_category_security">Bezpieczeństwo</string>
     <string name="pref_manage_notifications">Zarządzaj powiadomieniami</string>
-    <string name="theme_dark_amoled">Czarny AMOLED</string>
-    <string name="theme_dark_blue">Ciemnoniebieski</string>
-    <string name="theme_dark_default">Domyślny</string>
-    <string name="pref_theme_dark">Wariant ciemnego motywu</string>
-    <string name="theme_light_blue">Jasnoniebieski</string>
-    <string name="theme_light_default">Domyślny</string>
-    <string name="pref_theme_light">Wariant jasnego motywu</string>
+    <string name="theme_darkblue">Ciemnoniebieski</string>
+    <string name="theme_default">Domyślny</string>
     <string name="theme_system">Systemowy</string>
     <string name="theme_dark">Włącz</string>
     <string name="theme_light">Wyłącz</string>
@@ -662,10 +657,10 @@
     <string name="pref_reader_actions">Akcje</string>
     <string name="pref_grayscale">Odcienie szarości</string>
     <string name="cancel_all_for_series">Anuluj wszystko dla tego tytułu</string>
-    <string name="theme_dark_amoled_hotpink">Hot Pink</string>
-    <string name="theme_dark_midnightdusk">Zmierzch o północy</string>
-    <string name="theme_dark_greenapple">Zielone jabłko</string>
-    <string name="theme_light_strawberrydaiquiri">Truskawkowe Daiquiri</string>
+    <string name="theme_hotpink">Hot Pink</string>
+    <string name="theme_midnightdusk">Zmierzch o północy</string>
+    <string name="theme_greenapple">Zielone jabłko</string>
+    <string name="theme_strawberrydaiquiri">Truskawkowe Daiquiri</string>
     <string name="date">Data</string>
     <string name="local_filter_order_by">Sortowanie</string>
     <string name="local_invalid_format">Błędny format rozdziału</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5281ab89cb..1696ceb608 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Desligado</string>
     <string name="theme_dark">Ligado</string>
     <string name="theme_system">Seguir o sistema</string>
-    <string name="pref_theme_dark">Tema escuro</string>
-    <string name="theme_dark_default">Padrão</string>
-    <string name="theme_dark_blue">Azul Escuro</string>
-    <string name="theme_dark_amoled">Preto AMOLED</string>
+    <string name="theme_darkblue">Azul Escuro</string>
     <string name="pref_manage_notifications">Gerenciar notificações</string>
     <string name="pref_category_security">Segurança</string>
     <string name="lock_with_biometrics">Requer desbloqueio</string>
@@ -402,9 +399,7 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="pref_theme_light">Tema claro</string>
-    <string name="theme_light_default">Padrão</string>
-    <string name="theme_light_blue">Azul Claro</string>
+    <string name="theme_default">Padrão</string>
     <string name="action_menu">Menu</string>
     <string name="action_reorganize_by">Reordenar</string>
     <string name="action_newest">Mais novos</string>
@@ -640,16 +635,16 @@
     <string name="unread">Não lido</string>
     <string name="pref_auto_add_track">Monitora de modo silencioso ao adicionar um mangá na biblioteca</string>
     <string name="pref_move_side_nav_to_bottom">Mover os botões de navegação laterais para baixo</string>
-    <string name="theme_dark_amoled_hotpink">Rosa Quente</string>
-    <string name="theme_dark_midnightdusk">Aurora-da-noite</string>
-    <string name="theme_light_strawberrydaiquiri">Daiquiri de Morango</string>
+    <string name="theme_hotpink">Rosa Quente</string>
+    <string name="theme_midnightdusk">Aurora-da-noite</string>
+    <string name="theme_strawberrydaiquiri">Daiquiri de Morango</string>
     <string name="date">Data</string>
     <string name="local_filter_order_by">Ordenar por</string>
     <string name="local_invalid_format">Formato de capítulo inválido</string>
     <string name="chapter_not_found">Capítulo não encontrado</string>
     <string name="pref_library_update_refresh_trackers_summary">Atualizar os monitoradores durante a atualização da biblioteca</string>
     <string name="pref_library_update_refresh_trackers">Atualizar os monitoradores automaticamente</string>
-    <string name="theme_dark_greenapple">Maçã Verde</string>
+    <string name="theme_greenapple">Maçã Verde</string>
     <string name="restrictions">Restrições: %s</string>
     <string name="action_display_local_badge">Selos da fonte local</string>
     <string name="off">Desligado</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f6cc205162..4d9beafa91 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -387,10 +387,7 @@
     <string name="theme_light">Desligado</string>
     <string name="theme_dark">Ligado</string>
     <string name="theme_system">Seguir o do sistema</string>
-    <string name="pref_theme_dark">Tema escuro</string>
-    <string name="theme_dark_default">Padrão</string>
-    <string name="theme_dark_blue">Azul escuro</string>
-    <string name="theme_dark_amoled">Preto AMOLED</string>
+    <string name="theme_darkblue">Azul escuro</string>
     <string name="pref_manage_notifications">Gerir notificações</string>
     <string name="pref_category_security">Segurança</string>
     <string name="lock_with_biometrics">Requerer desbloqueio</string>
@@ -427,9 +424,7 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="pref_theme_light">Tema claro</string>
-    <string name="theme_light_default">Padrão</string>
-    <string name="theme_light_blue">Azul claro</string>
+    <string name="theme_default">Padrão</string>
     <string name="action_menu">Menu</string>
     <string name="action_reorganize_by">Reordenar</string>
     <string name="action_newest">Mais novos</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 33bff80ee6..02bb2a74f9 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -356,10 +356,7 @@
     <string name="theme_light">Oprită</string>
     <string name="theme_dark">Pornită</string>
     <string name="theme_system">Tema sistemului</string>
-    <string name="pref_theme_dark">Temă întunecată</string>
-    <string name="theme_dark_default">Implicită</string>
-    <string name="theme_dark_blue">Albastru Închis</string>
-    <string name="theme_dark_amoled">Negru AMOLED</string>
+    <string name="theme_darkblue">Albastru Închis</string>
     <string name="pref_manage_notifications">Setări notificări</string>
     <string name="pref_category_security">Securitate</string>
     <string name="lock_with_biometrics">Necesită deblocare</string>
@@ -406,9 +403,7 @@
         <item quantity="few">Pentru %d titluri</item>
         <item quantity="other">Pentru %d titluri</item>
     </plurals>
-    <string name="pref_theme_light">Temă deschisă</string>
-    <string name="theme_light_default">Implicit</string>
-    <string name="theme_light_blue">Albastru deschis</string>
+    <string name="theme_default">Implicit</string>
     <string name="action_menu">Meniu</string>
     <string name="action_reorganize_by">Reordonează</string>
     <string name="action_newest">Cele mai recente</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 38878fcd34..5d43a11dda 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Выключено</string>
     <string name="theme_dark">Включено</string>
     <string name="theme_system">В соответствии с системной темой</string>
-    <string name="pref_theme_dark">Тёмная тема</string>
-    <string name="theme_dark_default">По умолчанию</string>
-    <string name="theme_dark_blue">Темно Синий</string>
-    <string name="theme_dark_amoled">AMOLED Черный</string>
+    <string name="theme_darkblue">Темно Синий</string>
     <string name="pref_manage_notifications">Управлять уведомлениями</string>
     <string name="pref_category_security">Безопасность</string>
     <string name="lock_with_biometrics">Требовать разблокировку</string>
@@ -406,7 +403,7 @@
     <string name="battery_optimization_disabled">Оптимизация батареи уже выключена</string>
     <string name="pref_disable_battery_optimization_summary">Помогает с фоновым обновлением библиотеки и резевной копии</string>
     <string name="pref_disable_battery_optimization">Выключить оптимизацию батареи</string>
-    <string name="theme_light_default">По умолчанию</string>
+    <string name="theme_default">По умолчанию</string>
     <plurals name="update_check_notification_ext_updates">
         <item quantity="one">Доступно обновление для %d расширения</item>
         <item quantity="few">Доступны обновления для %d расширений</item>
@@ -418,8 +415,6 @@
     <string name="pref_enable_automatic_extension_updates">Проверять обновления для расширений</string>
     <string name="hide_notification_content">Скрыть содержимое уведомлений</string>
     <string name="secure_screen_summary">Скрывать содержимое приложения при переключении на другие приложения а также блокировать скриншоты</string>
-    <string name="theme_light_blue">Светло Синий</string>
-    <string name="pref_theme_light">Светлая тема</string>
     <string name="action_oldest">Старейший</string>
     <string name="action_newest">Новейший</string>
     <string name="action_move_to_top">В начало</string>
@@ -663,16 +658,16 @@
     <string name="unread">Не прочитано</string>
     <string name="pref_auto_add_track">Отслеживать бесшумно, при добавлении манги в библиотеку</string>
     <string name="pref_move_side_nav_to_bottom">Переместить боковые навигационные кнопки в нижнюю часть</string>
-    <string name="theme_dark_amoled_hotpink">Ярко Розовый</string>
-    <string name="theme_dark_midnightdusk">Полночные Сумерки</string>
-    <string name="theme_light_strawberrydaiquiri">Клубничный Дайкири</string>
+    <string name="theme_hotpink">Ярко Розовый</string>
+    <string name="theme_midnightdusk">Полночные Сумерки</string>
+    <string name="theme_strawberrydaiquiri">Клубничный Дайкири</string>
     <string name="date">Дата</string>
     <string name="local_filter_order_by">Сортировать по</string>
     <string name="local_invalid_format">Неверный формат глав</string>
     <string name="chapter_not_found">Глава не найдена</string>
     <string name="pref_library_update_refresh_trackers_summary">Обновлять отслеживание, при обновлении библиотеки</string>
     <string name="pref_library_update_refresh_trackers">Автоматически обновлять отслеживание</string>
-    <string name="theme_dark_greenapple">Зелёное Яблоко</string>
+    <string name="theme_greenapple">Зелёное Яблоко</string>
     <string name="restrictions">Ограничения: %s</string>
     <string name="action_display_local_badge">Локальные значки</string>
     <string name="off">Выключено</string>
diff --git a/app/src/main/res/values-sah/strings.xml b/app/src/main/res/values-sah/strings.xml
index 20cf707340..ec6383eca1 100644
--- a/app/src/main/res/values-sah/strings.xml
+++ b/app/src/main/res/values-sah/strings.xml
@@ -100,13 +100,8 @@
     <string name="system_default">Куолутунан</string>
     <string name="pref_language">Тыл</string>
     <string name="pref_start_screen">Сүрүн экран</string>
-    <string name="theme_dark_amoled">AMOLED хара</string>
-    <string name="theme_dark_blue">Хараҥа күөх</string>
-    <string name="theme_dark_default">Куолутунан</string>
-    <string name="pref_theme_dark">Хараҥа тиэмэ</string>
-    <string name="theme_light_blue">Сырдык күөх</string>
-    <string name="theme_light_default">Куолутунан</string>
-    <string name="pref_theme_light">Сырдык тиэмэ</string>
+    <string name="theme_darkblue">Хараҥа күөх</string>
+    <string name="theme_default">Куолутунан</string>
     <string name="theme_dark">Холбоммут</string>
     <string name="theme_light">Араарыллыбыт</string>
     <string name="theme_system">Системнайы тутуһуҥ</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 6eb029daff..823d0985e5 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Istudadu</string>
     <string name="theme_dark">Allutu</string>
     <string name="theme_system">Sighi su sistema</string>
-    <string name="pref_theme_dark">Tema iscuru</string>
-    <string name="theme_dark_default">Predefinidu</string>
-    <string name="theme_dark_blue">Biaitu iscuru</string>
-    <string name="theme_dark_amoled">Nieddu AMOLED</string>
+    <string name="theme_darkblue">Biaitu iscuru</string>
     <string name="pref_manage_notifications">Amministra sas notìficas</string>
     <string name="pref_category_security">Seguresa</string>
     <string name="lock_with_biometrics">Tocat a l\'isblocare</string>
@@ -402,9 +399,7 @@
         <item quantity="one">Pro 1 tìtulu</item>
         <item quantity="other">Pro %d tìtulos</item>
     </plurals>
-    <string name="pref_theme_light">Tema craru</string>
-    <string name="theme_light_default">Predefinidu</string>
-    <string name="theme_light_blue">Biaitu craru</string>
+    <string name="theme_default">Predefinidu</string>
     <string name="action_menu">Menù</string>
     <string name="action_reorganize_by">Riòrdina</string>
     <string name="action_newest">Prus noos</string>
@@ -639,7 +634,7 @@
     <string name="source_unsupported">Sa mitza no est suportada</string>
     <string name="unread">Non lèghidos</string>
     <string name="pref_auto_add_track">Arrasta a sa muda cando annanghes manga a sa biblioteca</string>
-    <string name="theme_light_strawberrydaiquiri">Daiquiri de fràgola</string>
+    <string name="theme_strawberrydaiquiri">Daiquiri de fràgola</string>
     <string name="date">Data</string>
     <string name="local_filter_order_by">Òrdina pro</string>
     <string name="local_invalid_format">Formadu de su capìtulu non vàlidu</string>
@@ -647,7 +642,7 @@
     <string name="pref_library_update_refresh_trackers_summary">Agiorna sos arrastadores cando agiornas sa biblioteca</string>
     <string name="pref_library_update_refresh_trackers">Agiorna sos arrastadores automaticamente</string>
     <string name="pref_move_side_nav_to_bottom">Moe sos butones de navigatzione laterales cara a bassu</string>
-    <string name="theme_dark_amoled_hotpink">Rosa caente</string>
-    <string name="theme_dark_midnightdusk">Intrinada de mesanote</string>
-    <string name="theme_dark_greenapple">Mela birde</string>
+    <string name="theme_hotpink">Rosa caente</string>
+    <string name="theme_midnightdusk">Intrinada de mesanote</string>
+    <string name="theme_greenapple">Mela birde</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ab9d031b12..f6e7e1df1e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -279,10 +279,7 @@
     <string name="theme_light">Isključeno</string>
     <string name="theme_dark">Upaljeno</string>
     <string name="theme_system">Prati sistem</string>
-    <string name="pref_theme_dark">Tamna tema</string>
-    <string name="theme_dark_default">Normalno</string>
-    <string name="theme_dark_blue">Tamno plavo</string>
-    <string name="theme_dark_amoled">AMOLED crno</string>
+    <string name="theme_darkblue">Tamno plavo</string>
     <string name="pref_manage_notifications">Podesi notifikacije</string>
     <string name="pref_category_security">Bezbednost</string>
     <string name="lock_when_idle">Zaključaj kada nekorišćeno</string>
@@ -312,9 +309,7 @@
     <string name="secure_screen_summary">Sakrij prikaz aplikacije kada mijenjate aplikaciju i blokiraj screenshot-ove</string>
     <string name="lock_with_biometrics">Biometrijski zaključaj</string>
     <string name="pref_confirm_exit">Potvrdi izlaz</string>
-    <string name="theme_light_blue">Svetlo plava</string>
-    <string name="theme_light_default">Podrazumevano</string>
-    <string name="pref_theme_light">Svijetla tema</string>
+    <string name="theme_default">Podrazumevano</string>
     <string name="action_move_to_bottom">Premesti na dno</string>
     <string name="action_move_to_top">Premesti na vrh</string>
     <string name="action_oldest">Najstarije</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a5672bbdf7..d735cbe798 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Av</string>
     <string name="theme_dark">På</string>
     <string name="theme_system">Följ systemet</string>
-    <string name="pref_theme_dark">Mörkt tema</string>
-    <string name="theme_dark_default">Standard</string>
-    <string name="theme_dark_blue">Mörkblå</string>
-    <string name="theme_dark_amoled">AMOLED svart</string>
+    <string name="theme_darkblue">Mörkblå</string>
     <string name="pref_manage_notifications">Hantera aviseringar</string>
     <string name="pref_category_security">Säkerhet</string>
     <string name="lock_with_biometrics">Kräv upplåsning</string>
@@ -402,9 +399,7 @@
         <item quantity="one">För 1 titel</item>
         <item quantity="other">För %d titlar</item>
     </plurals>
-    <string name="pref_theme_light">Ljust tema</string>
-    <string name="theme_light_default">Standard</string>
-    <string name="theme_light_blue">Ljusblå</string>
+    <string name="theme_default">Standard</string>
     <string name="action_menu">Meny</string>
     <string name="action_reorganize_by">Ändra ordning</string>
     <string name="action_newest">Nyaste</string>
@@ -646,10 +641,10 @@
     <string name="chapter_not_found">Kapitlet hittades inte</string>
     <string name="pref_library_update_refresh_trackers_summary">Uppdatera spårare när du uppdaterar biblioteket</string>
     <string name="pref_library_update_refresh_trackers">Uppdatera spårare automatiskt</string>
-    <string name="theme_dark_amoled_hotpink">Skrikrosa</string>
-    <string name="theme_dark_midnightdusk">Midnattskymning</string>
-    <string name="theme_dark_greenapple">Grönt äpple</string>
-    <string name="theme_light_strawberrydaiquiri">Jordgubbs-Daiquiri</string>
+    <string name="theme_hotpink">Skrikrosa</string>
+    <string name="theme_midnightdusk">Midnattskymning</string>
+    <string name="theme_greenapple">Grönt äpple</string>
+    <string name="theme_strawberrydaiquiri">Jordgubbs-Daiquiri</string>
     <string name="restrictions">Begränsningar: %s</string>
     <string name="action_display_local_badge">Lokala märken</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 6b68c4ac25..32b08c77d0 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -409,13 +409,8 @@
     <string name="pref_hide_bottom_bar_on_scroll">ซ่อนแถบด้านล่างเมื่อเลื่อน</string>
     <string name="pref_confirm_exit">ยืนยันการออก</string>
     <string name="pref_date_format">รูปแบบวันที่</string>
-    <string name="theme_dark_amoled">สีดํา AMOLED</string>
-    <string name="theme_dark_blue">สีน้ำเงินเข้ม</string>
-    <string name="theme_dark_default">ค่าปกติ</string>
-    <string name="pref_theme_dark">ธีมสีเข้ม</string>
-    <string name="theme_light_blue">ฟ้าอ่อน</string>
-    <string name="theme_light_default">ค่าปกติ</string>
-    <string name="pref_theme_light">ธีมสีอ่อน</string>
+    <string name="theme_darkblue">สีน้ำเงินเข้ม</string>
+    <string name="theme_default">ค่าปกติ</string>
     <string name="theme_dark">เปิด</string>
     <string name="theme_light">ปิด</string>
     <string name="theme_system">ตามระบบ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2e6da4cb6a..1120955c79 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Kapalı</string>
     <string name="theme_dark">Açık</string>
     <string name="theme_system">Sisteme uy</string>
-    <string name="pref_theme_dark">Karanlık tema</string>
-    <string name="theme_dark_default">Öntanımlı</string>
-    <string name="theme_dark_blue">Koyu Mavi</string>
-    <string name="theme_dark_amoled">AMOLED Siyah</string>
+    <string name="theme_darkblue">Koyu Mavi</string>
     <string name="pref_manage_notifications">Bildirimleri yönet</string>
     <string name="pref_category_security">Güvenlik</string>
     <string name="lock_with_biometrics">Kilit açma gerektir</string>
@@ -402,9 +399,7 @@
         <item quantity="one">1 başlık için</item>
         <item quantity="other">%d başlık için</item>
     </plurals>
-    <string name="pref_theme_light">Aydınlık tema</string>
-    <string name="theme_light_default">Öntanımlı</string>
-    <string name="theme_light_blue">Açık Mavi</string>
+    <string name="theme_default">Öntanımlı</string>
     <string name="action_menu">Menü</string>
     <string name="action_reorganize_by">Yeniden sırala</string>
     <string name="action_newest">En yeni</string>
@@ -640,16 +635,16 @@
     <string name="unread">Okunmayan</string>
     <string name="pref_auto_add_track">Kitaplığa manga eklerken sessizce izle</string>
     <string name="pref_move_side_nav_to_bottom">Yan gezinme düğmelerini alta taşı</string>
-    <string name="theme_dark_amoled_hotpink">Sıcak Pembe</string>
-    <string name="theme_dark_midnightdusk">Alacakaranlık</string>
+    <string name="theme_hotpink">Sıcak Pembe</string>
+    <string name="theme_midnightdusk">Alacakaranlık</string>
     <string name="date">Tarih</string>
     <string name="local_filter_order_by">Sıralama ölçütü</string>
     <string name="local_invalid_format">Geçersiz bölüm biçimi</string>
     <string name="chapter_not_found">Bölüm bulunamadı</string>
     <string name="pref_library_update_refresh_trackers_summary">Kitaplığı güncellerken izleyicileri güncelle</string>
     <string name="pref_library_update_refresh_trackers">İzleyicileri otomatik olarak güncelle</string>
-    <string name="theme_light_strawberrydaiquiri">Çilekli Kokteyl</string>
-    <string name="theme_dark_greenapple">Yeşil Elma</string>
+    <string name="theme_strawberrydaiquiri">Çilekli Kokteyl</string>
+    <string name="theme_greenapple">Yeşil Elma</string>
     <string name="restrictions">Kısıtlamalar: %s</string>
     <string name="action_display_local_badge">Yerel rozetler</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 466a4c3d19..94c7f6f0ef 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -357,10 +357,7 @@
     <string name="theme_light">Вимкнено</string>
     <string name="theme_dark">Увімкнено</string>
     <string name="theme_system">Використовувати системну</string>
-    <string name="pref_theme_dark">Темна тема</string>
-    <string name="theme_dark_default">За замовчуванням</string>
-    <string name="theme_dark_blue">Темно-синя</string>
-    <string name="theme_dark_amoled">AMOLED чорна</string>
+    <string name="theme_darkblue">Темно-синя</string>
     <string name="pref_manage_notifications">Керування сповіщеннями</string>
     <string name="pref_category_security">Безпека</string>
     <string name="lock_with_biometrics">Вимагати розблокування</string>
@@ -407,9 +404,7 @@
         <item quantity="few">Для %d тайтлів</item>
         <item quantity="many">Для %d тайтлів</item>
     </plurals>
-    <string name="pref_theme_light">Світла тема</string>
-    <string name="theme_light_default">За замовчуванням</string>
-    <string name="theme_light_blue">Блакитна</string>
+    <string name="theme_default">За замовчуванням</string>
     <string name="action_menu">Меню</string>
     <string name="action_reorganize_by">Переупорядкувати</string>
     <string name="action_newest">Найновіші</string>
diff --git a/app/src/main/res/values-v27/bools.xml b/app/src/main/res/values-v27/bools.xml
new file mode 100644
index 0000000000..9e125852c2
--- /dev/null
+++ b/app/src/main/res/values-v27/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightStatusBar">true</bool>
+    <bool name="lightNavigationBar">true</bool>
+</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 7087b33603..bef846eb33 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
+    <style name="Base.V27.Tachiyomi" parent="Base.Theme.Tachiyomi">
         <item name="android:navigationBarColor">?attr/colorSurface</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/lightNavigationBar</item>
     </style>
 
-    <style name="Theme.Tachiyomi.Light" parent="Base.V27.Theme.Tachiyomi.Light" />
+    <style name="Theme.Tachiyomi" parent="Base.V27.Tachiyomi" />
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index b9063aba13..46bbc5a29f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -416,13 +416,8 @@
     <string name="pref_category_security">Bảo mật</string>
     <string name="pref_manage_notifications">Quản lý thông báo</string>
     <string name="pref_date_format">Định dạng ngày</string>
-    <string name="theme_dark_amoled">AMOLED đen</string>
-    <string name="theme_dark_blue">Xanh đen</string>
-    <string name="theme_dark_default">Mặc định</string>
-    <string name="pref_theme_dark">Chủ đề tối</string>
-    <string name="theme_light_blue">Xanh trắng</string>
-    <string name="theme_light_default">Mặc định</string>
-    <string name="pref_theme_light">Chủ đề sáng</string>
+    <string name="theme_darkblue">Xanh đen</string>
+    <string name="theme_default">Mặc định</string>
     <string name="theme_system">Theo hệ thống</string>
     <string name="theme_dark">Bật</string>
     <string name="theme_light">Tắt</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2951b05c75..b348725d49 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -357,9 +357,7 @@
     <string name="theme_light">关闭</string>
     <string name="theme_dark">开启</string>
     <string name="theme_system">跟随系统</string>
-    <string name="theme_dark_default">默认</string>
-    <string name="theme_dark_blue">深蓝</string>
-    <string name="theme_dark_amoled">纯黑（AMOLED）</string>
+    <string name="theme_darkblue">深蓝</string>
     <string name="pref_manage_notifications">通知管理</string>
     <string name="pref_category_security">安全</string>
     <string name="lock_when_idle">应用待机时锁定</string>
@@ -375,7 +373,6 @@
     <string name="unlock_app">解锁 Tachiyomi</string>
     <string name="secure_screen_summary">在切换应用时隐藏预览，并禁止截取屏幕截图</string>
     <string name="pref_category_display">显示</string>
-    <string name="pref_theme_dark">深色主题</string>
     <string name="channel_new_chapters">章节更新</string>
     <string name="hide_notification_content">隐藏通知内容</string>
     <string name="lock_with_biometrics">需要解锁</string>
@@ -398,9 +395,7 @@
     <plurals name="notification_new_chapters_summary">
         <item quantity="other">共 %d 个漫画</item>
     </plurals>
-    <string name="pref_theme_light">浅色主题</string>
-    <string name="theme_light_default">默认</string>
-    <string name="theme_light_blue">浅蓝</string>
+    <string name="theme_default">默认</string>
     <string name="action_menu">菜单</string>
     <string name="action_reorganize_by">重新排序</string>
     <string name="action_newest">最新</string>
@@ -628,16 +623,16 @@
     <string name="source_unsupported">源不受支持</string>
     <string name="unread">未读</string>
     <string name="pref_move_side_nav_to_bottom">将侧导航按钮移到底部</string>
-    <string name="theme_dark_amoled_hotpink">亮粉</string>
-    <string name="theme_dark_midnightdusk">午夜黄昏</string>
+    <string name="theme_hotpink">亮粉</string>
+    <string name="theme_midnightdusk">午夜黄昏</string>
     <string name="date">日期</string>
     <string name="local_filter_order_by">排序依据</string>
     <string name="local_invalid_format">无效章节格式</string>
     <string name="chapter_not_found">未找到章节</string>
-    <string name="theme_light_strawberrydaiquiri">草莓黛琦莉</string>
+    <string name="theme_strawberrydaiquiri">草莓黛琦莉</string>
     <string name="pref_library_update_refresh_trackers_summary">更新书架时更新追踪器</string>
     <string name="pref_library_update_refresh_trackers">自动更新追踪器</string>
-    <string name="theme_dark_greenapple">绿苹果</string>
+    <string name="theme_greenapple">绿苹果</string>
     <string name="restrictions">限制：%s</string>
     <string name="action_display_local_badge">本地徽章</string>
     <string name="off">关</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 81805423b3..e15bf43738 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -341,15 +341,10 @@
     <string name="invalid_download_dir">無效的下載位置</string>
     <string name="ext_obsolete">過舊</string>
     <string name="obsolete_extension_message">這個擴充套件已無法使用。</string>
-    <string name="theme_light_blue">淺藍</string>
-    <string name="theme_dark_blue">深藍</string>
-    <string name="theme_dark_amoled">全黑 (AMOLED)</string>
-    <string name="pref_theme_dark">深色主題</string>
-    <string name="theme_light_default">預設</string>
-    <string name="pref_theme_light">淺色主題</string>
+    <string name="theme_darkblue">深藍</string>
+    <string name="theme_default">預設</string>
     <string name="theme_light">關閉</string>
     <string name="theme_system">遵循系統</string>
-    <string name="theme_dark_default">預設</string>
     <string name="pref_theme_mode">深色模式</string>
     <string name="theme_dark">開啟</string>
     <string name="pref_date_format">日期格式</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a841e19da1..d6d9e04fa9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -30,4 +30,6 @@
     <!-- For anything that is drawn on the toolbar -->
     <attr name="colorOnToolbar" format="reference|integer"/>
 
+    <attr name="lightSystemBarsOnPrimary" format="reference|boolean"/>
+
 </resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
new file mode 100644
index 0000000000..ab52ba9e3f
--- /dev/null
+++ b/app/src/main/res/values/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightStatusBar">true</bool>
+    <bool name="lightNavigationBar">false</bool>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aa7c2f72fd..5343f94e6c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,11 +3,11 @@
     <color name="splash">@color/accent_lightblue</color>
 
     <!-- Light Theme -->
-    <color name="accent_light">@color/md_blue_A400</color>
-    <color name="divider_light">@color/md_black_1000_12</color>
-    <color name="surface_light">@color/md_white_1000</color>
-    <color name="background_light">@color/md_grey_50</color>
-    <color name="ripple_colored_light">@color/md_blue_A400_12</color>
+    <color name="accent_default">@color/md_blue_A400</color>
+    <color name="divider_default">@color/md_black_1000_12</color>
+    <color name="surface_default">@color/md_white_1000</color>
+    <color name="background_default">@color/md_grey_50</color>
+    <color name="ripple_colored_default">@color/md_blue_A400_12</color>
 
     <!-- Light Blue Theme -->
     <color name="accent_lightblue">#54759E</color>
@@ -21,13 +21,6 @@
     <color name="accent_yotsuba">#FC8C5C</color>
     <color name="ripple_colored_yotsuba">#1FFC8C5C</color>
 
-    <!-- Dark Theme -->
-    <color name="accent_dark">#3399FF</color>
-    <color name="divider_dark">@color/md_white_1000_12</color>
-    <color name="surface_dark">#242529</color>
-    <color name="background_dark">#202125</color>
-    <color name="ripple_colored_dark">#1F3399FF</color>
-
     <!-- Dark Blue Theme -->
     <color name="accent_darkblue">#54759E</color>
     <color name="ripple_colored_darkblue">#1F54759E</color>
@@ -43,11 +36,9 @@
     <color name="ripple_colored_midnightdusk">#1FF02475</color>
 
     <!-- AMOLED Theme -->
-    <color name="accent_amoled">#3399FF</color>
     <color name="divider_amoled">@android:color/transparent</color>
-    <color name="surface_amoled">@color/md_black_1000</color>
-    <color name="background_amoled">@color/md_black_1000</color>
-    <color name="ripple_colored_amoled">#1F3399FF</color>
+    <color name="surface_amoled">#000001</color>
+    <color name="background_amoled">#000000</color>
 
     <!-- Hot Pink Theme -->
     <color name="accent_hotpink">#FF3399</color>
@@ -57,6 +48,8 @@
     <color name="filterColorDark">#FFEB3B</color>
     <color name="filterColorAmoled">#FFEB3B</color>
 
+    <color name="reader_background_dark">#202125</color>
+
     <!-- Material Design Colors -->
     <color name="md_black_1000">#000000</color>
     <color name="md_black_1000_87">#DE000000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be62e41011..212cea1a2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -146,18 +146,15 @@
     <string name="theme_system">Follow system</string>
     <string name="theme_light">Off</string>
     <string name="theme_dark">On</string>
-    <string name="pref_theme_light">Light theme</string>
-    <string name="theme_light_default">Default</string>
-    <string name="theme_light_blue">Light Blue</string>
-    <string name="theme_light_strawberrydaiquiri">Strawberry Daiquiri</string>
-    <string name="theme_light_yotsuba">Yotsuba</string>
-    <string name="pref_theme_dark">Dark theme</string>
-    <string name="theme_dark_default">Default</string>
-    <string name="theme_dark_blue">Dark Blue</string>
-    <string name="theme_dark_greenapple">Green Apple</string>
-    <string name="theme_dark_midnightdusk">Midnight Dusk</string>
-    <string name="theme_dark_amoled">AMOLED Black</string>
-    <string name="theme_dark_amoled_hotpink">AMOLED Hot Pink</string>
+    <string name="pref_app_theme">App theme</string>
+    <string name="theme_default">Default</string>
+    <string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
+    <string name="theme_yotsuba">Yotsuba</string>
+    <string name="theme_darkblue">Dark Blue</string>
+    <string name="theme_greenapple">Green Apple</string>
+    <string name="theme_midnightdusk">Midnight Dusk</string>
+    <string name="theme_hotpink">Hot Pink</string>
+    <string name="pref_dark_theme_pure_black">Pure black dark mode</string>
     <string name="pref_start_screen">Start screen</string>
     <string name="pref_language">Language</string>
     <string name="system_default">Default</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 81f52003da..96865a8dd9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,10 @@
         <item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
     </style>
 
+    <style name="ThemeOverlay.Tachiyomi.ActionBar.Colored" parent="ThemeOverlay.MaterialComponents.ActionBar">
+        <item name="android:colorControlHighlight">?attr/colorOnPrimary</item>
+    </style>
+
     <style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="tint">?attr/colorOnToolbar</item>
     </style>
@@ -254,7 +258,29 @@
         <item name="tabInlineLabel">true</item>
         <item name="tabMinWidth">75dp</item>
         <item name="tabMode">scrollable</item>
-        <item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
+        <item name="tabRippleColor">?attr/colorOnPrimary</item>
+    </style>
+
+
+    <!--================-->
+    <!--Navigation Views-->
+    <!--================-->
+    <style name="Widget.Tachiyomi.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
+        <item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
+        <item name="labelVisibilityMode">labeled</item>
+    </style>
+
+    <style name="Widget.Tachiyomi.BottomNavigationView.Colored" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+        <item name="labelVisibilityMode">labeled</item>
+    </style>
+
+    <style name="Widget.Tachiyomi.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
+        <item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
+        <item name="labelVisibilityMode">labeled</item>
+    </style>
+
+    <style name="Widget.Tachiyomi.NavigationRailView.Colored" parent="Widget.MaterialComponents.NavigationRailView.Colored">
+        <item name="labelVisibilityMode">labeled</item>
     </style>
 
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 91b16da164..858fc9f8b9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,12 +6,12 @@
     <!--============-->
 
     <!--== Theme base ==-->
-    <style name="Theme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Base.Theme.Tachiyomi" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Disallow 'Force dark theme' -->
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_light</item>
+        <item name="colorPrimary">@color/accent_default</item>
         <item name="colorPrimaryVariant">?attr/colorPrimary</item>
         <item name="colorOnPrimary">@color/md_white_1000</item>
         <item name="colorSecondary">?attr/colorPrimary</item>
@@ -21,13 +21,13 @@
         <item name="colorOnTertiary">@color/md_white_1000</item>
         <item name="colorToolbar">?attr/colorSurface</item>
         <item name="colorOnToolbar">?attr/colorOnSurface</item>
-        <item name="colorSurface">@color/surface_light</item>
-        <item name="android:colorBackground">@color/background_light</item>
-        <item name="android:divider">@color/divider_light</item>
+        <item name="colorSurface">@color/surface_default</item>
+        <item name="android:colorBackground">@color/background_default</item>
+        <item name="android:divider">@color/divider_default</item>
         <item name="android:listDivider">@drawable/line_divider</item>
 
         <!-- Ripples -->
-        <item name="colorControlHighlight">@color/ripple_colored_light</item>
+        <item name="colorControlHighlight">@color/ripple_colored_default</item>
         <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
 
         <!-- Handles RTL text -->
@@ -35,8 +35,9 @@
         <item name="android:textDirection">locale</item>
 
         <!-- Themes -->
-        <item name="android:statusBarColor">@color/md_black_1000</item>
-        <item name="android:navigationBarColor">@color/md_black_1000</item>
+        <item name="android:windowLightStatusBar">@bool/lightStatusBar</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
+        <item name="android:navigationBarColor">@color/surface_amoled</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
         <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
@@ -58,8 +59,10 @@
         <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
         <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
-        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
-        <item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
+        <item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView</item>
+        <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView</item>
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="lightSystemBarsOnPrimary">false</item>
 
         <!-- Text Appearances -->
         <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
@@ -76,53 +79,16 @@
         <item name="colorFilterActive">@color/filterColorLight</item>
     </style>
 
-    <!--==============-->
-    <!-- Light Themes -->
-    <!--==============-->
-
-    <!--== Light base ==-->
-    <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base.Light">
-        <!-- Base background/text colors -->
-        <item name="android:statusBarColor">?attr/colorSurface</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
-    <!--== Light theme ==-->
-    <style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
+    <style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" />
 
-    <!--== Light Blue theme ==-->
-    <style name="Theme.Tachiyomi.Light.Blue">
+    <style name="Theme.Tachiyomi.DarkBlue">
         <!-- Theme colors -->
         <item name="colorPrimary">@color/accent_lightblue</item>
-        <item name="colorFilterActive">@color/filterColorDark</item>
-        <item name="colorToolbar">?attr/colorPrimary</item>
-        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
-
-        <!-- Base background/text colors -->
-        <item name="background">@color/accent_lightblue</item>
-
-        <!-- Ripples -->
         <item name="colorControlHighlight">@color/ripple_colored_lightblue</item>
-        <item name="rippleColorToolbar">@color/md_white_1000_12</item>
-
-        <!-- Themes -->
-        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
-        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
-        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
-        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
-        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
-        <item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView.Colored</item>
-
-        <!-- Status/Navigation bar -->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
     </style>
 
     <!--== Strawberry Daiquiri theme ==-->
-    <style name="Theme.Tachiyomi.Light.StrawberryDaiquiri">
+    <style name="Theme.Tachiyomi.StrawberryDaiquiri">
         <!-- Theme colors -->
         <item name="colorPrimary">@color/accent_strawberry</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
@@ -130,226 +96,65 @@
     </style>
 
     <!--== Yotsuba theme ==-->
-    <style name="Theme.Tachiyomi.Light.Yotsuba">
+    <style name="Theme.Tachiyomi.Yotsuba">
         <!-- Theme colors -->
         <item name="colorPrimary">@color/accent_yotsuba</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
         <item name="colorControlHighlight">@color/ripple_colored_yotsuba</item>
     </style>
 
-    <!--=============-->
-    <!-- Dark Themes -->
-    <!--=============-->
-
-    <!--== Dark base ==-->
-    <style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
-        <!-- Disallow 'Force dark theme' -->
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-        <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_dark</item>
-        <item name="colorPrimaryVariant">?attr/colorPrimary</item>
-        <item name="colorOnPrimary">@color/md_white_1000</item>
-        <item name="colorSecondary">?attr/colorPrimary</item>
-        <item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
-        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
-        <item name="colorTertiary">@color/green</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorToolbar">?attr/colorSurface</item>
-        <item name="colorOnToolbar">?attr/colorOnSurface</item>
-        <item name="colorSurface">@color/surface_dark</item>
-        <item name="android:colorBackground">@color/background_dark</item>
-        <item name="android:divider">@color/divider_dark</item>
-        <item name="android:listDivider">@drawable/line_divider</item>
-
-        <!-- Ripples -->
-        <item name="colorControlHighlight">@color/ripple_colored_dark</item>
-        <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
-
-        <!-- Handles RTL text -->
-        <item name="android:textAlignment">gravity</item>
-        <item name="android:textDirection">locale</item>
-
-        <!-- Themes -->
-        <item name="android:statusBarColor">@color/md_black_1000</item>
-        <item name="android:navigationBarColor">@color/md_black_1000</item>
-        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
-        <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
-        <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
-        <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-        <item name="android:backgroundDimAmount">0.32</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
-        <item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
-        <item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
-        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
-        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
-        <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
-        <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
-        <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
-        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
-        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
-        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
-        <item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
-        <item name="elevationOverlayEnabled">false</item>
-
-        <!-- Text Appearances -->
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-
-        <!-- Material Dialogs -->
-        <item name="md_background_color">?attr/colorSurface</item>
-        <item name="md_color_title">?attr/colorOnSurface</item>
-        <item name="md_color_content">?attr/colorOnSurface</item>
-        <item name="md_color_button_text">?attr/colorPrimary</item>
-        <item name="md_button_casing">literal</item>
-        <item name="md_corner_radius">@dimen/dialog_radius</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorFilterActive">@color/filterColorDark</item>
-    </style>
-
-    <!--== Dark theme ==-->
-    <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
-        <item name="android:statusBarColor">?attr/colorSurface</item>
-        <item name="android:navigationBarColor">?attr/colorSurface</item>
-    </style>
-
-    <!--== Dark Blue theme ==-->
-    <style name="Theme.Tachiyomi.Dark.Blue">
-        <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_darkblue</item>
-        <item name="colorToolbar">?attr/colorPrimary</item>
-        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
-
-        <!-- Ripples -->
-        <item name="colorControlHighlight">@color/ripple_colored_darkblue</item>
-        <item name="rippleColorToolbar">@color/md_white_1000_12</item>
-
-        <!-- Themes -->
-        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
-        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
-        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
-        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
-        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
-        <item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView.Colored</item>
-
-        <!-- Status/Navigation bar -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
-    </style>
-
     <!--== Green Apple theme ==-->
-    <style name="Theme.Tachiyomi.Dark.GreenApple">
+    <style name="Theme.Tachiyomi.GreenApple">
         <!-- Theme colors -->
         <item name="colorPrimary">@color/accent_greenapple</item>
         <item name="colorOnPrimary">@color/md_black_1000</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
         <item name="colorControlHighlight">@color/ripple_colored_greenapple</item>
+        <item name="lightSystemBarsOnPrimary">true</item>
     </style>
 
     <!--== Midnight Dusk theme ==-->
-    <style name="Theme.Tachiyomi.Dark.MidnightDusk">
+    <style name="Theme.Tachiyomi.MidnightDusk">
         <!-- Theme colors -->
         <item name="colorPrimary">@color/accent_midnightdusk</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorSurface">@color/surface_midnightdusk</item>
-        <item name="android:colorBackground">@color/background_midnightdusk</item>
         <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
     </style>
 
-    <!--===============-->
-    <!-- AMOLED Themes -->
-    <!--===============-->
-
-    <!--== AMOLED base ==-->
-    <style name="Theme.Base.Amoled" parent="Theme.MaterialComponents.NoActionBar">
-        <!-- Disallow 'Force dark theme' -->
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
+    <!--== Hot Pink theme ==-->
+    <style name="Theme.Tachiyomi.HotPink">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_amoled</item>
-        <item name="colorPrimaryVariant">?attr/colorPrimary</item>
-        <item name="colorOnPrimary">@color/md_white_1000</item>
-        <item name="colorSecondary">?attr/colorPrimary</item>
-        <item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
-        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
-        <item name="colorTertiary">@color/green</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorToolbar">?attr/colorSurface</item>
-        <item name="colorOnToolbar">?attr/colorOnSurface</item>
-        <item name="colorSurface">@color/surface_amoled</item>
-        <item name="android:colorBackground">@color/background_amoled</item>
-        <item name="android:divider">@color/divider_amoled</item>
-        <item name="android:listDivider">@drawable/line_divider</item>
+        <item name="colorPrimary">@color/accent_hotpink</item>
+        <item name="colorTertiary">@color/md_blue_A400</item>
+        <item name="colorControlHighlight">@color/ripple_colored_hotpink</item>
+    </style>
 
-        <!-- Ripples -->
-        <item name="colorControlHighlight">@color/ripple_colored_amoled</item>
-        <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
+    <!--== AMOLED theme overlay ==-->
+    <style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
 
-        <!-- Handles RTL text -->
-        <item name="android:textAlignment">gravity</item>
-        <item name="android:textDirection">locale</item>
+    <!--== Colored bars (toolbar-navbar-navrail) theme overlay ==-->
+    <style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
+        <item name="colorToolbar">?attr/colorPrimary</item>
+        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
+
+        <!-- Base background/text colors -->
+        <item name="background">?attr/colorPrimary</item>
 
         <!-- Themes -->
-        <item name="android:statusBarColor">?attr/colorSurface</item>
-        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
-        <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
-        <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
-        <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-        <item name="android:backgroundDimAmount">0.32</item>
-        <item name="windowActionModeOverlay">true</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar.Colored</item>
         <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
-        <item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
-        <item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
-        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
-        <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
-        <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
-        <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
-        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
-        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
-        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
-        <item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
-        <item name="elevationOverlayEnabled">false</item>
-
-        <!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
-        <item name="android:navigationBarColor">#000001</item>
-
-        <!-- Text Appearances -->
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-
-        <!-- Material Dialogs -->
-        <item name="md_background_color">?attr/colorSurface</item>
-        <item name="md_color_title">?attr/colorOnSurface</item>
-        <item name="md_color_content">?attr/colorOnSurface</item>
-        <item name="md_color_button_text">?attr/colorPrimary</item>
-        <item name="md_button_casing">literal</item>
-        <item name="md_corner_radius">@dimen/dialog_radius</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorFilterActive">@color/filterColorAmoled</item>
-    </style>
-
-    <!--== AMOLED theme ==-->
-    <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled" />
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
+        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
+        <item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView.Colored</item>
+        <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView.Colored</item>
 
-    <!--== Hot Pink theme ==-->
-    <style name="Theme.Tachiyomi.Amoled.HotPink">
-        <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_hotpink</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_hotpink</item>
+        <!-- Status/Navigation bar -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">?attr/lightSystemBarsOnPrimary</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">?attr/lightSystemBarsOnPrimary</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?attr/colorPrimary</item>
     </style>
 
     <!--===============-->
@@ -357,10 +162,12 @@
     <!--===============-->
 
     <!--== Splash theme ==-->
-    <style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
+    <style name="Theme.Splash" parent="Theme.Tachiyomi">
         <item name="android:windowBackground">@drawable/splash_background</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
 </resources>