diff --git a/app/src/main/res/values-night/theme_dark_grey.xml b/app/src/main/res/values-night/theme_dark_grey.xml
deleted file mode 100644
index 17c7707db..000000000
--- a/app/src/main/res/values-night/theme_dark_grey.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <style name="DarkGrey" parent="DarkGrey_Base">
-    <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
-    <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
-    <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
-  </style>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/theme_white.xml b/app/src/main/res/values-night/theme_white.xml
deleted file mode 100644
index 444468ced..000000000
--- a/app/src/main/res/values-night/theme_white.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <style name="White" parent="White_Base"/>
-
-</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 69a66b517..1fd8a0379 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,11 +42,17 @@
     <item name="android:actionOverflowButtonStyle">@style/BlackOverflow</item>
   </style>
 
-  <style name="WhiteTint">
+  <style name="ThemeBase">
+    <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
+    <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
+    <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
+  </style>
+
+  <style name="WhiteTint" parent="ThemeBase">
     <item name="colorOnSecondary">@color/white_100</item>
   </style>
 
-  <style name="BlackTint">
+  <style name="BlackTint" parent="ThemeBase">
     <item name="colorOnSecondary">@color/black_87</item>
   </style>
 
diff --git a/app/src/main/res/values/theme_dark_grey.xml b/app/src/main/res/values/theme_dark_grey.xml
index 125c8919f..e6e9e1985 100644
--- a/app/src/main/res/values/theme_dark_grey.xml
+++ b/app/src/main/res/values/theme_dark_grey.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="DarkGrey_Base" parent="WhiteToolbarTheme">
+  <style name="DarkGrey" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/grey_900</item>
     <item name="colorPrimaryVariant">@color/grey_statusbar</item>
   </style>
 
-  <style name="DarkGrey" parent="DarkGrey_Base"/>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index fe7b47e8b..08dce7c80 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="White_Base" parent="BlackToolbarTheme">
+  <style name="White" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/white_100</item>
     <item name="colorPrimaryVariant">@color/white_100</item>
   </style>
 
-  <style name="White" parent="White_Base">
-    <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
-    <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
-    <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
-  </style>
-
 </resources>
\ No newline at end of file