3 files changed, 5 insertions, 11 deletions
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 47f419248..000000000
--- a/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ConversationsTheme.Dark" parent="ConversationsTheme.Dark.Base">
-        <item name="android:navigationBarColor">@color/realblack</item>
-    </style>
-</resources>
-\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a3c95305c..3b9c7c3df 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="primary">#ff0D47A1</color>  <!-- blue 900 -->
     <color name="primary_dark">#ff1A237E</color>  <!-- indigo 900 -->
     <color name="accent">#ff0091ea</color> <!-- light blue accent -->
+    <color name="black">#ff000000</color>
     <color name="black87">#de000309</color>
     <color name="black54">#8a000309</color>
     <color name="black26">#42000000</color>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c59eb6f3b..9acdd4c96 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
@@ -158,9 +158,7 @@
         <item name="ic_settings_about" type="reference">@drawable/ic_help_black_24dp</item>
     </style>
 
-    <style name="ConversationsTheme.Dark" parent="ConversationsTheme.Dark.Base" />
-
-    <style name="ConversationsTheme.Dark.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
@@ -168,6 +166,7 @@
         <item name="colorControlNormal">@color/accent</item>
         <item name="colorControlActivated">@color/accent</item>
         <item name="text_Color_Main">@color/realwhite</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
 
         <item name="color_background_primary">@color/grey700</item>
         <item name="color_background_secondary">@color/grey800</item>
@@ -367,6 +366,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
     </style>
 
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">