diff --git a/generate-themes.pl b/generate-themes.pl
index 5b98b60c..27d338e2 100644
--- a/generate-themes.pl
+++ b/generate-themes.pl
@@ -15,6 +15,7 @@ my $THEMES = [
 	{ name=>"blue_dark", id=>7, dark=>1, colorAccent => '#FF03A9F4', colorPrimary => '#FF0277BD', colorPrimaryDark => '#FF01579B', controlsNormal=>'@color/material_grey_300', _bg => '#ff2a2a2a' },
 	{ name=>"red_light", id=>8, dark=>0, colorAccent => '#ffd50000', colorPrimary => '#ffc62828', colorPrimaryDark => '#ffb71c1c', controlsNormal=>'@color/material_grey_900', _bg => '#fff0f0f0' },
 	{ name=>"red_dark", id=>9, dark=>1, colorAccent => '#ffd50000', colorPrimary => '#ffc62828', colorPrimaryDark => '#ffb71c1c', controlsNormal=>'@color/material_grey_300', _bg => '#ff2a2a2a' },
+	{ name=>"amoled_dark", id=>10, dark=>1, colorAccent => '#ffd8d8d8', colorPrimary => '#ff000000', colorPrimaryDark => '#ff000000', controlsNormal=>'@color/material_grey_600', colorBackground=>'@android:color/black', _bg => '#ff000000' },
 ];
 
 
@@ -172,5 +173,16 @@ EOF
 EOF
 	}
 $DATA .= "\n</resources>\n";
+
+	# Add custom colorBackground if set, inherit from theme otherwise.
+	# If we force this, we also set overlay_background_color to the same value
+	# as it is expected to match the background.
+	if (defined($this->{colorBackground})) {
+		$DATA =~ s/<item name="(overlay_background_color)">.+<\/item>/
+		<item name="android:colorBackground">$this->{colorBackground}<\/item>
+		<item name="\1">$this->{colorBackground}<\/item>
+		/;
+	}
+
 	return $DATA
 }
diff --git a/res/values-v21/theme-amoled_dark.xml b/res/values-v21/theme-amoled_dark.xml
new file mode 100644
index 00000000..fb84c160
--- /dev/null
+++ b/res/values-v21/theme-amoled_dark.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ *** THIS FILE WAS GENERATED BY 'generate-themes.pl' - DO NOT TOUCH ***
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. 
+-->
+
+<resources>
+	<!-- dark theme -->
+	<style name="Amoled_dark.VanillaBase" parent="android:Theme.Material">
+		
+		<item name="android:colorBackground">@android:color/black</item>
+		<item name="overlay_background_color">@android:color/black</item>
+		
+		<item name="overlay_foreground_color">@color/overlay_foreground_dark</item>
+		<item name="float_color">@color/material_grey_900</item>
+		<item name="background_circle_color">@color/material_grey_700</item>
+		<item name="tabs_background">#ff000000</item>
+		<item name="now_playing_marker">#ffd8d8d8</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ffd8d8d8</item>
+		<item name="android:colorAccent">#ffd8d8d8</item>
+		<item name="android:colorPrimary">#ff000000</item>
+		<item name="android:colorPrimaryDark">#ff000000</item>
+	</style>
+
+	<style name="Amoled_dark.Playback" parent="Amoled_dark.VanillaBase">
+		<item name="android:actionBarStyle">@style/Universal.PlaybackActionBar</item>
+	</style>
+
+	<style name="Amoled_dark.BackActionBar" parent="Amoled_dark.VanillaBase">
+		<item name="android:actionBarStyle">@style/Universal.PlaybackActionBar</item>
+	</style>
+
+	<style name="Amoled_dark.Library" parent="Amoled_dark.VanillaBase">
+		<item name="android:windowActionBar">false</item>
+		<item name="android:windowNoTitle">true</item>
+	</style>
+
+	<style name="Amoled_dark.PopupDialog" parent="android:Theme.Material.Dialog.MinWidth">
+		<item name="background_circle_color">@color/material_grey_700</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ffd8d8d8</item>
+	</style>
+
+</resources>
diff --git a/res/values-v21/themes-list.xml b/res/values-v21/themes-list.xml
index b5ca78dd..86eaa656 100644
--- a/res/values-v21/themes-list.xml
+++ b/res/values-v21/themes-list.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- THIS FILE IS AUTOGENERATED BY generate-themes.pl - DO NOT TOUCH! -->
 <resources>
-	<integer-array name="theme_category_library">
-		<item>@style/Library</item>
-		<item>@style/Standard_dark.Library</item>
-		<item>@style/Grey_light.Library</item>
-		<item>@style/Grey_dark.Library</item>
-		<item>@style/Orange_light.Library</item>
-		<item>@style/Orange_dark.Library</item>
-		<item>@style/Blue_light.Library</item>
-		<item>@style/Blue_dark.Library</item>
-		<item>@style/Red_light.Library</item>
-		<item>@style/Red_dark.Library</item>
+	<integer-array name="theme_category_vanillabase">
+		<item>@style/VanillaBase</item>
+		<item>@style/Standard_dark.VanillaBase</item>
+		<item>@style/Grey_light.VanillaBase</item>
+		<item>@style/Grey_dark.VanillaBase</item>
+		<item>@style/Orange_light.VanillaBase</item>
+		<item>@style/Orange_dark.VanillaBase</item>
+		<item>@style/Blue_light.VanillaBase</item>
+		<item>@style/Blue_dark.VanillaBase</item>
+		<item>@style/Red_light.VanillaBase</item>
+		<item>@style/Red_dark.VanillaBase</item>
+		<item>@style/Amoled_dark.VanillaBase</item>
 	</integer-array>
 
 	<integer-array name="theme_category_popupdialog">
@@ -25,6 +26,7 @@
 		<item>@style/Blue_dark.PopupDialog</item>
 		<item>@style/Red_light.PopupDialog</item>
 		<item>@style/Red_dark.PopupDialog</item>
+		<item>@style/Amoled_dark.PopupDialog</item>
 	</integer-array>
 
 	<integer-array name="theme_category_backactionbar">
@@ -38,19 +40,21 @@
 		<item>@style/Blue_dark.BackActionBar</item>
 		<item>@style/Red_light.BackActionBar</item>
 		<item>@style/Red_dark.BackActionBar</item>
+		<item>@style/Amoled_dark.BackActionBar</item>
 	</integer-array>
 
-	<integer-array name="theme_category_vanillabase">
-		<item>@style/VanillaBase</item>
-		<item>@style/Standard_dark.VanillaBase</item>
-		<item>@style/Grey_light.VanillaBase</item>
-		<item>@style/Grey_dark.VanillaBase</item>
-		<item>@style/Orange_light.VanillaBase</item>
-		<item>@style/Orange_dark.VanillaBase</item>
-		<item>@style/Blue_light.VanillaBase</item>
-		<item>@style/Blue_dark.VanillaBase</item>
-		<item>@style/Red_light.VanillaBase</item>
-		<item>@style/Red_dark.VanillaBase</item>
+	<integer-array name="theme_category_library">
+		<item>@style/Library</item>
+		<item>@style/Standard_dark.Library</item>
+		<item>@style/Grey_light.Library</item>
+		<item>@style/Grey_dark.Library</item>
+		<item>@style/Orange_light.Library</item>
+		<item>@style/Orange_dark.Library</item>
+		<item>@style/Blue_light.Library</item>
+		<item>@style/Blue_dark.Library</item>
+		<item>@style/Red_light.Library</item>
+		<item>@style/Red_dark.Library</item>
+		<item>@style/Amoled_dark.Library</item>
 	</integer-array>
 
 	<integer-array name="theme_category_playback">
@@ -64,34 +68,9 @@
 		<item>@style/Blue_dark.Playback</item>
 		<item>@style/Red_light.Playback</item>
 		<item>@style/Red_dark.Playback</item>
+		<item>@style/Amoled_dark.Playback</item>
 	</integer-array>
 
-	<string-array name="theme_variant">
-		<item>light</item>
-		<item>dark</item>
-		<item>light</item>
-		<item>dark</item>
-		<item>light</item>
-		<item>dark</item>
-		<item>light</item>
-		<item>dark</item>
-		<item>light</item>
-		<item>dark</item>
-	</string-array>
-
-	<string-array name="theme_values">
-		<item>#ff263238,#fff0f0f0,#ff37474f</item>
-		<item>#ff263238,#ff2a2a2a,#ff37474f</item>
-		<item>#ff090909,#fff0f0f0,#ff212121</item>
-		<item>#ff090909,#ff2a2a2a,#ff212121</item>
-		<item>#FFBF360C,#fff0f0f0,#FFE65100</item>
-		<item>#FFBF360C,#ff2a2a2a,#FFE65100</item>
-		<item>#FF01579B,#fff0f0f0,#FF0277BD</item>
-		<item>#FF01579B,#ff2a2a2a,#FF0277BD</item>
-		<item>#ffb71c1c,#fff0f0f0,#ffc62828</item>
-		<item>#ffb71c1c,#ff2a2a2a,#ffc62828</item>
-	</string-array>
-
 	<string-array name="theme_entries">
 		<item>standard_light</item>
 		<item>standard_dark</item>
@@ -103,6 +82,21 @@
 		<item>blue_dark</item>
 		<item>red_light</item>
 		<item>red_dark</item>
+		<item>amoled_dark</item>
+	</string-array>
+
+	<string-array name="theme_variant">
+		<item>light</item>
+		<item>dark</item>
+		<item>light</item>
+		<item>dark</item>
+		<item>light</item>
+		<item>dark</item>
+		<item>light</item>
+		<item>dark</item>
+		<item>light</item>
+		<item>dark</item>
+		<item>dark</item>
 	</string-array>
 
 	<string-array name="theme_ids">
@@ -116,6 +110,21 @@
 		<item>7</item>
 		<item>8</item>
 		<item>9</item>
+		<item>10</item>
+	</string-array>
+
+	<string-array name="theme_values">
+		<item>#ff263238,#fff0f0f0,#ff37474f</item>
+		<item>#ff263238,#ff2a2a2a,#ff37474f</item>
+		<item>#ff090909,#fff0f0f0,#ff212121</item>
+		<item>#ff090909,#ff2a2a2a,#ff212121</item>
+		<item>#FFBF360C,#fff0f0f0,#FFE65100</item>
+		<item>#FFBF360C,#ff2a2a2a,#FFE65100</item>
+		<item>#FF01579B,#fff0f0f0,#FF0277BD</item>
+		<item>#FF01579B,#ff2a2a2a,#FF0277BD</item>
+		<item>#ffb71c1c,#fff0f0f0,#ffc62828</item>
+		<item>#ffb71c1c,#ff2a2a2a,#ffc62828</item>
+		<item>#ff000000,#ff000000,#ff000000</item>
 	</string-array>
 
 </resources>