diff --git a/app/src/main/res/values/themes_amoled.xml b/app/src/main/res/values/themes_amoled.xml
index a2cbaa0f0c8602df3fdfac0f7fc6a1c7be33dab3..e2db709aeeda68537fb359455a855535e77f1cd9 100644
--- a/app/src/main/res/values/themes_amoled.xml
+++ b/app/src/main/res/values/themes_amoled.xml
@@ -44,10 +44,10 @@
     <item name="senderColorE">#b39775</item>
     <item name="senderColorF">#3176b3</item>
 
-    <item name="colorTextPrimary">#dedede</item>
-    <item name="colorTextPrimaryInverse">#303030</item>
-    <item name="colorTextSecondary">#8a8a8a</item>
-    <item name="colorTextSecondaryInverse">#757575</item>
+    <item name="colorTextPrimary">#ffffffff</item>
+    <item name="colorTextPrimaryInverse">#de000000</item>
+    <item name="colorTextSecondary">#b3ffffff</item>
+    <item name="colorTextSecondaryInverse">#8a000000</item>
     <item name="colorDivider">#1FFFFFFF</item>
 
     <item name="colorForeground">#FFFFFF</item>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index c19d5dd8409220defe7a0ed32b4feacd878ef09e..b13b69e61b78ba67ba9fc32ae173faa0d9b9b9f8 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -79,9 +79,10 @@
 
     <item name="windowActionModeOverlay">true</item>
 
-    <item name="colorTextPrimary">#dedede</item>
-    <item name="colorTextPrimaryInverse">?colorBackground</item>
-    <item name="colorTextSecondary">#8a8a8a</item>
+    <item name="colorTextPrimary">#ffffffff</item>
+    <item name="colorTextPrimaryInverse">#de000000</item>
+    <item name="colorTextSecondary">#b3ffffff</item>
+    <item name="colorTextSecondaryInverse">#8a000000</item>
     <item name="colorDivider">#1FFFFFFF</item>
     <item name="android:textColorHint">?colorTextSecondary</item>
 
@@ -114,10 +115,10 @@
     <item name="backgroundMenuItemRounded">@drawable/bg_menuitem_rounded_light</item>
 
     <item name="windowActionModeOverlay">true</item>
-
-    <item name="colorTextPrimary">#212121</item>
-    <item name="colorTextPrimaryInverse">?colorBackground</item>
-    <item name="colorTextSecondary">#757575</item>
+    <item name="colorTextPrimary">#de000000</item>
+    <item name="colorTextPrimaryInverse">#ffffffff</item>
+    <item name="colorTextSecondary">#8a000000</item>
+    <item name="colorTextSecondaryInverse">#b3ffffff</item>
     <item name="colorDivider">#1F000000</item>
     <item name="android:textColorHint">?colorTextSecondary</item>
 
diff --git a/app/src/main/res/values/themes_material.xml b/app/src/main/res/values/themes_material.xml
index 70c1c91bfc0862429c01ae6218a0f72f520387c8..9d4bb747e9af235afd5e2723669793eb1baa4a5c 100644
--- a/app/src/main/res/values/themes_material.xml
+++ b/app/src/main/res/values/themes_material.xml
@@ -40,10 +40,10 @@
     <item name="senderColorE">#9C27B0</item>
     <item name="senderColorF">#C51162</item>
 
-    <item name="colorTextPrimary">#212121</item>
-    <item name="colorTextPrimaryInverse">#FAFAFA</item>
-    <item name="colorTextSecondary">#757575</item>
-    <item name="colorTextSecondaryInverse">#8a8a8a</item>
+    <item name="colorTextPrimary">#de000000</item>
+    <item name="colorTextPrimaryInverse">#ffffffff</item>
+    <item name="colorTextSecondary">#8a000000</item>
+    <item name="colorTextSecondaryInverse">#b3ffffff</item>
     <item name="colorDivider">#1F000000</item>
 
     <item name="colorForeground">#DE000000</item>
@@ -93,10 +93,10 @@
     <item name="senderColorE">#9C27B0</item>
     <item name="senderColorF">#C51162</item>
 
-    <item name="colorTextPrimary">#dedede</item>
-    <item name="colorTextPrimaryInverse">#303030</item>
-    <item name="colorTextSecondary">#8a8a8a</item>
-    <item name="colorTextSecondaryInverse">#757575</item>
+    <item name="colorTextPrimary">#ffffffff</item>
+    <item name="colorTextPrimaryInverse">#de000000</item>
+    <item name="colorTextSecondary">#b3ffffff</item>
+    <item name="colorTextSecondaryInverse">#8a000000</item>
     <item name="colorDivider">#1FFFFFFF</item>
 
     <item name="colorForeground">#FFFFFF</item>
diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml
index 0536dbcc7635da1b5c898a78e379b2e7f914a1ce..3676233a893ef77259fab241784b1aba7335858a 100644
--- a/app/src/main/res/values/themes_quassel.xml
+++ b/app/src/main/res/values/themes_quassel.xml
@@ -40,10 +40,10 @@
     <item name="senderColorE">#b300cc</item>
     <item name="senderColorF">#cc004d</item>
 
-    <item name="colorTextPrimary">#212121</item>
-    <item name="colorTextPrimaryInverse">#FAFAFA</item>
-    <item name="colorTextSecondary">#757575</item>
-    <item name="colorTextSecondaryInverse">#8a8a8a</item>
+    <item name="colorTextPrimary">#de000000</item>
+    <item name="colorTextPrimaryInverse">#ffffffff</item>
+    <item name="colorTextSecondary">#8a000000</item>
+    <item name="colorTextSecondaryInverse">#b3ffffff</item>
     <item name="colorDivider">#1F000000</item>
 
     <item name="colorForeground">#DE000000</item>
@@ -93,10 +93,10 @@
     <item name="senderColorE">#b300cc</item>
     <item name="senderColorF">#cc004d</item>
 
-    <item name="colorTextPrimary">#dedede</item>
-    <item name="colorTextPrimaryInverse">#303030</item>
-    <item name="colorTextSecondary">#8a8a8a</item>
-    <item name="colorTextSecondaryInverse">#757575</item>
+    <item name="colorTextPrimary">#ffffffff</item>
+    <item name="colorTextPrimaryInverse">#de000000</item>
+    <item name="colorTextSecondary">#b3ffffff</item>
+    <item name="colorTextSecondaryInverse">#8a000000</item>
     <item name="colorDivider">#1FFFFFFF</item>
 
     <item name="colorForeground">#FFFFFF</item>