From 2f43113ce2111efa93b6755b16302b1a54974889 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 11 Jan 2025 16:24:39 -0700
Subject: [PATCH] ui: make brown/grey themes distinct

These would otherwise be red and blue unless I enable color match.
---
 app/src/main/res/values-night/colors_ui.xml | 434 ++++++++++----------
 app/src/main/res/values/colors_ui.xml       | 354 ++++++++--------
 2 files changed, 394 insertions(+), 394 deletions(-)

diff --git a/app/src/main/res/values-night/colors_ui.xml b/app/src/main/res/values-night/colors_ui.xml
index 5b6d8d22a..87bd21bc7 100644
--- a/app/src/main/res/values-night/colors_ui.xml
+++ b/app/src/main/res/values-night/colors_ui.xml
@@ -1988,287 +1988,287 @@
     <color name="orange_surfaceContainerHigh_highContrast">#312822</color>
     <color name="orange_surfaceContainerHighest_highContrast">#3C332C</color>
 
-    <color name="brown_primary">#FFB59B</color>
-    <color name="brown_onPrimary">#55200B</color>
-    <color name="brown_primaryContainer">#72351F</color>
-    <color name="brown_onPrimaryContainer">#FFDBCF</color>
-    <color name="brown_secondary">#E7BDB0</color>
-    <color name="brown_onSecondary">#442A21</color>
-    <color name="brown_secondaryContainer">#5D4036</color>
-    <color name="brown_onSecondaryContainer">#FFDBCF</color>
-    <color name="brown_tertiary">#D5C68E</color>
-    <color name="brown_onTertiary">#393005</color>
-    <color name="brown_tertiaryContainer">#51461A</color>
-    <color name="brown_onTertiaryContainer">#F2E2A7</color>
+    <color name="brown_primary">#E7BDB0</color>
+    <color name="brown_onPrimary">#442A21</color>
+    <color name="brown_primaryContainer">#6D4E43</color>
+    <color name="brown_onPrimaryContainer">#FFF7F5</color>
+    <color name="brown_secondary">#D8C2BB</color>
+    <color name="brown_onSecondary">#3B2D29</color>
+    <color name="brown_secondaryContainer">#483A35</color>
+    <color name="brown_onSecondaryContainer">#E2CCC5</color>
+    <color name="brown_tertiary">#CFC7A1</color>
+    <color name="brown_onTertiary">#353116</color>
+    <color name="brown_tertiaryContainer">#5B5537</color>
+    <color name="brown_onTertiaryContainer">#FFF8E3</color>
     <color name="brown_error">#FFB4AB</color>
     <color name="brown_onError">#690005</color>
     <color name="brown_errorContainer">#93000A</color>
     <color name="brown_onErrorContainer">#FFDAD6</color>
-    <color name="brown_background">#1A110F</color>
-    <color name="brown_onBackground">#F1DFD9</color>
-    <color name="brown_surface">#1A110F</color>
-    <color name="brown_onSurface">#F1DFD9</color>
-    <color name="brown_surfaceVariant">#53433E</color>
-    <color name="brown_onSurfaceVariant">#D8C2BB</color>
-    <color name="brown_outline">#A08D86</color>
-    <color name="brown_outlineVariant">#53433E</color>
+    <color name="brown_background">#161312</color>
+    <color name="brown_onBackground">#E9E1DF</color>
+    <color name="brown_surface">#161312</color>
+    <color name="brown_onSurface">#E9E1DF</color>
+    <color name="brown_surfaceVariant">#504440</color>
+    <color name="brown_onSurfaceVariant">#D4C3BE</color>
+    <color name="brown_outline">#9D8E89</color>
+    <color name="brown_outlineVariant">#504440</color>
     <color name="brown_scrim">#000000</color>
-    <color name="brown_inverseSurface">#F1DFD9</color>
-    <color name="brown_inverseOnSurface">#392E2B</color>
-    <color name="brown_inversePrimary">#8F4C34</color>
+    <color name="brown_inverseSurface">#E9E1DF</color>
+    <color name="brown_inverseOnSurface">#33302E</color>
+    <color name="brown_inversePrimary">#77574C</color>
     <color name="brown_primaryFixed">#FFDBCF</color>
-    <color name="brown_onPrimaryFixed">#380D00</color>
-    <color name="brown_primaryFixedDim">#FFB59B</color>
-    <color name="brown_onPrimaryFixedVariant">#72351F</color>
-    <color name="brown_secondaryFixed">#FFDBCF</color>
-    <color name="brown_onSecondaryFixed">#2C160D</color>
-    <color name="brown_secondaryFixedDim">#E7BDB0</color>
-    <color name="brown_onSecondaryFixedVariant">#5D4036</color>
-    <color name="brown_tertiaryFixed">#F2E2A7</color>
-    <color name="brown_onTertiaryFixed">#221B00</color>
-    <color name="brown_tertiaryFixedDim">#D5C68E</color>
-    <color name="brown_onTertiaryFixedVariant">#51461A</color>
-    <color name="brown_surfaceDim">#1A110F</color>
-    <color name="brown_surfaceBright">#423733</color>
-    <color name="brown_surfaceContainerLowest">#140C0A</color>
-    <color name="brown_surfaceContainerLow">#231A16</color>
-    <color name="brown_surfaceContainer">#271D1A</color>
-    <color name="brown_surfaceContainerHigh">#322824</color>
-    <color name="brown_surfaceContainerHighest">#3D322F</color>
-    <color name="brown_primary_mediumContrast">#FFBBA3</color>
-    <color name="brown_onPrimary_mediumContrast">#2F0900</color>
-    <color name="brown_primaryContainer_mediumContrast">#CB7D61</color>
+    <color name="brown_onPrimaryFixed">#2C160D</color>
+    <color name="brown_primaryFixedDim">#E7BDB0</color>
+    <color name="brown_onPrimaryFixedVariant">#5D4036</color>
+    <color name="brown_secondaryFixed">#F5DED6</color>
+    <color name="brown_onSecondaryFixed">#251915</color>
+    <color name="brown_secondaryFixedDim">#D8C2BB</color>
+    <color name="brown_onSecondaryFixedVariant">#53433E</color>
+    <color name="brown_tertiaryFixed">#ECE3BB</color>
+    <color name="brown_onTertiaryFixed">#201C04</color>
+    <color name="brown_tertiaryFixedDim">#CFC7A1</color>
+    <color name="brown_onTertiaryFixedVariant">#4C472A</color>
+    <color name="brown_surfaceDim">#161312</color>
+    <color name="brown_surfaceBright">#3C3837</color>
+    <color name="brown_surfaceContainerLowest">#100E0D</color>
+    <color name="brown_surfaceContainerLow">#1E1B1A</color>
+    <color name="brown_surfaceContainer">#221F1E</color>
+    <color name="brown_surfaceContainerHigh">#2D2928</color>
+    <color name="brown_surfaceContainerHighest">#383433</color>
+    <color name="brown_primary_mediumContrast">#EBC2B4</color>
+    <color name="brown_onPrimary_mediumContrast">#261009</color>
+    <color name="brown_primaryContainer_mediumContrast">#AD887C</color>
     <color name="brown_onPrimaryContainer_mediumContrast">#000000</color>
-    <color name="brown_secondary_mediumContrast">#EBC2B4</color>
-    <color name="brown_onSecondary_mediumContrast">#261009</color>
-    <color name="brown_secondaryContainer_mediumContrast">#AD887C</color>
+    <color name="brown_secondary_mediumContrast">#DCC6BF</color>
+    <color name="brown_onSecondary_mediumContrast">#1F1410</color>
+    <color name="brown_secondaryContainer_mediumContrast">#A08D86</color>
     <color name="brown_onSecondaryContainer_mediumContrast">#000000</color>
-    <color name="brown_tertiary_mediumContrast">#DACB91</color>
-    <color name="brown_onTertiary_mediumContrast">#1C1600</color>
-    <color name="brown_tertiaryContainer_mediumContrast">#9E905D</color>
+    <color name="brown_tertiary_mediumContrast">#D4CBA5</color>
+    <color name="brown_onTertiary_mediumContrast">#1A1602</color>
+    <color name="brown_tertiaryContainer_mediumContrast">#98916E</color>
     <color name="brown_onTertiaryContainer_mediumContrast">#000000</color>
     <color name="brown_error_mediumContrast">#FFBAB1</color>
     <color name="brown_onError_mediumContrast">#370001</color>
     <color name="brown_errorContainer_mediumContrast">#FF5449</color>
     <color name="brown_onErrorContainer_mediumContrast">#000000</color>
-    <color name="brown_background_mediumContrast">#1A110F</color>
-    <color name="brown_onBackground_mediumContrast">#F1DFD9</color>
-    <color name="brown_surface_mediumContrast">#1A110F</color>
+    <color name="brown_background_mediumContrast">#161312</color>
+    <color name="brown_onBackground_mediumContrast">#E9E1DF</color>
+    <color name="brown_surface_mediumContrast">#161312</color>
     <color name="brown_onSurface_mediumContrast">#FFF9F8</color>
-    <color name="brown_surfaceVariant_mediumContrast">#53433E</color>
-    <color name="brown_onSurfaceVariant_mediumContrast">#DCC6BF</color>
-    <color name="brown_outline_mediumContrast">#B39F98</color>
-    <color name="brown_outlineVariant_mediumContrast">#927F79</color>
+    <color name="brown_surfaceVariant_mediumContrast">#504440</color>
+    <color name="brown_onSurfaceVariant_mediumContrast">#D8C7C2</color>
+    <color name="brown_outline_mediumContrast">#AFA09B</color>
+    <color name="brown_outlineVariant_mediumContrast">#8E807C</color>
     <color name="brown_scrim_mediumContrast">#000000</color>
-    <color name="brown_inverseSurface_mediumContrast">#F1DFD9</color>
-    <color name="brown_inverseOnSurface_mediumContrast">#322824</color>
-    <color name="brown_inversePrimary_mediumContrast">#733720</color>
+    <color name="brown_inverseSurface_mediumContrast">#E9E1DF</color>
+    <color name="brown_inverseOnSurface_mediumContrast">#2D2928</color>
+    <color name="brown_inversePrimary_mediumContrast">#5E4137</color>
     <color name="brown_primaryFixed_mediumContrast">#FFDBCF</color>
-    <color name="brown_onPrimaryFixed_mediumContrast">#270600</color>
-    <color name="brown_primaryFixedDim_mediumContrast">#FFB59B</color>
-    <color name="brown_onPrimaryFixedVariant_mediumContrast">#5D2510</color>
-    <color name="brown_secondaryFixed_mediumContrast">#FFDBCF</color>
-    <color name="brown_onSecondaryFixed_mediumContrast">#200B05</color>
-    <color name="brown_secondaryFixedDim_mediumContrast">#E7BDB0</color>
-    <color name="brown_onSecondaryFixedVariant_mediumContrast">#4A3026</color>
-    <color name="brown_tertiaryFixed_mediumContrast">#F2E2A7</color>
-    <color name="brown_onTertiaryFixed_mediumContrast">#161100</color>
-    <color name="brown_tertiaryFixedDim_mediumContrast">#D5C68E</color>
-    <color name="brown_onTertiaryFixedVariant_mediumContrast">#3F360A</color>
-    <color name="brown_surfaceDim_mediumContrast">#1A110F</color>
-    <color name="brown_surfaceBright_mediumContrast">#423733</color>
-    <color name="brown_surfaceContainerLowest_mediumContrast">#140C0A</color>
-    <color name="brown_surfaceContainerLow_mediumContrast">#231A16</color>
-    <color name="brown_surfaceContainer_mediumContrast">#271D1A</color>
-    <color name="brown_surfaceContainerHigh_mediumContrast">#322824</color>
-    <color name="brown_surfaceContainerHighest_mediumContrast">#3D322F</color>
+    <color name="brown_onPrimaryFixed_mediumContrast">#200B05</color>
+    <color name="brown_primaryFixedDim_mediumContrast">#E7BDB0</color>
+    <color name="brown_onPrimaryFixedVariant_mediumContrast">#4A3026</color>
+    <color name="brown_secondaryFixed_mediumContrast">#F5DED6</color>
+    <color name="brown_onSecondaryFixed_mediumContrast">#190F0B</color>
+    <color name="brown_secondaryFixedDim_mediumContrast">#D8C2BB</color>
+    <color name="brown_onSecondaryFixedVariant_mediumContrast">#41332E</color>
+    <color name="brown_tertiaryFixed_mediumContrast">#ECE3BB</color>
+    <color name="brown_onTertiaryFixed_mediumContrast">#151100</color>
+    <color name="brown_tertiaryFixedDim_mediumContrast">#CFC7A1</color>
+    <color name="brown_onTertiaryFixedVariant_mediumContrast">#3B361B</color>
+    <color name="brown_surfaceDim_mediumContrast">#161312</color>
+    <color name="brown_surfaceBright_mediumContrast">#3C3837</color>
+    <color name="brown_surfaceContainerLowest_mediumContrast">#100E0D</color>
+    <color name="brown_surfaceContainerLow_mediumContrast">#1E1B1A</color>
+    <color name="brown_surfaceContainer_mediumContrast">#221F1E</color>
+    <color name="brown_surfaceContainerHigh_mediumContrast">#2D2928</color>
+    <color name="brown_surfaceContainerHighest_mediumContrast">#383433</color>
     <color name="brown_primary_highContrast">#FFF9F8</color>
     <color name="brown_onPrimary_highContrast">#000000</color>
-    <color name="brown_primaryContainer_highContrast">#FFBBA3</color>
+    <color name="brown_primaryContainer_highContrast">#EBC2B4</color>
     <color name="brown_onPrimaryContainer_highContrast">#000000</color>
     <color name="brown_secondary_highContrast">#FFF9F8</color>
     <color name="brown_onSecondary_highContrast">#000000</color>
-    <color name="brown_secondaryContainer_highContrast">#EBC2B4</color>
+    <color name="brown_secondaryContainer_highContrast">#DCC6BF</color>
     <color name="brown_onSecondaryContainer_highContrast">#000000</color>
-    <color name="brown_tertiary_highContrast">#FFFAF5</color>
+    <color name="brown_tertiary_highContrast">#FFFAF4</color>
     <color name="brown_onTertiary_highContrast">#000000</color>
-    <color name="brown_tertiaryContainer_highContrast">#DACB91</color>
+    <color name="brown_tertiaryContainer_highContrast">#D4CBA5</color>
     <color name="brown_onTertiaryContainer_highContrast">#000000</color>
     <color name="brown_error_highContrast">#FFF9F9</color>
     <color name="brown_onError_highContrast">#000000</color>
     <color name="brown_errorContainer_highContrast">#FFBAB1</color>
     <color name="brown_onErrorContainer_highContrast">#000000</color>
-    <color name="brown_background_highContrast">#1A110F</color>
-    <color name="brown_onBackground_highContrast">#F1DFD9</color>
-    <color name="brown_surface_highContrast">#1A110F</color>
+    <color name="brown_background_highContrast">#161312</color>
+    <color name="brown_onBackground_highContrast">#E9E1DF</color>
+    <color name="brown_surface_highContrast">#161312</color>
     <color name="brown_onSurface_highContrast">#FFFFFF</color>
-    <color name="brown_surfaceVariant_highContrast">#53433E</color>
+    <color name="brown_surfaceVariant_highContrast">#504440</color>
     <color name="brown_onSurfaceVariant_highContrast">#FFF9F8</color>
-    <color name="brown_outline_highContrast">#DCC6BF</color>
-    <color name="brown_outlineVariant_highContrast">#DCC6BF</color>
+    <color name="brown_outline_highContrast">#D8C7C2</color>
+    <color name="brown_outlineVariant_highContrast">#D8C7C2</color>
     <color name="brown_scrim_highContrast">#000000</color>
-    <color name="brown_inverseSurface_highContrast">#F1DFD9</color>
+    <color name="brown_inverseSurface_highContrast">#E9E1DF</color>
     <color name="brown_inverseOnSurface_highContrast">#000000</color>
-    <color name="brown_inversePrimary_highContrast">#4D1A05</color>
+    <color name="brown_inversePrimary_highContrast">#3D241B</color>
     <color name="brown_primaryFixed_highContrast">#FFE0D7</color>
     <color name="brown_onPrimaryFixed_highContrast">#000000</color>
-    <color name="brown_primaryFixedDim_highContrast">#FFBBA3</color>
-    <color name="brown_onPrimaryFixedVariant_highContrast">#2F0900</color>
-    <color name="brown_secondaryFixed_highContrast">#FFE0D7</color>
+    <color name="brown_primaryFixedDim_highContrast">#EBC2B4</color>
+    <color name="brown_onPrimaryFixedVariant_highContrast">#261009</color>
+    <color name="brown_secondaryFixed_highContrast">#F9E2DB</color>
     <color name="brown_onSecondaryFixed_highContrast">#000000</color>
-    <color name="brown_secondaryFixedDim_highContrast">#EBC2B4</color>
-    <color name="brown_onSecondaryFixedVariant_highContrast">#261009</color>
-    <color name="brown_tertiaryFixed_highContrast">#F7E7AB</color>
+    <color name="brown_secondaryFixedDim_highContrast">#DCC6BF</color>
+    <color name="brown_onSecondaryFixedVariant_highContrast">#1F1410</color>
+    <color name="brown_tertiaryFixed_highContrast">#F1E7C0</color>
     <color name="brown_onTertiaryFixed_highContrast">#000000</color>
-    <color name="brown_tertiaryFixedDim_highContrast">#DACB91</color>
-    <color name="brown_onTertiaryFixedVariant_highContrast">#1C1600</color>
-    <color name="brown_surfaceDim_highContrast">#1A110F</color>
-    <color name="brown_surfaceBright_highContrast">#423733</color>
-    <color name="brown_surfaceContainerLowest_highContrast">#140C0A</color>
-    <color name="brown_surfaceContainerLow_highContrast">#231A16</color>
-    <color name="brown_surfaceContainer_highContrast">#271D1A</color>
-    <color name="brown_surfaceContainerHigh_highContrast">#322824</color>
-    <color name="brown_surfaceContainerHighest_highContrast">#3D322F</color>
+    <color name="brown_tertiaryFixedDim_highContrast">#D4CBA5</color>
+    <color name="brown_onTertiaryFixedVariant_highContrast">#1A1602</color>
+    <color name="brown_surfaceDim_highContrast">#161312</color>
+    <color name="brown_surfaceBright_highContrast">#3C3837</color>
+    <color name="brown_surfaceContainerLowest_highContrast">#100E0D</color>
+    <color name="brown_surfaceContainerLow_highContrast">#1E1B1A</color>
+    <color name="brown_surfaceContainer_highContrast">#221F1E</color>
+    <color name="brown_surfaceContainerHigh_highContrast">#2D2928</color>
+    <color name="brown_surfaceContainerHighest_highContrast">#383433</color>
 
-    <color name="grey_primary">#82D3E0</color>
-    <color name="grey_onPrimary">#00363D</color>
-    <color name="grey_primaryContainer">#004F58</color>
-    <color name="grey_onPrimaryContainer">#9EEFFD</color>
-    <color name="grey_secondary">#B1CBD0</color>
-    <color name="grey_onSecondary">#1C3438</color>
-    <color name="grey_secondaryContainer">#334B4F</color>
-    <color name="grey_onSecondaryContainer">#CDE7EC</color>
-    <color name="grey_tertiary">#BAC6EA</color>
-    <color name="grey_onTertiary">#24304D</color>
-    <color name="grey_tertiaryContainer">#3B4664</color>
-    <color name="grey_onTertiaryContainer">#DAE2FF</color>
+    <color name="grey_primary">#C7C6C6</color>
+    <color name="grey_onPrimary">#303031</color>
+    <color name="grey_primaryContainer">#6C6C6C</color>
+    <color name="grey_onPrimaryContainer">#FFFFFF</color>
+    <color name="grey_secondary">#C8C6C5</color>
+    <color name="grey_onSecondary">#303030</color>
+    <color name="grey_secondaryContainer">#3E3D3D</color>
+    <color name="grey_onSecondaryContainer">#D3D0D0</color>
+    <color name="grey_tertiary">#CBC5C7</color>
+    <color name="grey_onTertiary">#323031</color>
+    <color name="grey_tertiaryContainer">#6F6B6D</color>
+    <color name="grey_onTertiaryContainer">#FFFFFF</color>
     <color name="grey_error">#FFB4AB</color>
     <color name="grey_onError">#690005</color>
     <color name="grey_errorContainer">#93000A</color>
     <color name="grey_onErrorContainer">#FFDAD6</color>
-    <color name="grey_background">#0E1415</color>
-    <color name="grey_onBackground">#DEE3E5</color>
-    <color name="grey_surface">#0E1415</color>
-    <color name="grey_onSurface">#DEE3E5</color>
-    <color name="grey_surfaceVariant">#3F484A</color>
-    <color name="grey_onSurfaceVariant">#BFC8CA</color>
-    <color name="grey_outline">#899294</color>
-    <color name="grey_outlineVariant">#3F484A</color>
+    <color name="grey_background">#141313</color>
+    <color name="grey_onBackground">#E5E2E1</color>
+    <color name="grey_surface">#141313</color>
+    <color name="grey_onSurface">#E5E2E1</color>
+    <color name="grey_surfaceVariant">#444748</color>
+    <color name="grey_onSurfaceVariant">#C4C7C7</color>
+    <color name="grey_outline">#8E9192</color>
+    <color name="grey_outlineVariant">#444748</color>
     <color name="grey_scrim">#000000</color>
-    <color name="grey_inverseSurface">#DEE3E5</color>
-    <color name="grey_inverseOnSurface">#2B3133</color>
-    <color name="grey_inversePrimary">#006874</color>
-    <color name="grey_primaryFixed">#9EEFFD</color>
-    <color name="grey_onPrimaryFixed">#001F24</color>
-    <color name="grey_primaryFixedDim">#82D3E0</color>
-    <color name="grey_onPrimaryFixedVariant">#004F58</color>
-    <color name="grey_secondaryFixed">#CDE7EC</color>
-    <color name="grey_onSecondaryFixed">#051F23</color>
-    <color name="grey_secondaryFixedDim">#B1CBD0</color>
-    <color name="grey_onSecondaryFixedVariant">#334B4F</color>
-    <color name="grey_tertiaryFixed">#DAE2FF</color>
-    <color name="grey_onTertiaryFixed">#0E1B37</color>
-    <color name="grey_tertiaryFixedDim">#BAC6EA</color>
-    <color name="grey_onTertiaryFixedVariant">#3B4664</color>
-    <color name="grey_surfaceDim">#0E1415</color>
-    <color name="grey_surfaceBright">#343A3B</color>
-    <color name="grey_surfaceContainerLowest">#090F10</color>
-    <color name="grey_surfaceContainerLow">#171D1E</color>
-    <color name="grey_surfaceContainer">#1B2122</color>
-    <color name="grey_surfaceContainerHigh">#252B2C</color>
-    <color name="grey_surfaceContainerHighest">#303637</color>
-    <color name="grey_primary_mediumContrast">#86D7E5</color>
-    <color name="grey_onPrimary_mediumContrast">#001A1D</color>
-    <color name="grey_primaryContainer_mediumContrast">#499CA9</color>
+    <color name="grey_inverseSurface">#E5E2E1</color>
+    <color name="grey_inverseOnSurface">#313030</color>
+    <color name="grey_inversePrimary">#5E5E5E</color>
+    <color name="grey_primaryFixed">#E3E2E2</color>
+    <color name="grey_onPrimaryFixed">#1B1C1C</color>
+    <color name="grey_primaryFixedDim">#C7C6C6</color>
+    <color name="grey_onPrimaryFixedVariant">#464747</color>
+    <color name="grey_secondaryFixed">#E5E2E1</color>
+    <color name="grey_onSecondaryFixed">#1B1C1C</color>
+    <color name="grey_secondaryFixedDim">#C8C6C5</color>
+    <color name="grey_onSecondaryFixedVariant">#474746</color>
+    <color name="grey_tertiaryFixed">#E7E1E3</color>
+    <color name="grey_onTertiaryFixed">#1D1B1D</color>
+    <color name="grey_tertiaryFixedDim">#CBC5C7</color>
+    <color name="grey_onTertiaryFixedVariant">#494648</color>
+    <color name="grey_surfaceDim">#141313</color>
+    <color name="grey_surfaceBright">#3A3939</color>
+    <color name="grey_surfaceContainerLowest">#0E0E0E</color>
+    <color name="grey_surfaceContainerLow">#1C1B1B</color>
+    <color name="grey_surfaceContainer">#201F1F</color>
+    <color name="grey_surfaceContainerHigh">#2A2A2A</color>
+    <color name="grey_surfaceContainerHighest">#353434</color>
+    <color name="grey_primary_mediumContrast">#CBCACA</color>
+    <color name="grey_onPrimary_mediumContrast">#151617</color>
+    <color name="grey_primaryContainer_mediumContrast">#919090</color>
     <color name="grey_onPrimaryContainer_mediumContrast">#000000</color>
-    <color name="grey_secondary_mediumContrast">#B5CFD4</color>
-    <color name="grey_onSecondary_mediumContrast">#011A1D</color>
-    <color name="grey_secondaryContainer_mediumContrast">#7C959A</color>
+    <color name="grey_secondary_mediumContrast">#CCCACA</color>
+    <color name="grey_onSecondary_mediumContrast">#161616</color>
+    <color name="grey_secondaryContainer_mediumContrast">#929090</color>
     <color name="grey_onSecondaryContainer_mediumContrast">#000000</color>
-    <color name="grey_tertiary_mediumContrast">#BECAEF</color>
-    <color name="grey_onTertiary_mediumContrast">#081531</color>
-    <color name="grey_tertiaryContainer_mediumContrast">#8490B2</color>
+    <color name="grey_tertiary_mediumContrast">#CFC9CB</color>
+    <color name="grey_onTertiary_mediumContrast">#181617</color>
+    <color name="grey_tertiaryContainer_mediumContrast">#948F91</color>
     <color name="grey_onTertiaryContainer_mediumContrast">#000000</color>
     <color name="grey_error_mediumContrast">#FFBAB1</color>
     <color name="grey_onError_mediumContrast">#370001</color>
     <color name="grey_errorContainer_mediumContrast">#FF5449</color>
     <color name="grey_onErrorContainer_mediumContrast">#000000</color>
-    <color name="grey_background_mediumContrast">#0E1415</color>
-    <color name="grey_onBackground_mediumContrast">#DEE3E5</color>
-    <color name="grey_surface_mediumContrast">#0E1415</color>
-    <color name="grey_onSurface_mediumContrast">#F6FCFD</color>
-    <color name="grey_surfaceVariant_mediumContrast">#3F484A</color>
-    <color name="grey_onSurfaceVariant_mediumContrast">#C3CCCE</color>
-    <color name="grey_outline_mediumContrast">#9BA5A6</color>
-    <color name="grey_outlineVariant_mediumContrast">#7B8587</color>
+    <color name="grey_background_mediumContrast">#141313</color>
+    <color name="grey_onBackground_mediumContrast">#E5E2E1</color>
+    <color name="grey_surface_mediumContrast">#141313</color>
+    <color name="grey_onSurface_mediumContrast">#FEFAF9</color>
+    <color name="grey_surfaceVariant_mediumContrast">#444748</color>
+    <color name="grey_onSurfaceVariant_mediumContrast">#C8CBCC</color>
+    <color name="grey_outline_mediumContrast">#A0A3A4</color>
+    <color name="grey_outlineVariant_mediumContrast">#808484</color>
     <color name="grey_scrim_mediumContrast">#000000</color>
-    <color name="grey_inverseSurface_mediumContrast">#DEE3E5</color>
-    <color name="grey_inverseOnSurface_mediumContrast">#252B2C</color>
-    <color name="grey_inversePrimary_mediumContrast">#005059</color>
-    <color name="grey_primaryFixed_mediumContrast">#9EEFFD</color>
-    <color name="grey_onPrimaryFixed_mediumContrast">#001417</color>
-    <color name="grey_primaryFixedDim_mediumContrast">#82D3E0</color>
-    <color name="grey_onPrimaryFixedVariant_mediumContrast">#003C44</color>
-    <color name="grey_secondaryFixed_mediumContrast">#CDE7EC</color>
-    <color name="grey_onSecondaryFixed_mediumContrast">#001417</color>
-    <color name="grey_secondaryFixedDim_mediumContrast">#B1CBD0</color>
-    <color name="grey_onSecondaryFixedVariant_mediumContrast">#223A3E</color>
-    <color name="grey_tertiaryFixed_mediumContrast">#DAE2FF</color>
-    <color name="grey_onTertiaryFixed_mediumContrast">#03102C</color>
-    <color name="grey_tertiaryFixedDim_mediumContrast">#BAC6EA</color>
-    <color name="grey_onTertiaryFixedVariant_mediumContrast">#2A3553</color>
-    <color name="grey_surfaceDim_mediumContrast">#0E1415</color>
-    <color name="grey_surfaceBright_mediumContrast">#343A3B</color>
-    <color name="grey_surfaceContainerLowest_mediumContrast">#090F10</color>
-    <color name="grey_surfaceContainerLow_mediumContrast">#171D1E</color>
-    <color name="grey_surfaceContainer_mediumContrast">#1B2122</color>
-    <color name="grey_surfaceContainerHigh_mediumContrast">#252B2C</color>
-    <color name="grey_surfaceContainerHighest_mediumContrast">#303637</color>
-    <color name="grey_primary_highContrast">#F1FDFF</color>
+    <color name="grey_inverseSurface_mediumContrast">#E5E2E1</color>
+    <color name="grey_inverseOnSurface_mediumContrast">#2B2A2A</color>
+    <color name="grey_inversePrimary_mediumContrast">#474848</color>
+    <color name="grey_primaryFixed_mediumContrast">#E3E2E2</color>
+    <color name="grey_onPrimaryFixed_mediumContrast">#101111</color>
+    <color name="grey_primaryFixedDim_mediumContrast">#C7C6C6</color>
+    <color name="grey_onPrimaryFixedVariant_mediumContrast">#353636</color>
+    <color name="grey_secondaryFixed_mediumContrast">#E5E2E1</color>
+    <color name="grey_onSecondaryFixed_mediumContrast">#111111</color>
+    <color name="grey_secondaryFixedDim_mediumContrast">#C8C6C5</color>
+    <color name="grey_onSecondaryFixedVariant_mediumContrast">#363636</color>
+    <color name="grey_tertiaryFixed_mediumContrast">#E7E1E3</color>
+    <color name="grey_onTertiaryFixed_mediumContrast">#121112</color>
+    <color name="grey_tertiaryFixedDim_mediumContrast">#CBC5C7</color>
+    <color name="grey_onTertiaryFixedVariant_mediumContrast">#383537</color>
+    <color name="grey_surfaceDim_mediumContrast">#141313</color>
+    <color name="grey_surfaceBright_mediumContrast">#3A3939</color>
+    <color name="grey_surfaceContainerLowest_mediumContrast">#0E0E0E</color>
+    <color name="grey_surfaceContainerLow_mediumContrast">#1C1B1B</color>
+    <color name="grey_surfaceContainer_mediumContrast">#201F1F</color>
+    <color name="grey_surfaceContainerHigh_mediumContrast">#2A2A2A</color>
+    <color name="grey_surfaceContainerHighest_mediumContrast">#353434</color>
+    <color name="grey_primary_highContrast">#FCFAFA</color>
     <color name="grey_onPrimary_highContrast">#000000</color>
-    <color name="grey_primaryContainer_highContrast">#86D7E5</color>
+    <color name="grey_primaryContainer_highContrast">#CBCACA</color>
     <color name="grey_onPrimaryContainer_highContrast">#000000</color>
-    <color name="grey_secondary_highContrast">#F1FDFF</color>
+    <color name="grey_secondary_highContrast">#FDFAF9</color>
     <color name="grey_onSecondary_highContrast">#000000</color>
-    <color name="grey_secondaryContainer_highContrast">#B5CFD4</color>
+    <color name="grey_secondaryContainer_highContrast">#CCCACA</color>
     <color name="grey_onSecondaryContainer_highContrast">#000000</color>
-    <color name="grey_tertiary_highContrast">#FCFAFF</color>
+    <color name="grey_tertiary_highContrast">#FFF9FA</color>
     <color name="grey_onTertiary_highContrast">#000000</color>
-    <color name="grey_tertiaryContainer_highContrast">#BECAEF</color>
+    <color name="grey_tertiaryContainer_highContrast">#CFC9CB</color>
     <color name="grey_onTertiaryContainer_highContrast">#000000</color>
     <color name="grey_error_highContrast">#FFF9F9</color>
     <color name="grey_onError_highContrast">#000000</color>
     <color name="grey_errorContainer_highContrast">#FFBAB1</color>
     <color name="grey_onErrorContainer_highContrast">#000000</color>
-    <color name="grey_background_highContrast">#0E1415</color>
-    <color name="grey_onBackground_highContrast">#DEE3E5</color>
-    <color name="grey_surface_highContrast">#0E1415</color>
+    <color name="grey_background_highContrast">#141313</color>
+    <color name="grey_onBackground_highContrast">#E5E2E1</color>
+    <color name="grey_surface_highContrast">#141313</color>
     <color name="grey_onSurface_highContrast">#FFFFFF</color>
-    <color name="grey_surfaceVariant_highContrast">#3F484A</color>
-    <color name="grey_onSurfaceVariant_highContrast">#F3FCFE</color>
-    <color name="grey_outline_highContrast">#C3CCCE</color>
-    <color name="grey_outlineVariant_highContrast">#C3CCCE</color>
+    <color name="grey_surfaceVariant_highContrast">#444748</color>
+    <color name="grey_onSurfaceVariant_highContrast">#F9FBFC</color>
+    <color name="grey_outline_highContrast">#C8CBCC</color>
+    <color name="grey_outlineVariant_highContrast">#C8CBCC</color>
     <color name="grey_scrim_highContrast">#000000</color>
-    <color name="grey_inverseSurface_highContrast">#DEE3E5</color>
+    <color name="grey_inverseSurface_highContrast">#E5E2E1</color>
     <color name="grey_inverseOnSurface_highContrast">#000000</color>
-    <color name="grey_inversePrimary_highContrast">#002F35</color>
-    <color name="grey_primaryFixed_highContrast">#AAF3FF</color>
+    <color name="grey_inversePrimary_highContrast">#292A2A</color>
+    <color name="grey_primaryFixed_highContrast">#E8E6E6</color>
     <color name="grey_onPrimaryFixed_highContrast">#000000</color>
-    <color name="grey_primaryFixedDim_highContrast">#86D7E5</color>
-    <color name="grey_onPrimaryFixedVariant_highContrast">#001A1D</color>
-    <color name="grey_secondaryFixed_highContrast">#D1ECF0</color>
+    <color name="grey_primaryFixedDim_highContrast">#CBCACA</color>
+    <color name="grey_onPrimaryFixedVariant_highContrast">#151617</color>
+    <color name="grey_secondaryFixed_highContrast">#E9E6E6</color>
     <color name="grey_onSecondaryFixed_highContrast">#000000</color>
-    <color name="grey_secondaryFixedDim_highContrast">#B5CFD4</color>
-    <color name="grey_onSecondaryFixedVariant_highContrast">#011A1D</color>
-    <color name="grey_tertiaryFixed_highContrast">#E0E6FF</color>
+    <color name="grey_secondaryFixedDim_highContrast">#CCCACA</color>
+    <color name="grey_onSecondaryFixedVariant_highContrast">#161616</color>
+    <color name="grey_tertiaryFixed_highContrast">#EBE5E7</color>
     <color name="grey_onTertiaryFixed_highContrast">#000000</color>
-    <color name="grey_tertiaryFixedDim_highContrast">#BECAEF</color>
-    <color name="grey_onTertiaryFixedVariant_highContrast">#081531</color>
-    <color name="grey_surfaceDim_highContrast">#0E1415</color>
-    <color name="grey_surfaceBright_highContrast">#343A3B</color>
-    <color name="grey_surfaceContainerLowest_highContrast">#090F10</color>
-    <color name="grey_surfaceContainerLow_highContrast">#171D1E</color>
-    <color name="grey_surfaceContainer_highContrast">#1B2122</color>
-    <color name="grey_surfaceContainerHigh_highContrast">#252B2C</color>
-    <color name="grey_surfaceContainerHighest_highContrast">#303637</color>
+    <color name="grey_tertiaryFixedDim_highContrast">#CFC9CB</color>
+    <color name="grey_onTertiaryFixedVariant_highContrast">#181617</color>
+    <color name="grey_surfaceDim_highContrast">#141313</color>
+    <color name="grey_surfaceBright_highContrast">#3A3939</color>
+    <color name="grey_surfaceContainerLowest_highContrast">#0E0E0E</color>
+    <color name="grey_surfaceContainerLow_highContrast">#1C1B1B</color>
+    <color name="grey_surfaceContainer_highContrast">#201F1F</color>
+    <color name="grey_surfaceContainerHigh_highContrast">#2A2A2A</color>
+    <color name="grey_surfaceContainerHighest_highContrast">#353434</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_ui.xml b/app/src/main/res/values/colors_ui.xml
index 605149368..984e35604 100644
--- a/app/src/main/res/values/colors_ui.xml
+++ b/app/src/main/res/values/colors_ui.xml
@@ -1988,287 +1988,287 @@
     <color name="orange_surfaceContainerHigh_highContrast">#F5E5DB</color>
     <color name="orange_surfaceContainerHighest_highContrast">#EFE0D6</color>
 
-    <color name="brown_primary">#8F4C34</color>
+    <color name="brown_primary">#604238</color>
     <color name="brown_onPrimary">#FFFFFF</color>
-    <color name="brown_primaryContainer">#FFDBCF</color>
-    <color name="brown_onPrimaryContainer">#380D00</color>
-    <color name="brown_secondary">#77574C</color>
+    <color name="brown_primaryContainer">#87665A</color>
+    <color name="brown_onPrimaryContainer">#FFFFFF</color>
+    <color name="brown_secondary">#6B5B55</color>
     <color name="brown_onSecondary">#FFFFFF</color>
-    <color name="brown_secondaryContainer">#FFDBCF</color>
-    <color name="brown_onSecondaryContainer">#2C160D</color>
-    <color name="brown_tertiary">#695E2F</color>
+    <color name="brown_secondaryContainer">#F9E2DB</color>
+    <color name="brown_onSecondaryContainer">#574742</color>
+    <color name="brown_tertiary">#4F4A2D</color>
     <color name="brown_onTertiary">#FFFFFF</color>
-    <color name="brown_tertiaryContainer">#F2E2A7</color>
-    <color name="brown_onTertiaryContainer">#221B00</color>
+    <color name="brown_tertiaryContainer">#746E4E</color>
+    <color name="brown_onTertiaryContainer">#FFFFFF</color>
     <color name="brown_error">#BA1A1A</color>
     <color name="brown_onError">#FFFFFF</color>
     <color name="brown_errorContainer">#FFDAD6</color>
     <color name="brown_onErrorContainer">#410002</color>
     <color name="brown_background">#FFF8F6</color>
-    <color name="brown_onBackground">#231A16</color>
+    <color name="brown_onBackground">#1E1B1A</color>
     <color name="brown_surface">#FFF8F6</color>
-    <color name="brown_onSurface">#231A16</color>
-    <color name="brown_surfaceVariant">#F5DED7</color>
-    <color name="brown_onSurfaceVariant">#53433E</color>
-    <color name="brown_outline">#85736D</color>
-    <color name="brown_outlineVariant">#D8C2BB</color>
+    <color name="brown_onSurface">#1E1B1A</color>
+    <color name="brown_surfaceVariant">#F1DFD9</color>
+    <color name="brown_onSurfaceVariant">#504440</color>
+    <color name="brown_outline">#827470</color>
+    <color name="brown_outlineVariant">#D4C3BE</color>
     <color name="brown_scrim">#000000</color>
-    <color name="brown_inverseSurface">#392E2B</color>
-    <color name="brown_inverseOnSurface">#FFEDE8</color>
-    <color name="brown_inversePrimary">#FFB59B</color>
+    <color name="brown_inverseSurface">#33302E</color>
+    <color name="brown_inverseOnSurface">#F7EFED</color>
+    <color name="brown_inversePrimary">#E7BDB0</color>
     <color name="brown_primaryFixed">#FFDBCF</color>
-    <color name="brown_onPrimaryFixed">#380D00</color>
-    <color name="brown_primaryFixedDim">#FFB59B</color>
-    <color name="brown_onPrimaryFixedVariant">#72351F</color>
-    <color name="brown_secondaryFixed">#FFDBCF</color>
-    <color name="brown_onSecondaryFixed">#2C160D</color>
-    <color name="brown_secondaryFixedDim">#E7BDB0</color>
-    <color name="brown_onSecondaryFixedVariant">#5D4036</color>
-    <color name="brown_tertiaryFixed">#F2E2A7</color>
-    <color name="brown_onTertiaryFixed">#221B00</color>
-    <color name="brown_tertiaryFixedDim">#D5C68E</color>
-    <color name="brown_onTertiaryFixedVariant">#51461A</color>
-    <color name="brown_surfaceDim">#E8D6D1</color>
+    <color name="brown_onPrimaryFixed">#2C160D</color>
+    <color name="brown_primaryFixedDim">#E7BDB0</color>
+    <color name="brown_onPrimaryFixedVariant">#5D4036</color>
+    <color name="brown_secondaryFixed">#F5DED6</color>
+    <color name="brown_onSecondaryFixed">#251915</color>
+    <color name="brown_secondaryFixedDim">#D8C2BB</color>
+    <color name="brown_onSecondaryFixedVariant">#53433E</color>
+    <color name="brown_tertiaryFixed">#ECE3BB</color>
+    <color name="brown_onTertiaryFixed">#201C04</color>
+    <color name="brown_tertiaryFixedDim">#CFC7A1</color>
+    <color name="brown_onTertiaryFixedVariant">#4C472A</color>
+    <color name="brown_surfaceDim">#E0D8D6</color>
     <color name="brown_surfaceBright">#FFF8F6</color>
     <color name="brown_surfaceContainerLowest">#FFFFFF</color>
-    <color name="brown_surfaceContainerLow">#FFF1EC</color>
-    <color name="brown_surfaceContainer">#FCEAE5</color>
-    <color name="brown_surfaceContainerHigh">#F7E4DF</color>
-    <color name="brown_surfaceContainerHighest">#F1DFD9</color>
-    <color name="brown_primary_mediumContrast">#6D321B</color>
+    <color name="brown_surfaceContainerLow">#FAF2F0</color>
+    <color name="brown_surfaceContainer">#F4ECEA</color>
+    <color name="brown_surfaceContainerHigh">#EFE6E4</color>
+    <color name="brown_surfaceContainerHighest">#E9E1DF</color>
+    <color name="brown_primary_mediumContrast">#593C32</color>
     <color name="brown_onPrimary_mediumContrast">#FFFFFF</color>
-    <color name="brown_primaryContainer_mediumContrast">#A96247</color>
+    <color name="brown_primaryContainer_mediumContrast">#87665A</color>
     <color name="brown_onPrimaryContainer_mediumContrast">#FFFFFF</color>
-    <color name="brown_secondary_mediumContrast">#593C32</color>
+    <color name="brown_secondary_mediumContrast">#4F3F3B</color>
     <color name="brown_onSecondary_mediumContrast">#FFFFFF</color>
-    <color name="brown_secondaryContainer_mediumContrast">#8F6D61</color>
+    <color name="brown_secondaryContainer_mediumContrast">#83716B</color>
     <color name="brown_onSecondaryContainer_mediumContrast">#FFFFFF</color>
-    <color name="brown_tertiary_mediumContrast">#4C4216</color>
+    <color name="brown_tertiary_mediumContrast">#484327</color>
     <color name="brown_onTertiary_mediumContrast">#FFFFFF</color>
-    <color name="brown_tertiaryContainer_mediumContrast">#807443</color>
+    <color name="brown_tertiaryContainer_mediumContrast">#746E4E</color>
     <color name="brown_onTertiaryContainer_mediumContrast">#FFFFFF</color>
     <color name="brown_error_mediumContrast">#8C0009</color>
     <color name="brown_onError_mediumContrast">#FFFFFF</color>
     <color name="brown_errorContainer_mediumContrast">#DA342E</color>
     <color name="brown_onErrorContainer_mediumContrast">#FFFFFF</color>
     <color name="brown_background_mediumContrast">#FFF8F6</color>
-    <color name="brown_onBackground_mediumContrast">#231A16</color>
+    <color name="brown_onBackground_mediumContrast">#1E1B1A</color>
     <color name="brown_surface_mediumContrast">#FFF8F6</color>
-    <color name="brown_onSurface_mediumContrast">#231A16</color>
-    <color name="brown_surfaceVariant_mediumContrast">#F5DED7</color>
-    <color name="brown_onSurfaceVariant_mediumContrast">#4F403B</color>
-    <color name="brown_outline_mediumContrast">#6C5B56</color>
-    <color name="brown_outlineVariant_mediumContrast">#897771</color>
+    <color name="brown_onSurface_mediumContrast">#1E1B1A</color>
+    <color name="brown_surfaceVariant_mediumContrast">#F1DFD9</color>
+    <color name="brown_onSurfaceVariant_mediumContrast">#4C403D</color>
+    <color name="brown_outline_mediumContrast">#695C58</color>
+    <color name="brown_outlineVariant_mediumContrast">#867873</color>
     <color name="brown_scrim_mediumContrast">#000000</color>
-    <color name="brown_inverseSurface_mediumContrast">#392E2B</color>
-    <color name="brown_inverseOnSurface_mediumContrast">#FFEDE8</color>
-    <color name="brown_inversePrimary_mediumContrast">#FFB59B</color>
-    <color name="brown_primaryFixed_mediumContrast">#A96247</color>
+    <color name="brown_inverseSurface_mediumContrast">#33302E</color>
+    <color name="brown_inverseOnSurface_mediumContrast">#F7EFED</color>
+    <color name="brown_inversePrimary_mediumContrast">#E7BDB0</color>
+    <color name="brown_primaryFixed_mediumContrast">#8F6D61</color>
     <color name="brown_onPrimaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="brown_primaryFixedDim_mediumContrast">#8C4A31</color>
+    <color name="brown_primaryFixedDim_mediumContrast">#74554A</color>
     <color name="brown_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="brown_secondaryFixed_mediumContrast">#8F6D61</color>
+    <color name="brown_secondaryFixed_mediumContrast">#83716B</color>
     <color name="brown_onSecondaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="brown_secondaryFixedDim_mediumContrast">#74554A</color>
+    <color name="brown_secondaryFixedDim_mediumContrast">#695853</color>
     <color name="brown_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="brown_tertiaryFixed_mediumContrast">#807443</color>
+    <color name="brown_tertiaryFixed_mediumContrast">#7B7554</color>
     <color name="brown_onTertiaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="brown_tertiaryFixedDim_mediumContrast">#675C2D</color>
+    <color name="brown_tertiaryFixedDim_mediumContrast">#625C3E</color>
     <color name="brown_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="brown_surfaceDim_mediumContrast">#E8D6D1</color>
+    <color name="brown_surfaceDim_mediumContrast">#E0D8D6</color>
     <color name="brown_surfaceBright_mediumContrast">#FFF8F6</color>
     <color name="brown_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
-    <color name="brown_surfaceContainerLow_mediumContrast">#FFF1EC</color>
-    <color name="brown_surfaceContainer_mediumContrast">#FCEAE5</color>
-    <color name="brown_surfaceContainerHigh_mediumContrast">#F7E4DF</color>
-    <color name="brown_surfaceContainerHighest_mediumContrast">#F1DFD9</color>
-    <color name="brown_primary_highContrast">#421201</color>
+    <color name="brown_surfaceContainerLow_mediumContrast">#FAF2F0</color>
+    <color name="brown_surfaceContainer_mediumContrast">#F4ECEA</color>
+    <color name="brown_surfaceContainerHigh_mediumContrast">#EFE6E4</color>
+    <color name="brown_surfaceContainerHighest_mediumContrast">#E9E1DF</color>
+    <color name="brown_primary_highContrast">#341C14</color>
     <color name="brown_onPrimary_highContrast">#FFFFFF</color>
-    <color name="brown_primaryContainer_highContrast">#6D321B</color>
+    <color name="brown_primaryContainer_highContrast">#593C32</color>
     <color name="brown_onPrimaryContainer_highContrast">#FFFFFF</color>
-    <color name="brown_secondary_highContrast">#341C14</color>
+    <color name="brown_secondary_highContrast">#2C1F1B</color>
     <color name="brown_onSecondary_highContrast">#FFFFFF</color>
-    <color name="brown_secondaryContainer_highContrast">#593C32</color>
+    <color name="brown_secondaryContainer_highContrast">#4F3F3B</color>
     <color name="brown_onSecondaryContainer_highContrast">#FFFFFF</color>
-    <color name="brown_tertiary_highContrast">#292200</color>
+    <color name="brown_tertiary_highContrast">#272209</color>
     <color name="brown_onTertiary_highContrast">#FFFFFF</color>
-    <color name="brown_tertiaryContainer_highContrast">#4C4216</color>
+    <color name="brown_tertiaryContainer_highContrast">#484327</color>
     <color name="brown_onTertiaryContainer_highContrast">#FFFFFF</color>
     <color name="brown_error_highContrast">#4E0002</color>
     <color name="brown_onError_highContrast">#FFFFFF</color>
     <color name="brown_errorContainer_highContrast">#8C0009</color>
     <color name="brown_onErrorContainer_highContrast">#FFFFFF</color>
     <color name="brown_background_highContrast">#FFF8F6</color>
-    <color name="brown_onBackground_highContrast">#231A16</color>
+    <color name="brown_onBackground_highContrast">#1E1B1A</color>
     <color name="brown_surface_highContrast">#FFF8F6</color>
     <color name="brown_onSurface_highContrast">#000000</color>
-    <color name="brown_surfaceVariant_highContrast">#F5DED7</color>
-    <color name="brown_onSurfaceVariant_highContrast">#2E211D</color>
-    <color name="brown_outline_highContrast">#4F403B</color>
-    <color name="brown_outlineVariant_highContrast">#4F403B</color>
+    <color name="brown_surfaceVariant_highContrast">#F1DFD9</color>
+    <color name="brown_onSurfaceVariant_highContrast">#2B221F</color>
+    <color name="brown_outline_highContrast">#4C403D</color>
+    <color name="brown_outlineVariant_highContrast">#4C403D</color>
     <color name="brown_scrim_highContrast">#000000</color>
-    <color name="brown_inverseSurface_highContrast">#392E2B</color>
+    <color name="brown_inverseSurface_highContrast">#33302E</color>
     <color name="brown_inverseOnSurface_highContrast">#FFFFFF</color>
     <color name="brown_inversePrimary_highContrast">#FFE7E0</color>
-    <color name="brown_primaryFixed_highContrast">#6D321B</color>
+    <color name="brown_primaryFixed_highContrast">#593C32</color>
     <color name="brown_onPrimaryFixed_highContrast">#FFFFFF</color>
-    <color name="brown_primaryFixedDim_highContrast">#501C07</color>
+    <color name="brown_primaryFixedDim_highContrast">#40261D</color>
     <color name="brown_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="brown_secondaryFixed_highContrast">#593C32</color>
+    <color name="brown_secondaryFixed_highContrast">#4F3F3B</color>
     <color name="brown_onSecondaryFixed_highContrast">#FFFFFF</color>
-    <color name="brown_secondaryFixedDim_highContrast">#40261D</color>
+    <color name="brown_secondaryFixedDim_highContrast">#372A25</color>
     <color name="brown_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="brown_tertiaryFixed_highContrast">#4C4216</color>
+    <color name="brown_tertiaryFixed_highContrast">#484327</color>
     <color name="brown_onTertiaryFixed_highContrast">#FFFFFF</color>
-    <color name="brown_tertiaryFixedDim_highContrast">#352C03</color>
+    <color name="brown_tertiaryFixedDim_highContrast">#312D12</color>
     <color name="brown_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="brown_surfaceDim_highContrast">#E8D6D1</color>
+    <color name="brown_surfaceDim_highContrast">#E0D8D6</color>
     <color name="brown_surfaceBright_highContrast">#FFF8F6</color>
     <color name="brown_surfaceContainerLowest_highContrast">#FFFFFF</color>
-    <color name="brown_surfaceContainerLow_highContrast">#FFF1EC</color>
-    <color name="brown_surfaceContainer_highContrast">#FCEAE5</color>
-    <color name="brown_surfaceContainerHigh_highContrast">#F7E4DF</color>
-    <color name="brown_surfaceContainerHighest_highContrast">#F1DFD9</color>
+    <color name="brown_surfaceContainerLow_highContrast">#FAF2F0</color>
+    <color name="brown_surfaceContainer_highContrast">#F4ECEA</color>
+    <color name="brown_surfaceContainerHigh_highContrast">#EFE6E4</color>
+    <color name="brown_surfaceContainerHighest_highContrast">#E9E1DF</color>
 
-    <color name="grey_primary">#006874</color>
+    <color name="grey_primary">#505151</color>
     <color name="grey_onPrimary">#FFFFFF</color>
-    <color name="grey_primaryContainer">#9EEFFD</color>
-    <color name="grey_onPrimaryContainer">#001F24</color>
-    <color name="grey_secondary">#4A6267</color>
+    <color name="grey_primaryContainer">#757575</color>
+    <color name="grey_onPrimaryContainer">#FFFFFF</color>
+    <color name="grey_secondary">#5F5E5E</color>
     <color name="grey_onSecondary">#FFFFFF</color>
-    <color name="grey_secondaryContainer">#CDE7EC</color>
-    <color name="grey_onSecondaryContainer">#051F23</color>
-    <color name="grey_tertiary">#525E7D</color>
+    <color name="grey_secondaryContainer">#E6E3E2</color>
+    <color name="grey_onSecondaryContainer">#494848</color>
+    <color name="grey_tertiary">#535052</color>
     <color name="grey_onTertiary">#FFFFFF</color>
-    <color name="grey_tertiaryContainer">#DAE2FF</color>
-    <color name="grey_onTertiaryContainer">#0E1B37</color>
+    <color name="grey_tertiaryContainer">#787476</color>
+    <color name="grey_onTertiaryContainer">#FFFFFF</color>
     <color name="grey_error">#BA1A1A</color>
     <color name="grey_onError">#FFFFFF</color>
     <color name="grey_errorContainer">#FFDAD6</color>
     <color name="grey_onErrorContainer">#410002</color>
-    <color name="grey_background">#F5FAFB</color>
-    <color name="grey_onBackground">#171D1E</color>
-    <color name="grey_surface">#F5FAFB</color>
-    <color name="grey_onSurface">#171D1E</color>
-    <color name="grey_surfaceVariant">#DBE4E6</color>
-    <color name="grey_onSurfaceVariant">#3F484A</color>
-    <color name="grey_outline">#6F797A</color>
-    <color name="grey_outlineVariant">#BFC8CA</color>
+    <color name="grey_background">#FCF8F8</color>
+    <color name="grey_onBackground">#1C1B1B</color>
+    <color name="grey_surface">#FCF8F8</color>
+    <color name="grey_onSurface">#1C1B1B</color>
+    <color name="grey_surfaceVariant">#E0E3E3</color>
+    <color name="grey_onSurfaceVariant">#444748</color>
+    <color name="grey_outline">#747878</color>
+    <color name="grey_outlineVariant">#C4C7C7</color>
     <color name="grey_scrim">#000000</color>
-    <color name="grey_inverseSurface">#2B3133</color>
-    <color name="grey_inverseOnSurface">#ECF2F3</color>
-    <color name="grey_inversePrimary">#82D3E0</color>
-    <color name="grey_primaryFixed">#9EEFFD</color>
-    <color name="grey_onPrimaryFixed">#001F24</color>
-    <color name="grey_primaryFixedDim">#82D3E0</color>
-    <color name="grey_onPrimaryFixedVariant">#004F58</color>
-    <color name="grey_secondaryFixed">#CDE7EC</color>
-    <color name="grey_onSecondaryFixed">#051F23</color>
-    <color name="grey_secondaryFixedDim">#B1CBD0</color>
-    <color name="grey_onSecondaryFixedVariant">#334B4F</color>
-    <color name="grey_tertiaryFixed">#DAE2FF</color>
-    <color name="grey_onTertiaryFixed">#0E1B37</color>
-    <color name="grey_tertiaryFixedDim">#BAC6EA</color>
-    <color name="grey_onTertiaryFixedVariant">#3B4664</color>
-    <color name="grey_surfaceDim">#D5DBDC</color>
-    <color name="grey_surfaceBright">#F5FAFB</color>
+    <color name="grey_inverseSurface">#313030</color>
+    <color name="grey_inverseOnSurface">#F4F0EF</color>
+    <color name="grey_inversePrimary">#C7C6C6</color>
+    <color name="grey_primaryFixed">#E3E2E2</color>
+    <color name="grey_onPrimaryFixed">#1B1C1C</color>
+    <color name="grey_primaryFixedDim">#C7C6C6</color>
+    <color name="grey_onPrimaryFixedVariant">#464747</color>
+    <color name="grey_secondaryFixed">#E5E2E1</color>
+    <color name="grey_onSecondaryFixed">#1B1C1C</color>
+    <color name="grey_secondaryFixedDim">#C8C6C5</color>
+    <color name="grey_onSecondaryFixedVariant">#474746</color>
+    <color name="grey_tertiaryFixed">#E7E1E3</color>
+    <color name="grey_onTertiaryFixed">#1D1B1D</color>
+    <color name="grey_tertiaryFixedDim">#CBC5C7</color>
+    <color name="grey_onTertiaryFixedVariant">#494648</color>
+    <color name="grey_surfaceDim">#DDD9D8</color>
+    <color name="grey_surfaceBright">#FCF8F8</color>
     <color name="grey_surfaceContainerLowest">#FFFFFF</color>
-    <color name="grey_surfaceContainerLow">#EFF5F6</color>
-    <color name="grey_surfaceContainer">#E9EFF0</color>
-    <color name="grey_surfaceContainerHigh">#E3E9EA</color>
-    <color name="grey_surfaceContainerHighest">#DEE3E5</color>
-    <color name="grey_primary_mediumContrast">#004A53</color>
+    <color name="grey_surfaceContainerLow">#F7F3F2</color>
+    <color name="grey_surfaceContainer">#F1EDEC</color>
+    <color name="grey_surfaceContainerHigh">#EBE7E7</color>
+    <color name="grey_surfaceContainerHighest">#E5E2E1</color>
+    <color name="grey_primary_mediumContrast">#424343</color>
     <color name="grey_onPrimary_mediumContrast">#FFFFFF</color>
-    <color name="grey_primaryContainer_mediumContrast">#25808C</color>
+    <color name="grey_primaryContainer_mediumContrast">#757575</color>
     <color name="grey_onPrimaryContainer_mediumContrast">#FFFFFF</color>
-    <color name="grey_secondary_mediumContrast">#2F474B</color>
+    <color name="grey_secondary_mediumContrast">#434343</color>
     <color name="grey_onSecondary_mediumContrast">#FFFFFF</color>
-    <color name="grey_secondaryContainer_mediumContrast">#60797D</color>
+    <color name="grey_secondaryContainer_mediumContrast">#757474</color>
     <color name="grey_onSecondaryContainer_mediumContrast">#FFFFFF</color>
-    <color name="grey_tertiary_mediumContrast">#374260</color>
+    <color name="grey_tertiary_mediumContrast">#454244</color>
     <color name="grey_onTertiary_mediumContrast">#FFFFFF</color>
-    <color name="grey_tertiaryContainer_mediumContrast">#687495</color>
+    <color name="grey_tertiaryContainer_mediumContrast">#787476</color>
     <color name="grey_onTertiaryContainer_mediumContrast">#FFFFFF</color>
     <color name="grey_error_mediumContrast">#8C0009</color>
     <color name="grey_onError_mediumContrast">#FFFFFF</color>
     <color name="grey_errorContainer_mediumContrast">#DA342E</color>
     <color name="grey_onErrorContainer_mediumContrast">#FFFFFF</color>
-    <color name="grey_background_mediumContrast">#F5FAFB</color>
-    <color name="grey_onBackground_mediumContrast">#171D1E</color>
-    <color name="grey_surface_mediumContrast">#F5FAFB</color>
-    <color name="grey_onSurface_mediumContrast">#171D1E</color>
-    <color name="grey_surfaceVariant_mediumContrast">#DBE4E6</color>
-    <color name="grey_onSurfaceVariant_mediumContrast">#3B4446</color>
-    <color name="grey_outline_mediumContrast">#576162</color>
-    <color name="grey_outlineVariant_mediumContrast">#737C7E</color>
+    <color name="grey_background_mediumContrast">#FCF8F8</color>
+    <color name="grey_onBackground_mediumContrast">#1C1B1B</color>
+    <color name="grey_surface_mediumContrast">#FCF8F8</color>
+    <color name="grey_onSurface_mediumContrast">#1C1B1B</color>
+    <color name="grey_surfaceVariant_mediumContrast">#E0E3E3</color>
+    <color name="grey_onSurfaceVariant_mediumContrast">#404344</color>
+    <color name="grey_outline_mediumContrast">#5C6060</color>
+    <color name="grey_outlineVariant_mediumContrast">#787B7C</color>
     <color name="grey_scrim_mediumContrast">#000000</color>
-    <color name="grey_inverseSurface_mediumContrast">#2B3133</color>
-    <color name="grey_inverseOnSurface_mediumContrast">#ECF2F3</color>
-    <color name="grey_inversePrimary_mediumContrast">#82D3E0</color>
-    <color name="grey_primaryFixed_mediumContrast">#25808C</color>
+    <color name="grey_inverseSurface_mediumContrast">#313030</color>
+    <color name="grey_inverseOnSurface_mediumContrast">#F4F0EF</color>
+    <color name="grey_inversePrimary_mediumContrast">#C7C6C6</color>
+    <color name="grey_primaryFixed_mediumContrast">#747474</color>
     <color name="grey_onPrimaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="grey_primaryFixedDim_mediumContrast">#006671</color>
+    <color name="grey_primaryFixedDim_mediumContrast">#5C5C5C</color>
     <color name="grey_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="grey_secondaryFixed_mediumContrast">#60797D</color>
+    <color name="grey_secondaryFixed_mediumContrast">#757474</color>
     <color name="grey_onSecondaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="grey_secondaryFixedDim_mediumContrast">#486064</color>
+    <color name="grey_secondaryFixedDim_mediumContrast">#5C5C5C</color>
     <color name="grey_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="grey_tertiaryFixed_mediumContrast">#687495</color>
+    <color name="grey_tertiaryFixed_mediumContrast">#777375</color>
     <color name="grey_onTertiaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="grey_tertiaryFixedDim_mediumContrast">#505B7B</color>
+    <color name="grey_tertiaryFixedDim_mediumContrast">#5E5B5D</color>
     <color name="grey_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="grey_surfaceDim_mediumContrast">#D5DBDC</color>
-    <color name="grey_surfaceBright_mediumContrast">#F5FAFB</color>
+    <color name="grey_surfaceDim_mediumContrast">#DDD9D8</color>
+    <color name="grey_surfaceBright_mediumContrast">#FCF8F8</color>
     <color name="grey_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
-    <color name="grey_surfaceContainerLow_mediumContrast">#EFF5F6</color>
-    <color name="grey_surfaceContainer_mediumContrast">#E9EFF0</color>
-    <color name="grey_surfaceContainerHigh_mediumContrast">#E3E9EA</color>
-    <color name="grey_surfaceContainerHighest_mediumContrast">#DEE3E5</color>
-    <color name="grey_primary_highContrast">#00272C</color>
+    <color name="grey_surfaceContainerLow_mediumContrast">#F7F3F2</color>
+    <color name="grey_surfaceContainer_mediumContrast">#F1EDEC</color>
+    <color name="grey_surfaceContainerHigh_mediumContrast">#EBE7E7</color>
+    <color name="grey_surfaceContainerHighest_mediumContrast">#E5E2E1</color>
+    <color name="grey_primary_highContrast">#212222</color>
     <color name="grey_onPrimary_highContrast">#FFFFFF</color>
-    <color name="grey_primaryContainer_highContrast">#004A53</color>
+    <color name="grey_primaryContainer_highContrast">#424343</color>
     <color name="grey_onPrimaryContainer_highContrast">#FFFFFF</color>
-    <color name="grey_secondary_highContrast">#0C2629</color>
+    <color name="grey_secondary_highContrast">#222222</color>
     <color name="grey_onSecondary_highContrast">#FFFFFF</color>
-    <color name="grey_secondaryContainer_highContrast">#2F474B</color>
+    <color name="grey_secondaryContainer_highContrast">#434343</color>
     <color name="grey_onSecondaryContainer_highContrast">#FFFFFF</color>
-    <color name="grey_tertiary_highContrast">#15213E</color>
+    <color name="grey_tertiary_highContrast">#242223</color>
     <color name="grey_onTertiary_highContrast">#FFFFFF</color>
-    <color name="grey_tertiaryContainer_highContrast">#374260</color>
+    <color name="grey_tertiaryContainer_highContrast">#454244</color>
     <color name="grey_onTertiaryContainer_highContrast">#FFFFFF</color>
     <color name="grey_error_highContrast">#4E0002</color>
     <color name="grey_onError_highContrast">#FFFFFF</color>
     <color name="grey_errorContainer_highContrast">#8C0009</color>
     <color name="grey_onErrorContainer_highContrast">#FFFFFF</color>
-    <color name="grey_background_highContrast">#F5FAFB</color>
-    <color name="grey_onBackground_highContrast">#171D1E</color>
-    <color name="grey_surface_highContrast">#F5FAFB</color>
+    <color name="grey_background_highContrast">#FCF8F8</color>
+    <color name="grey_onBackground_highContrast">#1C1B1B</color>
+    <color name="grey_surface_highContrast">#FCF8F8</color>
     <color name="grey_onSurface_highContrast">#000000</color>
-    <color name="grey_surfaceVariant_highContrast">#DBE4E6</color>
-    <color name="grey_onSurfaceVariant_highContrast">#1C2527</color>
-    <color name="grey_outline_highContrast">#3B4446</color>
-    <color name="grey_outlineVariant_highContrast">#3B4446</color>
+    <color name="grey_surfaceVariant_highContrast">#E0E3E3</color>
+    <color name="grey_onSurfaceVariant_highContrast">#212525</color>
+    <color name="grey_outline_highContrast">#404344</color>
+    <color name="grey_outlineVariant_highContrast">#404344</color>
     <color name="grey_scrim_highContrast">#000000</color>
-    <color name="grey_inverseSurface_highContrast">#2B3133</color>
+    <color name="grey_inverseSurface_highContrast">#313030</color>
     <color name="grey_inverseOnSurface_highContrast">#FFFFFF</color>
-    <color name="grey_inversePrimary_highContrast">#BFF5FF</color>
-    <color name="grey_primaryFixed_highContrast">#004A53</color>
+    <color name="grey_inversePrimary_highContrast">#EDECEB</color>
+    <color name="grey_primaryFixed_highContrast">#424343</color>
     <color name="grey_onPrimaryFixed_highContrast">#FFFFFF</color>
-    <color name="grey_primaryFixedDim_highContrast">#003238</color>
+    <color name="grey_primaryFixedDim_highContrast">#2C2D2D</color>
     <color name="grey_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="grey_secondaryFixed_highContrast">#2F474B</color>
+    <color name="grey_secondaryFixed_highContrast">#434343</color>
     <color name="grey_onSecondaryFixed_highContrast">#FFFFFF</color>
-    <color name="grey_secondaryFixedDim_highContrast">#183034</color>
+    <color name="grey_secondaryFixedDim_highContrast">#2D2D2D</color>
     <color name="grey_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="grey_tertiaryFixed_highContrast">#374260</color>
+    <color name="grey_tertiaryFixed_highContrast">#454244</color>
     <color name="grey_onTertiaryFixed_highContrast">#FFFFFF</color>
-    <color name="grey_tertiaryFixedDim_highContrast">#202C49</color>
+    <color name="grey_tertiaryFixedDim_highContrast">#2E2C2E</color>
     <color name="grey_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="grey_surfaceDim_highContrast">#D5DBDC</color>
-    <color name="grey_surfaceBright_highContrast">#F5FAFB</color>
+    <color name="grey_surfaceDim_highContrast">#DDD9D8</color>
+    <color name="grey_surfaceBright_highContrast">#FCF8F8</color>
     <color name="grey_surfaceContainerLowest_highContrast">#FFFFFF</color>
-    <color name="grey_surfaceContainerLow_highContrast">#EFF5F6</color>
-    <color name="grey_surfaceContainer_highContrast">#E9EFF0</color>
-    <color name="grey_surfaceContainerHigh_highContrast">#E3E9EA</color>
-    <color name="grey_surfaceContainerHighest_highContrast">#DEE3E5</color>
+    <color name="grey_surfaceContainerLow_highContrast">#F7F3F2</color>
+    <color name="grey_surfaceContainer_highContrast">#F1EDEC</color>
+    <color name="grey_surfaceContainerHigh_highContrast">#EBE7E7</color>
+    <color name="grey_surfaceContainerHighest_highContrast">#E5E2E1</color>
 </resources>
\ No newline at end of file