diff --git a/app/src/main/res/drawable/notification_close.xml b/app/src/main/res/drawable/notification_close.xml
deleted file mode 100644
index 65b33d4..0000000
--- a/app/src/main/res/drawable/notification_close.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_divider.xml b/app/src/main/res/drawable/notification_divider.xml
deleted file mode 100644
index b991115..0000000
--- a/app/src/main/res/drawable/notification_divider.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="1dip" />
-    <solid android:color="@android:color/darker_gray" />
-</shape>
diff --git a/app/src/main/res/drawable/notification_media_backward.xml b/app/src/main/res/drawable/notification_media_backward.xml
deleted file mode 100644
index b1c49fd..0000000
--- a/app/src/main/res/drawable/notification_media_backward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_media_fastforward.xml b/app/src/main/res/drawable/notification_media_fastforward.xml
deleted file mode 100644
index da07bd3..0000000
--- a/app/src/main/res/drawable/notification_media_fastforward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_media_forward.xml b/app/src/main/res/drawable/notification_media_forward.xml
deleted file mode 100644
index 8b4c77b..0000000
--- a/app/src/main/res/drawable/notification_media_forward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_media_pause.xml b/app/src/main/res/drawable/notification_media_pause.xml
deleted file mode 100644
index 27091be..0000000
--- a/app/src/main/res/drawable/notification_media_pause.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_media_rewind.xml b/app/src/main/res/drawable/notification_media_rewind.xml
deleted file mode 100644
index da56adf..0000000
--- a/app/src/main/res/drawable/notification_media_rewind.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notification_media_start.xml b/app/src/main/res/drawable/notification_media_start.xml
deleted file mode 100644
index b7f4083..0000000
--- a/app/src/main/res/drawable/notification_media_start.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index d0f2cd6..0000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="NotificationText.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
-
-    <style name="NotificationText.Content" parent="@android:style/TextAppearance.Material.Notification" />
-
-    <style name="NotificationButton" parent="NotificationButtonBase">
-        <item name="background">?attr/selectableItemBackgroundBorderless</item>
-    </style>
-
-    <style name="NotificationButton.Expanded" parent="@style/NotificationButton.ExpandedBase">
-        <item name="android:padding">2dip</item>
-        <item name="background">?attr/selectableItemBackgroundBorderless</item>
-    </style>
-
-    <style name="NotificationLayoutDivider">
-        <item name="divider">@drawable/notification_divider</item>
-    </style>
-
-    <style name="NotificationDivider">
-        <item name="background">@drawable/notification_divider</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
deleted file mode 100644
index a2915a0..0000000
--- a/app/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Audinaut.Light" parent="Theme.Audinaut.Light.Base">
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-    <style name="Theme.Audinaut.Dark" parent="Theme.Audinaut.Dark.Base">
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-    <style name="Theme.Audinaut.Black" parent="Theme.Audinaut.Black.Base">
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-    <style name="Theme.Audinaut.Light.No_Color" parent="Theme.Audinaut.Light.No_Color.Base">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor">@android:color/black</item>
-    </style>
-
-    <style name="Theme.Audinaut.Black.No_Color" parent="Theme.Audinaut.Black.No_Color.Base">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor">@android:color/black</item>
-    </style>
-
-    <style name="Theme.Audinaut.Dark.No_Color" parent="Theme.Audinaut.Dark.No_Color.Base">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor">@android:color/black</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0ea23b0..6c89aa2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,10 +15,13 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
-    <style name="NotificationButton" parent="NotificationButtonBase" />
+    <style name="NotificationButton" parent="NotificationButtonBase">
+        <item name="background">?attr/selectableItemBackgroundBorderless</item>
+    </style>
 
     <style name="NotificationButton.ExpandedBase">
-        <item name="background">?attr/selectableItemBackground</item>
+        <item name="android:padding">2dip</item>
+        <item name="background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
@@ -30,16 +33,16 @@
         <item name="android:padding">10dip</item>
     </style>
 
-    <style name="NotificationText.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+    <style name="NotificationText.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
 
-    <style name="NotificationText.Content" parent="@android:style/TextAppearance.StatusBar.EventContent" />
+    <style name="NotificationText.Content" parent="@android:style/TextAppearance.Material.Notification" />
 
     <style name="NotificationLayoutDivider">
-        <item name="divider">?android:listDivider</item>
+        <item name="divider">@drawable/notification_divider</item>
     </style>
 
     <style name="NotificationDivider">
-        <item name="background">?attr/dividerHorizontal</item>
+        <item name="background">@drawable/notification_divider</item>
     </style>
 
     <style name="MoreButton" parent="@style/BasicButton">