diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
index 33e2ee2f..10df1f7b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
@@ -48,7 +48,7 @@ public class PlayingQueueAdapter extends ArrayAdapter<Song> {
         if (MusicPlayerRemote.getPosition() == position) {
             int iconPadding = activity.getResources().getDimensionPixelSize(R.dimen.list_item_image_icon_padding);
             playingIndicator.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
-            playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), R.attr.themed_drawable_color)));
+            playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary)));
             playingIndicator.setVisibility(View.VISIBLE);
         } else {
             playingIndicator.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 7fecae82..8393af5b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -97,7 +97,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
             holder.image.setImageDrawable(Util.getTintedDrawable(
                     activity,
                     getIconRes(playlist),
-                    ColorUtil.resolveColor(activity, R.attr.themed_drawable_color)
+                    ColorUtil.resolveColor(activity, android.R.attr.textColorSecondary)
             ));
         }
     }
@@ -172,7 +172,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
                 if (shortSeparator != null) {
                     shortSeparator.setVisibility(View.GONE);
                 }
-                itemView.setBackgroundColor(ColorUtil.resolveColor(activity, R.attr.card_color));
+                itemView.setBackgroundColor(ColorUtil.resolveColor(activity, R.attr.cardBackgroundColor));
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation));
                 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
index 2eb8f30f..c9ea2b71 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
@@ -29,8 +29,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.ButterKnife;
-
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
@@ -143,14 +141,16 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
     public class ViewHolder extends MediaEntryViewHolder {
         public ViewHolder(@NonNull View itemView, int itemViewType) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
             itemView.setOnLongClickListener(null);
 
             if (itemViewType != HEADER) {
-                itemView.setBackgroundColor(ColorUtil.resolveColor(activity, R.attr.card_color));
+                itemView.setBackgroundColor(ColorUtil.resolveColor(activity, R.attr.cardBackgroundColor));
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation));
                 }
+                if (shortSeparator != null) {
+                    shortSeparator.setVisibility(View.GONE);
+                }
             }
 
             if (menu != null) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
index 9bcd4866..ef49081f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
@@ -31,14 +31,6 @@ public class WidgetMedium extends AppWidgetProvider {
     private static RemoteViews widgetLayout;
     private static String currentAlbumArtUri;
 
-    @Override
-    public void onUpdate(@NonNull Context context, @NonNull AppWidgetManager appWidgetManager, @NonNull int[] appWidgetIds) {
-        updateWidgets(context, MusicPlayerRemote.getCurrentSong(), MusicPlayerRemote.isPlaying());
-        for (int widgetId : appWidgetIds) {
-            appWidgetManager.updateAppWidget(widgetId, widgetLayout);
-        }
-    }
-
     public static void updateWidgets(@NonNull final Context context, @NonNull final Song song, boolean isPlaying) {
         if (song.id == -1) return;
         widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
@@ -53,7 +45,7 @@ public class WidgetMedium extends AppWidgetProvider {
     public static void updateWidgetsPlayState(@NonNull final Context context, boolean isPlaying) {
         if (widgetLayout == null)
             widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
-        int playPauseRes = isPlaying ? R.drawable.ic_pause_black_36dp : R.drawable.ic_play_arrow_black_36dp;
+        int playPauseRes = isPlaying ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_play_arrow_dark_36dp;
         widgetLayout.setImageViewResource(R.id.button_toggle_play_pause, playPauseRes);
         updateWidgets(context);
     }
@@ -145,6 +137,14 @@ public class WidgetMedium extends AppWidgetProvider {
         }
         return null;
     }
+
+    @Override
+    public void onUpdate(@NonNull Context context, @NonNull AppWidgetManager appWidgetManager, @NonNull int[] appWidgetIds) {
+        updateWidgets(context, MusicPlayerRemote.getCurrentSong(), MusicPlayerRemote.isPlaying());
+        for (int widgetId : appWidgetIds) {
+            appWidgetManager.updateAppWidget(widgetId, widgetLayout);
+        }
+    }
 }
 
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
index 1ec418db..44b765e1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
@@ -272,30 +272,30 @@ public class PlayingNotificationHelper {
         isDark = setDark;
 
         if (notificationLayout != null && notificationLayoutBig != null) {
-            int darkContentColor = service.getResources().getColor(R.color.notification_dark_text_content_color);
-            int darkContentSecondaryColor = service.getResources().getColor(R.color.notification_dark_text_secondary_content_color);
-            int contentColor = service.getResources().getColor(R.color.notification_content_color);
-            int contentSecondaryColor = service.getResources().getColor(R.color.notification_secondary_content_color);
+            int darkContentColor = service.getResources().getColor(R.color.primary_text_default_material_light);
+            int darkContentSecondaryColor = service.getResources().getColor(R.color.secondary_text_default_material_light);
+            int contentColor = service.getResources().getColor(R.color.primary_text_default_material_dark);
+            int contentSecondaryColor = service.getResources().getColor(R.color.secondary_text_default_material_dark);
 
             notificationLayout.setTextColor(R.id.title, setDark ? darkContentColor : contentColor);
             notificationLayout.setTextColor(R.id.text, setDark ? darkContentSecondaryColor : contentSecondaryColor);
-            notificationLayout.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_black_36dp : R.drawable.ic_skip_previous_white_36dp);
+            notificationLayout.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
             notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes());
-            notificationLayout.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_black_36dp : R.drawable.ic_skip_next_white_36dp);
+            notificationLayout.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
 
             notificationLayoutBig.setTextColor(R.id.title, setDark ? darkContentColor : contentColor);
             notificationLayoutBig.setTextColor(R.id.text, setDark ? darkContentSecondaryColor : contentSecondaryColor);
             notificationLayoutBig.setTextColor(R.id.text2, setDark ? darkContentSecondaryColor : contentSecondaryColor);
-            notificationLayoutBig.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_black_36dp : R.drawable.ic_skip_previous_white_36dp);
+            notificationLayoutBig.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
             notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes());
-            notificationLayoutBig.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_black_36dp : R.drawable.ic_skip_next_white_36dp);
-            notificationLayoutBig.setImageViewResource(R.id.action_quit, setDark ? R.drawable.ic_close_black_24dp : R.drawable.ic_close_white_24dp);
+            notificationLayoutBig.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
+            notificationLayoutBig.setImageViewResource(R.id.action_quit, setDark ? R.drawable.ic_close_dark_24dp : R.drawable.ic_close_white_24dp);
         }
     }
 
     private int getPlayPauseRes() {
         return isPlaying ?
-                (isDark ? R.drawable.ic_pause_black_36dp : R.drawable.ic_pause_white_36dp) :
-                (isDark ? R.drawable.ic_play_arrow_black_36dp : R.drawable.ic_play_arrow_white_36dp);
+                (isDark ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_pause_white_36dp) :
+                (isDark ? R.drawable.ic_play_arrow_dark_36dp : R.drawable.ic_play_arrow_white_36dp);
     }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
index 0f9cbb93..2c3ce8eb 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
@@ -46,10 +46,9 @@ public class SearchActivity extends AbsMusicServiceActivity {
     @SuppressLint("NewApi")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setStatusBarTransparent();
-        setTitle(null);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
+        setStatusBarTransparent();
         ButterKnife.bind(this);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
index c4118e46..4a5727a4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -281,10 +281,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
             }
         });
 
-        setMiniPlayerColor(ColorUtil.resolveColor(this, R.attr.card_color));
+        setMiniPlayerColor(ColorUtil.resolveColor(this, R.attr.cardBackgroundColor));
 
-        miniPlayerImage.setImageResource(R.drawable.ic_equalizer_white_24dp);
-        miniPlayerImage.setColorFilter(ColorUtil.resolveColor(this, R.attr.themed_drawable_color));
+        miniPlayerImage.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_equalizer_white_24dp,
+                ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)));
     }
 
     public void setMiniPlayerColor(int color) {
@@ -500,7 +500,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     }
 
     private void setUpPrevNext() {
-        int themedDrawableColor = ColorUtil.resolveColor(this, R.attr.themed_drawable_color);
+        int themedDrawableColor = ColorUtil.resolveColor(this, android.R.attr.textColorSecondary);
         nextButton.setImageDrawable(Util.getTintedDrawable(this,
                 R.drawable.ic_skip_next_white_36dp, themedDrawableColor));
         prevButton.setImageDrawable(Util.getTintedDrawable(this,
@@ -537,7 +537,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 break;
             default:
                 shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_36dp,
-                        ColorUtil.resolveColor(this, R.attr.themed_drawable_color)));
+                        ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)));
                 break;
         }
     }
@@ -556,7 +556,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         switch (MusicPlayerRemote.getRepeatMode()) {
             case MusicService.REPEAT_MODE_NONE:
                 repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp,
-                        DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
+                        DialogUtils.resolveColor(this, android.R.attr.textColorSecondary)));
                 break;
             case MusicService.REPEAT_MODE_ALL:
                 repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp,
@@ -671,18 +671,17 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     }
 
     private void applyPalette(@Nullable Bitmap bitmap) {
-        final int defaultBarColor = ColorUtil.resolveColor(this, R.attr.default_bar_color);
         if (bitmap != null) {
             Palette.from(bitmap)
-                    .resizeBitmapSize(100)
+                    .resizeBitmapSize(ColorUtil.PALETTE_BITMAP_SIZE)
                     .generate(new Palette.PaletteAsyncListener() {
                         @Override
                         public void onGenerated(@NonNull Palette palette) {
-                            setColors(palette.getVibrantColor(defaultBarColor));
+                            setColors(ColorUtil.getColor(AbsSlidingMusicPanelActivity.this, palette));
                         }
                     });
         } else {
-            setColors(defaultBarColor);
+            setColors(ColorUtil.getColor(AbsSlidingMusicPanelActivity.this, null));
         }
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
index 6fb43217..79bf73da 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.graphics.Palette;
 
 import com.kabouzeid.gramophone.R;
@@ -15,12 +16,35 @@ import com.kabouzeid.gramophone.R;
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class ColorUtil {
+    public static final int PALETTE_BITMAP_SIZE = 100;
 
     public static int generateColor(Context context, Bitmap bitmap) {
+        return getColor(context, generatePalette(bitmap));
+    }
+
+    public static Palette generatePalette(Bitmap bitmap) {
         return Palette.from(bitmap)
-                .resizeBitmapSize(100)
-                .generate()
-                .getVibrantColor(ColorUtil.resolveColor(context, R.attr.default_bar_color));
+                .resizeBitmapSize(PALETTE_BITMAP_SIZE)
+                .generate();
+    }
+
+    public static int getColor(Context context, @Nullable Palette palette) {
+        if (palette != null) {
+            if (palette.getVibrantSwatch() != null) {
+                return palette.getVibrantSwatch().getRgb();
+            } else if (palette.getMutedSwatch() != null) {
+                return palette.getMutedSwatch().getRgb();
+            } else if (palette.getDarkVibrantSwatch() != null) {
+                return palette.getDarkVibrantSwatch().getRgb();
+            } else if (palette.getDarkMutedSwatch() != null) {
+                return palette.getDarkMutedSwatch().getRgb();
+            } else if (palette.getLightVibrantSwatch() != null) {
+                return palette.getLightVibrantSwatch().getRgb();
+            } else if (palette.getLightMutedSwatch() != null) {
+                return palette.getLightMutedSwatch().getRgb();
+            }
+        }
+        return ColorUtil.resolveColor(context, R.attr.default_bar_color);
     }
 
     public static int resolveColor(@NonNull Context context, @AttrRes int colorAttr) {
diff --git a/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png
deleted file mode 100644
index c26640d3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png
deleted file mode 100644
index 0fcb0efb..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png
new file mode 100644
index 00000000..27bf91d0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index fdc4a5ad..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
deleted file mode 100644
index fb4967bc..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png
new file mode 100644
index 00000000..d64691ef
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
deleted file mode 100644
index 6fd60570..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png
new file mode 100644
index 00000000..95b0df12
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_black_36dp.png
deleted file mode 100644
index b66ad207..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png
new file mode 100644
index 00000000..4705f7d3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png
deleted file mode 100644
index 5ab79657..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png
new file mode 100644
index 00000000..f57637ef
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_check_white_24dp.png
deleted file mode 100644
index ba9cf063..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_check_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png
deleted file mode 100644
index 4342c765..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png
new file mode 100644
index 00000000..ed5e2d92
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 1d8ad18a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
deleted file mode 100644
index 4dffa8e5..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png
new file mode 100644
index 00000000..847a4803
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
deleted file mode 100644
index 2e70b039..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png
new file mode 100644
index 00000000..e5708d20
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png
deleted file mode 100644
index 9354ad31..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png
new file mode 100644
index 00000000..b83769c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png
deleted file mode 100644
index ea3c3a40..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png
new file mode 100644
index 00000000..28076e6e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
deleted file mode 100644
index 1f4846cb..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png
deleted file mode 100644
index 6201097f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png
new file mode 100644
index 00000000..5d4758fc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 1b04eda0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
deleted file mode 100644
index ec6617a7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png
new file mode 100644
index 00000000..9b5198fe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
deleted file mode 100644
index 91defe84..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png
new file mode 100644
index 00000000..6fc333ab
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png
deleted file mode 100644
index 94c2a3ca..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png
new file mode 100644
index 00000000..88ff0c1b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png
deleted file mode 100644
index 924fe054..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png
new file mode 100644
index 00000000..1ec17572
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
deleted file mode 100644
index a263412a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png
deleted file mode 100644
index 2214293f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png
new file mode 100644
index 00000000..214fe359
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 2955c02e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
deleted file mode 100644
index b12904c0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png
new file mode 100644
index 00000000..906446df
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
deleted file mode 100644
index 6f4ef0ed..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png
new file mode 100644
index 00000000..5f6f8803
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_36dp.png
deleted file mode 100644
index 6c4d7c9f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png
new file mode 100644
index 00000000..5fecc468
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png
deleted file mode 100644
index 401c515c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png
new file mode 100644
index 00000000..b0ebffb2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
deleted file mode 100644
index bf5bc7e0..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png
deleted file mode 100644
index 9e965ad4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png
new file mode 100644
index 00000000..a6e4fccd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 25b6f9f1..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png
deleted file mode 100644
index 057caefe..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png
new file mode 100644
index 00000000..73339397
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png
deleted file mode 100644
index 3df61f4f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png
new file mode 100644
index 00000000..bbae7d47
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png
deleted file mode 100644
index d25fcc04..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png
new file mode 100644
index 00000000..1a4ed909
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_36dp.png
deleted file mode 100644
index 9302f977..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png
new file mode 100644
index 00000000..3c07e3c4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png differ
diff --git a/app/src/main/res/drawable/notification_selector.xml b/app/src/main/res/drawable/notification_selector.xml
index 4cbc5ae3..d7867f86 100644
--- a/app/src/main/res/drawable/notification_selector.xml
+++ b/app/src/main/res/drawable/notification_selector.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
index 8ac20313..75e988c0 100644
--- a/app/src/main/res/drawable/rect_selector.xml
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_light" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_light" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_light" />
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector_dark.xml b/app/src/main/res/drawable/rect_selector_dark.xml
index 4cbc5ae3..d7867f86 100644
--- a/app/src/main/res/drawable/rect_selector_dark.xml
+++ b/app/src/main/res/drawable/rect_selector_dark.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/slider_thumb.xml b/app/src/main/res/drawable/slider_thumb.xml
index 4c099c65..086a8041 100644
--- a/app/src/main/res/drawable/slider_thumb.xml
+++ b/app/src/main/res/drawable/slider_thumb.xml
@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <size
-        android:height="20dp"
-        android:width="3dp" />
-    <solid
-        android:color="@color/black" />
+        android:width="3dp"
+        android:height="20dp" />
+    <solid android:color="@android:color/black" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/traditional_slider_thumb.xml b/app/src/main/res/drawable/traditional_slider_thumb.xml
index 489457a9..594829ac 100644
--- a/app/src/main/res/drawable/traditional_slider_thumb.xml
+++ b/app/src/main/res/drawable/traditional_slider_thumb.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:height="16dp"
-        android:width="16dp" />
-    <solid android:color="@color/black" />
+        android:width="16dp"
+        android:height="16dp" />
+    <solid android:color="@android:color/black" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/traditional_slider_thumb_dark.xml b/app/src/main/res/drawable/traditional_slider_thumb_dark.xml
deleted file mode 100644
index 943b1d3b..00000000
--- a/app/src/main/res/drawable/traditional_slider_thumb_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size
-        android:height="16dp"
-        android:width="16dp" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 19aee269..963b5504 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -60,7 +60,6 @@
             android:paddingRight="72dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/title_text_color"
             tools:ignore="UnusedAttribute" />
 
         <View
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 90e75da2..1ff5eaef 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -16,12 +16,12 @@
             android:layout_height="match_parent">
 
             <com.kabouzeid.gramophone.views.WidthFitSquareImageView
-                android:transitionName="@string/transition_album_art"
                 android:id="@+id/image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 android:src="@drawable/default_album_art"
+                android:transitionName="@string/transition_album_art"
                 tools:ignore="UnusedAttribute" />
 
             <LinearLayout
@@ -52,7 +52,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -81,8 +81,7 @@
                         android:hint="@string/album_artist"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -100,8 +99,7 @@
                         android:hint="@string/genre"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -119,8 +117,7 @@
                         android:hint="@string/year"
                         android:inputType="text|number"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index f00bd4a4..6699c8ab 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -60,7 +60,6 @@
             android:paddingRight="72dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/title_text_color"
             tools:ignore="UnusedAttribute" />
 
         <View
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 7ecf9000..1e83467a 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -50,7 +50,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -68,7 +68,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
                 </android.support.design.widget.TextInputLayout>
 
             </LinearLayout>
@@ -97,11 +97,10 @@
                         android:hint="@string/artist"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
-
                 <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -115,8 +114,7 @@
                         android:gravity="center_vertical"
                         android:hint="@string/genre"
                         android:singleLine="true"
-
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -135,8 +133,7 @@
                         android:hint="@string/year"
                         android:inputType="text|number"
                         android:singleLine="true"
-
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -155,7 +152,7 @@
                         android:hint="@string/track_hint"
                         android:inputType="text|number"
                         android:singleLine="true"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
diff --git a/app/src/main/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml
index ce188247..0578c0dd 100644
--- a/app/src/main/res/layout/artist_detail_header.xml
+++ b/app/src/main/res/layout/artist_detail_header.xml
@@ -11,9 +11,9 @@
         android:scrollbars="none" />
 
     <View
-        android:layout_marginTop="-8dp"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?separator_color" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-8dp"
+        android:background="?dividerHorizontal" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index 75fe00c8..576c46e7 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -16,7 +16,7 @@
         seekarc:rotation="180"
         seekarc:startAngle="30"
         seekarc:sweepAngle="300"
-        seekarc:thumb="?seek_arc_thumb_drawable" />
+        seekarc:thumb="@drawable/traditional_slider_thumb" />
 
     <TextView
         android:id="@+id/timer_display"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 83d7f8e6..43a35357 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -19,12 +19,10 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
 
-
         <LinearLayout
             android:id="@+id/palette_color_container"
             android:layout_width="match_parent"
             android:layout_height="68dp"
-            android:background="?default_bar_color"
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:paddingLeft="16dp"
@@ -36,16 +34,14 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <TextView
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="?caption_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
         </LinearLayout>
 
@@ -58,7 +54,8 @@
         android:layout_gravity="center"
         android:paddingBottom="68dp"
         android:src="@drawable/ic_check_white_96dp"
-        android:tint="?check_mark_color"
-        android:visibility="gone" />
+        android:tint="?android:textColorPrimary"
+        android:visibility="gone"
+        tools:ignore="ContentDescription" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_grid_card_horizontal.xml b/app/src/main/res/layout/item_grid_card_horizontal.xml
index 1aa49cee..0f8dae89 100644
--- a/app/src/main/res/layout/item_grid_card_horizontal.xml
+++ b/app/src/main/res/layout/item_grid_card_horizontal.xml
@@ -6,7 +6,7 @@
     android:layout_marginEnd="8dp"
     android:layout_marginRight="8dp"
     android:foreground="?rect_selector"
-    app:cardBackgroundColor="?card_color"
+    app:cardBackgroundColor="?cardBackgroundColor"
     app:elevation="@dimen/card_elevation">
 
     <LinearLayout
@@ -40,7 +40,6 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?title_text_color"
                     android:textSize="14sp" />
 
                 <TextView
@@ -49,7 +48,6 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:textColor="?caption_text_color"
                     android:textSize="12sp" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 210fa6ef..a3f28269 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -36,7 +36,6 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color"
                 android:visibility="gone" />
 
         </FrameLayout>
@@ -58,8 +57,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <TextView
                 android:id="@+id/text"
@@ -68,7 +66,7 @@
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:textColor="?caption_text_color" />
+                android:textColor="?android:textColorSecondary" />
         </LinearLayout>
 
         <ImageView
@@ -88,7 +86,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?separator_color"
+        android:background="?dividerHorizontal"
         android:visibility="gone" />
 
     <View
@@ -98,6 +96,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?separator_color" />
+        android:background="?dividerHorizontal" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 2f66a659..dd0085c3 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -37,7 +37,6 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color"
                 android:visibility="gone" />
 
         </FrameLayout>
@@ -54,8 +53,7 @@
             android:layout_weight="1"
             android:fontFamily="sans-serif"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="?title_text_color" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <ImageView
             android:id="@+id/menu"
@@ -74,7 +72,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?separator_color"
+        android:background="?dividerHorizontal"
         android:visibility="gone" />
 
     <View
@@ -84,6 +82,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?separator_color" />
+        android:background="?dividerHorizontal" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index c338ece1..d9728dae 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -24,10 +24,10 @@
     internal:layout_minHeight="64dp">
 
     <LinearLayout
-        android:id="@+id/root"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:internal="http://schemas.android.com/apk/prv/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#00000000"
@@ -36,9 +36,9 @@
         tools:ignore="UselessParent">
 
         <FrameLayout
-            android:id="@+id/icon_group"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+            android:id="@+id/icon_group"
             android:layout_width="@dimen/notification_large_icon_width"
             android:layout_height="@dimen/notification_large_icon_height"
             android:layout_weight="0">
@@ -73,7 +73,6 @@
                 android:gravity="bottom"
                 android:singleLine="true"
                 android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-                android:textColor="@color/notification_content_color"
                 tools:ignore="NestedWeights" />
 
             <TextView
@@ -85,8 +84,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
         </LinearLayout>
 
         <LinearLayout
@@ -100,10 +98,9 @@
             android:orientation="horizontal"
             tools:ignore="UnusedAttribute">
             <!-- media buttons will be added here -->
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_prev"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -116,10 +113,9 @@
                 android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_play_pause"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -132,10 +128,9 @@
                 android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_next"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
diff --git a/app/src/main/res/layout/notification_big.xml b/app/src/main/res/layout/notification_big.xml
index 9d52593c..bdbab381 100644
--- a/app/src/main/res/layout/notification_big.xml
+++ b/app/src/main/res/layout/notification_big.xml
@@ -36,10 +36,9 @@
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription" />
 
-        <ImageButton
+        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/action_quit"
             style="@style/Widget.AppCompat.Button.Borderless"
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_alignParentEnd="true"
@@ -74,8 +73,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-                android:textColor="@color/notification_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
 
             <TextView
                 android:id="@+id/text"
@@ -87,8 +85,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
 
             <TextView
                 android:id="@+id/text2"
@@ -99,8 +96,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
         </LinearLayout>
 
         <LinearLayout
@@ -116,10 +112,9 @@
             android:orientation="horizontal"
             tools:ignore="UnusedAttribute">
             <!-- media buttons will be added here -->
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_prev"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -132,10 +127,9 @@
                 android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_play_pause"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -148,10 +142,9 @@
                 android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_next"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 8f3c1dcd..a97b95f6 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -33,7 +33,7 @@
                 android:paddingLeft="8dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="10sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
 
@@ -47,7 +47,7 @@
                 android:paddingRight="8dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="10sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
 
@@ -80,8 +80,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?attr/title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
             <TextView
                 android:id="@+id/player_text"
@@ -89,8 +88,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="?attr/caption_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
         </LinearLayout>
 
@@ -188,7 +186,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/player_footer_frame"
-        android:background="@color/black">
+        android:background="@android:color/black">
 
         <ImageView
             android:id="@+id/player_album_art_background"
diff --git a/app/src/main/res/layout/widget_medium.xml b/app/src/main/res/layout/widget_medium.xml
index 71a34a98..5893ed6b 100644
--- a/app/src/main/res/layout/widget_medium.xml
+++ b/app/src/main/res/layout/widget_medium.xml
@@ -30,7 +30,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_previous_black_36dp" />
+                android:src="@drawable/ic_skip_previous_dark_36dp" />
 
             <ImageButton
                 android:id="@+id/button_toggle_play_pause"
@@ -38,7 +38,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_play_arrow_black_36dp" />
+                android:src="@drawable/ic_play_arrow_dark_36dp" />
 
             <ImageButton
                 android:id="@+id/button_next"
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_next_black_36dp" />
+                android:src="@drawable/ic_skip_next_dark_36dp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c4cd95d8..5ca1088b 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -33,4 +33,8 @@
         <item name="android:progressBackgroundTint">@android:color/transparent</item>
     </style>
 
+    <style name="OverFlowButton" parent="OverFlowButtonParent">
+        <item name="android:tintMode">src_in</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7658465b..61b22709 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="title_text_color" format="color" />
-    <attr name="caption_text_color" format="color" />
 
     <attr name="music_controller_container_color" format="color" />
 
     <attr name="round_selector" format="reference" />
     <attr name="rect_selector" format="reference" />
 
-    <attr name="separator_color" format="color" />
-
-    <attr name="themed_drawable_color" format="color" />
-
-    <attr name="check_mark_color" format="color" />
-
     <attr name="default_bar_color" format="color" />
-    <attr name="card_color" format="color" />
 
     <attr name="toolbarPopupTheme" format="reference" />
 
-    <attr name="seek_arc_thumb_drawable" format="reference" />
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aeed71cd..767f3e34 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--general-->
-    <color name="ripple_material_dark" type="color">#4dffffff</color>
-    <color name="ripple_material_light" type="color">#1f000000</color>
-
-    <color name="activated_selected_dark" type="color">#9affffff</color>
-    <color name="activated_selected_light" type="color">#3e000000</color>
 
     <!--light theme-->
-    <color name="materialmusic_music_controller_container_color">@color/grey_300</color>
-    <color name="materialmusic_navigation_drawer_background_color">#fff</color>
-    <color name="materialmusic_separator_color">#0C000000</color>
-    <color name="materialmusic_default_bar_color">@color/grey_400</color>
-    <color name="materialmusic_themed_drawable_color">#8A000000</color>
+    <color name="music_controller_container_color">@android:color/white</color>
+    <color name="default_bar_color">@color/grey_700</color>
 
     <!--dark theme-->
-    <color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
-    <color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
-    <color name="materialmusic_dark_separator_color">#0CFFFFFF</color>
-    <color name="materialmusic_dark_default_bar_color">@color/grey_900</color>
-    <color name="materialmusic_dark_themed_drawable_color">@color/white</color>
-
-    <color name="sliding_tabs_activated">#FFFFFF</color>
-    <color name="sliding_tabs_deactivated">#99FFFFFF</color>
-
-    <!--notification-->
-    <color name="notification_content_color">#deFFFFFF</color>
-    <color name="notification_secondary_content_color">#aaFFFFFF</color>
-
-    <color name="notification_dark_text_content_color">#de000000</color>
-    <color name="notification_dark_text_secondary_content_color">#aa000000</color>
+    <color name="music_controller_container_color_dark">@color/grey_800</color>
+    <color name="default_bar_color_dark">@color/grey_900</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/materialcolors.xml b/app/src/main/res/values/materialcolors.xml
index f6fa5d16..8607a11e 100644
--- a/app/src/main/res/values/materialcolors.xml
+++ b/app/src/main/res/values/materialcolors.xml
@@ -2,15 +2,9 @@
 <resources>
 
     <color name="pink_A200">#ff4081</color>
-
     <color name="indigo_500">#3f51b5</color>
 
-    <color name="black">#000</color>
-    <color name="white">#fff</color>
-
-    <color name="grey_300">#e0e0e0</color>
-    <color name="grey_400">#bdbdbd</color>
-    <color name="grey_500">#9e9e9e</color>
+    <color name="grey_700">#616161</color>
     <color name="grey_800">#424242</color>
     <color name="grey_900">#212121</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index beb53eec..841aafba 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,18 +8,7 @@
 
     <style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
-    <style name="OverFlowButton">
-        <item name="android:tint">?themed_drawable_color</item>
-        <item name="android:src">@drawable/ic_more_vert_white_24dp</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:layout_width">48dp</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:scaleType">fitXY</item>
-        <item name="android:background">?round_selector</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:focusableInTouchMode">false</item>
-        <item name="android:focusable">false</item>
-    </style>
+    <style name="OverFlowButton" parent="OverFlowButtonParent" />
 
     <style name="PlayingIndicator">
         <item name="android:layout_width">36dp</item>
@@ -41,8 +30,7 @@
     </style>
 
     <style name="Toolbar">
-
-    <item name="titleMarginStart">16dp</item>
+        <item name="titleMarginStart">16dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?attr/actionBarSize</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 3a726ce1..e4ff2783 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -2,69 +2,48 @@
 <resources>
 
     <style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar">
-        <!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
-        <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
 
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
         <item name="md_dark_theme">true</item>
 
-        <item name="title_text_color">@color/primary_text_default_material_dark</item>
-        <item name="caption_text_color">@color/secondary_text_default_material_dark</item>
-
-        <item name="music_controller_container_color">
-            @color/materialmusic_dark_music_controller_container_color
+        <item name="music_controller_container_color">@color/music_controller_container_color_dark
         </item>
 
         <item name="round_selector">@drawable/round_selector_dark</item>
         <item name="rect_selector">@drawable/rect_selector_dark</item>
-        <item name="separator_color">@color/materialmusic_dark_separator_color</item>
-        <item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb_dark</item>
 
-        <item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
-        <item name="check_mark_color">@color/grey_900</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
 
-        <item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
-        <item name="card_color">@color/grey_800</item>
+        <item name="default_bar_color">@color/default_bar_color_dark</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
         <!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
-        <item name="colorAccent">@color/white</item>
+        <item name="colorAccent">@android:color/white</item>
     </style>
 
     <style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
-        <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
 
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
         <item name="md_dark_theme">false</item>
 
-        <item name="title_text_color">@color/primary_text_default_material_light</item>
-        <item name="caption_text_color">@color/secondary_text_default_material_light</item>
-
-        <item name="music_controller_container_color">
-            @color/materialmusic_music_controller_container_color
-        </item>
+        <item name="music_controller_container_color">@color/music_controller_container_color</item>
 
         <item name="round_selector">@drawable/round_selector</item>
         <item name="rect_selector">@drawable/rect_selector</item>
-        <item name="separator_color">@color/materialmusic_separator_color</item>
-        <item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb</item>
 
-        <item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
-        <item name="check_mark_color">@color/white</item>
+        <item name="cardBackgroundColor">@color/cardview_light_background</item>
 
-        <item name="default_bar_color">@color/materialmusic_default_bar_color</item>
-        <item name="card_color">@color/white</item>
+        <item name="default_bar_color">@color/default_bar_color</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
         <!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
-        <item name="colorAccent">@color/black</item>
+        <item name="colorAccent">@android:color/black</item>
     </style>
 
     <style name="PlayPauseFabParent">
@@ -86,4 +65,17 @@
         <item name="android:layout_marginLeft">@dimen/seek_bar_margin_left_right</item>
         <item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
     </style>
+
+    <style name="OverFlowButtonParent">
+        <item name="android:tint">?android:textColorSecondary</item>
+        <item name="android:src">@drawable/abc_ic_menu_moreoverflow_mtrl_alpha</item>
+        <item name="android:padding">12dp</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:scaleType">fitXY</item>
+        <item name="android:background">?round_selector</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:focusableInTouchMode">false</item>
+        <item name="android:focusable">false</item>
+    </style>
 </resources>
\ No newline at end of file