diff --git a/app/src/main/res/values/styles_transdroid_dark.xml b/app/src/main/res/values-night/styles_transdroid.xml
similarity index 85%
rename from app/src/main/res/values/styles_transdroid_dark.xml
rename to app/src/main/res/values-night/styles_transdroid.xml
index 5cda3e43..3001b624 100644
--- a/app/src/main/res/values/styles_transdroid_dark.xml
+++ b/app/src/main/res/values-night/styles_transdroid.xml
@@ -18,7 +18,10 @@
 
 <resources>
 
-    <style name="Theme.Transdroid.Dark" parent="Theme.AppCompat.NoActionBar">
+    <style name="Theme.Transdroid.Auto" parent="Theme.AppCompat.DayNight.NoActionBar">
+		<item name="drawer_background">@color/background_dark</item>
+		<item name="activatable_background">@drawable/activatable_background</item>
+
 		<item name="colorPrimary">@color/green</item>
 		<item name="colorPrimaryDark">@color/green_dark</item>
 		<item name="windowActionModeOverlay">true</item>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ba03bc9d..6ad894ea 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -16,15 +16,15 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<style name="TransdroidTheme" parent="Theme.Transdroid.Light">
-		<item name="drawer_background">@color/background_light</item>
-		<item name="activatable_background">@drawable/activatable_background</item>
-	</style>
+<!--	<style name="TransdroidTheme" parent="Theme.Transdroid.Auto">-->
+<!--		<item name="drawer_background">@color/background_light</item>-->
+<!--		<item name="activatable_background">@drawable/activatable_background</item>-->
+<!--	</style>-->
 
-	<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Dark">
-		<item name="drawer_background">@color/background_dark</item>
-		<item name="activatable_background">@drawable/activatable_background</item>
-	</style>
+<!--	<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Auto">-->
+<!--		<item name="drawer_background">@color/background_dark</item>-->
+<!--		<item name="activatable_background">@drawable/activatable_background</item>-->
+<!--	</style>-->
 
 	<style name="DefaultToolbar">
 		<item name="android:background">?attr/colorPrimary</item>
diff --git a/app/src/main/res/values/colors_transdroid_dark.xml b/app/src/main/res/values/colors_transdroid_dark.xml
index 30ee0f48..212756cc 100644
--- a/app/src/main/res/values/colors_transdroid_dark.xml
+++ b/app/src/main/res/values/colors_transdroid_dark.xml
@@ -20,7 +20,7 @@
 <resources>
     <color name="pressed_transdroid_dark">#CCaada62</color>
    	<color name="divider_dark">#303030</color>
-    <color name="background_dark">#000</color>
+    <color name="background_dark">#2e2e2e</color>
     <color name="text_bright_dark">#fff</color>
     <color name="text_actionbar_dark">#fff</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b3eef9d1..ade74baf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,14 +16,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<style name="TransdroidTheme" parent="Theme.Transdroid.Light">
-		<item name="drawer_background">@color/background_light</item>
-		<item name="activatable_background">@drawable/activatable_background</item>
+	<style name="TransdroidTheme" parent="Theme.Transdroid.Auto">
 	</style>
 
-	<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Dark">
-		<item name="drawer_background">@color/background_dark</item>
-		<item name="activatable_background">@drawable/activatable_background</item>
+	<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Auto">
 	</style>
 
 	<!-- No theme background to let the user's wall paper shine through -->
diff --git a/app/src/main/res/values/styles_transdroid_light.xml b/app/src/main/res/values/styles_transdroid.xml
similarity index 86%
rename from app/src/main/res/values/styles_transdroid_light.xml
rename to app/src/main/res/values/styles_transdroid.xml
index 68902f36..3d079538 100644
--- a/app/src/main/res/values/styles_transdroid_light.xml
+++ b/app/src/main/res/values/styles_transdroid.xml
@@ -19,7 +19,10 @@
 
 <resources>
 
-    <style name="Theme.Transdroid.Light" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Theme.Transdroid.Auto" parent="Theme.AppCompat.DayNight.NoActionBar">
+		<item name="drawer_background">@color/background_light</item>
+		<item name="activatable_background">@drawable/activatable_background</item>
+
 		<item name="colorPrimary">@color/green</item>
 		<item name="colorPrimaryDark">@color/green_dark</item>
 		<item name="colorControlHighlight">@color/green_light</item>