diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f01e7779057d55c3e2f9d091c60879e100af9deb
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,7 @@
+stages:
+  - update-from-upstream
+
+include:
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index c94d155a5f39464adc9cb70ccb2cd512f5125f2b..8da4bb55362dc0466a16378ec512189675f98176 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
+    <item android:state_enabled="true" android:color="@lineageos.platform:color/color_default_primary_dark"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/search_chip_stroke_color.xml b/res/color/search_chip_stroke_color.xml
index be169354eb62d3ce6d71250df4561a694b7c4548..a2875bb8cd85971b8192936d2023b78458ff52ca 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="?android:strokeColor"/>
+    <item android:state_enabled="true" android:color="@lineageos.platform:color/color_default_accent"/>
     <item android:state_enabled="false" android:color="@android:color/transparent"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/inspector_separator.xml b/res/drawable/inspector_separator.xml
index cbb494a1d4832c550dc2b72461003aadd9f037d8..70e7ba380fe913da6cb186b13e9e20b1a76fbe00 100644
--- a/res/drawable/inspector_separator.xml
+++ b/res/drawable/inspector_separator.xml
@@ -19,6 +19,6 @@
     <shape xmlns:android="http://schemas.android.com/apk/res/android"
            android:tint="?android:attr/colorForeground">
         <size android:height="1dp"/>
-        <solid android:color="#1f000000"/>
+        <solid android:color="@lineageos.platform:color/color_default_divider"/>
     </shape>
 </inset>
\ No newline at end of file
diff --git a/res/layout-sw720dp/directory_app_bar.xml b/res/layout-sw720dp/directory_app_bar.xml
index 92865979390a6d1f9bddbe6a7ad31c8c96000fd5..7d4e4fc12b51f9ced77a09c624f3f622623529f6 100644
--- a/res/layout-sw720dp/directory_app_bar.xml
+++ b/res/layout-sw720dp/directory_app_bar.xml
@@ -20,7 +20,7 @@
     android:id="@+id/app_bar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/colorBackground">
+    android:background="@lineageos.platform:color/color_default_primary_dark">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
diff --git a/res/layout-sw720dp/item_doc_list.xml b/res/layout-sw720dp/item_doc_list.xml
index c19e69750def34e4b961cd09f65fb85523a2e61f..d7f35f2f54046fba1472a0d1bbeac21c4d5613b9 100644
--- a/res/layout-sw720dp/item_doc_list.xml
+++ b/res/layout-sw720dp/item_doc_list.xml
@@ -46,6 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@null"
+                android:tint="@lineageos.platform:color/color_default_accent"
                 android:scaleType="centerInside" />
 
             <ImageView
diff --git a/res/layout/dialog_sorting.xml b/res/layout/dialog_sorting.xml
index d8cb7364c08de93a00a0ec3abea07ef0234fd124..38be08f4005cfb6f8e178c90c46a8448d1ca903d 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="@lineageos.platform: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 3225ce59903035c9d81e0b9dd5bccdaff36ed615..22101131bf8334a92c669d3e2d8e2c522b83b28f 100644
--- a/res/layout/directory_app_bar.xml
+++ b/res/layout/directory_app_bar.xml
@@ -27,6 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="3dp"
+        android:background="@lineageos.platform:color/color_default_primary_dark"
         app:titleEnabled="false"
         app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
 
@@ -42,7 +43,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="@lineageos.platform:color/color_default_primary_dark"
             app:layout_collapseMode="pin"/>
 
         <androidx.appcompat.widget.Toolbar
@@ -50,7 +51,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="@lineageos.platform:color/color_default_primary_dark"
             android:theme="?actionBarTheme"
             android:popupTheme="?actionBarPopupTheme"
             android:elevation="3dp"
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index 94c52e978440b025187b7db6bb6f7ece9acc1cb9..c68583237b2354461d5c71f37efac37b4f3cfd51 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -25,7 +25,7 @@
         android:id="@+id/horizontal_breadcrumb"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/colorBackground"/>
+        android:background="@lineageos.platform:color/color_default_primary_dark"/>
 
     <!-- used for search chip. -->
     <include layout="@layout/search_chip_row"/>
diff --git a/res/layout/fixed_layout.xml b/res/layout/fixed_layout.xml
index fb2cb2452a5c3d5bcc4aba1c86ca7e68710df22c..52e3dc15bda25db9c0badc5b043d4ee56f4f6eb9 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="@lineageos.platform:color/color_default_primary_dark"
             android:elevation="3dp"
             android:theme="?actionBarTheme"
             android:popupTheme="?actionBarPopupTheme"
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
index df28d4968651e9800db0e17b871f898690de2caa..17946fe154ea01143ccd2bd66f6819001279fadf 100644
--- a/res/layout/inspector_activity.xml
+++ b/res/layout/inspector_activity.xml
@@ -25,11 +25,12 @@
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground">
+        android:background="@lineageos.platform:color/color_default_primary_dark">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@lineageos.platform:color/color_default_primary_dark"
             android:minHeight="?android:attr/actionBarSize"
             app:titleEnabled="false"
             app:statusBarScrim="@android:color/transparent"
@@ -46,6 +47,7 @@
 
                 <com.android.documentsui.inspector.HeaderView
                     android:id="@+id/inspector_header_view"
+                    android:background="@lineageos.platform: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="@lineageos.platform:color/color_default_primary_dark"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
diff --git a/res/layout/inspector_header.xml b/res/layout/inspector_header.xml
index 94a092790a434286dc3d091a32e1cc6318f70afd..20eee02d2b5bc5ea84e5546639d810316231936f 100644
--- a/res/layout/inspector_header.xml
+++ b/res/layout/inspector_header.xml
@@ -24,6 +24,7 @@
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
         android:alpha="0.0"
+        android:tint="@lineageos.platform:color/color_default_accent"
         android:background="?android:colorBackgroundFloating" />
 
 </RelativeLayout>
diff --git a/res/layout/item_dir_grid.xml b/res/layout/item_dir_grid.xml
index 269dd07827c38a7dfd261a14cbd80e720cc23a0e..8eaf636f6e6a19bf8648f868bb95de8c704bb4a4 100644
--- a/res/layout/item_dir_grid.xml
+++ b/res/layout/item_dir_grid.xml
@@ -65,6 +65,7 @@
                     android:layout_height="@dimen/grid_item_icon_size"
                     android:layout_gravity="center"
                     android:contentDescription="@null"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="centerInside"/>
 
                 <ImageView
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index 1189482a28e1919bec3f597caa3f2116bf643a80..92aa7466f741bc1f18366412776bc3267440e05c 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -49,6 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@null"
+                android:tint="@lineageos.platform:color/color_default_accent"
                 android:scaleType="centerInside" />
 
             <ImageView
diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml
index cb679931384cf507951b71b57a13e24501bd1966..00d6809948d7349bdee2855639bec45a398189f2 100644
--- a/res/layout/search_chip_item.xml
+++ b/res/layout/search_chip_item.xml
@@ -31,4 +31,5 @@
     app:iconStartPadding="@dimen/search_chip_icon_padding"
     app:rippleColor="@color/search_chip_ripple_color"
     app:chipMinTouchTargetSize="@dimen/button_touch_size"
+    app:chipIconTint="@lineageos.platform:color/color_default_accent"
 />
\ No newline at end of file
diff --git a/res/menu/sub_menu.xml b/res/menu/sub_menu.xml
index 73a97dc9779336ff71374fb51b2e611b361cc4a2..76a60c3188805e280fbb7795112b9727f2a5872f 100644
--- a/res/menu/sub_menu.xml
+++ b/res/menu/sub_menu.xml
@@ -22,10 +22,12 @@
         android:id="@+id/sub_menu_grid"
         android:title="@string/menu_grid"
         android:icon="@drawable/ic_menu_view_grid"
+        app:iconTint="@lineageos.platform:color/color_default_accent"
         app:showAsAction="always"/>
     <item
         android:id="@+id/sub_menu_list"
         android:title="@string/menu_list"
         android:icon="@drawable/ic_menu_view_list"
+        app:iconTint="@lineageos.platform:color/color_default_accent"
         app:showAsAction="always"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/mipmap-hdpi/ic_background.png b/res/mipmap-hdpi/ic_background.png
deleted file mode 100644
index 3237a8b80ff7533c9ca899ed33b8ef774245e41e..0000000000000000000000000000000000000000
Binary files a/res/mipmap-hdpi/ic_background.png and /dev/null differ
diff --git a/res/mipmap-hdpi/ic_foreground.png b/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index e959f3decd5e74010165d0d33f620337554691c9..0000000000000000000000000000000000000000
Binary files a/res/mipmap-hdpi/ic_foreground.png and /dev/null differ
diff --git a/res/mipmap-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..3240104ab9d12a97b439ecbfd5c027d30bbf65d7
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/res/mipmap-mdpi/ic_background.png b/res/mipmap-mdpi/ic_background.png
deleted file mode 100644
index 5a021dbb574335b5a15f05f7bdd00d0abae8afb5..0000000000000000000000000000000000000000
Binary files a/res/mipmap-mdpi/ic_background.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_foreground.png b/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index 3a0ef8b0ae014c5733b90b470a74f9b666361366..0000000000000000000000000000000000000000
Binary files a/res/mipmap-mdpi/ic_foreground.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher.png b/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..74c1acfda09c867d2eb8fedf082b44fd6809d4cb
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/res/mipmap-xhdpi/ic_background.png b/res/mipmap-xhdpi/ic_background.png
deleted file mode 100644
index 3d05e29aa39f8f0b043febe5e1d9101af7bd0812..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xhdpi/ic_background.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_foreground.png b/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index 1ad4b882bf7243c038d60cdba35806d35182754b..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xhdpi/ic_foreground.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4881058e0f34d65313425fc76b42270f55c2892
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxhdpi/ic_background.png b/res/mipmap-xxhdpi/ic_background.png
deleted file mode 100644
index 069090146e0ff222aa3d9d48e4fe73295853259b..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xxhdpi/ic_background.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_foreground.png b/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index 8ae499783c15518883be6bb9dd71892464f63899..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xxhdpi/ic_foreground.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e318c0330d02076f88b1ad9574388fc3dbb9a19
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxxhdpi/ic_background.png b/res/mipmap-xxxhdpi/ic_background.png
deleted file mode 100644
index fee41062e7b153e26f0aeef98daa1c9a6da4d6e2..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xxxhdpi/ic_background.png and /dev/null differ
diff --git a/res/mipmap-xxxhdpi/ic_foreground.png b/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index bd10015ae8ae3d0a4fa40180d1227561c2c58eb4..0000000000000000000000000000000000000000
Binary files a/res/mipmap-xxxhdpi/ic_foreground.png and /dev/null differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..52f7271dd1c87e18713f00822e18130d58c216dd
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/res/values-sw720dp/colors.xml b/res/values-night/bools.xml
similarity index 77%
rename from res/values-sw720dp/colors.xml
rename to res/values-night/bools.xml
index b39b89409dd94d4d32edc9411fc9ad0e193a1849..8a362691342d1ad303846056139968ace8cba66a 100644
--- a/res/values-sw720dp/colors.xml
+++ b/res/values-night/bools.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
+<!-- Copyright (c) 2021 The LineageOS 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
-
+         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>
-    <color name="menu_search_background">#ff2852ab</color>
+
+    <bool name="is_day">false</bool>
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 86bcbbc4846b0f9648ae0651d3cf8e0bc9a06af5..0c09e10459d3e6a580eed87c8c97b77994ab3b3d 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -14,11 +14,6 @@
      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>
-
-    <color name="primary">#8AB4F8</color>
     <color name="secondary">#3D8AB4F8</color>
     <color name="hairline">#5F6368</color>
 
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8ade73172dd2fdfff1ce649528d6356ad1ad73d3..ddf2dcd0278b53d0f53542362831e510a8a7a175 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -18,30 +18,4 @@
     <style name="LauncherTheme" parent="DocumentsTheme">
         <item name="android:windowBackground">@drawable/launcher_screen_night</item>
     </style>
-    <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/primary</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/mipmap-anydpi/ic_launcher.xml b/res/values/bools.xml
similarity index 70%
rename from res/mipmap-anydpi/ic_launcher.xml
rename to res/values/bools.xml
index d8649ba56640bf9a0f634519d40db702a9fc62cd..3299833ad0a73cfc7b6c2d22c5b5ed8d76c8055f 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/values/bools.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2018 The LineageOS Project
-
+<!-- Copyright (c) 2021 The LineageOS 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.
 -->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_background"/>
-    <foreground android:drawable="@mipmap/ic_foreground"/>
-</adaptive-icon>
+<resources>
 
+    <bool name="is_day">true</bool>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e00984ada249a6a4f4a7b41a8c146b97fba185a7..ac92bb1db61739332737feb5fc84e622b20c338c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,28 +19,28 @@
          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="app_background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="background_floating">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="nav_bar_translucent">@lineageos.platform:color/color_default_primary_dark</color>
 
-    <color name="primary">#1E88E5</color> <!-- Blue 600 -->
+    <color name="primary">@lineageos.platform:color/color_default_accent</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="chip_background_disable_color">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="menu_search_background">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="item_breadcrumb_background_hovered">@lineageos.platform:color/color_default_selector</color>
+    <color name="item_drag_shadow_background">@lineageos.platform: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">@lineageos.platform: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">@lineageos.platform:color/color_default_foreground</color>
+    <color name="band_select_border">@lineageos.platform:color/color_default_foreground</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="downloads_icon_background">@lineageos.platform:color/color_default_accent</color>
+    <color name="app_icon_background">@lineageos.platform:color/color_default_accent</color>
+    <color name="shortcut_foreground">@lineageos.platform:color/color_default_accent</color>
+    <color name="shortcut_background">@lineageos.platform:color/color_default_foreground</color>
 
     <color name="briefcase_icon_color">#1A73E8</color>
     <color name="cross_profile_button_text_color">#1A73E8</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7b90d06dcbec1058e9575de5fddceccccd1a074e..90a7a710e436feeda23b8d03df72d38a15af4eb4 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">?android:textColorSecondary</item>
+        <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:background">@lineageos.platform:color/color_default_primary_dark</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
@@ -59,7 +60,7 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
+        <item name="android:tint">@lineageos.platform:color/color_default_accent</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 59ddec0565403ebb8f0d2eb608f0d7fbfb363c8d..a13fef2eec35f24b709eaad9771a222ddf38b6ee 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,25 +22,26 @@
     <style name="DocumentsTheme" 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">@lineageos.platform:color/color_default_primary_dark</item>
 
         <!-- Color section -->
         <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@android:color/white</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_light</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>
+        <item name="android:strokeColor">@lineageos.platform: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">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:windowLightStatusBar">@bool/is_day</item>
+        <item name="android:windowLightNavigationBar">@bool/is_day</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
@@ -74,6 +75,10 @@
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="queryBackground">@color/menu_search_background</item>
         <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+
+        <item name="android:statusBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@lineageos.platform:color/color_default_primary_dark</item>
     </style>
 
     <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 8c0d9693fda8105c407ce6645d3343c96bb4b772..380f38d4ac276e0beddb3288ed1b6606f0ff8885 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -432,14 +432,6 @@ public abstract class BaseActivity
 
             return insets.consumeSystemWindowInsets();
         });
-
-        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
diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java
index ffd4b7e05790cc0aa371bc86087d3ad804352350..3c307aa790284fc490b1ebfe0025fd31c0eea95e 100644
--- a/src/com/android/documentsui/inspector/DebugView.java
+++ b/src/com/android/documentsui/inspector/DebugView.java
@@ -143,6 +143,9 @@ public class DebugView extends TableView implements DebugDisplay {
     private void put(@StringRes int key, boolean value) {
         KeyValueRow row = put(mRes.getString(key), String.valueOf(value));
         TextView valueView = ((TextView) row.findViewById(R.id.table_row_value));
-        valueView.setTextColor(value ? 0xFF006400 : 0xFF9A2020);
+        if (value) {
+        } else {
+        }
+        valueView.setTextColor(value ? 0XFF38D874 : 0xFFFB3846);
     }
 }
diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index 948d66fb27c213b052e6600c816538cfaebd28f6..8afd5d23d3abcff76307d844f6f4c3c7b7e0a655 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -117,13 +117,5 @@ public class InspectorActivity extends AppCompatActivity {
             container.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
             return insets;
         });
-
-        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