diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
index 2da707b94..e2faa05cd 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
@@ -26,32 +26,6 @@ import com.adevinta.spark.tokens.SparkColors
 import com.adevinta.spark.tokens.darkSparkColors
 import com.adevinta.spark.tokens.lightSparkColors
 
-// region Clementin colors
-private val Clementin900 = Color(0xFF2F1305)
-private val Clementin800 = Color(0xFF5C250A)
-private val Clementin700 = Color(0xFF89380F)
-private val Clementin600 = Color(0xFFB84A14)
-private val Clementin500 = Color(0xFFEC5A13)
-private val Clementin400 = Color(0xFFF07B42)
-private val Clementin300 = Color(0xFFF49D71)
-private val Clementin200 = Color(0xFFF7BEA1)
-private val Clementin100 = Color(0xFFFFE9DE)
-private val Clementin50 = Color(0xFFFFF2EB)
-// endregion
-
-// region Plum colors
-private val Plum900 = Color(0xFF1B052E)
-private val Plum800 = Color(0xFF360F57)
-private val Plum700 = Color(0xFF501782)
-private val Plum600 = Color(0xFF6B1FAD)
-private val Plum500 = Color(0xFF8526D9)
-private val Plum400 = Color(0xFF9F47EB)
-private val Plum300 = Color(0xFFB775F0)
-private val Plum200 = Color(0xFFCFA3F5)
-private val Plum100 = Color(0xFFE9D6FA)
-private val Plum50 = Color(0xFFF5EDFD)
-// endregion
-
 // region Blueberry colors
 private val Blueberry1000 = Color(0xFF010509)
 private val Blueberry900 = Color(0xFF152233)
@@ -66,287 +40,20 @@ private val Blueberry100 = Color(0xFFE6F2FD)
 private val Blueberry50 = Color(0xFFF4F9FE)
 // endregion
 
-// region Avocado colors
-private val Avocado900 = Color(0xFF101E10)
-private val Avocado800 = Color(0xFF1F3D20)
-private val Avocado700 = Color(0xFF2F5B30)
-private val Avocado600 = Color(0xFF3E7A40)
-private val Avocado500 = Color(0xFF4E9850)
-private val Avocado400 = Color(0xFF71AD73)
-private val Avocado300 = Color(0xFF95C196)
-private val Avocado200 = Color(0xFFB8D6B9)
-private val Avocado100 = Color(0xFFDCEADC)
-private val Avocado50 = Color(0xFFEDF5EE)
-// endregion
-
-// region Cherry colors
-private val Cherry900 = Color(0xFF2B0B08)
-private val Cherry800 = Color(0xFF57150F)
-private val Cherry700 = Color(0xFF822017)
-private val Cherry600 = Color(0xFFAD291F)
-private val Cherry500 = Color(0xFFD93426)
-private val Cherry400 = Color(0xFFE05D52)
-private val Cherry300 = Color(0xFFE8867D)
-private val Cherry200 = Color(0xFFF0AEA8)
-private val Cherry100 = Color(0xFFF7D7D4)
-private val Cherry50 = Color(0xFFFBECEB)
-// endregion
-
-// region Banana colors
-private val Banana900 = Color(0xFF332200)
-private val Banana800 = Color(0xFF664400)
-private val Banana700 = Color(0xFF996600)
-private val Banana600 = Color(0xFFCC8800)
-private val Banana500 = Color(0xFFFFAA00)
-private val Banana400 = Color(0xFFFFBB33)
-private val Banana300 = Color(0xFFFFCC66)
-private val Banana200 = Color(0xFFFFDD99)
-private val Banana100 = Color(0xFFFFEECC)
-private val Banana50 = Color(0xFFFFF6E5)
-// endregion
-
-// region NightShade colors
-private val NightShade1000 = Color(0xFF13171D)
-private val NightShade900 = Color(0xFF202730)
-private val NightShade800 = Color(0xFF2B3441)
-private val NightShade700 = Color(0xFF3A4757)
-private val NightShade600 = Color(0xFF4F6076)
-private val NightShade500 = Color(0xFF6C819D)
-private val NightShade400 = Color(0xFFACB8C7)
-private val NightShade300 = Color(0xFFD0D7DF)
-private val NightShade200 = Color(0xFFE4E8ED)
-private val NightShade100 = Color(0xFFF0F2F5)
-private val NightShade50 = Color(0xFFF6F8F9)
-// endregion
-
-internal val LeboncoinColorPartLight: SparkColors = lightSparkColors(
-    accent = Plum500,
-    onAccent = Color.White,
-    accentContainer = Plum100,
-    onAccentContainer = Plum800,
-    accentVariant = Plum700,
-    onAccentVariant = Color.White,
-    basic = Blueberry800,
-    onBasic = Color.White,
-    basicContainer = Blueberry100,
-    onBasicContainer = Blueberry900,
-    main = Clementin500,
-    onMain = Color.White,
-    mainContainer = Clementin100,
-    onMainContainer = Clementin700,
-    mainVariant = Clementin600,
-    onMainVariant = Color.White,
-    support = Blueberry800,
-    onSupport = Color.White,
-    supportContainer = Blueberry100,
-    onSupportContainer = Blueberry900,
-    supportVariant = Blueberry700,
-    onSupportVariant = Color.White,
-    success = Avocado600,
-    onSuccess = Color.White,
-    successContainer = Avocado100,
-    onSuccessContainer = Avocado700,
-    alert = Banana500,
-    onAlert = NightShade900,
-    alertContainer = Banana100,
-    onAlertContainer = Banana700,
-    error = Cherry500,
-    onError = Color.White,
-    errorContainer = Cherry100,
-    onErrorContainer = Cherry700,
-    info = Blueberry500,
-    onInfo = Color.White,
-    infoContainer = Blueberry200,
-    onInfoContainer = Blueberry700,
-    neutral = NightShade600,
-    onNeutral = Color.White,
-    neutralContainer = NightShade100,
-    onNeutralContainer = NightShade700,
-    background = Color.White,
-    onBackground = Blueberry900,
-    backgroundVariant = Blueberry50,
-    onBackgroundVariant = Blueberry900,
-    surface = Color.White,
-    onSurface = Blueberry900,
-    surfaceInverse = NightShade800,
-    onSurfaceInverse = Color.White,
-    outline = NightShade400,
-    outlineHigh = NightShade900,
-)
-
 internal val LeboncoinColorProLight: SparkColors = lightSparkColors(
-    accent = Plum500,
-    onAccent = Color.White,
-    accentContainer = Plum100,
-    onAccentContainer = Plum800,
-    accentVariant = Plum700,
-    onAccentVariant = Color.White,
-    basic = Blueberry800,
-    onBasic = Color.White,
-    basicContainer = Blueberry100,
-    onBasicContainer = Blueberry900,
     main = Blueberry600,
     onMain = Color.White,
     mainContainer = Blueberry100,
     onMainContainer = Blueberry700,
     mainVariant = Blueberry700,
     onMainVariant = Color.White,
-    support = Blueberry800,
-    onSupport = Color.White,
-    supportContainer = Blueberry100,
-    onSupportContainer = Blueberry900,
-    supportVariant = Blueberry700,
-    onSupportVariant = Color.White,
-    success = Avocado600,
-    onSuccess = Color.White,
-    successContainer = Avocado100,
-    onSuccessContainer = Avocado700,
-    alert = Banana500,
-    onAlert = NightShade900,
-    alertContainer = Banana100,
-    onAlertContainer = Banana700,
-    error = Cherry500,
-    onError = Color.White,
-    errorContainer = Cherry100,
-    onErrorContainer = Cherry700,
-    info = Blueberry500,
-    onInfo = Color.White,
-    infoContainer = Blueberry200,
-    onInfoContainer = Blueberry700,
-    neutral = NightShade600,
-    onNeutral = Color.White,
-    neutralContainer = NightShade100,
-    onNeutralContainer = NightShade700,
-    background = Color.White,
-    onBackground = Blueberry900,
-    backgroundVariant = Blueberry50,
-    onBackgroundVariant = Blueberry900,
-    surface = Color.White,
-    onSurface = Blueberry900,
-    surfaceInverse = NightShade800,
-    onSurfaceInverse = Color.White,
-    outline = NightShade400,
-    outlineHigh = NightShade900,
-)
-
-internal val LeboncoinColorPartDark: SparkColors = darkSparkColors(
-    accent = Plum200,
-    onAccent = Plum900,
-    accentContainer = Plum700,
-    onAccentContainer = Plum50,
-    accentVariant = Plum300,
-    onAccentVariant = Plum900,
-    basic = Blueberry200,
-    onBasic = Blueberry900,
-    basicContainer = Blueberry800,
-    onBasicContainer = Blueberry50,
-    main = Clementin400,
-    onMain = Clementin900,
-    mainContainer = Clementin700,
-    onMainContainer = Clementin50,
-    mainVariant = Clementin300,
-    onMainVariant = Clementin900,
-    support = Blueberry200,
-    onSupport = Blueberry900,
-    supportContainer = Blueberry800,
-    onSupportContainer = Blueberry50,
-    supportVariant = Blueberry100,
-    onSupportVariant = Blueberry900,
-    success = Avocado300,
-    onSuccess = Avocado900,
-    successContainer = Avocado700,
-    onSuccessContainer = Avocado50,
-    alert = Banana300,
-    onAlert = Banana900,
-    alertContainer = Banana800,
-    onAlertContainer = Banana50,
-    error = Cherry300,
-    onError = Cherry900,
-    errorContainer = Cherry700,
-    onErrorContainer = Cherry50,
-    info = Blueberry300,
-    onInfo = Blueberry900,
-    infoContainer = Blueberry700,
-    onInfoContainer = Blueberry50,
-    neutral = NightShade400,
-    onNeutral = NightShade900,
-    neutralContainer = NightShade700,
-    onNeutralContainer = NightShade50,
-    background = NightShade900,
-    onBackground = NightShade50,
-    backgroundVariant = NightShade1000,
-    onBackgroundVariant = NightShade50,
-    surface = NightShade900,
-    onSurface = NightShade50,
-    surfaceInverse = NightShade50,
-    onSurfaceInverse = NightShade800,
-    surfaceTint = Color.White,
-    outline = NightShade600,
-    outlineHigh = NightShade100,
-    dimContent1 = .72f,
-    dimContent2 = .56f,
-    dimContent3 = .40f,
-    dimContent4 = .16f,
-    dimContent5 = .08f,
 )
 
 internal val LeboncoinColorProDark: SparkColors = darkSparkColors(
-    accent = Plum200,
-    onAccent = Plum900,
-    accentContainer = Plum700,
-    onAccentContainer = Plum50,
-    accentVariant = Plum300,
-    onAccentVariant = Plum900,
-    basic = Blueberry200,
-    onBasic = Blueberry900,
-    basicContainer = Blueberry800,
-    onBasicContainer = Blueberry50,
     main = Blueberry400,
     onMain = Blueberry900,
     mainContainer = Blueberry800,
     onMainContainer = Blueberry50,
     mainVariant = Blueberry300,
     onMainVariant = Blueberry900,
-    support = Blueberry200,
-    onSupport = Blueberry900,
-    supportContainer = Blueberry800,
-    onSupportContainer = Blueberry50,
-    supportVariant = Blueberry100,
-    onSupportVariant = Blueberry900,
-    success = Avocado300,
-    onSuccess = Avocado900,
-    successContainer = Avocado700,
-    onSuccessContainer = Avocado50,
-    alert = Banana300,
-    onAlert = Banana900,
-    alertContainer = Banana800,
-    onAlertContainer = Banana50,
-    error = Cherry300,
-    onError = Cherry900,
-    errorContainer = Cherry700,
-    onErrorContainer = Cherry50,
-    info = Blueberry300,
-    onInfo = Blueberry900,
-    infoContainer = Blueberry700,
-    onInfoContainer = Blueberry50,
-    neutral = NightShade400,
-    onNeutral = NightShade900,
-    neutralContainer = NightShade700,
-    onNeutralContainer = NightShade50,
-    background = NightShade900,
-    onBackground = NightShade50,
-    backgroundVariant = NightShade1000,
-    onBackgroundVariant = NightShade50,
-    surface = NightShade900,
-    onSurface = NightShade50,
-    surfaceInverse = NightShade50,
-    onSurfaceInverse = NightShade800,
-    surfaceTint = Color.White,
-    outline = NightShade600,
-    outlineHigh = NightShade100,
-    dimContent1 = .72f,
-    dimContent2 = .56f,
-    dimContent3 = .40f,
-    dimContent4 = .16f,
-    dimContent5 = .08f,
 )
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Shape.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Shape.kt
index 0be8194c9..e4d632549 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Shape.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Shape.kt
@@ -21,17 +21,6 @@
  */
 package com.adevinta.spark.catalog.themes.themeprovider.leboncoin
 
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.ui.unit.dp
 import com.adevinta.spark.tokens.sparkShapes
 
-internal val LeboncoinShapes = sparkShapes(
-    none = RoundedCornerShape(0.dp),
-    extraSmall = RoundedCornerShape(4.0.dp),
-    small = RoundedCornerShape(8.0.dp),
-    medium = RoundedCornerShape(12.0.dp),
-    large = RoundedCornerShape(16.0.dp),
-    extraLarge = RoundedCornerShape(28.0.dp),
-    full = CircleShape,
-)
+internal val LeboncoinShapes = sparkShapes()
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Typography.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Typography.kt
index 9e881f271..615b09250 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Typography.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Typography.kt
@@ -21,125 +21,7 @@
  */
 package com.adevinta.spark.catalog.themes.themeprovider.leboncoin
 
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
 import com.adevinta.spark.tokens.SparkTypography
 import com.adevinta.spark.tokens.sparkTypography
 
-private val display1Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 40.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 56.sp,
-)
-
-private val display2Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 32.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 44.sp,
-)
-
-private val display3Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 24.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 32.sp,
-)
-
-private val headline1Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 20.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 28.sp,
-)
-
-private val headline2Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 18.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 24.sp,
-)
-
-private val subheadType = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 16.sp,
-    fontWeight = FontWeight.Bold,
-    lineHeight = 24.sp,
-)
-
-private val body1Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 16.sp,
-    fontWeight = FontWeight.Normal,
-    lineHeight = 24.sp,
-)
-
-private val body2Type = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 14.sp,
-    fontWeight = FontWeight.Normal,
-    lineHeight = 20.sp,
-)
-
-private val captionType = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 12.sp,
-    fontWeight = FontWeight.Normal,
-    lineHeight = 16.sp,
-)
-
-private val smallType = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 10.sp,
-    fontWeight = FontWeight.Normal,
-    lineHeight = 10.sp,
-)
-
-private val calloutType = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontSize = 14.sp,
-    fontWeight = FontWeight.Bold,
-)
-
-internal val LeboncoinTypo: SparkTypography = sparkTypography(
-    display1 = display1Type,
-    display2 = display2Type,
-    display3 = display3Type,
-    headline1 = headline1Type,
-    headline2 = headline2Type,
-    subhead = subheadType,
-    body1 = body1Type,
-    body2 = body2Type,
-    caption = captionType,
-    small = smallType,
-    callout = calloutType,
-)
-
-public fun brandTypography(
-    display1: TextStyle = display1Type,
-    display2: TextStyle = display2Type,
-    display3: TextStyle = display3Type,
-    headline1: TextStyle = headline1Type,
-    headline2: TextStyle = headline2Type,
-    subhead: TextStyle = subheadType,
-    body1: TextStyle = body1Type,
-    body2: TextStyle = body2Type,
-    caption: TextStyle = captionType,
-    small: TextStyle = smallType,
-    callout: TextStyle = calloutType,
-): SparkTypography = sparkTypography(
-    display1 = display1,
-    display2 = display2,
-    display3 = display3,
-    headline1 = headline1,
-    headline2 = headline2,
-    subhead = subhead,
-    body1 = body1,
-    body2 = body2,
-    caption = caption,
-    small = small,
-    callout = callout,
-)
+internal val LeboncoinTypo: SparkTypography = sparkTypography()
diff --git a/spark-screenshot-testing/src/test/kotlin/com/adevinta/spark/PaparazziUtils.kt b/spark-screenshot-testing/src/test/kotlin/com/adevinta/spark/PaparazziUtils.kt
index 87159e607..d6a3ca020 100644
--- a/spark-screenshot-testing/src/test/kotlin/com/adevinta/spark/PaparazziUtils.kt
+++ b/spark-screenshot-testing/src/test/kotlin/com/adevinta/spark/PaparazziUtils.kt
@@ -26,8 +26,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
@@ -114,8 +112,23 @@ internal fun Paparazzi.sparkSnapshotNightMode(
     drawBackground: Boolean = true,
     composable: @Composable () -> Unit,
 ) {
+    var lightTextThrowable: Throwable? = null
     ThemeVariant.entries.forEach {
-        sparkSnapshot(name.orEmpty() + "_${it.name}", drawBackground, it == ThemeVariant.Dark, composable)
+        try {
+            sparkSnapshot(
+                name = name.orEmpty() + "_${it.name}",
+                drawBackground = drawBackground,
+                isDark = it == ThemeVariant.Dark,
+                composable = composable,
+            )
+        } catch (e: Throwable) {
+            // Prioritize the light exception over the dark one since we will still get the paparazzi delta image
+            // for the dark one
+            if (it == ThemeVariant.Dark) throw lightTextThrowable ?: e
+
+            // Skip light exception otherwise we loose the information that also the dark one has failed.
+            lightTextThrowable = e
+        }
     }
 }
 
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_disabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_disabled.png
index 295f27b60..2f7cc6cc8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_disabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50f61849d4d27deccf23438326dd27a803625410ef0d90f69704f11571f1e671
-size 151013
+oid sha256:5fc8a434c3559c172be4d5330ca289692f8f6cd9fd12dc8cf7f99361bd935222
+size 151423
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_enabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_enabled.png
index 4a650ecdb..1d3c49cc5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_enabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconButtonScreenshot_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d8d9d8063bc4d4e33b1d4c3d818bf5e5439fcd3521bf5eb1fe908c8dbdba055
-size 161748
+oid sha256:140b0b47f45bda41b92edf7733381ee5accedf680b802f50787eebe0c9b5977e
+size 161984
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_disabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_disabled.png
index 67fbbe3ee..ea3606bf4 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_disabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2112e7a9dcaa7201428a545457b2421e069cce61bed9a411bec5b587c9e7f98
-size 315415
+oid sha256:df935a6a9ea16a67c0674b6e5b811afc06f51398c974152c5272b32fe0b00876
+size 315938
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_enabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_enabled.png
index eed77c9a9..b86b71c96 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_enabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.iconbutton_IconToggleButtonScreenshot_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cca96717dcb621f526189e4fc9adaf5827dc6096e23192ab760bed71ddb2243
-size 333770
+oid sha256:eacf799a6d3604bfce0512b48a2feb53f632baa07827c867908962cb122397e1
+size 333927
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerColumnScreenshot_themesProgressTrackerColumns__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerColumnScreenshot_themesProgressTrackerColumns__dark.png
index 56b20c9ee..4609a714d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerColumnScreenshot_themesProgressTrackerColumns__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerColumnScreenshot_themesProgressTrackerColumns__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9794a1f116dbf4378bae2d9cf937dadc79cf2cb79c0764c6521c505f2817ddb
-size 194946
+oid sha256:a37caf39c700d1ad7df659af2c15241253886fac1966f5afce880cf21c7b09b0
+size 198308
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressColumnShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressColumnShowcase__dark.png
index bb7cbe5f3..ee17a3f03 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressColumnShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressColumnShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4f230f8d92e2906940fa29b461b879147f2094ae3a8b6c10164c484bd560619
-size 176647
+oid sha256:b442e6ff872921170b2065c4890a4c9f9115abc3d010215f79c1589d2a271d95
+size 178827
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressRowShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressRowShowcase__dark.png
index 099b1635a..7536ffd53 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressRowShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerDocScreenshot_progressRowShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a78249c7d2ea187b9587f3b72406dc4c0b97c1185f141d10df697ccf315d59fa
-size 47351
+oid sha256:ca399772163f5fef4abcdc6e0164638cc3a497553b384a6ce84f856ec567cf2d
+size 48355
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__dark.png
index a3745f5f8..e51c0cd79 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d231c3b5aad0f3a2f6d1c1887da5576934d0f3098d41ae200f493af520a49e5
-size 352706
+oid sha256:52a867f3141cd57abbca7b6e1f9d12fdb99609b7fc97ddf728a94615e0813a24
+size 355841
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__light.png
index b08c469ce..3cdca4a94 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress.tracker_ProgressTrackerScreenshot_themesProgressTrackerRows__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3096071633fe8b1d15ab57e7922ac590a60a77dcf91a63c40347ef5b950bb419
-size 333804
+oid sha256:c6831407caabf2c4a0e9ff9e7502b243bbd58c6050adede739cf7f1184172b96
+size 334215
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_normal.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_normal.png
index f9616b5a2..9ad5b4aa1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_normal.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_normal.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:728dba856cfb07c12c2bf9da9c809c39d847f450b5d083985498eb6071e72e58
-size 4791
+oid sha256:06084d030626780a155dfd3dba123da5e5366d5d381d3bd285cd170fef79f243
+size 4799
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_rounded.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_rounded.png
index c6e810fe8..976a925fa 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_rounded.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.progress_ProgressScreenshot_rounded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07c73dc17efb5517f671aaf1230c3e1c7796b561928244deafbfe05bfe898dcb
-size 9001
+oid sha256:59761bc4498affec0876ba49afcc2e5ad553ce5ff5972092527ee604314fce9a
+size 9084
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.slider_SliderScreenshot_testRangeSliders.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.slider_SliderScreenshot_testRangeSliders.png
index 979d0e5f3..a9a26e051 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.slider_SliderScreenshot_testRangeSliders.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.slider_SliderScreenshot_testRangeSliders.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b570a1a303813edc2d18fb8ccd24cc319fafc63ba3f40ca1da3dfa8d805eac9
-size 32785
+oid sha256:9624f099e2322296d61849315f0ac19e03859b961c69e204c896f26c8694aa21
+size 32797
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__dark.png
index 7fe442bde..e6024b70a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04d62d2cd7cbfb7d7f9e8949f30cf7bfb728011f18a9140e9fe243f842445bf4
-size 67520
+oid sha256:b867b8bd3b41d1bba8cc668db3996d6349f60cfe588fd711c175516beb1cde21
+size 67376
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__dark.png
index b8fd162bb..ea47c5030 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9afc8a95e101666ca0f3568d92361c74b1f237f4a9bec2ad2cb1f910e938e724
-size 116887
+oid sha256:6ecef0c84fbd5e7eb2ba20b54e9eaedaa981dea32e7d78b6b99c5676518dadc4
+size 117557
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__light.png
index 816d0bac5..7a5e5ccf7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8d232949fbc17d8bf0979a535f32b5ed2877c068c23c672e07fa5c0766fea22
-size 108597
+oid sha256:7264d8956fed17656e388c2dd5639db0974febad7b5fc8775d1c15afcae8db84
+size 108936
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__dark.png
index db4515790..732bccd6e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e26eb95ce4309cd3ff4e3f322b9ba96b0817bbd8b25fe53c077c1e3888bc63c4
-size 117632
+oid sha256:f306715533b969ea71df3a605691724258999fb6f797920eb3c24fe497e37d61
+size 117698
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__light.png
index ff8910755..76dd4bf0c 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57d8642d486ee53b0cb5b8b3d70e70b461d674f926c53446429f0f029bb5d516
-size 108963
+oid sha256:5afa8a21f62707958320fb91c81ce9405e585a30b8c14511a6e8273aed9bb256
+size 109050
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__dark.png
index 035546f0f..9963b8948 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:246e0fb5f9b07174a0e0518d1ba08c751010cb02cc073fb399777694d12c7762
-size 30701
+oid sha256:76dcda006b0913dd6b539ba05a0ec5535ebc2d7e02ca1e4653717f8147dd6d7f
+size 30734
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__light.png
index 243aa10ab..e4c6b4820 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsIntentShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3b65e92726afeddc57a8bb21247a665239c3d65e4e61c5f3da4dcadebae674d
-size 30950
+oid sha256:ad9e914d959d558790dbd8ed24a9011f67a4bd11461ca7054fd24c7dba90d3ca
+size 31022
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSizeShowcase.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSizeShowcase.png
index caca8a556..e274dcfb5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSizeShowcase.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSizeShowcase.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16dcc948583934a70bb71f656d59a2169cce46a7384073461ff8b03a865e81c8
-size 28617
+oid sha256:8b0088818980528abae1b0f64c8374ae843759431e2ed4d315c86128e36cf091
+size 28686
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSpacingShowcase.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSpacingShowcase.png
index f6e25b1c8..d205e9876 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSpacingShowcase.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsDocScreenshot_tabsSpacingShowcase.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2855815184981db16f4f2b58446ad3829acda0f2ec7f876d431f81917cec2e6f
-size 20550
+oid sha256:87772cd9d3deb9054302806738c82424dd8e01f30c4114d3ccc767e5791a1ae6
+size 20590
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_disabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_disabled.png
index 7b837c7b5..755e7616e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_disabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80066d2e4b7bdfa246a00ad2bbf2ee59523b0bd219730743b89b452d0f9c0bcf
-size 61895
+oid sha256:ee19a04f7dc57b4f0f00f8337deddb7dc187e359b999b387b5db759258351e76
+size 62036
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_enabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_enabled.png
index b77b28b27..3c838914e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_enabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tab_TabsScreenshot_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7482d757a8fb940257bcff0eae906040e45a05e4e6779a3a1afacbd5f6a875d2
-size 64747
+oid sha256:8f0bd58434dd4a76cefd225eb4a7c74ce8d32bd8bb33c5e9cdcef458aedaf57a
+size 64847
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__dark.png
index 12ee8c1f4..ad9e7aa98 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8677afcc767b1a663b55fb8d7fe597d39587669fa58c78b6783013631eb0b9c
-size 327876
+oid sha256:54bc655a51ac494be6fe793b95479f684fb2f978ab6e9bcf73f6b120df27bb33
+size 332808
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__light.png
index 2c344b87b..47aa08a93 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tags_TagsScreenshot_themesTags__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af5a832bbeddfe7df28311135c00a2ca9a96ba122bf172691bbca9604fcf8d65
-size 325159
+oid sha256:d30c7262dcd01286faa143aef5d87532a4235645f8555802edff4f1e1b85c17e
+size 326556
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_frenchVariant__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_frenchVariant__dark.png
index 0401374f6..79682aaa8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_frenchVariant__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_frenchVariant__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9ae14c9d6fd7d754490db6428b0f595cd65a7ac3639fd6cd1d68b6fef11968f
-size 38317
+oid sha256:0b4ddde1fb1cef75d526d1fc1882996bba8f2c00a7438dfcbd7490c052fa91a5
+size 38149
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_testTextLink__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_testTextLink__dark.png
index ffde685d5..02b24f2b0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_testTextLink__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.text_TextLinkScreenshot_testTextLink__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bc4a02386aa3ac18ebae201911dbf21e3ad3b1d43b90d11316358dfeca061ee
-size 21659
+oid sha256:6d937c19c7f5053e1a3faf8a7157cfe9d13ea13339fdb73b2be19ce1d1daaa9b
+size 21552
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_DropdownScreenshot_expanded.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_DropdownScreenshot_expanded.png
index 543105008..8ba15ca88 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_DropdownScreenshot_expanded.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_DropdownScreenshot_expanded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5493387ca0c7ca1420060502ccc72c2dd66673376131b1f8e2d4a14d6d318e72
-size 25654
+oid sha256:86c86b2dcbe63f7a9e33125a4964aae4d88b7fe8723efc3db0fcf4699cef84c5
+size 25612
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__dark.png
index 68282fe97..456998c8b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0760f2dea2154740e4edb1cc5efcbb1b1701a6d492fcd5e3acc7f1a700b2f95
-size 93446
+oid sha256:949307406fdb7002475eb3c1509ac0c8c2ef2d9a72abe6057d79a2154b5fecbc
+size 94564
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__light.png
index 440b56c49..a2e678563 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a81ca26975ebfd5d7df5f05076a7558464c9a62d154832f90c793aeed75d3c4
-size 93903
+oid sha256:3711b672aed780df52d7ee6464e19914086ebf362a85703c7bdfee60f055be89
+size 94157
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__dark.png
index 224a9a14b..b7df4e1a1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cd9cee892ad422870f314e410dd97cfd030dc8b56cdec89ff5092207d67497c
-size 70233
+oid sha256:7bf11e25cfe3228d80414b8714f366cf80ede2befdb200967b61fb4b679b2f6a
+size 71519
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__light.png
index 443727a5f..6afce09f3 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_showcase_disabled__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23d98d281e28feb7cd526dc93bda712b15d6c87f6519abbe83e3edde9105c8c9
-size 68541
+oid sha256:f75910bbc18a649b080b19a2e8436a0ad7468422e1f8f4cd6a8d7953d2cdd467
+size 68463
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__dark.png
index fbd6d3404..bcea9b4cb 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76b74ece78a4e61b0707274c50264c20ad26525fb28184248e36a815c020e046
-size 96750
+oid sha256:4a081d1aaf5bd796c2dab1a0bbc9dc2073ed178493cd3a64054f9875e861a9b6
+size 97951
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__light.png
index ca0e6737e..4780d7f95 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_multilineTextFieldShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:313fe2c033185bb30090a0a856f673742742258418d5ada75a3670464addf344
-size 97943
+oid sha256:2cb75ba31079d41fa96757f9869c9db23520d59210f1a270f01f58a58a8eefb4
+size 98223
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__dark.png
index 3fda8d970..5fe890559 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28d582ddf4cf279cded38b0cd48cbed9a24c68267c7c1f98b595498bdad3c17e
-size 89618
+oid sha256:bd880baf4d83d9166a5c69c18e57a8b51c33454e58c0a32d011d76be22047993
+size 90677
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__light.png
index 85cfbb65f..9a5da5863 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_selectTextFieldShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1305838a303579699ff6d0b1f39b36b21eb22b636bce41444912d78295db024f
-size 88220
+oid sha256:eaa55d4fff631da31a98439eb50c543382130db64fbbc5a1ca7bc74e88e9e9b1
+size 88399
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__dark.png
index 8f4daea04..51ac73381 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea1d44fe484252b0aea5b0bf050abb58ae4659bc97fa1eac0a271d33127cb348
-size 89599
+oid sha256:36190eeb1ed6dc00df4df6c83d56ee50199f7c954aa26a5d46e6b79bce8e5207
+size 90663
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__light.png
index f6bd2acab..0fb04b1c5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldDocScreenshot_textFieldShowcase__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4e9739078a209b13bb18ada455933d9edab95bfed11c7b5cd8fc0b38a060a14
-size 89001
+oid sha256:c95b35774a81efaff6046192691c1157739afd90a2f2c66bd0bd7e13636000b5
+size 89263
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_bigValue.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_bigValue.png
index f632e0ab6..76c39807d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_bigValue.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_bigValue.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7a05881eaecab8a22f8f7d0391192607c6589da8fbbe2b61a663aa673f59428
-size 140024
+oid sha256:b7fc1c57f2336822cf97232be8ce6bd6b1a44bab0c0a5f3130b22c13e3bfe40b
+size 140156
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_disabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_disabled.png
index cc17565ea..fa5ba32f7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_disabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f57a3888d9bcfc0d26d4a4c39e8fea65d8f25e8ccb05dbf0e41aa211e4c33d7
-size 143743
+oid sha256:04de75ef103bf87b64859edf91a7738bd83ec0db12a3c09a39918cb29bb29eb8
+size 143715
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_enabled.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_enabled.png
index 3e9de9532..4f6301bd0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_enabled.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6caf79fe4ef10e2e3754f03df137843d68300838f2e628ed1ffbf1c59bbd2dc
-size 156659
+oid sha256:2af9c2a1189f475d91c45de8b55bc01003f0489639ecd084e373291aae4cb9d0
+size 156979
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_smallValue.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_smallValue.png
index 0ca6f8c31..2825b265b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_smallValue.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.textfields_TextFieldScreenshot_smallValue.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e66f18e6634b91506b698d127a68bf9be25ec20e8233902157136877203186af
-size 187462
+oid sha256:b3e18f560b56baba1318b1a2cab31ba6e571eb9bda4dab789cf0f772f106ed91
+size 187834
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__dark.png
index ee713dfa7..6f94cb1dd 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ff93599a9ff0e9d1b4ff3c31d02f9e51ba10e2252f45faa1c732908191a81d0
-size 163169
+oid sha256:72ffbd9321acd222591d7669a7638258cc8b1bd0d4b1a5aeb9cda71f413b2987
+size 168589
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__light.png
index cb15df8e1..b17f04936 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark.tokens_ColorsScreenshot_themesColors__light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:767a397940d807e316b8abca8a13509b5aeb7b0560fcdda9ba0d5153d81fc305
-size 173855
+oid sha256:3cd70dd50d9594d41f3c48401e5b60514f87dad9741cee0b24733c80d801e6c4
+size 173653
diff --git a/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt b/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
index 8cefe3fcc..4e9fa0614 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
@@ -58,30 +58,29 @@ import com.adevinta.spark.components.buttons.ButtonFilled
 import com.adevinta.spark.components.surface.Surface
 import com.adevinta.spark.components.text.Text
 import com.adevinta.spark.tokens.PaletteTokens.Avocado100
-import com.adevinta.spark.tokens.PaletteTokens.Avocado400
+import com.adevinta.spark.tokens.PaletteTokens.Avocado300
 import com.adevinta.spark.tokens.PaletteTokens.Avocado50
-import com.adevinta.spark.tokens.PaletteTokens.Avocado600
 import com.adevinta.spark.tokens.PaletteTokens.Avocado700
-import com.adevinta.spark.tokens.PaletteTokens.Avocado800
+import com.adevinta.spark.tokens.PaletteTokens.Avocado900
 import com.adevinta.spark.tokens.PaletteTokens.Banana100
-import com.adevinta.spark.tokens.PaletteTokens.Banana400
+import com.adevinta.spark.tokens.PaletteTokens.Banana300
 import com.adevinta.spark.tokens.PaletteTokens.Banana50
 import com.adevinta.spark.tokens.PaletteTokens.Banana500
-import com.adevinta.spark.tokens.PaletteTokens.Banana700
 import com.adevinta.spark.tokens.PaletteTokens.Banana800
+import com.adevinta.spark.tokens.PaletteTokens.Banana900
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry100
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry200
+import com.adevinta.spark.tokens.PaletteTokens.Blueberry300
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry50
-import com.adevinta.spark.tokens.PaletteTokens.Blueberry500
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry700
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry800
 import com.adevinta.spark.tokens.PaletteTokens.Blueberry900
 import com.adevinta.spark.tokens.PaletteTokens.Cherry100
-import com.adevinta.spark.tokens.PaletteTokens.Cherry400
+import com.adevinta.spark.tokens.PaletteTokens.Cherry300
 import com.adevinta.spark.tokens.PaletteTokens.Cherry50
-import com.adevinta.spark.tokens.PaletteTokens.Cherry500
+import com.adevinta.spark.tokens.PaletteTokens.Cherry600
 import com.adevinta.spark.tokens.PaletteTokens.Cherry700
-import com.adevinta.spark.tokens.PaletteTokens.Cherry800
+import com.adevinta.spark.tokens.PaletteTokens.Cherry900
 import com.adevinta.spark.tokens.PaletteTokens.Clementin100
 import com.adevinta.spark.tokens.PaletteTokens.Clementin300
 import com.adevinta.spark.tokens.PaletteTokens.Clementin400
@@ -89,20 +88,23 @@ import com.adevinta.spark.tokens.PaletteTokens.Clementin50
 import com.adevinta.spark.tokens.PaletteTokens.Clementin500
 import com.adevinta.spark.tokens.PaletteTokens.Clementin600
 import com.adevinta.spark.tokens.PaletteTokens.Clementin700
+import com.adevinta.spark.tokens.PaletteTokens.Clementin900
 import com.adevinta.spark.tokens.PaletteTokens.NightShade100
 import com.adevinta.spark.tokens.PaletteTokens.NightShade300
 import com.adevinta.spark.tokens.PaletteTokens.NightShade400
 import com.adevinta.spark.tokens.PaletteTokens.NightShade50
-import com.adevinta.spark.tokens.PaletteTokens.NightShade600
+import com.adevinta.spark.tokens.PaletteTokens.NightShade500
 import com.adevinta.spark.tokens.PaletteTokens.NightShade700
 import com.adevinta.spark.tokens.PaletteTokens.NightShade800
 import com.adevinta.spark.tokens.PaletteTokens.NightShade900
 import com.adevinta.spark.tokens.PaletteTokens.Plum100
 import com.adevinta.spark.tokens.PaletteTokens.Plum200
 import com.adevinta.spark.tokens.PaletteTokens.Plum300
+import com.adevinta.spark.tokens.PaletteTokens.Plum50
 import com.adevinta.spark.tokens.PaletteTokens.Plum500
 import com.adevinta.spark.tokens.PaletteTokens.Plum700
 import com.adevinta.spark.tokens.PaletteTokens.Plum800
+import com.adevinta.spark.tokens.PaletteTokens.Plum900
 import kotlin.math.ln
 import kotlin.reflect.KProperty0
 
@@ -129,23 +131,23 @@ public fun lightSparkColors(
     onSupportContainer: Color = Blueberry900,
     supportVariant: Color = Blueberry700,
     onSupportVariant: Color = Color.White,
-    success: Color = Avocado600,
+    success: Color = Avocado700,
     onSuccess: Color = Color.White,
     successContainer: Color = Avocado100,
     onSuccessContainer: Color = Avocado700,
     alert: Color = Banana500,
     onAlert: Color = NightShade900,
     alertContainer: Color = Banana100,
-    onAlertContainer: Color = Banana700,
-    error: Color = Cherry500,
+    onAlertContainer: Color = Banana800,
+    error: Color = Cherry600,
     onError: Color = Color.White,
     errorContainer: Color = Cherry100,
     onErrorContainer: Color = Cherry700,
-    info: Color = Blueberry500,
+    info: Color = Blueberry700,
     onInfo: Color = Color.White,
     infoContainer: Color = Blueberry200,
     onInfoContainer: Color = Blueberry700,
-    neutral: Color = NightShade600,
+    neutral: Color = NightShade700,
     onNeutral: Color = Color.White,
     neutralContainer: Color = NightShade100,
     onNeutralContainer: Color = NightShade700,
@@ -229,58 +231,58 @@ public fun lightSparkColors(
 
 public fun darkSparkColors(
     accent: Color = Plum200,
-    onAccent: Color = NightShade900,
+    onAccent: Color = Plum900,
     accentContainer: Color = Plum700,
-    onAccentContainer: Color = Color.White,
+    onAccentContainer: Color = Plum50,
     accentVariant: Color = Plum300,
-    onAccentVariant: Color = NightShade900,
-    basic: Color = Blueberry100,
-    onBasic: Color = NightShade900,
+    onAccentVariant: Color = Plum900,
+    basic: Color = Blueberry200,
+    onBasic: Color = Blueberry900,
     basicContainer: Color = Blueberry800,
     onBasicContainer: Color = Blueberry50,
     main: Color = Clementin400,
-    onMain: Color = NightShade900,
+    onMain: Color = Clementin900,
     mainContainer: Color = Clementin700,
     onMainContainer: Color = Clementin50,
     mainVariant: Color = Clementin300,
-    onMainVariant: Color = NightShade900,
-    support: Color = Blueberry100,
+    onMainVariant: Color = Clementin900,
+    support: Color = Blueberry200,
     onSupport: Color = Blueberry900,
     supportContainer: Color = Blueberry800,
     onSupportContainer: Color = Blueberry50,
-    supportVariant: Color = Blueberry50,
+    supportVariant: Color = Blueberry100,
     onSupportVariant: Color = Blueberry900,
-    success: Color = Avocado400,
-    onSuccess: Color = NightShade900,
-    successContainer: Color = Avocado800,
+    success: Color = Avocado300,
+    onSuccess: Color = Avocado900,
+    successContainer: Color = Avocado700,
     onSuccessContainer: Color = Avocado50,
-    alert: Color = Banana400,
-    onAlert: Color = NightShade900,
+    alert: Color = Banana300,
+    onAlert: Color = Banana900,
     alertContainer: Color = Banana800,
     onAlertContainer: Color = Banana50,
-    error: Color = Cherry400,
-    onError: Color = NightShade900,
-    errorContainer: Color = Cherry800,
+    error: Color = Cherry300,
+    onError: Color = Cherry900,
+    errorContainer: Color = Cherry700,
     onErrorContainer: Color = Cherry50,
-    info: Color = Blueberry200,
-    onInfo: Color = NightShade900,
-    infoContainer: Color = Blueberry800,
+    info: Color = Blueberry300,
+    onInfo: Color = Blueberry900,
+    infoContainer: Color = Blueberry700,
     onInfoContainer: Color = Blueberry50,
     neutral: Color = NightShade300,
     onNeutral: Color = NightShade900,
-    neutralContainer: Color = NightShade800,
+    neutralContainer: Color = NightShade700,
     onNeutralContainer: Color = NightShade50,
-    background: Color = Blueberry900,
-    onBackground: Color = Color.White,
-    backgroundVariant: Color = NightShade900,
-    onBackgroundVariant: Color = Color.White,
-    surface: Color = Blueberry900,
-    onSurface: Color = Color.White,
+    background: Color = NightShade900,
+    onBackground: Color = NightShade50,
+    backgroundVariant: Color = Color.Black,
+    onBackgroundVariant: Color = NightShade50,
+    surface: Color = NightShade900,
+    onSurface: Color = NightShade50,
     surfaceInverse: Color = NightShade50,
-    onSurfaceInverse: Color = NightShade700,
+    onSurfaceInverse: Color = NightShade800,
     surfaceTint: Color = Clementin400,
-    outline: Color = NightShade600,
-    outlineHigh: Color = NightShade50,
+    outline: Color = NightShade500,
+    outlineHigh: Color = NightShade100,
     scrim: Color = Color.Black,
     dimContent1: Float = .72f,
     dimContent2: Float = .56f,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt b/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
index f4d89d51f..2763a2b6e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
@@ -51,7 +51,6 @@ internal object PaletteTokens {
 // endregion
 
     // region Blueberry colors
-    internal val Blueberry1000 = Color(0xFF010509)
     internal val Blueberry900 = Color(0xFF152233)
     internal val Blueberry800 = Color(0xFF094171)
     internal val Blueberry700 = Color(0xFF0C5291)
@@ -65,16 +64,16 @@ internal object PaletteTokens {
 // endregion
 
     // region Avocado colors
-    internal val Avocado900 = Color(0xFF101E10)
-    internal val Avocado800 = Color(0xFF1F3D20)
-    internal val Avocado700 = Color(0xFF2F5B30)
-    internal val Avocado600 = Color(0xFF3E7A40)
-    internal val Avocado500 = Color(0xFF4E9850)
-    internal val Avocado400 = Color(0xFF71AD73)
-    internal val Avocado300 = Color(0xFF95C196)
-    internal val Avocado200 = Color(0xFFB8D6B9)
-    internal val Avocado100 = Color(0xFFDCEADC)
-    internal val Avocado50 = Color(0xFFEDF5EE)
+    internal val Avocado900 = Color(0xFF0C291B)
+    internal val Avocado800 = Color(0xFF14422B)
+    internal val Avocado700 = Color(0xFF1D6340)
+    internal val Avocado600 = Color(0xFF278456)
+    internal val Avocado500 = Color(0xFF31A56B)
+    internal val Avocado400 = Color(0xFF64BC90)
+    internal val Avocado300 = Color(0xFF8ECDAE)
+    internal val Avocado200 = Color(0xFFB7DFCB)
+    internal val Avocado100 = Color(0xFFE0F2E9)
+    internal val Avocado50 = Color(0xFFF5FBF8)
 // endregion
 
     // region Cherry colors