diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index efa07058..3d6dc203 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -2,39 +2,7 @@
 
 <resources>
 
-    <style name="Toolbar.Logo" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-            <item name="android:textSize">24sp</item>
-    </style>
-    <style name="Theme.Material" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:alertDialogTheme">@style/Theme.Material.Dialog.Alert</item>
-        <item name="android:dialogTheme">@style/Theme.Material.Dialog</item>
-        <item name="android:navigationBarColor">@color/material_accent_700</item>
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorButtonNormal">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
-    </style>
-    <style name="Theme.Material.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
-    </style>
-    <style name="Theme.Material.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
-    </style>
-
-    <style name="PopupTheme" parent="Theme.Material.Dialog">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
+    <style name="Theme.Material.Dialog" parent="Theme.Material.DialogBase"/>
+    <style name="Theme.Material.Dialog.Alert" parent="Theme.Material.Dialog.AlertBase"/>
 
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 78c52a46..dfde6612 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -14,16 +14,20 @@
         <item name="colorPrimary">@color/material_accent_500</item>
         <item name="colorPrimaryDark">@color/material_accent_700</item>
     </style>
-    <style name="Theme.Material.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="Theme.Material.DialogBase" parent="Theme.AppCompat.Light.Dialog">
         <item name="colorAccent">@color/material_accent_500</item>
         <item name="colorPrimary">@color/material_accent_500</item>
         <item name="colorPrimaryDark">@color/material_accent_700</item>
+    </style>
+    <style name="Theme.Material.Dialog.AlertBase" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/material_accent_500</item>
+        <item name="colorPrimary">@color/material_accent_500</item>
+        <item name="colorPrimaryDark">@color/material_accent_700</item>
+    </style>
+    <style name="Theme.Material.Dialog" parent="Theme.Material.DialogBase">
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
-    <style name="Theme.Material.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
+    <style name="Theme.Material.Dialog.Alert" parent="Theme.Material.Dialog.AlertBase">
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>