diff --git a/base/src/main/res/values-night/color-schemes.xml b/base/src/main/res/values-night/color-schemes.xml
index 608be0a33..4a0072587 100644
--- a/base/src/main/res/values-night/color-schemes.xml
+++ b/base/src/main/res/values-night/color-schemes.xml
@@ -1,32 +1,31 @@
 <resources>
     <style name="DefaultColors">
-        <item name="colorPrimary">#72D1FF</item>
-        <item name="colorOnPrimary">#003549</item>
-        <item name="colorPrimaryContainer">#004D68</item>
-        <item name="colorOnPrimaryContainer">#BFE8FF</item>
-        <item name="colorPrimaryInverse">#006689</item>
-        <item name="colorSecondary">#A2D824</item>
-        <item name="colorOnSecondary">#243600</item>
-        <item name="colorSecondaryContainer">#354E00</item>
-        <item name="colorOnSecondaryContainer">#BDF542</item>
-        <item name="colorTertiary">#FEBB2B</item>
-        <item name="colorOnTertiary">#422C00</item>
-        <item name="colorTertiaryContainer">#5F4100</item>
-        <item name="colorOnTertiaryContainer">#FFDEA4</item>
-        <item name="colorError">#FFB4A9</item>
-        <item name="colorOnError">#680003</item>
-        <item name="colorErrorContainer">#930006</item>
-        <item name="colorOnErrorContainer">#FFDAD4</item>
-        <item name="colorOutline">#8B9298</item>
-        <item name="android:colorBackground">#191C1E</item>
-        <item name="colorOnBackground">#E1E2E4</item>
-        <item name="colorSurface">#191C1E</item>
-        <item name="colorOnSurface">#E1E2E4</item>
-        <item name="colorSurfaceVariant">#41484D</item>
-        <item name="colorOnSurfaceVariant">#C0C7CD</item>
-        <item name="colorSurfaceInverse">#E1E2E4</item>
-        <item name="colorOnSurfaceInverse">#191C1E</item>
-        <item name="elevationOverlayEnabled">true</item>
+        <item name="colorPrimary">#BCCADC</item>
+        <item name="colorOnPrimary">#233143</item>
+        <item name="colorPrimaryContainer">#344A65</item>
+        <item name="colorOnPrimaryContainer">#DDE5EE</item>
+        <item name="colorPrimaryInverse">#456387</item>
+        <item name="colorSecondary">#B6D8E2</item>
+        <item name="colorOnSecondary">#1D3F49</item>
+        <item name="colorSecondaryContainer">#2B5F6E</item>
+        <item name="colorOnSecondaryContainer">#DAECF1</item>
+        <item name="colorTertiary">#BFD9D8</item>
+        <item name="colorOnTertiary">#26403F</item>
+        <item name="colorTertiaryContainer">#39605F</item>
+        <item name="colorOnTertiaryContainer">#DFECEC</item>
+        <item name="colorError">#E2B6BB</item>
+        <item name="colorOnError">#491D22</item>
+        <item name="colorErrorContainer">#6D2C32</item>
+        <item name="colorOnErrorContainer">#E2B6BB</item>
+        <item name="colorOutline">#7D91B5</item>
+        <item name="android:colorBackground">#15181E</item>
+        <item name="colorOnBackground">#E1E4EA</item>
+        <item name="colorSurface">#15181E</item>
+        <item name="colorOnSurface">#E1E4EA</item>
+        <item name="colorSurfaceVariant">#374662</item>
+        <item name="colorOnSurfaceVariant">#BEC8DA</item>
+        <item name="colorSurfaceInverse">#E1E4EA</item>
+        <item name="colorOnSurfaceInverse">#2B303B</item>
     </style>
 
     <style name="BlackWhiteColors">
diff --git a/base/src/main/res/values/color-schemes.xml b/base/src/main/res/values/color-schemes.xml
index 61d255d5d..a05fe8e5a 100644
--- a/base/src/main/res/values/color-schemes.xml
+++ b/base/src/main/res/values/color-schemes.xml
@@ -1,32 +1,31 @@
 <resources>
     <style name="DefaultColors">
-        <item name="colorPrimary">#006689</item>
-        <item name="colorOnPrimary">@android:color/white</item>
-        <item name="colorPrimaryContainer">#BFE8FF</item>
-        <item name="colorOnPrimaryContainer">#001E2C</item>
-        <item name="colorPrimaryInverse">#72D1FF</item>
-        <item name="colorSecondary">#496800</item>
-        <item name="colorOnSecondary">@android:color/white</item>
-        <item name="colorSecondaryContainer">#BDF542</item>
-        <item name="colorOnSecondaryContainer">#131F00</item>
-        <item name="colorTertiary">#7D5700</item>
-        <item name="colorOnTertiary">@android:color/white</item>
-        <item name="colorTertiaryContainer">#FFDEA4</item>
-        <item name="colorOnTertiaryContainer">#281900</item>
-        <item name="colorError">#BA1B1B</item>
-        <item name="colorOnError">@android:color/white</item>
-        <item name="colorErrorContainer">#FFDAD4</item>
-        <item name="colorOnErrorContainer">#410001</item>
-        <item name="colorOutline">#71787D</item>
-        <item name="android:colorBackground">#FBFCFE</item>
-        <item name="colorOnBackground">#191C1E</item>
-        <item name="colorSurface">#FBFCFE</item>
-        <item name="colorOnSurface">#191C1E</item>
-        <item name="colorSurfaceVariant">#DCE3E9</item>
-        <item name="colorOnSurfaceVariant">#41484D</item>
-        <item name="colorSurfaceInverse">#2E3133</item>
-        <item name="colorOnSurfaceInverse">#F0F1F3</item>
-        <item name="elevationOverlayEnabled">false</item>
+        <item name="colorPrimary">#456387</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#DDE5EE</item>
+        <item name="colorOnPrimaryContainer">#111922</item>
+        <item name="colorPrimaryInverse">#BCCADC</item>
+        <item name="colorSecondary">#3A7F92</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#DAECF1</item>
+        <item name="colorOnSecondaryContainer">#0E2025</item>
+        <item name="colorTertiary">#4C807F</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#DFECEC</item>
+        <item name="colorOnTertiaryContainer">#132020</item>
+        <item name="colorError">#913B43</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorErrorContainer">#F0DBDD</item>
+        <item name="colorOnErrorContainer">#240F11</item>
+        <item name="colorOutline">#5C75A3</item>
+        <item name="android:colorBackground">#FCFCFD</item>
+        <item name="colorOnBackground">#15181E</item>
+        <item name="colorSurface">#FCFCFD</item>
+        <item name="colorOnSurface">#15181E</item>
+        <item name="colorSurfaceVariant">#DEE3ED</item>
+        <item name="colorOnSurfaceVariant">#374662</item>
+        <item name="colorSurfaceInverse">#2B303B</item>
+        <item name="colorOnSurfaceInverse">#F0F2F4</item>
     </style>
 
     <style name="BlackWhiteColors">