diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
index f81270f..bd688bc 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="?attr/card_background"
+    android:background="?attr/actionModeBackground"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4250d80..6da0938 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,7 +5,7 @@
         <item name="android:windowBackground">@color/black</item>
     </style>
 
-    <style name="Theme.Audinaut.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.Audinaut.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="element_color">@color/lightElement</item>
         <item name="actionbar_element_color">@color/darkElement</item>
         <item name="offline_icon">@drawable/main_offline</item>
@@ -48,7 +48,7 @@
         <item name="drawerSettings">@drawable/ic_menu_settings</item>
         <item name="drawerArrowStyle">@style/Audinaut.DrawerArrow</item>
         <item name="colorPrimary">@color/lightPrimary</item>
-        <item name="colorPrimaryDark">@color/lightPrimaryDark</item>
+        <item name="colorPrimaryDark">@color/background_material_light</item>
         <item name="colorAccent">@color/lightAccent</item>
         <item name="actionbarBackgroundColor">@android:color/transparent</item>
         <item name="actionbarTitleStyle">
@@ -71,9 +71,10 @@
         <item name="card_background">@android:color/white</item>
         <item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
         <item name="drawerHeaderBackground">@color/lightPrimary</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="Theme.Audinaut.Dark.Base" parent="@style/Theme.AppCompat">
+    <style name="Theme.Audinaut.Dark" parent="@style/Theme.AppCompat">
         <item name="element_color">@color/darkElement</item>
         <item name="actionbar_element_color">@color/darkElement</item>
         <item name="offline_icon">@drawable/main_offline</item>
@@ -116,7 +117,7 @@
         <item name="drawerSettings">@drawable/ic_menu_settings</item>
         <item name="drawerArrowStyle">@style/Audinaut.DrawerArrow</item>
         <item name="colorPrimary">@color/lightPrimary</item>
-        <item name="colorPrimaryDark">@color/lightPrimaryDark</item>
+        <item name="colorPrimaryDark">@color/background_material_dark</item>
         <item name="colorAccent">@color/lightAccent</item>
         <item name="actionbarBackgroundColor">@android:color/transparent</item>
         <item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title
@@ -136,32 +137,26 @@
         <item name="drawerHeaderBackground">@color/lightPrimaryDark</item>
     </style>
 
-    <style name="Theme.Audinaut.Light" parent="Theme.Audinaut.Light.Base" />
-
-    <style name="Theme.Audinaut.Dark" parent="Theme.Audinaut.Dark.Base" />
-
-    <style name="Theme.Audinaut.Black.Base" parent="Theme.Audinaut.Dark.Base">
+    <style name="Theme.Audinaut.Black" parent="Theme.Audinaut.Dark">
         <item name="android:windowBackground">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
     </style>
 
-    <style name="Theme.Audinaut.Black" parent="Theme.Audinaut.Black.Base" />
-
-    <style name="Theme.Audinaut.Light.No_Actionbar" parent="Theme.Audinaut.Light">
+    <style name="Theme.Audinaut.Black.No_Color" parent="Theme.Audinaut.Black">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="actionModeBackground">@android:color/black</item>
     </style>
 
-    <style name="Theme.Audinaut.Black.No_Actionbar" parent="Theme.Audinaut.Black">
+    <style name="Theme.Audinaut.Dark.No_Color" parent="Theme.Audinaut.Dark">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="actionModeBackground">@color/background_material_dark</item>
     </style>
 
-    <style name="Theme.Audinaut.Dark.No_Actionbar" parent="Theme.Audinaut.Dark">
+    <style name="Theme.Audinaut.Light.No_Color" parent="Theme.Audinaut.Light">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.Audinaut.Light.No_Color.Base" parent="Theme.Audinaut.Light.No_Actionbar">
         <item name="actionbar_element_color">@color/lightElement</item>
         <item name="actionbarThemeStyle">@style/ThemeOverlay.AppCompat.ActionBar</item>
         <item name="actionbarBackgroundColor">@android:color/transparent</item>
@@ -197,22 +192,6 @@
         <item name="actionModeCloseButtonStyle">@style/DarkCloseButton</item>
     </style>
 
-    <style name="Theme.Audinaut.Black.No_Color.Base" parent="Theme.Audinaut.Black.No_Actionbar">
-        <item name="actionbarBackgroundColor">@android:color/transparent</item>
-        <item name="actionModeBackground">@android:color/black</item>
-    </style>
-
-    <style name="Theme.Audinaut.Dark.No_Color.Base" parent="Theme.Audinaut.Dark.No_Actionbar">
-        <item name="actionbarBackgroundColor">@android:color/transparent</item>
-        <item name="actionModeBackground">@color/background_material_dark</item>
-    </style>
-
-    <style name="Theme.Audinaut.Light.No_Color" parent="Theme.Audinaut.Light.No_Color.Base" />
-
-    <style name="Theme.Audinaut.Black.No_Color" parent="Theme.Audinaut.Black.No_Color.Base" />
-
-    <style name="Theme.Audinaut.Dark.No_Color" parent="Theme.Audinaut.Dark.No_Color.Base" />
-
     <style name="Audinaut.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">true</item>
     </style>