diff --git a/app/src/main/res/drawable-v21/library_item_selector_amoled.xml b/app/src/main/res/drawable-v21/library_item_selector_amoled.xml
index 319f4c20f0..b21f488c29 100644
--- a/app/src/main/res/drawable-v21/library_item_selector_amoled.xml
+++ b/app/src/main/res/drawable-v21/library_item_selector_amoled.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/md_blue_grey_900"
+    android:color="@color/selectorColorDark"
     >
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/md_blue_grey_800"/>
+                <color android:color="@color/selectorColorDark"/>
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/md_blue_grey_800"/>
+                <color android:color="@color/selectorColorDark"/>
             </item>
 
             <item>
diff --git a/app/src/main/res/drawable/library_item_selector_amoled.xml b/app/src/main/res/drawable/library_item_selector_amoled.xml
index 6a3bef4b4c..1cf05bdc96 100644
--- a/app/src/main/res/drawable/library_item_selector_amoled.xml
+++ b/app/src/main/res/drawable/library_item_selector_amoled.xml
@@ -2,9 +2,9 @@
 <selector android:exitFadeDuration="@android:integer/config_longAnimTime"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_focused="true" android:drawable="@color/md_blue_grey_800"/>
-    <item android:state_pressed="true" android:drawable="@color/md_blue_grey_800"/>
-    <item android:state_activated="true" android:drawable="@color/md_blue_grey_900"/>
+    <item android:state_focused="true" android:drawable="@color/selectorColorDark"/>
+    <item android:state_pressed="true" android:drawable="@color/selectorColorDark"/>
+    <item android:state_activated="true" android:drawable="@color/selectorColorDark"/>
     <item android:drawable="@color/md_black_1000"/>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index 7f495edcf3..fb62144d77 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -8,7 +8,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?colorPrimaryDark"
+        android:background="@color/colorPrimary"
         android:scaleType="centerCrop"/>
 
     <ImageView
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 73205ba779..e606e9966d 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -26,7 +26,6 @@
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
         <!-- Attributes specific for SDK 21 and up  -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@color/md_black_1000</item>
     </style>
 
     <!--==============-->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4ba50f85ee..e4a43c3b54 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,7 +34,7 @@
     <color name="appBarDark">@color/md_grey_900</color>
     <color name="backgroundDark">#303030</color>
     <color name="dialogDark">@color/md_grey_800</color>
-    <color name="dialog_oled">#141414</color>
+    <color name="dialog_amoled">#141414</color>
 
     <color name="selectorColorDark">@color/md_blue_A200_50</color>
     <color name="iconColorDark">@color/md_white_1000_54</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41478b78ba..b7cb150bfd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -87,14 +87,11 @@
     <!--==============-->
     <style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
         <item name="android:colorBackground">@color/md_black_1000</item>
-        <item name="colorPrimary">@color/appBarDark</item>
-        <item name="colorPrimaryDark">@color/md_blue_grey_900</item>
-        <item name="colorAccent">@color/md_grey_800</item>
 
         <!-- Custom Attributes-->
         <item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
         <item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item>
-        <item name="background_card">@color/dialog_oled</item>
+        <item name="background_card">@color/dialog_amoled</item>
     </style>
 
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">