diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index 0227f0791..246dca8d2 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -28,7 +28,6 @@
             android:layout_alignStart="@+id/statuswrapper"
             android:layout_toStartOf="@+id/device_info"
             android:singleLine="true"
-            android:textColor="@color/primarytext"
             android:typeface="sans" />
 
         <ProgressBar
@@ -51,7 +50,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:gravity="start"
-                android:textColor="@color/primarytext"
                 android:textStyle="bold" />
 
             <TextView
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 91e1b6460..61c6b4ca7 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,8 +1,15 @@
 <resources>
 
     <style name="GadgetbridgeTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/primarydark</item>
+        <item name="android:colorPrimary">@color/primary_light</item>
+        <item name="android:colorPrimaryDark">@color/primarydark_light</item>
         <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColor">@color/primary_text_default_material_light</item>
+    </style>
+    <style name="GadgetbridgeThemeDark" parent="@android:style/Theme.Material">
+        <item name="android:colorPrimary">@color/primary_dark</item>
+        <item name="android:colorPrimaryDark">@color/primarydark_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColor">@color/primary_text_default_material_dark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6ffb4e72d..d81fa9db4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="primary_light" type="color">#ffff5000</color>
+    <color name="primarydark_light" type="color">#f0f03000</color>
+
+    <color name="primary_dark" type="color">#fff03000</color>
+    <color name="primarydark_dark" type="color">#f0f03000</color>
 
-    <color name="primary" type="color">#ffff5000</color>
-    <color name="primarydark" type="color">#f0f03000</color>
     <color name="accent">#ff0091ea</color>
-    <color name="primarytext" type="color">#de000000</color>
-    <color name="secondarytext" type="color">#8a000000</color>
-    <color name="ondarktext" type="color">#fffafafa</color>
-    <color name="primarybackground" type="color">#fffafafa</color>
-    <color name="secondarybackground" type="color">#ffeeeeee</color>
-    <color name="darkbackground" type="color">#ff323232</color>
+    <color name="primarytext" type="color">#ff000000</color>
+    <color name="secondarytext" type="color">#ff808080</color>
     <color name="divider">#1f000000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ecc829a8a..3f1c38025 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,12 +3,12 @@
     <style name="GadgetbridgeTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/GadgetbridgeActionBar</item>
         <item name="android:actionBarWidgetTheme">@style/GadgetbridgeActionBarWidget</item>
-
+        <item name="android:textColor">@color/primarytext</item>
     </style>
 
     <style name="GadgetbridgeActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/primary</item>
-        <item name="android:backgroundStacked">@color/primarydark</item>
+        <item name="android:background">@color/primary_light</item>
+        <item name="android:backgroundStacked">@color/primarydark_light</item>
         <item name="android:displayOptions">showHome|showTitle</item>
         <item name="android:icon">@android:color/transparent</item>
     </style>