From 671bcd72f447273446b0c9880de50d8748da1a27 Mon Sep 17 00:00:00 2001
From: Jesse205 <2055675594@qq.com>
Date: Mon, 1 Dec 2025 06:26:08 +0800
Subject: [PATCH] Update theme tokens

---
 app/src/main/res/values-night/colors.xml | 146 +++++++++++++++++++---
 app/src/main/res/values-night/themes.xml |  49 +++++++-
 app/src/main/res/values/colors.xml       | 148 ++++++++++++++++++++---
 app/src/main/res/values/themes.xml       | 101 ++++++++++++++--
 4 files changed, 401 insertions(+), 43 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1f6c877a..2d3770dd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,34 +10,146 @@
     <color name="fip_active_color">#FFFFFF</color>
     <color name="fip_active_selected">#FFFFFF</color>
 
-    <color name="md_theme_primary">#00629D</color>
+    <color name="md_theme_primary">#9CCBFB</color>
     <color name="md_theme_onPrimary">#003354</color>
-    <color name="md_theme_primaryContainer">#004A77</color>
+    <color name="md_theme_primaryContainer">#124A73</color>
     <color name="md_theme_onPrimaryContainer">#CFE5FF</color>
     <color name="md_theme_secondary">#B9C8DA</color>
     <color name="md_theme_onSecondary">#243240</color>
     <color name="md_theme_secondaryContainer">#3A4857</color>
     <color name="md_theme_onSecondaryContainer">#D5E4F7</color>
-    <color name="md_theme_tertiary">#80D0FF</color>
-    <color name="md_theme_onTertiary">#00344B</color>
-    <color name="md_theme_tertiaryContainer">#004C6A</color>
-    <color name="md_theme_onTertiaryContainer">#C5E7FF</color>
+    <color name="md_theme_tertiary">#D4BEE6</color>
+    <color name="md_theme_onTertiary">#392A49</color>
+    <color name="md_theme_tertiaryContainer">#504060</color>
+    <color name="md_theme_onTertiaryContainer">#F0DBFF</color>
     <color name="md_theme_error">#FFB4AB</color>
-    <color name="md_theme_errorContainer">#93000A</color>
     <color name="md_theme_onError">#690005</color>
+    <color name="md_theme_errorContainer">#93000A</color>
     <color name="md_theme_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_background">#1A1C1E</color>
-    <color name="md_theme_onBackground">#E2E2E5</color>
-    <color name="md_theme_surface">#1A1C1E</color>
-    <color name="md_theme_onSurface">#E2E2E5</color>
+    <color name="md_theme_background">#101418</color>
+    <color name="md_theme_onBackground">#E0E2E8</color>
+    <color name="md_theme_surface">#101418</color>
+    <color name="md_theme_onSurface">#E0E2E8</color>
     <color name="md_theme_surfaceVariant">#42474E</color>
     <color name="md_theme_onSurfaceVariant">#C2C7CF</color>
     <color name="md_theme_outline">#8C9199</color>
-    <color name="md_theme_inverseOnSurface">#1A1C1E</color>
-    <color name="md_theme_inverseSurface">#E2E2E5</color>
-    <color name="md_theme_inversePrimary">#00629D</color>
-    <color name="md_theme_shadow">#000000</color>
-    <color name="md_theme_surfaceTint">#98CBFF</color>
-    <color name="md_theme_surfaceTintColor">#98CBFF</color>
+    <color name="md_theme_outlineVariant">#42474E</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#E0E2E8</color>
+    <color name="md_theme_inverseOnSurface">#2D3135</color>
+    <color name="md_theme_inversePrimary">#31628D</color>
+    <color name="md_theme_primaryFixed">#CFE5FF</color>
+    <color name="md_theme_onPrimaryFixed">#001D33</color>
+    <color name="md_theme_primaryFixedDim">#9CCBFB</color>
+    <color name="md_theme_onPrimaryFixedVariant">#124A73</color>
+    <color name="md_theme_secondaryFixed">#D5E4F7</color>
+    <color name="md_theme_onSecondaryFixed">#0E1D2A</color>
+    <color name="md_theme_secondaryFixedDim">#B9C8DA</color>
+    <color name="md_theme_onSecondaryFixedVariant">#3A4857</color>
+    <color name="md_theme_tertiaryFixed">#F0DBFF</color>
+    <color name="md_theme_onTertiaryFixed">#231533</color>
+    <color name="md_theme_tertiaryFixedDim">#D4BEE6</color>
+    <color name="md_theme_onTertiaryFixedVariant">#504060</color>
+    <color name="md_theme_surfaceDim">#101418</color>
+    <color name="md_theme_surfaceBright">#36393E</color>
+    <color name="md_theme_surfaceContainerLowest">#0B0E12</color>
+    <color name="md_theme_surfaceContainerLow">#181C20</color>
+    <color name="md_theme_surfaceContainer">#1C2024</color>
+    <color name="md_theme_surfaceContainerHigh">#272A2F</color>
+    <color name="md_theme_surfaceContainerHighest">#32353A</color>
+    <color name="md_theme_primary_mediumContrast">#C4DFFF</color>
+    <color name="md_theme_onPrimary_mediumContrast">#002843</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#6695C2</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_secondary_mediumContrast">#CFDEF1</color>
+    <color name="md_theme_onSecondary_mediumContrast">#192735</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#8492A3</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_tertiary_mediumContrast">#EAD4FC</color>
+    <color name="md_theme_onTertiary_mediumContrast">#2E1F3D</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#9D89AE</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_error_mediumContrast">#FFD2CC</color>
+    <color name="md_theme_onError_mediumContrast">#540003</color>
+    <color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
+    <color name="md_theme_background_mediumContrast">#101418</color>
+    <color name="md_theme_onBackground_mediumContrast">#E0E2E8</color>
+    <color name="md_theme_surface_mediumContrast">#101418</color>
+    <color name="md_theme_onSurface_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#42474E</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#D8DCE5</color>
+    <color name="md_theme_outline_mediumContrast">#ADB2BA</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#8C9198</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#E0E2E8</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#272A2F</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#144B75</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#CFE5FF</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#001223</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#9CCBFB</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#00395D</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#D5E4F7</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#04121F</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#B9C8DA</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#2A3746</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#F0DBFF</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#180A27</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#D4BEE6</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#3F304F</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#101418</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#414549</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#05080B</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#1A1E22</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#25282C</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#2F3337</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#3B3E42</color>
+    <color name="md_theme_primary_highContrast">#E7F1FF</color>
+    <color name="md_theme_onPrimary_highContrast">#000000</color>
+    <color name="md_theme_primaryContainer_highContrast">#99C7F7</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#000C1A</color>
+    <color name="md_theme_secondary_highContrast">#E7F1FF</color>
+    <color name="md_theme_onSecondary_highContrast">#000000</color>
+    <color name="md_theme_secondaryContainer_highContrast">#B6C4D6</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#000C19</color>
+    <color name="md_theme_tertiary_highContrast">#F9EBFF</color>
+    <color name="md_theme_onTertiary_highContrast">#000000</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#D0BBE2</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#120421</color>
+    <color name="md_theme_error_highContrast">#FFECE9</color>
+    <color name="md_theme_onError_highContrast">#000000</color>
+    <color name="md_theme_errorContainer_highContrast">#FFAEA4</color>
+    <color name="md_theme_onErrorContainer_highContrast">#220001</color>
+    <color name="md_theme_background_highContrast">#101418</color>
+    <color name="md_theme_onBackground_highContrast">#E0E2E8</color>
+    <color name="md_theme_surface_highContrast">#101418</color>
+    <color name="md_theme_onSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_highContrast">#42474E</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_outline_highContrast">#ECF0F8</color>
+    <color name="md_theme_outlineVariant_highContrast">#BEC3CB</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#E0E2E8</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#000000</color>
+    <color name="md_theme_inversePrimary_highContrast">#144B75</color>
+    <color name="md_theme_primaryFixed_highContrast">#CFE5FF</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#9CCBFB</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#001223</color>
+    <color name="md_theme_secondaryFixed_highContrast">#D5E4F7</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#B9C8DA</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#04121F</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#F0DBFF</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#D4BEE6</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#180A27</color>
+    <color name="md_theme_surfaceDim_highContrast">#101418</color>
+    <color name="md_theme_surfaceBright_highContrast">#4D5055</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#1C2024</color>
+    <color name="md_theme_surfaceContainer_highContrast">#2D3135</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#383C40</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#44474C</color>
 
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 77ffafce..e61d0185 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Dark" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Dark">
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+    </style>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 157a3404..19bbc7c5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,34 +17,146 @@
     <color name="fip_active_color">#000000</color>
     <color name="fip_active_selected">#000000</color>
 
-    <color name="md_theme_primary">#00629D</color>
+    <color name="md_theme_primary">#31628D</color>
     <color name="md_theme_onPrimary">#FFFFFF</color>
     <color name="md_theme_primaryContainer">#CFE5FF</color>
-    <color name="md_theme_onPrimaryContainer">#001D33</color>
+    <color name="md_theme_onPrimaryContainer">#124A73</color>
     <color name="md_theme_secondary">#526070</color>
     <color name="md_theme_onSecondary">#FFFFFF</color>
     <color name="md_theme_secondaryContainer">#D5E4F7</color>
-    <color name="md_theme_onSecondaryContainer">#0E1D2A</color>
-    <color name="md_theme_tertiary">#00658C</color>
+    <color name="md_theme_onSecondaryContainer">#3A4857</color>
+    <color name="md_theme_tertiary">#695779</color>
     <color name="md_theme_onTertiary">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer">#C5E7FF</color>
-    <color name="md_theme_onTertiaryContainer">#001E2D</color>
+    <color name="md_theme_tertiaryContainer">#F0DBFF</color>
+    <color name="md_theme_onTertiaryContainer">#504060</color>
     <color name="md_theme_error">#BA1A1A</color>
-    <color name="md_theme_errorContainer">#FFDAD6</color>
     <color name="md_theme_onError">#FFFFFF</color>
-    <color name="md_theme_onErrorContainer">#410002</color>
-    <color name="md_theme_background">#FCFCFF</color>
-    <color name="md_theme_onBackground">#1A1C1E</color>
-    <color name="md_theme_surface">#FCFCFF</color>
-    <color name="md_theme_onSurface">#1A1C1E</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#93000A</color>
+    <color name="md_theme_background">#F7F9FF</color>
+    <color name="md_theme_onBackground">#181C20</color>
+    <color name="md_theme_surface">#F7F9FF</color>
+    <color name="md_theme_onSurface">#181C20</color>
     <color name="md_theme_surfaceVariant">#DEE3EB</color>
     <color name="md_theme_onSurfaceVariant">#42474E</color>
     <color name="md_theme_outline">#72777F</color>
-    <color name="md_theme_inverseOnSurface">#F1F0F4</color>
-    <color name="md_theme_inverseSurface">#2F3033</color>
-    <color name="md_theme_inversePrimary">#98CBFF</color>
-    <color name="md_theme_shadow">#000000</color>
-    <color name="md_theme_surfaceTint">#00629D</color>
-    <color name="md_theme_surfaceTintColor">#00629D</color>
+    <color name="md_theme_outlineVariant">#C2C7CF</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2D3135</color>
+    <color name="md_theme_inverseOnSurface">#EFF1F6</color>
+    <color name="md_theme_inversePrimary">#9CCBFB</color>
+    <color name="md_theme_primaryFixed">#CFE5FF</color>
+    <color name="md_theme_onPrimaryFixed">#001D33</color>
+    <color name="md_theme_primaryFixedDim">#9CCBFB</color>
+    <color name="md_theme_onPrimaryFixedVariant">#124A73</color>
+    <color name="md_theme_secondaryFixed">#D5E4F7</color>
+    <color name="md_theme_onSecondaryFixed">#0E1D2A</color>
+    <color name="md_theme_secondaryFixedDim">#B9C8DA</color>
+    <color name="md_theme_onSecondaryFixedVariant">#3A4857</color>
+    <color name="md_theme_tertiaryFixed">#F0DBFF</color>
+    <color name="md_theme_onTertiaryFixed">#231533</color>
+    <color name="md_theme_tertiaryFixedDim">#D4BEE6</color>
+    <color name="md_theme_onTertiaryFixedVariant">#504060</color>
+    <color name="md_theme_surfaceDim">#D8DAE0</color>
+    <color name="md_theme_surfaceBright">#F7F9FF</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F2F3F9</color>
+    <color name="md_theme_surfaceContainer">#ECEEF4</color>
+    <color name="md_theme_surfaceContainerHigh">#E6E8EE</color>
+    <color name="md_theme_surfaceContainerHighest">#E0E2E8</color>
+    <color name="md_theme_primary_mediumContrast">#00395D</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#41719C</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#2A3746</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#606E7F</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#3F304F</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#786689</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_error_mediumContrast">#740006</color>
+    <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_background_mediumContrast">#F7F9FF</color>
+    <color name="md_theme_onBackground_mediumContrast">#181C20</color>
+    <color name="md_theme_surface_mediumContrast">#F7F9FF</color>
+    <color name="md_theme_onSurface_mediumContrast">#0E1115</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#DEE3EB</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#31373D</color>
+    <color name="md_theme_outline_mediumContrast">#4E535A</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#686D75</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2D3135</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#EFF1F6</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#9CCBFB</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#41719C</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#255882</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#606E7F</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#485666</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#786689</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#5F4E6F</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#C4C6CC</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F7F9FF</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#F2F3F9</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#E6E8EE</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#DBDDE2</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#CFD1D7</color>
+    <color name="md_theme_primary_highContrast">#002E4E</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#154C76</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#202D3B</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#3D4A5A</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#352644</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#534263</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_error_highContrast">#600004</color>
+    <color name="md_theme_onError_highContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_highContrast">#98000A</color>
+    <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_background_highContrast">#F7F9FF</color>
+    <color name="md_theme_onBackground_highContrast">#181C20</color>
+    <color name="md_theme_surface_highContrast">#F7F9FF</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#DEE3EB</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#000000</color>
+    <color name="md_theme_outline_highContrast">#272D33</color>
+    <color name="md_theme_outlineVariant_highContrast">#444A50</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2D3135</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#9CCBFB</color>
+    <color name="md_theme_primaryFixed_highContrast">#154C76</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#003558</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#3D4A5A</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#263442</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#534263</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#3B2C4B</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#B6B9BE</color>
+    <color name="md_theme_surfaceBright_highContrast">#F7F9FF</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#EFF1F6</color>
+    <color name="md_theme_surfaceContainer_highContrast">#E0E2E8</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#D2D4DA</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#C4C6CC</color>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 58db40b2..007bad4c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -17,19 +17,39 @@
         <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
         <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
         <item name="colorError">@color/md_theme_error</item>
-        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
         <item name="colorOutline">@color/md_theme_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
         <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
-        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <item name="android:listDivider">@color/list_divider</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
         <item name="materialCardViewFilledStyle">@style/Widget.App.CardView</item>
@@ -40,7 +60,54 @@
 
     <!-- end activities themes -->
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Light">
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+    </style>
 
     <!-- dialogs themes -->
 
@@ -61,19 +128,39 @@
         <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
         <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
         <item name="colorError">@color/md_theme_error</item>
-        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
-        <item name="colorSurfaceContainerLow">@color/md_theme_secondaryContainer</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
         <item name="colorOutline">@color/md_theme_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
         <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <item name="android:colorBackground">@android:color/transparent</item>
     </style>