diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16c3a5ad..55d7c729a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Key "extension-XXX-YYY" was already used` crash (@AntsyLich)
 - Navigation layout tap zones shifting after zooming out in webtoon readers (@FooIbar)
 - Some extension not loading due to missing classes (@AwkwardPeak7)
-- Theme colors in accordance to upstream changes (@CrepeTF)
+- Theme colors in accordance to upstream changes (@CrepeTF, @AntsyLich)
 - Crash when requesting folder access on non-conforming devices (@mainrs)
 - Bugged color for Date/Scanlator in chapter list for read chapters (@ivaniskandar)
 - Categories having same `order` after restoring backup (@Cologler)
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 24200c407..c79fcf02a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,8 +4,13 @@
     <!--== AMOLED Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
         <!-- Theme Colors -->
-        <item name="colorSurface">@color/surface_amoled</item>
-        <item name="android:colorBackground">@color/background_amoled</item>
+        <item name="android:colorBackground">@color/amoled_background</item>
+        <item name="colorOnBackground">@color/amoled_onBackground</item>
+        <item name="colorSurface">@color/amoled_surface</item>
+        <item name="colorOnSurface">@color/amoled_onSurface</item>
+        <item name="colorSurfaceContainer">@color/amoled_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/amoled_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/amoled_surfaceContainerHighest</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2e6458eca..d0fb6fca7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,6 +15,7 @@
         <item name="colorOnPrimary">@color/tachiyomi_onPrimary</item>
         <item name="colorPrimaryContainer">@color/tachiyomi_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/tachiyomi_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/tachiyomi_inversePrimary</item>
         <item name="colorSecondary">@color/tachiyomi_secondary</item>
         <item name="colorOnSecondary">@color/tachiyomi_onSecondary</item>
         <item name="colorSecondaryContainer">@color/tachiyomi_secondaryContainer</item>
@@ -29,14 +30,20 @@
         <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="elevationOverlayColor">@color/tachiyomi_surfaceTint</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="colorOnSurfaceInverse">@color/tachiyomi_inverseOnSurface</item>
+        <item name="colorError">@color/tachiyomi_error</item>
+        <item name="colorOnError">@color/tachiyomi_onError</item>
+        <item name="colorErrorContainer">@color/tachiyomi_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/tachiyomi_onErrorContainer</item>
+        <item name="colorOutline">@color/tachiyomi_outline</item>
+        <item name="colorOutlineVariant">@color/tachiyomi_outlineVariant</item>
+        <item name="colorSurfaceContainer">@color/tachiyomi_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/tachiyomi_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/tachiyomi_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/tachiyomi_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/tachiyomi_surfaceContainerLowest</item>
 
         <item name="android:divider">@color/divider_default</item>
         <item name="android:listDivider">@drawable/line_divider</item>
@@ -52,7 +59,7 @@
         <!-- Themes -->
         <item name="android:windowLightStatusBar">@bool/lightStatusBar</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@color/surface_amoled</item>
+        <item name="android:navigationBarColor">@color/amoled_surface</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
         <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
@@ -91,6 +98,7 @@
         <item name="colorOnPrimary">@color/greenapple_onPrimary</item>
         <item name="colorPrimaryContainer">@color/greenapple_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/greenapple_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/greenapple_inversePrimary</item>
         <item name="colorSecondary">@color/greenapple_secondary</item>
         <item name="colorOnSecondary">@color/greenapple_onSecondary</item>
         <item name="colorSecondaryContainer">@color/greenapple_secondaryContainer</item>
@@ -105,10 +113,22 @@
         <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="colorOnSurfaceInverse">@color/greenapple_inverseOnSurface</item>
+        <item name="colorError">@color/greenapple_error</item>
+        <item name="colorOnError">@color/greenapple_onError</item>
+        <item name="colorErrorContainer">@color/greenapple_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/greenapple_onErrorContainer</item>
+        <item name="colorOutline">@color/greenapple_outline</item>
+        <item name="colorOutlineVariant">@color/greenapple_outlineVariant</item>
+        <item name="scrimBackground">@color/greenapple_scrim</item>
+        <item name="colorSurfaceBright">@color/greenapple_surfaceBright</item>
+        <item name="colorSurfaceDim">@color/greenapple_surfaceDim</item>
+        <item name="colorSurfaceContainer">@color/greenapple_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/greenapple_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/greenapple_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/greenapple_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/greenapple_surfaceContainerLowest</item>
     </style>
 
     <!--== Lavender Theme ==-->
@@ -118,6 +138,7 @@
         <item name="colorOnPrimary">@color/lavender_onPrimary</item>
         <item name="colorPrimaryContainer">@color/lavender_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/lavender_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/lavender_inversePrimary</item>
         <item name="colorSecondary">@color/lavender_secondary</item>
         <item name="colorOnSecondary">@color/lavender_onSecondary</item>
         <item name="colorSecondaryContainer">@color/lavender_secondaryContainer</item>
@@ -132,11 +153,22 @@
         <item name="colorOnSurface">@color/lavender_onSurface</item>
         <item name="colorSurfaceVariant">@color/lavender_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/lavender_onSurfaceVariant</item>
-        <item name="colorOutline">@color/lavender_outline</item>
-        <item name="colorOnSurfaceInverse">@color/lavender_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/lavender_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/lavender_primaryInverse</item>
-        <item name="elevationOverlayColor">@color/lavender_elevationOverlay</item>
+        <item name="colorOnSurfaceInverse">@color/lavender_inverseOnSurface</item>
+        <item name="colorError">@color/lavender_error</item>
+        <item name="colorOnError">@color/lavender_onError</item>
+        <item name="colorErrorContainer">@color/lavender_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/lavender_onErrorContainer</item>
+        <item name="colorOutline">@color/lavender_outline</item>
+        <item name="colorOutlineVariant">@color/lavender_outlineVariant</item>
+        <item name="scrimBackground">@color/lavender_scrim</item>
+        <item name="colorSurfaceBright">@color/lavender_surfaceBright</item>
+        <item name="colorSurfaceDim">@color/lavender_surfaceDim</item>
+        <item name="colorSurfaceContainer">@color/lavender_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/lavender_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/lavender_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/lavender_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/lavender_surfaceContainerLowest</item>
     </style>
 
     <!--== Midnight Dusk Theme ==-->
@@ -146,6 +178,7 @@
         <item name="colorOnPrimary">@color/midnightdusk_onPrimary</item>
         <item name="colorPrimaryContainer">@color/midnightdusk_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/midnightdusk_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/midnightdusk_inversePrimary</item>
         <item name="colorSecondary">@color/midnightdusk_secondary</item>
         <item name="colorOnSecondary">@color/midnightdusk_onSecondary</item>
         <item name="colorSecondaryContainer">@color/midnightdusk_secondaryContainer</item>
@@ -160,11 +193,15 @@
         <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="elevationOverlayColor">@color/midnightdusk_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/midnightdusk_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/midnightdusk_primaryInverse</item>
-        <item name="elevationOverlayColor">@color/midnightdusk_elevationOverlay</item>
+        <item name="colorOnSurfaceInverse">@color/midnightdusk_inverseOnSurface</item>
+        <item name="colorOutline">@color/midnightdusk_outline</item>
+        <item name="colorSurfaceContainer">@color/midnightdusk_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/midnightdusk_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/midnightdusk_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/midnightdusk_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/midnightdusk_surfaceContainerLowest</item>
     </style>
 
     <!--== Strawberry Daiquiri Theme ==-->
@@ -174,6 +211,7 @@
         <item name="colorOnPrimary">@color/strawberry_onPrimary</item>
         <item name="colorPrimaryContainer">@color/strawberry_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/strawberry_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/strawberry_inversePrimary</item>
         <item name="colorSecondary">@color/strawberry_secondary</item>
         <item name="colorOnSecondary">@color/strawberry_onSecondary</item>
         <item name="colorSecondaryContainer">@color/strawberry_secondaryContainer</item>
@@ -188,10 +226,22 @@
         <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>
+        <item name="colorOnSurfaceInverse">@color/strawberry_inverseOnSurface</item>
+        <item name="colorError">@color/strawberry_error</item>
+        <item name="colorOnError">@color/strawberry_onError</item>
+        <item name="colorErrorContainer">@color/strawberry_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/strawberry_onErrorContainer</item>
+        <item name="colorOutline">@color/strawberry_outline</item>
+        <item name="colorOutlineVariant">@color/strawberry_outlineVariant</item>
+        <item name="scrimBackground">@color/strawberry_scrim</item>
+        <item name="colorSurfaceBright">@color/strawberry_surfaceBright</item>
+        <item name="colorSurfaceDim">@color/strawberry_surfaceDim</item>
+        <item name="colorSurfaceContainer">@color/strawberry_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/strawberry_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/strawberry_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/strawberry_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/strawberry_surfaceContainerLowest</item>
     </style>
 
     <!--== Tako Theme ==-->
@@ -201,6 +251,7 @@
         <item name="colorOnPrimary">@color/tako_onPrimary</item>
         <item name="colorPrimaryContainer">@color/tako_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/tako_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/tako_inversePrimary</item>
         <item name="colorSecondary">@color/tako_secondary</item>
         <item name="colorOnSecondary">@color/tako_onSecondary</item>
         <item name="colorSecondaryContainer">@color/tako_secondaryContainer</item>
@@ -215,11 +266,15 @@
         <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="elevationOverlayColor">@color/tako_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/tako_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/tako_primaryInverse</item>
-        <item name="elevationOverlayColor">@color/tako_elevationOverlay</item>
+        <item name="colorOnSurfaceInverse">@color/tako_inverseOnSurface</item>
+        <item name="colorOutline">@color/tako_outline</item>
+        <item name="colorSurfaceContainer">@color/tako_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/tako_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/tako_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/tako_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/tako_surfaceContainerLowest</item>
     </style>
 
     <!--== Teal & Turquoise Theme ==-->
@@ -229,6 +284,7 @@
         <item name="colorOnPrimary">@color/tealturquoise_onPrimary</item>
         <item name="colorPrimaryContainer">@color/tealturquoise_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/tealturquoise_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/tealturquoise_inversePrimary</item>
         <item name="colorSecondary">@color/tealturquoise_secondary</item>
         <item name="colorOnSecondary">@color/tealturquoise_onSecondary</item>
         <item name="colorSecondaryContainer">@color/tealturquoise_secondaryContainer</item>
@@ -243,13 +299,15 @@
         <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="elevationOverlayColor">@color/tealturquoise_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/tealturquoise_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/tealturquoise_primaryInverse</item>
-        <item name="colorError">@color/tealturquoise_tertiary</item>
-        <item name="colorOnError">@color/tealturquoise_onTertiary</item>
-        <item name="elevationOverlayColor">@color/tealturquoise_elevationOverlay</item>
+        <item name="colorOnSurfaceInverse">@color/tealturquoise_inverseOnSurface</item>
+        <item name="colorOutline">@color/tealturquoise_outline</item>
+        <item name="colorSurfaceContainer">@color/tealturquoise_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/tealturquoise_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/tealturquoise_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/tealturquoise_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/tealturquoise_surfaceContainerLowest</item>
     </style>
 
     <!--== Yin & Yang Theme ==-->
@@ -259,6 +317,7 @@
         <item name="colorOnPrimary">@color/yinyang_onPrimary</item>
         <item name="colorPrimaryContainer">@color/yinyang_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/yinyang_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/yinyang_inversePrimary</item>
         <item name="colorSecondary">@color/yinyang_secondary</item>
         <item name="colorOnSecondary">@color/yinyang_onSecondary</item>
         <item name="colorSecondaryContainer">@color/yinyang_secondaryContainer</item>
@@ -273,10 +332,15 @@
         <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="elevationOverlayColor">@color/yinyang_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/yinyang_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/yinyang_primaryInverse</item>
+        <item name="colorOnSurfaceInverse">@color/yinyang_inverseOnSurface</item>
+        <item name="colorOutline">@color/yinyang_outline</item>
+        <item name="colorSurfaceContainer">@color/yinyang_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/yinyang_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/yinyang_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/yinyang_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/yinyang_surfaceContainerLowest</item>
     </style>
 
     <!--== Yotsuba Theme ==-->
@@ -286,6 +350,7 @@
         <item name="colorOnPrimary">@color/yotsuba_onPrimary</item>
         <item name="colorPrimaryContainer">@color/yotsuba_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/yotsuba_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/yotsuba_inversePrimary</item>
         <item name="colorSecondary">@color/yotsuba_secondary</item>
         <item name="colorOnSecondary">@color/yotsuba_onSecondary</item>
         <item name="colorSecondaryContainer">@color/yotsuba_secondaryContainer</item>
@@ -300,10 +365,15 @@
         <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="elevationOverlayColor">@color/yotsuba_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/yotsuba_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/yotsuba_primaryInverse</item>
+        <item name="colorOnSurfaceInverse">@color/yotsuba_inverseOnSurface</item>
+        <item name="colorOutline">@color/yotsuba_outline</item>
+        <item name="colorSurfaceContainer">@color/yotsuba_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/yotsuba_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/yotsuba_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/yotsuba_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/yotsuba_surfaceContainerLowest</item>
     </style>
 
     <!--== Tidal Wave Theme ==-->
@@ -313,6 +383,7 @@
         <item name="colorOnPrimary">@color/tidalwave_onPrimary</item>
         <item name="colorPrimaryContainer">@color/tidalwave_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/tidalwave_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/tidalwave_inversePrimary</item>
         <item name="colorSecondary">@color/tidalwave_secondary</item>
         <item name="colorOnSecondary">@color/tidalwave_onSecondary</item>
         <item name="colorSecondaryContainer">@color/tidalwave_secondaryContainer</item>
@@ -327,10 +398,15 @@
         <item name="colorOnSurface">@color/tidalwave_onSurface</item>
         <item name="colorSurfaceVariant">@color/tidalwave_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/tidalwave_onSurfaceVariant</item>
-        <item name="colorOutline">@color/tidalwave_outline</item>
-        <item name="colorOnSurfaceInverse">@color/tidalwave_inverseOnSurface</item>
+        <item name="elevationOverlayColor">@color/tidalwave_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/tidalwave_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/tidalwave_primaryInverse</item>
+        <item name="colorOnSurfaceInverse">@color/tidalwave_inverseOnSurface</item>
+        <item name="colorOutline">@color/tidalwave_outline</item>
+        <item name="colorSurfaceContainer">@color/tidalwave_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/tidalwave_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/tidalwave_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/tidalwave_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/tidalwave_surfaceContainerLowest</item>
     </style>
 
     <!--== Nord Theme ==-->
@@ -340,6 +416,7 @@
         <item name="colorOnPrimary">@color/nord_onPrimary</item>
         <item name="colorPrimaryContainer">@color/nord_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/nord_onPrimaryContainer</item>
+        <item name="colorPrimaryInverse">@color/nord_inversePrimary</item>
         <item name="colorSecondary">@color/nord_secondary</item>
         <item name="colorOnSecondary">@color/nord_onSecondary</item>
         <item name="colorSecondaryContainer">@color/nord_secondaryContainer</item>
@@ -354,14 +431,19 @@
         <item name="colorOnSurface">@color/nord_onSurface</item>
         <item name="colorSurfaceVariant">@color/nord_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/nord_onSurfaceVariant</item>
-        <item name="colorOutline">@color/nord_outline</item>
-        <item name="colorOnSurfaceInverse">@color/nord_inverseOnSurface</item>
+        <item name="elevationOverlayColor">@color/nord_surfaceTint</item>
         <item name="colorSurfaceInverse">@color/nord_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/nord_primaryInverse</item>
+        <item name="colorOnSurfaceInverse">@color/nord_inverseOnSurface</item>
         <item name="colorOnError">@color/nord_onError</item>
         <item name="colorErrorContainer">@color/nord_errorContainer</item>
         <item name="colorOnErrorContainer">@color/nord_onErrorContainer</item>
-        <item name="elevationOverlayColor">@color/nord_elevationOverlay</item>
+        <item name="colorOutline">@color/nord_outline</item>
+        <item name="colorOutlineVariant">@color/nord_outlineVariant</item>
+        <item name="colorSurfaceContainer">@color/nord_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/nord_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/nord_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/nord_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/nord_surfaceContainerLowest</item>
     </style>
     
     <!--== AMOLED Mode Overlay ==-->
diff --git a/presentation-core/src/main/res/values-night/colors.xml b/presentation-core/src/main/res/values-night/colors.xml
index 9d6a4a86a..5f79e77f6 100644
--- a/presentation-core/src/main/res/values-night/colors.xml
+++ b/presentation-core/src/main/res/values-night/colors.xml
@@ -2,11 +2,6 @@
 <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="divider_default">@color/md_white_1000_12</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_greenapple.xml b/presentation-core/src/main/res/values-night/colors_greenapple.xml
index ecc50b64b..2d83e66e2 100644
--- a/presentation-core/src/main/res/values-night/colors_greenapple.xml
+++ b/presentation-core/src/main/res/values-night/colors_greenapple.xml
@@ -12,25 +12,38 @@
 -->
 <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_onPrimary">#003917</color>
+    <color name="greenapple_primaryContainer">#017737</color>
+    <color name="greenapple_onPrimaryContainer">#FFFFFF</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>
+    <color name="greenapple_onSecondary">#003917</color>
+    <color name="greenapple_secondaryContainer">#017737</color>
+    <color name="greenapple_onSecondaryContainer">#FFFFFF</color>
+    <color name="greenapple_tertiary">#FFB3AC</color>
+    <color name="greenapple_onTertiary">#680008</color>
+    <color name="greenapple_tertiaryContainer">#C7282A</color>
+    <color name="greenapple_onTertiaryContainer">#FFFFFF</color>
+    <color name="greenapple_error">#FFB4AB</color>
+    <color name="greenapple_onError">#690005</color>
+    <color name="greenapple_errorContainer">#93000A</color>
+    <color name="greenapple_onErrorContainer">#FFDAD6</color>
+    <color name="greenapple_background">#0F1510</color>
+    <color name="greenapple_onBackground">#DFE4DB</color>
+    <color name="greenapple_surface">#0F1510</color>
+    <color name="greenapple_onSurface">#DFE4DB</color>
+    <color name="greenapple_surfaceVariant">#3F493F</color>
+    <color name="greenapple_onSurfaceVariant">#BECABC</color>
+    <color name="greenapple_outline">#889487</color>
+    <color name="greenapple_outlineVariant">#3F493F</color>
+    <color name="greenapple_scrim">#000000</color>
+    <color name="greenapple_inverseSurface">#DFE4DB</color>
+    <color name="greenapple_inverseOnSurface">#2C322C</color>
+    <color name="greenapple_inversePrimary">#006D32</color>
+    <color name="greenapple_surfaceDim">#0F1510</color>
+    <color name="greenapple_surfaceBright">#353B35</color>
+    <color name="greenapple_surfaceContainerLowest">#0A0F0B</color>
+    <color name="greenapple_surfaceContainerLow">#181D18</color>
+    <color name="greenapple_surfaceContainer">#1C211C</color>
+    <color name="greenapple_surfaceContainerHigh">#262B26</color>
+    <color name="greenapple_surfaceContainerHighest">#313630</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_lavender.xml b/presentation-core/src/main/res/values-night/colors_lavender.xml
index f9d558025..54cdbd450 100644
--- a/presentation-core/src/main/res/values-night/colors_lavender.xml
+++ b/presentation-core/src/main/res/values-night/colors_lavender.xml
@@ -12,26 +12,38 @@
 -->
 <resources>
     <color name="lavender_primary">#A177FF</color>
-    <color name="lavender_onPrimary">#111129</color>
+    <color name="lavender_onPrimary">#3D0090</color>
     <color name="lavender_primaryContainer">#A177FF</color>
-    <color name="lavender_onPrimaryContainer">#111129</color>
+    <color name="lavender_onPrimaryContainer">#FFFFFF</color>
     <color name="lavender_secondary">#A177FF</color>
-    <color name="lavender_onSecondary">#111129</color>
+    <color name="lavender_onSecondary">#FFFFFF</color>
     <color name="lavender_secondaryContainer">#423271</color>
-    <color name="lavender_onSecondaryContainer">#111129</color>
-    <color name="lavender_tertiary">#5E25E1</color>
-    <color name="lavender_onTertiary">#E8E8E8</color>
-    <color name="lavender_tertiaryContainer">#111129</color>
-    <color name="lavender_onTertiaryContainer">#DEE8FF</color>
+    <color name="lavender_onSecondaryContainer">#A177FF</color>
+    <color name="lavender_tertiary">#CDBDFF</color>
+    <color name="lavender_onTertiary">#360096</color>
+    <color name="lavender_tertiaryContainer">#5512D8</color>
+    <color name="lavender_onTertiaryContainer">#EFE6FF</color>
+    <color name="lavender_error">#FFB4AB</color>
+    <color name="lavender_onError">#690005</color>
+    <color name="lavender_errorContainer">#93000A</color>
+    <color name="lavender_onErrorContainer">#FFDAD6</color>
     <color name="lavender_background">#111129</color>
-    <color name="lavender_onBackground">#DEE8FF</color>
+    <color name="lavender_onBackground">#E7E0EC</color>
     <color name="lavender_surface">#111129</color>
-    <color name="lavender_onSurface">#DEE8FF</color>
-    <color name="lavender_surfaceVariant">#2CB6B6B6</color>
-    <color name="lavender_onSurfaceVariant">#E8E8E8</color>
-    <color name="lavender_outline">#A8905FFF</color>
-    <color name="lavender_inverseOnSurface">#DEE8FF</color>
-    <color name="lavender_inverseSurface">#221247</color>
-    <color name="lavender_primaryInverse">#A177FF</color>
-    <color name="lavender_elevationOverlay">@color/lavender_primary</color>
+    <color name="lavender_onSurface">#E7E0EC</color>
+    <color name="lavender_surfaceVariant">#3D2F6B</color>
+    <color name="lavender_onSurfaceVariant">#CBC3D6</color>
+    <color name="lavender_outline">#958E9F</color>
+    <color name="lavender_outlineVariant">#4A4453</color>
+    <color name="lavender_scrim">#000000</color>
+    <color name="lavender_inverseSurface">#E7E0EC</color>
+    <color name="lavender_inverseOnSurface">#322F38</color>
+    <color name="lavender_inversePrimary">#6D41C8</color>
+    <color name="lavender_surfaceDim">#111129</color>
+    <color name="lavender_surfaceBright">#3B3841</color>
+    <color name="lavender_surfaceContainerLowest">#15132d</color>
+    <color name="lavender_surfaceContainerLow">#171531</color>
+    <color name="lavender_surfaceContainer">#1D193B</color>
+    <color name="lavender_surfaceContainerHigh">#241f41</color>
+    <color name="lavender_surfaceContainerHighest">#282446</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
index f10e84662..b245b1e7a 100644
--- a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
+++ b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
@@ -15,23 +15,28 @@
     <color name="midnightdusk_onPrimary">#FFFFFF</color>
     <color name="midnightdusk_primaryContainer">#BD1C5C</color>
     <color name="midnightdusk_onPrimaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_inversePrimary">#F02475</color>
     <color name="midnightdusk_secondary">#F02475</color>
-    <color name="midnightdusk_onSecondary">#FFFFFF</color>
+    <color name="midnightdusk_onSecondary">#16151D</color>
     <color name="midnightdusk_secondaryContainer">#66183C</color>
-    <color name="midnightdusk_onSecondaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_onSecondaryContainer">#F02475</color>
     <color name="midnightdusk_tertiary">#55971C</color>
-    <color name="midnightdusk_onTertiary">#FFFFFF</color>
+    <color name="midnightdusk_onTertiary">#16151D</color>
     <color name="midnightdusk_tertiaryContainer">#386412</color>
     <color name="midnightdusk_onTertiaryContainer">#E5E1E5</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_surfaceVariant">#281624</color>
     <color name="midnightdusk_onSurfaceVariant">#D6C1C4</color>
-    <color name="midnightdusk_outline">#9F8C8F</color>
+    <color name="midnightdusk_surfaceTint">#F02475</color>
     <color name="midnightdusk_inverseSurface">#333043</color>
     <color name="midnightdusk_inverseOnSurface">#FFFFFF</color>
-    <color name="midnightdusk_primaryInverse">#F02475</color>
-    <color name="midnightdusk_elevationOverlay">#2C0013</color>
+    <color name="midnightdusk_outline">#9F8C8F</color>
+    <color name="midnightdusk_surfaceContainerLowest">#221320</color>
+    <color name="midnightdusk_surfaceContainerLow">#251522</color>
+    <color name="midnightdusk_surfaceContainer">#281624</color>
+    <color name="midnightdusk_surfaceContainerHigh">#2D1C2A</color>
+    <color name="midnightdusk_surfaceContainerHighest">#2F1F2C</color>
 </resources>
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values-night/colors_nord.xml b/presentation-core/src/main/res/values-night/colors_nord.xml
index 058d52a4a..0aeb36cf9 100644
--- a/presentation-core/src/main/res/values-night/colors_nord.xml
+++ b/presentation-core/src/main/res/values-night/colors_nord.xml
@@ -5,26 +5,32 @@
     <color name="nord_onPrimary">#2E3440</color>
     <color name="nord_primaryContainer">#88C0D0</color>
     <color name="nord_onPrimaryContainer">#2E3440</color>
+    <color name="nord_inversePrimary">#397E91</color>
     <color name="nord_secondary">#81A1C1</color>
     <color name="nord_onSecondary">#2E3440</color>
     <color name="nord_secondaryContainer">#506275</color>
-    <color name="nord_onSecondaryContainer">#2E3440</color>
+    <color name="nord_onSecondaryContainer">#88C0D0</color>
     <color name="nord_tertiary">#5E81AC</color>
     <color name="nord_onTertiary">#000000</color>
     <color name="nord_tertiaryContainer">#5E81AC</color>
     <color name="nord_onTertiaryContainer">#000000</color>
     <color name="nord_background">#2E3440</color>
     <color name="nord_onBackground">#ECEFF4</color>
-    <color name="nord_surface">#3B4252</color>
+    <color name="nord_surface">#2E3440</color>
     <color name="nord_onSurface">#ECEFF4</color>
-    <color name="nord_surfaceVariant">#2E3440</color>
+    <color name="nord_surfaceVariant">#414C5C</color>
     <color name="nord_onSurfaceVariant">#ECEFF4</color>
-    <color name="nord_outline">#D8DEE9</color>
-    <color name="nord_inverseOnSurface">#2E3440</color>
+    <color name="nord_surfaceTint">#88C0D0</color>
     <color name="nord_inverseSurface">#D8DEE9</color>
-    <color name="nord_primaryInverse">#397E91</color>
-    <color name="nord_elevationOverlay">#434C5E</color>
+    <color name="nord_inverseOnSurface">#2E3440</color>
+    <color name="nord_outline">#6d717b</color>
+    <color name="nord_outlineVariant">#90939a</color>
     <color name="nord_onError">#2E3440</color>
     <color name="nord_errorContainer">#BF616A</color>
     <color name="nord_onErrorContainer">#000000</color>
+    <color name="nord_surfaceContainerLowest">#373F4D</color>
+    <color name="nord_surfaceContainerLow">#3E4756</color>
+    <color name="nord_surfaceContainer">#414C5C</color>
+    <color name="nord_surfaceContainerHigh">#4E5766</color>
+    <color name="nord_surfaceContainerHighest">#505968</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_strawberry.xml b/presentation-core/src/main/res/values-night/colors_strawberry.xml
index 79071bd14..f1a7b4b73 100644
--- a/presentation-core/src/main/res/values-night/colors_strawberry.xml
+++ b/presentation-core/src/main/res/values-night/colors_strawberry.xml
@@ -11,26 +11,39 @@
   ~ 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_primary">#FFB2B8</color>
+    <color name="strawberry_onPrimary">#67001D</color>
+    <color name="strawberry_primaryContainer">#D53855</color>
+    <color name="strawberry_onPrimaryContainer">#FFFFFF</color>
+    <color name="strawberry_secondary">#ED4A65</color>
+    <color name="strawberry_onSecondary">#201A1A</color>
     <color name="strawberry_secondaryContainer">#91002A</color>
-    <color name="strawberry_onSecondaryContainer">#FFDADD</color>
+    <color name="strawberry_onSecondaryContainer">#FFFFFF</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_onTertiary">#201A1A</color>
+    <color name="strawberry_tertiaryContainer">#775930</color>
+    <color name="strawberry_onTertiaryContainer">#FFF7F1</color>
+    <color name="strawberry_error">#FFB4AB</color>
+    <color name="strawberry_onError">#690005</color>
+    <color name="strawberry_errorContainer">#93000A</color>
+    <color name="strawberry_onErrorContainer">#FFDAD6</color>
     <color name="strawberry_background">#201A1A</color>
-    <color name="strawberry_onBackground">#ECDFDF</color>
+    <color name="strawberry_onBackground">#F7DCDD</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>
+    <color name="strawberry_onSurface">#F7DCDD</color>
+    <color name="strawberry_surfaceVariant">#322727</color>
+    <color name="strawberry_onSurfaceVariant">#E1BEC0</color>
+    <color name="strawberry_outline">#A9898B</color>
+    <color name="strawberry_outlineVariant">#594042</color>
+    <color name="strawberry_scrim">#000000</color>
+    <color name="strawberry_inverseSurface">#F7DCDD</color>
+    <color name="strawberry_inverseOnSurface">#3D2C2D</color>
+    <color name="strawberry_inversePrimary">#B61F40</color>
+    <color name="strawberry_surfaceDim">#1D1011</color>
+    <color name="strawberry_surfaceBright">#463536</color>
+    <color name="strawberry_surfaceContainerLowest">#2C2222</color>
+    <color name="strawberry_surfaceContainerLow">#302525</color>
+    <color name="strawberry_surfaceContainer">#322727</color>
+    <color name="strawberry_surfaceContainerHigh">#3C2F2F</color>
+    <color name="strawberry_surfaceContainerHighest">#463737</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_tachiyomi.xml b/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
index 40f5befcc..6af256bed 100644
--- a/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
+++ b/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
@@ -10,26 +10,37 @@
   ~ 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_primary">#B0C6FF</color>
+    <color name="tachiyomi_onPrimary">#002D6E</color>
+    <color name="tachiyomi_primaryContainer">#00429B</color>
+    <color name="tachiyomi_onPrimaryContainer">#D9E2FF</color>
+    <color name="tachiyomi_inversePrimary">#0058CA</color>
+    <color name="tachiyomi_secondary">#B0C6FF</color>
+    <color name="tachiyomi_onSecondary">#002D6E</color>
+    <color name="tachiyomi_secondaryContainer">#00429B</color>
+    <color name="tachiyomi_onSecondaryContainer">#D9E2FF</color>
     <color name="tachiyomi_tertiary">#7ADC77</color>
-    <color name="tachiyomi_onTertiary">#003907</color>
-    <color name="tachiyomi_tertiaryContainer">#00530D</color>
+    <color name="tachiyomi_onTertiary">#003909</color>
+    <color name="tachiyomi_tertiaryContainer">#005312</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_background">#1B1B1F</color>
+    <color name="tachiyomi_onBackground">#E3E2E6</color>
+    <color name="tachiyomi_surface">#1B1B1F</color>
+    <color name="tachiyomi_onSurface">#E3E2E6</color>
+    <color name="tachiyomi_surfaceVariant">#211F26</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>
+    <color name="tachiyomi_surfaceTint">#B0C6FF</color>
+    <color name="tachiyomi_inverseSurface">#E3E2E6</color>
+    <color name="tachiyomi_inverseOnSurface">#1B1B1F</color>
+    <color name="tachiyomi_error">#FFB4AB</color>
+    <color name="tachiyomi_onError">#690005</color>
+    <color name="tachiyomi_errorContainer">#93000A</color>
+    <color name="tachiyomi_onErrorContainer">#FFDAD6</color>
+    <color name="tachiyomi_outline">#8F9099</color>
+    <color name="tachiyomi_outlineVariant">#44464F</color>
+    <color name="tachiyomi_surfaceContainerLowest">#1A181D</color>
+    <color name="tachiyomi_surfaceContainerLow">#1E1C22</color>
+    <color name="tachiyomi_surfaceContainer">#211F26</color>
+    <color name="tachiyomi_surfaceContainerHigh">#292730</color>
+    <color name="tachiyomi_surfaceContainerHighest">#302E38</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_tako.xml b/presentation-core/src/main/res/values-night/colors_tako.xml
index 63c2db1ce..0824df1af 100644
--- a/presentation-core/src/main/res/values-night/colors_tako.xml
+++ b/presentation-core/src/main/res/values-night/colors_tako.xml
@@ -15,10 +15,11 @@
     <color name="tako_onPrimary">#38294E</color>
     <color name="tako_primaryContainer">#F3B375</color>
     <color name="tako_onPrimaryContainer">#38294E</color>
+    <color name="tako_inversePrimary">#84531E</color>
     <color name="tako_secondary">#F3B375</color>
-    <color name="tako_onSecondary">#5C4D4B</color>
-    <color name="tako_secondaryContainer">#F3B375</color>
-    <color name="tako_onSecondaryContainer">#38294E</color>
+    <color name="tako_onSecondary">#38294E</color>
+    <color name="tako_secondaryContainer">#5C4D4B</color>
+    <color name="tako_onSecondaryContainer">#F3B375</color>
     <color name="tako_tertiary">#66577E</color>
     <color name="tako_onTertiary">#F3B375</color>
     <color name="tako_tertiaryContainer">#4E4065</color>
@@ -27,11 +28,15 @@
     <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_surfaceVariant">#2A2A3C</color>
     <color name="tako_onSurfaceVariant">#CBC4CE</color>
-    <color name="tako_outline">#958F99</color>
-    <color name="tako_inverseOnSurface">#1B1B1E</color>
+    <color name="tako_surfaceTint">#66577E</color>
     <color name="tako_inverseSurface">#E5E1E6</color>
-    <color name="tako_primaryInverse">#84531E</color>
-    <color name="tako_elevationOverlay">@color/tako_tertiary</color>
+    <color name="tako_inverseOnSurface">#1B1B1E</color>
+    <color name="tako_outline">#958F99</color>
+    <color name="tako_surfaceContainerLowest">#20202E</color>
+    <color name="tako_surfaceContainerLow">#262636</color>
+    <color name="tako_surfaceContainer">#2A2A3C</color>
+    <color name="tako_surfaceContainerHigh">#303044</color>
+    <color name="tako_surfaceContainerHighest">#36364D</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_tealturqoise.xml b/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
index 69d3e4d4e..21bff2b26 100644
--- a/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
+++ b/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <color name="tealturquoise_primary">#40E0D0</color>
     <color name="tealturquoise_onPrimary">#000000</color>
     <color name="tealturquoise_primaryContainer">#40E0D0</color>
     <color name="tealturquoise_onPrimaryContainer">#000000</color>
+    <color name="tealturquoise_inversePrimary">#008080</color>
     <color name="tealturquoise_secondary">#40E0D0</color>
     <color name="tealturquoise_onSecondary">#000000</color>
     <color name="tealturquoise_secondaryContainer">#18544E</color>
@@ -17,11 +17,15 @@
     <color name="tealturquoise_onBackground">#DFDEDA</color>
     <color name="tealturquoise_surface">#202125</color>
     <color name="tealturquoise_onSurface">#DFDEDA</color>
-    <color name="tealturquoise_surfaceVariant">#3F4947</color>
+    <color name="tealturquoise_surfaceVariant">#233133</color>
     <color name="tealturquoise_onSurfaceVariant">#DFDEDA</color>
-    <color name="tealturquoise_outline">#899391</color>
-    <color name="tealturquoise_inverseOnSurface">#202125</color>
+    <color name="tealturquoise_surfaceTint">#40E0D0</color>
     <color name="tealturquoise_inverseSurface">#DFDEDA</color>
-    <color name="tealturquoise_primaryInverse">#008080</color>
-    <color name="tealturquoise_elevationOverlay">#18544E</color>
+    <color name="tealturquoise_inverseOnSurface">#202125</color>
+    <color name="tealturquoise_outline">#899391</color>
+    <color name="tealturquoise_surfaceContainerLowest">#202C2E</color>
+    <color name="tealturquoise_surfaceContainerLow">#222F31</color>
+    <color name="tealturquoise_surfaceContainer">#233133</color>
+    <color name="tealturquoise_surfaceContainerHigh">#28383A</color>
+    <color name="tealturquoise_surfaceContainerHighest">#2F4244</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_tidalwave.xml b/presentation-core/src/main/res/values-night/colors_tidalwave.xml
index 7cf425d55..c2eb63436 100644
--- a/presentation-core/src/main/res/values-night/colors_tidalwave.xml
+++ b/presentation-core/src/main/res/values-night/colors_tidalwave.xml
@@ -14,6 +14,7 @@
     <color name="tidalwave_onPrimary">#003544</color>
     <color name="tidalwave_primaryContainer">#004d61</color>
     <color name="tidalwave_onPrimaryContainer">#b8eaff</color>
+    <color name="tidalwave_inversePrimary">#a12b03</color>
     <color name="tidalwave_secondary">#5ed4fc</color>
     <color name="tidalwave_onSecondary">#003544</color>
     <color name="tidalwave_secondaryContainer">#004d61</color>
@@ -26,11 +27,15 @@
     <color name="tidalwave_onBackground">#d5e3ff</color>
     <color name="tidalwave_surface">#001c3b</color>
     <color name="tidalwave_onSurface">#d5e3ff</color>
-    <color name="tidalwave_surfaceVariant">#40484c</color>
+    <color name="tidalwave_surfaceVariant">#082b4b</color>
     <color name="tidalwave_onSurfaceVariant">#bfc8cc</color>
-    <color name="tidalwave_outline">#8a9296</color>
-    <color name="tidalwave_inverseOnSurface">#001c3b</color>
+    <color name="tidalwave_surfaceTint">#5ed4fc</color>
     <color name="tidalwave_inverseSurface">#ffe3c4</color>
-    <color name="tidalwave_primaryInverse">#a12b03</color>
-
+    <color name="tidalwave_inverseOnSurface">#001c3b</color>
+    <color name="tidalwave_outline">#8a9296</color>
+    <color name="tidalwave_surfaceContainerLowest">#072642</color>
+    <color name="tidalwave_surfaceContainerLow">#072947</color>
+    <color name="tidalwave_surfaceContainer">#082b4b</color>
+    <color name="tidalwave_surfaceContainerHigh">#093257</color>
+    <color name="tidalwave_surfaceContainerHighest">#0A3861</color>
 </resources>
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values-night/colors_yinyang.xml b/presentation-core/src/main/res/values-night/colors_yinyang.xml
index 0a34a2da6..1dccc74e3 100644
--- a/presentation-core/src/main/res/values-night/colors_yinyang.xml
+++ b/presentation-core/src/main/res/values-night/colors_yinyang.xml
@@ -9,6 +9,7 @@
     <color name="yinyang_onPrimary">#5A5A5A</color>
     <color name="yinyang_primaryContainer">#FFFFFF</color>
     <color name="yinyang_onPrimaryContainer">#000000</color>
+    <color name="yinyang_inversePrimary">#CECECE</color>
     <color name="yinyang_secondary">#FFFFFF</color>
     <color name="yinyang_onSecondary">#5A5A5A</color>
     <color name="yinyang_secondaryContainer">#717171</color>
@@ -21,10 +22,15 @@
     <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_surfaceVariant">#313131</color>
     <color name="yinyang_onSurfaceVariant">#D1D1D1</color>
-    <color name="yinyang_outline">#999999</color>
-    <color name="yinyang_inverseOnSurface">#1E1E1E</color>
+    <color name="yinyang_surfaceTint">#FFFFFF</color>
     <color name="yinyang_inverseSurface">#E6E6E6</color>
-    <color name="yinyang_primaryInverse">#CECECE</color>
+    <color name="yinyang_inverseOnSurface">#1E1E1E</color>
+    <color name="yinyang_outline">#999999</color>
+    <color name="yinyang_surfaceContainerLowest">#2A2A2A</color>
+    <color name="yinyang_surfaceContainerLow">#2D2D2D</color>
+    <color name="yinyang_surfaceContainer">#313131</color>
+    <color name="yinyang_surfaceContainerHigh">#383838</color>
+    <color name="yinyang_surfaceContainerHighest">#3F3F3F</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_yotsuba.xml b/presentation-core/src/main/res/values-night/colors_yotsuba.xml
index 4ca498a18..74ddae02d 100644
--- a/presentation-core/src/main/res/values-night/colors_yotsuba.xml
+++ b/presentation-core/src/main/res/values-night/colors_yotsuba.xml
@@ -15,6 +15,7 @@
     <color name="yotsuba_onPrimary">#5F1600</color>
     <color name="yotsuba_primaryContainer">#862200</color>
     <color name="yotsuba_onPrimaryContainer">#FFDBCF</color>
+    <color name="yotsuba_inversePrimary">#AE3200</color>
     <color name="yotsuba_secondary">#FFB59D</color>
     <color name="yotsuba_onSecondary">#5F1600</color>
     <color name="yotsuba_secondaryContainer">#862200</color>
@@ -27,10 +28,15 @@
     <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_surfaceVariant">#332723</color>
     <color name="yotsuba_onSurfaceVariant">#D8C2BC</color>
-    <color name="yotsuba_outline">#A08C87</color>
-    <color name="yotsuba_inverseOnSurface">#211A18</color>
+    <color name="yotsuba_surfaceTint">#FFB59D</color>
     <color name="yotsuba_inverseSurface">#EDE0DD</color>
-    <color name="yotsuba_primaryInverse">#AE3200</color>
+    <color name="yotsuba_inverseOnSurface">#211A18</color>
+    <color name="yotsuba_outline">#A08C87</color>
+    <color name="yotsuba_surfaceContainerLowest">#2E221F</color>
+    <color name="yotsuba_surfaceContainerLow">#312521</color>
+    <color name="yotsuba_surfaceContainer">#332723</color>
+    <color name="yotsuba_surfaceContainerHigh">#413531</color>
+    <color name="yotsuba_surfaceContainerHighest">#4C403D</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors.xml b/presentation-core/src/main/res/values/colors.xml
index 551dcc0a7..f8acc3cf4 100644
--- a/presentation-core/src/main/res/values/colors.xml
+++ b/presentation-core/src/main/res/values/colors.xml
@@ -4,11 +4,6 @@
 
     <color name="cover_placeholder">#1F888888</color>
 
-    <color name="error">#BA1B1B</color>
-    <color name="errorContainer">#FFDAD4</color>
-    <color name="onError">#FFFFFF</color>
-    <color name="onErrorContainer">#410001</color>
-
     <!-- Default Theme -->
     <color name="divider_default">@color/md_black_1000_12</color>
 
@@ -16,8 +11,13 @@
     <color name="accent_blue">#54759E</color>
 
     <!-- AMOLED Mode -->
-    <color name="surface_amoled">#000001</color>
-    <color name="background_amoled">#000000</color>
+    <color name="amoled_background">#000000</color>
+    <color name="amoled_onBackground">#FFFFFF</color>
+    <color name="amoled_surface">#000000</color>
+    <color name="amoled_onSurface">#FFFFFF</color>
+    <color name="amoled_surfaceContainer">#0C0C0C</color>
+    <color name="amoled_surfaceContainerHigh">#131313</color>
+    <color name="amoled_surfaceContainerHighest">#1B1B1B</color>
 
     <!-- Material Design Colors -->
     <color name="md_black_1000_12">#1F000000</color>
diff --git a/presentation-core/src/main/res/values/colors_greenapple.xml b/presentation-core/src/main/res/values/colors_greenapple.xml
index 13dbf83dc..df06d61e5 100644
--- a/presentation-core/src/main/res/values/colors_greenapple.xml
+++ b/presentation-core/src/main/res/values/colors_greenapple.xml
@@ -11,26 +11,39 @@
   ~ Neutral #5D5F5B
 -->
 <resources>
-    <color name="greenapple_primary">#006D2F</color>
+    <color name="greenapple_primary">#005927</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_primaryContainer">#188140</color>
+    <color name="greenapple_onPrimaryContainer">#FFFFFF</color>
+    <color name="greenapple_secondary">#005927</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_secondaryContainer">#97f7a9</color>
+    <color name="greenapple_onSecondaryContainer">#000000</color>
+    <color name="greenapple_tertiary">#9D0012</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>
+    <color name="greenapple_tertiaryContainer">#D33131</color>
+    <color name="greenapple_onTertiaryContainer">#FFFFFF</color>
+    <color name="greenapple_error">#BA1A1A</color>
+    <color name="greenapple_onError">#FFFFFF</color>
+    <color name="greenapple_errorContainer">#FFDAD6</color>
+    <color name="greenapple_onErrorContainer">#410002</color>
+    <color name="greenapple_background">#F6FBF2</color>
+    <color name="greenapple_onBackground">#181D18</color>
+    <color name="greenapple_surface">#F6FBF2</color>
+    <color name="greenapple_onSurface">#181D18</color>
+    <color name="greenapple_surfaceVariant">#DAE6D7</color>
+    <color name="greenapple_onSurfaceVariant">#3F493F</color>
+    <color name="greenapple_outline">#6F7A6E</color>
+    <color name="greenapple_outlineVariant">#BECABC</color>
+    <color name="greenapple_scrim">#000000</color>
+    <color name="greenapple_inverseSurface">#2C322C</color>
+    <color name="greenapple_inverseOnSurface">#EDF2E9</color>
+    <color name="greenapple_inversePrimary">#7ADB8F</color>
+    <color name="greenapple_surfaceDim">#D6DCD3</color>
+    <color name="greenapple_surfaceBright">#F6FBF2</color>
+    <color name="greenapple_surfaceContainerLowest">#FFFFFF</color>
+    <color name="greenapple_surfaceContainerLow">#F0F5EC</color>
+    <color name="greenapple_surfaceContainer">#EAEFE6</color>
+    <color name="greenapple_surfaceContainerHigh">#E4EAE1</color>
+    <color name="greenapple_surfaceContainerHighest">#DFE4DB</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_lavender.xml b/presentation-core/src/main/res/values/colors_lavender.xml
index 02d6274e3..dd763c2eb 100644
--- a/presentation-core/src/main/res/values/colors_lavender.xml
+++ b/presentation-core/src/main/res/values/colors_lavender.xml
@@ -10,27 +10,39 @@
   ~ Neutral #EDE2FF
 -->
 <resources>
-    <color name="lavender_primary">#7B46AF</color>
-    <color name="lavender_onPrimary">#EDE2FF</color>
+    <color name="lavender_primary">#6D41C8</color>
+    <color name="lavender_onPrimary">#FFFFFF</color>
     <color name="lavender_primaryContainer">#7B46AF</color>
-    <color name="lavender_onPrimaryContainer">#EDE2FF</color>
+    <color name="lavender_onPrimaryContainer">#130038</color>
     <color name="lavender_secondary">#7B46AF</color>
     <color name="lavender_onSecondary">#EDE2FF</color>
     <color name="lavender_secondaryContainer">#C9B0E6</color>
-    <color name="lavender_onSecondaryContainer">#EDE2FF</color>
+    <color name="lavender_onSecondaryContainer">#7B46AF</color>
     <color name="lavender_tertiary">#EDE2FF</color>
     <color name="lavender_onTertiary">#7B46AF</color>
-    <color name="lavender_tertiaryContainer">#EDE2FF</color>
-    <color name="lavender_onTertiaryContainer">#7B46AF</color>
+    <color name="lavender_tertiaryContainer">#6D3BF0</color>
+    <color name="lavender_onTertiaryContainer">#FFFFFF</color>
+    <color name="lavender_error">#BA1A1A</color>
+    <color name="lavender_onError">#FFFFFF</color>
+    <color name="lavender_errorContainer">#FFDAD6</color>
+    <color name="lavender_onErrorContainer">#410002</color>
     <color name="lavender_background">#EDE2FF</color>
-    <color name="lavender_onBackground">#1B1B22</color>
+    <color name="lavender_onBackground">#1D1A22</color>
     <color name="lavender_surface">#EDE2FF</color>
-    <color name="lavender_onSurface">#1B1B22</color>
-    <color name="lavender_surfaceVariant">#B9B0CC</color>
-    <color name="lavender_onSurfaceVariant">#D849454E</color>
-    <color name="lavender_outline">#7B46AF</color>
-    <color name="lavender_inverseOnSurface">#F3EFF4</color>
-    <color name="lavender_inverseSurface">#313033</color>
-    <color name="lavender_primaryInverse">#D6BAFF</color>
-    <color name="lavender_elevationOverlay">@color/lavender_primary</color>
+    <color name="lavender_onSurface">#1D1A22</color>
+    <color name="lavender_surfaceVariant">#E4D5F8</color>
+    <color name="lavender_onSurfaceVariant">#4A4453</color>
+    <color name="lavender_outline">#7B7485</color>
+    <color name="lavender_outlineVariant">#CBC3D6</color>
+    <color name="lavender_scrim">#000000</color>
+    <color name="lavender_inverseSurface">#322F38</color>
+    <color name="lavender_inverseOnSurface">#F5EEFA</color>
+    <color name="lavender_inversePrimary">#A177FF</color>
+    <color name="lavender_surfaceDim">#DED7E3</color>
+    <color name="lavender_surfaceBright">#EDE2FF</color>
+    <color name="lavender_surfaceContainerLowest">#DACCEC</color>
+    <color name="lavender_surfaceContainerLow">#DED0F1</color>
+    <color name="lavender_surfaceContainer">#E4D5F8</color>
+    <color name="lavender_surfaceContainerHigh">#EADCFD</color>
+    <color name="lavender_surfaceContainerHighest">#EEE2FF</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_midnightdusk.xml b/presentation-core/src/main/res/values/colors_midnightdusk.xml
index f78b6849e..547406360 100644
--- a/presentation-core/src/main/res/values/colors_midnightdusk.xml
+++ b/presentation-core/src/main/res/values/colors_midnightdusk.xml
@@ -15,10 +15,11 @@
     <color name="midnightdusk_onPrimary">#FFFFFF</color>
     <color name="midnightdusk_primaryContainer">#FFD9E1</color>
     <color name="midnightdusk_onPrimaryContainer">#3F0017</color>
+    <color name="midnightdusk_inversePrimary">#FFB1C4</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_secondaryContainer">#EFBAD4</color>
+    <color name="midnightdusk_onSecondaryContainer">#D1377C</color>
     <color name="midnightdusk_tertiary">#006638</color>
     <color name="midnightdusk_onTertiary">#FFFFFF</color>
     <color name="midnightdusk_tertiaryContainer">#00894b</color>
@@ -27,11 +28,15 @@
     <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_surfaceVariant">#F9E6F1</color>
     <color name="midnightdusk_onSurfaceVariant">#524346</color>
-    <color name="midnightdusk_outline">#847376</color>
-    <color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
+    <color name="midnightdusk_surfaceTint">#BB0054</color>
     <color name="midnightdusk_inverseSurface">#313033</color>
-    <color name="midnightdusk_primaryInverse">#FFB1C4</color>
-    <color name="midnightdusk_elevationOverlay">@color/midnightdusk_primary</color>
+    <color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
+    <color name="midnightdusk_outline">#847376</color>
+    <color name="midnightdusk_surfaceContainerLowest">#DAC0CD</color>
+    <color name="midnightdusk_surfaceContainerLow">#E8D1DD</color>
+    <color name="midnightdusk_surfaceContainer">#F9E6F1</color>
+    <color name="midnightdusk_surfaceContainerHigh">#FCF3F8</color>
+    <color name="midnightdusk_surfaceContainerHighest">#FEF9FC</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_nord.xml b/presentation-core/src/main/res/values/colors_nord.xml
index b04ae3eec..4cb1d411f 100644
--- a/presentation-core/src/main/res/values/colors_nord.xml
+++ b/presentation-core/src/main/res/values/colors_nord.xml
@@ -6,6 +6,7 @@
     <color name="nord_onPrimary">#000000</color>
     <color name="nord_primaryContainer">#5E81AC</color>
     <color name="nord_onPrimaryContainer">#000000</color>
+    <color name="nord_inversePrimary">#8CA8CD</color>
     <color name="nord_secondary">#81A1C1</color>
     <color name="nord_onSecondary">#2E3440</color>
     <color name="nord_secondaryContainer">#91B4D7</color>
@@ -18,14 +19,18 @@
     <color name="nord_onBackground">#2E3440</color>
     <color name="nord_surface">#E5E9F0</color>
     <color name="nord_onSurface">#2E3440</color>
-    <color name="nord_surfaceVariant">#ffffff</color>
+    <color name="nord_surfaceVariant">#DAE0EA</color>
     <color name="nord_onSurfaceVariant">#2E3440</color>
-    <color name="nord_outline">#4C566A</color>
-    <color name="nord_inverseOnSurface">#ECEFF4</color>
+    <color name="nord_surfaceTint">#5E81AC</color>
     <color name="nord_inverseSurface">#3B4252</color>
-    <color name="nord_primaryInverse">#8CA8CD</color>
-    <color name="nord_elevationOverlay">#D8DEE9</color>
+    <color name="nord_inverseOnSurface">#ECEFF4</color>
+    <color name="nord_outline">#2E3440</color>
     <color name="nord_onError">#ECEFF4</color>
     <color name="nord_errorContainer">#BF616A</color>
     <color name="nord_onErrorContainer">#000000</color>
+    <color name="nord_surfaceContainerLowest">#D1D7E0</color>
+    <color name="nord_surfaceContainerLow">#D6DCE6</color>
+    <color name="nord_surfaceContainer">#DAE0EA</color>
+    <color name="nord_surfaceContainerHigh">#E9EDF3</color>
+    <color name="nord_surfaceContainerHighest">#F2F4F8</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_strawberry.xml b/presentation-core/src/main/res/values/colors_strawberry.xml
index 97e45ba77..2a430c453 100644
--- a/presentation-core/src/main/res/values/colors_strawberry.xml
+++ b/presentation-core/src/main/res/values/colors_strawberry.xml
@@ -11,26 +11,39 @@
   ~ Neutral #655C5C
 -->
 <resources>
-    <color name="strawberry_primary">#B61E40</color>
+    <color name="strawberry_primary">#A10833</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_primaryContainer">#D53855</color>
+    <color name="strawberry_onPrimaryContainer">#FFFFFF</color>
+    <color name="strawberry_secondary">#A10833</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_secondaryContainer">#D53855</color>
+    <color name="strawberry_onSecondaryContainer">#F6EAED</color>
+    <color name="strawberry_tertiary">#5F441D</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>
+    <color name="strawberry_tertiaryContainer">#87683D</color>
+    <color name="strawberry_onTertiaryContainer">#FFFFFF</color>
+    <color name="strawberry_error">#BA1A1A</color>
+    <color name="strawberry_onError">#FFFFFF</color>
+    <color name="strawberry_errorContainer">#FFDAD6</color>
+    <color name="strawberry_onErrorContainer">#410002</color>
+    <color name="strawberry_background">#FAFAFA</color>
+    <color name="strawberry_onBackground">#261819</color>
+    <color name="strawberry_surface">#FAFAFA</color>
+    <color name="strawberry_onSurface">#261819</color>
+    <color name="strawberry_surfaceVariant">#F6EAED</color>
+    <color name="strawberry_onSurfaceVariant">#594042</color>
+    <color name="strawberry_outline">#8D7071</color>
+    <color name="strawberry_outlineVariant">#E1BEC0</color>
+    <color name="strawberry_scrim">#000000</color>
+    <color name="strawberry_inverseSurface">#3D2C2D</color>
+    <color name="strawberry_inverseOnSurface">#FFECED</color>
+    <color name="strawberry_inversePrimary">#FFB2B8</color>
+    <color name="strawberry_surfaceDim">#EED4D5</color>
+    <color name="strawberry_surfaceBright">#FFF8F7</color>
+    <color name="strawberry_surfaceContainerLowest">#F7DCDD</color>
+    <color name="strawberry_surfaceContainerLow">#FDE2E3</color>
+    <color name="strawberry_surfaceContainer">#F6EAED</color>
+    <color name="strawberry_surfaceContainerHigh">#FFF0F0</color>
+    <color name="strawberry_surfaceContainerHighest">#FFFFFF</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_tachiyomi.xml b/presentation-core/src/main/res/values/colors_tachiyomi.xml
index e5f4f5ed8..37f2a9ff0 100644
--- a/presentation-core/src/main/res/values/colors_tachiyomi.xml
+++ b/presentation-core/src/main/res/values/colors_tachiyomi.xml
@@ -10,26 +10,37 @@
   ~ Neutral #5E5E62
 -->
 <resources>
-    <color name="tachiyomi_primary">#0057CE</color>
+    <color name="tachiyomi_primary">#0058CA</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_primaryContainer">#D9E2FF</color>
+    <color name="tachiyomi_onPrimaryContainer">#001945</color>
+    <color name="tachiyomi_inversePrimary">#B0C6FF</color>
+    <color name="tachiyomi_secondary">#0058CA</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_secondaryContainer">#D9E2FF</color>
+    <color name="tachiyomi_onSecondaryContainer">#001945</color>
+    <color name="tachiyomi_tertiary">#006E1B</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_onTertiaryContainer">#002203</color>
+    <color name="tachiyomi_background">#FEFBFF</color>
+    <color name="tachiyomi_onBackground">#1B1B1F</color>
+    <color name="tachiyomi_surface">#FEFBFF</color>
+    <color name="tachiyomi_onSurface">#1B1B1F</color>
+    <color name="tachiyomi_surfaceVariant">#F3EDF7</color>
+    <color name="tachiyomi_onSurfaceVariant">#44464F</color>
+    <color name="tachiyomi_surfaceTint">#0058CA</color>
+    <color name="tachiyomi_inverseSurface">#303034</color>
     <color name="tachiyomi_inverseOnSurface">#F2F0F4</color>
-    <color name="tachiyomi_inverseSurface">#303033</color>
-    <color name="tachiyomi_primaryInverse">#AEC6FF</color>
+    <color name="tachiyomi_error">#BA1A1A</color>
+    <color name="tachiyomi_onError">#FFFFFF</color>
+    <color name="tachiyomi_errorContainer">#FFDAD6</color>
+    <color name="tachiyomi_onErrorContainer">#410002</color>
+    <color name="tachiyomi_outline">#757780</color>
+    <color name="tachiyomi_outlineVariant">#C5C6D0</color>
+    <color name="tachiyomi_surfaceContainerLowest">#F5F1F8</color>
+    <color name="tachiyomi_surfaceContainerLow">#F7F2FA</color>
+    <color name="tachiyomi_surfaceContainer">#F3EDF7</color>
+    <color name="tachiyomi_surfaceContainerHigh">#FCF7FF</color>
+    <color name="tachiyomi_surfaceContainerHighest">#FCF7FF</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_tako.xml b/presentation-core/src/main/res/values/colors_tako.xml
index 6a002cd2c..373970a04 100644
--- a/presentation-core/src/main/res/values/colors_tako.xml
+++ b/presentation-core/src/main/res/values/colors_tako.xml
@@ -15,10 +15,11 @@
     <color name="tako_onPrimary">#F3B375</color>
     <color name="tako_primaryContainer">#66577E</color>
     <color name="tako_onPrimaryContainer">#F3B375</color>
+    <color name="tako_inversePrimary">#D6BAFF</color>
     <color name="tako_secondary">#66577E</color>
     <color name="tako_onSecondary">#F3B375</color>
     <color name="tako_secondaryContainer">#C8BED0</color>
-    <color name="tako_onSecondaryContainer">#F3B375</color>
+    <color name="tako_onSecondaryContainer">#66577E</color>
     <color name="tako_tertiary">#F3B375</color>
     <color name="tako_onTertiary">#574360</color>
     <color name="tako_tertiaryContainer">#FDD6B0</color>
@@ -29,9 +30,13 @@
     <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_surfaceTint">#66577E</color>
     <color name="tako_inverseSurface">#313033</color>
-    <color name="tako_primaryInverse">#D6BAFF</color>
-    <color name="tako_elevationOverlay">@color/tako_primary</color>
+    <color name="tako_inverseOnSurface">#F3EFF4</color>
+    <color name="tako_outline">#7A757E</color>
+    <color name="tako_surfaceContainerLowest">#D7D0DA</color>
+    <color name="tako_surfaceContainerLow">#DFD8E2</color>
+    <color name="tako_surfaceContainer">#E8E0EB</color>
+    <color name="tako_surfaceContainerHigh">#EEE6F1</color>
+    <color name="tako_surfaceContainerHighest">#F7EEFA</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_tealturqoise.xml b/presentation-core/src/main/res/values/colors_tealturqoise.xml
index c9b1e0a9d..0bff8baaa 100644
--- a/presentation-core/src/main/res/values/colors_tealturqoise.xml
+++ b/presentation-core/src/main/res/values/colors_tealturqoise.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <color name="tealturquoise_primary">#008080</color>
     <color name="tealturquoise_onPrimary">#FFFFFF</color>
     <color name="tealturquoise_primaryContainer">#008080</color>
     <color name="tealturquoise_onPrimaryContainer">#FFFFFF</color>
+    <color name="tealturquoise_inversePrimary">#40E0D0</color>
     <color name="tealturquoise_secondary">#008080</color>
     <color name="tealturquoise_onSecondary">#FFFFFF</color>
-    <color name="tealturquoise_secondaryContainer">#BFDFDF</color>
+    <color name="tealturquoise_secondaryContainer">#CFE5E4</color>
     <color name="tealturquoise_onSecondaryContainer">#008080</color>
     <color name="tealturquoise_tertiary">#FF7F7F</color>
     <color name="tealturquoise_onTertiary">#000000</color>
@@ -17,11 +17,15 @@
     <color name="tealturquoise_onBackground">#050505</color>
     <color name="tealturquoise_surface">#FAFAFA</color>
     <color name="tealturquoise_onSurface">#050505</color>
-    <color name="tealturquoise_surfaceVariant">#DAE5E2</color>
+    <color name="tealturquoise_surfaceVariant">#EBF3F1</color>
     <color name="tealturquoise_onSurfaceVariant">#050505</color>
-    <color name="tealturquoise_outline">#6F7977</color>
-    <color name="tealturquoise_inverseOnSurface">#FAFAFA</color>
+    <color name="tealturquoise_surfaceTint">#BFDFDF</color>
     <color name="tealturquoise_inverseSurface">#050505</color>
-    <color name="tealturquoise_primaryInverse">#40E0D0</color>
-    <color name="tealturquoise_elevationOverlay">#BFDFDF</color>
+    <color name="tealturquoise_inverseOnSurface">#FAFAFA</color>
+    <color name="tealturquoise_outline">#6F7977</color>
+    <color name="tealturquoise_surfaceContainerLowest">#E1E9E7</color>
+    <color name="tealturquoise_surfaceContainerLow">#E6EEEC</color>
+    <color name="tealturquoise_surfaceContainer">#EBF3F1</color>
+    <color name="tealturquoise_surfaceContainerHigh">#F0F8F6</color>
+    <color name="tealturquoise_surfaceContainerHighest">#F7FFFD</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_tidalwave.xml b/presentation-core/src/main/res/values/colors_tidalwave.xml
index 8ae6942d5..e66f7aed5 100644
--- a/presentation-core/src/main/res/values/colors_tidalwave.xml
+++ b/presentation-core/src/main/res/values/colors_tidalwave.xml
@@ -15,9 +15,10 @@
     <color name="tidalwave_onPrimary">#ffffff</color>
     <color name="tidalwave_primaryContainer">#B4D4DF</color>
     <color name="tidalwave_onPrimaryContainer">#001f28</color>
+    <color name="tidalwave_inversePrimary">#ff987f</color>
     <color name="tidalwave_secondary">#006780</color>
     <color name="tidalwave_onSecondary">#ffffff</color>
-    <color name="tidalwave_secondaryContainer">#b8eaff</color>
+    <color name="tidalwave_secondaryContainer">#9AE1FF</color>
     <color name="tidalwave_onSecondaryContainer">#001f28</color>
     <color name="tidalwave_tertiary">#92f7bc</color>
     <color name="tidalwave_onTertiary">#001c3b</color>
@@ -27,10 +28,15 @@
     <color name="tidalwave_onBackground">#001c3b</color>
     <color name="tidalwave_surface">#fdfbff</color>
     <color name="tidalwave_onSurface">#001c3b</color>
-    <color name="tidalwave_surfaceVariant">#dce4e8</color>
+    <color name="tidalwave_surfaceVariant">#e8eff5</color>
     <color name="tidalwave_onSurfaceVariant">#40484c</color>
-    <color name="tidalwave_outline">#70787c</color>
-    <color name="tidalwave_inverseOnSurface">#ffe3c4</color>
+    <color name="tidalwave_surfaceTint">#006780</color>
     <color name="tidalwave_inverseSurface">#020400</color>
-    <color name="tidalwave_primaryInverse">#ff987f</color>
+    <color name="tidalwave_inverseOnSurface">#ffe3c4</color>
+    <color name="tidalwave_outline">#70787c</color>
+    <color name="tidalwave_surfaceContainerLowest">#e2e8ec</color>
+    <color name="tidalwave_surfaceContainerLow">#e5ecf1</color>
+    <color name="tidalwave_surfaceContainer">#e8eff5</color>
+    <color name="tidalwave_surfaceContainerHigh">#edf4fA</color>
+    <color name="tidalwave_surfaceContainerHighest">#f5faff</color>
 </resources>
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values/colors_yinyang.xml b/presentation-core/src/main/res/values/colors_yinyang.xml
index c6d2cefbd..e54ea0f6f 100644
--- a/presentation-core/src/main/res/values/colors_yinyang.xml
+++ b/presentation-core/src/main/res/values/colors_yinyang.xml
@@ -9,6 +9,7 @@
     <color name="yinyang_onPrimary">#FFFFFF</color>
     <color name="yinyang_primaryContainer">#000000</color>
     <color name="yinyang_onPrimaryContainer">#FFFFFF</color>
+    <color name="yinyang_inversePrimary">#A6A6A6</color>
     <color name="yinyang_secondary">#000000</color>
     <color name="yinyang_onSecondary">#FFFFFF</color>
     <color name="yinyang_secondaryContainer">#DDDDDD</color>
@@ -21,10 +22,15 @@
     <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_surfaceVariant">#E8E8E8</color>
     <color name="yinyang_onSurfaceVariant">#515151</color>
-    <color name="yinyang_outline">#838383</color>
-    <color name="yinyang_inverseOnSurface">#F4F4F4</color>
+    <color name="yinyang_surfaceTint">#000000</color>
     <color name="yinyang_inverseSurface">#333333</color>
-    <color name="yinyang_primaryInverse">#A6A6A6</color>
+    <color name="yinyang_inverseOnSurface">#F4F4F4</color>
+    <color name="yinyang_outline">#838383</color>
+    <color name="yinyang_surfaceContainerLowest">#CFCFCF</color>
+    <color name="yinyang_surfaceContainerLow">#DADADA</color>
+    <color name="yinyang_surfaceContainer">#E8E8E8</color>
+    <color name="yinyang_surfaceContainerHigh">#ECECEC</color>
+    <color name="yinyang_surfaceContainerHighest">#EFEFEF</color>
 </resources>
diff --git a/presentation-core/src/main/res/values/colors_yotsuba.xml b/presentation-core/src/main/res/values/colors_yotsuba.xml
index 79c662f7f..81fd13611 100644
--- a/presentation-core/src/main/res/values/colors_yotsuba.xml
+++ b/presentation-core/src/main/res/values/colors_yotsuba.xml
@@ -15,9 +15,10 @@
     <color name="yotsuba_onPrimary">#FFFFFF</color>
     <color name="yotsuba_primaryContainer">#FFDBCF</color>
     <color name="yotsuba_onPrimaryContainer">#3B0A00</color>
+    <color name="yotsuba_inversePrimary">#FFB59D</color>
     <color name="yotsuba_secondary">#AE3200</color>
     <color name="yotsuba_onSecondary">#FFFFFF</color>
-    <color name="yotsuba_secondaryContainer">#FFDBCF</color>
+    <color name="yotsuba_secondaryContainer">#EBCDC2</color>
     <color name="yotsuba_onSecondaryContainer">#3B0A00</color>
     <color name="yotsuba_tertiary">#6B5E2F</color>
     <color name="yotsuba_onTertiary">#FFFFFF</color>
@@ -27,10 +28,15 @@
     <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_surfaceVariant">#F6EBE7</color>
     <color name="yotsuba_onSurfaceVariant">#53433F</color>
-    <color name="yotsuba_outline">#85736E</color>
-    <color name="yotsuba_inverseOnSurface">#FBEEEB</color>
+    <color name="yotsuba_surfaceTint">#AE3200</color>
     <color name="yotsuba_inverseSurface">#362F2D</color>
-    <color name="yotsuba_primaryInverse">#FFB59D</color>
+    <color name="yotsuba_inverseOnSurface">#FBEEEB</color>
+    <color name="yotsuba_outline">#85736E</color>
+    <color name="yotsuba_surfaceContainerLowest">#ECE3E0</color>
+    <color name="yotsuba_surfaceContainerLow">#F1E7E4</color>
+    <color name="yotsuba_surfaceContainer">#F6EBE7</color>
+    <color name="yotsuba_surfaceContainerHigh">#FAF4F2</color>
+    <color name="yotsuba_surfaceContainerHighest">#FBF6F4</color>
 </resources>