diff --git a/res/color/item_doc_grid_border.xml b/res/color/item_doc_grid_border.xml
index b535aedc3419be372651189b1b77ed1007e575ea..89235b4bb458043af250effd65b1df2e0b1463eb 100644
--- a/res/color/item_doc_grid_border.xml
+++ b/res/color/item_doc_grid_border.xml
@@ -18,10 +18,10 @@
     <item
         android:state_focused="true"
         android:state_selected="false"
-        android:color="?android:attr/colorPrimary"/>
+        android:color="@color/accent"/>
     <item
         android:state_selected="true"
-        android:color="?android:attr/colorPrimary"/>
+        android:color="@color/accent"/>
     <item
         android:color="@android:color/transparent"/>
 </selector>
diff --git a/res/color/item_doc_grid_tint.xml b/res/color/item_doc_grid_tint.xml
index 2c48e965894462f99bd259f96f9b97c1f0c9ad46..fe0d36b8ca6b1f4f5b4e538d19b09c40d26fcd96 100644
--- a/res/color/item_doc_grid_tint.xml
+++ b/res/color/item_doc_grid_tint.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_activated="true"
-        android:color="?android:colorPrimary"
+        android:color="@color/accent"
         android:alpha=".15" />
     <item
         android:color="@android:color/transparent" />
diff --git a/res/color/item_root_primary_text.xml b/res/color/item_root_primary_text.xml
index 62a620c85c33a4fad96d1c7acac58a560126d66a..62e90d94c38957dd6be49627c1a307df7ab232b9 100644
--- a/res/color/item_root_primary_text.xml
+++ b/res/color/item_root_primary_text.xml
@@ -15,8 +15,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorControlActivated" />
-    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorControlActivated" />
-    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorPrimary" />
-    <item android:color="?android:textColorPrimary" />
+    <item android:state_focused="true" android:state_activated="true" android:color="@color/accent" />
+    <item android:state_focused="false" android:state_activated="true" android:color="@color/accent" />
+    <item android:state_enabled="false" android:alpha="0.5" android:color="@color/color_default_primary_text" />
+    <item android:color="@color/color_default_primary_text" />
 </selector>
diff --git a/res/color/item_root_secondary_text.xml b/res/color/item_root_secondary_text.xml
index 44086ef883ec318b8a1c898f638a4310e7644510..db7cb3daf01ffcb0e0bf05300fdd8d26cb5a6472 100644
--- a/res/color/item_root_secondary_text.xml
+++ b/res/color/item_root_secondary_text.xml
@@ -16,8 +16,8 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorPrimary" />
-    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorPrimary" />
-    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorSecondary" />
-    <item android:color="?android:textColorSecondary" />
+    <item android:state_focused="true" android:state_activated="true" android:alpha="0.8" android:color="@color/accent" />
+    <item android:state_focused="false" android:state_activated="true" android:alpha="0.8" android:color="@color/accent" />
+    <item android:state_enabled="false" android:alpha="0.5" android:color="@color/color_default_secondary_text" />
+    <item android:color="@color/color_default_secondary_text" />
 </selector>
diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index 538a2d46babdadf9bc951677a5a9f56b9caf9bb6..6450a23d6ceaf270614b78266c581c023618d49c 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -16,8 +16,8 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@color/color_default_blue1"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
-    <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
+    <item android:state_selected="true" android:color="@color/accent"/>
+    <item android:state_enabled="true" android:color="@color/color_default_primary_dark"/>
+    <item android:state_enabled="false" android:color="@color/primary"/>
 
 </selector>
\ No newline at end of file
diff --git a/res/color/search_chip_ripple_color.xml b/res/color/search_chip_ripple_color.xml
index 8d785253cc0059bbce97128daee598c2a2b6f18c..39e3830f69317c358c1baea4b3d90f5c37c86f7e 100644
--- a/res/color/search_chip_ripple_color.xml
+++ b/res/color/search_chip_ripple_color.xml
@@ -18,15 +18,15 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Selected. -->
     <item android:state_pressed="true" android:state_selected="true"
-          android:alpha="0.16" android:color="@color/color_default_blue1"/>
+          android:alpha="0.16" android:color="@color/accent"/>
     <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.16" android:color="@color/color_default_blue1"/>
+          android:alpha="0.16" android:color="@color/accent"/>
     <item android:state_focused="true" android:state_selected="true"
-          android:alpha="0.12" android:color="@color/color_default_blue1"/>
+          android:alpha="0.12" android:color="@color/accent"/>
     <item android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.04" android:color="@color/color_default_blue1"/>
+          android:alpha="0.04" android:color="@color/accent"/>
     <item android:state_selected="true"
-          android:alpha="0.00" android:color="@color/color_default_blue1"/>
+          android:alpha="0.00" android:color="@color/accent"/>
 
     <!-- Unselected. -->
     <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>
diff --git a/res/color/search_chip_stroke_color.xml b/res/color/search_chip_stroke_color.xml
index 2da7363587a1756d2e3dfebd001ece2574547cb4..7ad45e8be8ff86b456384a6b1f834050d0b5c54e 100644
--- a/res/color/search_chip_stroke_color.xml
+++ b/res/color/search_chip_stroke_color.xml
@@ -18,6 +18,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="@android:color/transparent"/>
     <item android:state_pressed="true" android:color="@android:color/transparent"/>
-    <item android:state_enabled="true" android:color="@color/color_default_blue1"/>
+    <item android:state_enabled="true" android:color="@color/accent"/>
     <item android:state_enabled="false" android:color="@android:color/transparent"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/search_chip_text_color.xml b/res/color/search_chip_text_color.xml
index 0457ba25ad68c90d5b94e7065b18ed64c397401d..df5d19bcc32a7afe72862c0ddf3dc10d3450043d 100644
--- a/res/color/search_chip_text_color.xml
+++ b/res/color/search_chip_text_color.xml
@@ -16,7 +16,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:colorPrimary"/>
-    <item android:state_enabled="true" android:color="?android:textColorSecondary"/>
-    <item android:state_enabled="false" android:color="?android:textColorSecondary" android:alpha="0.3"/>
+    <item android:state_selected="true" android:color="@color/color_default_view_on_accent"/>
+    <item android:state_enabled="true" android:color="?android:textColorPrimary"/>
+    <item android:state_enabled="false" android:color="?android:textColorSecondary" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/breadcrumb_item_background.xml b/res/drawable/breadcrumb_item_background.xml
index 410e8edb9aa4d6a14b2f9c9bc6425a77631c5f75..8005bcf3fb37022145b4ccf3dad1f0023dbc3fd7 100644
--- a/res/drawable/breadcrumb_item_background.xml
+++ b/res/drawable/breadcrumb_item_background.xml
@@ -20,7 +20,7 @@
     android:color="?attr/colorControlHighlight">
     <item
         android:id="@android:id/mask"
-        android:drawable="@android:color/white"/>
+        android:drawable="@color/color_default_background"/>
 
     <item>
         <selector>
diff --git a/res/drawable/check_textview_text_color.xml b/res/drawable/check_textview_text_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb30ea2fc7b9d32fe52c8b0ccfe22b029eb69235
--- /dev/null
+++ b/res/drawable/check_textview_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent" android:state_checked="true" />
+    <item android:color="@color/color_default_secondary_text" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/circle_button_background.xml b/res/drawable/circle_button_background.xml
index d5b3c50d1721ad18355568e6836531e1cf032352..8ff3a1968cefd0a678cf9226ea131b9b913cec51 100644
--- a/res/drawable/circle_button_background.xml
+++ b/res/drawable/circle_button_background.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
     <solid
-        android:color="#66000000"/>
+        android:color="@color/color_default_background"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/dropdown_sort_widget_background.xml b/res/drawable/dropdown_sort_widget_background.xml
index a1a74e787e33af02dad17e29bcecb7006b6f34f6..8c208ec1e81d94f669e194bfbbb923221341e3dc 100644
--- a/res/drawable/dropdown_sort_widget_background.xml
+++ b/res/drawable/dropdown_sort_widget_background.xml
@@ -19,5 +19,5 @@
         android:color="?attr/colorControlHighlight" >
     <item
         android:id="@android:id/mask"
-        android:drawable="@android:color/white"/>
+        android:drawable="@color/color_default_background"/>
 </ripple>
diff --git a/res/drawable/empty.xml b/res/drawable/empty.xml
index 73d4ffd2a23ab4757160cf59157e84b618de74a0..bb37849ab3b9d79f304ec4589d94e66c18cab122 100644
--- a/res/drawable/empty.xml
+++ b/res/drawable/empty.xml
@@ -20,13 +20,13 @@ Copyright (C) 2018 The Android Open Source Project
         android:viewportHeight="210">
 
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M115,109.44H95c-1.1,0-2-0.9-2-2s0.9-2,2-2h20c1.1,0,2,0.9,2,2S116.1,109.44,115,109.44z" />
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M62.67,85.14l3-0.11L62.67,85.14c-0.04-0.74-0.06-1.48-0.06-2.22c0-0.69,0.02-1.37,0.05-2.05l5.99,0.29 c-0.03,0.58-0.04,1.17-0.04,1.76c0,0.64,0.02,1.28,0.05,1.92l-2.99,0.2L62.67,85.14z" />
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M147.35,84.94l-5.99-0.28c0.03-0.56,0.04-1.12,0.04-1.69c0-0.64-0.02-1.28-0.05-1.92l-0.01-0.13l5.99-0.3 l0,0.08c0.04,0.77,0.06,1.52,0.06,2.26C147.39,83.64,147.38,84.29,147.35,84.94z" />
     <path
         android:fillColor="#EA4335"
@@ -35,16 +35,16 @@ Copyright (C) 2018 The Android Open Source Project
         android:fillColor="#EA4335"
         android:pathData="M137.35,66.27c-0.56-1.09-1.19-2.17-1.87-3.21l5.02-3.28c0.79,1.21,1.52,2.46,2.18,3.74L137.35,66.27z" />
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M85.15,52.44l-3.28-5.03c1.2-0.79,2.46-1.52,3.74-2.18l2.75,5.33C87.26,51.14,86.18,51.77,85.15,52.44z" />
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M124.69,52.34c-1.04-0.67-2.12-1.29-3.22-1.85l2.72-5.35c1.28,0.65,2.54,1.38,3.75,2.15L124.69,52.34z" />
     <path
         android:fillColor="#EA4335"
         android:pathData="M103.12,46.61l-0.4-5.99l0.08,0c1.45-0.07,2.85-0.08,4.25-0.01l-0.28,5.99 C105.56,46.54,104.34,46.54,103.12,46.61z" />
     <path
-        android:fillColor="#DADCE0"
+        android:fillColor="@color/color_default_gray1"
         android:pathData="M154,95.44v70H56v-70H154 M154,91.44H56c-2.21,0-4,1.79-4,4v70c0,2.21,1.79,4,4,4h98c2.21,0,4-1.79,4-4 v-70C158,93.24,156.21,91.44,154,91.44L154,91.44z" />
     <path
         android:pathData="M 0 0 H 210 V 210 H 0 V 0 Z" />
diff --git a/res/drawable/generic_ripple_background.xml b/res/drawable/generic_ripple_background.xml
index edf52c404e98d91a01a982935b9ab05abcacebe7..bc3aa1d377e10d53a2c0f31014c0f1fde3984d9d 100644
--- a/res/drawable/generic_ripple_background.xml
+++ b/res/drawable/generic_ripple_background.xml
@@ -20,7 +20,7 @@
     <item
         android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@android:color/white"/>
+            <solid android:color="@color/color_default_selector"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/res/drawable/grid_item_background.xml b/res/drawable/grid_item_background.xml
index 9c4e644a88b127f5debb9a8e3c5f703afc419bb1..7deb062ef16e786727e8d40daac9918d4aa231a8 100644
--- a/res/drawable/grid_item_background.xml
+++ b/res/drawable/grid_item_background.xml
@@ -16,10 +16,10 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
-        <color android:color="?android:colorSecondary"/>
+        <color android:color="@color/accent"/>
     </item>
     <item android:state_drag_hovered="true">
-        <color android:color="?android:strokeColor"/>
+        <color android:color="@color/color_default_selector"/>
     </item>
     <item android:state_selected="false">
         <color android:color="?android:colorBackground"/>
diff --git a/res/drawable/ic_action_clear.xml b/res/drawable/ic_action_clear.xml
index 38588b9bcc026b8d80523b09a397f18ef9f6a7db..1e24dad71e42b19d686fc418f0c15a4a81131fd3 100644
--- a/res/drawable/ic_action_clear.xml
+++ b/res/drawable/ic_action_clear.xml
@@ -18,8 +18,8 @@ Copyright (C) 2017 The Android Open Source Project
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal" >
+    android:tint="@color/accent" >
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/accent"
       android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_action_open.xml b/res/drawable/ic_action_open.xml
index 15890c94830d870c7fc8a838004b68e20707437d..85f09aa8b24df34c48b4abb0d645dd8751d73efe 100644
--- a/res/drawable/ic_action_open.xml
+++ b/res/drawable/ic_action_open.xml
@@ -19,6 +19,6 @@ Copyright (C) 201 The Android Open Source Project
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
   <path
-      android:fillColor="#FF737373"
+      android:fillColor="@color/accent"
       android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 1a9993033240dffb18681a538d51f4ac8d01fb9f..a8b601c598ec4982f518f1882e4f34f642dd3376 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_arrow_upward.xml b/res/drawable/ic_arrow_upward.xml
index dab39f9a316a90213bc84aa7ccb431bb068b4630..dfef6d9c5f0cc29163e7a24f9e8b5732ddf6a884 100644
--- a/res/drawable/ic_arrow_upward.xml
+++ b/res/drawable/ic_arrow_upward.xml
@@ -23,6 +23,6 @@
     <path
         android:pathData="M0 0h24v24H0V0z" />
     <path
-        android:fillColor="?android:textColorSecondary"
+        android:fillColor="@color/accent"
         android:pathData="M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_breadcrumb_arrow.xml b/res/drawable/ic_breadcrumb_arrow.xml
index f13be0f28d74d645c3c85d9016174e181678a8fd..7f3f4ab13eb8fb9f49627eb39de5b0d605850feb 100644
--- a/res/drawable/ic_breadcrumb_arrow.xml
+++ b/res/drawable/ic_breadcrumb_arrow.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6 -6,-6z"/>
 </vector>
diff --git a/res/drawable/ic_cab_cancel.xml b/res/drawable/ic_cab_cancel.xml
index 1eae40e5f2ff387686a5465bb3c8a77097cc7876..d0e056690b7fab8cfaf6658f313e33c50e4617b8 100644
--- a/res/drawable/ic_cab_cancel.xml
+++ b/res/drawable/ic_cab_cancel.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/accent"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml
index a6df08a93d9b0a4e0dca9581e5f37c684c32cb04..bf1971ca4de84218a3931fb62fb8bf08111a75c3 100644
--- a/res/drawable/ic_check.xml
+++ b/res/drawable/ic_check.xml
@@ -17,9 +17,8 @@ Copyright (C) 2018 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorPrimary">
+        android:viewportHeight="24.0" >
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="vM9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
 </vector>
diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml
index 192da29e6094719e89c06ee1a5bb14e6e1af0d90..4257b5e54f91490823b3033500ec003935a2ea07 100644
--- a/res/drawable/ic_check_circle.xml
+++ b/res/drawable/ic_check_circle.xml
@@ -18,9 +18,8 @@ Copyright (C) 2016 The Android Open Source Project
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-    android:tint="@color/color_default_blue1"
     >
     <path
-        android:fillColor="?android:attr/colorPrimary"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
 </vector>
diff --git a/res/drawable/ic_check_circle_accent.xml b/res/drawable/ic_check_circle_accent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e5ced57881c7cad6c86f7a8d615ee8d66f31123
--- /dev/null
+++ b/res/drawable/ic_check_circle_accent.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    >
+    <path
+        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 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
+</vector>
diff --git a/res/drawable/ic_debug_menu.xml b/res/drawable/ic_debug_menu.xml
index f0ada107b2b323114f11311506a90d081052bc46..b93842c1ace78aa542b2dff8e40e4d9796ffe2f5 100644
--- a/res/drawable/ic_debug_menu.xml
+++ b/res/drawable/ic_debug_menu.xml
@@ -6,8 +6,8 @@ This file has no copyright assigned and is placed in the Public Domain.
         android:width="24dp"
         android:viewportHeight="399.0"
         android:viewportWidth="425.8">
-    <path android:fillColor="?android:attr/colorControlNormal"
+    <path android:fillColor="@color/accent"
           android:pathData="M210.4,167c24,3 52.4,8.3 65,31.5 9.3,13.7 17.4,28.4 29,40.4 20.4,10.2 40.8,22.7 55.5,40.6 18.3,27.6 12.7,67 -8.7,91.2 -24,22 -58.5,33 -90.5,25 -20.5,-4.2 -40.8,-16.3 -62,-9.5 -19.8,5.5 -39.3,14.2 -60.2,11.8 -20,-0.5 -37.8,-10.3 -54.6,-20 -19.5,-12.6 -31.7,-35.3 -30.4,-58.6 0,-35 26.4,-64 56,-79.3 12.6,-6 26,-12.7 32,-26.3 8.5,-15.8 16,-35.5 35,-41 11,-3.8 22.4,-5.4 33.8,-5.6z" />
-    <path android:fillColor="?android:attr/colorControlNormal"
+    <path android:fillColor="@color/accent"
           android:pathData="M2.5,133.3c5,-18 19.7,-34.7 39,-37 13.8,-2 28,1.6 40.2,8 22.2,15 35,40 42.4,64.8 3.8,12 6.3,24.8 3.2,37 -2.8,14.8 -13.4,27 -27,32.8 -17.7,10.7 -41.2,9.2 -58,-2.4 -10,-6.7 -19,-15.3 -24.4,-26.2 -12.8,-23 -21.4,-50.5 -15.3,-77zM169,0.5s29.5,0.2 45.7,38c0,0 11.3,24.3 7.4,61.8 0,0 -0.5,37.8 -23,53.2 0,0 -30.6,27.8 -65.7,-9.6 0,0 -24.5,-26.4 -29.3,-63.5 0,0 -5.3,-38.4 18.5,-61.3 0,0 20,-19 46.5,-18.7zM314,6.2S350,17 346,58.4c0,0 2,33.2 -17.7,63.5 0,0 -20,37.3 -46.4,41.4 0,0 -29.2,9 -50.4,-36 0,0 -15.2,-51 8.3,-85.3 0,0 27.3,-50.8 74,-35.8zM394.4,108.4c17,5.2 29,21.6 30.5,39 1.6,15.8 -2,31.6 -7.4,46.3 -8.7,21.6 -24.2,40.4 -43.8,52.7 -14.8,8 -33.3,4.6 -47,-4.4 -5.5,-2.7 -9,-7.7 -11.2,-13.2 -9,-18 -10.4,-40 -2,-58.5 6.8,-17.4 15.4,-35.2 30,-47.5 11,-10 25.6,-18.3 41.2,-16.7 3.3,0.4 6.5,1.2 9.6,2.4z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dialog_alert.xml b/res/drawable/ic_dialog_alert.xml
index 8066483e507ca130e2b1098c5f57a040f174e66c..674d5120773dc506401d4b6cce72bffd99ae3bbd 100644
--- a/res/drawable/ic_dialog_alert.xml
+++ b/res/drawable/ic_dialog_alert.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dialog_info.xml b/res/drawable/ic_dialog_info.xml
index f1593516b7055c7e08c11e4133d57516c2ceeba8..adf79b8937c7c6fec1bd8ae7eef33f10e94be919 100644
--- a/res/drawable/ic_dialog_info.xml
+++ b/res/drawable/ic_dialog_info.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        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,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_done.xml b/res/drawable/ic_done.xml
index f8f66b692a94f8193e41507c978df7b1b894bd96..3ce93251ddd8bec6e8fa32a63cf406f394ddcf4c 100644
--- a/res/drawable/ic_done.xml
+++ b/res/drawable/ic_done.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorPrimary"
+        android:fillColor="@color/accent"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/res/drawable/ic_drop_copy_badge.xml b/res/drawable/ic_drop_copy_badge.xml
index 7f1be31514ff12358084d138585ddc4e3c3dbe3c..b08973c1a69214226be0891c50165dce3a805591 100644
--- a/res/drawable/ic_drop_copy_badge.xml
+++ b/res/drawable/ic_drop_copy_badge.xml
@@ -22,7 +22,7 @@ Copyright (C) 2016 The Android Open Source Project
     <group
          android:name="whiteBg">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M0,15a15,15 0 1,0 30,0a15,15 0 1,0 -30,0" />
     </group>
 
@@ -31,7 +31,7 @@ Copyright (C) 2016 The Android Open Source Project
          android:translateX="2"
          android:translateY="2">
     <path
-        android:fillColor="#FF0B8043"
+        android:fillColor="@color/color_default_green1"
         android:pathData="M13,0 C5.824,0 0,5.824 0,13 C0,20.176 5.824,26 13,26 C20.176,26 26,20.176 26,13 C26,5.824 20.176,0 13,0 L13,0 Z M19,14 L14,14 L14,19 L12,19 L12,14 L7,14 L7,12 L12,12 L12,7 L14,7 L14,12 L19,12 L19,14 Z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_eject.xml b/res/drawable/ic_eject.xml
index 0e1b36f33049357098896b379872747690582e3a..17bc93285327f6d308f7c1a5577857a19d821c1f 100644
--- a/res/drawable/ic_eject.xml
+++ b/res/drawable/ic_eject.xml
@@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#5F6368"
+        android:fillColor="@color/accent"
         android:pathData="M5 17h14v2H5zm7-12L5.33 15h13.34z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_exit_to_app.xml b/res/drawable/ic_exit_to_app.xml
index b597def5bcf50db316f2cf8ebd35513c090b4284..7304387f06302222dac845a9972e6ec1d7e31bda 100644
--- a/res/drawable/ic_exit_to_app.xml
+++ b/res/drawable/ic_exit_to_app.xml
@@ -19,6 +19,6 @@ Copyright (C) 2018 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#5F6368"
+        android:fillColor="@color/accent"
         android:pathData="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
 </vector>
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 2ab5fd9e0ec9565793447e48506fb4fd2a2e97c0..f623d2f4297dd8c80a252a688dd5554feaf4312e 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -22,6 +22,6 @@
     android:tint="@color/accent"
     >
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_history.xml b/res/drawable/ic_history.xml
index df0636dee92ba3c5d2eea0a812534f9f74b207f3..ba197a028132a3b36f0a418169c8b216f2ca66a7 100644
--- a/res/drawable/ic_history.xml
+++ b/res/drawable/ic_history.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorSecondary"
+        android:fillColor="@color/accent"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l4,3.99L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_compress.xml b/res/drawable/ic_menu_compress.xml
index cdb328e823ba1c83dc305be9b656402915aab4e6..130b6e068d40047396ffca586ea99145ee513ac2 100644
--- a/res/drawable/ic_menu_compress.xml
+++ b/res/drawable/ic_menu_compress.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
 <path
-    android:fillColor="?android:attr/colorControlNormal"
+    android:fillColor="@color/accent"
     android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_copy.xml b/res/drawable/ic_menu_copy.xml
index 9c391dae21be3926e1e95f54dc412a09e7ebafdd..0e54221d102494ae946db465526e0e13b6230d2c 100644
--- a/res/drawable/ic_menu_copy.xml
+++ b/res/drawable/ic_menu_copy.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml
index bfe3ed64fd60d0b5da59f96cbc093e27172c17e6..ed53870c77790f0d77111ad6e34f35f403bfd346 100644
--- a/res/drawable/ic_menu_delete.xml
+++ b/res/drawable/ic_menu_delete.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_extract.xml b/res/drawable/ic_menu_extract.xml
index 7770148c53eff78aa61c72a623ad23377bfe7b3f..13461a65781decc6f7762f95896f1b4cda41ecca 100644
--- a/res/drawable/ic_menu_extract.xml
+++ b/res/drawable/ic_menu_extract.xml
@@ -22,7 +22,7 @@
     <group>
         <clip-path android:pathData="M0,0h24v24H0V0z M 0,0"/>
         <path
-            android:fillColor="?android:attr/colorControlNormal"
+            android:fillColor="@color/accent"
             android:pathData="M20.55 5.22l-1.39,-1.68C18.88 3.21 18.47 3 18 3H6c-.47 0,-.88.21,-1.15.55L3.46 5.22C3.17 5.57 3 6.01 3 6.5V19c0 1.1.89 2 2 2h14c1.1 0 2,-.9 2,-2V6.5c0,-.49,-.17,-.93,-.45,-1.28zM12 9.5l5.5 5.5H14v2h-4v-2H6.5L12 9.5zM5.12 5l.82,-1h12l.93 1H5.12z"/>
     </group>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml
index d3a78711267cdece6770749e422673327ba8f8ce..8fe1658232ab9dd7370857612c4102303e687e62 100644
--- a/res/drawable/ic_menu_search.xml
+++ b/res/drawable/ic_menu_search.xml
@@ -19,9 +19,9 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24"
-    android:tint="@color/color_default_primary_text"
+    android:tint="@color/accent"
     >
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M15.5,14h-0.79l-0.28,-0.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,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml
index 5ff5c86359296b36d545ea63d521607bc3f2b28e..82a419d19313152278da053f72e088a4c23f8cd1 100644
--- a/res/drawable/ic_menu_share.xml
+++ b/res/drawable/ic_menu_share.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_view_grid.xml b/res/drawable/ic_menu_view_grid.xml
index 4279bfedffd5fe25b27d85c46ae2d6c14f54f28f..9cbcdc5007a9848798361792d2750f4ac031bbf5 100644
--- a/res/drawable/ic_menu_view_grid.xml
+++ b/res/drawable/ic_menu_view_grid.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M4,11h5L9,5L4,5v6zM4,18h5v-6L4,12v6zM10,18h5v-6h-5v6zM16,18h5v-6h-5v6zM10,11h5L15,5h-5v6zM16,5v6h5L21,5h-5z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_view_list.xml b/res/drawable/ic_menu_view_list.xml
index 7428c55fe6730a72519e24b78dae856127097a91..264faa47c61e73280d8881c2212e520434f6e3a9 100644
--- a/res/drawable/ic_menu_view_list.xml
+++ b/res/drawable/ic_menu_view_list.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/accent"
         android:pathData="M4,14h2c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v2C3,13.55 3.45,14 4,14zM4,19h2c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v2C3,18.55 3.45,19 4,19zM4,9h2c0.55,0 1,-0.45 1,-1V6c0,-0.55 -0.45,-1 -1,-1H4C3.45,5 3,5.45 3,6v2C3,8.55 3.45,9 4,9zM9,14h10c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H9c-0.55,0 -1,0.45 -1,1v2C8,13.55 8.45,14 9,14zM9,19h10c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H9c-0.55,0 -1,0.45 -1,1v2C8,18.55 8.45,19 9,19zM8,6v2c0,0.55 0.45,1 1,1h10c0.55,0 1,-0.45 1,-1V6c0,-0.55 -0.45,-1 -1,-1H9C8.45,5 8,5.45 8,6z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4d8bd702232abd81060af98ec5e247867f544cd8
--- /dev/null
+++ b/res/drawable/ic_more_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/accent">
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/res/drawable/ic_reject_drop_badge.xml b/res/drawable/ic_reject_drop_badge.xml
index 402aff8f81984f339eef9fa2c75a2e9aac97dccd..f43f7c1f090e1d0635036b96bbccaf33175303d9 100644
--- a/res/drawable/ic_reject_drop_badge.xml
+++ b/res/drawable/ic_reject_drop_badge.xml
@@ -23,7 +23,7 @@ Copyright (C) 2016 The Android Open Source Project
     <group
          android:name="whiteBg">
         <path
-            android:fillColor="#FFFFFFFF"
+            android:fillColor="@color/color_default_view_on_accent"
             android:pathData="M0,15a15,15 0 1,0 30,0a15,15 0 1,0 -30,0" />
     </group>
 
@@ -32,7 +32,7 @@ Copyright (C) 2016 The Android Open Source Project
          android:translateX="2"
          android:translateY="2">
         <path
-            android:fillColor="#FFC53929"
+            android:fillColor="@color/color_default_red1"
             android:pathData="M3.8056487,3.8056487 C-1.26854957,8.87984696 -1.26854957,17.1162267 3.8056487,22.190425 C8.87984696,27.2646233 17.1162267,27.2646233 22.190425,22.190425 C27.2646233,17.1162267 27.2646233,8.87984696 22.190425,3.8056487 C17.1162267,-1.26854957 8.87984696,-1.26854957 3.8056487,3.8056487 L3.8056487,3.8056487 Z M16.5335708,17.9477843 L12.9980369,14.4122504 L9.46250295,17.9477843 L8.04828938,16.5335708 L11.5838233,12.9980369 L8.04828938,9.46250295 L9.46250295,8.04828938 L12.9980369,11.5838233 L16.5335708,8.04828938 L17.9477843,9.46250295 L14.4122504,12.9980369 L17.9477843,16.5335708 L16.5335708,17.9477843 L16.5335708,17.9477843 Z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_sd_storage.xml b/res/drawable/ic_sd_storage.xml
index 8d9e4a67156461e524ecee84cf918cd9fa915cf9..179690a68a504b73314c94b3dfe4cf1e825eecca 100644
--- a/res/drawable/ic_sd_storage.xml
+++ b/res/drawable/ic_sd_storage.xml
@@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#5F6368"
+        android:fillColor="@color/accent"
         android:pathData="M18 2h-8L4.02 8 4 20c0 1.1.9 2 2 2h12c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z"/>
 </vector>
diff --git a/res/drawable/ic_subdirectory_arrow.xml b/res/drawable/ic_subdirectory_arrow.xml
index 35f5ca59e6b2d4ce632532935232c058e9c4c0a8..f20f720f0d71708cb0a69b404c1ca8b4a77f5f52 100644
--- a/res/drawable/ic_subdirectory_arrow.xml
+++ b/res/drawable/ic_subdirectory_arrow.xml
@@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:textColorSecondary"
+        android:fillColor="@color/accent"
         android:pathData="M19 15l-6 6,-1.42,-1.42L15.17 16H4V4h2v10h9.17l-3.59,-3.58L13 9l6 6z"/>
 </vector>
diff --git a/res/drawable/ic_usb_storage.xml b/res/drawable/ic_usb_storage.xml
index 60cb6c27f174d6c89244ec469b933b5bbc7e1b4b..42ce279490506788c36a3998c063d21459c1c366 100644
--- a/res/drawable/ic_usb_storage.xml
+++ b/res/drawable/ic_usb_storage.xml
@@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:textColorSecondary"
+        android:fillColor="@color/accent"
         android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>
 </vector>
diff --git a/res/drawable/ic_user_profile.xml b/res/drawable/ic_user_profile.xml
index 42e06a59e86dea34f985d0bc79a98fcc42a7bda1..41915d53508f224b3d4c6a8802669110d660e089 100644
--- a/res/drawable/ic_user_profile.xml
+++ b/res/drawable/ic_user_profile.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm6.36 14.83c-1.43-1.74-4.9-2.33-6.36-2.33s-4.93.59-6.36 2.33C4.62 15.49 4 13.82 4 12c0-4.41 3.59-8 8-8s8 3.59 8 8c0 1.82-.62 3.49-1.64 4.83zM12 6c-1.94 0-3.5 1.56-3.5 3.5S10.06 13 12 13s3.5-1.56 3.5-3.5S13.94 6 12 6z"
-        android:fillColor="#4285F4"/>
+        android:fillColor="@color/accent"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml
index 295054a35d55d2b2978eea37c02cd4e06469c9dd..0b10942aafc4bef546091418a43b2400a927dd48 100644
--- a/res/drawable/ic_zoom_out.xml
+++ b/res/drawable/ic_zoom_out.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M15,3l2.3,2.3 -2.89,2.87 1.42,1.42L18.7,6.7 21,9L21,3zM3,9l2.3,-2.3 2.87,2.89 1.42,-1.42L6.7,5.3 9,3L3,3zM9,21l-2.3,-2.3 2.89,-2.87 -1.42,-1.42L5.3,17.3 3,15v6zM21,15l-2.3,2.3 -2.87,-2.89 -1.42,1.42 2.89,2.87L15,21h6z"/>
 </vector>
diff --git a/res/drawable/inspector_separator.xml b/res/drawable/inspector_separator.xml
index cbb494a1d4832c550dc2b72461003aadd9f037d8..d26192e48cd9476f00d5061b8680146093a7bb76 100644
--- a/res/drawable/inspector_separator.xml
+++ b/res/drawable/inspector_separator.xml
@@ -17,8 +17,8 @@
     android:insetTop="10dp"
     android:insetBottom="10dp" >
     <shape xmlns:android="http://schemas.android.com/apk/res/android"
-           android:tint="?android:attr/colorForeground">
+           android:tint="@color/color_default_divider">
         <size android:height="1dp"/>
-        <solid android:color="#1f000000"/>
+        <solid android:color="@color/color_default_divider"/>
     </shape>
 </inset>
\ No newline at end of file
diff --git a/res/drawable/item_doc_grid_border.xml b/res/drawable/item_doc_grid_border.xml
index db66094fc2ec0581e561abf3c7617826402fa4c4..29a6cc53fdd38cc4bdda70aea337f4aeab0a1480 100644
--- a/res/drawable/item_doc_grid_border.xml
+++ b/res/drawable/item_doc_grid_border.xml
@@ -18,5 +18,5 @@
        android:shape="rectangle">
     <stroke
         android:width="2dp"
-        android:color="@color/item_doc_grid_border"/>
+        android:color="@color/color_default_divider"/>
 </shape>
diff --git a/res/drawable/item_doc_grid_border_rounded.xml b/res/drawable/item_doc_grid_border_rounded.xml
index e6ffbcad6db744891f9aa37deaf1e6904569050f..646edae33575acddc0fbe55211cd5fa1710c7b6b 100644
--- a/res/drawable/item_doc_grid_border_rounded.xml
+++ b/res/drawable/item_doc_grid_border_rounded.xml
@@ -18,6 +18,6 @@
        android:shape="rectangle">
     <stroke
         android:width="2dp"
-        android:color="@color/item_doc_grid_border"/>
+        android:color="@color/color_default_divider"/>
     <corners android:radius="@dimen/grid_item_radius"/>
 </shape>
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index 5768aff8afe0f7ad882416d87a21df1033b81501..4e28c423ff90eb6a1308fbe41faba43148e7161e 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -16,7 +16,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:tint="?android:attr/colorForeground">
-    <solid android:color="#1f000000" />
+    <solid android:color="@color/color_default_divider" />
     <size
         android:height="1dp"
         android:width="1dp" />
diff --git a/res/drawable/list_item_background.xml b/res/drawable/list_item_background.xml
index afbeecd278f2e21afed93c2fbf0ffb75178a7a14..9a5e7255358d9e223254cac3bdaa240b6baff6ed 100644
--- a/res/drawable/list_item_background.xml
+++ b/res/drawable/list_item_background.xml
@@ -16,16 +16,16 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true" >
-        <color android:color="?android:colorSecondary"/>
+        <color android:color="@color/accent"/>
     </item>
     <item android:state_selected="true">
-        <color android:color="?android:colorSecondary"/>
+        <color android:color="@color/accent"/>
     </item>
     <item android:state_drag_hovered="true">
-        <color android:color="?android:strokeColor"/>
+        <color android:color="@color/color_default_selector"/>
     </item>
     <item android:state_selected="false"
           android:state_focused="false">
-        <color android:color="@color/app_background_color"/>
+        <color android:color="@color/color_default_background"/>
     </item>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/menu_dropdown_panel.xml b/res/drawable/menu_dropdown_panel.xml
index f750f0d5aafa661a73eeff8869e0080e87f49560..bd7dd43892a2a35243cf658e32afe2c40735792d 100644
--- a/res/drawable/menu_dropdown_panel.xml
+++ b/res/drawable/menu_dropdown_panel.xml
@@ -21,8 +21,8 @@
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:shape="rectangle"
             android:tint="?android:attr/colorBackgroundFloating">
-            <stroke android:width="2dp" android:color="#3C4043" />
-            <solid android:color="#5F6368" />
+            <stroke android:width="2dp" android:color="@color/color_default_divider" />
+            <solid android:color="@color/color_default_background" />
             <corners
                 android:topRightRadius="@dimen/material_round_radius"
                 android:topLeftRadius="@dimen/material_round_radius"
diff --git a/res/drawable/root_item_background.xml b/res/drawable/root_item_background.xml
index 6eca486eb7c16ee749490def5e7291a7ee5e1e5c..78b6fadea8019f5caa5f5b837bb483f988f2ddc9 100644
--- a/res/drawable/root_item_background.xml
+++ b/res/drawable/root_item_background.xml
@@ -25,7 +25,7 @@
     <item>
         <selector>
             <item app:state_highlighted="true">
-                <color android:color="?android:attr/colorControlHighlight"/>
+                <color android:color="@color/color_default_selector"/>
             </item>
             <item
                 app:state_highlighted="false"
diff --git a/res/drawable/root_list_selector.xml b/res/drawable/root_list_selector.xml
index 911c2edc516c7175f74d36cfa46d0df8c6fae12d..23894411ec33a59be5ed8d774f67769d77c35678 100644
--- a/res/drawable/root_list_selector.xml
+++ b/res/drawable/root_list_selector.xml
@@ -25,6 +25,6 @@
             android:bottomLeftRadius="2dp"
             android:bottomRightRadius="2dp"/>
         <solid
-            android:color="?android:attr/colorSecondary"/>
+            android:color="@color/color_default_selector"/>
     </shape>
 </inset>
\ No newline at end of file
diff --git a/res/drawable/search_bar_background.xml b/res/drawable/search_bar_background.xml
index ab657c3856cedf488eab2bd8a89c6e02fd694eaa..68dae3c70c503569c1f0dfcb273d5c79d9a683d2 100644
--- a/res/drawable/search_bar_background.xml
+++ b/res/drawable/search_bar_background.xml
@@ -23,7 +23,7 @@
         android:start="@dimen/search_bar_background_margin_start"
         android:end="@dimen/search_bar_background_margin_end">
         <shape android:shape="rectangle">
-            <solid android:color="?android:attr/colorBackgroundFloating"/>
+            <solid android:color="@color/color_default_primary_dark"/>
             <corners android:radius="@dimen/search_bar_radius"/>
         </shape>
     </item>
diff --git a/res/drawable/selection_demo_band_overlay.xml b/res/drawable/selection_demo_band_overlay.xml
index adf2b27f8284165f65061d22e317359dba03887c..f16b97b6562e092f7cc7341e8f7a446f04f5cca4 100644
--- a/res/drawable/selection_demo_band_overlay.xml
+++ b/res/drawable/selection_demo_band_overlay.xml
@@ -17,6 +17,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="rectangle">
-    <solid android:color="#339999ff" />
-    <stroke android:width="1dp" android:color="#44000000" />
+    <solid android:color="@color/color_default_selector" />
+    <stroke android:width="1dp" android:color="@color/color_default_secondary_text" />
 </shape>
diff --git a/res/drawable/sort_widget_background.xml b/res/drawable/sort_widget_background.xml
index b7f6ae523c4ef8765dc0c78d561c39d4e4a3023e..c8e0d51d71a9fcab8b2a7fad096ff69cf1a40948 100644
--- a/res/drawable/sort_widget_background.xml
+++ b/res/drawable/sort_widget_background.xml
@@ -24,7 +24,7 @@
         <shape android:shape="rectangle">
             <stroke
                 android:width="1dp"
-                android:color="#1f000000" />
+                android:color="@color/color_default_divider" />
         </shape>
     </item>
 </layer-list>
diff --git a/res/layout-sw720dp/directory_app_bar.xml b/res/layout-sw720dp/directory_app_bar.xml
index 4bb63613ad0a7e26a961857b73652c060f6e068b..711fab1bae0db60a3996a28e1c4a67b6a453782e 100644
--- a/res/layout-sw720dp/directory_app_bar.xml
+++ b/res/layout-sw720dp/directory_app_bar.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
         android:layout_margin="@dimen/search_bar_margin"
-        android:background="?android:attr/colorBackground"
+        android:background="@color/color_default_primary_dark"
         android:theme="?actionBarTheme"
         android:popupTheme="?actionBarPopupTheme"
         android:elevation="3dp"
diff --git a/res/layout/dialog_file_name.xml b/res/layout/dialog_file_name.xml
index b62480a67cca4c72e2dd22dc1f091d1a7873bd54..3201f8d606571fb0b81055a85383e71d728ddfa6 100644
--- a/res/layout/dialog_file_name.xml
+++ b/res/layout/dialog_file_name.xml
@@ -15,6 +15,7 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="https://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fitsSystemWindows="true">
@@ -29,14 +30,14 @@
         android:layout_marginTop="@dimen/dialog_content_padding_top"
         android:layout_marginBottom="@dimen/dialog_content_padding_bottom"
         android:layout_centerInParent="true"
-        android:textColorHint="@color/hairline"
+        app:hintTextAppearance="@style/HintTextStyle"
        >
         <!--style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"-->
         <com.google.android.material.textfield.TextInputEditText
             android:id="@android:id/text1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColorHint="@color/hairline"
+            android:textColorHint="@color/color_default_secondary_text"
             android:hint="@string/input_hint_new_folder"
             android:inputType="textCapSentences"/>
 
diff --git a/res/layout/dialog_sorting.xml b/res/layout/dialog_sorting.xml
index d8cb7364c08de93a00a0ec3abea07ef0234fd124..4102276a866f039b18bda4b32218ee7b58f4330c 100644
--- a/res/layout/dialog_sorting.xml
+++ b/res/layout/dialog_sorting.xml
@@ -17,6 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/color_default_primary_dark"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/layout/directory_app_bar.xml b/res/layout/directory_app_bar.xml
index 45864e96994d03c2be6129ae1ef5623a5f811f3d..ccf415e191ce23c9f5e16280f6e0822d1753f1c8 100644
--- a/res/layout/directory_app_bar.xml
+++ b/res/layout/directory_app_bar.xml
@@ -28,6 +28,7 @@
         android:layout_height="wrap_content"
         android:elevation="3dp"
         app:titleEnabled="false"
+        android:background="@color/color_default_primary_dark"
         app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
 
         <include layout="@layout/directory_header"/>
@@ -36,7 +37,7 @@
             android:id="@+id/toolbar_background_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/action_bar_space_height"
-            android:background="?android:attr/colorBackground"
+            android:background="@color/color_default_primary_dark"
             app:layout_collapseMode="pin"/>
 
         <androidx.appcompat.widget.Toolbar
@@ -44,7 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
             android:layout_margin="@dimen/search_bar_margin"
-            android:background="?android:attr/colorBackground"
+            android:background="@color/color_default_primary_dark"
             android:theme="?actionBarTheme"
             android:popupTheme="?actionBarPopupTheme"
             android:elevation="3dp"
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index a5331d5206a5e152512e81ef5663e4b09def4101..bc1db64419f2202cc8390ec7ab165dc67e3d7fd7 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -86,10 +86,10 @@
                 android:id="@+id/roots_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/color_default_primary_dark"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
-                app:titleTextColor="?android:colorPrimary"/>
+                app:titleTextColor="@color/color_default_primary_text"/>
 
             <FrameLayout
                 android:id="@+id/container_roots"
diff --git a/res/layout/fixed_layout.xml b/res/layout/fixed_layout.xml
index 7f7547fd4deb7a9183fdb11dfea772695d52acc6..61364932d68790682ed3c2340bddd392fb83a4f6 100644
--- a/res/layout/fixed_layout.xml
+++ b/res/layout/fixed_layout.xml
@@ -34,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
             android:layout_margin="@dimen/search_bar_margin"
-            android:background="?android:attr/colorBackground"
+            android:background="@color/color_default_primary_dark"
             android:elevation="3dp"
             android:theme="?actionBarTheme"
             android:popupTheme="?actionBarPopupTheme"
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index c6377aefc61163de120293f0211bffcf953b97dd..da29fbaf830c830a011141342886685a885ea100 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -28,6 +28,7 @@
         android:layout_height="?android:attr/actionBarSize"
         android:layout_margin="@dimen/search_bar_margin"
         android:theme="?actionBarTheme"
+        android:background="@color/color_default_primary_dark"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:navigationContentDescription="@string/abc_toolbar_collapse_description">
 
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
index df28d4968651e9800db0e17b871f898690de2caa..5ab570f36a3577b5ec359432700360c6785f1b3a 100644
--- a/res/layout/inspector_activity.xml
+++ b/res/layout/inspector_activity.xml
@@ -25,7 +25,7 @@
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground">
+        android:background="@color/color_default_primary_dark" >
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -33,6 +33,7 @@
             android:minHeight="?android:attr/actionBarSize"
             app:titleEnabled="false"
             app:statusBarScrim="@android:color/transparent"
+            android:background="@color/color_default_primary_dark"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <LinearLayout
@@ -46,6 +47,7 @@
 
                 <com.android.documentsui.inspector.HeaderView
                     android:id="@+id/inspector_header_view"
+                    android:background="@color/color_default_background"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/inspector_header_height"
                     app:layout_collapseMode="parallax"/>
@@ -55,7 +57,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/color_default_primary_dark"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
index d8f6eaf83cfc57a8bd242cb94fa51ad8f32987d6..65db670dd5e74aa6928729bcd0505787fc1383ab 100644
--- a/res/layout/item_doc_grid.xml
+++ b/res/layout/item_doc_grid.xml
@@ -58,9 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:scaleType="centerCrop"
-                    android:contentDescription="@null"
-                    android:tint="?attr/gridItemTint"
-                    android:tintMode="src_over"/>
+                    android:contentDescription="@null" />
 
                 <com.android.documentsui.GridItemThumbnail
                     android:id="@+id/icon_mime_lg"
@@ -125,7 +123,7 @@
 
                     <ImageView
                         android:id="@+id/icon_check"
-                        android:src="@drawable/ic_check_circle"
+                        android:src="@drawable/ic_check_circle_accent"
                         android:alpha="0"
                         android:layout_width="@dimen/check_icon_size"
                         android:layout_height="@dimen/check_icon_size"
diff --git a/res/layout/item_doc_header_message.xml b/res/layout/item_doc_header_message.xml
index 352d50cfb8da09171e4f9fd7662638e350b057fc..2a8c964859398799b62c68d45fcf2c53d128336c 100644
--- a/res/layout/item_doc_header_message.xml
+++ b/res/layout/item_doc_header_message.xml
@@ -36,6 +36,7 @@
         android:layout_marginStart="0dp"
         android:layout_marginEnd="@dimen/list_item_padding"
         android:layout_toEndOf="@+id/message_icon"
+        android:textColor="@color/color_default_primary_text"
         android:selectAllOnFocus="true"/>
 
     <Button
@@ -45,5 +46,7 @@
         android:layout_alignEnd="@+id/message_textview"
         android:layout_below="@+id/message_textview"
         android:text="@android:string/ok"
+        android:textColor="@color/color_default_primary_text"
+        android:background="@color/color_default_foreground"
         style="?attr/materialButtonStyle"/>
 </RelativeLayout>
diff --git a/res/layout/item_photo_grid.xml b/res/layout/item_photo_grid.xml
index a1ceea00c2965ffdb1531525a20b876edc94e433..c5a5f2a11f2afe6e18957ca9450ede0d992e27e6 100644
--- a/res/layout/item_photo_grid.xml
+++ b/res/layout/item_photo_grid.xml
@@ -49,9 +49,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:tint="?attr/gridItemTint"
-                android:tintMode="src_over"/>
+                android:contentDescription="@null" />
 
             <com.android.documentsui.GridItemThumbnail
                 android:id="@+id/icon_mime_lg"
@@ -72,7 +70,7 @@
 
             <ImageView
                 android:id="@+id/icon_check"
-                android:src="@drawable/ic_check_circle"
+                android:src="@drawable/ic_check_circle_accent"
                 android:alpha="0"
                 android:layout_width="@dimen/check_icon_size"
                 android:layout_height="@dimen/check_icon_size"
diff --git a/res/layout/item_root_spacer.xml b/res/layout/item_root_spacer.xml
index 16ecee7fd0e47a82aeb9cfc3aa2668b8c87b9415..6926f225d67d556c7a2e9c70c96e89d47bcb7648 100644
--- a/res/layout/item_root_spacer.xml
+++ b/res/layout/item_root_spacer.xml
@@ -24,6 +24,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:alpha=".5"
         android:background="?android:attr/listDivider" />
 
 </FrameLayout>
diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml
index 592cf63f9f02e4b2654c378c547986c676ab12e7..d3ceb719ff17b3339f6afc140bc489943f42c7e1 100644
--- a/res/layout/search_chip_item.xml
+++ b/res/layout/search_chip_item.xml
@@ -31,5 +31,5 @@
     app:iconStartPadding="@dimen/search_chip_icon_padding"
     app:rippleColor="@color/search_chip_ripple_color"
     app:chipMinTouchTargetSize="@dimen/button_touch_size"
-    app:chipIconTint="@color/color_default_blue1"
+    app:chipIconTint="@color/accent"
 />
\ No newline at end of file
diff --git a/res/layout/sort_list_item.xml b/res/layout/sort_list_item.xml
index c2f50c8b87218e7531b88bf6526f64d79225f395..5264af5c623b5954c9db19b0f7f6738091cf4e62 100644
--- a/res/layout/sort_list_item.xml
+++ b/res/layout/sort_list_item.xml
@@ -19,6 +19,7 @@
                  android:layout_width="match_parent"
                  android:layout_height="?android:attr/listPreferredItemHeightSmall"
                  android:textAppearance="@style/SortList"
+                 android:textColor="@drawable/check_textview_text_color"
                  android:gravity="center_vertical"
                  android:checkMark="@drawable/list_checker"
                  android:paddingStart="?android:attr/listPreferredItemPaddingStart"
diff --git a/res/values-sw720dp/colors.xml b/res/values-night-v27/themes.xml
similarity index 53%
rename from res/values-sw720dp/colors.xml
rename to res/values-night-v27/themes.xml
index b39b89409dd94d4d32edc9411fc9ad0e193a1849..e73055fae2acaafefe53c88494ca0a74c7bf061e 100644
--- a/res/values-sw720dp/colors.xml
+++ b/res/values-night-v27/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,5 +15,14 @@
 -->
 
 <resources>
-    <color name="menu_search_background">#ff2852ab</color>
+    <!-- DocumentsTheme is allow customize by run time overlay -->
+    <style name="DocumentsTheme" parent="DocumentsTheme.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="DocumentsDefaultTheme" parent="DocumentsDefaultTheme.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
 </resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
deleted file mode 100644
index 2af2ca9974ad37af390e41fa5ff0f33e9c6b2c13..0000000000000000000000000000000000000000
--- a/res/values-night/themes.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
-        <item name="android:colorBackground">@color/app_background_color</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
-</resources>
diff --git a/res/values-night/colors.xml b/res/values-v27/themes.xml
similarity index 53%
rename from res/values-night/colors.xml
rename to res/values-v27/themes.xml
index f358b023a40ed87dadf84d0919017443f1fff45c..7fc2cdd264fa76ef8a4c2455d2d6f0569f006b3f 100644
--- a/res/values-night/colors.xml
+++ b/res/values-v27/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,12 +13,16 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <resources>
-    <color name="app_background_color">#202124</color>
-    <color name="background_floating">#3C4043</color>
-    <color name="nav_bar_translucent">#52000000</color>
+    <!-- DocumentsTheme is allow customize by run time overlay -->
+    <style name="DocumentsTheme" parent="DocumentsTheme.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
 
-    <color name="primary">#8AB4F8</color>
-    <color name="secondary">#3D8AB4F8</color>
-    <color name="hairline">#5F6368</color>
+    <style name="DocumentsDefaultTheme" parent="DocumentsDefaultTheme.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 47eb28ec1698e94d4e1a02e27a28659e783e5f3a..1b8bb33425de577d9975f1115d33d8e5ec48b0c0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,44 +19,45 @@
          else that needs to manually declare a background matching the "default"
          app background (e.g. the drawer overlay). -->
 
-    <color name="app_background_color">@android:color/white</color>
-    <color name="background_floating">@android:color/white</color>
-    <color name="nav_bar_translucent">#99FFFFFF</color>
-
-    <color name="primary">@color/color_default_foreground</color> <!-- Blue 600 -->
-    <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-    <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
-
-    <color name="chip_background_disable_color">#fff1f3f4</color>
-    <color name="menu_search_background">@android:color/transparent</color>
-    <color name="item_breadcrumb_background_hovered">#1affffff</color>
-    <color name="item_drag_shadow_background">@android:color/white</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="background_floating">@color/color_default_primary_dark</color>
+    <color name="nav_bar_translucent">@color/color_default_primary_dark</color>
+
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
+
+    <color name="chip_background_disable_color">@color/color_default_secondary_text</color>
+    <color name="menu_search_background">@color/color_default_primary_dark</color>
+    <color name="item_breadcrumb_background_hovered">@color/color_default_selector</color>
+    <color name="item_drag_shadow_background">@color/color_default_foreground</color>
     <color name="item_drag_shadow_container_background">@android:color/transparent</color>
-    <color name="tool_bar_gradient_max">#7f000000</color>
+    <color name="tool_bar_gradient_max">@color/color_default_primary_dark</color>
 
-    <color name="band_select_background">#88ffffff</color>
-    <color name="band_select_border">#44000000</color>
+    <color name="band_select_background">@color/color_default_foreground</color>
+    <color name="band_select_border">@color/color_default_divider</color>
 
-    <color name="downloads_icon_background">#ff4688f2</color>
-    <color name="app_icon_background">#ff4688f2</color>
-    <color name="shortcut_foreground">#ff3367d6</color>
-    <color name="shortcut_background">#fff5f5f5</color>
+    <color name="app_icon_background">@color/accent</color>
+    <color name="shortcut_foreground">@color/accent</color>
+    <color name="shortcut_background">@color/color_default_foreground</color>
 
-    <color name="window_background">#fff1f1f1</color>
-    <color name="item_doc_background_selected">#4d3367d6</color>
-    <color name="item_title">#ff333333</color>
+    <color name="window_background">@color/color_default_background</color>
+    <color name="item_doc_background_selected">@color/color_default_selector</color>
+    <color name="item_title">@color/color_default_primary_text</color>
 
 
 
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
 
-    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+
     <!--white-->
     <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
     <!--black 80%-->
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
-
-
-
-
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
+    <color name="color_default_selector">@lineageos.platform:color/color_default_selector</color>
+    <color name="color_default_red1">@lineageos.platform:color/color_default_red1</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>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f645ed1303ee9c4aa5a9dd0b4a79ece9e8f6e4e4..022c7d18828f54f6a96a210fa8fbacb2238d45d3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">@color/color_default_primary_text</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="android:background">@color/color_default_primary_dark</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
@@ -27,7 +28,7 @@
     </style>
 
     <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardBackgroundColor">@color/color_default_background</item>
         <item name="cardPreventCornerOverlap">false</item>
         <item name="cardCornerRadius">@dimen/grid_item_radius</item>
         <item name="cardElevation">@dimen/grid_item_elevation</item>
@@ -50,7 +51,7 @@
     <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="bottomSheetStyle">@style/BottomSheet</item>
-        <item name="colorControlHighlight">@color/ripple_material_light</item>
+        <item name="colorControlHighlight">@color/color_default_selector</item>
     </style>
 
     <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
@@ -58,19 +59,21 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_primary_text</item>
+        <item name="android:src">@drawable/ic_more_24</item>
+        <item name="android:tint">@color/accent</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
+        <item name="android:paddingRight">5dp</item>
     </style>
 
     <style name="OverflowMenuStyle" parent="@style/Widget.AppCompat.PopupMenu.Overflow">
         <item name="android:popupBackground">@drawable/menu_dropdown_panel</item>
         <item name="android:dropDownWidth">wrap_content</item>
         <item name="android:overlapAnchor">false</item>
-
+        <item name="tint">@color/accent</item>
     </style>
 
     <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">
-        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">20sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
@@ -104,4 +107,9 @@
         <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>
         <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleStyle</item>
     </style>
+
+    <style name="HintTextStyle" parent="TextAppearance.Design.Hint">
+        <item name="android:textColor">@color/color_default_secondary_text</item>
+    </style>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d4366d316f9dc447a3d06af5e09c01cde030e2d0..2f1552de71097307c9aa5f9dd53513cbdfbedfa5 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,52 +16,62 @@
 
 <resources>
     <!-- DocumentsTheme is allow customize by run time overlay -->
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
+    <style name="DocumentsTheme" parent="DocumentsTheme.Base">
+    </style>
+
+    <style name="DocumentsTheme.Base" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
 
         <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+        <item name="android:actionModeBackground">@color/color_default_primary_dark</item>
 
         <!-- Color section -->
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
-        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
-        <item name="android:colorControlActivated">@color/color_default_blue1</item>
+        <item name="android:colorControlHighlight">@color/color_default_selector</item>
+        <item name="android:colorControlActivated">@color/accent</item>
         <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:strokeColor">@color/color_default_divider</item>
 
         <!-- System | Widget section -->
         <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
         <item name="android:windowNoTitle">true</item>
 
+        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+
     </style>
 
-    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="DocumentsDefaultTheme" parent="DocumentsDefaultTheme.Base">
+    </style>
 
+    <style name="DocumentsDefaultTheme.Base" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- This only used by support lib, not allow to overlay -->
         <item name="windowActionBar">false</item>
         <item name="windowActionModeOverlay">true</item>
 
         <!-- For material design widget, chips, buttons, not support attr-->
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
 
         <!-- TODO need to solve the error handle in GridItemThumbnail -->
-        <item name="gridItemTint">@color/item_doc_grid_tint</item>
+        <item name="gridItemTint">@color/accent</item>
 
         <item name="actionBarTheme">@style/ActionBarTheme</item>
         <item name="actionModeStyle">@style/ActionModeStyle</item>
         <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
         <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
@@ -72,5 +82,9 @@
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="queryBackground">@color/menu_search_background</item>
         <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
     </style>
 </resources>
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index 824d2090e8938d32c02d8de6825febc9216d1661..1e516a7c66012f207293621c77e731688e97957d 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -432,9 +432,8 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
             showDebugMessage();
         } else {
             mActivity.getActionBar().setBackgroundDrawable(new ColorDrawable(
-                    mActivity.getResources().getColor(R.color.primary)));
-            mActivity.getWindow().setStatusBarColor(
-                    mActivity.getResources().getColor(android.R.color.background_dark));
+                    mActivity.getResources().getColor(R.color.color_default_primary_dark)));
+            mActivity.getWindow().setStatusBarColor(mActivity.getResources().getColor(R.color.color_default_primary_dark));
         }
     }
 
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 460e582a1d9a5541039cd7159f6f21f66ec4d432..1f1763f7ef730aeb0b7ba31f9bf268677c402cec 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -401,13 +401,13 @@ public abstract class BaseActivity
             return insets.consumeSystemWindowInsets();
         });
 
-        getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
+        /*getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
         if (Build.VERSION.SDK_INT >= 29) {
             getWindow().setNavigationBarColor(Color.TRANSPARENT);
             getWindow().setNavigationBarContrastEnforced(true);
         } else {
             getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
+        }*/
     }
 
     @Override
@@ -902,7 +902,7 @@ public abstract class BaseActivity
      * */
 
     private int fetchAccentColor() {
-        int color=getResources().getColor(R.color.color_default_blue1);
+        int color=getResources().getColor(R.color.accent);
         return color;
     }
 
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 15692482b4e92524350cfb4cee2bf1a164cd0cd9..b6c4f9640ab9dd9cfd2b1ba24df32417cf939c27 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -18,6 +18,7 @@ package com.android.documentsui;
 
 import static com.android.documentsui.base.SharedMinimal.DEBUG;
 
+import android.graphics.Color;
 import android.app.Activity;
 import android.content.res.TypedArray;
 import android.util.Log;
@@ -269,7 +270,7 @@ public abstract class DrawerController implements DrawerListener {
         int color=activity.getResources().getColor(R.color.accent);
 
         toolbar.setBackgroundColor(color);
-        toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
+        toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_view_on_accent));
 
         return color;
     }
diff --git a/src/com/android/documentsui/GridItemThumbnail.java b/src/com/android/documentsui/GridItemThumbnail.java
index 6348148fdafe935581641a11d9baa0a92e4d711a..14ac232c7e23f4f5537115ff1fbbde527e6116ea 100644
--- a/src/com/android/documentsui/GridItemThumbnail.java
+++ b/src/com/android/documentsui/GridItemThumbnail.java
@@ -39,7 +39,7 @@ public class GridItemThumbnail extends ImageView {
         TypedArray ta = context.obtainStyledAttributes(R.styleable.GridItem);
         ColorStateList color = ta.getColorStateList(R.styleable.GridItem_gridItemTint);
         ta.recycle();
-        setImageTintList(color);
+        //setImageTintList(color);
     }
 
     @Override
diff --git a/src/com/android/documentsui/IconUtils.java b/src/com/android/documentsui/IconUtils.java
index 46d0321242860ef7e2a7ea081d184e86139d9e0a..8caec1d106baecdba4162794383bf4fc4ea7050f 100644
--- a/src/com/android/documentsui/IconUtils.java
+++ b/src/com/android/documentsui/IconUtils.java
@@ -21,7 +21,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ProviderInfo;
 import android.graphics.drawable.Drawable;
 import android.util.TypedValue;
-
+import com.android.documentsui.R;
 import com.android.documentsui.base.MimeTypes;
 
 public class IconUtils {
@@ -53,7 +53,8 @@ public class IconUtils {
      */
     public static Drawable loadMimeIcon(Context context, String mimeType) {
         if (mimeType == null) return null;
-        return context.getContentResolver().getTypeInfo(mimeType).getIcon().loadDrawable(context);
+        Drawable drawable = context.getContentResolver().getTypeInfo(mimeType).getIcon().loadDrawable(context);
+        return applyTintColor(context, drawable, R.color.accent);
     }
 
     public static Drawable applyTintColor(Context context, int drawableId, int tintColorId) {
diff --git a/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java b/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java
index a1963645bf760e232960ca8f5874320ac1399ddc..7a0fc016f81d9d2a1e79edb516aaf5f4bfec29aa 100644
--- a/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java
+++ b/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java
@@ -42,13 +42,13 @@ public class DocumentsSwipeRefreshLayout extends SwipeRefreshLayout {
     public DocumentsSwipeRefreshLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        final int[] styledAttrs = {android.R.attr.colorPrimary};
+        final int[] styledAttrs = {R.color.accent};
 
         TypedArray a = context.obtainStyledAttributes(styledAttrs);
         @ColorRes int colorId = a.getResourceId(0, -1);
         if (colorId == -1) {
             Log.w(TAG, "Retrive colorPrimary colorId from theme fail, assign R.color.primary");
-            colorId = R.color.primary;
+            colorId = R.color.accent;
         }
         a.recycle();
         setColorSchemeResources(colorId);
diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
index 7575354f510cb81aa3ba1f10f74a2b48402be14f..bd0a7eea1782645eb0f221d25916e8eaadf40a9b 100644
--- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
@@ -73,12 +73,11 @@ final class GridDirectoryHolder extends DocumentHolder {
 
         if(selected){
             mlayout_grid_item.setBackgroundColor(BaseActivity.accentColor);
-            mTitle.setTextColor(context.getResources().getColor(R.color.window_background));
-            mIconCheck.setColorFilter(context.getResources().getColor(R.color.window_background), android.graphics.PorterDuff.Mode.SRC_IN);
+            mTitle.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent));
         }
         else {
-            mlayout_grid_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background));
-            mTitle.setTextColor(context.getResources().getColor(R.color.item_title));
+            mlayout_grid_item.setBackgroundColor(context.getResources().getColor(R.color.color_default_background));
+            mTitle.setTextColor(context.getResources().getColor(R.color.color_default_primary_text));
 
         }
 
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index 3fc1f8e6ec2acc996d1431484f0de2ee7374258a..309548f4bd9ed15105a366ad023710d81357242e 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -113,12 +113,17 @@ final class ListDocumentHolder extends DocumentHolder {
 
         if(selected){
             layout_list_item.setBackgroundColor(BaseActivity.accentColor);
-            mTitle.setTextColor(context.getResources().getColor(R.color.window_background));
-            mIconCheck.setColorFilter(context.getResources().getColor(R.color.window_background), android.graphics.PorterDuff.Mode.SRC_IN);
+            mTitle.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent));
+            mSize.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent));
+            mDate.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent));
+            mType.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent));
         }
         else {
-            layout_list_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background));
-            mTitle.setTextColor(context.getResources().getColor(R.color.item_title));
+            layout_list_item.setBackgroundColor(context.getResources().getColor(R.color.color_default_background));
+            mTitle.setTextColor(context.getResources().getColor(R.color.color_default_primary_text));
+            mSize.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text));
+            mDate.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text));
+            mType.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text));
         }
 
     }
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index d93e5dbac6b40c70f0038e15848d45473c303d50..7f13db55c886b1864d79f6d82cc18faee449a3a1 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -108,7 +108,7 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons
                 mInjector.selectionMgr,
                 mDrawer,
                 this::focusSidebar,
-                getColor(R.color.primary));
+                getColor(R.color.color_default_selector));
 
         mInjector.menuManager = new MenuManager(
                 mInjector.features,
diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index f7c2c8de5cc223aebd3f919e04544eb876ad88fc..f0b3b327f159231cc5d90a9d7c98dbdce66d5f54 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -101,12 +101,12 @@ public class InspectorActivity extends AppCompatActivity {
             return insets;
         });
 
-        getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
+        /*getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
         if (Build.VERSION.SDK_INT >= 29) {
             getWindow().setNavigationBarColor(Color.TRANSPARENT);
             getWindow().setNavigationBarContrastEnforced(true);
         } else {
             getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
+        }*/
     }
 }
\ No newline at end of file
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index 57969e0c2752cb92c489910622cb3c1d084a0081..b166ec76fe41b7659b25a8c80a9055a31a3c2bfd 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -106,7 +106,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {
                 mInjector.selectionMgr,
                 mDrawer,
                 this::focusSidebar,
-                getColor(R.color.primary));
+                getColor(R.color.color_default_selector));
 
         mInjector.menuManager = new MenuManager(mSearchManager, mState, new DirectoryDetails(this));
 
diff --git a/src/com/android/documentsui/ui/Snackbars.java b/src/com/android/documentsui/ui/Snackbars.java
index 5d6e012e8ec52f5931e5a1ba308484fe20467772..a4fed7f4859aa58e88687c2b2ffe063e775e24ff 100644
--- a/src/com/android/documentsui/ui/Snackbars.java
+++ b/src/com/android/documentsui/ui/Snackbars.java
@@ -20,7 +20,7 @@ import android.app.Activity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
-
+import androidx.core.content.ContextCompat;
 import androidx.annotation.StringRes;
 
 import com.android.documentsui.R;
@@ -111,6 +111,13 @@ public final class Snackbars {
     public static final Snackbar makeSnackbar(
             Activity activity, CharSequence message, int duration) {
         final View view = activity.findViewById(R.id.container_save);
-        return Snackbar.make(view, message, duration);
+        Snackbar snackbar = Snackbar.make(view, message, duration);
+
+        View snackbarView = snackbar.getView();
+        snackbarView.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
+        TextView tv = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
+        tv.setTextColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_text));
+        tv.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
+        return snackbar;
     }
 }
diff --git a/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java b/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java
index 33938a234a7da39efeffbbc672cdd6221ce596a2..81ae733558ae9d98c99b42bb938992847971575d 100644
--- a/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java
+++ b/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java
@@ -48,7 +48,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
     @Test
     public void themeNightModeEnable_actionBarColorShouldBeDark() {
         assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorBackground,
-                mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
+                mTheme.getResources().getColor(com.android.documentsui.R.color.color_default_background,
                         mTheme));
     }
 
@@ -73,14 +73,14 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
     @Test
     public void themeNightModeEnable_windowBackgroundColorShouldBeDark() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_windowBackground,
-                mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
+                mTheme.getResources().getColor(com.android.documentsui.R.color.color_default_background,
                         mTheme));
     }
 
     @Test
     public void themeNightModeEnable_statusBarColorShouldBeDark() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,
-                mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
+                mTheme.getResources().getColor(com.android.documentsui.R.color.color_default_background,
                         mTheme));
     }