diff --git a/res/drawable/ic_doc_folder.xml b/res/drawable/ic_doc_folder.xml
index dcbce010810edef6e7197a2a662ea31f4f0cc409..21c3bb2138cc47f9d1837797ee69398436605d6a 100644
--- a/res/drawable/ic_doc_folder.xml
+++ b/res/drawable/ic_doc_folder.xml
@@ -17,7 +17,9 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="#FF737373"
         android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml
index 126256365804fe81ca02517072aa7f3507ba45e4..0fb43d4248097a07ab545022580765389cf7f9e6 100644
--- a/res/drawable/ic_doc_image.xml
+++ b/res/drawable/ic_doc_image.xml
@@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="#FFDB4437"
         android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z"/>
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 7cda32e469e170d3c688c740ea6da71017bdedef..97cd27f2ce4b245423ff56c4fa2d6d736d931f70 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_hamburger_alpha"
-    android:tint="?android:attr/colorControlNormal" />
+    android:tint="@color/color_default_blue1" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0ae5a0e2472e1e4a7ba00f769df708ec9cb037a3..4c1d85b6c9c54e2e36cf84495a6d65db9b202037 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,14 +24,14 @@
     <color name="directory_background">#fff7f7f7</color>
     <color name="menu_search_background">@android:color/transparent</color>
 
-    <color name="primary_dark">#ff254FAE</color>
+    <color name="primary_dark">@color/color_default_foreground</color>
     <color name="primary">@color/tool_bar_color</color>
     <!--<color name="accent">@color/tool_bar_color</color>-->
-    <color name="accent">@*android:color/accent_device_default</color>
+    <color name="accent">@lineageos.platform:color/color_default_accent</color>
 <!--    <color name="colorAccent">@*android:color/accent_device_default</color>-->
-    <color name="accent_dark">@*android:color/accent_device_default_dark</color>
+    <color name="accent_dark">@lineageos.platform:color/color_default_accent</color>
 
-    <color name="text_cursor">@*android:color/white</color>
+    <color name="text_cursor">@color/accent</color>
     <color name="text_handle">#FF82B1FF</color>     <!--Blue A100-->
     <color name="text_highlight">#FF82B1FF</color>  <!--Blue A100-->
 
@@ -50,7 +50,7 @@
     <color name="root_icon_color">#ff5a5a5a</color>
     <item name="root_icon_disabled_alpha" format="float" type="dimen">@*android:dimen/disabled_alpha_material_light</item>
     <color name="doc_icon_color">#ff5a5a5a</color>
-    <color name="tool_bar_color">#ff1A73E8</color>
+    <color name="tool_bar_color">@color/color_default_foreground</color>
 
     <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->
     <color name="item_doc_title">#ff333333</color>
@@ -83,4 +83,12 @@
     <color name="inspector_section_title">#ff939393</color>
     <color name="inspector_section_divider">#E0E0E0</color>
     <color name="inspector_title_background">#40000000</color>
+
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</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>
+
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 950b9034545d81d3b2dd71863a891ba78f13f48e..66ffa33b123fc6dda62e942dfa8c413a48cb14db 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,16 +17,23 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="android:colorControlNormal">@android:color/white</item>
+        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
         <item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
         <item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
         <item name="android:textCursorDrawable">@drawable/text_cursor</item>
         <item name="android:textColorHighlight">@color/text_highlight</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+
+        <item name="android:textColorSecondary">@color/color_default_primary_text</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
     </style>
     <style name="ActionBarPopupTheme" parent="@style/Theme.AppCompat.DayNight" />
 
+    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/color_default_primary_text</item>
+    </style>
+
     <style name="DocumentsTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="actionBarWidgetTheme">@null</item>
         <item name="actionBarTheme">@style/ActionBarTheme</item>
@@ -46,8 +53,13 @@
         <item name="android:windowNoTitle">true</item>
 
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+        <!--statusbar icons color-->
+        <item name="android:windowLightStatusBar">true</item>
+
     </style>
 
+
+
     <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
         <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
         <item name="android:minHeight">3dp</item>
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 13e25123389de20dbda14ea1a5468c99ff79fb0e..7569b39a12c744e1a2b03b948d0856d845026bc8 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -694,30 +694,9 @@ public abstract class BaseActivity
 
     private int fetchAccentColor() {
         int color=getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-       //toolbar change color to accent color
-        toolbar.setBackgroundColor(color);
-
-        //change status bar color
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(darkenColor(color));
-        }
-
         return color;
     }
 
 
-    int darkenColor(int color) {
-        float[] hsv = new float[3];
-        android.graphics.Color.colorToHSV(color, hsv);
-        hsv[2] *= 0.8f;
-        return android.graphics.Color.HSVToColor(hsv);
-    }
 
 }
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 51dbda611423724c901063a1abffba96a321341d..0f22f7364d7b4a0ea3b08bdd7541a8602ebf3e91 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -34,6 +34,7 @@ import android.widget.Toolbar;
 
 import com.android.documentsui.base.Display;
 
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -57,7 +58,7 @@ public abstract class DrawerController implements DrawerListener {
      * Returns a controller suitable for {@code Layout}.
      */
     public static DrawerController create(Activity activity, ActivityConfig activityConfig) {
-        accentColor=fetchAccentColor(activity);
+
         DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);
 
         if (layout == null) {
@@ -67,11 +68,6 @@ public abstract class DrawerController implements DrawerListener {
         View drawer = activity.findViewById(R.id.drawer_roots);
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
 
-
-        if(accentColor!=0){
-            toolbar.setBackgroundColor(accentColor);
-        }
-
         drawer.getLayoutParams().width = calculateDrawerWidth(activity);
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -81,6 +77,9 @@ public abstract class DrawerController implements DrawerListener {
                 R.string.drawer_open,
                 R.string.drawer_close);
 
+
+        accentColor=fetchAccentColor(activity, toolbar, toggle);
+
         return new RuntimeDrawerController(layout, drawer, toggle, toolbar, activityConfig);
     }
 
@@ -204,6 +203,7 @@ public abstract class DrawerController implements DrawerListener {
         @Override
         void setTitle(String title) {
             mToolbar.setTitle(title);
+            //mToolbar.setTitleTextColor(mActivity.getResources().getColor(R.color.color_default_foreground));
         }
 
         @Override
@@ -273,15 +273,13 @@ public abstract class DrawerController implements DrawerListener {
      * get Accent color from OS
      * */
 
-    private static int fetchAccentColor(Activity activity) {
+    private static int fetchAccentColor(Activity activity, Toolbar toolbar, ActionBarDrawerToggle toggle) {
 
         int color=activity.getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
+
+        toolbar.setBackgroundColor(color);
+        toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
+
         return color;
     }
 }
diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index 59d5c8e855f88b0ab0e02ba25157a8acf1656e6f..7e288c44834b001bbe02b5297a0714876a6f524f 100644
--- a/src/com/android/documentsui/files/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -182,12 +182,6 @@ public class LauncherActivity extends Activity {
 
     private int fetchAccentColor() {
         int color=getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
         return color;
     }