diff --git a/app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt b/app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt
index d02d92b..48cf200 100644
--- a/app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt
+++ b/app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt
@@ -16,20 +16,7 @@ import fr.openium.consentium.R
 import fr.openium.consentium.api.Consentium
 import fr.openium.consentium.ui.screens.main.MainScreen
 import fr.openium.consentium.ui.screens.splash.SplashScreen
-import fr.openium.consentium.ui.theme.Error
-import fr.openium.consentium.ui.theme.OnPrimary
-import fr.openium.consentium.ui.theme.OnSecondary
-import fr.openium.consentium.ui.theme.OnSurface
-import fr.openium.consentium.ui.theme.OnSurfaceVariant
-import fr.openium.consentium.ui.theme.Primary
-import fr.openium.consentium.ui.theme.Secondary
-import fr.openium.consentium.ui.theme.Success
-import fr.openium.consentium.ui.theme.SurfaceHigh
-import fr.openium.consentium.ui.theme.SurfaceHighest
-import fr.openium.consentium.ui.theme.SurfaceMiddle
-import fr.openium.consentium.ui.theme.Tertiary
 import fr.openium.consentium_ui.ui.components.ConsentiumComponent
-import fr.openium.consentium_ui.ui.components.style.ConsentiumDefaults
 import fr.openium.consentium_ui.ui.model.ConsentiumPageUI
 
 private const val NAV_ANIMATION_TIME = 500
@@ -159,20 +146,6 @@ fun DemoNavGraph(navHostController: NavHostController) {
                     context = context,
                     apiKey = apiKey,
                     appId = appId,
-                ),
-                colors = ConsentiumDefaults.colors(
-                    primary = Primary,
-                    onPrimary = OnPrimary,
-                    secondary = Secondary,
-                    onSecondary = OnSecondary,
-                    tertiary = Tertiary,
-                    onSurfaceVariant = OnSurfaceVariant,
-                    onSurface = OnSurface,
-                    error = Error,
-                    surfaceHighest = SurfaceHighest,
-                    surfaceHigh = SurfaceHigh,
-                    surfaceMiddle = SurfaceMiddle,
-                    success = Success,
                 )
             )
         }
diff --git a/app/src/main/java/fr/openium/consentium/ui/screens/main/MainScreen.kt b/app/src/main/java/fr/openium/consentium/ui/screens/main/MainScreen.kt
index 1879e5e..0c67189 100644
--- a/app/src/main/java/fr/openium/consentium/ui/screens/main/MainScreen.kt
+++ b/app/src/main/java/fr/openium/consentium/ui/screens/main/MainScreen.kt
@@ -18,7 +18,6 @@ fun MainScreen(
     onGoToConsentDetail: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-
     // View
     Column(
         modifier = modifier.fillMaxSize(),
diff --git a/app/src/main/java/fr/openium/consentium/ui/theme/Theme.kt b/app/src/main/java/fr/openium/consentium/ui/theme/Theme.kt
index 001768d..e26d36d 100644
--- a/app/src/main/java/fr/openium/consentium/ui/theme/Theme.kt
+++ b/app/src/main/java/fr/openium/consentium/ui/theme/Theme.kt
@@ -8,14 +8,38 @@ import androidx.compose.runtime.Composable
 
 private val DarkColorScheme = darkColorScheme(
     primary = Primary,
+    onPrimary = OnPrimary,
+
     secondary = Secondary,
-    tertiary = Tertiary
+    onSecondary = OnSecondary,
+
+    tertiary = Tertiary,
+
+    onSurfaceVariant = OnSurfaceVariant,
+    onSurface = OnSurface,
+
+    error = Error,
+    surfaceContainerHighest = SurfaceHighest,
+    surfaceContainerHigh = SurfaceHigh,
+    surfaceContainer = SurfaceMiddle,
 )
 
 private val LightColorScheme = lightColorScheme(
     primary = Primary,
+    onPrimary = OnPrimary,
+
     secondary = Secondary,
-    tertiary = Tertiary
+    onSecondary = OnSecondary,
+
+    tertiary = Tertiary,
+
+    onSurfaceVariant = OnSurfaceVariant,
+    onSurface = OnSurface,
+
+    error = Error,
+    surfaceContainerHighest = SurfaceHighest,
+    surfaceContainerHigh = SurfaceHigh,
+    surfaceContainer = SurfaceMiddle,
 )
 
 @Composable
diff --git a/consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt b/consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt
index 854d364..78dd56d 100644
--- a/consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt
+++ b/consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt
@@ -92,7 +92,7 @@ object ConsentiumDefaults {
     fun colors(
         primary: Color = MaterialTheme.colorScheme.primary,
         onPrimary: Color = MaterialTheme.colorScheme.onPrimary,
-        secondary: Color = MaterialTheme.colorScheme.background,
+        secondary: Color = MaterialTheme.colorScheme.secondary,
         onSecondary: Color = MaterialTheme.colorScheme.surfaceVariant,
         tertiary: Color = MaterialTheme.colorScheme.onBackground,
         onSurfaceVariant: Color = MaterialTheme.colorScheme.onBackground,