diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_launcher_background.png b/res/drawable-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..64b7edb6bdfea9808b9faac5e70de973cba5d7a8
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_background.png differ
diff --git a/res/drawable-hdpi/ic_launcher_foreground.png b/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..81ea2c5d223ce6941da1b304847e72820dfb3c7f
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-mdpi/ic_launcher_background.png b/res/drawable-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7acb2b47353094400346e1efc403d236eebee4
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_background.png differ
diff --git a/res/drawable-mdpi/ic_launcher_foreground.png b/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8e7184627265f353809396a040d83465cd280f
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_background.png b/res/drawable-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..680ddf5995eca0f5f17d2fa981f634338d895e8d
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_foreground.png b/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..35934bb8a26fe97391fd03b66f035dad77505e7c
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_background.png b/res/drawable-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a1a1eb0c1474b1f7d1e84ec2d2bf74fd345cf47
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_foreground.png b/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..96249c085124cded633fee3f478b824137a8b819
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxxhdpi/ic_launcher_background.png b/res/drawable-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..16f4ea1970a1b401b479bb334834d51d28b0f299
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xxxhdpi/ic_launcher_foreground.png b/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e6ca1bee5e3b2d66f5c7b4430bbf636ef506f3a
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 452f45a3ad5508dc3bee9dd4486ea9faeb12977d..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#0092E4"/>
-  <path
-      android:pathData="M60,70m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
-      android:fillColor="#CBDEFB"/>
-</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 7ce0be9048f8ab8f0bd44d93f22abf6439a0d62c..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 38f9fbb9b1e2f42ccf23ee783d5fb2a6b86560dc..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38ZM75,68V51.264C70.891,47.97 65.676,46 60,46C47.08,46 36.545,56.209 36.02,69H74C74.552,69 75,68.552 75,68Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
index c94d155a5f39464adc9cb70ccb2cd512f5125f2b..157e622321a73d3431bd24f29c2041a4692d719a 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
@@ -16,7 +16,7 @@
   -->
 
 <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_selected="true" android:color="@*android:color/e_alpha_accent"/>
+    <item android:state_enabled="true" android:color="@*android:color/e_action_bar"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
 </selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/bottom_sheet_dialog_background.xml b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/bottom_sheet_dialog_background.xml
index 703667a52423ac8aef3b3576999f5155fb99f419..f3f7bb930fedc9e62cd8fe0aaf77fcdcbdf7e9ed 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/bottom_sheet_dialog_background.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/bottom_sheet_dialog_background.xml
@@ -15,7 +15,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?android:attr/colorBackground" />
+    <solid android:color="?android:attr/colorBackgroundFloating" />
 
     <corners android:topLeftRadius="@dimen/grid_item_radius"
              android:topRightRadius="@dimen/grid_item_radius"
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_arrow_back.xml b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_arrow_back.xml
index 1a9993033240dffb18681a538d51f4ac8d01fb9f..4ccac591f8a9942d1366889364fc47a02df59cad 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_arrow_back.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorControlNormal"
+        android:fillColor="@*android:color/e_primary_text_color"
         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/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_hamburger.xml b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_hamburger.xml
index bc273524ba973bce677a3975297e79d28abe813c..09e9782d822e2cc2ece7994f92f61dadfc989245 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_hamburger.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_hamburger.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@*android:color/e_primary_text_color"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
 </vector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/list_divider.xml b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/list_divider.xml
index 5067af08e842dd9fc197a8f8d3f618c343c1b768..de96b1f12df9b083d9180caf9fc1dde49d4a0296 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/drawable/list_divider.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/drawable/list_divider.xml
@@ -15,7 +15,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:tint="?android:attr/colorForeground">
+       android:tint="@android:color/transparent">
     <solid android:color="@color/list_divider_color" />
     <size
         android:height="1dp"
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
index d08c17d9fae3a80794c0aa73aaabf7a7306f8b17..52cb68ad262c80e3ec01035ed233d27b458042a4 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
@@ -79,13 +79,13 @@
             android:layout_gravity="start"
             android:orientation="vertical"
             android:elevation="0dp"
-            android:background="?android:attr/colorBackground">
+            android:background="@*android:color/e_drawer_background">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/roots_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@*android:color/e_drawer_background"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
                 app:titleTextColor="?android:colorAccent"/>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
index cba4ecb9a467c25c1d892f39317b872ea7b40efc..c3446f4944e80da98a7e9913b062b349fb9121fa 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
@@ -44,8 +44,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:backgroundTint="@color/fragment_pick_button_background_color"
-            android:textColor="@color/fragment_pick_button_text_color"
             android:layout_marginEnd="4dp" />
 
         <!-- Handles touch events when button1 is disabled. -->
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
index 8763351c9f33b27ca4cb3217b777a13deb006cc8..4d531b1970892c35648ad6bddc547467bc3277c0 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
@@ -55,7 +55,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@*android:color/e_action_bar"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
@@ -76,7 +76,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bottom_sheet_dialog_background"
+            android:background="@color/app_background_color"
             android:paddingBottom="5dp">
 
             <com.android.documentsui.inspector.DetailsView
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
index 94a092790a434286dc3d091a32e1cc6318f70afd..d50ccf09602d037ef51ae70a0570642fefe78d27 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
@@ -24,6 +24,6 @@
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
         android:alpha="0.0"
-        android:background="?android:colorBackgroundFloating" />
+        android:background="?android:colorBackground" />
 
 </RelativeLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
index 9874d8a4cf3ce3396bfcd60e89da83de24289a4f..fc564688f4fdcf0d1cd9938ae2d5fa88273800be 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
@@ -14,14 +14,8 @@
      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>
-
     <color name="empty_state_text_color">@android:color/white</color>
     <color name="error_image_color">@android:color/white</color>
 
@@ -32,7 +26,6 @@
     <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
 
     <color name="list_divider_color">#9aa0a6</color>
-    <color name="list_item_selected_background_color">?android:colorSecondary</color>
 
     <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
 
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml
index 8ade73172dd2fdfff1ce649528d6356ad1ad73d3..ddf2dcd0278b53d0f53542362831e510a8a7a175 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/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/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
index c82ff581433ae77f8b0a17c02869e6e37d368bff..5c64448bb75be1969a760cf6fe7b90f92b0f8de8 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
@@ -39,7 +39,7 @@
   <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
     <item name="android:textAppearance">@style/MaterialButtonTextAppearance
     </item>
-    <item name="android:backgroundTint">@android:color/white</item>
+    <item name="android:backgroundTint">@*android:color/e_floating_background</item>
     <item name="android:textColor">?android:colorAccent</item>
   </style>
 
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
index 6ccaa6faff2c0472a7205dec24002ed98022e258..8d1fb6e3aaeb9cee379251b0584f80b9cb8fa202 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
@@ -18,13 +18,13 @@
        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="app_background_color">@*android:color/e_background</color>
+  <color name="background_floating">@*android:color/e_floating_background</color>
   <color name="nav_bar_translucent">#99FFFFFF</color>
 
-  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+  <color name="primary">@*android:color/e_accent</color> <!-- Blue 600 -->
+  <color name="secondary">@*android:color/e_alpha_accent</color> <!-- Blue 50 -->
+  <color name="hairline">@*android:color/e_stroke_color</color>
 
   <color name="chip_background_disable_color">#fff1f3f4</color>
   <color name="menu_search_background">@android:color/transparent</color>
@@ -55,7 +55,7 @@
   <color name="list_divider_color">#1f000000</color>
   <color name="list_item_selected_background_color">?android:colorSecondary
   </color>
-  <color name="color_surface_header">@color/app_background_color</color>
+  <color name="color_surface_header">@*android:color/e_action_bar</color>
 
   <color name="tab_selected_text_color">@color/primary</color>
   <color name="work_profile_button_stroke_color">@color/primary</color>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
index 1efd1d5d188c41cf57465e28cc9fa5b624e48a89..6576d445de920f36e32b68882159a2fe7faab8a8 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
@@ -24,6 +24,7 @@
              override this -->
         <item name="android:actionMenuTextColor">?android:textColorPrimary</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <!-- This gets overridden for specific platform versions and/or configs -->
@@ -37,7 +38,7 @@
     </style>
 
     <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardBackgroundColor">@*android:color/e_floating_background</item>
         <item name="cardPreventCornerOverlap">false</item>
         <item name="cardCornerRadius">@dimen/grid_item_radius</item>
         <item name="cardElevation">@dimen/grid_item_elevation</item>
@@ -69,7 +70,6 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
@@ -113,6 +113,8 @@
     </style>
 
     <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
+        <item name="colorSurface">@color/background_floating</item>
+        <item name="elevationOverlayEnabled">false</item>
         <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
         <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
index 4433742822b46e7185983101213cb601478ccf4c..696df2171dc9d1fb61579225aa64c2cffbd8acbf 100644
--- a/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
@@ -22,13 +22,13 @@
     <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">@*android:color/e_action_bar</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:colorControlHighlight">@*android:color/e_alpha_accent</item>
         <item name="android:colorControlActivated">@color/primary</item>
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorSecondary">@color/secondary</item>
@@ -36,16 +36,18 @@
 
         <!-- 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:statusBarColor">@*android:color/e_action_bar</item>
+        <item name="android:navigationBarColor">@*android:color/e_action_bar</item>
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
         <item name="android:windowNoTitle">true</item>
+        <item name="android:textColorPrimary">@*android:color/e_primary_text_color</item>
+        <item name="android:textColorSecondary">@*android:color/e_secondary_text_color</item>
 
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
     </style>
 
     <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff94fc2cd9353409539d491f43b91966a5..4b6f4091fc06368abc8f782076dc4af7361fe5cc 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright Murena SAS 2024
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 94ec91d8bae6cb32ea12a4ca7f224bc509507483..aaf393827466e631a5aea72d301f281aa9856178 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -624,12 +624,6 @@ public abstract class BaseActivity
                 });
 
         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/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index 948d66fb27c213b052e6600c816538cfaebd28f6..42759526111f7273c040fa769548bda38bca4748 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -119,11 +119,5 @@ public class InspectorActivity extends AppCompatActivity {
         });
 
         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