Massiv design optimizations and settings

app/src/main/res/drawable/list_item_selected.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="@color/list_item_selected"/>
-</shape>

app/src/main/res/drawable/list_item_selected_dark.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="@color/list_item_selected_dark"/>
-</shape>

app/src/main/res/drawable/list_selector.xml

@@ -2,7 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:drawable="@drawable/list_item_activated" android:state_activated="true"/>
-    <item android:drawable="@drawable/list_item_selected" android:state_pressed="true"/>
     <item android:drawable="@drawable/transparent"/>
 
 </selector>

app/src/main/res/drawable/list_selector_dark.xml

@@ -2,7 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:drawable="@drawable/list_item_activated_dark" android:state_activated="true"/>
-    <item android:drawable="@drawable/list_item_selected_dark" android:state_pressed="true"/>
     <item android:drawable="@drawable/transparent"/>
 
 </selector>

app/src/main/res/layout-land/activity_music_controller.xml

@@ -32,6 +32,12 @@
                 android:layout_alignParentTop="true"
                 android:scaleType="centerCrop"/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@+id/footer"
+                android:background="@drawable/shadow_up"/>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -44,28 +50,23 @@
                     android:id="@+id/song_current_progress"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="1"
                     android:fontFamily="sans-serif-medium"
                     android:gravity="bottom|left"
                     android:singleLine="true"
-                    android:text="1:24"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?attr/title_text_color"
-                    android:textSize="30sp"/>
+                    android:textColor="@color/white"/>
 
                 <TextView
                     android:id="@+id/song_total_time"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="16dp"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif"
                     android:gravity="bottom|right"
                     android:singleLine="true"
-                    android:text="3:58"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:textColor="?attr/caption_text_color"
-                    android:textSize="18sp"/>
+                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    android:textColor="@color/white"/>
 
             </LinearLayout>
 
@@ -125,8 +126,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_margin="16dp"
-                android:background="?attr/music_controller_container_color"
-                android:elevation="2dp">
+                android:background="?attr/music_controller_container_color">
 
                 <com.melnykov.fab.FloatingActionButton
                     android:id="@+id/fab"
@@ -197,17 +197,23 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:elevation="2dp"
-        android:fitsSystemWindows="true"
-        android:minHeight="@dimen/abc_action_bar_default_height_material"
-        android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:layout_alignParentTop="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/statusBar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusMargin"
+            android:background="@android:color/transparent"/>
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:background="@android:color/transparent"/>
+    </LinearLayout>
 
 </FrameLayout>
 

app/src/main/res/layout/activity_album_detail.xml

@@ -21,8 +21,8 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@null"
         android:clipToPadding="false"
+        android:divider="@null"
         android:dividerHeight="0dp"
         android:scrollbars="none"/>
 
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/title_view_height"
             android:height="@dimen/title_view_height"
-            android:background="@color/materialmusic_default_bar_color"
+            android:background="?default_bar_color"
             android:elevation="@dimen/toolbar_elevation"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical"
@@ -66,8 +66,7 @@
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            style="@style/Toolbar"
             android:background="@android:color/transparent"/>
     </LinearLayout>
 

app/src/main/res/layout/activity_album_tag_editor.xml

@@ -1,5 +1,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
@@ -44,7 +45,7 @@
                     android:paddingTop="8dp"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?attr/title_text_color"/>
+                    android:textColor="@color/white"/>
 
             </LinearLayout>
 
@@ -53,7 +54,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/header"
-                android:background="@color/background_material_dark"
                 android:orientation="vertical"
                 android:padding="16dp">
 
@@ -146,15 +146,10 @@
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        style="@style/Toolbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="#00000000"
-        android:minHeight="@dimen/abc_action_bar_default_height_material"
-        android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:background="#00000000"/>
 
     <com.melnykov.fab.FloatingActionButton
         android:id="@+id/fab"

app/src/main/res/layout/activity_artist_detail.xml

@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/title_view_height"
             android:height="@dimen/title_view_height"
-            android:background="@color/materialmusic_default_bar_color"
+            android:background="?default_bar_color"
             android:elevation="@dimen/toolbar_elevation"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical"
@@ -66,8 +66,7 @@
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            style="@style/Toolbar"
             android:background="@android:color/transparent"/>
     </LinearLayout>
 

app/src/main/res/layout/activity_main.xml

@@ -38,23 +38,37 @@
 
                 <android.support.v7.widget.Toolbar
                     android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    android:background="?colorPrimary"
-                    android:elevation="@dimen/toolbar_elevation"
-                    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+                    style="@style/Toolbar"
+                    android:background="?colorPrimary">
 
-                <com.google.samples.apps.iosched.ui.widget.SlidingTabLayout
-                    android:id="@+id/sliding_tabs"
+                    <TextView
+                        android:id="@+id/toolbar_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginStart="16dp"
+                        android:fontFamily="sans-serif-medium"
+                        android:gravity="left|center"
+                        android:text="@string/app_name"
+                        android:textColor="@color/white"
+                        android:textSize="20sp"/>
+                </android.support.v7.widget.Toolbar>
+
+                <com.astuetz.PagerSlidingTabStrip
+                    android:id="@+id/tabs"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/tab_height"
                     android:background="?colorPrimary"
-                    android:elevation="2dp"/>
+                    app:elevation="@dimen/toolbar_elevation"
+                    android:paddingLeft="64dp"
+                    android:textColor="@color/grey_400"
+                    android:textColorPrimary="@color/white"
+                    app:pstsTabPaddingLeftRight="8dp"/>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
-                    android:background="@drawable/shadow_down" />
+                    android:background="@drawable/shadow_down"/>
             </LinearLayout>
 
             <LinearLayout

app/src/main/res/layout/activity_music_controller.xml

@@ -1,4 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -30,16 +31,16 @@
         android:orientation="horizontal">
 
         <TextView
-            android:textStyle="bold"
             android:id="@+id/song_current_progress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:fontFamily="sans-serif"
+            android:fontFamily="sans-serif-medium"
             android:gravity="bottom|left"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/title_text_color"/>
+            android:textColor="@color/white"
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/song_total_time"
@@ -50,7 +51,7 @@
             android:gravity="bottom|right"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/caption_text_color"/>
+            android:textColor="@color/white"/>
 
     </LinearLayout>
 
@@ -60,7 +61,6 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/media_controller_container"
         android:background="@color/materialmusic_default_bar_color"
-        android:elevation="2dp"
         android:orientation="vertical"
         android:paddingBottom="16dp"
         android:paddingLeft="72dp"
@@ -89,14 +89,13 @@
     </LinearLayout>
 
     <RelativeLayout
+        android:layout_margin="16dp"
         android:id="@+id/media_controller_container"
         android:layout_width="match_parent"
         android:layout_height="88dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_margin="16dp"
-        android:background="?attr/music_controller_container_color"
-        android:elevation="2dp">
+        android:background="?music_controller_container_color">
 
         <ImageButton
             android:id="@+id/prev_button"
@@ -149,28 +148,32 @@
         <com.melnykov.fab.FloatingActionButton
             android:id="@+id/fab"
             style="@style/PlayPauseFab"
-            android:layout_centerInParent="true"
-            />
+            android:layout_centerInParent="true"/>
 
     </RelativeLayout>
 
     <SeekBar
-        android:elevation="2dp"
         android:id="@+id/progress_slider"
         style="@style/MusicProgressSlider"
-        android:layout_above="@+id/footer"/>
+        android:layout_above="@+id/footer"
+        android:elevation="2dp"/>
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        android:layout_alignParentTop="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:background="#00000000"
-        android:elevation="2dp"
-        android:fitsSystemWindows="true"
-        android:minHeight="@dimen/abc_action_bar_default_height_material"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/statusBar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusMargin"
+            android:background="@android:color/transparent"/>
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:background="@android:color/transparent"/>
+    </LinearLayout>
 
 </RelativeLayout>

app/src/main/res/layout/activity_playlist_detail.xml

@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?colorPrimary"
-            android:elevation="@dimen/toolbar_elevation"
+            app:elevation="@dimen/toolbar_elevation"
             app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
         <android.support.v7.widget.RecyclerView

app/src/main/res/layout/activity_preferences.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:background="?colorPrimary"/>
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>

app/src/main/res/layout/activity_search.xml

@@ -7,26 +7,25 @@
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        style="@style/Toolbar"
         android:background="?colorPrimary"
-        android:elevation="@dimen/toolbar_elevation"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        app:elevation="@dimen/toolbar_elevation"/>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="5dp"
-            android:background="@drawable/shadow_down" />
+            android:background="@drawable/shadow_down"/>
 
         <ListView
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:dividerHeight="0px"
-            android:divider="@null"/>
-        </FrameLayout>
+            android:divider="@null"
+            android:dividerHeight="0px"/>
+    </FrameLayout>
 
 </LinearLayout>

app/src/main/res/layout/activity_song_tag_editor.xml

@@ -1,5 +1,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
@@ -44,7 +45,7 @@
                     android:paddingTop="8dp"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?attr/title_text_color"/>
+                    android:textColor="@color/white"/>
 
                 <EditText
                     android:id="@+id/title2"
@@ -57,7 +58,7 @@
                     android:paddingTop="8dp"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?attr/title_text_color"/>
+                    android:textColor="@color/white"/>
 
             </LinearLayout>
 
@@ -66,7 +67,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/header"
-                android:background="@color/background_material_dark"
                 android:orientation="vertical"
                 android:padding="16dp">
 
@@ -186,15 +186,10 @@
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        style="@style/Toolbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="#00000000"
-        android:minHeight="@dimen/abc_action_bar_default_height_material"
-        android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:background="#00000000"/>
 
     <com.melnykov.fab.FloatingActionButton
         android:id="@+id/fab"

app/src/main/res/layout/artist_detail_header.xml

@@ -7,13 +7,13 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="164dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:scrollbars="none"/>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="#0CFFFFFF"/>
+        android:background="?separator_color"/>
 
 </LinearLayout>

app/src/main/res/layout/fragment_album_view.xml

@@ -3,15 +3,13 @@
     android:id="@+id/fragment_album_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="2dp">
+    android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:padding="2dp"
         android:scrollbars="vertical"/>
 </LinearLayout>
 

app/src/main/res/layout/fragment_navigation_drawer.xml

@@ -46,7 +46,7 @@
                 android:fontFamily="sans-serif-medium"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="@android:color/white"
+                android:textColor="@color/white"
                 android:textSize="14sp"/>
 
             <TextView

app/src/main/res/layout/item_grid_album.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    android:elevation="3dp"
-    android:foreground="?rect_selector">
+    android:layout_margin="2dp"
+    android:foreground="?rect_selector"
+    app:elevation="3dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -36,10 +36,8 @@
                 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:textSize="16sp"
-                tools:text="Album Title"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:textColor="?title_text_color"/>
 
             <TextView
                 android:id="@+id/album_interpret"
@@ -47,10 +45,8 @@
                 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:textSize="12sp"
-                tools:text="Interpret"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColor="?caption_text_color"/>
         </LinearLayout>
 
     </LinearLayout>

app/src/main/res/layout/item_grid_artist_album.xml

@@ -1,9 +1,10 @@
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="104dp"
     android:layout_height="148dp"
     android:layout_marginRight="8dp"
-    android:elevation="3dp"
+    app:elevation="3dp"
     android:foreground="?rect_selector">
 
     <LinearLayout
@@ -39,9 +40,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?attr/title_text_color"
-                    android:textSize="12sp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="?title_text_color"
+                    android:textSize="14sp"
                     />
 
                 <TextView
@@ -49,9 +50,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:textColor="?attr/caption_text_color"
-                    android:textSize="10sp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textColor="?caption_text_color"
+                    android:textSize="12sp"
                     />
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/item_list_album_song.xml

@@ -1,50 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?rect_selector"
-    android:descendantFocusability="blocksDescendants"
-    android:orientation="horizontal"
-    android:paddingLeft="16dp"
-    >
+    android:layout_height="72dp"
+    android:background="?rect_selector">
 
-    <TextView
-        android:id="@+id/track_number"
-        android:layout_width="40dp"
-        android:layout_height="64dp"
-        android:layout_gravity="center"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:descendantFocusability="blocksDescendants"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        >
 
-    <TextView
-        android:id="@+id/song_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_weight="1"
-        android:fontFamily="sans-serif"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+        <TextView
+            android:id="@+id/track_number"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:fontFamily="sans-serif"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="?title_text_color"/>
 
-    <TextView
-        android:id="@+id/song_duration"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"/>
-</LinearLayout>
+            <TextView
+                android:id="@+id/song_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:textColor="?title_text_color"/>
+
+            <TextView
+                android:id="@+id/song_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColor="?caption_text_color"/>
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/menu"
+            style="@style/OverFlowButton"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"/>
+    </LinearLayout>
+
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="72dp"
+        android:background="?separator_color"/>
+</FrameLayout>

app/src/main/res/layout/item_list_artist.xml

@@ -1,45 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:background="?rect_selector"
-    android:orientation="horizontal"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/artist_image"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="72dp"
+             android:background="?rect_selector">
 
     <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_weight="1"
-        android:orientation="vertical">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
 
-        <TextView
-            android:id="@+id/artist_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/artist_image"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="centerCrop"/>
 
-        <TextView
-            android:id="@+id/artist_info"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="sans-serif"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+            android:layout_gravity="center"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/artist_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:textColor="?title_text_color"/>
+
+            <TextView
+                android:id="@+id/artist_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColor="?caption_text_color"/>
+        </LinearLayout>
+
     </LinearLayout>
 
-</LinearLayout>
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="72dp"
+        android:background="?separator_color"/>
+</FrameLayout>

app/src/main/res/layout/item_list_artist_song.xml

@@ -1,49 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:descendantFocusability="blocksDescendants"
-    android:orientation="horizontal"
-    android:paddingLeft="16dp">
-
-    <com.kabouzeid.gramophone.view.SquareImageView
-        android:id="@+id/album_art"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="72dp">
 
     <LinearLayout
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:orientation="vertical">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:descendantFocusability="blocksDescendants"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp">
 
-        <TextView
-            android:id="@+id/song_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+        <com.kabouzeid.gramophone.view.SquareImageView
+            android:id="@+id/album_art"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="centerCrop"/>
 
-        <TextView
-            android:id="@+id/song_info"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="sans-serif"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+            android:layout_gravity="center"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:textColor="?title_text_color"
+                android:id="@+id/song_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
+
+            <TextView
+                android:textColor="?caption_text_color"
+                android:id="@+id/song_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/menu"
+            style="@style/OverFlowButton"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="2dp"/>
+
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_marginRight="2dp"/>
-</LinearLayout>
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="72dp"
+        android:background="?separator_color"/>
+</FrameLayout>

app/src/main/res/layout/item_list_playlist.xml

@@ -1,36 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:background="?rect_selector"
-    android:orientation="horizontal"
-    android:paddingLeft="16dp">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="64dp"
+             android:background="?rect_selector">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:src="@drawable/ic_queue_music_white_24dp"
-        />
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
 
-    <TextView
-        android:layout_weight="1"
-        android:id="@+id/playlist_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:fontFamily="sans-serif"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+        android:orientation="horizontal"
+        android:paddingLeft="16dp">
 
-    <ImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_marginRight="2dp"/>
+        <ImageView
+            android:id="@+id/playlist_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:padding="8dp"
+            android:src="@drawable/ic_queue_music_white_24dp"
+            />
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/playlist_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:fontFamily="sans-serif"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="?title_text_color"/>
+
+        <ImageView
+            android:id="@+id/menu"
+            style="@style/OverFlowButton"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="2dp"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="72dp"
+        android:background="?separator_color"/>
+</FrameLayout>

app/src/main/res/layout/item_list_search.xml

@@ -9,8 +9,8 @@
 
     <com.kabouzeid.gramophone.view.SquareImageView
         android:id="@+id/image"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_gravity="center"
         android:gravity="center"
         android:scaleType="centerCrop"
@@ -31,7 +31,8 @@
             android:layout_marginRight="16dp"
             android:fontFamily="sans-serif"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="?title_text_color"/>
 
         <TextView
             android:id="@+id/sub_title"
@@ -41,6 +42,7 @@
             android:layout_marginRight="16dp"
             android:fontFamily="sans-serif"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="?caption_text_color"/>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/item_list_song.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
-    android:background="?rect_selector"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:background="?rect_selector">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="72dp"
+        android:layout_height="match_parent"
         android:descendantFocusability="blocksDescendants"
         android:orientation="horizontal"
         android:paddingLeft="16dp">
 
         <com.kabouzeid.gramophone.view.SquareImageView
             android:id="@+id/album_art"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_gravity="center"
             android:gravity="center"
             android:scaleType="centerCrop"/>
@@ -30,20 +30,22 @@
             android:orientation="vertical">
 
             <TextView
+                android:textColor="?title_text_color"
                 android:id="@+id/song_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
             <TextView
+                android:textColor="?caption_text_color"
                 android:id="@+id/song_info"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
         </LinearLayout>
 
         <ImageView
@@ -58,6 +60,14 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="#0CFFFFFF"
+        android:background="?separator_color"
         android:visibility="gone"/>
+
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="72dp"
+        android:background="?separator_color"/>
 </FrameLayout>

app/src/main/res/layout/item_navigation_drawer.xml

@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/list_selector"
+    android:background="?list_selector"
     android:minHeight="48dp"
     android:orientation="horizontal"
     android:padding="16dp">

app/src/main/res/menu/menu_album_detail.xml

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/music_box"
+        android:icon="@drawable/ic_equalizer_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom"/>
 
@@ -17,7 +17,6 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:icon="@drawable/ic_shuffle_white_48dp"
         android:title="@string/shuffle_all"
         app:showAsAction="never"/>
 
@@ -30,10 +29,4 @@
         android:id="@+id/action_tag_editor"
         android:title="@string/action_tag_editor"
         app:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
 </menu>

app/src/main/res/menu/menu_artist_detail.xml

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/music_box"
+        android:icon="@drawable/ic_equalizer_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom"/>
 
@@ -17,7 +17,6 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:icon="@drawable/ic_shuffle_white_48dp"
         android:title="@string/shuffle_all"
         app:showAsAction="never"/>
 
@@ -30,10 +29,4 @@
         android:id="@+id/action_re_download_artist_image"
         android:title="@string/action_re_download_artist_image"
         app:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
 </menu>

app/src/main/res/menu/menu_main.xml

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/music_box"
+        android:icon="@drawable/ic_equalizer_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="always"/>
 
@@ -17,7 +17,6 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:icon="@drawable/ic_shuffle_white_48dp"
         android:title="@string/shuffle_all"
         app:showAsAction="never"/>
 
@@ -29,7 +28,6 @@
 
     <item
         android:id="@+id/action_settings"
-        android:icon="@drawable/settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never"/>

app/src/main/res/menu/menu_music_playing.xml

@@ -10,7 +10,6 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:icon="@drawable/ic_shuffle_white_48dp"
         android:title="@string/shuffle_all"
         app:showAsAction="never"/>
 
@@ -34,9 +33,4 @@
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
 </menu>

app/src/main/res/menu/menu_playlist_detail.xml

@@ -4,12 +4,11 @@
       tools:context="com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity">
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/music_box"
+        android:icon="@drawable/ic_equalizer_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_playing_queue"
-        android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
         app:showAsAction="never"/>
     <item

app/src/main/res/menu/menu_playlists.xml

@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/music_box"
+        android:icon="@drawable/ic_equalizer_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="always"/>
 
@@ -20,19 +20,16 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:icon="@drawable/ic_shuffle_white_48dp"
         android:title="@string/shuffle_all"
         app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_playing_queue"
-        android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
         app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_settings"
-        android:icon="@drawable/settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never"/>

app/src/main/res/menu/menu_tag_editor.xml

@@ -1,10 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
-      tools:context="com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
-</menu>

app/src/main/res/values-v21/styles.xml

@@ -27,7 +27,7 @@
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
         <item name="android:elevation">2dp</item>
         <item name="android:thumbTint">@color/materialmusic_accent_color</item>
-        <item name="android:progressTint">@color/materialmusic_accent_color_darker</item>
+        <item name="android:progressTint">@color/materialmusic_accent_color</item>
         <item name="android:padding">0dp</item>
     </style>
 </resources>

app/src/main/res/values/attrs.xml

@@ -2,9 +2,26 @@
 <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="navigation_drawer_background_color" format="color"/>
+
     <attr name="list_selector" format="reference"/>
     <attr name="round_selector" format="reference"/>
     <attr name="rect_selector" format="reference"/>
+
+    <attr name="separator_color" format="color"/>
+
+    <attr name="drawable_color" format="color"/>
+    <attr name="drawable_color_enabled" format="color"/>
+
+    <attr name="icon_overflow" format="reference"/>
+
+    <attr name="themed_drawable_color" format="color"/>
+    <attr name="themed_drawable_activated_color" format="color"/>
+
+    <attr name="default_bar_color" format="color"/>
+
+    <attr name="toolbarPopupTheme" format="reference"/>
+
 </resources>

app/src/main/res/values/colors.xml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--general-->
-    <color name="materialmusic_default_bar_color">@color/grey_900</color>
+
 
     <!--light theme-->
-    <color name="materialmusic_color">@color/blue_500</color>
-    <color name="materialmusic_color_darker">@color/blue_600</color>
+    <color name="materialmusic_color">@color/indigo_500</color>
+    <color name="materialmusic_color_darker">@color/indigo_600</color>
     <color name="materialmusic_accent_color">@color/pink_500</color>
     <color name="materialmusic_accent_color_darker">@color/pink_600</color>
     <color name="materialmusic_accent_color_lighter">@color/pink_300</color>
-    <color name="materialmusic_title_text_color">?android:attr/textColorPrimaryInverse</color>
-    <color name="materialmusic_caption_text_color">?android:attr/textColorSecondaryInverse</color>
-    <color name="materialmusic_music_controller_container_color">@color/grey_400</color>
+    <color name="materialmusic_music_controller_container_color">@color/grey_300</color>
     <color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
+    <color name="materialmusic_separator_color">#0C000000</color>
+    <color name="materialmusic_default_bar_color">@color/white</color>
+    <color name="materialmusic_themed_drawable_color">@color/grey_800</color>
+    <color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
+    <color name="list_item_activated">#D0D0D0</color>
     
     <!--dark theme-->
     <color name="materialmusic_dark_color">@color/indigo_500</color>
@@ -20,16 +23,13 @@
     <color name="materialmusic_dark_accent_color">@color/pink_500</color>
     <color name="materialmusic_dark_accent_color_darker">@color/pink_600</color>
     <color name="materialmusic_dark_accent_color_lighter">@color/pink_300</color>
-    <color name="materialmusic_dark_title_text_color">?android:attr/textColorPrimary</color>
-    <color name="materialmusic_dark_caption_text_color">?android:attr/textColorSecondary</color>
     <color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
     <color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
-
-    <!--nav drawer list items-->
-    <color name="list_item_activated">#55000000</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="materialmusic_dark_themed_drawable_activated_color">@color/materialmusic_dark_accent_color</color>
     <color name="list_item_activated_dark">#55000000</color>
-    <color name="list_item_selected">#D0D0D0</color>
-    <color name="list_item_selected_dark">#77404040</color>
 
     <!--round and rect selector-->
     <color name="button_selected">#D0D0D0</color>

app/src/main/res/values/strings.xml

@@ -89,5 +89,9 @@
     <string name="delete_songs_2">\u0020songs?</string>
     <string name="delete_warning">"Warning: This operation can not be undone."</string>
     <string name="shuffle_all">Shuffle all</string>
+    <string name="last_opened">Last opened</string>
+    <string name="title_setting_start_page">Start page</string>
+    <string name="light_theme_name">Light</string>
+    <string name="dark_theme_name">Dark</string>
 
 </resources>

app/src/main/res/values/strings_activity_settings.xml

@@ -0,0 +1,40 @@
+<resources>
+    <string name="title_activity_settings">Settings</string>
+
+    <!-- Strings related to Settings -->
+
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_set_default_start_page">Set default start page</string>
+    <string-array name="pref_start_page_list_titles">
+        <item>@string/last_opened</item>
+        <item>@string/songs</item>
+        <item>@string/albums</item>
+        <item>@string/artists</item>
+        <item>@string/playlists</item>
+    </string-array>
+    <string-array name="pref_start_page_list_values">
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <!-- UI settings -->
+    <string name="pref_header_ui">UI</string>
+    <string name="pref_title_general_theme">General theme</string>
+    <string-array name="pref_general_theme_list_titles">
+        <item>@string/light_theme_name</item>
+        <item>@string/dark_theme_name</item>
+    </string-array>
+    <string-array name="pref_general_theme_list_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string name="pref_title_show_playback_controller_card">Playback controller card</string>
+    <string name="pref_title_colored_navigation_bar_artists">Colored navigation bar artist view</string>
+    <string name="pref_title_colored_navigation_bar_albums">Colored navigation bar album view</string>
+    <string name="pref_title_colored_album_footers">Colored album footers</string>
+
+</resources>

app/src/main/res/values/styles.xml

@@ -16,7 +16,7 @@
         <item name="android:padding">12dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
-        <item name="android:src">@drawable/ic_overflow</item>
+        <item name="android:src">?icon_overflow</item>
         <item name="android:scaleType">fitXY</item>
         <item name="android:background">?round_selector</item>
         <item name="android:layout_centerVertical">true</item>
@@ -43,4 +43,13 @@
         <item name="android:thumb">@drawable/slider_thumb</item>
     </style>
 
+    <style name="Toolbar">
+        <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>
+        <item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item>
+        <item name="popupTheme">?toolbarPopupTheme</item>
+        <item name="elevation">@dimen/toolbar_elevation</item>
+    </style>
+
 </resources>

app/src/main/res/values/styles_parents.xml

@@ -21,6 +21,16 @@
         <item name="list_selector">@drawable/list_selector_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="icon_overflow">@drawable/ic_more_vert_white_24dp</item>
+
+        <item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
+        <item name="themed_drawable_activated_color">@color/materialmusic_dark_themed_drawable_activated_color</item>
+
+        <item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
         <item name="md_dark_theme">true</item>
 
@@ -37,8 +47,8 @@
         <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
         <item name="fab_colorPressed">@color/materialmusic_accent_color</item>
 
-        <item name="title_text_color">?android:attr/textColorPrimaryInverse</item>
-        <item name="caption_text_color">?android:attr/textColorSecondaryInverse</item>
+        <item name="title_text_color">?android:attr/textColorPrimary</item>
+        <item name="caption_text_color">?android:attr/textColorSecondary</item>
 
         <item name="music_controller_container_color">@color/materialmusic_music_controller_container_color</item>
         <item name="navigation_drawer_background_color">@color/materialmusic_navigation_drawer_background_color</item>
@@ -46,6 +56,16 @@
         <item name="list_selector">@drawable/list_selector</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="icon_overflow">@drawable/ic_more_vert_black_24dp</item>
+
+        <item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
+        <item name="themed_drawable_activated_color">@color/materialmusic_themed_drawable_activated_color</item>
+
+        <item name="default_bar_color">@color/materialmusic_default_bar_color</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
         <item name="md_dark_theme">false</item>
     </style>

app/src/main/res/xml/pref_general.xml

@@ -0,0 +1,15 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:title="@string/pref_header_general">
+        <com.afollestad.materialdialogs.prefs.MaterialListPreference
+            android:defaultValue="-1"
+            android:entries="@array/pref_start_page_list_titles"
+            android:entryValues="@array/pref_start_page_list_values"
+            android:key="default_start_page"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_set_default_start_page"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>

app/src/main/res/xml/pref_ui.xml

@@ -0,0 +1,34 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/pref_header_ui">
+    <com.afollestad.materialdialogs.prefs.MaterialListPreference
+        android:defaultValue="1"
+        android:entries="@array/pref_general_theme_list_titles"
+        android:entryValues="@array/pref_general_theme_list_values"
+        android:key="general_theme"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:title="@string/pref_title_general_theme"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="playback_controller_card"
+        android:title="@string/pref_title_show_playback_controller_card"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="colored_navigation_bar_artist"
+        android:title="@string/pref_title_colored_navigation_bar_artists"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="colored_navigation_bar_album"
+        android:title="@string/pref_title_colored_navigation_bar_albums"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="colored_album_footers"
+        android:title="@string/pref_title_colored_album_footers"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>