diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
index 0dd9c765..42127442 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
@@ -29,8 +29,8 @@ public final class AppShortcutIconGenerator {
     private static IconCompat generateDefaultThemedIcon(Context context, int iconId) {
         // return icon of iconId with default colors
         return generateThemedIcon(context, iconId,
-                context.getColor(R.color.app_shortcut_default_foreground),
-                context.getColor(R.color.app_shortcut_default_background)
+                context.getColor(R.color.color_shortcut_foreground),
+                context.getColor(R.color.color_shortcut_background)
         );
     }
 
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
index f8b46989..5cc05af8 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
@@ -6,4 +6,4 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/shadow_up.xml b/app/src/main/res/drawable/gradient_navigation.xml
similarity index 68%
rename from app/src/main/res/drawable/shadow_up.xml
rename to app/src/main/res/drawable/gradient_navigation.xml
index b9971acc..64076ddb 100644
--- a/app/src/main/res/drawable/shadow_up.xml
+++ b/app/src/main/res/drawable/gradient_navigation.xml
@@ -4,6 +4,6 @@
     <gradient
         android:angle="270"
         android:centerColor="#11000000"
-        android:endColor="@color/twenty_percent_black_overlay"
-        android:startColor="#00000000" />
+        android:endColor="@color/overlay_dark"
+        android:startColor="@color/overlay_light" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toolbar_gradient.xml b/app/src/main/res/drawable/gradient_shadow.xml
similarity index 67%
rename from app/src/main/res/drawable/toolbar_gradient.xml
rename to app/src/main/res/drawable/gradient_shadow.xml
index c12356f6..4c952943 100644
--- a/app/src/main/res/drawable/toolbar_gradient.xml
+++ b/app/src/main/res/drawable/gradient_shadow.xml
@@ -4,6 +4,6 @@
     <gradient
         android:angle="90"
         android:centerY="0.33"
-        android:endColor="@color/fifty_percent_black_overlay"
-        android:startColor="#00000000" />
+        android:endColor="@color/overlay_light"
+        android:startColor="@color/overlay_clear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down.xml b/app/src/main/res/drawable/gradient_toolbar.xml
similarity index 68%
rename from app/src/main/res/drawable/shadow_down.xml
rename to app/src/main/res/drawable/gradient_toolbar.xml
index 2cf5263f..40a59974 100644
--- a/app/src/main/res/drawable/shadow_down.xml
+++ b/app/src/main/res/drawable/gradient_toolbar.xml
@@ -4,6 +4,6 @@
     <gradient
         android:angle="90"
         android:centerColor="#11000000"
-        android:endColor="@color/twenty_percent_black_overlay"
-        android:startColor="#00000000" />
+        android:endColor="@color/overlay_dark"
+        android:startColor="@color/overlay_clear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
index fa10a8fa..daab8955 100644
--- a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
@@ -7,4 +7,4 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,11A2,2 0 0,0 9,13A2,2 0 0,0 11,15A2,2 0 0,0 13,13V8H16V6H12V11.27C11.71,11.1 11.36,11 11,11Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml b/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
index 47850a05..86f37f3b 100644
--- a/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
@@ -1,4 +1,3 @@
-<!-- drawable/comment_text_outline.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -7,4 +6,4 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M6,7H18V9H6V7M6,11H15V13H6V11Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_file_music_white_24dp.xml b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
index 4d018bdf..9a084359 100644
--- a/app/src/main/res/drawable/ic_file_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
@@ -7,4 +7,4 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
index b2446883..c251d2ff 100644
--- a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
@@ -7,4 +7,4 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/notification_selector.xml b/app/src/main/res/drawable/notification_selector.xml
index d7867f86..18e7c215 100644
--- a/app/src/main/res/drawable/notification_selector.xml
+++ b/app/src/main/res/drawable/notification_selector.xml
@@ -6,4 +6,4 @@
     <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index 2426470a..2e8a7d8d 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -19,7 +19,7 @@
         <com.dkanada.gramophone.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding"
-            android:background="@color/twenty_percent_black_overlay" />
+            android:background="@color/overlay_light" />
 
     </FrameLayout>
 
@@ -81,7 +81,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="4dp"
                         android:layout_marginBottom="4dp"
-                        android:background="@drawable/shadow_down" />
+                        android:background="@drawable/gradient_shadow" />
 
                     <TextView
                         android:id="@+id/player_queue_sub_header"
diff --git a/app/src/main/res/layout/app_widget_album.xml b/app/src/main/res/layout/app_widget_album.xml
index 6abd09de..f6b9c797 100644
--- a/app/src/main/res/layout/app_widget_album.xml
+++ b/app/src/main/res/layout/app_widget_album.xml
@@ -34,9 +34,9 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/widget_selector_dark"
-            tools:ignore="ContentDescription"
+            android:contentDescription="@string/action_previous"
             tools:src="@drawable/ic_skip_previous_white_24dp"
-            tools:tint="@color/ate_primary_text_dark" />
+            tools:tint="?android:textColorPrimary" />
 
         <ImageButton
             android:id="@+id/button_toggle_play_pause"
@@ -44,9 +44,9 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/widget_selector_dark"
-            tools:ignore="ContentDescription"
+            android:contentDescription="@string/action_play_pause"
             tools:src="@drawable/ic_play_arrow_white_24dp"
-            tools:tint="@color/ate_primary_text_dark" />
+            tools:tint="?android:textColorPrimary" />
 
         <ImageButton
             android:id="@+id/button_next"
@@ -54,9 +54,9 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/widget_selector_dark"
-            tools:ignore="ContentDescription"
+            android:contentDescription="@string/action_next"
             tools:src="@drawable/ic_skip_next_white_24dp"
-            tools:tint="@color/ate_primary_text_dark" />
+            tools:tint="?android:textColorPrimary" />
 
     </LinearLayout>
 
@@ -85,7 +85,7 @@
             android:gravity="center"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-            android:textColor="@color/ate_primary_text_dark"
+            android:textColor="@color/overlay_text"
             tools:text="Title" />
 
         <TextView
@@ -96,7 +96,7 @@
             android:gravity="center"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="@color/ate_secondary_text_dark"
+            android:textColor="@color/overlay_text"
             tools:text="Text" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml
index 2510729f..3656c5dd 100644
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@@ -36,7 +36,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:textColor="@color/ate_primary_text_light"
+                android:textColor="?android:textColorPrimary"
                 tools:text="Title" />
 
             <TextView
@@ -47,7 +47,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="@color/ate_secondary_text_light"
+                android:textColor="?android:textColorSecondary"
                 tools:text="Text" />
 
         </LinearLayout>
@@ -69,9 +69,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
+                android:contentDescription="@string/action_previous"
                 tools:src="@drawable/ic_skip_previous_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
             <ImageButton
                 android:id="@+id/button_toggle_play_pause"
@@ -79,9 +79,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
+                android:contentDescription="@string/action_play_pause"
                 tools:src="@drawable/ic_play_arrow_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
             <ImageButton
                 android:id="@+id/button_next"
@@ -89,9 +89,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
+                android:contentDescription="@string/action_next"
                 tools:src="@drawable/ic_skip_next_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml
index 832624a1..29ca32e4 100644
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/card"
-    android:orientation="horizontal"
-    tools:ignore="ContentDescription">
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/image"
@@ -14,6 +13,7 @@
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
+        tools:ignore="ContentDescription"
         tools:src="@drawable/default_album_art" />
 
     <RelativeLayout
@@ -37,8 +37,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
+                android:contentDescription="@string/action_previous"
                 tools:src="@drawable/ic_skip_previous_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
             <ImageButton
                 android:id="@+id/button_toggle_play_pause"
@@ -46,8 +47,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
+                android:contentDescription="@string/action_play_pause"
                 tools:src="@drawable/ic_play_arrow_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
             <ImageButton
                 android:id="@+id/button_next"
@@ -55,8 +57,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
+                android:contentDescription="@string/action_next"
                 tools:src="@drawable/ic_skip_next_white_24dp"
-                tools:tint="@color/ate_secondary_text_light" />
+                tools:tint="?android:textColorPrimary" />
 
         </LinearLayout>
 
@@ -77,7 +80,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="@color/ate_primary_text_light"
+                android:textColor="?android:textColorPrimary"
                 tools:text="Title" />
 
             <TextView
@@ -87,7 +90,7 @@
                 android:gravity="center"
                 android:maxLines="2"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="@color/ate_secondary_text_light"
+                android:textColor="?android:textColorSecondary"
                 tools:text="Text" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 1312d7a1..a18cf576 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay">
+        android:background="@color/overlay_light">
 
         <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/player_buffering_indicator"
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 399bc61d..fa0015bf 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -17,7 +17,7 @@
         <com.dkanada.gramophone.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding"
-            android:background="@color/twenty_percent_black_overlay" />
+            android:background="@color/overlay_light" />
 
     </FrameLayout>
 
@@ -60,7 +60,7 @@
                 android:id="@+id/toolbar_container"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/toolbar_scrim_height"
-                android:background="@drawable/toolbar_gradient">
+                android:background="@drawable/gradient_toolbar">
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
@@ -106,7 +106,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="4dp"
                         android:layout_marginBottom="4dp"
-                        android:background="@drawable/shadow_down" />
+                        android:background="@drawable/gradient_shadow" />
 
                     <include
                         android:id="@+id/current_song"
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index 5012a653..c5926c78 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -5,12 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:background="@color/md_amber_500">
+    tools:background="@android:color/darker_gray">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay">
+        android:background="@color/overlay_light">
 
         <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/player_buffering_indicator"
@@ -34,7 +34,7 @@
             android:paddingStart="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/ate_primary_text_dark"
+            android:textColor="?android:textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintStart_toStartOf="parent"
             tools:ignore="RtlSymmetry"
@@ -49,7 +49,7 @@
             android:paddingEnd="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/ate_primary_text_dark"
+            android:textColor="?android:textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="RtlSymmetry"
diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml
index 5de58cb0..9471fa3a 100644
--- a/app/src/main/res/layout/fragment_player_album_cover.xml
+++ b/app/src/main/res/layout/fragment_player_album_cover.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="center"
         android:padding="72dp"
         android:scaleType="fitXY"
-        android:tint="@color/md_pink_A400"
+        android:tint="@color/color_favorite"
         android:tintMode="src_in"
         android:visibility="invisible"
         app:srcCompat="@drawable/ic_favorite_white_24dp"
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index 9eab523a..011a26b2 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -1,5 +1,4 @@
 <androidx.percentlayout.widget.PercentFrameLayout 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:id="@+id/header"
     android:layout_width="match_parent"
@@ -8,27 +7,25 @@
     android:focusable="true"
     android:foreground="?rectSelectorStrong">
 
-    <!--suppress AndroidDomInspection-->
     <ImageView
         android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="180dp"
         android:scaleType="centerCrop"
         android:src="@drawable/default_album_art"
-        android:transitionName="@string/transition_album_image"
-        app:layout_aspectRatio="178%"
-        app:layout_widthPercent="100%"
         tools:ignore="ContentDescription,UnusedAttribute" />
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="112dp"
+        android:layout_height="180dp"
         android:layout_gravity="bottom"
-        android:background="@drawable/shadow_up" />
+        android:background="@drawable/gradient_navigation" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:layout_gravity="bottom"
-        android:layout_marginBottom="8dp"
+        android:paddingVertical="8dp"
         android:gravity="center_vertical"
         android:orientation="vertical">
 
@@ -41,7 +38,7 @@
             android:fontFamily="sans-serif-medium"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="@color/ate_primary_text_dark"
+            android:textColor="?android:textColorPrimary"
             android:textSize="14sp" />
 
         <TextView
@@ -53,7 +50,7 @@
             android:fontFamily="sans-serif"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/ate_secondary_text_dark"
+            android:textColor="?android:textColorSecondary"
             android:textSize="14sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/shadow_status_bar_toolbar.xml b/app/src/main/res/layout/shadow_status_bar_toolbar.xml
index bf357b28..b85d91d6 100644
--- a/app/src/main/res/layout/shadow_status_bar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_status_bar_toolbar.xml
@@ -25,6 +25,6 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@id/status_bar"
         android:layout_alignTop="@id/status_bar"
-        android:background="@drawable/toolbar_gradient" />
+        android:background="@drawable/gradient_toolbar" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 1aeca294..899dc36a 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -2,19 +2,16 @@
 
     <style name="Theme.Phonograph" parent="Theme.Phonograph.Base">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="Theme.Phonograph.Light" parent="Theme.Phonograph.Base.Light">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="Theme.Phonograph.Black" parent="Theme.Phonograph.Base.Black">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 630e0278..d409b3bd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="ic_launcher_background">#E0E0E0</color>
+    <!-- Pink A400 -->
+    <color name="color_favorite">#F50057</color>
 
-    <color name="twenty_percent_black_overlay">#34000000</color>
-    <color name="fifty_percent_black_overlay">#88000000</color>
+    <!-- Blue Grey 500 and Grey 100 -->
+    <color name="color_shortcut_foreground">#607D8B</color>
+    <color name="color_shortcut_background">#F5F5F5</color>
 
-    <color name="app_shortcut_default_foreground">@color/md_blue_grey_500</color>
-    <color name="app_shortcut_default_background">@color/md_grey_50</color>
+    <color name="overlay_text">#FFFFFFFF</color>
+    <color name="overlay_dark">#80000000</color>
+    <color name="overlay_light">#40000000</color>
+    <color name="overlay_clear">#00000000</color>
 
 </resources>
diff --git a/app/src/main/res/values/parents.xml b/app/src/main/res/values/parents.xml
index 49ef0968..b2474a77 100644
--- a/app/src/main/res/values/parents.xml
+++ b/app/src/main/res/values/parents.xml
@@ -6,18 +6,16 @@
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
-        <item name="md_dark_theme">true</item>
-
         <item name="roundSelector">@drawable/round_selector_dark</item>
         <item name="rectSelector">@drawable/rect_selector_dark</item>
         <item name="rectSelectorStrong">@drawable/rect_selector_strong_dark</item>
 
-        <item name="cardBackgroundColor">@color/md_grey_800</item>
+        <item name="cardBackgroundColor">#424242</item>
 
-        <item name="defaultFooterColor">@color/md_grey_900</item>
+        <item name="defaultFooterColor">#212121</item>
 
-        <item name="dividerColor">@color/md_divider_white</item>
-        <item name="iconColor">@color/ate_secondary_text_dark</item>
+        <item name="dividerColor">#10FFFFFF</item>
+        <item name="iconColor">#B3FFFFFF</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
@@ -36,18 +34,16 @@
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
-        <item name="md_dark_theme">false</item>
-
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
 
-        <item name="cardBackgroundColor">@color/md_white_1000</item>
+        <item name="cardBackgroundColor">#FFFFFF</item>
 
-        <item name="defaultFooterColor">@color/md_grey_300</item>
+        <item name="defaultFooterColor">#E0E0E0</item>
 
-        <item name="dividerColor">@color/md_divider_black</item>
-        <item name="iconColor">@color/ate_secondary_text_light</item>
+        <item name="dividerColor">#10000000</item>
+        <item name="iconColor">#8A000000</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
@@ -63,10 +59,11 @@
 
     <style name="Theme.Phonograph.Base.Black" parent="@style/Theme.Phonograph.Base">
         <item name="android:windowBackground">@android:color/black</item>
+
         <item name="dividerColor">#18FFFFFF</item>
-        <item name="defaultFooterColor">@color/md_grey_800</item>
-        <item name="cardBackgroundColor">@color/md_grey_900</item>
-        <item name="md_background_color">@color/md_grey_900</item>
+        <item name="defaultFooterColor">#424242</item>
+        <item name="cardBackgroundColor">#212121</item>
+        <item name="md_background_color">#212121</item>
     </style>
 
     <style name="FabParent">