diff --git a/generate-themes.pl b/generate-themes.pl
index 08d45621..38359a27 100644
--- a/generate-themes.pl
+++ b/generate-themes.pl
@@ -7,23 +7,23 @@ use constant THEMES_LIST   => './res/values-v21/themes-list.xml';
 my $THEMES = [
 	{
 		_name => 'standard',
-		light => { colorAccent => '#ff3e677a', colorPrimary => '#ff37474f', colorPrimaryDark => '#ff263238', _bg => '#fff0f0f0' },
-		dark  => { colorAccent => '#ff3e677a', colorPrimary => '#ff37474f', colorPrimaryDark => '#ff263238', _bg => '#ff2a2a2a' },
+		light => { colorAccent => '#ff3e677a', colorPrimary => '#ff37474f', colorPrimaryDark => '#ff263238', controlsNormal=>'@color/material_grey_900', _bg => '#fff0f0f0' },
+		dark  => { colorAccent => '#ff3e677a', colorPrimary => '#ff37474f', colorPrimaryDark => '#ff263238', controlsNormal=>'@color/material_grey_300', _bg => '#ff2a2a2a' },
 	},
 	{
 		_name => 'greyish',
-		light => { colorAccent => '#ff212121', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', _bg => '#fff0f0f0' },
-		dark  => { colorAccent => '#ffececec', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', _bg => '#ff2a2a2a' },
+		light => { colorAccent => '#ff000000', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', controlsNormal=>'@color/material_grey_600', _bg => '#fff0f0f0' },
+		dark  => { colorAccent => '#ffffffff', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', controlsNormal=>'@color/material_grey_600', _bg => '#ff2a2a2a' },
 	},
 	{
 		_name => 'orange',
-		light => { colorAccent => '#FFF57F17', colorPrimary => '#FFE65100', colorPrimaryDark => '#FFBF360C', _bg => '#fff0f0f0' },
-		dark  => { colorAccent => '#FFF57F17', colorPrimary => '#FFE65100', colorPrimaryDark => '#FFBF360C', _bg => '#ff2a2a2a' },
+		light => { colorAccent => '#FFF57F17', colorPrimary => '#FFE65100', colorPrimaryDark => '#FFBF360C', controlsNormal=>'@color/material_grey_900', _bg => '#fff0f0f0' },
+		dark  => { colorAccent => '#FFF57F17', colorPrimary => '#FFE65100', colorPrimaryDark => '#FFBF360C', controlsNormal=>'@color/material_grey_300', _bg => '#ff2a2a2a' },
 	},
 	{
 		_name => 'blue',
-		light => { colorAccent => '#FF03A9F4', colorPrimary => '#FF0277BD', colorPrimaryDark => '#FF01579B', _bg => '#fff0f0f0' },
-		dark  => { colorAccent => '#FF03A9F4', colorPrimary => '#FF0277BD', colorPrimaryDark => '#FF01579B', _bg => '#ff2a2a2a' },
+		light => { colorAccent => '#FF03A9F4', colorPrimary => '#FF0277BD', colorPrimaryDark => '#FF01579B', controlsNormal=>'@color/material_grey_900', _bg => '#fff0f0f0' },
+		dark  => { colorAccent => '#FF03A9F4', colorPrimary => '#FF0277BD', colorPrimaryDark => '#FF01579B', controlsNormal=>'@color/material_grey_300', _bg => '#ff2a2a2a' },
 	},
 ];
 
@@ -117,7 +117,7 @@ my $DATA = << "EOF";
 		<item name="background_circle_color">\@color/material_grey_300</item>
 		<item name="tabs_background">$this->{light}->{colorPrimary}</item>
 		<item name="now_playing_marker">$this->{light}->{colorAccent}</item>
-		<item name="controls_normal">\@color/material_grey_900</item>
+		<item name="controls_normal">$this->{light}->{controlsNormal}</item>
 		<item name="controls_active">$this->{light}->{colorAccent}</item>
 		<item name="android:colorAccent">$this->{light}->{colorAccent}</item>
 		<item name="android:colorPrimary">$this->{light}->{colorPrimary}</item>
@@ -139,7 +139,7 @@ my $DATA = << "EOF";
 
 	<style name="${tid}PopupDialog" parent="android:Theme.Material.Light.Dialog.MinWidth">
 		<item name="background_circle_color">\@color/material_grey_300</item>
-		<item name="controls_normal">\@color/material_grey_900</item>
+		<item name="controls_normal">$this->{light}->{controlsNormal}</item>
 		<item name="controls_active">$this->{light}->{colorAccent}</item>
 	</style>
 
@@ -151,7 +151,7 @@ my $DATA = << "EOF";
 		<item name="background_circle_color">\@color/material_grey_700</item>
 		<item name="tabs_background">$this->{dark}->{colorPrimary}</item>
 		<item name="now_playing_marker">$this->{dark}->{colorAccent}</item>
-		<item name="controls_normal">\@color/material_grey_300</item>
+		<item name="controls_normal">$this->{dark}->{controlsNormal}</item>
 		<item name="controls_active">$this->{dark}->{colorAccent}</item>
 		<item name="android:colorAccent">$this->{dark}->{colorAccent}</item>
 		<item name="android:colorPrimary">$this->{dark}->{colorPrimary}</item>
@@ -173,7 +173,7 @@ my $DATA = << "EOF";
 
 	<style name="${tid}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_300</item>
+		<item name="controls_normal">$this->{dark}->{controlsNormal}</item>
 		<item name="controls_active">$this->{dark}->{colorAccent}</item>
 	</style>
 
diff --git a/res/values-v21/theme-greyish.xml b/res/values-v21/theme-greyish.xml
index 273e1600..dd3637b3 100644
--- a/res/values-v21/theme-greyish.xml
+++ b/res/values-v21/theme-greyish.xml
@@ -24,10 +24,10 @@
 		<item name="float_color">@color/material_grey_400</item>
 		<item name="background_circle_color">@color/material_grey_300</item>
 		<item name="tabs_background">#ff212121</item>
-		<item name="now_playing_marker">#ff212121</item>
-		<item name="controls_normal">@color/material_grey_900</item>
-		<item name="controls_active">#ff212121</item>
-		<item name="android:colorAccent">#ff212121</item>
+		<item name="now_playing_marker">#ff000000</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ff000000</item>
+		<item name="android:colorAccent">#ff000000</item>
 		<item name="android:colorPrimary">#ff212121</item>
 		<item name="android:colorPrimaryDark">#ff090909</item>
 	</style>
@@ -47,8 +47,8 @@
 
 	<style name="Greyish.PopupDialog" parent="android:Theme.Material.Light.Dialog.MinWidth">
 		<item name="background_circle_color">@color/material_grey_300</item>
-		<item name="controls_normal">@color/material_grey_900</item>
-		<item name="controls_active">#ff212121</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ff000000</item>
 	</style>
 
 	<!-- dark theme -->
@@ -58,10 +58,10 @@
 		<item name="float_color">@color/material_grey_900</item>
 		<item name="background_circle_color">@color/material_grey_700</item>
 		<item name="tabs_background">#ff212121</item>
-		<item name="now_playing_marker">#ffececec</item>
-		<item name="controls_normal">@color/material_grey_300</item>
-		<item name="controls_active">#ffececec</item>
-		<item name="android:colorAccent">#ffececec</item>
+		<item name="now_playing_marker">#ffffffff</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ffffffff</item>
+		<item name="android:colorAccent">#ffffffff</item>
 		<item name="android:colorPrimary">#ff212121</item>
 		<item name="android:colorPrimaryDark">#ff090909</item>
 	</style>
@@ -81,8 +81,8 @@
 
 	<style name="Greyish.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_300</item>
-		<item name="controls_active">#ffececec</item>
+		<item name="controls_normal">@color/material_grey_600</item>
+		<item name="controls_active">#ffffffff</item>
 	</style>
 
 </resources>
diff --git a/res/values-v21/themes-list.xml b/res/values-v21/themes-list.xml
index 5d2a3bc1..3f0bc6f0 100644
--- a/res/values-v21/themes-list.xml
+++ b/res/values-v21/themes-list.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- THIS FILE IS AUTOGENERATED BY generate-themes.pl - DO NOT TOUCH! -->
 <resources>
-	<integer-array name="theme_category_backactionbar">
-		<item>@style/BackActionBar</item>
-		<item>@style/Dark.BackActionBar</item>
-		<item>@style/Greyish.BackActionBar</item>
-		<item>@style/Greyish.Dark.BackActionBar</item>
-		<item>@style/Orange.BackActionBar</item>
-		<item>@style/Orange.Dark.BackActionBar</item>
-		<item>@style/Blue.BackActionBar</item>
-		<item>@style/Blue.Dark.BackActionBar</item>
-	</integer-array>
-
-	<integer-array name="theme_category_vanillabase">
-		<item>@style/VanillaBase</item>
-		<item>@style/Dark.VanillaBase</item>
-		<item>@style/Greyish.VanillaBase</item>
-		<item>@style/Greyish.Dark.VanillaBase</item>
-		<item>@style/Orange.VanillaBase</item>
-		<item>@style/Orange.Dark.VanillaBase</item>
-		<item>@style/Blue.VanillaBase</item>
-		<item>@style/Blue.Dark.VanillaBase</item>
-	</integer-array>
-
 	<integer-array name="theme_category_library">
 		<item>@style/Library</item>
 		<item>@style/Dark.Library</item>
@@ -34,6 +12,17 @@
 		<item>@style/Blue.Dark.Library</item>
 	</integer-array>
 
+	<integer-array name="theme_category_backactionbar">
+		<item>@style/BackActionBar</item>
+		<item>@style/Dark.BackActionBar</item>
+		<item>@style/Greyish.BackActionBar</item>
+		<item>@style/Greyish.Dark.BackActionBar</item>
+		<item>@style/Orange.BackActionBar</item>
+		<item>@style/Orange.Dark.BackActionBar</item>
+		<item>@style/Blue.BackActionBar</item>
+		<item>@style/Blue.Dark.BackActionBar</item>
+	</integer-array>
+
 	<integer-array name="theme_category_popupdialog">
 		<item>@style/PopupDialog</item>
 		<item>@style/Dark.PopupDialog</item>
@@ -56,6 +45,17 @@
 		<item>@style/Blue.Dark.Playback</item>
 	</integer-array>
 
+	<integer-array name="theme_category_vanillabase">
+		<item>@style/VanillaBase</item>
+		<item>@style/Dark.VanillaBase</item>
+		<item>@style/Greyish.VanillaBase</item>
+		<item>@style/Greyish.Dark.VanillaBase</item>
+		<item>@style/Orange.VanillaBase</item>
+		<item>@style/Orange.Dark.VanillaBase</item>
+		<item>@style/Blue.VanillaBase</item>
+		<item>@style/Blue.Dark.VanillaBase</item>
+	</integer-array>
+
 	<string-array name="theme_entries">
 		<item>Standard</item>
 		<item>Dark.Standard</item>