diff --git a/res/drawable/bottom_shadow.xml b/res/drawable/bottom_shadow.xml
index 7b6385c28bc95f3c084b522f75dc5134863f295c..2122798b750513a023245ffeec53f1365b9f862d 100644
--- a/res/drawable/bottom_shadow.xml
+++ b/res/drawable/bottom_shadow.xml
@@ -21,6 +21,6 @@
     <gradient
         android:angle="90.0"
         android:endColor="@color/transparent"
-        android:startColor="@color/black" />
+        android:startColor="@color/primary_text" />
 
 </shape>
diff --git a/res/drawable/btn_add_to_playlist.xml b/res/drawable/btn_add_to_playlist.xml
index 1907ca04a31dd3047018cf82fe3f327cfc646aac..d3a59b8296f39efcee3d798502ae20464064c3b0 100644
--- a/res/drawable/btn_add_to_playlist.xml
+++ b/res/drawable/btn_add_to_playlist.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M14 10H2v2h12v-2zm0-4H2v2h12V6zm4 8v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2
 16h8v-2H2v2z" />
 </vector>
diff --git a/res/drawable/btn_playback_browse.xml b/res/drawable/btn_playback_browse.xml
index 2602092cda4f32a1850690eebf744bcd9f7b7f81..54e5e58dc7b50829c5ea3e54c6fb9db1d8e83755 100644
--- a/res/drawable/btn_playback_browse.xml
+++ b/res/drawable/btn_playback_browse.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M20 2H8c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-2
 5h-3v5.5c0 1.38-1.12 2.5-2.5 2.5S10 13.88 10 12.5s1.12-2.5 2.5-2.5c.57 0 1.08
 .19 1.5 .51 V5h4v2zM4 6H2v14c0 1.1 .9 2 2 2h14v-2H4V6z" />
diff --git a/res/drawable/btn_playback_icon.xml b/res/drawable/btn_playback_icon.xml
index b3aaacbdb82fb3e6c86cdf8eb62a2c2b19fdffa6..7945505c146fbbd3117516d323296f06bda93827 100644
--- a/res/drawable/btn_playback_icon.xml
+++ b/res/drawable/btn_playback_icon.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M12 3v9.28c-.47-.17-.97-.28-1.5-.28-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5
 4.5c2.31 0 4.2-1.75 4.45-4h.05v-11h4v-3h-7z" />
 </vector>
diff --git a/res/drawable/btn_queue_icon.xml b/res/drawable/btn_queue_icon.xml
index bce1cf2db51e146032b7cdf10dd32adc1ee3f696..a72e4fe1cb792c0ab21652cae8547ea52d70b187 100644
--- a/res/drawable/btn_queue_icon.xml
+++ b/res/drawable/btn_queue_icon.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17
 6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" />
 </vector>
diff --git a/res/drawable/drag_indicator.xml b/res/drawable/drag_indicator.xml
index 4298d28b049c6c1a8c5c343af167a3d36f26f3ed..5ca250129ade1190fbc11a0658211c812da46785 100644
--- a/res/drawable/drag_indicator.xml
+++ b/res/drawable/drag_indicator.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
 </vector>
diff --git a/res/drawable/gray_circle.xml b/res/drawable/gray_circle.xml
index 8a53cf3855b4170095883124976ebc10ffab17cf..20e170be7d0242b348294ad9ef622061a27b5f9b 100644
--- a/res/drawable/gray_circle.xml
+++ b/res/drawable/gray_circle.xml
@@ -15,5 +15,5 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/grey" />
+    <solid android:color="@color/accent" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/gripper.xml b/res/drawable/gripper.xml
index a2c58d63279f36e4d6b3075a6e5e4c9916c18581..e5385f84318f61d4f5e330233be97f9674bad6ad 100644
--- a/res/drawable/gripper.xml
+++ b/res/drawable/gripper.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
 </vector>
diff --git a/res/drawable/gripper_light.xml b/res/drawable/gripper_light.xml
index 4298d28b049c6c1a8c5c343af167a3d36f26f3ed..e5385f84318f61d4f5e330233be97f9674bad6ad 100644
--- a/res/drawable/gripper_light.xml
+++ b/res/drawable/gripper_light.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
 </vector>
diff --git a/res/drawable/history_icon.xml b/res/drawable/history_icon.xml
index d47287015f542e90c04f1ca679187e31582552c5..39581a6018f64a8c797aaf136507d57d4d688e0b 100644
--- a/res/drawable/history_icon.xml
+++ b/res/drawable/history_icon.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:fillAlpha=".9"
         android:strokeAlpha=".9"
         android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
diff --git a/res/drawable/ic_action_search.xml b/res/drawable/ic_action_search.xml
index e23efa46d92ea45fd8b314a4685cd1b5ebb0f84f..ccdabce156327cd7bd7d6a0222b55c630dc552a4 100644
--- a/res/drawable/ic_action_search.xml
+++ b/res/drawable/ic_action_search.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91
 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27 .28 v.79l5 4.99L20.49
 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5
diff --git a/res/drawable/ic_default_artwork.xml b/res/drawable/ic_default_artwork.xml
new file mode 100644
index 0000000000000000000000000000000000000000..90e8066f2c0480d3070325085139b5614b24e330
--- /dev/null
+++ b/res/drawable/ic_default_artwork.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M0,0 L24,0 L24,24 L0,24 z" />
+    <path
+        android:fillColor="@color/color_default_view_on_accent"
+        android:pathData="M12 3v9.28c-.47-.17-.97-.28-1.5-.28-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5
+4.5c2.31 0 4.2-1.75 4.45-4h.05v-11h4v-3h-7z" />
+
+</vector>
diff --git a/res/drawable/menu_button.xml b/res/drawable/menu_button.xml
index 89a4dcaa6ea9f006f07942a1600f288c52782285..da1adfc958bc7b9e851a7b479959e73d48fd255a 100644
--- a/res/drawable/menu_button.xml
+++ b/res/drawable/menu_button.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
 </vector>
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
index 5d8af81b83413691e47da48a8400bcd8fb3c451f..da1adfc958bc7b9e851a7b479959e73d48fd255a 100644
--- a/res/drawable/menu_button_light.xml
+++ b/res/drawable/menu_button_light.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/list_item_text_color_light"
+        android:fillColor="@color/accent"
         android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
 </vector>
diff --git a/res/drawable/no_results.xml b/res/drawable/no_results.xml
index 6299d0218a09dbea7208ee4d93958d17c19693d0..1e17a211066476030fbdc83801fd0a8121621e3b 100644
--- a/res/drawable/no_results.xml
+++ b/res/drawable/no_results.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 14.5c-2.49
 0-4.5-2.01-4.5-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5-2.01 4.5-4.5 4.5zm0-5.5c-.55
 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1z" />
diff --git a/res/drawable/playlist_icon.xml b/res/drawable/playlist_icon.xml
index 454540cd647252c66e7d782c3cd677627558ead9..58bd2d126e6f10a48dd8721553eb0e37852475f3 100644
--- a/res/drawable/playlist_icon.xml
+++ b/res/drawable/playlist_icon.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/primary"
+        android:fillColor="@color/accent"
         android:pathData="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17
 6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" />
 </vector>
diff --git a/res/drawable/recent_icon.xml b/res/drawable/recent_icon.xml
index 7605ba75c4b24af93dc519e651e7eb5932320dc6..39581a6018f64a8c797aaf136507d57d4d688e0b 100644
--- a/res/drawable/recent_icon.xml
+++ b/res/drawable/recent_icon.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/lineage_blue_color"
+        android:fillColor="@color/accent"
         android:fillAlpha=".9"
         android:strokeAlpha=".9"
         android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
diff --git a/res/drawable/recently_added.xml b/res/drawable/recently_added.xml
index e37ccd0991239126c86abfcd6cfa9b2b8cb7bf23..935dd383ab1218c0305460b078521d5387cb8806 100644
--- a/res/drawable/recently_added.xml
+++ b/res/drawable/recently_added.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/lineage_blue_color"
+        android:fillColor="@color/accent"
         android:pathData="M23 12l-2.44-2.78 .34 -3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61 .81
 .34 3.68L1 12l2.44 2.78-.34 3.69 3.61 .82 1.89 3.18L12 21l3.4 1.46 1.89-3.18
 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z" />
diff --git a/res/drawable/right_shadow.xml b/res/drawable/right_shadow.xml
index 85e5744547e0b8af950e7385c9ef5259f6597588..ef3fc62cf34bb77acb55db7b0d45880ea577f634 100644
--- a/res/drawable/right_shadow.xml
+++ b/res/drawable/right_shadow.xml
@@ -21,6 +21,6 @@
     <gradient
         android:angle="180"
         android:endColor="@color/transparent"
-        android:startColor="@color/black" />
+        android:startColor="@color/primary_text" />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/round_corner_rect.xml b/res/drawable/round_corner_rect.xml
index 23dce5c108906531e8b1f1c13925582067b45ba8..1216f6741f6cd61d2e9b22880e1b946c0b3b4148 100644
--- a/res/drawable/round_corner_rect.xml
+++ b/res/drawable/round_corner_rect.xml
@@ -5,7 +5,7 @@
         android:radius="10dp"
         />
     <solid
-        android:color="@color/lineage_blue_color"
+        android:color="@color/accent"
         />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/selectable_background.xml b/res/drawable/selectable_background.xml
index cc32cb7b9bbb039434fdb1eee29ca044af2d84e2..763e8df85bd6fc76f434c51bec89e2fc6711868a 100644
--- a/res/drawable/selectable_background.xml
+++ b/res/drawable/selectable_background.xml
@@ -15,4 +15,4 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white" />
+    android:color="@color/background_color" />
diff --git a/res/drawable/selectable_background_light.xml b/res/drawable/selectable_background_light.xml
index ed49ae527ccf27c5662aae1276edc064121f130b..3e1e6c6bd66f345251d567a6b4c1f8290d77c918 100644
--- a/res/drawable/selectable_background_light.xml
+++ b/res/drawable/selectable_background_light.xml
@@ -14,4 +14,4 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/primary" />
+    android:color="@color/background_color" />
diff --git a/res/drawable/top_tracks_icon.xml b/res/drawable/top_tracks_icon.xml
index 327d4ac22b2d02de088804e1a2d7269ceb097cfd..44bb01731c54fbd5f5e8438bfbdbf21e19f5927f 100644
--- a/res/drawable/top_tracks_icon.xml
+++ b/res/drawable/top_tracks_icon.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/lineage_blue_color"
+        android:fillColor="@color/accent"
         android:pathData="M12 21.35l-1.45-1.32c-5.15-4.67-8.55-7.75-8.55-11.53 0-3.08 2.42-5.5 5.5-5.5
 1.74 0 3.41 .81 4.5 2.09 1.09-1.28 2.76-2.09 4.5-2.09 3.08 0 5.5 2.42 5.5 5.5 0
 3.78-3.4 6.86-8.55 11.54l-1.45 1.31z" />
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml
index f9e09d4e8180185aed220e7f4eb23b5e67ca695d..0b4191713d096bb6177c5e9ee5d5f74f286ef026 100644
--- a/res/drawable/view_pager_tab_background.xml
+++ b/res/drawable/view_pager_tab_background.xml
@@ -17,6 +17,6 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/tab_ripple_color">
     <item android:id="@android:id/mask">
-        <color android:color="@android:color/white" />
+        <color android:color="@color/color_default_view_on_accent" />
     </item>
 </ripple>
diff --git a/res/layout-land/activity_player_fragment.xml b/res/layout-land/activity_player_fragment.xml
index ffeef76da662e895b0086ecedc67df923481c513..85644ef9c348d7871ac623657d8f641bb3832ada 100644
--- a/res/layout-land/activity_player_fragment.xml
+++ b/res/layout-land/activity_player_fragment.xml
@@ -22,6 +22,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_color"
     android:orientation="vertical">
 
     <include
diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index d5c83030b27e21040a8e36a104fc85d483107210..9b7c4e6202083111b875191e006e7ffdb601ef43 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -9,7 +9,7 @@
         android:layout_height="108dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
-        android:background="@color/page_header_background"
+        android:background="@color/primary_dark"
         android:elevation="2dp" >
 
         <ImageView
@@ -69,6 +69,7 @@
                 android:layout_alignBottom="@+id/duration"
                 android:layout_marginEnd="4dp"
                 android:gravity="center"
+                android:tint="@color/accent"
                 android:src="@drawable/stopwatch_icon_small_grey" />
 
             <TextView
diff --git a/res/layout/activity_audio_preview.xml b/res/layout/activity_audio_preview.xml
index 3eb2f54882cf680b4533d477aebb08d08c2f2de0..f894488f4b9b9b37b893ea0f87bb10a0034d5840 100644
--- a/res/layout/activity_audio_preview.xml
+++ b/res/layout/activity_audio_preview.xml
@@ -24,7 +24,7 @@
 
     <LinearLayout
         android:id="@+id/grp_container_view"
-        android:background="?android:colorBackground"
+        android:background="@color/background_color"
         android:layout_centerInParent="true"
         android:layout_width="match_parent"
         android:layout_height="@dimen/preview_layout_height"
@@ -45,6 +45,9 @@
                 android:visibility="invisible"
                 android:maxHeight="@dimen/preview_layout_seekbar_height"
                 android:minHeight="@dimen/preview_layout_seekbar_height"
+                android:thumbTint="@color/accent"
+                android:progressTint="@color/accent"
+                android:progressBackgroundTint="@color/color_default_gray1"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/preview_layout_seekbar_height"/>
 
@@ -56,6 +59,7 @@
                 android:maxHeight="@dimen/preview_layout_seekbar_height"
                 android:minHeight="@dimen/preview_layout_seekbar_height"
                 android:layout_height="@dimen/preview_layout_seekbar_height"
+                android:progressDrawable="@drawable/circular_drawable"
                 android:layout_width="match_parent" />
 
         </FrameLayout>
@@ -83,6 +87,7 @@
                 android:layout_alignParentTop="true"
                 android:gravity="top"
                 android:layout_toLeftOf="@id/ib_playpause"
+                android:textColor="@color/primary_text"
                 android:ellipsize="end"
                 android:textSize="@dimen/preview_title_textSize"
                 android:textStyle="bold"/>
@@ -94,6 +99,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_below="@id/tv_title"
                 android:layout_toLeftOf="@id/ib_playpause"
+                android:textColor="@color/secondary_text"
                 android:ellipsize="end"
                 android:textSize="@dimen/preview_artist_textSize"
                 android:textStyle="italic"/>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 6b2ac8e948284ccaae099cad5d6bb5d72fced362..67324585db133880fb32ca8efdfd1d9ed160809d 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -104,6 +104,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="5dp"
+                    android:layout_marginTop="5dp"
                     android:background="@drawable/round_corner_rect">
 
                     <ImageView
@@ -112,7 +113,7 @@
                         android:layout_height="@dimen/sliding_panel_indicator_height"
                         android:layout_gravity="center_horizontal"
                         android:scaleType="centerInside"
-                        android:tint="@color/white"
+                        android:tint="@color/color_default_view_on_accent"
                         android:layout_marginStart="20dp"
                         android:layout_marginEnd="20dp"
                         android:src="@drawable/drag_indicator" />
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index dd9c63caffb5b03cbaeac71c1fab89d7eed77b61..e9352cea0dc4f77c1a53c5d84d10eeb7b94e1096 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -25,7 +25,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     tools:background="@color/blue_dark"
-    android:background="@color/player_action_bar_color"
+    android:background="@color/background_color"
     >
 
     <include
diff --git a/res/layout/album_art_fragment.xml b/res/layout/album_art_fragment.xml
index b8e44f8066db2c538bbcccff89d5932887330f83..df1e4374c2cd189f4ec92cb6a07a6a926ca97cbc 100644
--- a/res/layout/album_art_fragment.xml
+++ b/res/layout/album_art_fragment.xml
@@ -22,5 +22,5 @@
         android:id="@+id/audio_player_album_art"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:src="@drawable/default_artwork"/>
+        android:src="@drawable/ic_default_artwork"/>
 </FrameLayout>
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index de709c1e7713085958525e2f361f4d02ede48953..f877ad65e63c221f789606defedbd0d94e9dac72 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -23,6 +23,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:gravity="center"
+            android:tint="@color/accent"
             android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 344fe04820516a2faa3d1ccc6512d2b135ded8b7..c87be15bfe7fb9b41e2f60c377bc1ae70bc8c435 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -46,6 +46,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginBottom="1dp"
             android:gravity="center_vertical"
+            android:tint="@color/accent"
             android:src="@lineageos.platform:drawable/ic_menu" />
 
         <LinearLayout
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 3cfff98b3cab4052499b541cd54d6e1066704372..9cad7029a046abcc34608fabfb65c1213d7dcce7 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -33,6 +33,7 @@
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
+            android:tint="@color/accent"
             android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index 3005fbb1e31a4346984fa1df19041a4397578d83..e868a1b1fb77ecc131c3449c79b116cbe56ee451 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -24,7 +24,7 @@
     android:clickable="true"
     android:orientation="horizontal"
     android:elevation="@dimen/action_bar_elevation"
-    android:background="@color/lineage_blue_color"
+    android:background="@color/accent"
     tools:ignore="ContentDescription" >
 
     <org.lineageos.eleven.widgets.SquareImageView
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start|center"
-        android:src="@drawable/default_artwork" />
+        android:src="@drawable/ic_default_artwork" />
 
     <RelativeLayout
         android:id="@+id/bottom_action_bar_info_container"
diff --git a/res/layout/custom_select_dialog_item.xml b/res/layout/custom_select_dialog_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..372738b0418375665f1619a16d900024541f1a3a
--- /dev/null
+++ b/res/layout/custom_select_dialog_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:textAppearance="?android:attr/textAppearanceLarge"
+    android:textColor="@color/primary_text"
+    android:gravity="center_vertical"
+    android:paddingStart="14dip"
+    android:paddingEnd="15dip"
+    android:ellipsize="marquee"
+    />
\ No newline at end of file
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index f592bc5ab6aab6bab548218335491a5e59ef54ce..99f082c1c1facdbc801ba3ec90df5dba530de5d3 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -26,7 +26,6 @@
         android:layout_height="@dimen/drag_and_drop_height"
         android:layout_centerVertical="true"
         android:scaleType="fitXY"
-        android:tint="@color/lineage_blue_color"
         android:src="@drawable/gripper_light" />
 
     <FrameLayout
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index 3b87761a57a11b07e676dae3f8f85d1ecda1be6e..a055e65105a4a1efa939ba047e289fdb57781ac5 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -68,6 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/grid_item_padding_right"
+                android:tint="@color/accent"
                 android:src="@lineageos.platform:drawable/ic_menu" />
 
         </LinearLayout>
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index dd8cb18f98c12f66f1606926355e62287d6ae7d0..cc3516a7c447fbf615fc335ba572f58e0bdb372a 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -55,6 +55,7 @@
         android:layout_weight="0"
         android:scaleType="centerInside"
         android:background="@drawable/selectable_background"
+        android:tint="@color/accent"
         android:src="@lineageos.platform:drawable/ic_menu"/>
 
 </org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_base.xml b/res/layout/list_base.xml
index 6737eccc03c4f7a35ca9689222fe9e33d29d7a73..b9193754010c4d2e6d7cc2d4aa4947b97e1de299 100644
--- a/res/layout/list_base.xml
+++ b/res/layout/list_base.xml
@@ -28,6 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:cacheColorHint="@color/transparent"
+        android:background="@color/background_color"
         android:drawSelectorOnTop="false"
         android:divider="@null"
         android:dividerHeight="0dp"
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index 18c5a8d6e36691e38d1260ce5d548971c68dde9c..e9543a72333c42dd1bdabc11aa9d03cdf62ce97e 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -56,6 +56,7 @@
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
+            android:tint="@color/accent"
             android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 5608e5951147ecad007d3b60ddd0257d3a400fb5..b539a64c8025f805e4ba75ff870848e2c48b5d89 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -71,5 +71,6 @@
         android:layout_height="@dimen/overflow_height"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:tint="@color/accent"
         android:src="@lineageos.platform:drawable/ic_menu" />
 </RelativeLayout>
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index aeefcb9905464325aa581059cba79cc8150e7f31..756223617040babe210af3e7bc1d6697e60f6d3c 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -65,6 +65,7 @@
             android:layout_height="@dimen/overflow_height"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
+            android:tint="@color/accent"
             android:src="@lineageos.platform:drawable/ic_menu" />
     </RelativeLayout>
 
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 1d72be5e34495f9a696ccf28fee5187e66ecc8eb..35d0836f75148a1c63f4b007ff61075255302113 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -95,6 +95,7 @@
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
+                android:tint="@color/accent"
                 android:src="@lineageos.platform:drawable/ic_menu" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/res/layout/loading_empty_container.xml b/res/layout/loading_empty_container.xml
index c219b0f6f1d367e7b6bf7a0dd3112fc69fb1d9d5..e9ff0eb34597da2852cfea9b577b2e6c47de3eb7 100644
--- a/res/layout/loading_empty_container.xml
+++ b/res/layout/loading_empty_container.xml
@@ -23,6 +23,7 @@
     android:layout_height="match_parent"
     android:layout_centerInParent="true"
     android:layout_gravity="center"
+    android:background="@color/background_color"
     android:gravity="center">
 
     <ProgressBar
diff --git a/res/layout/main_album_flow.xml b/res/layout/main_album_flow.xml
index 5411b067ac5e307770892900eee652ca187fbeb5..176d3afd8c68f3ce92523ff4b7cffac9be3f3814 100644
--- a/res/layout/main_album_flow.xml
+++ b/res/layout/main_album_flow.xml
@@ -22,15 +22,15 @@
     android:layout_height="wrap_content"
     tools:background="@drawable/default_artwork">
 
+    <include
+        layout="@layout/loading_empty_container"
+        tools:visibility="gone" />
+
     <org.lineageos.eleven.widgets.SquareViewPager
         android:id="@+id/audio_player_album_art_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <include
-        layout="@layout/loading_empty_container"
-        tools:visibility="gone" />
-
     <org.lineageos.eleven.widgets.VisualizerView
         android:id="@+id/visualizerView"
         android:layout_width="match_parent"
diff --git a/res/layout/play_pause_progress_button_collapsed.xml b/res/layout/play_pause_progress_button_collapsed.xml
index e5c9ab73d9fd7c7d2414098c62c55ff672a979a6..a6da62d21353d3614f5c1580a6a33df920b9addd 100644
--- a/res/layout/play_pause_progress_button_collapsed.xml
+++ b/res/layout/play_pause_progress_button_collapsed.xml
@@ -43,8 +43,8 @@
         android:clickable="false"
         android:indeterminate="false"
         android:max="100"
-        android:progressTint="@color/white"
-        android:progressBackgroundTint="@color/white"
+        android:progressTint="@color/color_default_view_on_accent"
+        android:progressBackgroundTint="@color/color_default_gray1"
         android:progress="100"
         android:progressDrawable="@drawable/circular_drawable" />
 
diff --git a/res/layout/playlist_detail_header.xml b/res/layout/playlist_detail_header.xml
index a71e6e0b4000fdd14584910cf7ef2051b5076a16..7cceb7b24e8744ef32bcac59408944a02cfd5cfb 100644
--- a/res/layout/playlist_detail_header.xml
+++ b/res/layout/playlist_detail_header.xml
@@ -57,6 +57,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:scaleType="centerInside"
+                android:tint="@color/accent"
                 android:src="@drawable/stopwatch_icon_white" />
 
             <TextView
diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ac77245d5c32854bbd51394f1f9f9c106250566
--- /dev/null
+++ b/res/values-night-v27/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Eleven.Theme" parent="Eleven.Theme.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..578d800f1bdfd755a96416b6b243816efdb0e67d
--- /dev/null
+++ b/res/values-night/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ToolBarTheme.Base" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..040fd4831a77bd92866e8240690c5628a582a8c4
--- /dev/null
+++ b/res/values-v27/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Eleven.Theme" parent="Eleven.Theme.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index be9c8183763dbbd43e8114d246f6e121e38520f3..d6c53c7f448a07f94429aa6c746ba663c28d034f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,32 +15,42 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Material -->
-<!--    <color name="primary">#333333</color>-->
-<!--    <color name="primary_dark">#212121</color>-->
-<!--    <color name="primary_light">#424242</color>-->
-<!--    <color name="accent">#E91E63</color>-->
+    <!--****eOS colors****-->
+    <color name="accent">@lineageos.platform:color/color_default_accent</color>
     <color name="primary">@lineageos.platform:color/color_default_primary</color>
     <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="primary_light">#424242</color>
-    <color name="accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="foreground_color">@lineageos.platform:color/color_default_foreground</color>
+    <color name="divider_color">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_selector">@lineageos.platform:color/color_default_selector</color>
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_blue2">@lineageos.platform:color/color_default_blue2</color>
+    <color name="color_default_red1">@lineageos.platform:color/color_default_red1</color>
+    <color name="color_default_orange1">@lineageos.platform:color/color_default_orange1</color>
+    <color name="color_default_green1">@lineageos.platform:color/color_default_green1</color>
+    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
+    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
+    <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
+    <!--****eOS colors****-->
+
     <!--Menu icon color-->
-    <color name="colorControlNormal">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="colorControlNormal">@color/accent</color>
 
     <!-- Main colors -->
     <color name="black">#333333</color>
-    <color name="semitransparent_black">#a0333333</color>
     <color name="white">#fafafa</color>
-    <color name="grey">#9e9e9e</color>
-    <color name="grey_dark">#616161</color>
+    <color name="grey">@color/color_default_gray1</color>
+    <color name="grey_dark">@color/color_default_gray2</color>
     <color name="purple">#9C27B0</color>
     <color name="indigo">#673AB7</color>
-    <color name="green">#4CAF50</color>
-    <color name="red">#F44336</color>
-    <color name="orange">#FF5722</color>
+    <color name="green">@color/color_default_green1</color>
+    <color name="red">@color/color_default_red1</color>
+    <color name="orange">@color/color_default_orange1</color>
     <color name="brown">#795548</color>
     <color name="teal">#009688</color>
-    <color name="blue">#3F51B5</color>
+    <color name="blue">@color/color_default_blue1</color>
     <color name="purple_dark">#7B1FA2</color>
     <color name="indigo_dark">#512DA8</color>
     <color name="green_dark">#388E3C</color>
@@ -48,95 +58,78 @@
     <color name="orange_dark">#F57C00</color>
     <color name="brown_dark">#5D4037</color>
     <color name="teal_dark">#00796B</color>
-    <color name="blue_dark">#303F9F</color>
-
-    <!-- Standard Text Color -->
-    <color name="default_text_color">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="default_text_color_light">@color/primary</color>
+    <color name="blue_dark">@color/color_default_blue2</color>
 
     <!-- Cards -->
-    <color name="cards_bg_color">@lineageos.platform:color/color_default_background</color>
-    <color name="cardOne">@color/black</color>
-    <color name="cardTwo">#424242</color>
+    <color name="cards_bg_color">@color/background_color</color>
+    <color name="cardOne">@color/primary_text</color>
+    <color name="cardTwo">@color/secondary_text</color>
 
     <!-- Transparent colors -->
-    <color name="transparent">#00000000</color>
-    <color name="transparent_black">#99212121</color>
-    <color name="transparent_white">#99fafafa</color>
-    <color name="transparent_blue">#993F51B5</color>
+    <color name="transparent">@android:color/transparent</color>
 
-    <color name="background_color">@color/header_action_bar_color</color>
 
     <!-- Color for the action bar -->
-    <color name="header_action_bar_color">@color/primary</color>
-    <color name="main_action_bar_text_color">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="header_action_bar_color">@color/primary_dark</color>
+    <color name="main_action_bar_text_color">@color/primary_text</color>
 <!--    <color name="header_action_bar_text_color">@lineageos.platform:color/color_default_primary_text</color>-->
-    <color name="header_action_bar_text_color">@lineageos.platform:color/color_default_secondary_text</color>
-    <color name="header_action_bar_text_color_active">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
-    <color name="lineage_blue_color">@lineageos.platform:color/color_default_blue1</color>
+    <color name="header_action_bar_text_color">@color/secondary_text</color>
+    <color name="header_action_bar_text_color_active">@color/accent</color>
+    <color name="bottom_action_bar_text_color">@color/primary_text</color>
 <!--    Player-->
-    <color name="player_action_bar_color">@color/primary</color>
-    <color name="player_action_bar_title_text_color">@color/main_action_bar_text_color</color>
-    <color name="player_action_bar_subtitle_text_color">@color/header_action_bar_text_color</color>
-
-    <color name="player_control_color">@color/header_action_bar_text_color</color>
-    <color name="player_control_background_color">@color/header_action_bar_text_color</color>
+    <color name="player_action_bar_color">@color/primary_dark</color>
+    <color name="player_action_bar_title_text_color">@color/primary_text</color>
+    <color name="player_action_bar_subtitle_text_color">@color/secondary_text</color>
 
-    <!-- Background color used on some page headers -->
-    <color name="page_header_background">@color/white</color>
+    <color name="player_control_color">@color/accent</color>
+    <color name="player_control_background_color">@color/color_default_gray1</color>
 
     <!-- Color for background for shadow on playlist page -->
-    <color name="header_shadow_color">#ea212121</color>
-
-    <!-- Color for the pop up menu -->
-    <color name="menu_divider_color">@color/transparent</color>
-    <color name="menu_text_color">@color/black</color>
+    <color name="header_shadow_color">@color/foreground_color</color>
 
     <!-- List view related colors -->
-    <color name="list_item_background">#4cfafafa</color>
-    <color name="list_item_header_text_color">@color/black</color>
-    <color name="list_item_search_footer_text_color">@color/accent</color>
-    <color name="list_item_text_color">@color/default_text_color</color>
-    <color name="list_item_text_color_light">@color/player_action_bar_title_text_color</color>
-    <color name="list_item_divider_color">#4c212121</color>
-    <color name="list_item_divider_color_light">#34fafafa</color>
-    <color name="grid_list_item_text_color">#b3212121</color>
+    <color name="list_item_background">@color/background_color</color>
+    <color name="list_item_header_text_color">@color/primary_text</color>
+    <color name="list_item_search_footer_text_color">@color/secondary_text</color>
+    <color name="list_item_text_color">@color/primary_text</color>
+    <color name="list_item_text_color_light">@color/primary_text</color>
+    <color name="list_item_divider_color">@color/divider_color</color>
+    <color name="list_item_divider_color_light">@color/secondary_text</color>
+    <color name="grid_list_item_text_color">@color/primary_text</color>
 
     <!-- Top title page colors -->
-    <color name="tab_ripple_color">@color/white</color>
-    <color name="tab_accent_color">@color/white</color>
-    <color name="tab_selected_underline_color">@color/lineage_blue_color</color>
+    <color name="tab_ripple_color">@color/accent</color>
+    <color name="tab_accent_color">@color/accent</color>
+    <color name="tab_selected_underline_color">@color/accent</color>
 
     <!-- Search Colors -->
-    <color name="search_hint_color">@color/black</color>
+    <color name="search_hint_color">@color/secondary_text</color>
 
     <!-- Color for the text on the audio player -->
-    <color name="audio_player_text_color">@color/default_text_color_light</color>
+    <color name="audio_player_text_color">@color/primary_text</color>
 
     <!-- Color for the Progress bar -->
-    <color name="circular_progress_bar_background">@color/player_control_background_color</color>
-    <color name="circular_progress_bar">@color/player_control_color</color>
-    <color name="circular_play_pause_collapsed">@color/white</color>
+    <color name="circular_progress_bar_background">@color/color_default_view_on_accent</color>
+    <color name="circular_progress_bar">@color/accent</color>
+    <color name="circular_play_pause_collapsed">@color/color_default_view_on_accent</color>
 
     <!-- search no results text color -->
-    <color name="no_results">@color/black</color>
-    <color name="no_results_light">@color/main_action_bar_text_color</color>
+    <color name="no_results">@color/primary_text</color>
+    <color name="no_results_light">@color/secondary_text</color>
 
     <color name="now_playing_divider">@color/transparent</color>
 
     <!-- App widget colors -->
-    <color name="widget_text">@color/white</color>
+    <color name="widget_text">@color/primary_text</color>
 
     <!-- Background Lyrics Color -->
     <color name="lyrics_background_color">#b2212121</color>
 
     <!-- Letter tile colors -->
-    <color name="letter_tile_default_color">@color/grey</color>
-    <color name="letter_tile_font_color">@color/white</color>
+    <color name="letter_tile_default_color">@color/accent</color>
+    <color name="letter_tile_font_color">@color/color_default_view_on_accent</color>
     <array name="letter_tile_colors">
         <item>@color/letter_tile_purple_color</item>
-        <item>@color/letter_tile_blue_color</item>
         <item>@color/letter_tile_indigo_color</item>
         <item>@color/letter_tile_teal_color</item>
         <item>@color/letter_tile_light_green_color</item>
@@ -148,7 +141,6 @@
 
     <array name="letter_tile_vibrant_dark_colors">
         <item>@color/letter_tile_purple_color_dark</item>
-        <item>@color/letter_tile_blue_color_dark</item>
         <item>@color/letter_tile_indigo_color_dark</item>
         <item>@color/letter_tile_teal_color_dark</item>
         <item>@color/letter_tile_light_green_color_dark</item>
@@ -162,16 +154,16 @@
     <color name="visualizer_fill_color">#bffafafa</color>
 
     <!-- Separated and exposed values for themes -->
-    <color name="widget_background_color">@color/black</color>
+    <color name="widget_background_color">@color/background_color</color>
     <color name="list_base_container_background_color">@color/background_color</color>
     <color name="activity_album_detail_background_color">@color/background_color</color>
     <color name="activity_artist_detail_background_color">@color/background_color</color>
     <color name="activity_base_background_color">@color/background_color</color>
     <color name="artist_detail_header_background_color">@color/background_color</color>
-    <color name="album_detail_title_text_color">@color/default_text_color</color>
-    <color name="album_detail_song_count_and_year_text_color">@color/default_text_color</color>
-    <color name="album_detail_genre_text_color">@color/default_text_color</color>
-    <color name="album_detail_duration_text_color">@color/default_text_color</color>
+    <color name="album_detail_title_text_color">@color/primary_text</color>
+    <color name="album_detail_song_count_and_year_text_color">@color/primary_text</color>
+    <color name="album_detail_genre_text_color">@color/primary_text</color>
+    <color name="album_detail_duration_text_color">@color/primary_text</color>
     <color name="app_msg_text_color">?android:textColorPrimaryInverse</color>
     <color name="artist_detail_album_title_text_color">@color/cardOne</color>
     <color name="artist_detail_album_year_text_color">@color/cardTwo</color>
@@ -179,17 +171,17 @@
     <color name="artist_detail_header_songs_label_text_color">@color/list_item_header_text_color</color>
     <color name="grid_items_normal_line_one">@color/cardOne</color>
     <color name="grid_items_normal_line_two">@color/cardTwo</color>
-    <color name="position_number_color">@color/white</color>
-    <color name="number_of_songs_text_color">@color/white</color>
-    <color name="duration_text_color">@color/white</color>
+    <color name="position_number_color">@color/color_default_view_on_accent</color>
+    <color name="number_of_songs_text_color">@color/primary_text</color>
+    <color name="duration_text_color">@color/primary_text</color>
 
     <!-- audio player main controls -->
     <color name="audio_player_seeker_progress_color">@color/player_control_color</color>
     <color name="audio_player_seeker_progress_background_color">@color/player_control_background_color</color>
     <color name="audio_player_seeker_thumb_color">@color/player_control_color</color>
 
-    <color name="audio_player_lyrics_text_color">@color/player_control_background_color</color>
-    <color name="audio_player_current_time_color">@color/player_control_background_color</color>
-    <color name="audio_player_total_time_color">@color/player_control_background_color</color>
+    <color name="audio_player_lyrics_text_color">@color/color_default_view_on_accent</color>
+    <color name="audio_player_current_time_color">@color/primary_text</color>
+    <color name="audio_player_total_time_color">@color/primary_text</color>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c0d3803febcac581a19594fb54f54778d4764fa0..565ea349bcb548674cf0dbebfae6af1f6e816ce0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Main Material -->
-    <style name="Eleven.Theme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="Eleven.Theme" parent="Eleven.Theme.Base">
+    </style>
+
+    <style name="Eleven.Theme.Base" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="popupMenuStyle">@style/PopupMenu</item>
         <item name="dropDownListViewStyle">@style/DropDownListView</item>
@@ -29,11 +32,24 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@color/background_color</item>
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:alertDialogTheme">@style/CustomAlertDialogStyle</item>
+    </style>
+
+    <style name="CustomAlertDialogStyle" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
+        <item name="android:background">@color/background_color</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:textColorPrimary">@color/primary_text</item>
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -57,19 +73,21 @@
         <item name="android:dividerHeight">@dimen/divider_height</item>
     </style>
 
-    <style name="PopupMenu" parent="@style/Widget.AppCompat.PopupMenu"/>
+    <style name="PopupMenu" parent="@style/Widget.AppCompat.PopupMenu">
+        <item name="android:popupBackground">@color/background_color</item>
+    </style>
 
-    <style name="DropDownListView" parent="@style/Widget.AppCompat.ListView.DropDown"/>
+    <style name="DropDownListView" parent="@style/Widget.AppCompat.Light.ListView.DropDown"/>
 
     <!-- Sets up the pop up menu text color and size -->
     <style name="SmallPopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Small">
-        <item name="android:textColor">@color/menu_text_color</item>
+        <item name="android:textColor">@color/primary_text</item>
         <item name="android:textSize">@dimen/text_size_medium</item>
     </style>
 
     <!-- Sets up the pop up menu text color and size -->
     <style name="LargePopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Large">
-        <item name="android:textColor">@color/menu_text_color</item>
+        <item name="android:textColor">@color/primary_text</item>
         <item name="android:textSize">@dimen/text_size_medium</item>
     </style>
 
@@ -81,6 +99,7 @@
     <!-- Sets the action bar menu icon -->
     <style name="ActionOverFlowButton" parent="@style/Widget.AppCompat.ActionButton">
         <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
+        <item name="tint">@color/accent</item>
         <item name="android:minWidth">0dip</item>
         <item name="android:paddingLeft">8dip</item>
         <item name="android:paddingRight">8dip</item>
@@ -153,7 +172,7 @@
         <item name="android:ellipsize">end</item>
         <item name="android:fadingEdge">horizontal</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">#212121</item>
+        <item name="android:textColor">@color/primary_text</item>
     </style>
 
     <!-- Bottom Action Bar TextViews -->
@@ -171,10 +190,12 @@
     <style name="BottomActionBarLineOne" parent="@style/BottomActionBarText">
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textColor">@color/color_default_view_on_accent</item>
     </style>
 
     <style name="BottomActionBarLineTwo" parent="@style/BottomActionBarText">
         <item name="android:textSize">@dimen/text_size_extra_micro</item>
+        <item name="android:textColor">@color/color_default_view_on_accent</item>
     </style>
 
     <!-- Bottom Action Bar Image Buttons -->
@@ -193,12 +214,17 @@
         <item name="android:textSize">@dimen/tab_text_size</item>
     </style>
 
-    <style name="ToolBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar" >
+    <style name="ToolBarTheme" parent="ToolBarTheme.Base">
         <item name="colorControlNormal">@color/colorControlNormal</item>
+    </style>
 
+    <style name="ToolBarTheme.Base" parent="@style/ThemeOverlay.AppCompat.ActionBar">
     </style>
 
-    <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat.Light" />
+    <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat.DayNight" >
+        <item name="android:textColor">@color/primary_text</item>
+        <item name="background">@color/background_color</item>
+    </style>
 
     <style name="Eleven.Theme.PopupMenuOverlapAnchor">
         <item name="android:overlapAnchor">true</item>
diff --git a/src/org/lineageos/eleven/cache/ImageWorker.java b/src/org/lineageos/eleven/cache/ImageWorker.java
index da568db1f23ea5887552f2c6f4f8c01f17867c1d..7ce4417e7f8d3b7e91e4910a0d5a16904b2b5240 100644
--- a/src/org/lineageos/eleven/cache/ImageWorker.java
+++ b/src/org/lineageos/eleven/cache/ImageWorker.java
@@ -142,7 +142,7 @@ public abstract class ImageWorker {
     /**
      * Adds a new image to the memory and disk caches
      *
-     * @param data The key used to store the image
+     * @param key The key used to store the image
      * @param bitmap The {@link Bitmap} to cache
      */
     public void addBitmapToCache(final String key, final Bitmap bitmap) {
@@ -249,6 +249,34 @@ public abstract class ImageWorker {
         return null;
     }
 
+    public static TransitionDrawable createImageTransitionDrawable(final Resources resources,
+                                                                   final Drawable fromDrawable, final Drawable drawable, final int fadeTime,
+                                                                   final boolean dither, final boolean force) {
+        if (drawable != null || force) {
+            final Drawable[] arrayDrawable = new Drawable[2];
+            arrayDrawable[0] = getTopDrawable(fromDrawable);
+
+            // Add the transition to drawable
+            Drawable layerTwo;
+            if (drawable != null) {
+                layerTwo = drawable;
+            } else {
+                // if no bitmap (forced) then transition to transparent
+                layerTwo = new ColorDrawable(Color.TRANSPARENT);
+            }
+
+            arrayDrawable[1] = layerTwo;
+
+            // Finally, return the image
+            final TransitionDrawable result = new TransitionDrawable(arrayDrawable);
+            result.setCrossFadeEnabled(true);
+            result.startTransition(fadeTime);
+            return result;
+        }
+
+        return null;
+    }
+
     /**
      * This will create the palette transition from the original color to the new one
      * @param scrimImage the container to change the color for
diff --git a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
index 7f892ffd4426c23bfba30e6fd5f759e5f2d8b95a..69a20eb2ecde13e99d991f7327d425f6ee8b0b8b 100644
--- a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
+++ b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
@@ -28,6 +28,7 @@ import android.widget.Button;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 
 import org.lineageos.eleven.R;
@@ -75,6 +76,8 @@ public abstract class BasePlaylistDialog extends DialogFragment implements TextW
                 });
 
         mPlaylist = new EditText(getActivity());
+        mPlaylist.setTextColor(ContextCompat.getColor(getContext(), R.color.primary_text));
+        mPlaylist.setHintTextColor(ContextCompat.getColor(getContext(), R.color.secondary_text));
         mPlaylist.setSingleLine(true);
         mPlaylist.setInputType(mPlaylist.getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
                 | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
diff --git a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index 505b820eb011779a49cb0ed8255fa6e8df5609a2..d232520252b2952d3b3c5974e565a1cc52bce94d 100644
--- a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
+++ b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -99,22 +99,18 @@ public class PhotoSelectionDialog extends DialogFragment {
         // Dialog item Adapter
         final HomeActivity activity = (HomeActivity) getActivity();
         final ListAdapter adapter = new ArrayAdapter<>(activity,
-                android.R.layout.select_dialog_item, mChoices);
+                R.layout.custom_select_dialog_item, mChoices);
         return new AlertDialog.Builder(activity).setTitle(title)
-                .setAdapter(adapter, new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(final DialogInterface dialog, final int which) {
-                        switch (which) {
-                            case NEW_PHOTO:
-                                activity.selectNewPhoto(mKey);
-                                break;
-                            case OLD_PHOTO:
-                                MusicUtils.selectOldPhoto(activity, mKey);
-                                break;
-                            default:
-                                break;
-                        }
+                .setAdapter(adapter, (dialog, which) -> {
+                    switch (which) {
+                        case NEW_PHOTO:
+                            activity.selectNewPhoto(mKey);
+                            break;
+                        case OLD_PHOTO:
+                            MusicUtils.selectOldPhoto(activity, mKey);
+                            break;
+                        default:
+                            break;
                     }
                 }).create();
     }
diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 36d612ffce9184689726f10ff984862c576d09eb..ba75556aa55609000bb7f6b76f4801d3b4857b7e 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -325,7 +325,7 @@ public abstract class BaseActivity extends AppCompatActivity implements ServiceC
     }
 
     protected void clearMetaInfo() {
-        mAlbumArt.setImageResource(R.drawable.default_artwork);
+        mAlbumArt.setImageResource(R.drawable.ic_default_artwork);
     }
 
     /**
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
index cf160dc7ab07d5d8fd6428617c12829bcbdbde56..832e1dd6086a4638cdba5f66b17453903ddabe46 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -55,9 +55,9 @@ import org.lineageos.eleven.widgets.NoResultsContainer;
 import java.util.List;
 import java.util.TreeSet;
 
-public class PlaylistDetailFragment extends FadingBarFragment implements
+public class PlaylistDetailFragment extends DetailFragment implements
         LoaderManager.LoaderCallbacks<List<Song>>, OnItemClickListener, DropListener,
-        RemoveListener, DragScrollProfile, IChildFragment {
+        RemoveListener, DragScrollProfile, IChildFragment, AbsListView.OnScrollListener {
 
     /**
      * LoaderCallbacks identifier
@@ -304,8 +304,6 @@ public class PlaylistDetailFragment extends FadingBarFragment implements
 
     @Override
     public void onScrollStateChanged(AbsListView view, int scrollState) {
-        super.onScrollStateChanged(view, scrollState);
-
         if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_FLING) {
             mAdapter.setPauseDiskCache(true);
         } else {
@@ -314,6 +312,24 @@ public class PlaylistDetailFragment extends FadingBarFragment implements
         }
     }
 
+    @Override
+    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+        View firstChild = view.getChildAt(0);
+        if (firstChild == null) {
+            return;
+        }
+
+        float firstChildY = firstChild.getY();
+
+        if (firstVisibleItem == 0) {
+            // move header to current top of list
+            setHeaderPosition(firstChildY);
+        } else {
+            // header off screen
+            setHeaderPosition(-getHeaderHeight());
+        }
+    }
+
     protected int getHeaderHeight() { return mHeaderContainer.getHeight(); }
 
     protected void setHeaderPosition(float y) {
diff --git a/src/org/lineageos/eleven/utils/MusicUtils.java b/src/org/lineageos/eleven/utils/MusicUtils.java
index 667ecf2ca921e46456f1f73e471ceea737d59574..8d30f84c9a8aaa0a9d76984d44a17c326834b4ed 100644
--- a/src/org/lineageos/eleven/utils/MusicUtils.java
+++ b/src/org/lineageos/eleven/utils/MusicUtils.java
@@ -1460,7 +1460,7 @@ public final class MusicUtils {
         // sort the list but ignore case
         Collections.sort(menuItemMap, new IgnoreCaseComparator());
         // add new_playlist to the top of the sorted list
-        menuItemMap.add(0, context.getString(R.string.new_playlist));
+        //menuItemMap.add(0, context.getString(R.string.new_playlist));
 
         return menuItemMap;
     }
diff --git a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
index 2a3d4a3d3a0b97aab4afe8dfca8d048c60d5b655..b620066eac97a7d8af70bd41808dd1c4501f043d 100644
--- a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
+++ b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
@@ -22,6 +22,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.util.AttributeSet;
@@ -70,11 +71,10 @@ public class AlbumScrimImage extends FrameLayout {
             return;
         }
 
-        Bitmap blurredBitmap = ((BitmapDrawable) ContextCompat.getDrawable(
-                getContext(), R.drawable.default_artwork_blur_2)).getBitmap();
+        Drawable blurredDrawable = new ColorDrawable(ContextCompat.getColor(getContext(), R.color.background_color));
 
         TransitionDrawable imageTransition = ImageWorker.createImageTransitionDrawable(
-                getResources(), mImageView.getDrawable(), blurredBitmap,
+                getResources(), mImageView.getDrawable(), blurredDrawable,
                 ImageWorker.FADE_IN_TIME_SLOW, true, true);
 
         TransitionDrawable paletteTransition = ImageWorker.createPaletteTransition(this,
diff --git a/src/org/lineageos/eleven/widgets/NoResultsContainer.java b/src/org/lineageos/eleven/widgets/NoResultsContainer.java
index 770afc347d9505e3661648c3560927cb8291ec1f..1bff189008d2d1a99d247da13b8c9310921572dc 100644
--- a/src/org/lineageos/eleven/widgets/NoResultsContainer.java
+++ b/src/org/lineageos/eleven/widgets/NoResultsContainer.java
@@ -60,7 +60,6 @@ public class NoResultsContainer extends LinearLayout {
     }
 
     public void setTextColor(int color) {
-        ((ImageView)findViewById(R.id.no_results_image)).setColorFilter(color, PorterDuff.Mode.SRC_IN);
         ((TextView)findViewById(R.id.no_results_main_text)).setTextColor(color);
         ((TextView)findViewById(R.id.no_results_main_highlight_text)).setTextColor(color);
         ((TextView)findViewById(R.id.no_results_secondary_text)).setTextColor(color);