diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 09d158a7..61a21049 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -46,8 +46,8 @@
 	<color name="cpp_metro_blue">#10648c</color>
 	<color name="cpp_material_blue">#ff0d4663</color>
 	<color name="cpp_material_blue_lighter">#ff0d668d</color>
-	<color name="cpp_material_light">#4285f4</color>
-	<color name="cpp_material_light_darker">#ff3463bd</color>
+	<color name="cpp_material_light">#42d5b2</color>
+	<color name="cpp_material_light_darker">#ff38b99a</color>
 	<color name="cpp_material_light_disabled">#c1d2ef</color>
 	<color name="cpp_metro_blue_dark">#ff092c39</color>
 	<color name="cpp_metro_green">#088e3a</color>
@@ -56,6 +56,8 @@
 	<color name="cpp_text_primary">#ddffffff</color>
 	<color name="cpp_text_secondary">#89ffffff</color>
 	<color name="cpp_widget_ripple">#40ffffff</color>
+	<color name="cpp_status_bar">#ff131313</color>
+	<color name="cpp_status_bar_light">#262626</color>
 
 	<color name="cpp_wizard_disabled_text">#66ffffff</color>
 
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index 565e60a7..6d0a5aa1 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -30,6 +30,7 @@
 		<item name="colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
+		<item name="android:statusBarColor">@color/cpp_status_bar</item>
 
 		<item name="android:windowBackground">@color/cpp_main_bg</item>
 
@@ -39,8 +40,6 @@
 		<item name="cpp_main_bg">@color/cpp_main_bg</item>
 		<item name="cpp_pane_bg">@drawable/pane</item>
 		<item name="cpp_fab_bg">@color/cpp_material_grey</item>
-		<item name="android:textColorPrimary">@color/cpp_text</item>
-		<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
 	</style>
 
 	<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.Dialog">
@@ -51,6 +50,7 @@
 		<item name="colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
+		<item name="android:statusBarColor">@color/cpp_status_bar</item>
 
 		<item name="android:windowNoTitle">false</item>
 		<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
@@ -60,8 +60,6 @@
 		<item name="cpp_main_bg">@color/cpp_main_bg</item>
 		<item name="cpp_pane_bg">@drawable/pane</item>
 		<item name="cpp_fab_bg">@color/cpp_material_grey</item>
-		<item name="android:textColorPrimary">@color/cpp_text</item>
-		<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
 	</style>
 
 	<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -73,6 +71,7 @@
 		<item name="android:colorPrimaryDark">@color/cpp_material_light</item>
 		<item name="colorAccent">@color/cpp_material_light</item>
 		<item name="android:colorAccent">@color/cpp_material_light</item>
+		<item name="android:statusBarColor">@color/cpp_status_bar_light</item>
 
 		<item name="actionBarStyle">@style/CppActionBar.Light</item>
 		<item name="android:actionBarStyle">@style/CppActionBar.Light</item>
@@ -80,8 +79,6 @@
 		<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
 		<item name="cpp_pane_bg">@drawable/pane_light</item>
 		<item name="cpp_fab_bg">@color/cpp_material_light</item>
-		<item name="android:textColorPrimary">@color/cpp_text_inverse</item>
-		<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>
 	</style>
 
 	<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
@@ -91,6 +88,7 @@
 		<item name="android:colorPrimaryDark">@color/cpp_material_light</item>
 		<item name="colorAccent">@color/cpp_material_light</item>
 		<item name="android:colorAccent">@color/cpp_material_light</item>
+		<item name="android:statusBarColor">@color/cpp_status_bar_light</item>
 
 		<item name="android:windowNoTitle">false</item>
 		<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
@@ -100,8 +98,6 @@
 		<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
 		<item name="cpp_pane_bg">@drawable/pane_light</item>
 		<item name="cpp_fab_bg">@color/cpp_material_light</item>
-		<item name="android:textColorPrimary">@color/cpp_text_inverse</item>
-		<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>
 	</style>
 
 	<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">