diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 586b544831..1768e6f4e1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -111,7 +111,7 @@
         <item name="colorFabBackground">@color/lightAmberAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightAmberAccent</item>
+        <item name="colorInfoBackground">@color/lightBluePrimary</item>
 
         <item name="android:textColorLink">@color/lightAmberAccentDark</item>
     </style>
@@ -128,7 +128,7 @@
         <item name="colorFabBackground">@color/lightBlueAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightBlueAccent</item>
+        <item name="colorInfoBackground">@color/lightAmberPrimary</item>
 
         <item name="android:textColorLink">@color/lightBlueAccent</item>
     </style>
@@ -143,7 +143,7 @@
         <item name="colorFabBackground">@color/lightPurpleAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightPurpleAccent</item>
+        <item name="colorInfoBackground">@color/lightYellowPrimary</item>
 
         <item name="android:textColorLink">@color/lightPurpleAccent</item>
     </style>
@@ -158,7 +158,7 @@
         <item name="colorFabBackground">@color/lightYellowAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightYellowAccent</item>
+        <item name="colorInfoBackground">@color/lightPurplePrimary</item>
 
         <item name="android:textColorLink">@color/lightYellowAccent</item>
     </style>
@@ -173,7 +173,7 @@
         <item name="colorFabBackground">@color/lightGreenAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightGreenAccent</item>
+        <item name="colorInfoBackground">@color/lightRedPrimary</item>
 
         <item name="android:textColorLink">@color/lightGreenAccent</item>
     </style>
@@ -188,7 +188,7 @@
         <item name="colorFabBackground">@color/lightRedAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/lightRedAccent</item>
+        <item name="colorInfoBackground">@color/lightGreenPrimary</item>
 
         <item name="android:textColorLink">@color/lightRedAccent</item>
     </style>
@@ -206,8 +206,8 @@
 
         <item name="colorFabBackground">@color/darkAmberAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkAmberAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkBluePrimary</item>
     </style>
 
     <style name="AppThemeOrangeBlueDark" parent="AppThemeBaseDark">
@@ -221,8 +221,8 @@
 
         <item name="colorFabBackground">@color/darkBlueAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkBlueAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkAmberPrimary</item>
     </style>
 
     <style name="AppThemeYellowPurpleDark" parent="AppThemeBaseDark">
@@ -234,8 +234,8 @@
 
         <item name="colorFabBackground">@color/darkPurpleAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkPurpleAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkYellowPrimary</item>
 
         <item name="android:textColorLink">@color/darkPurpleAccent</item>
     </style>
@@ -249,8 +249,8 @@
 
         <item name="colorFabBackground">@color/darkYellowAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkYellowAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkPurplePrimary</item>
 
         <item name="android:textColorLink">@color/darkYellowAccent</item>
     </style>
@@ -264,8 +264,8 @@
 
         <item name="colorFabBackground">@color/darkGreenAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkGreenAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkRedPrimary</item>
 
         <item name="android:textColorLink">@color/darkGreenAccent</item>
     </style>
@@ -279,8 +279,8 @@
 
         <item name="colorFabBackground">@color/darkRedAccent</item>
 
-        <item name="colorInfoForeground">@color/black</item>
-        <item name="colorInfoBackground">@color/darkRedAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkGreenPrimary</item>
 
         <item name="android:textColorLink">@color/darkRedAccent</item>
     </style>
@@ -292,6 +292,9 @@
         <item name="colorPrimary">@color/blackPrimary</item>
         <item name="colorPrimaryDark">@color/blackPrimaryDark</item>
 
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/blackPrimary</item>
+
         <item name="android:windowBackground">@color/black</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
@@ -308,7 +311,7 @@
         <item name="colorFabBackground">@color/greyAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/greyAccent</item>
+        <item name="colorInfoBackground">@color/greyPrimary</item>
     </style>
 
     <style name="AppThemeGreySteelBlueDark" parent="AppThemeBlack">
@@ -324,7 +327,7 @@
         <item name="colorFabBackground">@color/greyAccentDark</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/greyAccentDark</item>
+        <item name="colorInfoBackground">@color/greyPrimary</item>
     </style>
 
     <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">