Try different M3 theme

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsDrawerHandler.kt

@@ -236,7 +236,7 @@ fun BrandingHeader() {
         Spacer(Modifier.height(16.dp))
         Box(
             Modifier.background(
-                color = M3ColorScheme.md_theme_light_primary,
+                color = M3ColorScheme.primaryLight,
                 shape = RoundedCornerShape(16.dp)
             )
         ) {

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt

@@ -361,8 +361,8 @@ fun AccountList(
             for ((account, progress) in accounts)
                 Card(
                     colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.tertiaryContainer,
+                        containerColor = MaterialTheme.colorScheme.tertiary,
-                        contentColor = MaterialTheme.colorScheme.onTertiaryContainer
+                        contentColor = MaterialTheme.colorScheme.onTertiary
                     ),
                     elevation = CardDefaults.cardElevation(1.dp),
                     modifier = Modifier
@@ -375,7 +375,6 @@ fun AccountList(
                         when (progress) {
                             AccountProgress.Active ->
                                 LinearProgressIndicator(
-                                    //color = MaterialTheme.colors.onSecondary,
                                     modifier = Modifier
                                         .alpha(progressAlpha)
                                         .fillMaxWidth()

app/src/main/kotlin/at/bitfire/davdroid/ui/AppTheme.kt

@@ -14,9 +14,9 @@ fun AppTheme(
     content: @Composable () -> Unit
 ) {
     val colors = if (!useDarkTheme)
-        M3ColorScheme.LightColors
+        M3ColorScheme.lightScheme
     else
-        M3ColorScheme.DarkColors
+        M3ColorScheme.darkScheme
 
     MaterialTheme(
         colorScheme = colors,

app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt

@@ -51,7 +51,7 @@ class IntroActivity : AppIntro2() {
             })
         }
 
-        setBarColor(M3ColorScheme.LightColors.primary.toArgb())
+        setBarColor(M3ColorScheme.primaryLight.toArgb())
         isSkipButtonEnabled = false
 
         onBackPressedDispatcher.addCallback(this) {

app/src/main/kotlin/at/bitfire/davdroid/ui/intro/WelcomePage.kt

@@ -51,7 +51,7 @@ class WelcomePage: IntroPage {
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .background(color = M3ColorScheme.md_theme_light_primary),
+                .background(color = M3ColorScheme.primaryLight),
         ) {
             Image(
                 painter = painterResource(R.drawable.ic_launcher_foreground),

app/src/main/kotlin/at/bitfire/davdroid/ui/widget/SyncButtonWidget.kt

@@ -50,7 +50,7 @@ class SyncButtonWidget : GlanceAppWidget() {
         Row(
             modifier = GlanceModifier
                 .fillMaxWidth()
-                .background(ColorProvider(M3ColorScheme.md_theme_light_primary))
+                .background(ColorProvider(M3ColorScheme.primaryLight))
                 .cornerRadius(16.dp)
                 .padding(4.dp)
                 .clickable {
@@ -58,7 +58,7 @@ class SyncButtonWidget : GlanceAppWidget() {
                 },
             verticalAlignment = Alignment.CenterVertically
         ) {
-            val onPrimary = ColorProvider(M3ColorScheme.md_theme_light_onPrimary)
+            val onPrimary = ColorProvider(M3ColorScheme.onPrimaryLight)
             Image(
                 provider = ImageProvider(R.drawable.ic_sync),
                 contentDescription = context.getString(R.string.widget_sync_all_accounts),

app/src/ose/kotlin/at/bitfire/davdroid/ui/ThemeColors.kt

@@ -6,134 +6,467 @@ package at.bitfire.davdroid.ui
 
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 
+@Suppress("MemberVisibilityCanBePrivate")
 object M3ColorScheme {
 
-    val md_theme_light_primary = Color(0xFF47680F)
+    // copied from Material Theme Builder: Color.kt
-    val md_theme_light_onPrimary = Color(0xFFFFFFFF)
-    val md_theme_light_primaryContainer = Color(0xFFC7F089)
-    val md_theme_light_onPrimaryContainer = Color(0xFF121F00)
-    val md_theme_light_secondary = Color(0xFF8B5000)
-    val md_theme_light_onSecondary = Color(0xFFFFFFFF)
-    val md_theme_light_secondaryContainer = Color(0xFFFFDCBF)
-    val md_theme_light_onSecondaryContainer = Color(0xFF2D1600)
-    val md_theme_light_tertiary = Color(0xFF4C6700)
-    val md_theme_light_onTertiary = Color(0xFFFFFFFF)
-    val md_theme_light_tertiaryContainer = Color(0xFFC4F25A)
-    val md_theme_light_onTertiaryContainer = Color(0xFF151F00)
-    val md_theme_light_error = Color(0xFFBA1A1A)
-    val md_theme_light_errorContainer = Color(0xFFFFDAD6)
-    val md_theme_light_onError = Color(0xFFFFFFFF)
-    val md_theme_light_onErrorContainer = Color(0xFF410002)
-    val md_theme_light_background = Color(0xFFFEFCF5)
-    val md_theme_light_onBackground = Color(0xFF1B1C18)
-    val md_theme_light_surface = Color(0xFFFEFCF5)
-    val md_theme_light_onSurface = Color(0xFF1B1C18)
-    val md_theme_light_surfaceVariant = Color(0xFFE1E4D5)
-    val md_theme_light_onSurfaceVariant = Color(0xFF45483D)
-    val md_theme_light_outline = Color(0xFF75786C)
-    val md_theme_light_inverseOnSurface = Color(0xFFF2F1E9)
-    val md_theme_light_inverseSurface = Color(0xFF30312C)
-    val md_theme_light_inversePrimary = Color(0xFFACD370)
-    val md_theme_light_shadow = Color(0xFF000000)
-    val md_theme_light_surfaceTint = Color(0xFF47680F)
-    val md_theme_light_outlineVariant = Color(0xFFC5C8B9)
-    val md_theme_light_scrim = Color(0xFF000000)
 
-    val md_theme_dark_primary = Color(0xFFACD370)
+    val primaryLight = Color(0xFF4B662C)
-    val md_theme_dark_onPrimary = Color(0xFF223600)
+    val onPrimaryLight = Color(0xFFFFFFFF)
-    val md_theme_dark_primaryContainer = Color(0xFF334F00)
+    val primaryContainerLight = Color(0xFFCCEDA4)
-    val md_theme_dark_onPrimaryContainer = Color(0xFFC7F089)
+    val onPrimaryContainerLight = Color(0xFF0F2000)
-    val md_theme_dark_secondary = Color(0xFFFFB872)
+    val secondaryLight = Color(0xFF2F628C)
-    val md_theme_dark_onSecondary = Color(0xFF4A2800)
+    val onSecondaryLight = Color(0xFFFFFFFF)
-    val md_theme_dark_secondaryContainer = Color(0xFF6A3B00)
+    val secondaryContainerLight = Color(0xFFCEE5FF)
-    val md_theme_dark_onSecondaryContainer = Color(0xFFFFDCBF)
+    val onSecondaryContainerLight = Color(0xFF001D32)
-    val md_theme_dark_tertiary = Color(0xFFA9D540)
+    val tertiaryLight = Color(0xFF3F6837)
-    val md_theme_dark_onTertiary = Color(0xFF263500)
+    val onTertiaryLight = Color(0xFFFFFFFF)
-    val md_theme_dark_tertiaryContainer = Color(0xFF394E00)
+    val tertiaryContainerLight = Color(0xFFBFF0B1)
-    val md_theme_dark_onTertiaryContainer = Color(0xFFC4F25A)
+    val onTertiaryContainerLight = Color(0xFF002201)
-    val md_theme_dark_error = Color(0xFFFFB4AB)
+    val errorLight = Color(0xFFBA1A1A)
-    val md_theme_dark_errorContainer = Color(0xFF93000A)
+    val onErrorLight = Color(0xFFFFFFFF)
-    val md_theme_dark_onError = Color(0xFF690005)
+    val errorContainerLight = Color(0xFFFFDAD6)
-    val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+    val onErrorContainerLight = Color(0xFF410002)
-    val md_theme_dark_background = Color(0xFF1B1C18)
+    val backgroundLight = Color(0xFFF9FAEF)
-    val md_theme_dark_onBackground = Color(0xFFE4E3DB)
+    val onBackgroundLight = Color(0xFF1A1C16)
-    val md_theme_dark_surface = Color(0xFF1B1C18)
+    val surfaceLight = Color(0xFFF9FAEF)
-    val md_theme_dark_onSurface = Color(0xFFE4E3DB)
+    val onSurfaceLight = Color(0xFF1A1C16)
-    val md_theme_dark_surfaceVariant = Color(0xFF45483D)
+    val surfaceVariantLight = Color(0xFFE1E4D5)
-    val md_theme_dark_onSurfaceVariant = Color(0xFFC5C8B9)
+    val onSurfaceVariantLight = Color(0xFF44483D)
-    val md_theme_dark_outline = Color(0xFF8F9285)
+    val outlineLight = Color(0xFF75796C)
-    val md_theme_dark_inverseOnSurface = Color(0xFF1B1C18)
+    val outlineVariantLight = Color(0xFFC5C8BA)
-    val md_theme_dark_inverseSurface = Color(0xFFE4E3DB)
+    val scrimLight = Color(0xFF000000)
-    val md_theme_dark_inversePrimary = Color(0xFF47680F)
+    val inverseSurfaceLight = Color(0xFF2F312A)
-    val md_theme_dark_shadow = Color(0xFF000000)
+    val inverseOnSurfaceLight = Color(0xFFF0F2E6)
-    val md_theme_dark_surfaceTint = Color(0xFFACD370)
+    val inversePrimaryLight = Color(0xFFB1D18A)
-    val md_theme_dark_outlineVariant = Color(0xFF45483D)
+    val surfaceDimLight = Color(0xFFDADBD0)
-    val md_theme_dark_scrim = Color(0xFF000000)
+    val surfaceBrightLight = Color(0xFFF9FAEF)
+    val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+    val surfaceContainerLowLight = Color(0xFFF3F4E9)
+    val surfaceContainerLight = Color(0xFFEEEFE4)
+    val surfaceContainerHighLight = Color(0xFFE8E9DE)
+    val surfaceContainerHighestLight = Color(0xFFE2E3D8)
 
-    val LightColors = lightColorScheme(
+    val primaryLightMediumContrast = Color(0xFF314A12)
-        primary = md_theme_light_primary,
+    val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
-        onPrimary = md_theme_light_onPrimary,
+    val primaryContainerLightMediumContrast = Color(0xFF617D40)
-        primaryContainer = md_theme_light_primaryContainer,
+    val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
-        onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    val secondaryLightMediumContrast = Color(0xFF05466E)
-        secondary = md_theme_light_secondary,
+    val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
-        onSecondary = md_theme_light_onSecondary,
+    val secondaryContainerLightMediumContrast = Color(0xFF4779A4)
-        secondaryContainer = md_theme_light_secondaryContainer,
+    val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
-        onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    val tertiaryLightMediumContrast = Color(0xFF234C1D)
-        tertiary = md_theme_light_tertiary,
+    val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
-        onTertiary = md_theme_light_onTertiary,
+    val tertiaryContainerLightMediumContrast = Color(0xFF547F4B)
-        tertiaryContainer = md_theme_light_tertiaryContainer,
+    val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
-        onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    val errorLightMediumContrast = Color(0xFF8C0009)
-        error = md_theme_light_error,
+    val onErrorLightMediumContrast = Color(0xFFFFFFFF)
-        errorContainer = md_theme_light_errorContainer,
+    val errorContainerLightMediumContrast = Color(0xFFDA342E)
-        onError = md_theme_light_onError,
+    val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
-        onErrorContainer = md_theme_light_onErrorContainer,
+    val backgroundLightMediumContrast = Color(0xFFF9FAEF)
-        background = md_theme_light_background,
+    val onBackgroundLightMediumContrast = Color(0xFF1A1C16)
-        onBackground = md_theme_light_onBackground,
+    val surfaceLightMediumContrast = Color(0xFFF9FAEF)
-        surface = md_theme_light_surface,
+    val onSurfaceLightMediumContrast = Color(0xFF1A1C16)
-        onSurface = md_theme_light_onSurface,
+    val surfaceVariantLightMediumContrast = Color(0xFFE1E4D5)
-        surfaceVariant = md_theme_light_surfaceVariant,
+    val onSurfaceVariantLightMediumContrast = Color(0xFF404439)
-        onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    val outlineLightMediumContrast = Color(0xFF5D6155)
-        outline = md_theme_light_outline,
+    val outlineVariantLightMediumContrast = Color(0xFF787C70)
-        inverseOnSurface = md_theme_light_inverseOnSurface,
+    val scrimLightMediumContrast = Color(0xFF000000)
-        inverseSurface = md_theme_light_inverseSurface,
+    val inverseSurfaceLightMediumContrast = Color(0xFF2F312A)
-        inversePrimary = md_theme_light_inversePrimary,
+    val inverseOnSurfaceLightMediumContrast = Color(0xFFF0F2E6)
-        surfaceTint = md_theme_light_surfaceTint,
+    val inversePrimaryLightMediumContrast = Color(0xFFB1D18A)
-        outlineVariant = md_theme_light_outlineVariant,
+    val surfaceDimLightMediumContrast = Color(0xFFDADBD0)
-        scrim = md_theme_light_scrim,
+    val surfaceBrightLightMediumContrast = Color(0xFFF9FAEF)
+    val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
+    val surfaceContainerLowLightMediumContrast = Color(0xFFF3F4E9)
+    val surfaceContainerLightMediumContrast = Color(0xFFEEEFE4)
+    val surfaceContainerHighLightMediumContrast = Color(0xFFE8E9DE)
+    val surfaceContainerHighestLightMediumContrast = Color(0xFFE2E3D8)
+
+    val primaryLightHighContrast = Color(0xFF142700)
+    val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
+    val primaryContainerLightHighContrast = Color(0xFF314A12)
+    val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
+    val secondaryLightHighContrast = Color(0xFF00243D)
+    val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
+    val secondaryContainerLightHighContrast = Color(0xFF05466E)
+    val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
+    val tertiaryLightHighContrast = Color(0xFF002901)
+    val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
+    val tertiaryContainerLightHighContrast = Color(0xFF234C1D)
+    val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
+    val errorLightHighContrast = Color(0xFF4E0002)
+    val onErrorLightHighContrast = Color(0xFFFFFFFF)
+    val errorContainerLightHighContrast = Color(0xFF8C0009)
+    val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
+    val backgroundLightHighContrast = Color(0xFFF9FAEF)
+    val onBackgroundLightHighContrast = Color(0xFF1A1C16)
+    val surfaceLightHighContrast = Color(0xFFF9FAEF)
+    val onSurfaceLightHighContrast = Color(0xFF000000)
+    val surfaceVariantLightHighContrast = Color(0xFFE1E4D5)
+    val onSurfaceVariantLightHighContrast = Color(0xFF21251C)
+    val outlineLightHighContrast = Color(0xFF404439)
+    val outlineVariantLightHighContrast = Color(0xFF404439)
+    val scrimLightHighContrast = Color(0xFF000000)
+    val inverseSurfaceLightHighContrast = Color(0xFF2F312A)
+    val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
+    val inversePrimaryLightHighContrast = Color(0xFFD6F7AD)
+    val surfaceDimLightHighContrast = Color(0xFFDADBD0)
+    val surfaceBrightLightHighContrast = Color(0xFFF9FAEF)
+    val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
+    val surfaceContainerLowLightHighContrast = Color(0xFFF3F4E9)
+    val surfaceContainerLightHighContrast = Color(0xFFEEEFE4)
+    val surfaceContainerHighLightHighContrast = Color(0xFFE8E9DE)
+    val surfaceContainerHighestLightHighContrast = Color(0xFFE2E3D8)
+
+    val primaryDark = Color(0xFFB1D18A)
+    val onPrimaryDark = Color(0xFF1F3701)
+    val primaryContainerDark = Color(0xFF344E16)
+    val onPrimaryContainerDark = Color(0xFFCCEDA4)
+    val secondaryDark = Color(0xFF9BCBFB)
+    val onSecondaryDark = Color(0xFF003353)
+    val secondaryContainerDark = Color(0xFF0D4A73)
+    val onSecondaryContainerDark = Color(0xFFCEE5FF)
+    val tertiaryDark = Color(0xFFA4D396)
+    val onTertiaryDark = Color(0xFF10380C)
+    val tertiaryContainerDark = Color(0xFF275021)
+    val onTertiaryContainerDark = Color(0xFFBFF0B1)
+    val errorDark = Color(0xFFFFB4AB)
+    val onErrorDark = Color(0xFF690005)
+    val errorContainerDark = Color(0xFF93000A)
+    val onErrorContainerDark = Color(0xFFFFDAD6)
+    val backgroundDark = Color(0xFF12140E)
+    val onBackgroundDark = Color(0xFFE2E3D8)
+    val surfaceDark = Color(0xFF12140E)
+    val onSurfaceDark = Color(0xFFE2E3D8)
+    val surfaceVariantDark = Color(0xFF44483D)
+    val onSurfaceVariantDark = Color(0xFFC5C8BA)
+    val outlineDark = Color(0xFF8E9285)
+    val outlineVariantDark = Color(0xFF44483D)
+    val scrimDark = Color(0xFF000000)
+    val inverseSurfaceDark = Color(0xFFE2E3D8)
+    val inverseOnSurfaceDark = Color(0xFF2F312A)
+    val inversePrimaryDark = Color(0xFF4B662C)
+    val surfaceDimDark = Color(0xFF12140E)
+    val surfaceBrightDark = Color(0xFF383A32)
+    val surfaceContainerLowestDark = Color(0xFF0C0F09)
+    val surfaceContainerLowDark = Color(0xFF1A1C16)
+    val surfaceContainerDark = Color(0xFF1E201A)
+    val surfaceContainerHighDark = Color(0xFF282B24)
+    val surfaceContainerHighestDark = Color(0xFF33362E)
+
+    val primaryDarkMediumContrast = Color(0xFFB5D58E)
+    val onPrimaryDarkMediumContrast = Color(0xFF0C1A00)
+    val primaryContainerDarkMediumContrast = Color(0xFF7C9A59)
+    val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
+    val secondaryDarkMediumContrast = Color(0xFF9FCFFF)
+    val onSecondaryDarkMediumContrast = Color(0xFF00182A)
+    val secondaryContainerDarkMediumContrast = Color(0xFF6595C2)
+    val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
+    val tertiaryDarkMediumContrast = Color(0xFFA8D79A)
+    val onTertiaryDarkMediumContrast = Color(0xFF001C01)
+    val tertiaryContainerDarkMediumContrast = Color(0xFF709C65)
+    val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
+    val errorDarkMediumContrast = Color(0xFFFFBAB1)
+    val onErrorDarkMediumContrast = Color(0xFF370001)
+    val errorContainerDarkMediumContrast = Color(0xFFFF5449)
+    val onErrorContainerDarkMediumContrast = Color(0xFF000000)
+    val backgroundDarkMediumContrast = Color(0xFF12140E)
+    val onBackgroundDarkMediumContrast = Color(0xFFE2E3D8)
+    val surfaceDarkMediumContrast = Color(0xFF12140E)
+    val onSurfaceDarkMediumContrast = Color(0xFFFBFCF0)
+    val surfaceVariantDarkMediumContrast = Color(0xFF44483D)
+    val onSurfaceVariantDarkMediumContrast = Color(0xFFC9CCBE)
+    val outlineDarkMediumContrast = Color(0xFFA1A497)
+    val outlineVariantDarkMediumContrast = Color(0xFF818578)
+    val scrimDarkMediumContrast = Color(0xFF000000)
+    val inverseSurfaceDarkMediumContrast = Color(0xFFE2E3D8)
+    val inverseOnSurfaceDarkMediumContrast = Color(0xFF282B24)
+    val inversePrimaryDarkMediumContrast = Color(0xFF354F17)
+    val surfaceDimDarkMediumContrast = Color(0xFF12140E)
+    val surfaceBrightDarkMediumContrast = Color(0xFF383A32)
+    val surfaceContainerLowestDarkMediumContrast = Color(0xFF0C0F09)
+    val surfaceContainerLowDarkMediumContrast = Color(0xFF1A1C16)
+    val surfaceContainerDarkMediumContrast = Color(0xFF1E201A)
+    val surfaceContainerHighDarkMediumContrast = Color(0xFF282B24)
+    val surfaceContainerHighestDarkMediumContrast = Color(0xFF33362E)
+
+    val primaryDarkHighContrast = Color(0xFFF4FFE0)
+    val onPrimaryDarkHighContrast = Color(0xFF000000)
+    val primaryContainerDarkHighContrast = Color(0xFFB5D58E)
+    val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
+    val secondaryDarkHighContrast = Color(0xFFFAFAFF)
+    val onSecondaryDarkHighContrast = Color(0xFF000000)
+    val secondaryContainerDarkHighContrast = Color(0xFF9FCFFF)
+    val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
+    val tertiaryDarkHighContrast = Color(0xFFF1FFE8)
+    val onTertiaryDarkHighContrast = Color(0xFF000000)
+    val tertiaryContainerDarkHighContrast = Color(0xFFA8D79A)
+    val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
+    val errorDarkHighContrast = Color(0xFFFFF9F9)
+    val onErrorDarkHighContrast = Color(0xFF000000)
+    val errorContainerDarkHighContrast = Color(0xFFFFBAB1)
+    val onErrorContainerDarkHighContrast = Color(0xFF000000)
+    val backgroundDarkHighContrast = Color(0xFF12140E)
+    val onBackgroundDarkHighContrast = Color(0xFFE2E3D8)
+    val surfaceDarkHighContrast = Color(0xFF12140E)
+    val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
+    val surfaceVariantDarkHighContrast = Color(0xFF44483D)
+    val onSurfaceVariantDarkHighContrast = Color(0xFFF9FCED)
+    val outlineDarkHighContrast = Color(0xFFC9CCBE)
+    val outlineVariantDarkHighContrast = Color(0xFFC9CCBE)
+    val scrimDarkHighContrast = Color(0xFF000000)
+    val inverseSurfaceDarkHighContrast = Color(0xFFE2E3D8)
+    val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
+    val inversePrimaryDarkHighContrast = Color(0xFF1A3000)
+    val surfaceDimDarkHighContrast = Color(0xFF12140E)
+    val surfaceBrightDarkHighContrast = Color(0xFF383A32)
+    val surfaceContainerLowestDarkHighContrast = Color(0xFF0C0F09)
+    val surfaceContainerLowDarkHighContrast = Color(0xFF1A1C16)
+    val surfaceContainerDarkHighContrast = Color(0xFF1E201A)
+    val surfaceContainerHighDarkHighContrast = Color(0xFF282B24)
+    val surfaceContainerHighestDarkHighContrast = Color(0xFF33362E)
+
+
+    // copied from Material Theme Builder: Theme.kt
+
+    val lightScheme = lightColorScheme(
+        primary = primaryLight,
+        onPrimary = onPrimaryLight,
+        primaryContainer = primaryContainerLight,
+        onPrimaryContainer = onPrimaryContainerLight,
+        secondary = secondaryLight,
+        onSecondary = onSecondaryLight,
+        secondaryContainer = secondaryContainerLight,
+        onSecondaryContainer = onSecondaryContainerLight,
+        tertiary = tertiaryLight,
+        onTertiary = onTertiaryLight,
+        tertiaryContainer = tertiaryContainerLight,
+        onTertiaryContainer = onTertiaryContainerLight,
+        error = errorLight,
+        onError = onErrorLight,
+        errorContainer = errorContainerLight,
+        onErrorContainer = onErrorContainerLight,
+        background = backgroundLight,
+        onBackground = onBackgroundLight,
+        surface = surfaceLight,
+        onSurface = onSurfaceLight,
+        surfaceVariant = surfaceVariantLight,
+        onSurfaceVariant = onSurfaceVariantLight,
+        outline = outlineLight,
+        outlineVariant = outlineVariantLight,
+        scrim = scrimLight,
+        inverseSurface = inverseSurfaceLight,
+        inverseOnSurface = inverseOnSurfaceLight,
+        inversePrimary = inversePrimaryLight,
+        surfaceDim = surfaceDimLight,
+        surfaceBright = surfaceBrightLight,
+        surfaceContainerLowest = surfaceContainerLowestLight,
+        surfaceContainerLow = surfaceContainerLowLight,
+        surfaceContainer = surfaceContainerLight,
+        surfaceContainerHigh = surfaceContainerHighLight,
+        surfaceContainerHighest = surfaceContainerHighestLight,
     )
 
-    val DarkColors = darkColorScheme(
+    val darkScheme = darkColorScheme(
-        primary = md_theme_dark_primary,
+        primary = primaryDark,
-        onPrimary = md_theme_dark_onPrimary,
+        onPrimary = onPrimaryDark,
-        primaryContainer = md_theme_dark_primaryContainer,
+        primaryContainer = primaryContainerDark,
-        onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+        onPrimaryContainer = onPrimaryContainerDark,
-        secondary = md_theme_dark_secondary,
+        secondary = secondaryDark,
-        onSecondary = md_theme_dark_onSecondary,
+        onSecondary = onSecondaryDark,
-        secondaryContainer = md_theme_dark_secondaryContainer,
+        secondaryContainer = secondaryContainerDark,
-        onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+        onSecondaryContainer = onSecondaryContainerDark,
-        tertiary = md_theme_dark_tertiary,
+        tertiary = tertiaryDark,
-        onTertiary = md_theme_dark_onTertiary,
+        onTertiary = onTertiaryDark,
-        tertiaryContainer = md_theme_dark_tertiaryContainer,
+        tertiaryContainer = tertiaryContainerDark,
-        onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+        onTertiaryContainer = onTertiaryContainerDark,
-        error = md_theme_dark_error,
+        error = errorDark,
-        errorContainer = md_theme_dark_errorContainer,
+        onError = onErrorDark,
-        onError = md_theme_dark_onError,
+        errorContainer = errorContainerDark,
-        onErrorContainer = md_theme_dark_onErrorContainer,
+        onErrorContainer = onErrorContainerDark,
-        background = md_theme_dark_background,
+        background = backgroundDark,
-        onBackground = md_theme_dark_onBackground,
+        onBackground = onBackgroundDark,
-        surface = md_theme_dark_surface,
+        surface = surfaceDark,
-        onSurface = md_theme_dark_onSurface,
+        onSurface = onSurfaceDark,
-        surfaceVariant = md_theme_dark_surfaceVariant,
+        surfaceVariant = surfaceVariantDark,
-        onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+        onSurfaceVariant = onSurfaceVariantDark,
-        outline = md_theme_dark_outline,
+        outline = outlineDark,
-        inverseOnSurface = md_theme_dark_inverseOnSurface,
+        outlineVariant = outlineVariantDark,
-        inverseSurface = md_theme_dark_inverseSurface,
+        scrim = scrimDark,
-        inversePrimary = md_theme_dark_inversePrimary,
+        inverseSurface = inverseSurfaceDark,
-        surfaceTint = md_theme_dark_surfaceTint,
+        inverseOnSurface = inverseOnSurfaceDark,
-        outlineVariant = md_theme_dark_outlineVariant,
+        inversePrimary = inversePrimaryDark,
-        scrim = md_theme_dark_scrim,
+        surfaceDim = surfaceDimDark,
+        surfaceBright = surfaceBrightDark,
+        surfaceContainerLowest = surfaceContainerLowestDark,
+        surfaceContainerLow = surfaceContainerLowDark,
+        surfaceContainer = surfaceContainerDark,
+        surfaceContainerHigh = surfaceContainerHighDark,
+        surfaceContainerHighest = surfaceContainerHighestDark,
+    )
+
+    val mediumContrastLightColorScheme = lightColorScheme(
+        primary = primaryLightMediumContrast,
+        onPrimary = onPrimaryLightMediumContrast,
+        primaryContainer = primaryContainerLightMediumContrast,
+        onPrimaryContainer = onPrimaryContainerLightMediumContrast,
+        secondary = secondaryLightMediumContrast,
+        onSecondary = onSecondaryLightMediumContrast,
+        secondaryContainer = secondaryContainerLightMediumContrast,
+        onSecondaryContainer = onSecondaryContainerLightMediumContrast,
+        tertiary = tertiaryLightMediumContrast,
+        onTertiary = onTertiaryLightMediumContrast,
+        tertiaryContainer = tertiaryContainerLightMediumContrast,
+        onTertiaryContainer = onTertiaryContainerLightMediumContrast,
+        error = errorLightMediumContrast,
+        onError = onErrorLightMediumContrast,
+        errorContainer = errorContainerLightMediumContrast,
+        onErrorContainer = onErrorContainerLightMediumContrast,
+        background = backgroundLightMediumContrast,
+        onBackground = onBackgroundLightMediumContrast,
+        surface = surfaceLightMediumContrast,
+        onSurface = onSurfaceLightMediumContrast,
+        surfaceVariant = surfaceVariantLightMediumContrast,
+        onSurfaceVariant = onSurfaceVariantLightMediumContrast,
+        outline = outlineLightMediumContrast,
+        outlineVariant = outlineVariantLightMediumContrast,
+        scrim = scrimLightMediumContrast,
+        inverseSurface = inverseSurfaceLightMediumContrast,
+        inverseOnSurface = inverseOnSurfaceLightMediumContrast,
+        inversePrimary = inversePrimaryLightMediumContrast,
+        surfaceDim = surfaceDimLightMediumContrast,
+        surfaceBright = surfaceBrightLightMediumContrast,
+        surfaceContainerLowest = surfaceContainerLowestLightMediumContrast,
+        surfaceContainerLow = surfaceContainerLowLightMediumContrast,
+        surfaceContainer = surfaceContainerLightMediumContrast,
+        surfaceContainerHigh = surfaceContainerHighLightMediumContrast,
+        surfaceContainerHighest = surfaceContainerHighestLightMediumContrast,
+    )
+
+    val highContrastLightColorScheme = lightColorScheme(
+        primary = primaryLightHighContrast,
+        onPrimary = onPrimaryLightHighContrast,
+        primaryContainer = primaryContainerLightHighContrast,
+        onPrimaryContainer = onPrimaryContainerLightHighContrast,
+        secondary = secondaryLightHighContrast,
+        onSecondary = onSecondaryLightHighContrast,
+        secondaryContainer = secondaryContainerLightHighContrast,
+        onSecondaryContainer = onSecondaryContainerLightHighContrast,
+        tertiary = tertiaryLightHighContrast,
+        onTertiary = onTertiaryLightHighContrast,
+        tertiaryContainer = tertiaryContainerLightHighContrast,
+        onTertiaryContainer = onTertiaryContainerLightHighContrast,
+        error = errorLightHighContrast,
+        onError = onErrorLightHighContrast,
+        errorContainer = errorContainerLightHighContrast,
+        onErrorContainer = onErrorContainerLightHighContrast,
+        background = backgroundLightHighContrast,
+        onBackground = onBackgroundLightHighContrast,
+        surface = surfaceLightHighContrast,
+        onSurface = onSurfaceLightHighContrast,
+        surfaceVariant = surfaceVariantLightHighContrast,
+        onSurfaceVariant = onSurfaceVariantLightHighContrast,
+        outline = outlineLightHighContrast,
+        outlineVariant = outlineVariantLightHighContrast,
+        scrim = scrimLightHighContrast,
+        inverseSurface = inverseSurfaceLightHighContrast,
+        inverseOnSurface = inverseOnSurfaceLightHighContrast,
+        inversePrimary = inversePrimaryLightHighContrast,
+        surfaceDim = surfaceDimLightHighContrast,
+        surfaceBright = surfaceBrightLightHighContrast,
+        surfaceContainerLowest = surfaceContainerLowestLightHighContrast,
+        surfaceContainerLow = surfaceContainerLowLightHighContrast,
+        surfaceContainer = surfaceContainerLightHighContrast,
+        surfaceContainerHigh = surfaceContainerHighLightHighContrast,
+        surfaceContainerHighest = surfaceContainerHighestLightHighContrast,
+    )
+
+    val mediumContrastDarkColorScheme = darkColorScheme(
+        primary = primaryDarkMediumContrast,
+        onPrimary = onPrimaryDarkMediumContrast,
+        primaryContainer = primaryContainerDarkMediumContrast,
+        onPrimaryContainer = onPrimaryContainerDarkMediumContrast,
+        secondary = secondaryDarkMediumContrast,
+        onSecondary = onSecondaryDarkMediumContrast,
+        secondaryContainer = secondaryContainerDarkMediumContrast,
+        onSecondaryContainer = onSecondaryContainerDarkMediumContrast,
+        tertiary = tertiaryDarkMediumContrast,
+        onTertiary = onTertiaryDarkMediumContrast,
+        tertiaryContainer = tertiaryContainerDarkMediumContrast,
+        onTertiaryContainer = onTertiaryContainerDarkMediumContrast,
+        error = errorDarkMediumContrast,
+        onError = onErrorDarkMediumContrast,
+        errorContainer = errorContainerDarkMediumContrast,
+        onErrorContainer = onErrorContainerDarkMediumContrast,
+        background = backgroundDarkMediumContrast,
+        onBackground = onBackgroundDarkMediumContrast,
+        surface = surfaceDarkMediumContrast,
+        onSurface = onSurfaceDarkMediumContrast,
+        surfaceVariant = surfaceVariantDarkMediumContrast,
+        onSurfaceVariant = onSurfaceVariantDarkMediumContrast,
+        outline = outlineDarkMediumContrast,
+        outlineVariant = outlineVariantDarkMediumContrast,
+        scrim = scrimDarkMediumContrast,
+        inverseSurface = inverseSurfaceDarkMediumContrast,
+        inverseOnSurface = inverseOnSurfaceDarkMediumContrast,
+        inversePrimary = inversePrimaryDarkMediumContrast,
+        surfaceDim = surfaceDimDarkMediumContrast,
+        surfaceBright = surfaceBrightDarkMediumContrast,
+        surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast,
+        surfaceContainerLow = surfaceContainerLowDarkMediumContrast,
+        surfaceContainer = surfaceContainerDarkMediumContrast,
+        surfaceContainerHigh = surfaceContainerHighDarkMediumContrast,
+        surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast,
+    )
+
+    val highContrastDarkColorScheme = darkColorScheme(
+        primary = primaryDarkHighContrast,
+        onPrimary = onPrimaryDarkHighContrast,
+        primaryContainer = primaryContainerDarkHighContrast,
+        onPrimaryContainer = onPrimaryContainerDarkHighContrast,
+        secondary = secondaryDarkHighContrast,
+        onSecondary = onSecondaryDarkHighContrast,
+        secondaryContainer = secondaryContainerDarkHighContrast,
+        onSecondaryContainer = onSecondaryContainerDarkHighContrast,
+        tertiary = tertiaryDarkHighContrast,
+        onTertiary = onTertiaryDarkHighContrast,
+        tertiaryContainer = tertiaryContainerDarkHighContrast,
+        onTertiaryContainer = onTertiaryContainerDarkHighContrast,
+        error = errorDarkHighContrast,
+        onError = onErrorDarkHighContrast,
+        errorContainer = errorContainerDarkHighContrast,
+        onErrorContainer = onErrorContainerDarkHighContrast,
+        background = backgroundDarkHighContrast,
+        onBackground = onBackgroundDarkHighContrast,
+        surface = surfaceDarkHighContrast,
+        onSurface = onSurfaceDarkHighContrast,
+        surfaceVariant = surfaceVariantDarkHighContrast,
+        onSurfaceVariant = onSurfaceVariantDarkHighContrast,
+        outline = outlineDarkHighContrast,
+        outlineVariant = outlineVariantDarkHighContrast,
+        scrim = scrimDarkHighContrast,
+        inverseSurface = inverseSurfaceDarkHighContrast,
+        inverseOnSurface = inverseOnSurfaceDarkHighContrast,
+        inversePrimary = inversePrimaryDarkHighContrast,
+        surfaceDim = surfaceDimDarkHighContrast,
+        surfaceBright = surfaceBrightDarkHighContrast,
+        surfaceContainerLowest = surfaceContainerLowestDarkHighContrast,
+        surfaceContainerLow = surfaceContainerLowDarkHighContrast,
+        surfaceContainer = surfaceContainerDarkHighContrast,
+        surfaceContainerHigh = surfaceContainerHighDarkHighContrast,
+        surfaceContainerHighest = surfaceContainerHighestDarkHighContrast,
+    )
+
+    @Immutable
+    data class ColorFamily(
+        val color: Color,
+        val onColor: Color,
+        val colorContainer: Color,
+        val onColorContainer: Color
     )
 
 }