From 88bc0bf61356b6f9c31fb888506aec805b0896a4 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Mon, 15 Nov 2021 21:53:57 +0700
Subject: [PATCH] Adapt App Themes to M3 Color System (#6230)

* Adapt Default theme to M3 color system

* Adapt Dynamic theme to M3 color system

* Adapt Midnight Dusk theme to M3 color system

* Adapt Strawberry Daiquiri theme to M3 color system

* Adapt Yotsuba theme to M3 color system

* Adapt Tako theme to M3 color system

* Adapt Green Apple theme to M3 color system

* Adapt Teal & Turquoise theme to M3 color system

* Adapt Yin & Yang theme to M3 color system

* Remove old theme colors

* Yotsuba theme adjustments

Co-authored-by: ztimms73 <vp1984tanki@gmail.com>

* Green Apple theme adjustments

Co-authored-by: Soitora <10836780+Soitora@users.noreply.github.com>

* Tako theme adjustments

* Midnight Dusk theme adjustments

* Use colorSurfaceVariant for colorControlHighlight

* Nits

Co-authored-by: ztimms73 <vp1984tanki@gmail.com>
Co-authored-by: Soitora <10836780+Soitora@users.noreply.github.com>
---
 .../res/color-v31/ripple_colored_monet.xml    |   4 -
 app/src/main/res/values-night-v31/themes.xml  |  44 ++++
 app/src/main/res/values-night/colors.xml      |  49 +---
 .../res/values-night/greenapple_colors.xml    |  36 +++
 .../res/values-night/midnightdusk_colors.xml  |  36 +++
 .../res/values-night/strawberry_colors.xml    |  36 +++
 .../res/values-night/tachiyomi_colors.xml     |  35 +++
 app/src/main/res/values-night/tako_colors.xml |  36 +++
 .../res/values-night/tealturqoise_colors.xml  |  36 +++
 app/src/main/res/values-night/themes.xml      |  10 -
 .../main/res/values-night/yinyang_colors.xml  |  30 +++
 .../main/res/values-night/yotsuba_colors.xml  |  36 +++
 app/src/main/res/values-v31/themes.xml        |  51 +++-
 app/src/main/res/values/colors.xml            |  65 +----
 app/src/main/res/values/greenapple_colors.xml |  36 +++
 .../main/res/values/midnightdusk_colors.xml   |  36 +++
 app/src/main/res/values/strawberry_colors.xml |  36 +++
 app/src/main/res/values/tachiyomi_colors.xml  |  35 +++
 app/src/main/res/values/tako_colors.xml       |  36 +++
 .../main/res/values/tealturqoise_colors.xml   |  36 +++
 app/src/main/res/values/themes.xml            | 232 ++++++++++++++----
 app/src/main/res/values/yinyang_colors.xml    |  30 +++
 app/src/main/res/values/yotsuba_colors.xml    |  36 +++
 23 files changed, 841 insertions(+), 176 deletions(-)
 delete mode 100644 app/src/main/res/color-v31/ripple_colored_monet.xml
 create mode 100644 app/src/main/res/values-night-v31/themes.xml
 create mode 100644 app/src/main/res/values-night/greenapple_colors.xml
 create mode 100644 app/src/main/res/values-night/midnightdusk_colors.xml
 create mode 100644 app/src/main/res/values-night/strawberry_colors.xml
 create mode 100644 app/src/main/res/values-night/tachiyomi_colors.xml
 create mode 100644 app/src/main/res/values-night/tako_colors.xml
 create mode 100644 app/src/main/res/values-night/tealturqoise_colors.xml
 create mode 100644 app/src/main/res/values-night/yinyang_colors.xml
 create mode 100644 app/src/main/res/values-night/yotsuba_colors.xml
 create mode 100644 app/src/main/res/values/greenapple_colors.xml
 create mode 100644 app/src/main/res/values/midnightdusk_colors.xml
 create mode 100644 app/src/main/res/values/strawberry_colors.xml
 create mode 100644 app/src/main/res/values/tachiyomi_colors.xml
 create mode 100644 app/src/main/res/values/tako_colors.xml
 create mode 100644 app/src/main/res/values/tealturqoise_colors.xml
 create mode 100644 app/src/main/res/values/yinyang_colors.xml
 create mode 100644 app/src/main/res/values/yotsuba_colors.xml

diff --git a/app/src/main/res/color-v31/ripple_colored_monet.xml b/app/src/main/res/color-v31/ripple_colored_monet.xml
deleted file mode 100644
index efaa46d448..0000000000
--- a/app/src/main/res/color-v31/ripple_colored_monet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/accent_monet" android:alpha="0.12" />
-</selector>
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 0000000000..8db9fdf9f6
--- /dev/null
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- From ThemeOverlay.Material3.DynamicColors.Dark -->
+    <style name="Theme.Tachiyomi.Monet">
+        <!-- Color palettes -->
+        <item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
+        <item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
+        <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
+        <item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+        <item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
+        <item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
+        <item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
+        <item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
+        <item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
+        <item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
+        <item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
+        <item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
+        <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
+        <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
+        <item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+
+        <!-- Default Framework Text Colors. -->
+        <item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
+        <item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
+        <item name="android:textColorSecondary">@color/m3_dynamic_dark_default_color_secondary_text</item>
+        <item name="android:textColorSecondaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
+        <item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text</item>
+        <item name="android:textColorTertiaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
+        <item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
+        <item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
+        <item name="android:textColorHint">@color/m3_dynamic_dark_hint_foreground</item>
+        <item name="android:textColorHintInverse">@color/m3_dynamic_hint_foreground</item>
+        <item name="android:textColorHighlight">@color/m3_dynamic_dark_highlighted_text</item>
+        <item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
+        <item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 9c55f75f8e..9d6a4a86a6 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,47 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="splash">@color/background_default</color>
+<resources>
+    <color name="splash">#202125</color>
+
+    <color name="error">#FFB4A9</color>
+    <color name="errorContainer">#930006</color>
+    <color name="onError">#680003</color>
+    <color name="onErrorContainer">#FFDAD4</color>
 
     <!-- Default Theme -->
-    <color name="accent_default">#3399FF</color>
     <color name="divider_default">@color/md_white_1000_12</color>
-    <color name="surface_default">#242529</color>
-    <color name="background_default">#202125</color>
-    <color name="ripple_colored_default">#1F3399FF</color>
-
-    <!-- Monet Theme -->
-    <color name="accent_monet" tools:targetApi="31">@android:color/system_accent1_100</color>
-    <color name="on_accent_monet" tools:targetApi="31">@android:color/system_accent1_900</color>
-    <color name="divider_monet" tools:targetApi="31">@android:color/system_neutral1_700</color>
-    <color name="tertiary_monet" tools:targetApi="31">@android:color/system_accent3_100</color>
-    <color name="on_tertiary_monet" tools:targetApi="31">@android:color/system_accent3_900</color>
-    <color name="surface_monet" tools:targetApi="31">@android:color/system_neutral1_900</color>
-    <color name="on_surface_monet" tools:targetApi="31">@android:color/system_neutral1_50</color>
-
-    <!-- Green Apple Theme -->
-    <color name="accent_greenapple">#48E484</color>
-    <color name="color_on_primary_greenapple">@color/md_black_1000</color>
-    <color name="ripple_colored_greenapple">#1F48E484</color>
-
-    <!-- Tako Theme -->
-    <color name="accent_tako">#F3B375</color>
-    <color name="color_on_primary_tako">#242431</color>
-    <color name="tertiary_tako">@color/color_on_primary_tako</color>
-    <color name="color_on_tertiary_tako">@color/accent_tako</color>
-    <color name="ripple_colored_tako">#1FF3B375</color>
-    <color name="surface_tako">#2A2A3C</color>
-    <color name="background_tako">#21212E</color>
-    <color name="filter_tako">@color/accent_tako</color>
-
-    <!-- Teal & Turquoise Theme -->
-    <color name="accent_tealturquoise">#40E0D0</color>
-    <color name="color_on_primary_tealturquoise">#000000</color>
-    <color name="tertiary_tealturquoise">#BF1F2F</color>
-    <color name="color_on_tertiary_tealturquoise">#FFFFFF</color>
-    <color name="ripple_colored_tealturquoise">#1F40E0D0</color>
-
-    <!-- Yin & Yang Theme -->
-    <color name="accent_yinyang">#FFFFFF</color>
-    <color name="color_on_secondary_yinyang">#000000</color>
-    <color name="ripple_colored_yinyang">#777777</color>
 </resources>
diff --git a/app/src/main/res/values-night/greenapple_colors.xml b/app/src/main/res/values-night/greenapple_colors.xml
new file mode 100644
index 0000000000..ecc50b64b8
--- /dev/null
+++ b/app/src/main/res/values-night/greenapple_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Green Apple theme
+  ~ Original color scheme by CarlosEsco, Jays2Kings and CrepeTF
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #188140
+  ~ Secondary #188140
+  ~ Tertiary #D33131
+  ~ Neutral #5D5F5B
+-->
+<resources>
+    <color name="greenapple_primary">#7ADB8F</color>
+    <color name="greenapple_onPrimary">#003915</color>
+    <color name="greenapple_primaryContainer">#005322</color>
+    <color name="greenapple_onPrimaryContainer">#96F8A9</color>
+    <color name="greenapple_secondary">#7ADB8F</color>
+    <color name="greenapple_onSecondary">#003915</color>
+    <color name="greenapple_secondaryContainer">#005322</color>
+    <color name="greenapple_onSecondaryContainer">#96F8A9</color>
+    <color name="greenapple_tertiary">#FFB3AA</color>
+    <color name="greenapple_onTertiary">#680006</color>
+    <color name="greenapple_tertiaryContainer">#93000D</color>
+    <color name="greenapple_onTertiaryContainer">#FFDAD5</color>
+    <color name="greenapple_background">#1A1C19</color>
+    <color name="greenapple_onBackground">#E1E3DD</color>
+    <color name="greenapple_surface">#1A1C19</color>
+    <color name="greenapple_onSurface">#E1E3DD</color>
+    <color name="greenapple_surfaceVariant">#414941</color>
+    <color name="greenapple_onSurfaceVariant">#C1C8BE</color>
+    <color name="greenapple_outline">#8B9389</color>
+    <color name="greenapple_inverseOnSurface">#1A1C19</color>
+    <color name="greenapple_inverseSurface">#E1E3DD</color>
+    <color name="greenapple_primaryInverse">#006D2F</color>
+</resources>
diff --git a/app/src/main/res/values-night/midnightdusk_colors.xml b/app/src/main/res/values-night/midnightdusk_colors.xml
new file mode 100644
index 0000000000..bc31204844
--- /dev/null
+++ b/app/src/main/res/values-night/midnightdusk_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Midnight Dusk theme
+  ~ Original color scheme by CrepeTF
+  ~ M3 color scheme generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #F02475
+  ~ Secondary #F02475
+  ~ Tertiary #7A5733
+  ~ Neutral #16151D
+-->
+<resources>
+    <color name="midnightdusk_primary">#FFB1C4</color>
+    <color name="midnightdusk_onPrimary">#66002A</color>
+    <color name="midnightdusk_primaryContainer">#8F003F</color>
+    <color name="midnightdusk_onPrimaryContainer">#FFD9E1</color>
+    <color name="midnightdusk_secondary">#FFB1C4</color>
+    <color name="midnightdusk_onSecondary">#66002A</color>
+    <color name="midnightdusk_secondaryContainer">#8F003F</color>
+    <color name="midnightdusk_onSecondaryContainer">#FFD9E1</color>
+    <color name="midnightdusk_tertiary">#EDBE91</color>
+    <color name="midnightdusk_onTertiary">#462A09</color>
+    <color name="midnightdusk_tertiaryContainer">#60401D</color>
+    <color name="midnightdusk_onTertiaryContainer">#FFDCBA</color>
+    <color name="midnightdusk_background">#16151D</color>
+    <color name="midnightdusk_onBackground">#E5E1E5</color>
+    <color name="midnightdusk_surface">#16151D</color>
+    <color name="midnightdusk_onSurface">#E5E1E5</color>
+    <color name="midnightdusk_surfaceVariant">#524346</color>
+    <color name="midnightdusk_onSurfaceVariant">#D6C1C4</color>
+    <color name="midnightdusk_outline">#9F8C8F</color>
+    <color name="midnightdusk_inverseOnSurface">#1C1B1F</color>
+    <color name="midnightdusk_inverseSurface">#E5E1E5</color>
+    <color name="midnightdusk_primaryInverse">#BB0054</color>
+</resources>
diff --git a/app/src/main/res/values-night/strawberry_colors.xml b/app/src/main/res/values-night/strawberry_colors.xml
new file mode 100644
index 0000000000..79071bd14f
--- /dev/null
+++ b/app/src/main/res/values-night/strawberry_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Strawberry Daiquiri theme
+  ~ Original color scheme by Soitora
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #ED4A65
+  ~ Secondary #ED4A65
+  ~ Tertiary #775930
+  ~ Neutral #655C5C
+-->
+<resources>
+    <color name="strawberry_primary">#FFB2B9</color>
+    <color name="strawberry_onPrimary">#67001B</color>
+    <color name="strawberry_primaryContainer">#91002A</color>
+    <color name="strawberry_onPrimaryContainer">#FFDADD</color>
+    <color name="strawberry_secondary">#FFB2B9</color>
+    <color name="strawberry_onSecondary">#67001B</color>
+    <color name="strawberry_secondaryContainer">#91002A</color>
+    <color name="strawberry_onSecondaryContainer">#FFDADD</color>
+    <color name="strawberry_tertiary">#E8C08E</color>
+    <color name="strawberry_onTertiary">#432C06</color>
+    <color name="strawberry_tertiaryContainer">#5D421B</color>
+    <color name="strawberry_onTertiaryContainer">#FFDDB1</color>
+    <color name="strawberry_background">#201A1A</color>
+    <color name="strawberry_onBackground">#ECDFDF</color>
+    <color name="strawberry_surface">#201A1A</color>
+    <color name="strawberry_onSurface">#ECDFDF</color>
+    <color name="strawberry_surfaceVariant">#534344</color>
+    <color name="strawberry_onSurfaceVariant">#D7C1C2</color>
+    <color name="strawberry_outline">#A08C8D</color>
+    <color name="strawberry_inverseOnSurface">#201A1A</color>
+    <color name="strawberry_inverseSurface">#ECDFDF</color>
+    <color name="strawberry_primaryInverse">#B61E40</color>
+</resources>
diff --git a/app/src/main/res/values-night/tachiyomi_colors.xml b/app/src/main/res/values-night/tachiyomi_colors.xml
new file mode 100644
index 0000000000..40f5befccf
--- /dev/null
+++ b/app/src/main/res/values-night/tachiyomi_colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Default theme
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #2979FF
+  ~ Secondary #2979FF
+  ~ Tertiary #47A84A
+  ~ Neutral #5E5E62
+-->
+<resources>
+    <color name="tachiyomi_primary">#AEC6FF</color>
+    <color name="tachiyomi_onPrimary">#002C71</color>
+    <color name="tachiyomi_primaryContainer">#00419E</color>
+    <color name="tachiyomi_onPrimaryContainer">#D8E2FF</color>
+    <color name="tachiyomi_secondary">#AEC6FF</color>
+    <color name="tachiyomi_onSecondary">#002C71</color>
+    <color name="tachiyomi_secondaryContainer">#00419E</color>
+    <color name="tachiyomi_onSecondaryContainer">#D8E2FF</color>
+    <color name="tachiyomi_tertiary">#7ADC77</color>
+    <color name="tachiyomi_onTertiary">#003907</color>
+    <color name="tachiyomi_tertiaryContainer">#00530D</color>
+    <color name="tachiyomi_onTertiaryContainer">#95F990</color>
+    <color name="tachiyomi_background">#1B1B1E</color>
+    <color name="tachiyomi_onBackground">#E4E2E6</color>
+    <color name="tachiyomi_surface">#1B1B1E</color>
+    <color name="tachiyomi_onSurface">#E4E2E6</color>
+    <color name="tachiyomi_surfaceVariant">#44464E</color>
+    <color name="tachiyomi_onSurfaceVariant">#C5C6D0</color>
+    <color name="tachiyomi_outline">#8E9099</color>
+    <color name="tachiyomi_inverseOnSurface">#1B1B1E</color>
+    <color name="tachiyomi_inverseSurface">#E4E2E6</color>
+    <color name="tachiyomi_primaryInverse">#0057CE</color>
+</resources>
diff --git a/app/src/main/res/values-night/tako_colors.xml b/app/src/main/res/values-night/tako_colors.xml
new file mode 100644
index 0000000000..9aabf0b1b2
--- /dev/null
+++ b/app/src/main/res/values-night/tako_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Tako theme
+  ~ Original color scheme by ghostbear
+  ~ M3 color scheme generated by yours truly
+  ~
+  ~ Key colors:
+  ~ Primary #F3B375
+  ~ Secondary #F3B375
+  ~ Tertiary #66577E
+  ~ Neutral #21212E
+-->
+<resources>
+    <color name="tako_primary">#F3B375</color>
+    <color name="tako_onPrimary">#38294E</color>
+    <color name="tako_primaryContainer">#F3B375</color>
+    <color name="tako_onPrimaryContainer">#38294E</color>
+    <color name="tako_secondary">#F3B375</color>
+    <color name="tako_onSecondary">#38294E</color>
+    <color name="tako_secondaryContainer">#F3B375</color>
+    <color name="tako_onSecondaryContainer">#38294E</color>
+    <color name="tako_tertiary">#66577E</color>
+    <color name="tako_onTertiary">#F3B375</color>
+    <color name="tako_tertiaryContainer">#4E4065</color>
+    <color name="tako_onTertiaryContainer">#EDDCFF</color>
+    <color name="tako_background">#21212E</color>
+    <color name="tako_onBackground">#E3E0F2</color>
+    <color name="tako_surface">#21212E</color>
+    <color name="tako_onSurface">#E3E0F2</color>
+    <color name="tako_surfaceVariant">#49454E</color>
+    <color name="tako_onSurfaceVariant">#CBC4CE</color>
+    <color name="tako_outline">#958F99</color>
+    <color name="tako_inverseOnSurface">#1B1B1E</color>
+    <color name="tako_inverseSurface">#E5E1E6</color>
+    <color name="tako_primaryInverse">#84531E</color>
+</resources>
diff --git a/app/src/main/res/values-night/tealturqoise_colors.xml b/app/src/main/res/values-night/tealturqoise_colors.xml
new file mode 100644
index 0000000000..74d29764f7
--- /dev/null
+++ b/app/src/main/res/values-night/tealturqoise_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Teal & Turquoise theme
+  ~ Original color scheme by Riztard
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #008080
+  ~ Secondary #008080
+  ~ Tertiary #FF7F7F
+  ~ Neutral #5B5F5F
+-->
+<resources>
+    <color name="tealturquoise_primary">#4DDADA</color>
+    <color name="tealturquoise_onPrimary">#003738</color>
+    <color name="tealturquoise_primaryContainer">#004F50</color>
+    <color name="tealturquoise_onPrimaryContainer">#6EF6F6</color>
+    <color name="tealturquoise_secondary">#4DDADA</color>
+    <color name="tealturquoise_onSecondary">#003738</color>
+    <color name="tealturquoise_secondaryContainer">#004F50</color>
+    <color name="tealturquoise_onSecondaryContainer">#6EF6F6</color>
+    <color name="tealturquoise_tertiary">#FFB3B1</color>
+    <color name="tealturquoise_onTertiary">#640914</color>
+    <color name="tealturquoise_tertiaryContainer">#842328</color>
+    <color name="tealturquoise_onTertiaryContainer">#FFDAD7</color>
+    <color name="tealturquoise_background">#191C1C</color>
+    <color name="tealturquoise_onBackground">#E0E3E2</color>
+    <color name="tealturquoise_surface">#191C1C</color>
+    <color name="tealturquoise_onSurface">#E0E3E2</color>
+    <color name="tealturquoise_surfaceVariant">#3F4848</color>
+    <color name="tealturquoise_onSurfaceVariant">#BEC9C8</color>
+    <color name="tealturquoise_outline">#889392</color>
+    <color name="tealturquoise_inverseOnSurface">#191C1C</color>
+    <color name="tealturquoise_inverseSurface">#E0E3E2</color>
+    <color name="tealturquoise_primaryInverse">#006A6A</color>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index dbd49bb7d4..d59f70dc02 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--== Midnight Dusk Theme ==-->
-    <style name="Theme.Tachiyomi.MidnightDusk">
-        <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_midnightdusk</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
-        <item name="colorSurface">@color/surface_midnightdusk</item>
-        <item name="android:colorBackground">@color/background_midnightdusk</item>
-    </style>
-
     <!--== AMOLED Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
         <!-- Theme Colors -->
diff --git a/app/src/main/res/values-night/yinyang_colors.xml b/app/src/main/res/values-night/yinyang_colors.xml
new file mode 100644
index 0000000000..6f2ef34c90
--- /dev/null
+++ b/app/src/main/res/values-night/yinyang_colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Yin & Yang theme
+  ~ Original color scheme by Riztard
+  ~ M3 colors generated by yours truly
+-->
+<resources>
+    <color name="yinyang_primary">#FFFFFF</color>
+    <color name="yinyang_onPrimary">#5A5A5A</color>
+    <color name="yinyang_primaryContainer">#717171</color>
+    <color name="yinyang_onPrimaryContainer">#E4E4E4</color>
+    <color name="yinyang_secondary">#FFFFFF</color>
+    <color name="yinyang_onSecondary">#5A5A5A</color>
+    <color name="yinyang_secondaryContainer">#717171</color>
+    <color name="yinyang_onSecondaryContainer">#E4E4E4</color>
+    <color name="yinyang_tertiary">#AEC6FF</color>
+    <color name="yinyang_onTertiary">#002C71</color>
+    <color name="yinyang_tertiaryContainer">#00419E</color>
+    <color name="yinyang_onTertiaryContainer">#D8E2FF</color>
+    <color name="yinyang_background">#1E1E1E</color>
+    <color name="yinyang_onBackground">#E6E6E6</color>
+    <color name="yinyang_surface">#1E1E1E</color>
+    <color name="yinyang_onSurface">#E6E6E6</color>
+    <color name="yinyang_surfaceVariant">#4E4E4E</color>
+    <color name="yinyang_onSurfaceVariant">#D1D1D1</color>
+    <color name="yinyang_outline">#999999</color>
+    <color name="yinyang_inverseOnSurface">#1E1E1E</color>
+    <color name="yinyang_inverseSurface">#E6E6E6</color>
+    <color name="yinyang_primaryInverse">#CECECE</color>
+</resources>
diff --git a/app/src/main/res/values-night/yotsuba_colors.xml b/app/src/main/res/values-night/yotsuba_colors.xml
new file mode 100644
index 0000000000..4ca498a189
--- /dev/null
+++ b/app/src/main/res/values-night/yotsuba_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Yotsuba theme
+  ~ Original color scheme by ztimms73
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #AE3200
+  ~ Secondary #AE3200
+  ~ Tertiary #6B5E2F
+  ~ Neutral #655C5A
+-->
+<resources>
+    <color name="yotsuba_primary">#FFB59D</color>
+    <color name="yotsuba_onPrimary">#5F1600</color>
+    <color name="yotsuba_primaryContainer">#862200</color>
+    <color name="yotsuba_onPrimaryContainer">#FFDBCF</color>
+    <color name="yotsuba_secondary">#FFB59D</color>
+    <color name="yotsuba_onSecondary">#5F1600</color>
+    <color name="yotsuba_secondaryContainer">#862200</color>
+    <color name="yotsuba_onSecondaryContainer">#FFDBCF</color>
+    <color name="yotsuba_tertiary">#D7C68D</color>
+    <color name="yotsuba_onTertiary">#3A2F05</color>
+    <color name="yotsuba_tertiaryContainer">#524619</color>
+    <color name="yotsuba_onTertiaryContainer">#F5E2A7</color>
+    <color name="yotsuba_background">#211A18</color>
+    <color name="yotsuba_onBackground">#EDE0DD</color>
+    <color name="yotsuba_surface">#211A18</color>
+    <color name="yotsuba_onSurface">#EDE0DD</color>
+    <color name="yotsuba_surfaceVariant">#53433F</color>
+    <color name="yotsuba_onSurfaceVariant">#D8C2BC</color>
+    <color name="yotsuba_outline">#A08C87</color>
+    <color name="yotsuba_inverseOnSurface">#211A18</color>
+    <color name="yotsuba_inverseSurface">#EDE0DD</color>
+    <color name="yotsuba_primaryInverse">#AE3200</color>
+</resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 04aa6893ff..bb77f70c86 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -1,17 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- From ThemeOverlay.Material3.DynamicColors.Light -->
     <style name="Theme.Tachiyomi.Monet">
-        <item name="colorPrimary">@color/accent_monet</item>
-        <item name="colorOnPrimary">@color/on_accent_monet</item>
-        <item name="colorTertiary">@color/tertiary_monet</item>
-        <item name="colorOnTertiary">@color/on_tertiary_monet</item>
-        <item name="colorSurface">@color/surface_monet</item>
-        <item name="colorOnSurface">@color/on_surface_monet</item>
-        <item name="android:colorBackground">@color/background_monet</item>
-        <item name="colorOnBackground">@color/on_background_monet</item>
-        <item name="colorControlHighlight">@color/ripple_colored_monet</item>
-        <item name="android:divider">@color/divider_monet</item>
-        <item name="android:textColorPrimary">@color/text_primary_monet</item>
-        <item name="android:textColorSecondary">@color/text_secondary_monet</item>
+        <!-- Color palettes -->
+        <item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
+        <item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
+        <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
+        <item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+        <item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
+        <item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
+        <item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
+        <item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
+        <item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
+        <item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
+        <item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
+        <item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
+        <item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
+        <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
+        <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
+        <item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+
+        <!-- Default Framework Text Colors. -->
+        <item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
+        <item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
+        <item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text</item>
+        <item name="android:textColorSecondaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
+        <item name="android:textColorTertiary">@color/m3_dynamic_default_color_secondary_text</item>
+        <item name="android:textColorTertiaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
+        <item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
+        <item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
+        <item name="android:textColorHint">@color/m3_dynamic_hint_foreground</item>
+        <item name="android:textColorHintInverse">@color/m3_dynamic_dark_hint_foreground</item>
+        <item name="android:textColorHighlight">@color/m3_dynamic_highlighted_text</item>
+        <item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
+        <item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 642fa15e30..a106bf35af 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,68 +2,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <color name="splash">@color/accent_blue</color>
 
-    <!-- Default Theme -->
-    <color name="accent_default">@color/md_blue_A400</color>
-    <color name="divider_default">@color/md_black_1000_12</color>
-    <color name="surface_default">@color/md_white_1000</color>
-    <color name="background_default">@color/md_grey_50</color>
-    <color name="ripple_colored_default">@color/md_blue_A400_12</color>
+    <color name="error">#BA1B1B</color>
+    <color name="errorContainer">#FFDAD4</color>
+    <color name="onError">#FFFFFF</color>
+    <color name="onErrorContainer">#410001</color>
 
-    <!-- Monet Theme -->
-    <color name="accent_monet" tools:targetApi="31">@android:color/system_accent1_600</color>
-    <color name="on_accent_monet" tools:targetApi="31">@android:color/system_accent1_10</color>
-    <color name="divider_monet" tools:targetApi="31">@android:color/system_neutral1_200</color>
-    <color name="tertiary_monet" tools:targetApi="31">@android:color/system_accent3_600</color>
-    <color name="on_tertiary_monet" tools:targetApi="31">@android:color/system_accent3_10</color>
-    <color name="surface_monet" tools:targetApi="31">@android:color/system_neutral1_50</color>
-    <color name="on_surface_monet" tools:targetApi="31">@android:color/system_neutral1_900</color>
-    <color name="background_monet" tools:targetApi="31">@color/surface_monet</color>
-    <color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
+    <!-- Default Theme -->
+    <color name="divider_default">@color/md_black_1000_12</color>
 
     <!-- Blue Theme -->
     <color name="accent_blue">#54759E</color>
 
-    <!-- Green Apple Theme -->
-    <color name="accent_greenapple">#188140</color>
-    <color name="color_on_primary_greenapple">@color/md_white_1000</color>
-    <color name="ripple_colored_greenapple">#1F188140</color>
-
-    <!-- Midnight Dusk Theme -->
-    <color name="accent_midnightdusk">#F02475</color>
-    <color name="background_midnightdusk">#16151D</color>
-    <color name="surface_midnightdusk">#201F27</color>
-    <color name="ripple_colored_midnightdusk">#1FF02475</color>
-
-    <!-- Strawberry Daiquiri Theme -->
-    <color name="accent_strawberry">#ED4A65</color>
-    <color name="ripple_colored_strawberry">#1FED4A65</color>
-
-    <!-- Tako Theme -->
-    <color name="accent_tako">#66577E</color>
-    <color name="color_on_primary_tako">#F3B375</color>
-    <color name="tertiary_tako">@color/color_on_primary_tako</color>
-    <color name="color_on_tertiary_tako">#574360</color>
-    <color name="ripple_colored_tako">#1F66577E</color>
-    <color name="surface_tako">#F7F5FF</color>
-    <color name="background_tako">#F2EDF7</color>
-    <color name="filter_tako">#F29940</color>
-
-    <!-- Teal & Turquoise Theme -->
-    <color name="accent_tealturquoise">#008080</color>
-    <color name="color_on_primary_tealturquoise">#FFFFFF</color>
-    <color name="tertiary_tealturquoise">#FF7F7F</color>
-    <color name="color_on_tertiary_tealturquoise">#000000</color>
-    <color name="ripple_colored_tealturquoise">#1F008080</color>
-
-    <!-- Yin & Yang Theme -->
-    <color name="accent_yinyang">#000000</color>
-    <color name="color_on_secondary_yinyang">#FFFFFF</color>
-    <color name="ripple_colored_yinyang">#999999</color>
-
-    <!-- Yotsuba Theme -->
-    <color name="accent_yotsuba">#FC8C5C</color>
-    <color name="ripple_colored_yotsuba">#1FFC8C5C</color>
-
     <!-- AMOLED Mode -->
     <color name="surface_amoled">#000001</color>
     <color name="background_amoled">#000000</color>
@@ -111,8 +60,6 @@
     <color name="md_blue_grey_900">#263238</color>
     <color name="md_blue_grey_800">#37474F</color>
 
-    <color name="green">#47a84a</color>
-
     <!-- Navigation Overlay Colors -->
     <color name="navigation_next">#CB84E296</color>
     <color name="navigation_prev">#CCFF7733</color>
diff --git a/app/src/main/res/values/greenapple_colors.xml b/app/src/main/res/values/greenapple_colors.xml
new file mode 100644
index 0000000000..13dbf83dc5
--- /dev/null
+++ b/app/src/main/res/values/greenapple_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Green Apple theme
+  ~ Original color scheme by CarlosEsco, Jays2Kings and CrepeTF
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #188140
+  ~ Secondary #188140
+  ~ Tertiary #D33131
+  ~ Neutral #5D5F5B
+-->
+<resources>
+    <color name="greenapple_primary">#006D2F</color>
+    <color name="greenapple_onPrimary">#FFFFFF</color>
+    <color name="greenapple_primaryContainer">#96F8A9</color>
+    <color name="greenapple_onPrimaryContainer">#002109</color>
+    <color name="greenapple_secondary">#006D2F</color>
+    <color name="greenapple_onSecondary">#FFFFFF</color>
+    <color name="greenapple_secondaryContainer">#96F8A9</color>
+    <color name="greenapple_onSecondaryContainer">#002109</color>
+    <color name="greenapple_tertiary">#B91D22</color>
+    <color name="greenapple_onTertiary">#FFFFFF</color>
+    <color name="greenapple_tertiaryContainer">#FFDAD5</color>
+    <color name="greenapple_onTertiaryContainer">#410003</color>
+    <color name="greenapple_background">#FBFDF7</color>
+    <color name="greenapple_onBackground">#1A1C19</color>
+    <color name="greenapple_surface">#FBFDF7</color>
+    <color name="greenapple_onSurface">#1A1C19</color>
+    <color name="greenapple_surfaceVariant">#DDE5DA</color>
+    <color name="greenapple_onSurfaceVariant">#414941</color>
+    <color name="greenapple_outline">#717970</color>
+    <color name="greenapple_inverseOnSurface">#F0F2EC</color>
+    <color name="greenapple_inverseSurface">#2F312E</color>
+    <color name="greenapple_primaryInverse">#7ADB8F</color>
+</resources>
diff --git a/app/src/main/res/values/midnightdusk_colors.xml b/app/src/main/res/values/midnightdusk_colors.xml
new file mode 100644
index 0000000000..450315c6ea
--- /dev/null
+++ b/app/src/main/res/values/midnightdusk_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Midnight Dusk theme
+  ~ Original color scheme by CrepeTF
+  ~ M3 color scheme generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #F02475
+  ~ Secondary #F02475
+  ~ Tertiary #7A5733
+  ~ Neutral #16151D
+-->
+<resources>
+    <color name="midnightdusk_primary">#BB0054</color>
+    <color name="midnightdusk_onPrimary">#FFFFFF</color>
+    <color name="midnightdusk_primaryContainer">#FFD9E1</color>
+    <color name="midnightdusk_onPrimaryContainer">#3F0017</color>
+    <color name="midnightdusk_secondary">#BB0054</color>
+    <color name="midnightdusk_onSecondary">#FFFFFF</color>
+    <color name="midnightdusk_secondaryContainer">#FFD9E1</color>
+    <color name="midnightdusk_onSecondaryContainer">#3F0017</color>
+    <color name="midnightdusk_tertiary">#7A5733</color>
+    <color name="midnightdusk_onTertiary">#FFFFFF</color>
+    <color name="midnightdusk_tertiaryContainer">#FFDCBA</color>
+    <color name="midnightdusk_onTertiaryContainer">#2D1600</color>
+    <color name="midnightdusk_background">#FFFBFF</color>
+    <color name="midnightdusk_onBackground">#1C1B1F</color>
+    <color name="midnightdusk_surface">#FFFBFF</color>
+    <color name="midnightdusk_onSurface">#1C1B1F</color>
+    <color name="midnightdusk_surfaceVariant">#F3DDE0</color>
+    <color name="midnightdusk_onSurfaceVariant">#524346</color>
+    <color name="midnightdusk_outline">#847376</color>
+    <color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
+    <color name="midnightdusk_inverseSurface">#313033</color>
+    <color name="midnightdusk_primaryInverse">#FFB1C4</color>
+</resources>
diff --git a/app/src/main/res/values/strawberry_colors.xml b/app/src/main/res/values/strawberry_colors.xml
new file mode 100644
index 0000000000..97e45ba773
--- /dev/null
+++ b/app/src/main/res/values/strawberry_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Strawberry Daiquiri theme
+  ~ Original color scheme by Soitora
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #ED4A65
+  ~ Secondary #ED4A65
+  ~ Tertiary #775930
+  ~ Neutral #655C5C
+-->
+<resources>
+    <color name="strawberry_primary">#B61E40</color>
+    <color name="strawberry_onPrimary">#FFFFFF</color>
+    <color name="strawberry_primaryContainer">#FFDADD</color>
+    <color name="strawberry_onPrimaryContainer">#40000D</color>
+    <color name="strawberry_secondary">#B61E40</color>
+    <color name="strawberry_onSecondary">#FFFFFF</color>
+    <color name="strawberry_secondaryContainer">#FFDADD</color>
+    <color name="strawberry_onSecondaryContainer">#40000D</color>
+    <color name="strawberry_tertiary">#775930</color>
+    <color name="strawberry_onTertiary">#FFFFFF</color>
+    <color name="strawberry_tertiaryContainer">#FFDDB1</color>
+    <color name="strawberry_onTertiaryContainer">#2A1800</color>
+    <color name="strawberry_background">#FCFCFC</color>
+    <color name="strawberry_onBackground">#201A1A</color>
+    <color name="strawberry_surface">#FCFCFC</color>
+    <color name="strawberry_onSurface">#201A1A</color>
+    <color name="strawberry_surfaceVariant">#F4DDDD</color>
+    <color name="strawberry_onSurfaceVariant">#534344</color>
+    <color name="strawberry_outline">#857374</color>
+    <color name="strawberry_inverseOnSurface">#FBEDED</color>
+    <color name="strawberry_inverseSurface">#362F2F</color>
+    <color name="strawberry_primaryInverse">#FFB2B9</color>
+</resources>
diff --git a/app/src/main/res/values/tachiyomi_colors.xml b/app/src/main/res/values/tachiyomi_colors.xml
new file mode 100644
index 0000000000..e5f4f5ed83
--- /dev/null
+++ b/app/src/main/res/values/tachiyomi_colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Default theme
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #2979FF
+  ~ Secondary #2979FF
+  ~ Tertiary #47A84A
+  ~ Neutral #5E5E62
+-->
+<resources>
+    <color name="tachiyomi_primary">#0057CE</color>
+    <color name="tachiyomi_onPrimary">#FFFFFF</color>
+    <color name="tachiyomi_primaryContainer">#D8E2FF</color>
+    <color name="tachiyomi_onPrimaryContainer">#001947</color>
+    <color name="tachiyomi_secondary">#0057CE</color>
+    <color name="tachiyomi_onSecondary">#FFFFFF</color>
+    <color name="tachiyomi_secondaryContainer">#D8E2FF</color>
+    <color name="tachiyomi_onSecondaryContainer">#001947</color>
+    <color name="tachiyomi_tertiary">#006E17</color>
+    <color name="tachiyomi_onTertiary">#FFFFFF</color>
+    <color name="tachiyomi_tertiaryContainer">#95F990</color>
+    <color name="tachiyomi_onTertiaryContainer">#002202</color>
+    <color name="tachiyomi_background">#FDFBFF</color>
+    <color name="tachiyomi_onBackground">#1B1B1E</color>
+    <color name="tachiyomi_surface">#FDFBFF</color>
+    <color name="tachiyomi_onSurface">#1B1B1E</color>
+    <color name="tachiyomi_surfaceVariant">#E1E2EC</color>
+    <color name="tachiyomi_onSurfaceVariant">#44464E</color>
+    <color name="tachiyomi_outline">#757780</color>
+    <color name="tachiyomi_inverseOnSurface">#F2F0F4</color>
+    <color name="tachiyomi_inverseSurface">#303033</color>
+    <color name="tachiyomi_primaryInverse">#AEC6FF</color>
+</resources>
diff --git a/app/src/main/res/values/tako_colors.xml b/app/src/main/res/values/tako_colors.xml
new file mode 100644
index 0000000000..54198e69cf
--- /dev/null
+++ b/app/src/main/res/values/tako_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Tako theme
+  ~ Original color scheme by ghostbear
+  ~ M3 colors generated by yours truly
+  ~
+  ~ Key colors:
+  ~ Primary #66577E
+  ~ Secondary #66577E
+  ~ Tertiary #F3B375
+  ~ Neutral #F7F5FF
+-->
+<resources>
+    <color name="tako_primary">#66577E</color>
+    <color name="tako_onPrimary">#F3B375</color>
+    <color name="tako_primaryContainer">#66577E</color>
+    <color name="tako_onPrimaryContainer">#F3B375</color>
+    <color name="tako_secondary">#66577E</color>
+    <color name="tako_onSecondary">#F3B375</color>
+    <color name="tako_secondaryContainer">#66577E</color>
+    <color name="tako_onSecondaryContainer">#F3B375</color>
+    <color name="tako_tertiary">#F3B375</color>
+    <color name="tako_onTertiary">#574360</color>
+    <color name="tako_tertiaryContainer">#FDD6B0</color>
+    <color name="tako_onTertiaryContainer">#221437</color>
+    <color name="tako_background">#F7F5FF</color>
+    <color name="tako_onBackground">#1B1B22</color>
+    <color name="tako_surface">#F7F5FF</color>
+    <color name="tako_onSurface">#1B1B22</color>
+    <color name="tako_surfaceVariant">#E8E0EB</color>
+    <color name="tako_onSurfaceVariant">#49454E</color>
+    <color name="tako_outline">#7A757E</color>
+    <color name="tako_inverseOnSurface">#F3EFF4</color>
+    <color name="tako_inverseSurface">#313033</color>
+    <color name="tako_primaryInverse">#D6BAFF</color>
+</resources>
diff --git a/app/src/main/res/values/tealturqoise_colors.xml b/app/src/main/res/values/tealturqoise_colors.xml
new file mode 100644
index 0000000000..289ca9f935
--- /dev/null
+++ b/app/src/main/res/values/tealturqoise_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Teal & Turquoise theme
+  ~ Original color scheme by Riztard
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #008080
+  ~ Secondary #008080
+  ~ Tertiary #FF7F7F
+  ~ Neutral #5B5F5F
+-->
+<resources>
+    <color name="tealturquoise_primary">#006A6A</color>
+    <color name="tealturquoise_onPrimary">#FFFFFF</color>
+    <color name="tealturquoise_primaryContainer">#6EF6F6</color>
+    <color name="tealturquoise_onPrimaryContainer">#002020</color>
+    <color name="tealturquoise_secondary">#006A6A</color>
+    <color name="tealturquoise_onSecondary">#FFFFFF</color>
+    <color name="tealturquoise_secondaryContainer">#6EF6F6</color>
+    <color name="tealturquoise_onSecondaryContainer">#002020</color>
+    <color name="tealturquoise_tertiary">#A33A3D</color>
+    <color name="tealturquoise_onTertiary">#FFFFFF</color>
+    <color name="tealturquoise_tertiaryContainer">#FFDAD7</color>
+    <color name="tealturquoise_onTertiaryContainer">#410006</color>
+    <color name="tealturquoise_background">#FAFDFC</color>
+    <color name="tealturquoise_onBackground">#191C1C</color>
+    <color name="tealturquoise_surface">#FAFDFC</color>
+    <color name="tealturquoise_onSurface">#191C1C</color>
+    <color name="tealturquoise_surfaceVariant">#DAE5E4</color>
+    <color name="tealturquoise_onSurfaceVariant">#3F4848</color>
+    <color name="tealturquoise_outline">#6F7978</color>
+    <color name="tealturquoise_inverseOnSurface">#EFF1F0</color>
+    <color name="tealturquoise_inverseSurface">#2D3131</color>
+    <color name="tealturquoise_primaryInverse">#4DDADA</color>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 43e167d325..be282f6279 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,24 +11,40 @@
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_default</item>
-        <item name="colorOnPrimary">@color/md_white_1000</item>
-        <item name="colorPrimaryContainer">?attr/colorPrimary</item>
-        <item name="colorOnPrimaryContainer">?attr/colorOnPrimary</item>
-        <item name="colorSecondary">?attr/colorPrimary</item>
-        <item name="colorSecondaryContainer">?attr/colorPrimaryContainer</item>
-        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
-        <item name="colorTertiary">@color/green</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
+        <item name="colorPrimary">@color/tachiyomi_primary</item>
+        <item name="colorOnPrimary">@color/tachiyomi_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/tachiyomi_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/tachiyomi_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/tachiyomi_secondary</item>
+        <item name="colorOnSecondary">@color/tachiyomi_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/tachiyomi_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/tachiyomi_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/tachiyomi_tertiary</item>
+        <item name="colorOnTertiary">@color/tachiyomi_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/tachiyomi_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/tachiyomi_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/tachiyomi_background</item>
+        <item name="colorOnBackground">@color/tachiyomi_onBackground</item>
+        <item name="colorSurface">@color/tachiyomi_surface</item>
+        <item name="colorOnSurface">@color/tachiyomi_onSurface</item>
+        <item name="colorSurfaceVariant">@color/tachiyomi_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/tachiyomi_onSurfaceVariant</item>
+        <item name="colorOutline">@color/tachiyomi_outline</item>
+        <item name="colorOnSurfaceInverse">@color/tachiyomi_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/tachiyomi_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/tachiyomi_primaryInverse</item>
+        <item name="colorError">@color/error</item>
+        <item name="colorOnError">@color/onError</item>
+        <item name="colorErrorContainer">@color/errorContainer</item>
+        <item name="colorOnErrorContainer">@color/onErrorContainer</item>
+
         <item name="colorToolbar">?attr/colorSurface</item>
         <item name="colorOnToolbar">?attr/colorOnSurface</item>
-        <item name="colorSurface">@color/surface_default</item>
-        <item name="android:colorBackground">@color/background_default</item>
         <item name="android:divider">@color/divider_default</item>
         <item name="android:listDivider">@drawable/line_divider</item>
 
         <!-- Ripples -->
-        <item name="colorControlHighlight">@color/ripple_colored_default</item>
+        <item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
         <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
 
         <!-- Handles RTL Text -->
@@ -89,76 +105,194 @@
     <!--== Green Apple Theme ==-->
     <style name="Theme.Tachiyomi.GreenApple">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_greenapple</item>
-        <item name="colorOnPrimary">@color/color_on_primary_greenapple</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_greenapple</item>
+        <item name="colorPrimary">@color/greenapple_primary</item>
+        <item name="colorOnPrimary">@color/greenapple_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/greenapple_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/greenapple_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/greenapple_secondary</item>
+        <item name="colorOnSecondary">@color/greenapple_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/greenapple_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/greenapple_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/greenapple_tertiary</item>
+        <item name="colorOnTertiary">@color/greenapple_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/greenapple_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/greenapple_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/greenapple_background</item>
+        <item name="colorOnBackground">@color/greenapple_onBackground</item>
+        <item name="colorSurface">@color/greenapple_surface</item>
+        <item name="colorOnSurface">@color/greenapple_onSurface</item>
+        <item name="colorSurfaceVariant">@color/greenapple_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/greenapple_onSurfaceVariant</item>
+        <item name="colorOutline">@color/greenapple_outline</item>
+        <item name="colorOnSurfaceInverse">@color/greenapple_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/greenapple_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/greenapple_primaryInverse</item>
         <item name="lightSystemBarsOnPrimary">true</item>
     </style>
 
     <!--== Midnight Dusk Theme ==-->
     <style name="Theme.Tachiyomi.MidnightDusk">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_midnightdusk</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
+        <item name="colorPrimary">@color/midnightdusk_primary</item>
+        <item name="colorOnPrimary">@color/midnightdusk_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/midnightdusk_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/midnightdusk_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/midnightdusk_secondary</item>
+        <item name="colorOnSecondary">@color/midnightdusk_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/midnightdusk_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/midnightdusk_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/midnightdusk_tertiary</item>
+        <item name="colorOnTertiary">@color/midnightdusk_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/midnightdusk_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/midnightdusk_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/midnightdusk_background</item>
+        <item name="colorOnBackground">@color/midnightdusk_onBackground</item>
+        <item name="colorSurface">@color/midnightdusk_surface</item>
+        <item name="colorOnSurface">@color/midnightdusk_onSurface</item>
+        <item name="colorSurfaceVariant">@color/midnightdusk_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/midnightdusk_onSurfaceVariant</item>
+        <item name="colorOutline">@color/midnightdusk_outline</item>
+        <item name="colorOnSurfaceInverse">@color/midnightdusk_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/midnightdusk_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/midnightdusk_primaryInverse</item>
     </style>
 
     <!--== Strawberry Daiquiri Theme ==-->
     <style name="Theme.Tachiyomi.StrawberryDaiquiri">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_strawberry</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_strawberry</item>
+        <item name="colorPrimary">@color/strawberry_primary</item>
+        <item name="colorOnPrimary">@color/strawberry_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/strawberry_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/strawberry_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/strawberry_secondary</item>
+        <item name="colorOnSecondary">@color/strawberry_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/strawberry_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/strawberry_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/strawberry_tertiary</item>
+        <item name="colorOnTertiary">@color/strawberry_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/strawberry_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/strawberry_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/strawberry_background</item>
+        <item name="colorOnBackground">@color/strawberry_onBackground</item>
+        <item name="colorSurface">@color/strawberry_surface</item>
+        <item name="colorOnSurface">@color/strawberry_onSurface</item>
+        <item name="colorSurfaceVariant">@color/strawberry_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/strawberry_onSurfaceVariant</item>
+        <item name="colorOutline">@color/strawberry_outline</item>
+        <item name="colorOnSurfaceInverse">@color/strawberry_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/strawberry_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/strawberry_primaryInverse</item>
     </style>
 
     <!--== Tako Theme ==-->
     <style name="Theme.Tachiyomi.Tako">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_tako</item>
-        <item name="colorOnPrimary">@color/color_on_primary_tako</item>
-        <item name="colorTertiary">@color/tertiary_tako</item>
-        <item name="colorOnTertiary">@color/color_on_tertiary_tako</item>
-        <item name="colorControlHighlight">@color/ripple_colored_tako</item>
-        <item name="colorSurface">@color/surface_tako</item>
-        <item name="android:colorBackground">@color/background_tako</item>
+        <item name="colorPrimary">@color/tako_primary</item>
+        <item name="colorOnPrimary">@color/tako_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/tako_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/tako_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/tako_secondary</item>
+        <item name="colorOnSecondary">@color/tako_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/tako_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/tako_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/tako_tertiary</item>
+        <item name="colorOnTertiary">@color/tako_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/tako_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/tako_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/tako_background</item>
+        <item name="colorOnBackground">@color/tako_onBackground</item>
+        <item name="colorSurface">@color/tako_surface</item>
+        <item name="colorOnSurface">@color/tako_onSurface</item>
+        <item name="colorSurfaceVariant">@color/tako_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/tako_onSurfaceVariant</item>
+        <item name="colorOutline">@color/tako_outline</item>
+        <item name="colorOnSurfaceInverse">@color/tako_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/tako_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/tako_primaryInverse</item>
 
         <!-- Custom Attributes-->
-        <item name="colorFilterActive">@color/filter_tako</item>
+        <item name="colorFilterActive">?attr/colorTertiary</item>
     </style>
 
     <!--== Teal & Turquoise Theme ==-->
     <style name="Theme.Tachiyomi.TealTurquoise">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_tealturquoise</item>
-        <item name="colorOnPrimary">@color/color_on_primary_tealturquoise</item>
-        <item name="colorOnSecondary">@color/color_on_primary_tealturquoise</item>
-        <item name="colorTertiary">@color/tertiary_tealturquoise</item>
-        <item name="colorOnTertiary">@color/color_on_tertiary_tealturquoise</item>
-        <item name="colorControlHighlight">@color/ripple_colored_tealturquoise</item>
+        <item name="colorPrimary">@color/tealturquoise_primary</item>
+        <item name="colorOnPrimary">@color/tealturquoise_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/tealturquoise_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/tealturquoise_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/tealturquoise_secondary</item>
+        <item name="colorOnSecondary">@color/tealturquoise_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/tealturquoise_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/tealturquoise_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/tealturquoise_tertiary</item>
+        <item name="colorOnTertiary">@color/tealturquoise_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/tealturquoise_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/tealturquoise_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/tealturquoise_background</item>
+        <item name="colorOnBackground">@color/tealturquoise_onBackground</item>
+        <item name="colorSurface">@color/tealturquoise_surface</item>
+        <item name="colorOnSurface">@color/tealturquoise_onSurface</item>
+        <item name="colorSurfaceVariant">@color/tealturquoise_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/tealturquoise_onSurfaceVariant</item>
+        <item name="colorOutline">@color/tealturquoise_outline</item>
+        <item name="colorOnSurfaceInverse">@color/tealturquoise_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/tealturquoise_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/tealturquoise_primaryInverse</item>
     </style>
 
     <!--== Yin & Yang Theme ==-->
     <style name="Theme.Tachiyomi.YinYang">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_yinyang</item>
-        <item name="colorOnPrimary">@color/color_on_secondary_yinyang</item>
-        <item name="colorOnSecondary">@color/color_on_secondary_yinyang</item>
-        <item name="colorTertiary">@color/color_on_secondary_yinyang</item>
-        <item name="colorOnTertiary">@color/accent_yinyang</item>
-        <item name="colorControlHighlight">@color/ripple_colored_yinyang</item>
-
-        <!-- Themes -->
-        <item name="chipTextColor">@color/color_on_secondary_yinyang</item>
-        <item name="chipBackgroundColor">@color/accent_yinyang</item>
+        <item name="colorPrimary">@color/yinyang_primary</item>
+        <item name="colorOnPrimary">@color/yinyang_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/yinyang_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/yinyang_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/yinyang_secondary</item>
+        <item name="colorOnSecondary">@color/yinyang_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/yinyang_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/yinyang_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/yinyang_tertiary</item>
+        <item name="colorOnTertiary">@color/yinyang_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/yinyang_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/yinyang_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/yinyang_background</item>
+        <item name="colorOnBackground">@color/yinyang_onBackground</item>
+        <item name="colorSurface">@color/yinyang_surface</item>
+        <item name="colorOnSurface">@color/yinyang_onSurface</item>
+        <item name="colorSurfaceVariant">@color/yinyang_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/yinyang_onSurfaceVariant</item>
+        <item name="colorOutline">@color/yinyang_outline</item>
+        <item name="colorOnSurfaceInverse">@color/yinyang_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/yinyang_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/yinyang_primaryInverse</item>
     </style>
 
     <!--== Yotsuba Theme ==-->
     <style name="Theme.Tachiyomi.Yotsuba">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_yotsuba</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_yotsuba</item>
+        <item name="colorPrimary">@color/yotsuba_primary</item>
+        <item name="colorOnPrimary">@color/yotsuba_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/yotsuba_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/yotsuba_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/yotsuba_secondary</item>
+        <item name="colorOnSecondary">@color/yotsuba_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/yotsuba_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/yotsuba_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/yotsuba_tertiary</item>
+        <item name="colorOnTertiary">@color/yotsuba_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/yotsuba_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/yotsuba_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/yotsuba_background</item>
+        <item name="colorOnBackground">@color/yotsuba_onBackground</item>
+        <item name="colorSurface">@color/yotsuba_surface</item>
+        <item name="colorOnSurface">@color/yotsuba_onSurface</item>
+        <item name="colorSurfaceVariant">@color/yotsuba_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/yotsuba_onSurfaceVariant</item>
+        <item name="colorOutline">@color/yotsuba_outline</item>
+        <item name="colorOnSurfaceInverse">@color/yotsuba_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/yotsuba_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/yotsuba_primaryInverse</item>
     </style>
 
     <!--== AMOLED Mode Overlay ==-->
diff --git a/app/src/main/res/values/yinyang_colors.xml b/app/src/main/res/values/yinyang_colors.xml
new file mode 100644
index 0000000000..79a7d444b1
--- /dev/null
+++ b/app/src/main/res/values/yinyang_colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Yin & Yang theme
+  ~ Original color scheme by Riztard
+  ~ M3 colors generated by yours truly
+-->
+<resources>
+    <color name="yinyang_primary">#000000</color>
+    <color name="yinyang_onPrimary">#FFFFFF</color>
+    <color name="yinyang_primaryContainer">#DDDDDD</color>
+    <color name="yinyang_onPrimaryContainer">#0C0C0C</color>
+    <color name="yinyang_secondary">#000000</color>
+    <color name="yinyang_onSecondary">#FFFFFF</color>
+    <color name="yinyang_secondaryContainer">#DDDDDD</color>
+    <color name="yinyang_onSecondaryContainer">#0C0C0C</color>
+    <color name="yinyang_tertiary">#0057CE</color>
+    <color name="yinyang_onTertiary">#FFFFFF</color>
+    <color name="yinyang_tertiaryContainer">#D8E2FF</color>
+    <color name="yinyang_onTertiaryContainer">#001947</color>
+    <color name="yinyang_background">#FDFDFD</color>
+    <color name="yinyang_onBackground">#222222</color>
+    <color name="yinyang_surface">#FDFDFD</color>
+    <color name="yinyang_onSurface">#222222</color>
+    <color name="yinyang_surfaceVariant">#EDEDED</color>
+    <color name="yinyang_onSurfaceVariant">#515151</color>
+    <color name="yinyang_outline">#838383</color>
+    <color name="yinyang_inverseOnSurface">#F4F4F4</color>
+    <color name="yinyang_inverseSurface">#333333</color>
+    <color name="yinyang_primaryInverse">#A6A6A6</color>
+</resources>
diff --git a/app/src/main/res/values/yotsuba_colors.xml b/app/src/main/res/values/yotsuba_colors.xml
new file mode 100644
index 0000000000..79c662f7fb
--- /dev/null
+++ b/app/src/main/res/values/yotsuba_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Yotsuba theme
+  ~ Original color scheme by ztimms73
+  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
+  ~
+  ~ Key colors:
+  ~ Primary #AE3200
+  ~ Secondary #AE3200
+  ~ Tertiary #6B5E2F
+  ~ Neutral #655C5A
+-->
+<resources>
+    <color name="yotsuba_primary">#AE3200</color>
+    <color name="yotsuba_onPrimary">#FFFFFF</color>
+    <color name="yotsuba_primaryContainer">#FFDBCF</color>
+    <color name="yotsuba_onPrimaryContainer">#3B0A00</color>
+    <color name="yotsuba_secondary">#AE3200</color>
+    <color name="yotsuba_onSecondary">#FFFFFF</color>
+    <color name="yotsuba_secondaryContainer">#FFDBCF</color>
+    <color name="yotsuba_onSecondaryContainer">#3B0A00</color>
+    <color name="yotsuba_tertiary">#6B5E2F</color>
+    <color name="yotsuba_onTertiary">#FFFFFF</color>
+    <color name="yotsuba_tertiaryContainer">#F5E2A7</color>
+    <color name="yotsuba_onTertiaryContainer">#231B00</color>
+    <color name="yotsuba_background">#FCFCFC</color>
+    <color name="yotsuba_onBackground">#211A18</color>
+    <color name="yotsuba_surface">#FCFCFC</color>
+    <color name="yotsuba_onSurface">#211A18</color>
+    <color name="yotsuba_surfaceVariant">#F5DED8</color>
+    <color name="yotsuba_onSurfaceVariant">#53433F</color>
+    <color name="yotsuba_outline">#85736E</color>
+    <color name="yotsuba_inverseOnSurface">#FBEEEB</color>
+    <color name="yotsuba_inverseSurface">#362F2D</color>
+    <color name="yotsuba_primaryInverse">#FFB59D</color>
+</resources>