diff --git a/app/src/main/res/values-night-v23/color_themes.xml b/app/src/main/res/values-night-v23/color_themes.xml
index 0085829bc..a4a77b973 100644
--- a/app/src/main/res/values-night-v23/color_themes.xml
+++ b/app/src/main/res/values-night-v23/color_themes.xml
@@ -2,205 +2,261 @@
 <resources>
 	<!-- Colored themes -->
 	<style name="Theme.Kotatsu.Miku">
-		<item name="colorPrimary">#4CDBCE</item>
-		<item name="colorOnPrimary">#003733</item>
+		<item name="colorPrimary">#50DBCF</item>
 		<item name="colorPrimaryContainer">#00504A</item>
-		<item name="colorOnPrimaryContainer">#6EF8EA</item>
+		<item name="colorOnPrimary">#003733</item>
+		<item name="colorOnPrimaryContainer">#72F7EB</item>
+		<item name="colorPrimaryInverse">#006A63</item>
 		<item name="colorSecondary">#B1CCC8</item>
-		<item name="colorOnSecondary">#1C3532</item>
 		<item name="colorSecondaryContainer">#324B48</item>
+		<item name="colorOnSecondary">#1C3532</item>
 		<item name="colorOnSecondaryContainer">#CCE8E4</item>
-		<item name="colorTertiary">#AFC9E7</item>
-		<item name="colorOnTertiary">#17324A</item>
-		<item name="colorTertiaryContainer">#2F4961</item>
+		<item name="colorTertiary">#96CCFF</item>
+		<item name="colorTertiaryContainer">#004A75</item>
+		<item name="colorOnTertiary">#003353</item>
 		<item name="colorOnTertiaryContainer">#CEE5FF</item>
+		<item name="colorSurface">#101413</item>
+		<item name="colorSurfaceDim">#101413</item>
+		<item name="colorSurfaceBright">#363A39</item>
+		<item name="colorSurfaceContainerLowest">#0B0F0E</item>
+		<item name="colorSurfaceContainerLow">#191C1C</item>
+		<item name="colorSurfaceContainer">#1D2020</item>
+		<item name="colorSurfaceContainerHigh">#272B2A</item>
+		<item name="colorSurfaceContainerHighest">#323535</item>
+		<item name="colorSurfaceVariant">#3F4947</item>
+		<item name="colorOnSurface">#C4C7C6</item>
+		<item name="colorOnSurfaceVariant">#BEC9C6</item>
+		<item name="colorSurfaceInverse">#E0E3E1</item>
+		<item name="colorOnSurfaceInverse">#191C1C</item>
+		<item name="android:colorBackground">#272B2A</item>
+		<item name="colorOnBackground">#E0E3E1</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_miku</item>
-		<item name="colorOnBackground">#E0E3E1</item>
-		<item name="colorSurface">@color/background_miku</item>
-		<item name="colorOnSurface">#E0E3E1</item>
-		<item name="colorSurfaceVariant">#3F4947</item>
-		<item name="colorOnSurfaceVariant">#BEC9C6</item>
 		<item name="colorOutline">#899391</item>
-		<item name="colorOnSurfaceInverse">#191C1C</item>
-		<item name="colorSurfaceInverse">#E0E3E1</item>
-		<item name="colorPrimaryInverse">#006A63</item>
+		<item name="colorOutlineVariant">#3F4947</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
 		<item name="colorPrimary">#FFB3AF</item>
-		<item name="colorOnPrimary">#68000E</item>
 		<item name="colorPrimaryContainer">#930018</item>
+		<item name="colorOnPrimary">#68000E</item>
 		<item name="colorOnPrimaryContainer">#FFDAD7</item>
+		<item name="colorPrimaryInverse">#BA1928</item>
 		<item name="colorSecondary">#FFB783</item>
+		<item name="colorSecondaryContainer">#703700</item>
 		<item name="colorOnSecondary">#4F2500</item>
-		<item name="colorSecondaryContainer">#713700</item>
 		<item name="colorOnSecondaryContainer">#FFDCC5</item>
-		<item name="colorTertiary">#E2C28C</item>
-		<item name="colorOnTertiary">#412D05</item>
-		<item name="colorTertiaryContainer">#594319</item>
-		<item name="colorOnTertiaryContainer">#FFDEA9</item>
+		<item name="colorTertiary">#F7BD48</item>
+		<item name="colorTertiaryContainer">#5E4200</item>
+		<item name="colorOnTertiary">#412D00</item>
+		<item name="colorOnTertiaryContainer">#FFDEA7</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3737</item>
+		<item name="colorSurfaceContainerLowest">#120D0C</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#251E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3332</item>
+		<item name="colorSurfaceVariant">#534342</item>
+		<item name="colorOnSurface">#D0C4C3</item>
+		<item name="colorOnSurfaceVariant">#D8C1C0</item>
+		<item name="colorSurfaceInverse">#EDE0DE</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#EDE0DE</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_asuka</item>
-		<item name="colorOnBackground">#EDE0DE</item>
-		<item name="colorSurface">@color/background_asuka</item>
-		<item name="colorOnSurface">#EDE0DE</item>
-		<item name="colorSurfaceVariant">#534342</item>
-		<item name="colorOnSurfaceVariant">#D8C1C0</item>
 		<item name="colorOutline">#A08C8B</item>
-		<item name="colorOnSurfaceInverse">#201A1A</item>
-		<item name="colorSurfaceInverse">#EDE0DE</item>
-		<item name="colorPrimaryInverse">#BA1928</item>
+		<item name="colorOutlineVariant">#534342</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
-		<item name="colorPrimary">#7FDA8E</item>
-		<item name="colorOnPrimary">#003915</item>
-		<item name="colorPrimaryContainer">#005321</item>
-		<item name="colorOnPrimaryContainer">#9AF7A8</item>
-		<item name="colorSecondary">#EAC32E</item>
-		<item name="colorOnSecondary">#3C2F00</item>
+		<item name="colorPrimary">#70DBA8</item>
+		<item name="colorPrimaryContainer">#005236</item>
+		<item name="colorOnPrimary">#003824</item>
+		<item name="colorOnPrimaryContainer">#8CF7C2</item>
+		<item name="colorPrimaryInverse">#006C48</item>
+		<item name="colorSecondary">#E7C349</item>
 		<item name="colorSecondaryContainer">#564500</item>
+		<item name="colorOnSecondary">#3C2F00</item>
 		<item name="colorOnSecondaryContainer">#FFE080</item>
-		<item name="colorTertiary">#5AD5F9</item>
-		<item name="colorOnTertiary">#003542</item>
-		<item name="colorTertiaryContainer">#004E5F</item>
-		<item name="colorOnTertiaryContainer">#B4EBFF</item>
+		<item name="colorTertiary">#FFB2BA</item>
+		<item name="colorTertiaryContainer">#7D2938</item>
+		<item name="colorOnTertiary">#5F1223</item>
+		<item name="colorOnTertiaryContainer">#FFD9DC</item>
+		<item name="colorSurface">#111412</item>
+		<item name="colorSurfaceDim">#111412</item>
+		<item name="colorSurfaceBright">#373A37</item>
+		<item name="colorSurfaceContainerLowest">#0C0F0D</item>
+		<item name="colorSurfaceContainerLow">#191C1A</item>
+		<item name="colorSurfaceContainer">#1D201E</item>
+		<item name="colorSurfaceContainerHigh">#272B28</item>
+		<item name="colorSurfaceContainerHighest">#323633</item>
+		<item name="colorSurfaceVariant">#404943</item>
+		<item name="colorOnSurface">#C5C7C3</item>
+		<item name="colorOnSurfaceVariant">#C0C9C1</item>
+		<item name="colorSurfaceInverse">#E1E3DF</item>
+		<item name="colorOnSurfaceInverse">#191C1A</item>
+		<item name="android:colorBackground">#272B28</item>
+		<item name="colorOnBackground">#E1E3DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_mion</item>
-		<item name="colorOnBackground">#E2E3DD</item>
-		<item name="colorSurface">@color/background_mion</item>
-		<item name="colorOnSurface">#E2E3DD</item>
-		<item name="colorSurfaceVariant">#414941</item>
-		<item name="colorOnSurfaceVariant">#C1C9BE</item>
-		<item name="colorOutline">#8B9389</item>
-		<item name="colorOnSurfaceInverse">#1A1C19</item>
-		<item name="colorSurfaceInverse">#E2E3DD</item>
-		<item name="colorPrimaryInverse">#006E2F</item>
+		<item name="colorOutline">#8A938C</item>
+		<item name="colorOutlineVariant">#404943</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#FFC2C4</item>
-		<item name="colorOnPrimary">#C44B50</item>
-		<item name="colorPrimaryContainer">#91363A</item>
-		<item name="colorOnPrimaryContainer">#FFDADB</item>
-		<item name="colorSecondary">#9886A3</item>
-		<item name="colorOnSecondary">#544B59</item>
-		<item name="colorSecondaryContainer">#3E3543</item>
-		<item name="colorOnSecondaryContainer">#F0D5FF</item>
-		<item name="colorTertiary">#E9B9D2</item>
-		<item name="colorOnTertiary">#47263A</item>
-		<item name="colorTertiaryContainer">#5F3C51</item>
+		<item name="colorPrimary">#FFB3B6</item>
+		<item name="colorPrimaryContainer">#7D2933</item>
+		<item name="colorOnPrimary">#5F121E</item>
+		<item name="colorOnPrimaryContainer">#FFDADA</item>
+		<item name="colorPrimaryInverse">#9C4049</item>
+		<item name="colorSecondary">#E0B6FF</item>
+		<item name="colorSecondaryContainer">#5E3281</item>
+		<item name="colorOnSecondary">#461969</item>
+		<item name="colorOnSecondaryContainer">#F2DAFF</item>
+		<item name="colorTertiary">#FFAEDC</item>
+		<item name="colorTertiaryContainer">#762A5C</item>
+		<item name="colorOnTertiary">#5A1145</item>
 		<item name="colorOnTertiaryContainer">#FFD8EB</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3737</item>
+		<item name="colorSurfaceContainerLowest">#120D0D</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#241E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3333</item>
+		<item name="colorSurfaceVariant">#524343</item>
+		<item name="colorOnSurface">#D0C4C3</item>
+		<item name="colorOnSurfaceVariant">#D7C1C1</item>
+		<item name="colorSurfaceInverse">#ECE0DF</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#ECE0DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_rikka</item>
-		<item name="colorOnBackground">#E5E1E6</item>
-		<item name="colorSurface">@color/background_rikka</item>
-		<item name="colorOnSurface">#E5E1E6</item>
-		<item name="colorSurfaceVariant">#332837</item>
-		<item name="colorOnSurfaceVariant">#C8C5D0</item>
-		<item name="colorOutline">#918F9A</item>
-		<item name="colorOnSurfaceInverse">#28202B</item>
-		<item name="colorSurfaceInverse">#E5E1E6</item>
-		<item name="colorPrimaryInverse">#8A3B49</item>
+		<item name="colorOutline">#9F8C8C</item>
+		<item name="colorOutlineVariant">#524343</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
-		<item name="colorPrimary">#6993A1</item>
-		<item name="colorOnPrimary">#39545d</item>
-		<item name="colorPrimaryContainer">#263C43</item>
-		<item name="colorOnPrimaryContainer">#CCF2FF</item>
-		<item name="colorSecondary">#FFA8AC</item>
-		<item name="colorOnSecondary">#C54F54</item>
-		<item name="colorSecondaryContainer">#393233</item>
-		<item name="colorOnSecondaryContainer">#FFC8CA</item>
-		<item name="colorTertiary">#97DDF4</item>
-		<item name="colorOnTertiary">#072A37</item>
-		<item name="colorTertiaryContainer">#293F47</item>
-		<item name="colorOnTertiaryContainer">#BFEFFF</item>
+		<item name="colorPrimary">#B2EBFF</item>
+		<item name="colorPrimaryContainer">#004E5E</item>
+		<item name="colorOnPrimary">#001F27</item>
+		<item name="colorOnPrimaryContainer">#B2EBFF</item>
+		<item name="colorPrimaryInverse">#00677D</item>
+		<item name="colorSecondary">#FFDADA</item>
+		<item name="colorSecondaryContainer">#7D2933</item>
+		<item name="colorOnSecondary">#40000C</item>
+		<item name="colorOnSecondaryContainer">#FFDADA</item>
+		<item name="colorTertiary">#59D5F8</item>
+		<item name="colorTertiaryContainer">#004E5E</item>
+		<item name="colorOnTertiary">#003642</item>
+		<item name="colorOnTertiaryContainer">#B2EBFF</item>
+		<item name="colorSurface">#111415</item>
+		<item name="colorSurfaceDim">#111415</item>
+		<item name="colorSurfaceBright">#373A3B</item>
+		<item name="colorSurfaceContainerLowest">#0B0F10</item>
+		<item name="colorSurfaceContainerLow">#191C1D</item>
+		<item name="colorSurfaceContainer">#1D2021</item>
+		<item name="colorSurfaceContainerHigh">#272A2C</item>
+		<item name="colorSurfaceContainerHighest">#323536</item>
+		<item name="colorSurfaceVariant">#40484B</item>
+		<item name="colorOnSurface">#C5C7C8</item>
+		<item name="colorOnSurfaceVariant">#BFC8CC</item>
+		<item name="colorSurfaceInverse">#E1E3E4</item>
+		<item name="colorOnSurfaceInverse">#191C1D</item>
+		<item name="android:colorBackground">#272A2C</item>
+		<item name="colorOnBackground">#E1E3E4</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_sakura</item>
-		<item name="colorOnBackground">#EBE0E1</item>
-		<item name="colorSurface">@color/background_sakura</item>
-		<item name="colorOnSurface">#EBE0E1</item>
-		<item name="colorSurfaceVariant">#393233</item>
-		<item name="colorOnSurfaceVariant">#D5C2C6</item>
-		<item name="colorOutline">#9E8C90</item>
-		<item name="colorOnSurfaceInverse">#201C1D</item>
-		<item name="colorSurfaceInverse">#EBE0E1</item>
-		<item name="colorPrimaryInverse">#423B3D</item>
+		<item name="colorOutline">#899296</item>
+		<item name="colorOutlineVariant">#40484B</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
-		<item name="colorPrimary">#EAB1B2</item>
-		<item name="colorOnPrimary">#9C4346</item>
-		<item name="colorPrimaryContainer">#5C3436</item>
-		<item name="colorOnPrimaryContainer">#FFC8CA</item>
-		<item name="colorSecondary">#72A3CD</item>
-		<item name="colorOnSecondary">#294055</item>
-		<item name="colorSecondaryContainer">#2F4559</item>
-		<item name="colorOnSecondaryContainer">#C7E5FF</item>
-		<item name="colorTertiary">#9A9486</item>
-		<item name="colorOnTertiary">#5C574A</item>
-		<item name="colorTertiaryContainer">#43403A</item>
-		<item name="colorOnTertiaryContainer">#FFF1CF</item>
+		<item name="colorPrimary">#FFB2B7</item>
+		<item name="colorPrimaryContainer">#7D2935</item>
+		<item name="colorOnPrimary">#5F1220</item>
+		<item name="colorOnPrimaryContainer">#FFDADB</item>
+		<item name="colorPrimaryInverse">#9C404B</item>
+		<item name="colorSecondary">#98CBFF</item>
+		<item name="colorSecondaryContainer">#004A77</item>
+		<item name="colorOnSecondary">#003354</item>
+		<item name="colorOnSecondaryContainer">#CFE5FF</item>
+		<item name="colorTertiary">#FFB784</item>
+		<item name="colorTertiaryContainer">#713700</item>
+		<item name="colorOnTertiary">#502500</item>
+		<item name="colorOnTertiaryContainer">#FFDCC6</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3738</item>
+		<item name="colorSurfaceContainerLowest">#120D0D</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#241E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3333</item>
+		<item name="colorSurfaceVariant">#524344</item>
+		<item name="colorOnSurface">#D0C4C4</item>
+		<item name="colorOnSurfaceVariant">#D7C1C2</item>
+		<item name="colorSurfaceInverse">#ECE0DF</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#ECE0DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_mamimi</item>
-		<item name="colorOnBackground">#EBE0E1</item>
-		<item name="colorSurface">@color/background_mamimi</item>
-		<item name="colorOnSurface">#EBE0E1</item>
-		<item name="colorSurfaceVariant">#294055</item>
-		<item name="colorOnSurfaceVariant">#D5C2C6</item>
-		<item name="colorOutline">#9E8C90</item>
-		<item name="colorOnSurfaceInverse">#232B33</item>
-		<item name="colorSurfaceInverse">#EBE0E1</item>
-		<item name="colorPrimaryInverse">#525a6d</item>
+		<item name="colorOutline">#9F8C8D</item>
+		<item name="colorOutlineVariant">#524344</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
-		<item name="colorPrimary">#AEAEAE</item>
-		<item name="colorOnPrimary">#555555</item>
-		<item name="colorPrimaryContainer">#4A4A4A</item>
-		<item name="colorOnPrimaryContainer">#CCCCCC</item>
-		<item name="colorSecondary">#B1B1B1</item>
-		<item name="colorOnSecondary">#464646</item>
-		<item name="colorSecondaryContainer">#4E4E4E</item>
-		<item name="colorOnSecondaryContainer">#B3B3B3</item>
-		<item name="colorTertiary">#959595</item>
-		<item name="colorOnTertiary">#676767</item>
-		<item name="colorTertiaryContainer">#494949</item>
-		<item name="colorOnTertiaryContainer">#BABABA</item>
+		<item name="colorPrimary">#D8D8D8</item>
+		<item name="colorPrimaryContainer">#494949</item>
+		<item name="colorOnPrimary">#2C2C2C</item>
+		<item name="colorOnPrimaryContainer">#DADADA</item>
+		<item name="colorPrimaryInverse">#656565</item>
+		<item name="colorSecondary">#CDCDCD</item>
+		<item name="colorSecondaryContainer">#474747</item>
+		<item name="colorOnSecondary">#323232</item>
+		<item name="colorOnSecondaryContainer">#E1E1E1</item>
+		<item name="colorTertiary">#BABABA</item>
+		<item name="colorTertiaryContainer">#7A7A7A</item>
+		<item name="colorOnTertiary">#4E4E4E</item>
+		<item name="colorOnTertiaryContainer">#CFCFCF</item>
+		<item name="colorSurface">#151515</item>
+		<item name="colorSurfaceDim">#151515</item>
+		<item name="colorSurfaceBright">#393939</item>
+		<item name="colorSurfaceContainerLowest">#101010</item>
+		<item name="colorSurfaceContainerLow">#1E1E1E</item>
+		<item name="colorSurfaceContainer">#232323</item>
+		<item name="colorSurfaceContainerHigh">#2B2B2B</item>
+		<item name="colorSurfaceContainerHighest">#353535</item>
+		<item name="colorSurfaceVariant">#4E4E4E</item>
+		<item name="colorOnSurface">#C8C8C8</item>
+		<item name="colorOnSurfaceVariant">#C8C8C8</item>
+		<item name="colorSurfaceInverse">#E3E3E3</item>
+		<item name="colorOnSurfaceInverse">#1B1B1B</item>
+		<item name="android:colorBackground">#2B2B2B</item>
+		<item name="colorOnBackground">#E3E3E3</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_kanade</item>
-		<item name="colorOnBackground">#D8D8D8</item>
-		<item name="colorSurface">@color/background_kanade</item>
-		<item name="colorOnSurface">#E3E3E3</item>
-		<item name="colorSurfaceVariant">#575757</item>
-		<item name="colorOnSurfaceVariant">#CCCCCC</item>
-		<item name="colorOutline">#A5A5A5</item>
-		<item name="colorOnSurfaceInverse">#353535</item>
-		<item name="colorSurfaceInverse">#272727</item>
-		<item name="colorPrimaryInverse">#686868</item>
+		<item name="colorOutline">#959595</item>
+		<item name="colorOutlineVariant">#494949</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-v23/color_themes.xml b/app/src/main/res/values-v23/color_themes.xml
index 788787398..17b1a0d67 100644
--- a/app/src/main/res/values-v23/color_themes.xml
+++ b/app/src/main/res/values-v23/color_themes.xml
@@ -3,204 +3,260 @@
 	<!-- Colored themes -->
 	<style name="Theme.Kotatsu.Miku">
 		<item name="colorPrimary">#006A63</item>
+		<item name="colorPrimaryContainer">#72F7EB</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#6EF8EA</item>
 		<item name="colorOnPrimaryContainer">#00201D</item>
+		<item name="colorPrimaryInverse">#50DBCF</item>
 		<item name="colorSecondary">#4A6360</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#CCE8E4</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#051F1D</item>
-		<item name="colorTertiary">#47617A</item>
-		<item name="colorOnTertiary">#FFFFFF</item>
+		<item name="colorTertiary">#00639A</item>
 		<item name="colorTertiaryContainer">#CEE5FF</item>
-		<item name="colorOnTertiaryContainer">#001D33</item>
-		<item name="colorError">#BA1A1A</item>
+		<item name="colorOnTertiary">#FFFFFF</item>
+		<item name="colorOnTertiaryContainer">#001D32</item>
+		<item name="colorSurface">#F7FAF8</item>
+		<item name="colorSurfaceDim">#D8DBD9</item>
+		<item name="colorSurfaceBright">#F7FAF8</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F2F4F2</item>
+		<item name="colorSurfaceContainer">#ECEEED</item>
+		<item name="colorSurfaceContainerHigh">#E6E9E7</item>
+		<item name="colorSurfaceContainerHighest">#E0E3E1</item>
+		<item name="colorSurfaceVariant">#DAE5E2</item>
+		<item name="colorOnSurface">#191C1C</item>
+		<item name="colorOnSurfaceVariant">#3F4947</item>
+		<item name="colorSurfaceInverse">#2D3130</item>
+		<item name="colorOnSurfaceInverse">#EFF1F0</item>
+		<item name="android:colorBackground">#E6E9E7</item>
+		<item name="colorOnBackground">#191C1C</item>
+		<item name="colorError">#B81F1E</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_miku</item>
-		<item name="colorOnBackground">#191C1C</item>
-		<item name="colorSurface">@color/background_miku</item>
-		<item name="colorOnSurface">#191C1C</item>
-		<item name="colorSurfaceVariant">#DAE5E2</item>
-		<item name="colorOnSurfaceVariant">#3F4947</item>
 		<item name="colorOutline">#6F7977</item>
-		<item name="colorOnSurfaceInverse">#EFF1F0</item>
-		<item name="colorSurfaceInverse">#2D3130</item>
-		<item name="colorPrimaryInverse">#4CDBCE</item>
+		<item name="colorOutlineVariant">#BEC9C6</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
 		<item name="colorPrimary">#BA1928</item>
-		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorPrimaryContainer">#FFDAD7</item>
+		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorOnPrimaryContainer">#410005</item>
+		<item name="colorPrimaryInverse">#FFB3AF</item>
 		<item name="colorSecondary">#944B00</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#FFDCC5</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#301400</item>
-		<item name="colorTertiary">#735B2E</item>
+		<item name="colorTertiary">#7C5800</item>
+		<item name="colorTertiaryContainer">#FFDEA7</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFDEA9</item>
 		<item name="colorOnTertiaryContainer">#271900</item>
+		<item name="colorSurface">#FFF8F7</item>
+		<item name="colorSurfaceDim">#E4D7D6</item>
+		<item name="colorSurfaceBright">#FFF8F7</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FEF1EF</item>
+		<item name="colorSurfaceContainer">#F8EBEA</item>
+		<item name="colorSurfaceContainerHigh">#F2E5E4</item>
+		<item name="colorSurfaceContainerHighest">#EDE0DE</item>
+		<item name="colorSurfaceVariant">#F4DDDB</item>
+		<item name="colorOnSurface">#201A1A</item>
+		<item name="colorOnSurfaceVariant">#534342</item>
+		<item name="colorSurfaceInverse">#362F2E</item>
+		<item name="colorOnSurfaceInverse">#FBEEEC</item>
+		<item name="android:colorBackground">#F2E5E4</item>
+		<item name="colorOnBackground">#201A1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_asuka</item>
-		<item name="colorOnBackground">#201A1A</item>
-		<item name="colorSurface">@color/background_asuka</item>
-		<item name="colorOnSurface">#201A1A</item>
-		<item name="colorSurfaceVariant">#F4DDDB</item>
-		<item name="colorOnSurfaceVariant">#534342</item>
 		<item name="colorOutline">#857372</item>
-		<item name="colorOnSurfaceInverse">#FBEEEC</item>
-		<item name="colorSurfaceInverse">#362F2E</item>
-		<item name="colorPrimaryInverse">#FFB3AF</item>
+		<item name="colorOutlineVariant">#D8C1C0</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
-		<item name="colorPrimary">#2D956A</item>
+		<item name="colorPrimary">#006C48</item>
+		<item name="colorPrimaryContainer">#8CF7C2</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#9AF7A8</item>
-		<item name="colorOnPrimaryContainer">#00301C</item>
+		<item name="colorOnPrimaryContainer">#002113</item>
+		<item name="colorPrimaryInverse">#70DBA8</item>
 		<item name="colorSecondary">#725C00</item>
+		<item name="colorSecondaryContainer">#FFE080</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFEFC0</item>
 		<item name="colorOnSecondaryContainer">#231B00</item>
-		<item name="colorTertiary">#f28795</item>
+		<item name="colorTertiary">#9B404F</item>
+		<item name="colorTertiaryContainer">#FFD9DC</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFB3BD</item>
-		<item name="colorOnTertiaryContainer">#2B0006</item>
+		<item name="colorOnTertiaryContainer">#400011</item>
+		<item name="colorSurface">#F8FAF6</item>
+		<item name="colorSurfaceDim">#D8DBD6</item>
+		<item name="colorSurfaceBright">#F8FAF6</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F2F4F0</item>
+		<item name="colorSurfaceContainer">#ECEEEA</item>
+		<item name="colorSurfaceContainerHigh">#E7E9E5</item>
+		<item name="colorSurfaceContainerHighest">#E1E3DF</item>
+		<item name="colorSurfaceVariant">#DCE5DD</item>
+		<item name="colorOnSurface">#191C1A</item>
+		<item name="colorOnSurfaceVariant">#404943</item>
+		<item name="colorSurfaceInverse">#2E312F</item>
+		<item name="colorOnSurfaceInverse">#EFF1ED</item>
+		<item name="android:colorBackground">#E7E9E5</item>
+		<item name="colorOnBackground">#191C1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_mion</item>
-		<item name="colorOnBackground">#1A1C19</item>
-		<item name="colorSurface">@color/background_mion</item>
-		<item name="colorOnSurface">#1A1C19</item>
-		<item name="colorSurfaceVariant">#DDE5DA</item>
-		<item name="colorOnSurfaceVariant">#414941</item>
-		<item name="colorOutline">#727970</item>
-		<item name="colorOnSurfaceInverse">#F0F1EC</item>
-		<item name="colorSurfaceInverse">#2E312E</item>
-		<item name="colorPrimaryInverse">#7FDA8E</item>
+		<item name="colorOutline">#707973</item>
+		<item name="colorOutlineVariant">#C0C9C1</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#4b4965</item>
+		<item name="colorPrimary">#5954A8</item>
+		<item name="colorPrimaryContainer">#E3DFFF</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#E3E1FF</item>
-		<item name="colorOnPrimaryContainer">#1E1C49</item>
-		<item name="colorSecondary">#c44b50</item>
+		<item name="colorOnPrimaryContainer">#140463</item>
+		<item name="colorPrimaryInverse">#C5C0FF</item>
+		<item name="colorSecondary">#A8363D</item>
+		<item name="colorSecondaryContainer">#FFDAD9</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFD3D5</item>
-		<item name="colorOnSecondaryContainer">#450003</item>
-		<item name="colorTertiary">#592A2A</item>
+		<item name="colorOnSecondaryContainer">#410008</item>
+		<item name="colorTertiary">#9C4142</item>
+		<item name="colorTertiaryContainer">#FFDAD8</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFD8D8</item>
-		<item name="colorOnTertiaryContainer">#301111</item>
+		<item name="colorOnTertiaryContainer">#410007</item>
+		<item name="colorSurface">#FCF8FD</item>
+		<item name="colorSurfaceDim">#DDD9DD</item>
+		<item name="colorSurfaceBright">#FCF8FD</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F6F2F7</item>
+		<item name="colorSurfaceContainer">#F1ECF1</item>
+		<item name="colorSurfaceContainerHigh">#EBE7EC</item>
+		<item name="colorSurfaceContainerHighest">#E5E1E6</item>
+		<item name="colorSurfaceVariant">#E5E1EC</item>
+		<item name="colorOnSurface">#1C1B1F</item>
+		<item name="colorOnSurfaceVariant">#47464F</item>
+		<item name="colorSurfaceInverse">#313034</item>
+		<item name="colorOnSurfaceInverse">#F4EFF4</item>
+		<item name="android:colorBackground">#EBE7EC</item>
+		<item name="colorOnBackground">#1C1B1F</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_rikka</item>
-		<item name="colorOnBackground">#1C1B1F</item>
-		<item name="colorSurface">@color/background_rikka</item>
-		<item name="colorOnSurface">#1C1B1F</item>
-		<item name="colorSurfaceVariant">#E4E1EC</item>
-		<item name="colorOnSurfaceVariant">#47464F</item>
-		<item name="colorOutline">#777680</item>
-		<item name="colorOnSurfaceInverse">#F3EFF4</item>
-		<item name="colorSurfaceInverse">#313034</item>
-		<item name="colorPrimaryInverse">#C2C1FF</item>
+		<item name="colorOutline">#787680</item>
+		<item name="colorOutlineVariant">#C8C5D0</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
 		<item name="colorPrimary">#B31A62</item>
-		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorPrimaryContainer">#FFD9E2</item>
+		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorOnPrimaryContainer">#3E001D</item>
+		<item name="colorPrimaryInverse">#FFB1C8</item>
 		<item name="colorSecondary">#B12E00</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#FFDBD1</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#3B0900</item>
-		<item name="colorTertiary">#7C5635</item>
+		<item name="colorTertiary">#8F4E00</item>
+		<item name="colorTertiaryContainer">#FFDCC2</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFDCC1</item>
 		<item name="colorOnTertiaryContainer">#2E1500</item>
+		<item name="colorSurface">#FFF8F8</item>
+		<item name="colorSurfaceDim">#E3D7D9</item>
+		<item name="colorSurfaceBright">#FFF8F8</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FDF1F2</item>
+		<item name="colorSurfaceContainer">#F7EBEC</item>
+		<item name="colorSurfaceContainerHigh">#F1E5E7</item>
+		<item name="colorSurfaceContainerHighest">#EBE0E1</item>
+		<item name="colorSurfaceVariant">#F2DDE1</item>
+		<item name="colorOnSurface">#201A1B</item>
+		<item name="colorOnSurfaceVariant">#514347</item>
+		<item name="colorSurfaceInverse">#352F30</item>
+		<item name="colorOnSurfaceInverse">#FAEEEF</item>
+		<item name="android:colorBackground">#F1E5E7</item>
+		<item name="colorOnBackground">#201A1B</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_sakura</item>
-		<item name="colorOnBackground">#201A1B</item>
-		<item name="colorSurface">@color/background_sakura</item>
-		<item name="colorOnSurface">#201A1B</item>
-		<item name="colorSurfaceVariant">#F2DDE1</item>
-		<item name="colorOnSurfaceVariant">#514347</item>
 		<item name="colorOutline">#837377</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#352F30</item>
-		<item name="colorPrimaryInverse">#FFB1C8</item>
+		<item name="colorOutlineVariant">#D5C2C6</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
-		<item name="colorPrimary">#964d54</item>
+		<item name="colorPrimary">#9C404B</item>
+		<item name="colorPrimaryContainer">#FFDADB</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#FFD6DA</item>
-		<item name="colorOnPrimaryContainer">#400006</item>
-		<item name="colorSecondary">#385068</item>
+		<item name="colorOnPrimaryContainer">#40000E</item>
+		<item name="colorPrimaryInverse">#FFB2B7</item>
+		<item name="colorSecondary">#00639D</item>
+		<item name="colorSecondaryContainer">#CFE5FF</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#CAE5FF</item>
-		<item name="colorOnSecondaryContainer">#002142</item>
-		<item name="colorTertiary">#A19086</item>
+		<item name="colorOnSecondaryContainer">#001D33</item>
+		<item name="colorTertiary">#944A01</item>
+		<item name="colorTertiaryContainer">#FFDCC6</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFD7BF</item>
-		<item name="colorOnTertiaryContainer">#491B00</item>
+		<item name="colorOnTertiaryContainer">#301400</item>
+		<item name="colorSurface">#FFF8F7</item>
+		<item name="colorSurfaceDim">#E4D7D7</item>
+		<item name="colorSurfaceBright">#FFF8F7</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FEF1F0</item>
+		<item name="colorSurfaceContainer">#F8EBEB</item>
+		<item name="colorSurfaceContainerHigh">#F2E5E5</item>
+		<item name="colorSurfaceContainerHighest">#ECE0DF</item>
+		<item name="colorSurfaceVariant">#F4DDDE</item>
+		<item name="colorOnSurface">#201A1A</item>
+		<item name="colorOnSurfaceVariant">#524344</item>
+		<item name="colorSurfaceInverse">#362F2F</item>
+		<item name="colorOnSurfaceInverse">#FBEEED</item>
+		<item name="android:colorBackground">#F2E5E5</item>
+		<item name="colorOnBackground">#201A1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_mamimi</item>
-		<item name="colorOnBackground">#201A1B</item>
-		<item name="colorSurface">@color/background_mamimi</item>
-		<item name="colorOnSurface">#201A1B</item>
-		<item name="colorSurfaceVariant">#CAE5FF</item>
-		<item name="colorOnSurfaceVariant">#514347</item>
-		<item name="colorOutline">#837377</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#352F30</item>
-		<item name="colorPrimaryInverse">#FFB1C8</item>
+		<item name="colorOutline">#857373</item>
+		<item name="colorOutlineVariant">#D7C1C2</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
-		<item name="colorPrimary">#5E5E5E</item>
+		<item name="colorPrimary">#A1A1A1</item>
+		<item name="colorPrimaryContainer">#D3D3D3</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#BDBDBD</item>
-		<item name="colorOnPrimaryContainer">#494949</item>
-		<item name="colorSecondary">#757575</item>
+		<item name="colorOnPrimaryContainer">#404040</item>
+		<item name="colorPrimaryInverse">#989898</item>
+		<item name="colorSecondary">#9C9C9C</item>
+		<item name="colorSecondaryContainer">#C1C1C1</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#CCCCCC</item>
 		<item name="colorOnSecondaryContainer">#474747</item>
-		<item name="colorTertiary">#434343</item>
+		<item name="colorTertiary">#919191</item>
+		<item name="colorTertiaryContainer">#C1C1C1</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#919191</item>
-		<item name="colorOnTertiaryContainer">#373737</item>
+		<item name="colorOnTertiaryContainer">#252525</item>
+		<item name="colorSurface">#F3F3F3</item>
+		<item name="colorSurfaceDim">#DCDCDC</item>
+		<item name="colorSurfaceBright">#EDEDED</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#E3E3E3</item>
+		<item name="colorSurfaceContainer">#E4E4E4</item>
+		<item name="colorSurfaceContainerHigh">#E6E6E6</item>
+		<item name="colorSurfaceContainerHighest">#D8D8D8</item>
+		<item name="colorSurfaceVariant">#C6C6C6</item>
+		<item name="colorOnSurface">#202020</item>
+		<item name="colorOnSurfaceVariant">#505050</item>
+		<item name="colorSurfaceInverse">#373737</item>
+		<item name="colorOnSurfaceInverse">#F1F1F1</item>
+		<item name="android:colorBackground">#E6E6E6</item>
+		<item name="colorOnBackground">#202020</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_kanade</item>
-		<item name="colorOnBackground">#202020</item>
-		<item name="colorSurface">@color/background_kanade</item>
-		<item name="colorOnSurface">#272727</item>
-		<item name="colorSurfaceVariant">#CCCCCC</item>
-		<item name="colorOnSurfaceVariant">#616161</item>
-		<item name="colorOutline">#818181</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#E4E4E4</item>
-		<item name="colorPrimaryInverse">#8F8F8F</item>
+		<item name="colorOutline">#808080</item>
+		<item name="colorOutlineVariant">#D5D5D5</item>
 	</style>
 </resources>