diff --git a/app/src/main/res/color-v31/primary_text_md3_dark.xml b/app/src/main/res/color-v31/primary_text_md3_dark.xml
new file mode 100644
index 00000000..f3908cb2
--- /dev/null
+++ b/app/src/main/res/color-v31/primary_text_md3_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@android:color/system_neutral1_500" />
+    <item android:color="@android:color/system_neutral1_50" />
+</selector>
diff --git a/app/src/main/res/color-v31/primary_text_md3_light.xml b/app/src/main/res/color-v31/primary_text_md3_light.xml
new file mode 100644
index 00000000..3013d087
--- /dev/null
+++ b/app/src/main/res/color-v31/primary_text_md3_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@android:color/system_neutral1_400" />
+    <item android:color="@android:color/system_neutral1_900" />
+</selector>
diff --git a/app/src/main/res/color-v31/secondary_text_md3_dark.xml b/app/src/main/res/color-v31/secondary_text_md3_dark.xml
new file mode 100644
index 00000000..b3151cda
--- /dev/null
+++ b/app/src/main/res/color-v31/secondary_text_md3_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:alpha="?android:disabledAlpha" android:color="@android:color/system_neutral2_200" />
+    <item android:color="@android:color/system_neutral2_200" />
+</selector>
diff --git a/app/src/main/res/color-v31/secondary_text_md3_light.xml b/app/src/main/res/color-v31/secondary_text_md3_light.xml
new file mode 100644
index 00000000..5e5b5871
--- /dev/null
+++ b/app/src/main/res/color-v31/secondary_text_md3_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:alpha="?android:disabledAlpha" android:color="@android:color/system_neutral2_700" />
+    <item android:color="@android:color/system_neutral2_700" />
+</selector>
diff --git a/app/src/main/res/color-v31/tertiary_text_md3_dark.xml b/app/src/main/res/color-v31/tertiary_text_md3_dark.xml
new file mode 100644
index 00000000..50de8eae
--- /dev/null
+++ b/app/src/main/res/color-v31/tertiary_text_md3_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:alpha="?android:disabledAlpha" android:color="@android:color/system_neutral2_400" />
+    <item android:color="@android:color/system_neutral2_400" />
+</selector>
diff --git a/app/src/main/res/color-v31/tertiary_text_md3_light.xml b/app/src/main/res/color-v31/tertiary_text_md3_light.xml
new file mode 100644
index 00000000..41be2965
--- /dev/null
+++ b/app/src/main/res/color-v31/tertiary_text_md3_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ This file is part of LSPosed.
+  ~
+  ~ LSPosed 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.
+  ~
+  ~ LSPosed 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 LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  ~ Copyright (C) 2021 LSPosed Contributors
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:alpha="?android:disabledAlpha" android:color="@android:color/system_neutral2_500" />
+    <item android:color="@android:color/system_neutral2_500" />
+</selector>
diff --git a/app/src/main/res/values-night-v31/colors_custom.xml b/app/src/main/res/values-night-v31/colors_custom.xml
index ff6e2526..49d4dc25 100644
--- a/app/src/main/res/values-night-v31/colors_custom.xml
+++ b/app/src/main/res/values-night-v31/colors_custom.xml
@@ -20,6 +20,18 @@
   -->
 
 <resources>
-    <color name="system">@android:color/system_accent1_200</color>
-    <color name="system_background">@android:color/system_neutral1_800</color>
+    <color name="color_primary_md3">@color/color_primary_md3_dark</color>
+
+    <color name="color_background_md3">@color/color_background_md3_dark</color>
+
+    <color name="color_surface_md3">@color/color_surface_md3_dark</color>
+
+    <color name="color_background_floating_md3">@color/color_background_floating_md3_dark</color>
+
+    <color name="primary_text_md3">@color/primary_text_md3_dark</color>
+    <color name="primary_text_inverse_md3">@color/primary_text_md3_light</color>
+    <color name="secondary_text_md3">@color/secondary_text_md3_dark</color>
+    <color name="secondary_text_inverse_md3">@color/secondary_text_md3_light</color>
+    <color name="tertiary_text_md3">@color/tertiary_text_md3_dark</color>
+    <color name="tertiary_text_inverse_md3">@color/tertiary_text_md3_light</color>
 </resources>
diff --git a/app/src/main/res/values-v31/colors_custom.xml b/app/src/main/res/values-v31/colors_custom.xml
index 366fa2eb..b4760d19 100644
--- a/app/src/main/res/values-v31/colors_custom.xml
+++ b/app/src/main/res/values-v31/colors_custom.xml
@@ -20,6 +20,27 @@
   -->
 
 <resources>
-    <color name="system">@android:color/system_accent1_500</color>
-    <color name="system_background">@android:color/system_neutral1_50</color>
+
+    <color name="color_primary_md3_light">@android:color/system_accent1_600</color>
+    <color name="color_primary_md3_dark">@android:color/system_accent1_200</color>
+    <color name="color_primary_md3">@color/color_primary_md3_light</color>
+
+    <color name="color_surface_md3_light">@android:color/system_neutral1_50</color>
+    <color name="color_surface_md3_dark">@android:color/system_neutral1_900</color>
+    <color name="color_surface_md3">@color/color_surface_md3_light</color>
+
+    <color name="color_background_md3_light">@android:color/system_neutral1_50</color>
+    <color name="color_background_md3_dark">@android:color/system_neutral1_800</color>
+    <color name="color_background_md3">@color/color_background_md3_light</color>
+
+    <color name="color_background_floating_md3_light">@android:color/system_neutral1_50</color>
+    <color name="color_background_floating_md3_dark">@android:color/system_neutral1_800</color>
+    <color name="color_background_floating_md3">@color/color_background_floating_md3_light</color>
+
+    <color name="primary_text_md3">@color/primary_text_md3_light</color>
+    <color name="primary_text_inverse_md3">@color/primary_text_md3_dark</color>
+    <color name="secondary_text_md3">@color/secondary_text_md3_light</color>
+    <color name="secondary_text_inverse_md3">@color/secondary_text_md3_dark</color>
+    <color name="tertiary_text_md3">@color/tertiary_text_md3_light</color>
+    <color name="tertiary_text_inverse_md3">@color/tertiary_text_md3_dark</color>
 </resources>
diff --git a/app/src/main/res/values-v31/themes_custom.xml b/app/src/main/res/values-v31/themes_custom.xml
index 3ca35dc6..b29ac905 100644
--- a/app/src/main/res/values-v31/themes_custom.xml
+++ b/app/src/main/res/values-v31/themes_custom.xml
@@ -20,19 +20,15 @@
 <resources>
 
     <style name="ThemeOverlay.system">
-        <item name="colorPrimary">@color/system</item>
-        <item name="colorBackgroundFloating">@color/system_background</item>
-        <item name="android:colorBackground">@color/system_background</item>
-        <item name="android:windowBackground">@color/system_background</item>
-        <item name="dialogTheme">@style/ThemeOverlay.Material.Dialog.SystemAccent</item>
-        <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog.Alert.SystemAccent</item>
-    </style>
-
-    <style name="ThemeOverlay.Material.Dialog.SystemAccent" parent="ThemeOverlay.Material.Dialog">
-        <item name="android:colorBackground">?colorBackgroundFloating</item>
-    </style>
-
-    <style name="ThemeOverlay.Material.Dialog.Alert.SystemAccent" parent="ThemeOverlay.Material.Dialog.Alert">
-        <item name="android:colorBackground">?colorBackgroundFloating</item>
+        <item name="colorPrimary">@color/color_primary_md3</item>
+        <item name="colorSurface">@color/color_surface_md3</item>
+        <item name="colorBackgroundFloating">@color/color_background_floating_md3</item>
+        <item name="android:colorBackground">@color/color_background_md3</item>
+        <item name="android:textColorPrimary">@color/primary_text_md3</item>
+        <item name="android:textColorPrimaryInverse">@color/primary_text_inverse_md3</item>
+        <item name="android:textColorSecondary">@color/secondary_text_md3</item>
+        <item name="android:textColorSecondaryInverse">@color/secondary_text_inverse_md3</item>
+        <item name="android:textColorTertiary">@color/tertiary_text_md3</item>
+        <item name="android:textColorTertiaryInverse">@color/tertiary_text_inverse_md3</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors_custom.xml b/app/src/main/res/values/colors_custom.xml
index 18d2e883..5e93ab0a 100644
--- a/app/src/main/res/values/colors_custom.xml
+++ b/app/src/main/res/values/colors_custom.xml
@@ -39,6 +39,4 @@
     <color name="material_brown">@color/material_brown_500</color>
     <color name="material_grey">@color/material_grey_500</color>
     <color name="material_blue_grey">@color/material_blue_grey_500</color>
-    <color name="system">@color/material_blue</color>
-    <color name="system_background">@color/material_blue</color>
 </resources>
diff --git a/app/src/main/res/values/themes_custom.xml b/app/src/main/res/values/themes_custom.xml
index dd265425..5589fcf3 100644
--- a/app/src/main/res/values/themes_custom.xml
+++ b/app/src/main/res/values/themes_custom.xml
@@ -98,6 +98,4 @@
     <style name="ThemeOverlay.material_blue_grey">
         <item name="colorPrimary">@color/material_blue_grey</item>
     </style>
-
-    <style name="ThemeOverlay.system" />
 </resources>
diff --git a/app/src/main/res/values/themes_override.xml b/app/src/main/res/values/themes_override.xml
index b67982a5..a531fd6b 100644
--- a/app/src/main/res/values/themes_override.xml
+++ b/app/src/main/res/values/themes_override.xml
@@ -60,4 +60,4 @@
         <!-- 0.8 Spacing, 0.8/11 = 0.072727273 -->
         <item name="android:letterSpacing">0.072727273</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>