diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt b/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt
index 9d50c84..7e54683 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt
@@ -10,18 +10,18 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import com.xinto.mauth.core.settings.model.ColorSetting
 import com.xinto.mauth.core.settings.model.ThemeSetting
-import com.xinto.mauth.ui.theme.color.DarkBlueberryBlue
-import com.xinto.mauth.ui.theme.color.DarkLemonYellow
-import com.xinto.mauth.ui.theme.color.DarkLimeGreen
-import com.xinto.mauth.ui.theme.color.DarkMothPurple
-import com.xinto.mauth.ui.theme.color.DarkOrangeOrange
-import com.xinto.mauth.ui.theme.color.DarkSkyCyan
-import com.xinto.mauth.ui.theme.color.LightBlueberryBlue
-import com.xinto.mauth.ui.theme.color.LightLemonYellow
-import com.xinto.mauth.ui.theme.color.LightLimeGreen
-import com.xinto.mauth.ui.theme.color.LightMothPurple
-import com.xinto.mauth.ui.theme.color.LightOrangeOrange
-import com.xinto.mauth.ui.theme.color.LightSkyCyan
+import com.xinto.mauth.ui.theme.color.BlueberryBlueDark
+import com.xinto.mauth.ui.theme.color.LimeGreenDark
+import com.xinto.mauth.ui.theme.color.MothPurpleDark
+import com.xinto.mauth.ui.theme.color.OrangeOrangeDark
+import com.xinto.mauth.ui.theme.color.SkyCyanDark
+import com.xinto.mauth.ui.theme.color.LemonYellowDark
+import com.xinto.mauth.ui.theme.color.BlueberryBlueLight
+import com.xinto.mauth.ui.theme.color.LemonYellowLight
+import com.xinto.mauth.ui.theme.color.LimeGreenLight
+import com.xinto.mauth.ui.theme.color.MothPurpleLight
+import com.xinto.mauth.ui.theme.color.OrangeOrangeLight
+import com.xinto.mauth.ui.theme.color.SkyCyanLight
 
 @Composable
 fun MauthTheme(
@@ -44,28 +44,28 @@ fun MauthTheme(
             }
         }
         color == ColorSetting.BlueberryBlue -> when (isDark) {
-            true -> DarkBlueberryBlue
-            false -> LightBlueberryBlue
+            true -> BlueberryBlueDark
+            false -> BlueberryBlueLight
         }
         color == ColorSetting.PickleYellow -> when (isDark) {
-            true -> DarkLemonYellow
-            false -> LightLemonYellow
+            true -> LemonYellowDark
+            false -> LemonYellowLight
         }
         color == ColorSetting.ToxicGreen -> when (isDark) {
-            true -> DarkLimeGreen
-            false -> LightLimeGreen
+            true -> LimeGreenDark
+            false -> LimeGreenLight
         }
         color == ColorSetting.LeatherOrange -> when (isDark) {
-            true -> DarkOrangeOrange
-            false -> LightOrangeOrange
+            true -> OrangeOrangeDark
+            false -> OrangeOrangeLight
         }
         color == ColorSetting.OceanTurquoise -> when (isDark) {
-            true -> DarkSkyCyan
-            false -> LightSkyCyan
+            true -> SkyCyanDark
+            false -> SkyCyanLight
         }
         else -> when (isDark) {
-            true -> DarkMothPurple
-            false -> LightMothPurple
+            true -> MothPurpleDark
+            false -> MothPurpleLight
         }
     }
     MaterialTheme(
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt
index 2a8b13a..a74f143 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt
@@ -4,68 +4,233 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightBlueberryBlue = lightColorScheme(
-    primary = Color(0xFF343DFF),
+val BlueberryBlueLight = lightColorScheme(
+    primary = Color(0xFF475D92),
     onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFFE0E0FF),
-    onPrimaryContainer = Color(0xFF00006E),
-    secondary = Color(0xFF5C5D72),
+    primaryContainer = Color(0xFFD9E2FF),
+    onPrimaryContainer = Color(0xFF001945),
+    secondary = Color(0xFF575E71),
     onSecondary = Color(0xFFFFFFFF),
-    secondaryContainer = Color(0xFFE1E0F9),
-    onSecondaryContainer = Color(0xFF191A2C),
-    tertiary = Color(0xFF78536B),
+    secondaryContainer = Color(0xFFDCE2F9),
+    onSecondaryContainer = Color(0xFF141B2C),
+    tertiary = Color(0xFF725572),
     onTertiary = Color(0xFFFFFFFF),
-    tertiaryContainer = Color(0xFFFFD8EE),
-    onTertiaryContainer = Color(0xFF2E1126),
+    tertiaryContainer = Color(0xFFFDD7FA),
+    onTertiaryContainer = Color(0xFF2A132C),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFFFBFF),
-    onBackground = Color(0xFF1B1B1F),
-    surface = Color(0xFFFFFBFF),
-    onSurface = Color(0xFF1B1B1F),
-    surfaceVariant = Color(0xFFE4E1EC),
-    onSurfaceVariant = Color(0xFF46464F),
-    outline = Color(0xFF777680),
-    inverseOnSurface = Color(0xFFF3EFF4),
-    inverseSurface = Color(0xFF303034),
-    inversePrimary = Color(0xFFBEC2FF),
-    surfaceTint = Color(0xFF343DFF),
-    outlineVariant = Color(0xFFC7C5D0),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF1A1B20),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF44464F),
+    outline = Color(0xFF757780),
+    outlineVariant = Color(0xFFC5C6D0),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFF1F0F7),
+    inversePrimary = Color(0xFFB0C6FF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
 )
 
-val DarkBlueberryBlue = darkColorScheme(
-    primary = Color(0xFFBEC2FF),
-    onPrimary = Color(0xFF0001AC),
-    primaryContainer = Color(0xFF0000EF),
-    onPrimaryContainer = Color(0xFFE0E0FF),
-    secondary = Color(0xFFC5C4DD),
-    onSecondary = Color(0xFF2E2F42),
-    secondaryContainer = Color(0xFF444559),
-    onSecondaryContainer = Color(0xFFE1E0F9),
-    tertiary = Color(0xFFE8B9D5),
-    onTertiary = Color(0xFF46263B),
-    tertiaryContainer = Color(0xFF5E3C52),
-    onTertiaryContainer = Color(0xFFFFD8EE),
+val BlueberryBlueLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF2A4174),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF5D73A9),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF3C4255),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF6E7488),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF553A55),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF8A6A89),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF1A1B20),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF40434B),
+    outline = Color(0xFF5D5F67),
+    outlineVariant = Color(0xFF797A83),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFF1F0F7),
+    inversePrimary = Color(0xFFB0C6FF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
+)
+
+val BlueberryBlueLightHighContrast = lightColorScheme(
+    primary = Color(0xFF011F51),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF2A4174),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF1B2233),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF3C4255),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF311933),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF553A55),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF21242B),
+    outline = Color(0xFF40434B),
+    outlineVariant = Color(0xFF40434B),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFE7EBFF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
+)
+
+val BlueberryBlueDark = darkColorScheme(
+
+    primary = Color(0xFFB0C6FF),
+    onPrimary = Color(0xFF152E60),
+    primaryContainer = Color(0xFF2E4578),
+    onPrimaryContainer = Color(0xFFD9E2FF),
+    secondary = Color(0xFFC0C6DC),
+    onSecondary = Color(0xFF293042),
+    secondaryContainer = Color(0xFF404659),
+    onSecondaryContainer = Color(0xFFDCE2F9),
+    tertiary = Color(0xFFE0BBDD),
+    onTertiary = Color(0xFF412742),
+    tertiaryContainer = Color(0xFF593D5A),
+    onTertiaryContainer = Color(0xFFFDD7FA),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1B1B1F),
-    onBackground = Color(0xFFE5E1E6),
-    surface = Color(0xFF1B1B1F),
-    onSurface = Color(0xFFE5E1E6),
-    surfaceVariant = Color(0xFF46464F),
-    onSurfaceVariant = Color(0xFFC7C5D0),
-    outline = Color(0xFF91909A),
-    inverseOnSurface = Color(0xFF1B1B1F),
-    inverseSurface = Color(0xFFE5E1E6),
-    inversePrimary = Color(0xFF343DFF),
-    surfaceTint = Color(0xFFBEC2FF),
-    outlineVariant = Color(0xFF46464F),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFE2E2E9),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFC5C6D0),
+    outline = Color(0xFF8F9099),
+    outlineVariant = Color(0xFF44464F),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF2F3036),
+    inversePrimary = Color(0xFF475D92),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
+)
+
+val DarkBlueberryBlueMediumContrast = darkColorScheme(
+    primary = Color(0xFFB6CAFF),
+    onPrimary = Color(0xFF00143A),
+    primaryContainer = Color(0xFF7A90C8),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFC4CAE1),
+    onSecondary = Color(0xFF0F1626),
+    secondaryContainer = Color(0xFF8A90A5),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFE4BFE2),
+    onTertiary = Color(0xFF240D27),
+    tertiaryContainer = Color(0xFFA786A6),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFFCFAFF),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFC9CAD4),
+    outline = Color(0xFFA1A2AC),
+    outlineVariant = Color(0xFF81838C),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF282A2F),
+    inversePrimary = Color(0xFF304679),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
+)
+
+val DarkBlueberryBlueHighContrast = darkColorScheme(
+    primary = Color(0xFFFCFAFF),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFB6CAFF),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFFCFAFF),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFC4CAE1),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFFFF9FA),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFE4BFE2),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFFCFAFF),
+    outline = Color(0xFFC9CAD4),
+    outlineVariant = Color(0xFFC9CAD4),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF0C2859),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
 )
 
-val BlueberryBlue = Color(0xFF0000FF)
\ No newline at end of file
+val BlueberryBlue = Color(0xFF4f86f7)
\ No newline at end of file
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/LemonYellow.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/LemonYellow.kt
index 07dcb4a..764e5d7 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/LemonYellow.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/LemonYellow.kt
@@ -4,10 +4,10 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightLemonYellow = lightColorScheme(
-    primary = Color(0xFF626200),
+val LemonYellowLight = lightColorScheme(
+    primary = Color(0xFF616118),
     onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFFEAEA00),
+    primaryContainer = Color(0xFFE8E78F),
     onPrimaryContainer = Color(0xFF1D1D00),
     secondary = Color(0xFF606043),
     onSecondary = Color(0xFFFFFFFF),
@@ -18,29 +18,111 @@ val LightLemonYellow = lightColorScheme(
     tertiaryContainer = Color(0xFFBFECD8),
     onTertiaryContainer = Color(0xFF002117),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFFFBFF),
-    onBackground = Color(0xFF1C1C17),
-    surface = Color(0xFFFFFBFF),
-    onSurface = Color(0xFF1C1C17),
+    background = Color(0xFFFDF9EC),
+    onBackground = Color(0xFF1C1C14),
+    surface = Color(0xFFFDF9EC),
+    onSurface = Color(0xFF1C1C14),
     surfaceVariant = Color(0xFFE6E3D1),
     onSurfaceVariant = Color(0xFF48473A),
     outline = Color(0xFF797869),
-    inverseOnSurface = Color(0xFFF4F0E8),
-    inverseSurface = Color(0xFF31312B),
-    inversePrimary = Color(0xFFCDCD00),
-    surfaceTint = Color(0xFF626200),
     outlineVariant = Color(0xFFCAC7B6),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF313128),
+    inverseOnSurface = Color(0xFFF4F1E3),
+    inversePrimary = Color(0xFFCBCB76),
+    surfaceDim = Color(0xFFDDDACD),
+    surfaceBright = Color(0xFFFDF9EC),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF7F4E6),
+    surfaceContainer = Color(0xFFF1EEE0),
+    surfaceContainerHigh = Color(0xFFECE8DB),
+    surfaceContainerHighest = Color(0xFFE6E3D5),
+)
+
+val LemonYellowLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF454500),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF78782D),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF454429),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF777657),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF214A3C),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF537D6C),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFDF9EC),
+    onBackground = Color(0xFF1C1C14),
+    surface = Color(0xFFFDF9EC),
+    onSurface = Color(0xFF1C1C14),
+    surfaceVariant = Color(0xFFE6E3D1),
+    onSurfaceVariant = Color(0xFF444336),
+    outline = Color(0xFF616052),
+    outlineVariant = Color(0xFF7D7B6C),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF313128),
+    inverseOnSurface = Color(0xFFF4F1E3),
+    inversePrimary = Color(0xFFCBCB76),
+    surfaceDim = Color(0xFFDDDACD),
+    surfaceBright = Color(0xFFFDF9EC),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF7F4E6),
+    surfaceContainer = Color(0xFFF1EEE0),
+    surfaceContainerHigh = Color(0xFFECE8DB),
+    surfaceContainerHighest = Color(0xFFE6E3D5),
 )
 
-val DarkLemonYellow = darkColorScheme(
-    primary = Color(0xFFCDCD00),
+val LemonYellowLightHighContrast = lightColorScheme(
+    primary = Color(0xFF242400),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF454500),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF23230B),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF454429),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF00281C),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF214A3C),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFDF9EC),
+    onBackground = Color(0xFF1C1C14),
+    surface = Color(0xFFFDF9EC),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFE6E3D1),
+    onSurfaceVariant = Color(0xFF252419),
+    outline = Color(0xFF444336),
+    outlineVariant = Color(0xFF444336),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF313128),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFF2F198),
+    surfaceDim = Color(0xFFDDDACD),
+    surfaceBright = Color(0xFFFDF9EC),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF7F4E6),
+    surfaceContainer = Color(0xFFF1EEE0),
+    surfaceContainerHigh = Color(0xFFECE8DB),
+    surfaceContainerHighest = Color(0xFFE6E3D5),
+)
+
+val LemonYellowDark = darkColorScheme(
+    primary = Color(0xFFCBCB76),
     onPrimary = Color(0xFF323200),
     primaryContainer = Color(0xFF494900),
-    onPrimaryContainer = Color(0xFFEAEA00),
+    onPrimaryContainer = Color(0xFFE8E78F),
     secondary = Color(0xFFCAC8A5),
     onSecondary = Color(0xFF323218),
     secondaryContainer = Color(0xFF49482D),
@@ -50,23 +132,104 @@ val DarkLemonYellow = darkColorScheme(
     tertiaryContainer = Color(0xFF254E40),
     onTertiaryContainer = Color(0xFFBFECD8),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1C1C17),
-    onBackground = Color(0xFFE6E2D9),
-    surface = Color(0xFF1C1C17),
-    onSurface = Color(0xFFE6E2D9),
+    background = Color(0xFF14140C),
+    onBackground = Color(0xFFE6E3D5),
+    surface = Color(0xFF14140C),
+    onSurface = Color(0xFFE6E3D5),
     surfaceVariant = Color(0xFF48473A),
     onSurfaceVariant = Color(0xFFCAC7B6),
     outline = Color(0xFF939182),
-    inverseOnSurface = Color(0xFF1C1C17),
-    inverseSurface = Color(0xFFE6E2D9),
-    inversePrimary = Color(0xFF626200),
-    surfaceTint = Color(0xFFCDCD00),
     outlineVariant = Color(0xFF48473A),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE6E3D5),
+    inverseOnSurface = Color(0xFF313128),
+    inversePrimary = Color(0xFF616118),
+    surfaceDim = Color(0xFF14140C),
+    surfaceBright = Color(0xFF3A3A30),
+    surfaceContainerLowest = Color(0xFF0F0F07),
+    surfaceContainerLow = Color(0xFF1C1C14),
+    surfaceContainer = Color(0xFF202018),
+    surfaceContainerHigh = Color(0xFF2B2A22),
+    surfaceContainerHighest = Color(0xFF36352C),
 )
 
+val LemonYellowDarkMediumContrast = darkColorScheme(
+    primary = Color(0xFFD0CF7A),
+    onPrimary = Color(0xFF171700),
+    primaryContainer = Color(0xFF959446),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFCECCA9),
+    onSecondary = Color(0xFF171703),
+    secondaryContainer = Color(0xFF949272),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFA8D4C1),
+    onTertiary = Color(0xFF001B12),
+    tertiaryContainer = Color(0xFF6F9A88),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF14140C),
+    onBackground = Color(0xFFE6E3D5),
+    surface = Color(0xFF14140C),
+    onSurface = Color(0xFFFEFBED),
+    surfaceVariant = Color(0xFF48473A),
+    onSurfaceVariant = Color(0xFFCECBBA),
+    outline = Color(0xFFA5A393),
+    outlineVariant = Color(0xFF858474),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE6E3D5),
+    inverseOnSurface = Color(0xFF2B2A22),
+    inversePrimary = Color(0xFF4B4B00),
+    surfaceDim = Color(0xFF14140C),
+    surfaceBright = Color(0xFF3A3A30),
+    surfaceContainerLowest = Color(0xFF0F0F07),
+    surfaceContainerLow = Color(0xFF1C1C14),
+    surfaceContainer = Color(0xFF202018),
+    surfaceContainerHigh = Color(0xFF2B2A22),
+    surfaceContainerHighest = Color(0xFF36352C),
+)
+
+val LemonYellowDarkHighContrast = darkColorScheme(
+    primary = Color(0xFFFFFCDC),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFD0CF7A),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFFFFCDC),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFCECCA9),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFEDFFF5),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFA8D4C1),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF14140C),
+    onBackground = Color(0xFFE6E3D5),
+    surface = Color(0xFF14140C),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF48473A),
+    onSurfaceVariant = Color(0xFFFFFBE9),
+    outline = Color(0xFFCECBBA),
+    outlineVariant = Color(0xFFCECBBA),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE6E3D5),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF2C2C00),
+    surfaceDim = Color(0xFF14140C),
+    surfaceBright = Color(0xFF3A3A30),
+    surfaceContainerLowest = Color(0xFF0F0F07),
+    surfaceContainerLow = Color(0xFF1C1C14),
+    surfaceContainer = Color(0xFF202018),
+    surfaceContainerHigh = Color(0xFF2B2A22),
+    surfaceContainerHighest = Color(0xFF36352C),
+)
 
 val LemonYellow = Color(0xFFFFFF00)
\ No newline at end of file
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/LimeGreen.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/LimeGreen.kt
index 9eb1e24..f2602ae 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/LimeGreen.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/LimeGreen.kt
@@ -4,10 +4,10 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightLimeGreen = lightColorScheme(
-    primary = Color(0xFF026E00),
+val LimeGreenLight = lightColorScheme(
+    primary = Color(0xFF406836),
     onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFF77FF61),
+    primaryContainer = Color(0xFFC0EFB0),
     onPrimaryContainer = Color(0xFF002200),
     secondary = Color(0xFF54634D),
     onSecondary = Color(0xFFFFFFFF),
@@ -18,29 +18,111 @@ val LightLimeGreen = lightColorScheme(
     tertiaryContainer = Color(0xFFBCEBEE),
     onTertiaryContainer = Color(0xFF002022),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFCFDF6),
-    onBackground = Color(0xFF1A1C18),
-    surface = Color(0xFFFCFDF6),
-    onSurface = Color(0xFF1A1C18),
+    background = Color(0xFFF8FBF1),
+    onBackground = Color(0xFF191D17),
+    surface = Color(0xFFF8FBF1),
+    onSurface = Color(0xFF191D17),
     surfaceVariant = Color(0xFFDFE4D7),
     onSurfaceVariant = Color(0xFF43483F),
     outline = Color(0xFF73796E),
-    inverseOnSurface = Color(0xFFF1F1EB),
-    inverseSurface = Color(0xFF2F312D),
-    inversePrimary = Color(0xFF02E600),
-    surfaceTint = Color(0xFF026E00),
     outlineVariant = Color(0xFFC3C8BC),
-    scrim = Color(0xFF000000)
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2E322B),
+    inverseOnSurface = Color(0xFFEFF2E8),
+    inversePrimary = Color(0xFFA5D395),
+    surfaceDim = Color(0xFFD8DBD2),
+    surfaceBright = Color(0xFFF8FBF1),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF2F5EB),
+    surfaceContainer = Color(0xFFECEFE5),
+    surfaceContainerHigh = Color(0xFFE6E9E0),
+    surfaceContainerHighest = Color(0xFFE1E4DA),
 )
 
-val DarkLimeGreen = darkColorScheme(
-    primary = Color(0xFF02E600),
-    onPrimary = Color(0xFF013A00),
-    primaryContainer = Color(0xFF015300),
-    onPrimaryContainer = Color(0xFF77FF61),
+val LimeGreenLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF244B1D),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF557F4A),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF394733),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF6A7963),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF19494C),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF4F7C7F),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFF8FBF1),
+    onBackground = Color(0xFF191D17),
+    surface = Color(0xFFF8FBF1),
+    onSurface = Color(0xFF191D17),
+    surfaceVariant = Color(0xFFDFE4D7),
+    onSurfaceVariant = Color(0xFF3F453B),
+    outline = Color(0xFF5B6157),
+    outlineVariant = Color(0xFF777D72),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2E322B),
+    inverseOnSurface = Color(0xFFEFF2E8),
+    inversePrimary = Color(0xFFA5D395),
+    surfaceDim = Color(0xFFD8DBD2),
+    surfaceBright = Color(0xFFF8FBF1),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF2F5EB),
+    surfaceContainer = Color(0xFFECEFE5),
+    surfaceContainerHigh = Color(0xFFE6E9E0),
+    surfaceContainerHighest = Color(0xFFE1E4DA),
+)
+
+val LimeGreenLightHighContrast = lightColorScheme(
+    primary = Color(0xFF022901),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF244B1D),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF182614),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF394733),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF002729),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF19494C),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFF8FBF1),
+    onBackground = Color(0xFF191D17),
+    surface = Color(0xFFF8FBF1),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFDFE4D7),
+    onSurfaceVariant = Color(0xFF20251D),
+    outline = Color(0xFF3F453B),
+    outlineVariant = Color(0xFF3F453B),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2E322B),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFCAF9B8),
+    surfaceDim = Color(0xFFD8DBD2),
+    surfaceBright = Color(0xFFF8FBF1),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF2F5EB),
+    surfaceContainer = Color(0xFFECEFE5),
+    surfaceContainerHigh = Color(0xFFE6E9E0),
+    surfaceContainerHighest = Color(0xFFE1E4DA),
+)
+
+val LimeGreenDark = darkColorScheme(
+    primary = Color(0xFFA5D395),
+    onPrimary = Color(0xFF11380B),
+    primaryContainer = Color(0xFF285020),
+    onPrimaryContainer = Color(0xFFC0EFB0),
     secondary = Color(0xFFBBCBB2),
     onSecondary = Color(0xFF263422),
     secondaryContainer = Color(0xFF3C4B37),
@@ -50,22 +132,104 @@ val DarkLimeGreen = darkColorScheme(
     tertiaryContainer = Color(0xFF1E4D50),
     onTertiaryContainer = Color(0xFFBCEBEE),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1A1C18),
-    onBackground = Color(0xFFE2E3DC),
-    surface = Color(0xFF1A1C18),
-    onSurface = Color(0xFFE2E3DC),
+    background = Color(0xFF11140F),
+    onBackground = Color(0xFFE1E4DA),
+    surface = Color(0xFF11140F),
+    onSurface = Color(0xFFE1E4DA),
     surfaceVariant = Color(0xFF43483F),
     onSurfaceVariant = Color(0xFFC3C8BC),
     outline = Color(0xFF8D9387),
-    inverseOnSurface = Color(0xFF1A1C18),
-    inverseSurface = Color(0xFFE2E3DC),
-    inversePrimary = Color(0xFF026E00),
-    surfaceTint = Color(0xFF02E600),
     outlineVariant = Color(0xFF43483F),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE1E4DA),
+    inverseOnSurface = Color(0xFF2E322B),
+    inversePrimary = Color(0xFF406836),
+    surfaceDim = Color(0xFF11140F),
+    surfaceBright = Color(0xFF363A34),
+    surfaceContainerLowest = Color(0xFF0C0F0A),
+    surfaceContainerLow = Color(0xFF191D17),
+    surfaceContainer = Color(0xFF1D211B),
+    surfaceContainerHigh = Color(0xFF272B25),
+    surfaceContainerHighest = Color(0xFF32362F),
+)
+
+val LimeGreenDarkMediumContrast = darkColorScheme(
+    primary = Color(0xFFA9D799),
+    onPrimary = Color(0xFF001C00),
+    primaryContainer = Color(0xFF719C64),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFBFD0B6),
+    onSecondary = Color(0xFF0D1909),
+    secondaryContainer = Color(0xFF86957E),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFA4D3D6),
+    onTertiary = Color(0xFF001A1B),
+    tertiaryContainer = Color(0xFF6B989B),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF11140F),
+    onBackground = Color(0xFFE1E4DA),
+    surface = Color(0xFF11140F),
+    onSurface = Color(0xFFF9FCF2),
+    surfaceVariant = Color(0xFF43483F),
+    onSurfaceVariant = Color(0xFFC7CDC0),
+    outline = Color(0xFF9FA599),
+    outlineVariant = Color(0xFF7F857A),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE1E4DA),
+    inverseOnSurface = Color(0xFF272B25),
+    inversePrimary = Color(0xFF2A5121),
+    surfaceDim = Color(0xFF11140F),
+    surfaceBright = Color(0xFF363A34),
+    surfaceContainerLowest = Color(0xFF0C0F0A),
+    surfaceContainerLow = Color(0xFF191D17),
+    surfaceContainer = Color(0xFF1D211B),
+    surfaceContainerHigh = Color(0xFF272B25),
+    surfaceContainerHighest = Color(0xFF32362F),
+)
+
+val LimeGreenDarkHighContrast = darkColorScheme(
+    primary = Color(0xFFF2FFE7),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFA9D799),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFF2FFE7),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFBFD0B6),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFECFEFF),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFA4D3D6),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF11140F),
+    onBackground = Color(0xFFE1E4DA),
+    surface = Color(0xFF11140F),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF43483F),
+    onSurfaceVariant = Color(0xFFF7FDEF),
+    outline = Color(0xFFC7CDC0),
+    outlineVariant = Color(0xFFC7CDC0),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE1E4DA),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF0A3105),
+    surfaceDim = Color(0xFF11140F),
+    surfaceBright = Color(0xFF363A34),
+    surfaceContainerLowest = Color(0xFF0C0F0A),
+    surfaceContainerLow = Color(0xFF191D17),
+    surfaceContainer = Color(0xFF1D211B),
+    surfaceContainerHigh = Color(0xFF272B25),
+    surfaceContainerHighest = Color(0xFF32362F),
 )
 
 val LimeGreen = Color(0xFF00FF00)
\ No newline at end of file
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/MothPurple.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/MothPurple.kt
index 3e4fb00..f2ecdc2 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/MothPurple.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/MothPurple.kt
@@ -4,11 +4,11 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightMothPurple = lightColorScheme(
-    primary = Color(0xFF8A4485),
+val MothPurpleLight = lightColorScheme(
+    primary = Color(0xFF804D7A),
     onPrimary = Color(0xFFFFFFFF),
     primaryContainer = Color(0xFFFFD7F5),
-    onPrimaryContainer = Color(0xFF380038),
+    onPrimaryContainer = Color(0xFF340832),
     secondary = Color(0xFF6D5869),
     onSecondary = Color(0xFFFFFFFF),
     secondaryContainer = Color(0xFFF7DAEF),
@@ -18,28 +18,110 @@ val LightMothPurple = lightColorScheme(
     tertiaryContainer = Color(0xFFFFDBD1),
     onTertiaryContainer = Color(0xFF321208),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFFFBFF),
-    onBackground = Color(0xFF1E1A1D),
-    surface = Color(0xFFFFFBFF),
-    onSurface = Color(0xFF1E1A1D),
+    background = Color(0xFFFFF7F9),
+    onBackground = Color(0xFF201A1E),
+    surface = Color(0xFFFFF7F9),
+    onSurface = Color(0xFF201A1E),
     surfaceVariant = Color(0xFFEEDEE7),
     onSurfaceVariant = Color(0xFF4E444B),
     outline = Color(0xFF80747C),
-    inverseOnSurface = Color(0xFFF8EEF2),
-    inverseSurface = Color(0xFF342F32),
-    inversePrimary = Color(0xFFFFABF3),
-    surfaceTint = Color(0xFF8A4485),
     outlineVariant = Color(0xFFD1C2CB),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF352E33),
+    inverseOnSurface = Color(0xFFFAEDF4),
+    inversePrimary = Color(0xFFF1B3E6),
+    surfaceDim = Color(0xFFE3D7DD),
+    surfaceBright = Color(0xFFFFF7F9),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFDF0F7),
+    surfaceContainer = Color(0xFFF7EBF1),
+    surfaceContainerHigh = Color(0xFFF1E5EB),
+    surfaceContainerHighest = Color(0xFFECDFE5),
+)
+
+val MothPurpleLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF61325C),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF986391),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF503D4D),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF856E7F),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF62382C),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF9B685A),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFFF7F9),
+    onBackground = Color(0xFF201A1E),
+    surface = Color(0xFFFFF7F9),
+    onSurface = Color(0xFF201A1E),
+    surfaceVariant = Color(0xFFEEDEE7),
+    onSurfaceVariant = Color(0xFF4A4047),
+    outline = Color(0xFF675C63),
+    outlineVariant = Color(0xFF83777F),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF352E33),
+    inverseOnSurface = Color(0xFFFAEDF4),
+    inversePrimary = Color(0xFFF1B3E6),
+    surfaceDim = Color(0xFFE3D7DD),
+    surfaceBright = Color(0xFFFFF7F9),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFDF0F7),
+    surfaceContainer = Color(0xFFF7EBF1),
+    surfaceContainerHigh = Color(0xFFF1E5EB),
+    surfaceContainerHighest = Color(0xFFECDFE5),
+)
+
+val MothPurpleLightHighContrast = lightColorScheme(
+    primary = Color(0xFF3B103A),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF61325C),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF2E1D2B),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF503D4D),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF3B180E),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF62382C),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFFF7F9),
+    onBackground = Color(0xFF201A1E),
+    surface = Color(0xFFFFF7F9),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFEEDEE7),
+    onSurfaceVariant = Color(0xFF2A2128),
+    outline = Color(0xFF4A4047),
+    outlineVariant = Color(0xFF4A4047),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF352E33),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFFFE5F7),
+    surfaceDim = Color(0xFFE3D7DD),
+    surfaceBright = Color(0xFFFFF7F9),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFDF0F7),
+    surfaceContainer = Color(0xFFF7EBF1),
+    surfaceContainerHigh = Color(0xFFF1E5EB),
+    surfaceContainerHighest = Color(0xFFECDFE5),
 )
 
-val DarkMothPurple = darkColorScheme(
-    primary = Color(0xFFFFABF3),
-    onPrimary = Color(0xFF551353),
-    primaryContainer = Color(0xFF6F2C6B),
+val MothPurpleDark = darkColorScheme(
+    primary = Color(0xFFF1B3E6),
+    onPrimary = Color(0xFF4C1F49),
+    primaryContainer = Color(0xFF653661),
     onPrimaryContainer = Color(0xFFFFD7F5),
     secondary = Color(0xFFDABFD2),
     onSecondary = Color(0xFF3D2B3A),
@@ -50,22 +132,104 @@ val DarkMothPurple = darkColorScheme(
     tertiaryContainer = Color(0xFF663C2F),
     onTertiaryContainer = Color(0xFFFFDBD1),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1E1A1D),
-    onBackground = Color(0xFFE9E0E4),
-    surface = Color(0xFF1E1A1D),
-    onSurface = Color(0xFFE9E0E4),
+    background = Color(0xFF171216),
+    onBackground = Color(0xFFECDFE5),
+    surface = Color(0xFF171216),
+    onSurface = Color(0xFFECDFE5),
     surfaceVariant = Color(0xFF4E444B),
     onSurfaceVariant = Color(0xFFD1C2CB),
     outline = Color(0xFF9A8D95),
-    inverseOnSurface = Color(0xFF1E1A1D),
-    inverseSurface = Color(0xFFE9E0E4),
-    inversePrimary = Color(0xFF8A4485),
-    surfaceTint = Color(0xFFFFABF3),
     outlineVariant = Color(0xFF4E444B),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFECDFE5),
+    inverseOnSurface = Color(0xFF352E33),
+    inversePrimary = Color(0xFF804D7A),
+    surfaceDim = Color(0xFF171216),
+    surfaceBright = Color(0xFF3E373C),
+    surfaceContainerLowest = Color(0xFF120D11),
+    surfaceContainerLow = Color(0xFF201A1E),
+    surfaceContainer = Color(0xFF241E22),
+    surfaceContainerHigh = Color(0xFF2F282D),
+    surfaceContainerHighest = Color(0xFF3A3338),
+)
+
+val MothPurpleDarkMediumContrast = darkColorScheme(
+    primary = Color(0xFFF6B7EB),
+    onPrimary = Color(0xFF2D032D),
+    primaryContainer = Color(0xFFB77EAE),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFDEC3D7),
+    onSecondary = Color(0xFF21111F),
+    secondaryContainer = Color(0xFFA2899C),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFFABCAB),
+    onTertiary = Color(0xFF2C0D04),
+    tertiaryContainer = Color(0xFFBA8474),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF171216),
+    onBackground = Color(0xFFECDFE5),
+    surface = Color(0xFF171216),
+    onSurface = Color(0xFFFFF9FA),
+    surfaceVariant = Color(0xFF4E444B),
+    onSurfaceVariant = Color(0xFFD5C7CF),
+    outline = Color(0xFFAD9FA7),
+    outlineVariant = Color(0xFF8C8088),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFECDFE5),
+    inverseOnSurface = Color(0xFF2F282D),
+    inversePrimary = Color(0xFF673762),
+    surfaceDim = Color(0xFF171216),
+    surfaceBright = Color(0xFF3E373C),
+    surfaceContainerLowest = Color(0xFF120D11),
+    surfaceContainerLow = Color(0xFF201A1E),
+    surfaceContainer = Color(0xFF241E22),
+    surfaceContainerHigh = Color(0xFF2F282D),
+    surfaceContainerHighest = Color(0xFF3A3338),
+)
+
+val MothPurpleDarkhighContrast = darkColorScheme(
+    primary = Color(0xFFFFF9FA),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFF6B7EB),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFFFF9FA),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFDEC3D7),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFFFF9F8),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFFABCAB),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF171216),
+    onBackground = Color(0xFFECDFE5),
+    surface = Color(0xFF171216),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF4E444B),
+    onSurfaceVariant = Color(0xFFFFF9FA),
+    outline = Color(0xFFD5C7CF),
+    outlineVariant = Color(0xFFD5C7CF),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFECDFE5),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF441842),
+    surfaceDim = Color(0xFF171216),
+    surfaceBright = Color(0xFF3E373C),
+    surfaceContainerLowest = Color(0xFF120D11),
+    surfaceContainerLow = Color(0xFF201A1E),
+    surfaceContainer = Color(0xFF241E22),
+    surfaceContainerHigh = Color(0xFF2F282D),
+    surfaceContainerHighest = Color(0xFF3A3338),
 )
 
 val MothPurple = Color(0xFF420042)
\ No newline at end of file
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/OrangeOrange.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/OrangeOrange.kt
index 63da754..208c9d1 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/OrangeOrange.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/OrangeOrange.kt
@@ -4,8 +4,8 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightOrangeOrange = lightColorScheme(
-    primary = Color(0xFF855400),
+val OrangeOrangeLight = lightColorScheme(
+    primary = Color(0xFF815512),
     onPrimary = Color(0xFFFFFFFF),
     primaryContainer = Color(0xFFFFDDB7),
     onPrimaryContainer = Color(0xFF2A1700),
@@ -18,26 +18,108 @@ val LightOrangeOrange = lightColorScheme(
     tertiaryContainer = Color(0xFFD6E9B9),
     onTertiaryContainer = Color(0xFF121F03),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFFFBFF),
-    onBackground = Color(0xFF1F1B16),
-    surface = Color(0xFFFFFBFF),
-    onSurface = Color(0xFF1F1B16),
+    background = Color(0xFFFFF8F4),
+    onBackground = Color(0xFF211A13),
+    surface = Color(0xFFFFF8F4),
+    onSurface = Color(0xFF211A13),
     surfaceVariant = Color(0xFFF0E0D0),
     onSurfaceVariant = Color(0xFF504539),
     outline = Color(0xFF827568),
-    inverseOnSurface = Color(0xFFF9EFE7),
-    inverseSurface = Color(0xFF352F2A),
-    inversePrimary = Color(0xFFFFB95C),
-    surfaceTint = Color(0xFF855400),
     outlineVariant = Color(0xFFD4C4B5),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF362F27),
+    inverseOnSurface = Color(0xFFFCEEE2),
+    inversePrimary = Color(0xFFF7BB70),
+    surfaceDim = Color(0xFFE5D8CC),
+    surfaceBright = Color(0xFFFFF8F4),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFFF1E5),
+    surfaceContainer = Color(0xFFF9ECE0),
+    surfaceContainerHigh = Color(0xFFF3E6DA),
+    surfaceContainerHighest = Color(0xFFEEE0D4),
 )
 
-val DarkOrangeOrange = darkColorScheme(
-    primary = Color(0xFFFFB95C),
+val OrangeOrangeLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF5F3B00),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF9B6B28),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF533F27),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF887055),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF384824),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF697A52),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFFF8F4),
+    onBackground = Color(0xFF211A13),
+    surface = Color(0xFFFFF8F4),
+    onSurface = Color(0xFF211A13),
+    surfaceVariant = Color(0xFFF0E0D0),
+    onSurfaceVariant = Color(0xFF4C4136),
+    outline = Color(0xFF695D51),
+    outlineVariant = Color(0xFF85796B),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF362F27),
+    inverseOnSurface = Color(0xFFFCEEE2),
+    inversePrimary = Color(0xFFF7BB70),
+    surfaceDim = Color(0xFFE5D8CC),
+    surfaceBright = Color(0xFFFFF8F4),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFFF1E5),
+    surfaceContainer = Color(0xFFF9ECE0),
+    surfaceContainerHigh = Color(0xFFF3E6DA),
+    surfaceContainerHighest = Color(0xFFEEE0D4),
+)
+
+val OrangeOrangeLightHighContrast = lightColorScheme(
+    primary = Color(0xFF331D00),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF5F3B00),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF2F1F0A),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF533F27),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF182607),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF384824),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFFF8F4),
+    onBackground = Color(0xFF211A13),
+    surface = Color(0xFFFFF8F4),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFF0E0D0),
+    onSurfaceVariant = Color(0xFF2B2218),
+    outline = Color(0xFF4C4136),
+    outlineVariant = Color(0xFF4C4136),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF362F27),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFFFE8D1),
+    surfaceDim = Color(0xFFE5D8CC),
+    surfaceBright = Color(0xFFFFF8F4),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFFFF1E5),
+    surfaceContainer = Color(0xFFF9ECE0),
+    surfaceContainerHigh = Color(0xFFF3E6DA),
+    surfaceContainerHighest = Color(0xFFEEE0D4),
+)
+
+val OrangeOrangeDark = darkColorScheme(
+    primary = Color(0xFFF7BB70),
     onPrimary = Color(0xFF462A00),
     primaryContainer = Color(0xFF653E00),
     onPrimaryContainer = Color(0xFFFFDDB7),
@@ -50,22 +132,104 @@ val DarkOrangeOrange = darkColorScheme(
     tertiaryContainer = Color(0xFF3C4C28),
     onTertiaryContainer = Color(0xFFD6E9B9),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1F1B16),
-    onBackground = Color(0xFFEBE1D9),
-    surface = Color(0xFF1F1B16),
-    onSurface = Color(0xFFEBE1D9),
+    background = Color(0xFF18120C),
+    onBackground = Color(0xFFEEE0D4),
+    surface = Color(0xFF18120C),
+    onSurface = Color(0xFFEEE0D4),
     surfaceVariant = Color(0xFF504539),
     onSurfaceVariant = Color(0xFFD4C4B5),
     outline = Color(0xFF9C8E80),
-    inverseOnSurface = Color(0xFF1F1B16),
-    inverseSurface = Color(0xFFEBE1D9),
-    inversePrimary = Color(0xFF855400),
-    surfaceTint = Color(0xFFFFB95C),
     outlineVariant = Color(0xFF504539),
-    scrim = Color(0xFF000000)
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFEEE0D4),
+    inverseOnSurface = Color(0xFF362F27),
+    inversePrimary = Color(0xFF815512),
+    surfaceDim = Color(0xFF18120C),
+    surfaceBright = Color(0xFF403830),
+    surfaceContainerLowest = Color(0xFF130D07),
+    surfaceContainerLow = Color(0xFF211A13),
+    surfaceContainer = Color(0xFF251E17),
+    surfaceContainerHigh = Color(0xFF302921),
+    surfaceContainerHighest = Color(0xFF3B332B),
+)
+
+val OrangeOrangeDarkMediumContrast = darkColorScheme(
+    primary = Color(0xFFFCC074),
+    onPrimary = Color(0xFF231300),
+    primaryContainer = Color(0xFFBB8641),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFE3C6A6),
+    onSecondary = Color(0xFF221302),
+    secondaryContainer = Color(0xFFA68C6F),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFBFD1A3),
+    onTertiary = Color(0xFF0D1A00),
+    tertiaryContainer = Color(0xFF85976C),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF18120C),
+    onBackground = Color(0xFFEEE0D4),
+    surface = Color(0xFF18120C),
+    onSurface = Color(0xFFFFFAF7),
+    surfaceVariant = Color(0xFF504539),
+    onSurfaceVariant = Color(0xFFD8C8B9),
+    outline = Color(0xFFAFA092),
+    outlineVariant = Color(0xFF8E8173),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFEEE0D4),
+    inverseOnSurface = Color(0xFF302921),
+    inversePrimary = Color(0xFF663F00),
+    surfaceDim = Color(0xFF18120C),
+    surfaceBright = Color(0xFF403830),
+    surfaceContainerLowest = Color(0xFF130D07),
+    surfaceContainerLow = Color(0xFF211A13),
+    surfaceContainer = Color(0xFF251E17),
+    surfaceContainerHigh = Color(0xFF302921),
+    surfaceContainerHighest = Color(0xFF3B332B),
+)
+
+val OrangeOrangeDarkHighContrast = darkColorScheme(
+    primary = Color(0xFFFFFAF7),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFFCC074),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFFFFAF7),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFE3C6A6),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFF4FFDF),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFBFD1A3),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF18120C),
+    onBackground = Color(0xFFEEE0D4),
+    surface = Color(0xFF18120C),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF504539),
+    onSurfaceVariant = Color(0xFFFFFAF7),
+    outline = Color(0xFFD8C8B9),
+    outlineVariant = Color(0xFFD8C8B9),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFEEE0D4),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF3E2400),
+    surfaceDim = Color(0xFF18120C),
+    surfaceBright = Color(0xFF403830),
+    surfaceContainerLowest = Color(0xFF130D07),
+    surfaceContainerLow = Color(0xFF211A13),
+    surfaceContainer = Color(0xFF251E17),
+    surfaceContainerHigh = Color(0xFF302921),
+    surfaceContainerHighest = Color(0xFF3B332B),
 )
 
 val OrangeOrange = Color(0xFFFFA500)
\ No newline at end of file
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/SkyCyan.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/SkyCyan.kt
index 952ebd7..96358b6 100644
--- a/app/src/main/java/com/xinto/mauth/ui/theme/color/SkyCyan.kt
+++ b/app/src/main/java/com/xinto/mauth/ui/theme/color/SkyCyan.kt
@@ -4,10 +4,10 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightSkyCyan = lightColorScheme(
+val SkyCyanLight = lightColorScheme(
     primary = Color(0xFF006A6A),
     onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFF00FBFB),
+    primaryContainer = Color(0xFF9CF1F0),
     onPrimaryContainer = Color(0xFF002020),
     secondary = Color(0xFF4A6363),
     onSecondary = Color(0xFFFFFFFF),
@@ -18,29 +18,111 @@ val LightSkyCyan = lightColorScheme(
     tertiaryContainer = Color(0xFFD3E4FF),
     onTertiaryContainer = Color(0xFF041C35),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFAFDFC),
-    onBackground = Color(0xFF191C1C),
-    surface = Color(0xFFFAFDFC),
-    onSurface = Color(0xFF191C1C),
+    background = Color(0xFFF4FBFA),
+    onBackground = Color(0xFF161D1D),
+    surface = Color(0xFFF4FBFA),
+    onSurface = Color(0xFF161D1D),
     surfaceVariant = Color(0xFFDAE5E4),
     onSurfaceVariant = Color(0xFF3F4948),
     outline = Color(0xFF6F7979),
-    inverseOnSurface = Color(0xFFEFF1F0),
-    inverseSurface = Color(0xFF2D3131),
-    inversePrimary = Color(0xFF00DDDD),
-    surfaceTint = Color(0xFF006A6A),
     outlineVariant = Color(0xFFBEC9C8),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2B3231),
+    inverseOnSurface = Color(0xFFECF2F1),
+    inversePrimary = Color(0xFF80D5D4),
+    surfaceDim = Color(0xFFD5DBDA),
+    surfaceBright = Color(0xFFF4FBFA),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFEFF5F4),
+    surfaceContainer = Color(0xFFE9EFEE),
+    surfaceContainerHigh = Color(0xFFE3E9E9),
+    surfaceContainerHighest = Color(0xFFDDE4E3),
+)
+
+val SkyCyanLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF004B4B),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF238181),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF2E4747),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF5F7979),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF2F445F),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF617693),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFF4FBFA),
+    onBackground = Color(0xFF161D1D),
+    surface = Color(0xFFF4FBFA),
+    onSurface = Color(0xFF161D1D),
+    surfaceVariant = Color(0xFFDAE5E4),
+    onSurfaceVariant = Color(0xFF3B4544),
+    outline = Color(0xFF576161),
+    outlineVariant = Color(0xFF737D7C),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2B3231),
+    inverseOnSurface = Color(0xFFECF2F1),
+    inversePrimary = Color(0xFF80D5D4),
+    surfaceDim = Color(0xFFD5DBDA),
+    surfaceBright = Color(0xFFF4FBFA),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFEFF5F4),
+    surfaceContainer = Color(0xFFE9EFEE),
+    surfaceContainerHigh = Color(0xFFE3E9E9),
+    surfaceContainerHighest = Color(0xFFDDE4E3),
+)
+
+val SkyCyanLightHighContrast = lightColorScheme(
+    primary = Color(0xFF002727),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF004B4B),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF0C2626),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF2E4747),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF0C233C),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF2F445F),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFF4FBFA),
+    onBackground = Color(0xFF161D1D),
+    surface = Color(0xFFF4FBFA),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFDAE5E4),
+    onSurfaceVariant = Color(0xFF1C2625),
+    outline = Color(0xFF3B4544),
+    outlineVariant = Color(0xFF3B4544),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2B3231),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFA6FBFA),
+    surfaceDim = Color(0xFFD5DBDA),
+    surfaceBright = Color(0xFFF4FBFA),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFEFF5F4),
+    surfaceContainer = Color(0xFFE9EFEE),
+    surfaceContainerHigh = Color(0xFFE3E9E9),
+    surfaceContainerHighest = Color(0xFFDDE4E3),
 )
 
-val DarkSkyCyan = darkColorScheme(
-    primary = Color(0xFF00DDDD),
+val SkyCyanDark = darkColorScheme(
+    primary = Color(0xFF80D5D4),
     onPrimary = Color(0xFF003737),
     primaryContainer = Color(0xFF004F4F),
-    onPrimaryContainer = Color(0xFF00FBFB),
+    onPrimaryContainer = Color(0xFF9CF1F0),
     secondary = Color(0xFFB0CCCB),
     onSecondary = Color(0xFF1B3534),
     secondaryContainer = Color(0xFF324B4B),
@@ -50,22 +132,104 @@ val DarkSkyCyan = darkColorScheme(
     tertiaryContainer = Color(0xFF334863),
     onTertiaryContainer = Color(0xFFD3E4FF),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF191C1C),
-    onBackground = Color(0xFFE0E3E2),
-    surface = Color(0xFF191C1C),
-    onSurface = Color(0xFFE0E3E2),
+    background = Color(0xFF0E1514),
+    onBackground = Color(0xFFDDE4E3),
+    surface = Color(0xFF0E1514),
+    onSurface = Color(0xFFDDE4E3),
     surfaceVariant = Color(0xFF3F4948),
     onSurfaceVariant = Color(0xFFBEC9C8),
     outline = Color(0xFF889392),
-    inverseOnSurface = Color(0xFF191C1C),
-    inverseSurface = Color(0xFFE0E3E2),
-    inversePrimary = Color(0xFF006A6A),
-    surfaceTint = Color(0xFF00DDDD),
     outlineVariant = Color(0xFF3F4948),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFDDE4E3),
+    inverseOnSurface = Color(0xFF2B3231),
+    inversePrimary = Color(0xFF006A6A),
+    surfaceDim = Color(0xFF0E1514),
+    surfaceBright = Color(0xFF343A3A),
+    surfaceContainerLowest = Color(0xFF090F0F),
+    surfaceContainerLow = Color(0xFF161D1D),
+    surfaceContainer = Color(0xFF1A2121),
+    surfaceContainerHigh = Color(0xFF252B2B),
+    surfaceContainerHighest = Color(0xFF2F3636),
+)
+
+val SkyCyanDarkMediumContrast = darkColorScheme(
+    primary = Color(0xFF84D9D8),
+    onPrimary = Color(0xFF001A1A),
+    primaryContainer = Color(0xFF479E9D),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFB5D0CF),
+    onSecondary = Color(0xFF001A1A),
+    secondaryContainer = Color(0xFF7B9695),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFB7CCED),
+    onTertiary = Color(0xFF00172F),
+    tertiaryContainer = Color(0xFF7D92B1),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF0E1514),
+    onBackground = Color(0xFFDDE4E3),
+    surface = Color(0xFF0E1514),
+    onSurface = Color(0xFFF6FCFB),
+    surfaceVariant = Color(0xFF3F4948),
+    onSurfaceVariant = Color(0xFFC2CDCC),
+    outline = Color(0xFF9BA5A4),
+    outlineVariant = Color(0xFF7B8585),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFDDE4E3),
+    inverseOnSurface = Color(0xFF252B2B),
+    inversePrimary = Color(0xFF005151),
+    surfaceDim = Color(0xFF0E1514),
+    surfaceBright = Color(0xFF343A3A),
+    surfaceContainerLowest = Color(0xFF090F0F),
+    surfaceContainerLow = Color(0xFF161D1D),
+    surfaceContainer = Color(0xFF1A2121),
+    surfaceContainerHigh = Color(0xFF252B2B),
+    surfaceContainerHighest = Color(0xFF2F3636),
+)
+
+val SkyCyanDarkHighContrast = darkColorScheme(
+    primary = Color(0xFFEAFFFE),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFF84D9D8),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFEAFFFE),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFB5D0CF),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFFAFAFF),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFB7CCED),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF0E1514),
+    onBackground = Color(0xFFDDE4E3),
+    surface = Color(0xFF0E1514),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF3F4948),
+    onSurfaceVariant = Color(0xFFF3FDFC),
+    outline = Color(0xFFC2CDCC),
+    outlineVariant = Color(0xFFC2CDCC),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFDDE4E3),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF003030),
+    surfaceDim = Color(0xFF0E1514),
+    surfaceBright = Color(0xFF343A3A),
+    surfaceContainerLowest = Color(0xFF090F0F),
+    surfaceContainerLow = Color(0xFF161D1D),
+    surfaceContainer = Color(0xFF1A2121),
+    surfaceContainerHigh = Color(0xFF252B2B),
+    surfaceContainerHighest = Color(0xFF2F3636),
 )
 
 val SkyCyan = Color(0xFF00FFFF)
\ No newline at end of file