diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 69dc5ab0e4..1c26947662 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -56,6 +56,11 @@ class MainActivity : BaseActivity() {
     lateinit var tabAnimator: TabsAnimator
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        /*delegate.setLocalNightMode(when (preferences.theme()) {
+            1 -> MODE_NIGHT_NO
+            2, 3, 4 -> MODE_NIGHT_YES
+            else -> MODE_NIGHT_FOLLOW_SYSTEM
+        })*/
         setDefaultNightMode(when (preferences.theme()) {
             1 -> MODE_NIGHT_NO
             2, 3, 4 -> MODE_NIGHT_YES
@@ -73,7 +78,7 @@ class MainActivity : BaseActivity() {
             finish()
             return
         }
-        //AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_NO)
+
         setContentView(R.layout.main_activity)
 
         setSupportActionBar(toolbar)
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 47fe4b8e40..4afd1ca7b3 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
@@ -61,12 +61,7 @@ class SettingsGeneralController : SettingsController() {
             defaultValue = "5"
             summary = "%s"
 
-            onChange {newValue ->
-                AppCompatDelegate.setDefaultNightMode(when (newValue) {
-                    "1" -> AppCompatDelegate.MODE_NIGHT_NO
-                    "2", "3", "4" -> AppCompatDelegate.MODE_NIGHT_YES
-                    else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                })
+            onChange {
                 activity?.recreate()
                 true
             }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 1125915dcd..b80e9d0e3c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -16,7 +16,6 @@
     <item name="android:listDivider">@drawable/line_divider_dark</item>
 
     <!-- Themes -->
-    <item name="windowActionModeOverlay">true</item>
     <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
     <item name="preferenceTheme">@style/PreferenceThemeOverlay.Material</item>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 2af45a9f12..ad29ff952c 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -23,7 +23,7 @@
     <!--==============-->
     <!-- Amoled Theme -->
     <!--==============-->
-    <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
+    <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base">
         <!-- Attributes specific for SDK 21 and up  -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
index 8fc07ac2f9..bb7e609435 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/themes.xml
@@ -19,7 +19,7 @@
   <!--==============-->
   <!-- Amoled Theme -->
   <!--==============-->
-  <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
+  <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base">
     <!-- Attributes specific for SDK 21 and up  -->
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3d13686f1d..bea8fc13d6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -58,15 +58,6 @@
         <item name="android:colorBackground">@android:color/white</item>
     </style>
 
-    <style name="Theme.Reader" parent="Theme.Base.Reader.Dark">
-        <!-- Attributes specific for SDK 16 to SDK 20 -->
-    </style>
-
-    <style name="Theme.Reader.Light" parent="Theme.Base.Reader.Light">
-        <!-- Attributes specific for SDK 16 to SDK 20 -->
-    </style>
-
-
     <!--===============-->
     <!-- Launch Screen -->
     <!--===============-->