diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt
index 415b1b8d5..bf1ef7a75 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt
@@ -24,4 +24,8 @@ class Batoto : Source {
         return Observable.error(Exception("RIP Batoto"))
     }
 
+    override fun toString(): String {
+        return "$name (EN)"
+    }
+
 }
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index caaa1c55c..346e9027e 100755
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -27,7 +27,7 @@
         <!-- Attributes specific for SDK 21 and up  -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@color/colorAmoled</item>
+        <item name="android:navigationBarColor">@color/colorAmoledPrimary</item>
     </style>
 
     <!--==============-->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 014063490..376e00dbb 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application Colors -->
-    <color name="colorPrimary">#54759e</color>
-    <color name="colorPrimaryDark">#435e7e</color>
+    <color name="colorPrimary">#54759E</color>
+    <color name="colorPrimaryDark">#435E7E</color>
     <!-- Dark Application Colors -->
     <color name="colorDarkPrimary">#212121</color>
-    <color name="colorDarkPrimaryDark">#1c1c1d</color>
-    <color name="colorAmoled">@color/md_black_1000</color>
+    <color name="colorDarkPrimaryDark">#1C1C1D</color>
+    <color name="colorAmoledPrimary">@color/md_black_1000</color>
 
     <!-- Light Theme -->
     <color name="colorAccentLight">@color/md_blue_A400</color>
@@ -27,7 +27,7 @@
     <color name="iconColorLight">@color/md_black_1000</color>
 
     <!-- Dark Theme -->
-    <color name="colorAccentDark">#3399ff</color>
+    <color name="colorAccentDark">#3399FF</color>
     <color name="textColorPrimaryDark">@color/md_white_1000</color>
     <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
     <color name="textColorHintDark">@color/md_white_1000_50</color>
@@ -36,7 +36,7 @@
 
     <color name="statusBarDark">@color/md_black_1000</color>
     <color name="appBarDark">@color/md_grey_900</color>
-    <color name="backgroundDark">#1c1c1d</color>
+    <color name="backgroundDark">@color/colorDarkPrimaryDark</color>
     <color name="dialogDark">@color/colorDarkPrimary</color>
     <color name="dialog_amoled">@color/colorDarkPrimaryDark</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b35b2ed43..83611ff6e 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -70,6 +70,7 @@
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Material</item>
+        <item name="md_background_color">@color/dialogDark</item>
         <item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
 
 
@@ -90,8 +91,8 @@
     <!-- Amoled Theme -->
     <!--==============-->
     <style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
-        <item name="colorPrimary">@color/colorAmoled</item>
-        <item name="colorPrimaryDark">@color/colorAmoled</item>
+        <item name="colorPrimary">@color/colorAmoledPrimary</item>
+        <item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
         <item name="android:colorBackground">@color/md_black_1000</item>
 
         <!-- Custom Attributes-->