diff --git a/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml b/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml
new file mode 100644
index 0000000..55901b8
--- /dev/null
+++ b/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml
@@ -0,0 +1,44 @@
+<?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="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: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: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/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml b/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml
new file mode 100644
index 0000000..c6ba6bf
--- /dev/null
+++ b/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml
@@ -0,0 +1,80 @@
+<?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>
+    <style name="LauncherTheme" parent="DocumentsTheme">
+        <item name="android:windowBackground">@drawable/launcher_screen</item>
+    </style>
+    <!-- DocumentsTheme is allow customize by run time overlay -->
+    <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>
+
+        <!-- Color section -->
+        <item name="android:colorAccent">@color/primary</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>
+
+        <!-- System | Widget section -->
+        <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:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+
+        <!-- OEM should not overlay this attr -->
+        <item name="android:windowNoTitle">true</item>
+
+    </style>
+
+    <style name="DocumentsDefaultTheme" 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/primary</item>
+
+        <!-- TODO need to solve the error handle in GridItemThumbnail -->
+        <item name="gridItemTint">@color/item_doc_grid_tint</item>
+
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeStyle">@style/ActionModeStyle</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
+        <item name="materialButtonStyle">@style/MaterialButton</item>
+        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
+        <item name="materialCardViewStyle">@style/CardViewStyle</item>
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="queryBackground">@color/menu_search_background</item>
+        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
+    </style>
+
+    <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="colorPrimary">@color/edge_effect</item>
+    </style>
+</resources>
diff --git a/overlay/common/packages/apps/DocumentsUI/res/values/config.xml b/overlay/common/packages/apps/DocumentsUI/res/values/config.xml
deleted file mode 100644
index b3cfce3..0000000
--- a/overlay/common/packages/apps/DocumentsUI/res/values/config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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>
-    <bool name="show_documents_root">true</bool>
-</resources>