diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..6195b36e 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,30 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -9,6 +33,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index c224ad56..bb449370 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.21" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/NOTICE.txt b/NOTICE.txt
index beaaaed1..f289914a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -17,7 +17,6 @@ app/src/main/res/drawable/ic_chevron_down.xml
 app/src/main/res/drawable/ic_component_atom.xml
 app/src/main/res/drawable/ic_copy.xml
 app/src/main/res/drawable/ic_design_token_figma.xml
-app/src/main/res/drawable/ic_design_token_figma_no_padding.xml
 app/src/main/res/drawable/ic_dimension.xml
 app/src/main/res/drawable/ic_filter_effects.xml
 app/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt b/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt
index d871c6b8..4ef1474b 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt
@@ -23,13 +23,16 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import com.orange.ouds.app.R
+import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.UiModePreviews
+import com.orange.ouds.theme.tokens.OudsColorKeyToken
 
 @Composable
 fun BottomBar(currentRoute: String, navigateToRoute: (String) -> Unit) {
     val items = BottomBarItem.entries.toTypedArray()
     NavigationBar(
+        containerColor = OudsColorKeyToken.Background.Secondary.value, //TODO Temporary color. Waiting for Material colors from Maxime.
         content = {
             items.forEach { item ->
                 NavigationBarItem(
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt
index 527d5bc9..3043f2cc 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt
@@ -51,7 +51,7 @@ fun ComponentsScreen() {
                     .padding(top = OudsSpaceKeyToken.Fixed.Medium.value)
                     .width(OudsGridKeyToken.Margin.value)
                     .height(OudsGridKeyToken.ColumnGap.value)
-                    .background(OudsColorKeyToken.Background.Brand.Primary.value)
+                    .background(OudsColorKeyToken.Content.Brand.Primary.value)
             )
         }
     }
diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt
index d3b72e6d..cfbff986 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt
@@ -64,11 +64,10 @@ sealed class TokenCategory<T>(
             TokenProperty.ColorAlways,
             TokenProperty.ColorBackground,
             TokenProperty.ColorBorder,
-            TokenProperty.ColorBrand,
             TokenProperty.ColorContent,
             TokenProperty.ColorDecorative,
-            TokenProperty.ColorElevation,
-            TokenProperty.ColorGradient,
+            TokenProperty.ColorOverlay,
+            TokenProperty.ColorSurface,
         )
     )
 
@@ -87,16 +86,10 @@ sealed class TokenCategory<T>(
                 TokenProperty.SpaceScaled,
                 TokenProperty.SpaceFixed,
                 TokenProperty.SpacePaddingInline,
-                TokenProperty.SpacePaddingInlineWithIcon,
-                TokenProperty.SpacePaddingInlineWithArrow,
                 TokenProperty.SpacePaddingStack,
-                TokenProperty.SpacePaddingStackWithIcon,
                 TokenProperty.SpacePaddingInset,
                 TokenProperty.SpaceColumnGap,
-                TokenProperty.SpaceColumnGapWithIcon,
-                TokenProperty.SpaceColumnGapWithArrow,
                 TokenProperty.SpaceRowGap,
-                TokenProperty.SpaceRowGapWithIcon
             ),
         )
 
@@ -104,7 +97,7 @@ sealed class TokenCategory<T>(
             R.string.app_tokens_dimension_size_label,
             R.drawable.ic_dimension,
             R.string.app_tokens_dimension_size_description_text,
-            getTokenValueCode<OudsSizeKeyToken.Icon.Decorative.Shortest>(),
+            getTokenValueCode<OudsSizeKeyToken.Icon.Decorative.ExtraExtraSmall>(),
             listOf(TokenProperty.SizeIconDecorative, TokenProperty.SizeIconWithText),
         )
     }
@@ -129,7 +122,7 @@ sealed class TokenCategory<T>(
         R.string.app_tokens_opacity_label,
         R.drawable.ic_filter_effects,
         R.string.app_tokens_opacity_description_text,
-        getTokenValueCode<OudsOpacityKeyToken.Transparent>(),
+        getTokenValueCode<OudsOpacityKeyToken.Invisible>(),
         listOf(TokenProperty.Opacity)
     )
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt
index 522879c6..985b6cee 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt
@@ -211,8 +211,8 @@ private fun TokenIllustration(tokenProperty: TokenProperty<*>, token: Token<*>)
     is TokenProperty.BorderWidth -> BorderIllustrationBox(width = token.value() as Dp)
     is TokenProperty.BorderRadius -> BorderIllustrationBox(shape = RoundedCornerShape(token.value() as Dp))
     is TokenProperty.BorderStyle -> BorderIllustrationBox(style = token.value() as OudsBorderStyle)
-    is TokenProperty.ColorAction, TokenProperty.ColorAlways, TokenProperty.ColorBackground, TokenProperty.ColorBorder, TokenProperty.ColorBrand, TokenProperty.ColorContent,
-    TokenProperty.ColorElevation, TokenProperty.ColorGradient, TokenProperty.ColorDecorative -> BorderIllustrationBox(backgroundColor = token.value() as Color)
+    is TokenProperty.ColorAction, TokenProperty.ColorAlways, TokenProperty.ColorBackground, TokenProperty.ColorBorder, TokenProperty.ColorContent,
+    TokenProperty.ColorDecorative, TokenProperty.ColorOverlay, TokenProperty.ColorSurface -> BorderIllustrationBox(backgroundColor = token.value() as Color)
     is TokenProperty.Opacity -> OpacityIllustrationBox(opacity = token.value() as Float)
     is TokenProperty.Elevation -> ElevationIllustrationSurface(elevation = token.value() as Dp)
     is TokenProperty.SizeIconDecorative -> SizeIconDecorativeIllustrationBox(size = token.value() as Dp)
@@ -222,13 +222,9 @@ private fun TokenIllustration(tokenProperty: TokenProperty<*>, token: Token<*>)
         contentAlignment = Alignment.Center
     )
     TokenProperty.SpacePaddingInline -> SpaceIllustrationBox(size = token.value() as Dp)
-    TokenProperty.SpacePaddingInlineWithIcon, TokenProperty.SpaceColumnGapWithIcon -> SpaceWithIconIllustrationRow(size = token.value() as Dp)
-    TokenProperty.SpacePaddingInlineWithArrow, TokenProperty.SpaceColumnGapWithArrow -> SpaceWithArrowIllustrationRow(size = token.value() as Dp)
     TokenProperty.SpacePaddingInset -> SpacePaddingInsetIllustrationBox(size = token.value() as Dp)
     TokenProperty.SpacePaddingStack -> SpaceIllustrationBox(size = token.value() as Dp, orientation = SpaceOrientation.Vertical)
     TokenProperty.SpaceRowGap -> SpaceIllustrationBox(size = token.value() as Dp, orientation = SpaceOrientation.Vertical, contentAlignment = Alignment.Center)
-    TokenProperty.SpaceRowGapWithIcon -> SpaceWithIconIllustrationColumn(size = token.value() as Dp, verticalArrangement = Arrangement.Bottom)
-    TokenProperty.SpacePaddingStackWithIcon -> SpaceWithIconIllustrationColumn(size = token.value() as Dp)
     TokenProperty.Typography, TokenProperty.Grid -> Unit
 }
 
@@ -277,7 +273,7 @@ private fun CodeColumn(codeExample: String, modifier: Modifier = Modifier) {
                         stateDescription = linkStateDescription
                     },
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(OudsSpaceKeyToken.PaddingInline.WithArrow.Short.value)
+                horizontalArrangement = Arrangement.spacedBy(OudsSpaceKeyToken.PaddingInline.Short.value)
             ) {
                 Text(
                     text = stringResource(R.string.app_tokens_viewCodeExample_label),
@@ -286,7 +282,7 @@ private fun CodeColumn(codeExample: String, modifier: Modifier = Modifier) {
                 Icon(
                     modifier = Modifier.rotate(linkArrowRotation),
                     painter = painterResource(R.drawable.ic_chevron_down),
-                    tint = OudsColorKeyToken.Brand.Primary.Default.value,
+                    tint = OudsColorKeyToken.Content.Brand.Primary.value,
                     contentDescription = null
                 )
             }
diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt
index 97036e97..9437df14 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt
@@ -74,12 +74,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorBrand : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_brand_label,
-        tokens = OudsColorKeyToken.Brand::class.getTokens(),
-        categoryClass = TokenCategory.Color::class
-    )
-
     data object ColorContent : TokenProperty<TokenCategory.Color>(
         nameRes = R.string.app_tokens_color_content_label,
         tokens = OudsColorKeyToken.Content::class.getTokens(),
@@ -92,15 +86,15 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorElevation : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_elevation_label,
-        tokens = OudsColorKeyToken.Elevation::class.getTokens(),
+    data object ColorOverlay : TokenProperty<TokenCategory.Color>(
+        nameRes = R.string.app_tokens_color_overlay_label,
+        tokens = OudsColorKeyToken.Overlay::class.getTokens(),
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorGradient : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_gradient_label,
-        tokens = OudsColorKeyToken.Gradient::class.getTokens(),
+    data object ColorSurface : TokenProperty<TokenCategory.Color>(
+        nameRes = R.string.app_tokens_color_surface_label,
+        tokens = OudsColorKeyToken.Surface::class.getTokens(),
         categoryClass = TokenCategory.Color::class
     )
 
@@ -154,18 +148,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpaceColumnGapWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_columnGapWithIcon_label,
-        tokens = OudsSpaceKeyToken.ColumnGap.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
-    data object SpaceColumnGapWithArrow : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_columnGapWithArrow_label,
-        tokens = OudsSpaceKeyToken.ColumnGap.WithArrow::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceFixed : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_fixed_label,
         tokens = OudsSpaceKeyToken.Fixed::class.getTokens(),
@@ -178,18 +160,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpacePaddingInlineWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingInlineWithIcon_label,
-        tokens = OudsSpaceKeyToken.PaddingInline.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
-    data object SpacePaddingInlineWithArrow : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingInlineWithArrow_label,
-        tokens = OudsSpaceKeyToken.PaddingInline.WithArrow::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpacePaddingInset : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_paddingInset_label,
         tokens = OudsSpaceKeyToken.Inset::class.getTokens(),
@@ -202,24 +172,12 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpacePaddingStackWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingStackWithIcon_label,
-        tokens = OudsSpaceKeyToken.PaddingBlock.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceRowGap : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_rowGap_label,
         tokens = OudsSpaceKeyToken.RowGap::class.getTokens(recursive = false),
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpaceRowGapWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_rowGapWithIcon_label,
-        tokens = OudsSpaceKeyToken.RowGap.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceScaled : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_scaled_label,
         tokens = OudsSpaceKeyToken.Scaled::class.getTokens(),
diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyHeader.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyHeader.kt
index 4038a3cd..4edf5584 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyHeader.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyHeader.kt
@@ -20,20 +20,20 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import com.orange.ouds.app.R
+import com.orange.ouds.core.theme.OudsTheme
+import com.orange.ouds.core.theme.OudsThemeTweak
 import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.BasicPreviewParameterProvider
@@ -71,12 +71,14 @@ fun SpaceHeader(
     spaceTokenProperty: TokenProperty<TokenCategory.Dimension.Space>,
     modifier: Modifier = Modifier
 ) {
-    Box(
-        modifier = modifier
-            .background(color = OudsColorKeyToken.Background.Emphasized.value)
-            .padding(all = OudsSpaceKeyToken.Fixed.Medium.value)
-    ) {
-        SpaceHeaderContent(spaceTokenProperty = spaceTokenProperty)
+    OudsThemeTweak(tweak = OudsTheme.Tweak.ForceDark) { //TODO This does not give the expected result in light mode because the background should be black. To fix when demo app Figma file is updated with new tokens.
+        Box(
+            modifier = modifier
+                .background(color = OudsColorKeyToken.Background.Emphasized.value)
+                .padding(all = OudsSpaceKeyToken.Fixed.Medium.value)
+        ) {
+            SpaceHeaderContent(spaceTokenProperty = spaceTokenProperty)
+        }
     }
 }
 
@@ -86,38 +88,30 @@ private fun SpaceHeaderContent(spaceTokenProperty: TokenProperty<TokenCategory.D
 
     val externalSpaceValues = when (spaceTokenProperty) {
         TokenProperty.SpaceScaled -> PaddingValues(start = OudsSpaceKeyToken.Fixed.Shorter.value, top = OudsSpaceKeyToken.Fixed.Shortest.value)
-        TokenProperty.SpaceFixed,
-        TokenProperty.SpacePaddingInlineWithArrow,
-        TokenProperty.SpacePaddingInlineWithIcon -> PaddingValues(start = OudsSpaceKeyToken.Fixed.Shorter.value)
+        TokenProperty.SpaceFixed -> PaddingValues(start = OudsSpaceKeyToken.Fixed.Shorter.value)
         TokenProperty.SpacePaddingInline -> PaddingValues(horizontal = OudsSpaceKeyToken.Fixed.Shorter.value)
         TokenProperty.SpacePaddingStack -> PaddingValues(vertical = OudsSpaceKeyToken.Fixed.Shorter.value)
-        TokenProperty.SpacePaddingStackWithIcon -> PaddingValues(top = OudsSpaceKeyToken.Fixed.Shorter.value)
         TokenProperty.SpacePaddingInset -> PaddingValues(all = OudsSpaceKeyToken.Fixed.Shorter.value)
         else -> PaddingValues(all = 0.dp)
     }
 
     val internalSpaceColor = when (spaceTokenProperty) {
         TokenProperty.SpaceColumnGap,
-        TokenProperty.SpaceColumnGapWithIcon,
-        TokenProperty.SpaceColumnGapWithArrow,
-        TokenProperty.SpaceRowGap,
-        TokenProperty.SpaceRowGapWithIcon -> OudsColorKeyToken.Always.Info.value
+        TokenProperty.SpaceRowGap -> OudsColorKeyToken.Content.Status.Info.value
         else -> OudsColorKeyToken.Background.Emphasized.value
     }
 
     val modifier = Modifier
-        .dashedBorder(width = dashedBorderWidth, color = OudsColorKeyToken.Content.Default.OnBgEmphasized.value)
+        .dashedBorder(width = dashedBorderWidth, color = OudsColorKeyToken.Content.Default.value)
         .padding(all = dashedBorderWidth)
-        .background(color = OudsColorKeyToken.Always.Info.value)
+        .background(color = OudsColorKeyToken.Content.Status.Info.value)
         .padding(externalSpaceValues)
         .background(internalSpaceColor)
 
     val column = remember {
         spaceTokenProperty in listOf(
             TokenProperty.SpaceRowGap,
-            TokenProperty.SpaceRowGapWithIcon,
             TokenProperty.SpacePaddingStack,
-            TokenProperty.SpacePaddingStackWithIcon
         )
     }
 
@@ -130,12 +124,6 @@ private fun SpaceHeaderContent(spaceTokenProperty: TokenProperty<TokenCategory.D
         ) {
             if (spaceTokenProperty == TokenProperty.SpaceRowGap) {
                 SpaceHeaderText(spaceTokenProperty = spaceTokenProperty)
-            } else {
-                SpaceHeaderImage(
-                    modifier = Modifier.fillMaxWidth(),
-                    spaceTokenProperty = spaceTokenProperty,
-                    alignment = Alignment.CenterStart
-                )
             }
             SpaceHeaderText(spaceTokenProperty = spaceTokenProperty)
         }
@@ -148,10 +136,6 @@ private fun SpaceHeaderContent(spaceTokenProperty: TokenProperty<TokenCategory.D
                 SpaceHeaderText(modifier = Modifier.weight(0.5f), spaceTokenProperty = spaceTokenProperty)
                 SpaceHeaderText(modifier = Modifier.weight(0.5f), spaceTokenProperty = spaceTokenProperty)
             } else {
-                SpaceHeaderImage(
-                    modifier = Modifier.fillMaxHeight(),
-                    spaceTokenProperty = spaceTokenProperty
-                )
                 SpaceHeaderText(spaceTokenProperty = spaceTokenProperty)
             }
         }
@@ -162,17 +146,11 @@ private fun SpaceHeaderContent(spaceTokenProperty: TokenProperty<TokenCategory.D
 private fun SpaceHeaderText(spaceTokenProperty: TokenProperty<TokenCategory.Dimension.Space>, modifier: Modifier = Modifier) {
     val textResId = when (spaceTokenProperty) {
         TokenProperty.SpaceColumnGap -> R.string.app_tokens_dimension_space_columnGapHeader_text
-        TokenProperty.SpaceColumnGapWithArrow -> R.string.app_tokens_dimension_space_columnGapWithArrowHeader_text
-        TokenProperty.SpaceColumnGapWithIcon -> R.string.app_tokens_dimension_space_columnGapWithIconHeader_text
         TokenProperty.SpaceFixed -> R.string.app_tokens_dimension_space_fixedHeader_text
         TokenProperty.SpacePaddingInline -> R.string.app_tokens_dimension_space_paddingInlineHeader_text
-        TokenProperty.SpacePaddingInlineWithArrow -> R.string.app_tokens_dimension_space_paddingInlineWithArrowHeader_text
-        TokenProperty.SpacePaddingInlineWithIcon -> R.string.app_tokens_dimension_space_paddingInlineWithIconHeader_text
         TokenProperty.SpacePaddingInset -> R.string.app_tokens_dimension_space_paddingInsetHeader_text
         TokenProperty.SpacePaddingStack -> R.string.app_tokens_dimension_space_paddingStackHeader_text
-        TokenProperty.SpacePaddingStackWithIcon -> R.string.app_tokens_dimension_space_paddingStackWithIconHeader_text
         TokenProperty.SpaceRowGap -> R.string.app_tokens_dimension_space_rowGapHeader_text
-        TokenProperty.SpaceRowGapWithIcon -> R.string.app_tokens_dimension_space_rowGapWithIconHeader_text
         TokenProperty.SpaceScaled -> R.string.app_tokens_dimension_space_scaledHeader_text
         else -> null
     }
@@ -180,49 +158,12 @@ private fun SpaceHeaderText(spaceTokenProperty: TokenProperty<TokenCategory.Dime
         Text(
             modifier = modifier.background(color = OudsColorKeyToken.Background.Emphasized.value),
             text = stringResource(id = textResId),
-            color = OudsColorKeyToken.Content.Default.OnBgEmphasized.value,
+            color = OudsColorKeyToken.Content.Default.value,
             style = OudsTypographyKeyToken.Body.Default.Medium.value
         )
     }
 }
 
-@Composable
-private fun SpaceHeaderImage(
-    spaceTokenProperty: TokenProperty<TokenCategory.Dimension.Space>,
-    modifier: Modifier = Modifier,
-    alignment: Alignment = Alignment.Center
-) {
-    val imageResId = when (spaceTokenProperty) {
-        TokenProperty.SpacePaddingInlineWithIcon,
-        TokenProperty.SpacePaddingStackWithIcon,
-        TokenProperty.SpaceColumnGapWithIcon,
-        TokenProperty.SpaceRowGapWithIcon -> R.drawable.ic_design_token_figma_no_padding
-        TokenProperty.SpacePaddingInlineWithArrow,
-        TokenProperty.SpaceColumnGapWithArrow -> R.drawable.ic_chevron_down
-        else -> null
-    }
-
-    if (imageResId != null) {
-        val paddingValue = 1.dp
-        val paddingValues = when (spaceTokenProperty) {
-            TokenProperty.SpacePaddingInlineWithIcon -> PaddingValues(start = paddingValue)
-            TokenProperty.SpacePaddingStackWithIcon -> PaddingValues(top = paddingValue)
-            TokenProperty.SpaceColumnGapWithIcon -> PaddingValues(end = paddingValue)
-            TokenProperty.SpaceRowGapWithIcon -> PaddingValues(bottom = paddingValue)
-            else -> PaddingValues(all = 0.dp)
-        }
-
-        Image(
-            modifier = modifier
-                .background(color = OudsColorKeyToken.Background.Emphasized.value)
-                .padding(paddingValues = paddingValues),
-            painter = painterResource(id = imageResId),
-            contentDescription = null,
-            alignment = alignment
-        )
-    }
-}
-
 @UiModePreviews.Default
 @Composable
 private fun PreviewGridHeader() = OudsPreview {
@@ -244,14 +185,8 @@ private val previewParameterValues: List<TokenProperty<TokenCategory.Dimension.S
         TokenProperty.SpaceScaled,
 //        TokenProperty.SpaceFixed,
 //        TokenProperty.SpacePaddingInline,
-//        TokenProperty.SpacePaddingInlineWithIcon,
-//        TokenProperty.SpacePaddingInlineWithArrow,
 //        TokenProperty.SpacePaddingStack,
-//        TokenProperty.SpacePaddingStackWithIcon,
 //        TokenProperty.SpacePaddingInset,
 //        TokenProperty.SpaceColumnGap,
-//        TokenProperty.SpaceColumnGapWithIcon,
-//        TokenProperty.SpaceColumnGapWithArrow,
 //        TokenProperty.SpaceRowGap,
-//        TokenProperty.SpaceRowGapWithIcon
     )
diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyIllustration.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyIllustration.kt
index fe5b26d4..1fbc2236 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyIllustration.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenPropertyIllustration.kt
@@ -82,7 +82,7 @@ fun BorderIllustrationBox(
     style: OudsBorderStyle = OudsBorderStyle.Solid,
     backgroundColor: Color = OudsColorKeyToken.Background.Secondary.value
 ) {
-    val borderColor = OudsColorKeyToken.Border.Default.value
+    val borderColor = OudsColorKeyToken.Border.Emphasized.value
     val modifier = when (style) {
         OudsBorderStyle.None -> Modifier
         OudsBorderStyle.Solid -> Modifier.border(width = width, color = borderColor, shape = shape)
@@ -156,87 +156,6 @@ fun SizeIconWithTextIllustrationRow(size: Dp, tokenName: String) {
     }
 }
 
-@Composable
-fun SpaceWithIconIllustrationColumn(size: Dp, verticalArrangement: Arrangement.Vertical = Arrangement.Top) {
-    Column(
-        modifier = Modifier
-            .size(defaultIllustrationSize)
-            .background(color = OudsColorKeyToken.Background.Emphasized.value),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = verticalArrangement
-    ) {
-        val image: @Composable () -> Unit = {
-            Image(
-                painter = painterResource(R.drawable.ic_design_token_figma_no_padding),
-                contentDescription = null,
-                contentScale = ContentScale.None
-            )
-        }
-
-        val space: @Composable () -> Unit = {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(height = size)
-                    .background(OudsColorKeyToken.Always.Info.value)
-            )
-        }
-
-        if (verticalArrangement == Arrangement.Bottom) {
-            image()
-            space()
-        } else {
-            space()
-            image()
-        }
-    }
-}
-
-@Composable
-fun SpaceWithIconIllustrationRow(size: Dp) {
-    SpaceWithImageIllustrationRow(
-        spaceSize = size,
-        imagePainter = painterResource(R.drawable.ic_design_token_figma_no_padding),
-        imageModifier = Modifier.padding(horizontal = 1.dp)
-    )
-}
-
-@Composable
-fun SpaceWithArrowIllustrationRow(size: Dp) {
-    SpaceWithImageIllustrationRow(
-        spaceSize = size,
-        imagePainter = painterResource(R.drawable.ic_chevron_down)
-    )
-}
-
-@Composable
-private fun SpaceWithImageIllustrationRow(
-    spaceSize: Dp,
-    imagePainter: Painter,
-    modifier: Modifier = Modifier,
-    imageModifier: Modifier = Modifier
-) {
-    Row(
-        modifier = modifier
-            .size(defaultIllustrationSize)
-            .background(color = OudsColorKeyToken.Background.Emphasized.value),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxHeight()
-                .width(width = spaceSize)
-                .background(OudsColorKeyToken.Always.Info.value)
-        )
-        Image(
-            modifier = imageModifier,
-            painter = imagePainter,
-            contentDescription = null,
-            contentScale = ContentScale.None
-        )
-    }
-}
-
 @Composable
 fun SpacePaddingInsetIllustrationBox(size: Dp) {
     IllustrationBox {
@@ -244,13 +163,13 @@ fun SpacePaddingInsetIllustrationBox(size: Dp) {
             modifier = Modifier
                 .fillMaxWidth()
                 .height(height = size)
-                .background(OudsColorKeyToken.Always.Info.value)
+                .background(OudsColorKeyToken.Content.Status.Info.value)
         )
         Box(
             modifier = Modifier
                 .fillMaxHeight()
                 .width(width = size)
-                .background(OudsColorKeyToken.Always.Info.value)
+                .background(OudsColorKeyToken.Content.Status.Info.value)
         )
     }
 }
@@ -272,7 +191,7 @@ fun SpaceIllustrationBox(
     }
     IllustrationBox(contentAlignment = contentAlignment) {
         Box(
-            modifier = dimensionBoxModifier.background(color = OudsColorKeyToken.Always.Info.value)
+            modifier = dimensionBoxModifier.background(color = OudsColorKeyToken.Content.Status.Info.value)
         )
     }
 }
diff --git a/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/DetailScreenHeader.kt b/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/DetailScreenHeader.kt
index 3d63cfae..57d00845 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/DetailScreenHeader.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/DetailScreenHeader.kt
@@ -29,6 +29,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.orange.ouds.app.R
+import com.orange.ouds.core.theme.OudsTheme
+import com.orange.ouds.core.theme.OudsThemeTweak
 import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.UiModePreviews
@@ -44,7 +46,7 @@ fun DetailScreenHeader(
     Column {
         Image(
             painter = painterResource(imageRes),
-            colorFilter = ColorFilter.tint(OudsColorKeyToken.Content.Default.OnBgEmphasized.value),
+            colorFilter = ColorFilter.tint(OudsColorKeyToken.Always.White.value),
             contentDescription = null,
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/LargeCard.kt b/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/LargeCard.kt
index 8e412717..1fe8483e 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/LargeCard.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/utilities/composable/LargeCard.kt
@@ -47,13 +47,12 @@ fun LargeCard(
     title: String,
     @DrawableRes imageRes: Int,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    Card(modifier = modifier, shape = RectangleShape, elevation = cardElevation(defaultElevation = OudsElevationKeyToken.Raised.value), onClick = onClick) {
-        Column(modifier = Modifier.background(OudsColorKeyToken.Elevation.Raised.value)) {
+    Card(shape = RectangleShape, elevation = cardElevation(defaultElevation = OudsElevationKeyToken.Raised.value), onClick = onClick) {
+        Column(modifier = Modifier.background(OudsColorKeyToken.Background.Primary.value)) {
             Image(
                 painter = painterResource(imageRes),
-                colorFilter = ColorFilter.tint(OudsColorKeyToken.Content.Default.OnBgEmphasized.value),
+                colorFilter = ColorFilter.tint(OudsColorKeyToken.Always.White.value),
                 contentDescription = null,
                 modifier = Modifier
                     .fillMaxWidth()
@@ -62,7 +61,10 @@ fun LargeCard(
                 contentScale = ContentScale.None
             )
             Column(
-                modifier = Modifier.padding(OudsSpaceKeyToken.Fixed.Medium.value)
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(OudsColorKeyToken.Action.Support.Enabled.value)
+                    .padding(OudsSpaceKeyToken.Fixed.Medium.value)
             ) {
                 Text(
                     text = title,
diff --git a/app/src/main/res/drawable/ic_design_token_figma_no_padding.xml b/app/src/main/res/drawable/ic_design_token_figma_no_padding.xml
deleted file mode 100644
index 732bc7d8..00000000
--- a/app/src/main/res/drawable/ic_design_token_figma_no_padding.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  ~ Software Name: OUDS Android
-  ~ SPDX-FileCopyrightText: Copyright (c) Orange SA
-  ~ SPDX-License-Identifier: MIT
-  ~
-  ~ This software is distributed under the MIT license,
-  ~ the text of which is available at https://opensource.org/license/MIT/
-  ~ or see the "LICENSE" file for more details.
-  ~
-  ~ Software description: Android library of reusable graphical components
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="24dp"
-    android:viewportWidth="22"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M21.594,6.306C21.586,6.19 21.549,6.078 21.487,5.979C21.426,5.88 21.34,5.798 21.239,5.74L11.349,0.093C11.242,0.032 11.121,0 10.998,0C10.875,0 10.755,0.032 10.648,0.093L0.757,5.74C0.649,5.802 0.56,5.892 0.497,5.999C0.435,6.107 0.402,6.229 0.401,6.353V17.647C0.401,17.772 0.434,17.894 0.497,18.002C0.559,18.11 0.649,18.199 0.757,18.26L10.648,23.908C10.755,23.968 10.875,24 10.998,24C11.121,24 11.242,23.968 11.349,23.908L21.239,18.26C21.347,18.199 21.437,18.11 21.5,18.002C21.562,17.894 21.595,17.772 21.595,17.648C21.579,17.59 21.609,6.356 21.594,6.306ZM10.998,1.519L19.465,6.353L14.277,9.315C12.639,7.26 9.357,7.261 7.72,9.315L2.532,6.353L10.998,1.519ZM13.824,12C13.832,13.567 12.519,14.835 10.998,14.824C9.478,14.835 8.164,13.567 8.172,12C8.16,10.473 9.444,9.165 10.998,9.177C12.553,9.165 13.837,10.473 13.824,12ZM10.292,22.078L1.814,17.238V7.57L7.018,10.541C6.08,12.992 7.743,15.789 10.292,16.177V22.078ZM20.183,17.238L11.705,22.078V16.177C14.253,15.789 15.917,12.992 14.979,10.541L20.183,7.57V17.238Z"
-        android:fillColor="#26B2FF"
-        android:fillType="evenOdd" />
-</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fdd68b92..723e48cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,9 +55,9 @@
     <string name="app_tokens_color_border_label">Border</string>
     <string name="app_tokens_color_brand_label">Brand</string>
     <string name="app_tokens_color_content_label">Content</string>
-    <string name="app_tokens_color_elevation_label">Elevation</string>
-    <string name="app_tokens_color_gradient_label">Gradient</string>
     <string name="app_tokens_color_decorative_label">Decorative</string>
+    <string name="app_tokens_color_overlay_label">Overlay</string>
+    <string name="app_tokens_color_surface_label">Surface</string>
 
     <!-- Tokens: dimension -->
     <string name="app_tokens_dimension_label">Dimension</string>
@@ -72,26 +72,14 @@
     <string name="app_tokens_dimension_space_fixedHeader_text">Fixed spacing refers to a constant distance between elements that remains the same regardless of factors like container size, screen resolution, or layout changes.</string>
     <string name="app_tokens_dimension_space_paddingInline_label">Padding inline</string>
     <string name="app_tokens_dimension_space_paddingInlineHeader_text">Padding inline includes the left and right padding of an object or a group of objects.</string>
-    <string name="app_tokens_dimension_space_paddingInlineWithIcon_label">Padding inline with icon</string>
-    <string name="app_tokens_dimension_space_paddingInlineWithIconHeader_text">Padding inline with icon includes the padding of a group of objects that includes an icon.</string>
-    <string name="app_tokens_dimension_space_paddingInlineWithArrow_label">Padding inline with arrow</string>
-    <string name="app_tokens_dimension_space_paddingInlineWithArrowHeader_text">Padding inline with arrow includes the padding of a group of objects that includes an arrow.</string>
     <string name="app_tokens_dimension_space_paddingStack_label">Padding stack</string>
     <string name="app_tokens_dimension_space_paddingStackHeader_text">Padding stack includes the top and bottom padding.</string>
-    <string name="app_tokens_dimension_space_paddingStackWithIcon_label">Padding stack with icon</string>
-    <string name="app_tokens_dimension_space_paddingStackWithIconHeader_text">Padding stack with icon includes the padding of a group of objects that includes an icon.</string>
     <string name="app_tokens_dimension_space_paddingInset_label">Padding inset</string>
     <string name="app_tokens_dimension_space_paddingInsetHeader_text">Padding inset includes the left, right, top, and bottom padding, with all parameters being equal.</string>
     <string name="app_tokens_dimension_space_columnGap_label">Column gap</string>
     <string name="app_tokens_dimension_space_columnGapHeader_text">Gap inline includes the vertical spacing between objects.</string>
-    <string name="app_tokens_dimension_space_columnGapWithIcon_label">Column gap with icon</string>
-    <string name="app_tokens_dimension_space_columnGapWithIconHeader_text">Gap inline with icon includes the vertical spacing between objects, one of which is an icon.</string>
-    <string name="app_tokens_dimension_space_columnGapWithArrow_label">Column gap with arrow</string>
-    <string name="app_tokens_dimension_space_columnGapWithArrowHeader_text">Gap inline with arrow includes the vertical spacing between objects, one of which is an arrow.</string>
     <string name="app_tokens_dimension_space_rowGap_label">Row gap</string>
     <string name="app_tokens_dimension_space_rowGapHeader_text">Gap stack includes the horizontal spacing between objects.</string>
-    <string name="app_tokens_dimension_space_rowGapWithIcon_label">Row gap with icon</string>
-    <string name="app_tokens_dimension_space_rowGapWithIconHeader_text">Gap stack with icon includes the horizontal spacing between objects, one of which is an icon.</string>
 
     <!-- Tokens: dimension/size -->
     <string name="app_tokens_dimension_size_label">Size</string>
diff --git a/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt b/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt
index 861252cc..dd7007e9 100644
--- a/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt
@@ -28,7 +28,6 @@ import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.BasicPreviewParameterProvider
 import com.orange.ouds.foundation.utilities.UiModePreviews
-import com.orange.ouds.theme.tokens.OudsColorKeyToken
 
 @Composable
 fun OudsButton(
@@ -66,7 +65,6 @@ fun OudsButton(
                 modifier = modifier,
                 text = text,
                 style = labelStyle.value,
-                color = OudsColorKeyToken.Content.OnAction.Primary.Enabled.value
             )
         }
     }
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
index 3198e146..d93810c6 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
@@ -20,220 +20,93 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Background
+import com.orange.ouds.theme.tokens.android.OudsAndroidColorDarkTokens
+import com.orange.ouds.theme.tokens.android.OudsAndroidColorLightTokens
+import com.orange.ouds.theme.tokens.android.OudsAndroidColorLightTokens.surfaceVariant
 import com.orange.ouds.theme.tokens.semantic.OudsColorSemanticTokens
 
 data class OudsColorScheme(
-    val transparentColors: Transparent,
     val actionColors: Action,
     val alwaysColors: Always,
     val backgroundColors: Background,
     val borderColors: Border,
-    val brandColors: Brand,
     val contentColors: Content,
-    val elevationColors: Elevation,
-    val gradientColors: Gradient,
     val decorativeColors: Decorative,
+    val opacityColors: Opacity,
+    val overlayColors: Overlay,
+    val surfaceColors: Surface,
 ) {
 
-    data class Transparent(
-        val transparentDefault: Color
-    )
-
     data class Action(
         val disabled: Color,
-        val disabledOnBgEmphasized: Color,
+        val enabled: Color,
+        val focus: Color,
+        val highlighted: Color,
+        val hover: Color,
+        val loading: Color,
         val negativeEnabled: Color,
         val negativeFocus: Color,
         val negativeHover: Color,
         val negativeLoading: Color,
         val negativePressed: Color,
-        val primaryEnabled: Color,
-        val primaryEnabledOnBgEmphasized: Color,
-        val primaryFocus: Color,
-        val primaryFocusOnBgEmphasized: Color,
-        val primaryHover: Color,
-        val primaryHoverOnBgEmphasized: Color,
-        val primaryLoading: Color,
-        val primaryLoadingOnBgEmphasized: Color,
-        val primaryPressed: Color,
-        val primaryPressedOnBgEmphasized: Color,
-        val secondaryEnabled: Color,
-        val secondaryEnabledOnBgEmphasized: Color,
-        val secondaryFocus: Color,
-        val secondaryFocusOnBgEmphasized: Color,
-        val secondaryHover: Color,
-        val secondaryHoverOnBgEmphasized: Color,
-        val secondaryLoading: Color,
-        val secondaryLoadingOnBgEmphasized: Color,
-        val secondaryPressed: Color,
-        val secondaryPressedOnBgEmphasized: Color,
+        val pressed: Color,
         val selected: Color,
-        val selectedOnBgEmphasized: Color,
+        val supportEnabled: Color,
+        val supportFocus: Color,
+        val supportHover: Color,
+        val supportLoading: Color,
+        val supportPressed: Color,
         val visited: Color,
-        val visitedOnBgEmphasized: Color,
     )
 
     data class Always(
-        val accent: Color,
         val black: Color,
-        val info: Color,
-        val negative: Color,
-        val onAccent: Color,
         val onBlack: Color,
-        val onInfo: Color,
-        val onNegative: Color,
-        val onPositive: Color,
-        val onWarning: Color,
         val onWhite: Color,
-        val positive: Color,
-        val warning: Color,
         val white: Color,
     )
 
     data class Background(
-        val brandPrimary: Color,
         val emphasized: Color,
         val primary: Color,
         val secondary: Color,
-        val statusAccentEmphasized: Color,
-        val statusAccentMuted: Color,
-        val statusAccentMutedOnBgEmphasized: Color,
-        val statusInfoEmphasized: Color,
-        val statusInfoMuted: Color,
-        val statusInfoMutedOnBgEmphasized: Color,
-        val statusNegativeEmphasized: Color,
-        val statusNegativeMuted: Color,
-        val statusNegativeMutedOnBgEmphasized: Color,
-        val statusNeutral: Color,
-        val statusNeutralOnBgEmphasized: Color,
-        val statusPositiveEmphasized: Color,
-        val statusPositiveMuted: Color,
-        val statusPositiveMutedOnBgEmphasized: Color,
-        val statusWarningEmphasized: Color,
-        val statusWarningMuted: Color,
-        val statusWarningMutedOnBgEmphasized: Color,
         val tertiary: Color,
     )
 
     data class Border(
         val brandPrimary: Color,
-        val brandPrimaryOnBgEmphasized: Color,
         val default: Color,
-        val defaultOnBgEmphasized: Color,
         val emphasized: Color,
-        val emphasizedOnBgEmphasized: Color,
         val focus: Color,
         val focusInset: Color,
-        val focusInsetOnBgEmphasized: Color,
-        val focusOnBgEmphasized: Color,
         val onBrandPrimary: Color,
     )
 
-    data class Brand(
-        val accentDefault: Color,
-        val accentHigh: Color,
-        val accentHighest: Color,
-        val accentLowest: Color,
-        val infoDefault: Color,
-        val infoHighest: Color,
-        val infoLowest: Color,
-        val negativeDefault: Color,
-        val negativeHigh: Color,
-        val negativeHigher: Color,
-        val negativeHighest: Color,
-        val negativeLowest: Color,
-        val neutralEmphasizedBlack: Color,
-        val neutralEmphasizedHigh: Color,
-        val neutralEmphasizedHigher: Color,
-        val neutralEmphasizedHighest: Color,
-        val neutralEmphasizedLow: Color,
-        val neutralEmphasizedLower: Color,
-        val neutralEmphasizedLowest: Color,
-        val neutralEmphasizedMedium: Color,
-        val neutralMutedHighest: Color,
-        val neutralMutedLow: Color,
-        val neutralMutedLower: Color,
-        val neutralMutedLowest: Color,
-        val neutralMutedMedium: Color,
-        val neutralMutedWhite: Color,
-        val positiveDefault: Color,
-        val positiveHighest: Color,
-        val positiveLowest: Color,
-        val primaryDefault: Color,
-        val primaryLow: Color,
-        val warningDefault: Color,
-        val warningHigh: Color,
-        val warningHighest: Color,
-        val warningLowest: Color,
-    )
-
     data class Content(
         val brandPrimary: Color,
-        val brandPrimaryOnBgEmphasized: Color,
         val default: Color,
-        val defaultOnBgEmphasized: Color,
         val disabled: Color,
-        val disabledOnBgEmphasized: Color,
         val muted: Color,
-        val mutedOnBgEmphasized: Color,
         val onActionDisabled: Color,
-        val onActionDisabledOnBgEmphasized: Color,
+        val onActionEnabled: Color,
+        val onActionFocus: Color,
+        val onActionHighlighted: Color,
+        val onActionHover: Color,
+        val onActionLoading: Color,
         val onActionNegative: Color,
-        val onActionPrimaryEnabled: Color,
-        val onActionPrimaryEnabledOnBgEmphasized: Color,
-        val onActionPrimaryFocus: Color,
-        val onActionPrimaryFocusOnBgEmphasized: Color,
-        val onActionPrimaryHover: Color,
-        val onActionPrimaryHoverOnBgEmphasized: Color,
-        val onActionPrimaryLoading: Color,
-        val onActionPrimaryLoadingOnBgEmphasized: Color,
-        val onActionPrimaryPressed: Color,
-        val onActionPrimaryPressedOnBgEmphasized: Color,
+        val onActionPressed: Color,
         val onBrandPrimary: Color,
-        val onStatusAccentEmphasized: Color,
-        val onStatusAccentMuted: Color,
-        val onStatusAccentMutedOnBgEmphasized: Color,
-        val onStatusInfoEmphasized: Color,
-        val onStatusInfoMuted: Color,
-        val onStatusInfoMutedOnBgEmphasized: Color,
-        val onStatusNegativeEmphasized: Color,
-        val onStatusNegativeMuted: Color,
-        val onStatusNegativeMutedOnBgEmphasized: Color,
-        val onStatusPositiveEmphasized: Color,
-        val onStatusPositiveMuted: Color,
-        val onStatusPositiveMutedOnBgEmphasized: Color,
-        val onStatusWarningEmphasized: Color,
-        val onStatusWarningMuted: Color,
-        val onStatusWarningMutedOnBgEmphasized: Color,
+        val onOverlayEmphasized: Color,
+        val onStatusEmphasized: Color,
+        val onStatusEmphasizedNeutral: Color,
+        val onStatusMuted: Color,
         val statusInfo: Color,
         val statusNegative: Color,
         val statusPositive: Color,
         val statusWarning: Color,
     )
 
-    data class Elevation(
-        val drag: Color,
-        val dragOnBgEmphasized: Color,
-        val dragOnBgSecondary: Color,
-        val modal: Color,
-        val overlayDefault: Color,
-        val overlayDefaultOnBgEmphasized: Color,
-        val overlayDefaultOnBgSecondary: Color,
-        val overlayEmphasized: Color,
-        val overlayEmphasizedOnBgEmphasized: Color,
-        val overlayEmphasizedOnBgSecondary: Color,
-        val raised: Color,
-        val raisedOnBgEmphasized: Color,
-        val raisedOnBgSecondary: Color,
-    )
-
-    data class Gradient(
-        val skeletonMiddle: Color,
-        val skeletonMiddleOnBgEmphasized: Color,
-        val skeletonStartEnd: Color,
-        val skeletonStartEndOnBgEmphasized: Color,
-    )
-
     data class Decorative(
         val accent1Default: Color,
         val accent1Emphasized: Color,
@@ -266,216 +139,113 @@ data class OudsColorScheme(
         val skinTint800: Color,
         val skinTint900: Color,
     )
+
+    data class Opacity(
+        val invisibleBlack: Color,
+        val invisibleWhite: Color
+    )
+
+    data class Overlay(
+        val default: Color,
+        val drag: Color,
+        val emphasized: Color,
+        val modal: Color,
+    )
+
+    data class Surface(
+        val brandPrimary: Color,
+        val statusAccentEmphasized: Color,
+        val statusAccentMuted: Color,
+        val statusInfoEmphasized: Color,
+        val statusInfoMuted: Color,
+        val statusNegativeEmphasized: Color,
+        val statusNegativeMuted: Color,
+        val statusNeutralEmphasized: Color,
+        val statusNeutralMuted: Color,
+        val statusPositiveEmphasized: Color,
+        val statusPositiveMuted: Color,
+        val statusWarningEmphasized: Color,
+        val statusWarningMuted: Color,
+    )
+
 }
 
 val OudsColorSemanticTokens.lightColorScheme: OudsColorScheme
     get() = OudsColorScheme(
-        transparentColors = OudsColorScheme.Transparent(
-            transparentDefault = transparentColorTokens.transparentDefaultLight,
-        ),
         actionColors = with(actionColorTokens) {
             OudsColorScheme.Action(
                 disabled = actionDisabledLight,
-                disabledOnBgEmphasized = actionDisabledOnBgEmphasizedLight,
                 negativeEnabled = actionNegativeEnabledLight,
                 negativeFocus = actionNegativeFocusLight,
                 negativeHover = actionNegativeHoverLight,
                 negativeLoading = actionNegativeLoadingLight,
                 negativePressed = actionNegativePressedLight,
-                primaryEnabled = actionPrimaryEnabledLight,
-                primaryEnabledOnBgEmphasized = actionPrimaryEnabledOnBgEmphasizedLight,
-                primaryFocus = actionPrimaryFocusLight,
-                primaryFocusOnBgEmphasized = actionPrimaryFocusOnBgEmphasizedLight,
-                primaryHover = actionPrimaryHoverLight,
-                primaryHoverOnBgEmphasized = actionPrimaryHoverOnBgEmphasizedLight,
-                primaryLoading = actionPrimaryLoadingLight,
-                primaryLoadingOnBgEmphasized = actionPrimaryLoadingOnBgEmphasizedLight,
-                primaryPressed = actionPrimaryPressedLight,
-                primaryPressedOnBgEmphasized = actionPrimaryPressedOnBgEmphasizedLight,
-                secondaryEnabled = actionSecondaryEnabledLight,
-                secondaryEnabledOnBgEmphasized = actionSecondaryEnabledOnBgEmphasizedLight,
-                secondaryFocus = actionSecondaryFocusLight,
-                secondaryFocusOnBgEmphasized = actionSecondaryFocusOnBgEmphasizedLight,
-                secondaryHover = actionSecondaryHoverLight,
-                secondaryHoverOnBgEmphasized = actionSecondaryHoverOnBgEmphasizedLight,
-                secondaryLoading = actionSecondaryLoadingLight,
-                secondaryLoadingOnBgEmphasized = actionSecondaryLoadingOnBgEmphasizedLight,
-                secondaryPressed = actionSecondaryPressedLight,
-                secondaryPressedOnBgEmphasized = actionSecondaryPressedOnBgEmphasizedLight,
+                enabled = actionEnabledLight,
+                focus = actionFocusLight,
+                highlighted = actionHighlightedLight,
+                hover = actionHoverLight,
+                loading = actionLoadingLight,
+                pressed = actionPressedLight,
+                supportEnabled = actionSupportEnabledLight,
+                supportFocus = actionSupportFocusLight,
+                supportHover = actionSupportHoverLight,
+                supportLoading = actionSupportLoadingLight,
+                supportPressed = actionSupportPressedLight,
                 selected = actionSelectedLight,
-                selectedOnBgEmphasized = actionSelectedOnBgEmphasizedLight,
                 visited = actionVisitedLight,
-                visitedOnBgEmphasized = actionVisitedOnBgEmphasizedLight,
             )
         },
         alwaysColors = with(alwaysColorTokens) {
             OudsColorScheme.Always(
-                accent = alwaysAccentLight,
                 black = alwaysBlackLight,
-                info = alwaysInfoLight,
-                negative = alwaysNegativeLight,
-                onAccent = alwaysOnAccentLight,
                 onBlack = alwaysOnBlackLight,
-                onInfo = alwaysOnInfoLight,
-                onNegative = alwaysOnNegativeLight,
-                onPositive = alwaysOnPositiveLight,
-                onWarning = alwaysOnWarningLight,
                 onWhite = alwaysOnWhiteLight,
-                positive = alwaysPositiveLight,
-                warning = alwaysWarningLight,
                 white = alwaysWhiteLight,
             )
         },
         backgroundColors = with(backgroundColorTokens) {
             OudsColorScheme.Background(
-                brandPrimary = bgBrandPrimaryLight,
                 emphasized = bgEmphasizedLight,
                 primary = bgPrimaryLight,
                 secondary = bgSecondaryLight,
-                statusAccentEmphasized = bgStatusAccentEmphasizedLight,
-                statusAccentMuted = bgStatusAccentMutedLight,
-                statusAccentMutedOnBgEmphasized = bgStatusAccentMutedOnBgEmphasizedLight,
-                statusInfoEmphasized = bgStatusInfoEmphasizedLight,
-                statusInfoMuted = bgStatusInfoMutedLight,
-                statusInfoMutedOnBgEmphasized = bgStatusInfoMutedOnBgEmphasizedLight,
-                statusNegativeEmphasized = bgStatusNegativeEmphasizedLight,
-                statusNegativeMuted = bgStatusNegativeMutedLight,
-                statusNegativeMutedOnBgEmphasized = bgStatusNegativeMutedOnBgEmphasizedLight,
-                statusNeutral = bgStatusNeutralLight,
-                statusNeutralOnBgEmphasized = bgStatusNeutralOnBgEmphasizedLight,
-                statusPositiveEmphasized = bgStatusPositiveEmphasizedLight,
-                statusPositiveMuted = bgStatusPositiveMutedLight,
-                statusPositiveMutedOnBgEmphasized = bgStatusPositiveMutedOnBgEmphasizedLight,
-                statusWarningEmphasized = bgStatusWarningEmphasizedLight,
-                statusWarningMuted = bgStatusWarningMutedLight,
-                statusWarningMutedOnBgEmphasized = bgStatusWarningMutedOnBgEmphasizedLight,
                 tertiary = bgTertiaryLight,
             )
         },
         borderColors = with(borderColorTokens) {
             OudsColorScheme.Border(
                 brandPrimary = borderBrandPrimaryLight,
-                brandPrimaryOnBgEmphasized = borderBrandPrimaryOnBgEmphasizedLight,
                 default = borderDefaultLight,
-                defaultOnBgEmphasized = borderDefaultOnBgEmphasizedLight,
                 emphasized = borderEmphasizedLight,
-                emphasizedOnBgEmphasized = borderEmphasizedOnBgEmphasizedLight,
                 focus = borderFocusLight,
                 focusInset = borderFocusInsetLight,
-                focusInsetOnBgEmphasized = borderFocusInsetOnBgEmphasizedLight,
-                focusOnBgEmphasized = borderFocusOnBgEmphasizedLight,
                 onBrandPrimary = borderOnBrandPrimaryLight,
             )
         },
-        brandColors = with(brandColorTokens) {
-            OudsColorScheme.Brand(
-                accentDefault = brandAccentDefaultLight,
-                accentHigh = brandAccentHighLight,
-                accentHighest = brandAccentHighestLight,
-                accentLowest = brandAccentLowestLight,
-                infoDefault = brandInfoDefaultLight,
-                infoHighest = brandInfoHighestLight,
-                infoLowest = brandInfoLowestLight,
-                negativeDefault = brandNegativeDefaultLight,
-                negativeHigh = brandNegativeHighLight,
-                negativeHigher = brandNegativeHigherLight,
-                negativeHighest = brandNegativeHighestLight,
-                negativeLowest = brandNegativeLowestLight,
-                neutralEmphasizedBlack = brandNeutralEmphasizedBlackLight,
-                neutralEmphasizedHigh = brandNeutralEmphasizedHighLight,
-                neutralEmphasizedHigher = brandNeutralEmphasizedHigherLight,
-                neutralEmphasizedHighest = brandNeutralEmphasizedHighestLight,
-                neutralEmphasizedLow = brandNeutralEmphasizedLowLight,
-                neutralEmphasizedLower = brandNeutralEmphasizedLowerLight,
-                neutralEmphasizedLowest = brandNeutralEmphasizedLowestLight,
-                neutralEmphasizedMedium = brandNeutralEmphasizedMediumLight,
-                neutralMutedHighest = brandNeutralMutedHighestLight,
-                neutralMutedLow = brandNeutralMutedLowLight,
-                neutralMutedLower = brandNeutralMutedLowerLight,
-                neutralMutedLowest = brandNeutralMutedLowestLight,
-                neutralMutedMedium = brandNeutralMutedMediumLight,
-                neutralMutedWhite = brandNeutralMutedWhiteLight,
-                positiveDefault = brandPositiveDefaultLight,
-                positiveHighest = brandPositiveHighestLight,
-                positiveLowest = brandPositiveLowestLight,
-                primaryDefault = brandPrimaryDefaultLight,
-                primaryLow = brandPrimaryLowLight,
-                warningDefault = brandWarningDefaultLight,
-                warningHigh = brandWarningHighLight,
-                warningHighest = brandWarningHighestLight,
-                warningLowest = brandWarningLowestLight,
-            )
-        },
         contentColors = with(contentColorTokens) {
             OudsColorScheme.Content(
                 brandPrimary = contentBrandPrimaryLight,
-                brandPrimaryOnBgEmphasized = contentBrandPrimaryOnBgEmphasizedLight,
                 default = contentDefaultLight,
-                defaultOnBgEmphasized = contentDefaultOnBgEmphasizedLight,
                 disabled = contentDisabledLight,
-                disabledOnBgEmphasized = contentDisabledOnBgEmphasizedLight,
                 muted = contentMutedLight,
-                mutedOnBgEmphasized = contentMutedOnBgEmphasizedLight,
                 onActionDisabled = contentOnActionDisabledLight,
-                onActionDisabledOnBgEmphasized = contentOnActionDisabledOnBgEmphasizedLight,
                 onActionNegative = contentOnActionNegativeLight,
-                onActionPrimaryEnabled = contentOnActionPrimaryEnabledLight,
-                onActionPrimaryEnabledOnBgEmphasized = contentOnActionPrimaryEnabledOnBgEmphasizedLight,
-                onActionPrimaryFocus = contentOnActionPrimaryFocusLight,
-                onActionPrimaryFocusOnBgEmphasized = contentOnActionPrimaryFocusOnBgEmphasizedLight,
-                onActionPrimaryHover = contentOnActionPrimaryHoverLight,
-                onActionPrimaryHoverOnBgEmphasized = contentOnActionPrimaryHoverOnBgEmphasizedLight,
-                onActionPrimaryLoading = contentOnActionPrimaryLoadingLight,
-                onActionPrimaryLoadingOnBgEmphasized = contentOnActionPrimaryLoadingOnBgEmphasizedLight,
-                onActionPrimaryPressed = contentOnActionPrimaryPressedLight,
-                onActionPrimaryPressedOnBgEmphasized = contentOnActionPrimaryPressedOnBgEmphasizedLight,
+                onActionEnabled = contentOnActionEnabledLight,
+                onActionFocus = contentOnActionFocusLight,
+                onActionHighlighted = contentOnActionHighlightedLight,
+                onActionHover = contentOnActionHoverLight,
+                onActionLoading = contentOnActionLoadingLight,
+                onActionPressed = contentOnActionPressedLight,
                 onBrandPrimary = contentOnBrandPrimaryLight,
-                onStatusAccentEmphasized = contentOnStatusAccentEmphasizedLight,
-                onStatusAccentMuted = contentOnStatusAccentMutedLight,
-                onStatusAccentMutedOnBgEmphasized = contentOnStatusAccentMutedOnBgEmphasizedLight,
-                onStatusInfoEmphasized = contentOnStatusInfoEmphasizedLight,
-                onStatusInfoMuted = contentOnStatusInfoMutedLight,
-                onStatusInfoMutedOnBgEmphasized = contentOnStatusInfoMutedOnBgEmphasizedLight,
-                onStatusNegativeEmphasized = contentOnStatusNegativeEmphasizedLight,
-                onStatusNegativeMuted = contentOnStatusNegativeMutedLight,
-                onStatusNegativeMutedOnBgEmphasized = contentOnStatusNegativeMutedOnBgEmphasizedLight,
-                onStatusPositiveEmphasized = contentOnStatusPositiveEmphasizedLight,
-                onStatusPositiveMuted = contentOnStatusPositiveMutedLight,
-                onStatusPositiveMutedOnBgEmphasized = contentOnStatusPositiveMutedOnBgEmphasizedLight,
-                onStatusWarningEmphasized = contentOnStatusWarningEmphasizedLight,
-                onStatusWarningMuted = contentOnStatusWarningMutedLight,
-                onStatusWarningMutedOnBgEmphasized = contentOnStatusWarningMutedOnBgEmphasizedLight,
+                onOverlayEmphasized = contentOnOverlayEmphasizedLight,
+                onStatusEmphasized = contentOnStatusEmphasizedLight,
+                onStatusEmphasizedNeutral = contentOnStatusEmphasizedNeutralLight,
+                onStatusMuted = contentOnStatusMutedLight,
                 statusInfo = contentStatusInfoLight,
                 statusNegative = contentStatusNegativeLight,
                 statusPositive = contentStatusPositiveLight,
                 statusWarning = contentStatusWarningLight,
             )
         },
-        elevationColors = with(elevationColorTokens) {
-            OudsColorScheme.Elevation(
-                drag = elevationDragLight,
-                dragOnBgEmphasized = elevationDragOnBgEmphasizedLight,
-                dragOnBgSecondary = elevationDragOnBgSecondaryLight,
-                modal = elevationModalLight,
-                overlayDefault = elevationOverlayDefaultLight,
-                overlayDefaultOnBgEmphasized = elevationOverlayDefaultOnBgEmphasizedLight,
-                overlayDefaultOnBgSecondary = elevationOverlayDefaultOnBgSecondaryLight,
-                overlayEmphasized = elevationOverlayEmphasizedLight,
-                overlayEmphasizedOnBgEmphasized = elevationOverlayEmphasizedOnBgEmphasizedLight,
-                overlayEmphasizedOnBgSecondary = elevationOverlayEmphasizedOnBgSecondaryLight,
-                raised = elevationRaisedLight,
-                raisedOnBgEmphasized = elevationRaisedOnBgEmphasizedLight,
-                raisedOnBgSecondary = elevationRaisedOnBgSecondaryLight,
-            )
-        },
-        gradientColors = with(gradientColorTokens) {
-            OudsColorScheme.Gradient(
-                skeletonMiddle = gradientSkeletonMiddleLight,
-                skeletonMiddleOnBgEmphasized = gradientSkeletonMiddleOnBgEmphasizedLight,
-                skeletonStartEnd = gradientSkeletonStartEndLight,
-                skeletonStartEndOnBgEmphasized = gradientSkeletonStartEndOnBgEmphasizedLight,
-            )
-        },
         decorativeColors = with(decorativeColorTokens) {
             OudsColorScheme.Decorative(
                 accent1Default = decorativeAccent1DefaultLight,
@@ -510,216 +280,115 @@ val OudsColorSemanticTokens.lightColorScheme: OudsColorScheme
                 skinTint900 = decorativeSkinTint900Light,
             )
         },
+        opacityColors = with(opacityColorTokens) {
+            OudsColorScheme.Opacity(
+                invisibleBlack = opacityInvisibleBlackLight,
+                invisibleWhite = opacityInvisibleWhiteLight,
+            )
+        },
+        overlayColors = with(overlayColorTokens) {
+            OudsColorScheme.Overlay(
+                default = overlayDefaultLight,
+                drag = overlayDragLight,
+                emphasized = overlayEmphasizedLight,
+                modal = overlayModalLight
+            )
+        },
+        surfaceColors = with(surfaceColorTokens) {
+            OudsColorScheme.Surface(
+                brandPrimary = surfaceBrandPrimaryLight,
+                statusAccentEmphasized = surfaceStatusAccentEmphasizedLight,
+                statusAccentMuted = surfaceStatusAccentMutedLight,
+                statusInfoEmphasized = surfaceStatusInfoEmphasizedLight,
+                statusInfoMuted = surfaceStatusInfoMutedLight,
+                statusNegativeEmphasized = surfaceStatusNegativeEmphasizedLight,
+                statusNegativeMuted = surfaceStatusNegativeMutedLight,
+                statusNeutralEmphasized = surfaceStatusNeutralEmphasizedLight,
+                statusNeutralMuted = surfaceStatusNeutralMutedLight,
+                statusPositiveEmphasized = surfaceStatusPositiveEmphasizedLight,
+                statusPositiveMuted = surfaceStatusPositiveMutedLight,
+                statusWarningEmphasized = surfaceStatusWarningEmphasizedLight,
+                statusWarningMuted = surfaceStatusWarningMutedLight,
+            )
+        },
     )
 
 val OudsColorSemanticTokens.darkColorScheme: OudsColorScheme
     get() = OudsColorScheme(
-        transparentColors = OudsColorScheme.Transparent(
-            transparentDefault = transparentColorTokens.transparentDefaultDark,
-        ),
         actionColors = with(actionColorTokens) {
             OudsColorScheme.Action(
                 disabled = actionDisabledDark,
-                disabledOnBgEmphasized = actionDisabledOnBgEmphasizedDark,
                 negativeEnabled = actionNegativeEnabledDark,
                 negativeFocus = actionNegativeFocusDark,
                 negativeHover = actionNegativeHoverDark,
                 negativeLoading = actionNegativeLoadingDark,
                 negativePressed = actionNegativePressedDark,
-                primaryEnabled = actionPrimaryEnabledDark,
-                primaryEnabledOnBgEmphasized = actionPrimaryEnabledOnBgEmphasizedDark,
-                primaryFocus = actionPrimaryFocusDark,
-                primaryFocusOnBgEmphasized = actionPrimaryFocusOnBgEmphasizedDark,
-                primaryHover = actionPrimaryHoverDark,
-                primaryHoverOnBgEmphasized = actionPrimaryHoverOnBgEmphasizedDark,
-                primaryLoading = actionPrimaryLoadingDark,
-                primaryLoadingOnBgEmphasized = actionPrimaryLoadingOnBgEmphasizedDark,
-                primaryPressed = actionPrimaryPressedDark,
-                primaryPressedOnBgEmphasized = actionPrimaryPressedOnBgEmphasizedDark,
-                secondaryEnabled = actionSecondaryEnabledDark,
-                secondaryEnabledOnBgEmphasized = actionSecondaryEnabledOnBgEmphasizedDark,
-                secondaryFocus = actionSecondaryFocusDark,
-                secondaryFocusOnBgEmphasized = actionSecondaryFocusOnBgEmphasizedDark,
-                secondaryHover = actionSecondaryHoverDark,
-                secondaryHoverOnBgEmphasized = actionSecondaryHoverOnBgEmphasizedDark,
-                secondaryLoading = actionSecondaryLoadingDark,
-                secondaryLoadingOnBgEmphasized = actionSecondaryLoadingOnBgEmphasizedDark,
-                secondaryPressed = actionSecondaryPressedDark,
-                secondaryPressedOnBgEmphasized = actionSecondaryPressedOnBgEmphasizedDark,
+                enabled = actionEnabledDark,
+                focus = actionFocusDark,
+                highlighted = actionHighlightedDark,
+                hover = actionHoverDark,
+                loading = actionLoadingDark,
+                pressed = actionPressedDark,
+                supportEnabled = actionSupportEnabledDark,
+                supportFocus = actionSupportFocusDark,
+                supportHover = actionSupportHoverDark,
+                supportLoading = actionSupportLoadingDark,
+                supportPressed = actionSupportPressedDark,
                 selected = actionSelectedDark,
-                selectedOnBgEmphasized = actionSelectedOnBgEmphasizedDark,
                 visited = actionVisitedDark,
-                visitedOnBgEmphasized = actionVisitedOnBgEmphasizedDark,
             )
         },
         alwaysColors = with(alwaysColorTokens) {
             OudsColorScheme.Always(
-                accent = alwaysAccentDark,
                 black = alwaysBlackDark,
-                info = alwaysInfoDark,
-                negative = alwaysNegativeDark,
-                onAccent = alwaysOnAccentDark,
                 onBlack = alwaysOnBlackDark,
-                onInfo = alwaysOnInfoDark,
-                onNegative = alwaysOnNegativeDark,
-                onPositive = alwaysOnPositiveDark,
-                onWarning = alwaysOnWarningDark,
                 onWhite = alwaysOnWhiteDark,
-                positive = alwaysPositiveDark,
-                warning = alwaysWarningDark,
                 white = alwaysWhiteDark,
             )
         },
         backgroundColors = with(backgroundColorTokens) {
             OudsColorScheme.Background(
-                brandPrimary = bgBrandPrimaryDark,
                 emphasized = bgEmphasizedDark,
                 primary = bgPrimaryDark,
                 secondary = bgSecondaryDark,
-                statusAccentEmphasized = bgStatusAccentEmphasizedDark,
-                statusAccentMuted = bgStatusAccentMutedDark,
-                statusAccentMutedOnBgEmphasized = bgStatusAccentMutedOnBgEmphasizedDark,
-                statusInfoEmphasized = bgStatusInfoEmphasizedDark,
-                statusInfoMuted = bgStatusInfoMutedDark,
-                statusInfoMutedOnBgEmphasized = bgStatusInfoMutedOnBgEmphasizedDark,
-                statusNegativeEmphasized = bgStatusNegativeEmphasizedDark,
-                statusNegativeMuted = bgStatusNegativeMutedDark,
-                statusNegativeMutedOnBgEmphasized = bgStatusNegativeMutedOnBgEmphasizedDark,
-                statusNeutral = bgStatusNeutralDark,
-                statusNeutralOnBgEmphasized = bgStatusNeutralOnBgEmphasizedDark,
-                statusPositiveEmphasized = bgStatusPositiveEmphasizedDark,
-                statusPositiveMuted = bgStatusPositiveMutedDark,
-                statusPositiveMutedOnBgEmphasized = bgStatusPositiveMutedOnBgEmphasizedDark,
-                statusWarningEmphasized = bgStatusWarningEmphasizedDark,
-                statusWarningMuted = bgStatusWarningMutedDark,
-                statusWarningMutedOnBgEmphasized = bgStatusWarningMutedOnBgEmphasizedDark,
                 tertiary = bgTertiaryDark,
             )
         },
         borderColors = with(borderColorTokens) {
             OudsColorScheme.Border(
                 brandPrimary = borderBrandPrimaryDark,
-                brandPrimaryOnBgEmphasized = borderBrandPrimaryOnBgEmphasizedDark,
                 default = borderDefaultDark,
-                defaultOnBgEmphasized = borderDefaultOnBgEmphasizedDark,
                 emphasized = borderEmphasizedDark,
-                emphasizedOnBgEmphasized = borderEmphasizedOnBgEmphasizedDark,
                 focus = borderFocusDark,
                 focusInset = borderFocusInsetDark,
-                focusInsetOnBgEmphasized = borderFocusInsetOnBgEmphasizedDark,
-                focusOnBgEmphasized = borderFocusOnBgEmphasizedDark,
                 onBrandPrimary = borderOnBrandPrimaryDark,
             )
         },
-        brandColors = with(brandColorTokens) {
-            OudsColorScheme.Brand(
-                accentDefault = brandAccentDefaultDark,
-                accentHigh = brandAccentHighDark,
-                accentHighest = brandAccentHighestDark,
-                accentLowest = brandAccentLowestDark,
-                infoDefault = brandInfoDefaultDark,
-                infoHighest = brandInfoHighestDark,
-                infoLowest = brandInfoLowestDark,
-                negativeDefault = brandNegativeDefaultDark,
-                negativeHigh = brandNegativeHighDark,
-                negativeHigher = brandNegativeHigherDark,
-                negativeHighest = brandNegativeHighestDark,
-                negativeLowest = brandNegativeLowestDark,
-                neutralEmphasizedBlack = brandNeutralEmphasizedBlackDark,
-                neutralEmphasizedHigh = brandNeutralEmphasizedHighDark,
-                neutralEmphasizedHigher = brandNeutralEmphasizedHigherDark,
-                neutralEmphasizedHighest = brandNeutralEmphasizedHighestDark,
-                neutralEmphasizedLow = brandNeutralEmphasizedLowDark,
-                neutralEmphasizedLower = brandNeutralEmphasizedLowerDark,
-                neutralEmphasizedLowest = brandNeutralEmphasizedLowestDark,
-                neutralEmphasizedMedium = brandNeutralEmphasizedMediumDark,
-                neutralMutedHighest = brandNeutralMutedHighestDark,
-                neutralMutedLow = brandNeutralMutedLowDark,
-                neutralMutedLower = brandNeutralMutedLowerDark,
-                neutralMutedLowest = brandNeutralMutedLowestDark,
-                neutralMutedMedium = brandNeutralMutedMediumDark,
-                neutralMutedWhite = brandNeutralMutedWhiteDark,
-                positiveDefault = brandPositiveDefaultDark,
-                positiveHighest = brandPositiveHighestDark,
-                positiveLowest = brandPositiveLowestDark,
-                primaryDefault = brandPrimaryDefaultDark,
-                primaryLow = brandPrimaryLowDark,
-                warningDefault = brandWarningDefaultDark,
-                warningHigh = brandWarningHighDark,
-                warningHighest = brandWarningHighestDark,
-                warningLowest = brandWarningLowestDark,
-            )
-        },
         contentColors = with(contentColorTokens) {
             OudsColorScheme.Content(
                 brandPrimary = contentBrandPrimaryDark,
-                brandPrimaryOnBgEmphasized = contentBrandPrimaryOnBgEmphasizedDark,
                 default = contentDefaultDark,
-                defaultOnBgEmphasized = contentDefaultOnBgEmphasizedDark,
                 disabled = contentDisabledDark,
-                disabledOnBgEmphasized = contentDisabledOnBgEmphasizedDark,
                 muted = contentMutedDark,
-                mutedOnBgEmphasized = contentMutedOnBgEmphasizedDark,
                 onActionDisabled = contentOnActionDisabledDark,
-                onActionDisabledOnBgEmphasized = contentOnActionDisabledOnBgEmphasizedDark,
                 onActionNegative = contentOnActionNegativeDark,
-                onActionPrimaryEnabled = contentOnActionPrimaryEnabledDark,
-                onActionPrimaryEnabledOnBgEmphasized = contentOnActionPrimaryEnabledOnBgEmphasizedDark,
-                onActionPrimaryFocus = contentOnActionPrimaryFocusDark,
-                onActionPrimaryFocusOnBgEmphasized = contentOnActionPrimaryFocusOnBgEmphasizedDark,
-                onActionPrimaryHover = contentOnActionPrimaryHoverDark,
-                onActionPrimaryHoverOnBgEmphasized = contentOnActionPrimaryHoverOnBgEmphasizedDark,
-                onActionPrimaryLoading = contentOnActionPrimaryLoadingDark,
-                onActionPrimaryLoadingOnBgEmphasized = contentOnActionPrimaryLoadingOnBgEmphasizedDark,
-                onActionPrimaryPressed = contentOnActionPrimaryPressedDark,
-                onActionPrimaryPressedOnBgEmphasized = contentOnActionPrimaryPressedOnBgEmphasizedDark,
+                onActionEnabled = contentOnActionEnabledDark,
+                onActionFocus = contentOnActionFocusDark,
+                onActionHighlighted = contentOnActionHighlightedDark,
+                onActionHover = contentOnActionHoverDark,
+                onActionLoading = contentOnActionLoadingDark,
+                onActionPressed = contentOnActionPressedDark,
                 onBrandPrimary = contentOnBrandPrimaryDark,
-                onStatusAccentEmphasized = contentOnStatusAccentEmphasizedDark,
-                onStatusAccentMuted = contentOnStatusAccentMutedDark,
-                onStatusAccentMutedOnBgEmphasized = contentOnStatusAccentMutedOnBgEmphasizedDark,
-                onStatusInfoEmphasized = contentOnStatusInfoEmphasizedDark,
-                onStatusInfoMuted = contentOnStatusInfoMutedDark,
-                onStatusInfoMutedOnBgEmphasized = contentOnStatusInfoMutedOnBgEmphasizedDark,
-                onStatusNegativeEmphasized = contentOnStatusNegativeEmphasizedDark,
-                onStatusNegativeMuted = contentOnStatusNegativeMutedDark,
-                onStatusNegativeMutedOnBgEmphasized = contentOnStatusNegativeMutedOnBgEmphasizedDark,
-                onStatusPositiveEmphasized = contentOnStatusPositiveEmphasizedDark,
-                onStatusPositiveMuted = contentOnStatusPositiveMutedDark,
-                onStatusPositiveMutedOnBgEmphasized = contentOnStatusPositiveMutedOnBgEmphasizedDark,
-                onStatusWarningEmphasized = contentOnStatusWarningEmphasizedDark,
-                onStatusWarningMuted = contentOnStatusWarningMutedDark,
-                onStatusWarningMutedOnBgEmphasized = contentOnStatusWarningMutedOnBgEmphasizedDark,
+                onOverlayEmphasized = contentOnOverlayEmphasizedDark,
+                onStatusEmphasized = contentOnStatusEmphasizedDark,
+                onStatusEmphasizedNeutral = contentOnStatusEmphasizedNeutralDark,
+                onStatusMuted = contentOnStatusMutedDark,
                 statusInfo = contentStatusInfoDark,
                 statusNegative = contentStatusNegativeDark,
                 statusPositive = contentStatusPositiveDark,
                 statusWarning = contentStatusWarningDark,
             )
         },
-        elevationColors = with(elevationColorTokens) {
-            OudsColorScheme.Elevation(
-                drag = elevationDragDark,
-                dragOnBgEmphasized = elevationDragOnBgEmphasizedDark,
-                dragOnBgSecondary = elevationDragOnBgSecondaryDark,
-                modal = elevationModalDark,
-                overlayDefault = elevationOverlayDefaultDark,
-                overlayDefaultOnBgEmphasized = elevationOverlayDefaultOnBgEmphasizedDark,
-                overlayDefaultOnBgSecondary = elevationOverlayDefaultOnBgSecondaryDark,
-                overlayEmphasized = elevationOverlayEmphasizedDark,
-                overlayEmphasizedOnBgEmphasized = elevationOverlayEmphasizedOnBgEmphasizedDark,
-                overlayEmphasizedOnBgSecondary = elevationOverlayEmphasizedOnBgSecondaryDark,
-                raised = elevationRaisedDark,
-                raisedOnBgEmphasized = elevationRaisedOnBgEmphasizedDark,
-                raisedOnBgSecondary = elevationRaisedOnBgSecondaryDark,
-            )
-        },
-        gradientColors = with(gradientColorTokens) {
-            OudsColorScheme.Gradient(
-                skeletonMiddle = gradientSkeletonMiddleDark,
-                skeletonMiddleOnBgEmphasized = gradientSkeletonMiddleOnBgEmphasizedDark,
-                skeletonStartEnd = gradientSkeletonStartEndDark,
-                skeletonStartEndOnBgEmphasized = gradientSkeletonStartEndOnBgEmphasizedDark,
-            )
-        },
         decorativeColors = with(decorativeColorTokens) {
             OudsColorScheme.Decorative(
                 accent1Default = decorativeAccent1DefaultDark,
@@ -754,6 +423,37 @@ val OudsColorSemanticTokens.darkColorScheme: OudsColorScheme
                 skinTint900 = decorativeSkinTint900Dark,
             )
         },
+        opacityColors = with(opacityColorTokens) {
+            OudsColorScheme.Opacity(
+                invisibleBlack = opacityInvisibleBlackDark,
+                invisibleWhite = opacityInvisibleWhiteDark,
+            )
+        },
+        overlayColors = with(overlayColorTokens) {
+            OudsColorScheme.Overlay(
+                default = overlayDefaultDark,
+                drag = overlayDragDark,
+                emphasized = overlayEmphasizedDark,
+                modal = overlayModalLight
+            )
+        },
+        surfaceColors = with(surfaceColorTokens) {
+            OudsColorScheme.Surface(
+                brandPrimary = surfaceBrandPrimaryDark,
+                statusAccentEmphasized = surfaceStatusAccentEmphasizedDark,
+                statusAccentMuted = surfaceStatusAccentMutedDark,
+                statusInfoEmphasized = surfaceStatusInfoEmphasizedDark,
+                statusInfoMuted = surfaceStatusInfoMutedDark,
+                statusNegativeEmphasized = surfaceStatusNegativeEmphasizedDark,
+                statusNegativeMuted = surfaceStatusNegativeMutedDark,
+                statusNeutralEmphasized = surfaceStatusNeutralEmphasizedDark,
+                statusNeutralMuted = surfaceStatusNeutralMutedDark,
+                statusPositiveEmphasized = surfaceStatusPositiveEmphasizedDark,
+                statusPositiveMuted = surfaceStatusPositiveMutedDark,
+                statusWarningEmphasized = surfaceStatusWarningEmphasizedDark,
+                statusWarningMuted = surfaceStatusWarningMutedDark,
+            )
+        },
     )
 
 @Stable
@@ -761,36 +461,24 @@ fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Action): Color {
     return with(actionColors) {
         when (token) {
             OudsColorKeyToken.Action.Disabled -> disabled
-            OudsColorKeyToken.Action.Disabled.OnBgEmphasized -> disabledOnBgEmphasized
+            OudsColorKeyToken.Action.Enabled -> enabled
+            OudsColorKeyToken.Action.Focus -> focus
+            OudsColorKeyToken.Action.Highlighted -> highlighted
+            OudsColorKeyToken.Action.Hover -> hover
+            OudsColorKeyToken.Action.Loading -> loading
             OudsColorKeyToken.Action.Negative.Enabled -> negativeEnabled
             OudsColorKeyToken.Action.Negative.Focus -> negativeFocus
             OudsColorKeyToken.Action.Negative.Hover -> negativeHover
             OudsColorKeyToken.Action.Negative.Loading -> negativeLoading
             OudsColorKeyToken.Action.Negative.Pressed -> negativePressed
-            OudsColorKeyToken.Action.Primary.Enabled -> primaryEnabled
-            OudsColorKeyToken.Action.Primary.Enabled.OnBgEmphasized -> primaryEnabledOnBgEmphasized
-            OudsColorKeyToken.Action.Primary.Focus -> primaryFocus
-            OudsColorKeyToken.Action.Primary.Focus.OnBgEmphasized -> primaryFocusOnBgEmphasized
-            OudsColorKeyToken.Action.Primary.Hover -> primaryHover
-            OudsColorKeyToken.Action.Primary.Hover.OnBgEmphasized -> primaryHoverOnBgEmphasized
-            OudsColorKeyToken.Action.Primary.Loading -> primaryLoading
-            OudsColorKeyToken.Action.Primary.Loading.OnBgEmphasized -> primaryLoadingOnBgEmphasized
-            OudsColorKeyToken.Action.Primary.Pressed -> primaryPressed
-            OudsColorKeyToken.Action.Primary.Pressed.OnBgEmphasized -> primaryPressedOnBgEmphasized
-            OudsColorKeyToken.Action.Secondary.Enabled -> secondaryEnabled
-            OudsColorKeyToken.Action.Secondary.Enabled.OnBgEmphasized -> secondaryEnabledOnBgEmphasized
-            OudsColorKeyToken.Action.Secondary.Focus -> secondaryFocus
-            OudsColorKeyToken.Action.Secondary.Focus.OnBgEmphasized -> secondaryFocusOnBgEmphasized
-            OudsColorKeyToken.Action.Secondary.Hover -> secondaryHover
-            OudsColorKeyToken.Action.Secondary.Hover.OnBgEmphasized -> secondaryHoverOnBgEmphasized
-            OudsColorKeyToken.Action.Secondary.Loading -> secondaryLoading
-            OudsColorKeyToken.Action.Secondary.Loading.OnBgEmphasized -> secondaryLoadingOnBgEmphasized
-            OudsColorKeyToken.Action.Secondary.Pressed -> secondaryPressed
-            OudsColorKeyToken.Action.Secondary.Pressed.OnBgEmphasized -> secondaryPressedOnBgEmphasized
+            OudsColorKeyToken.Action.Pressed -> pressed
             OudsColorKeyToken.Action.Selected -> selected
-            OudsColorKeyToken.Action.Selected.OnBgEmphasized -> selectedOnBgEmphasized
+            OudsColorKeyToken.Action.Support.Enabled -> supportEnabled
+            OudsColorKeyToken.Action.Support.Focus -> supportFocus
+            OudsColorKeyToken.Action.Support.Hover -> supportHover
+            OudsColorKeyToken.Action.Support.Loading -> supportLoading
+            OudsColorKeyToken.Action.Support.Pressed -> supportPressed
             OudsColorKeyToken.Action.Visited -> visited
-            OudsColorKeyToken.Action.Visited.OnBgEmphasized -> visitedOnBgEmphasized
         }
     }
 }
@@ -799,19 +487,9 @@ fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Action): Color {
 fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Always): Color {
     return with(alwaysColors) {
         when (token) {
-            OudsColorKeyToken.Always.Accent -> accent
             OudsColorKeyToken.Always.Black -> black
-            OudsColorKeyToken.Always.Info -> info
-            OudsColorKeyToken.Always.Negative -> negative
-            OudsColorKeyToken.Always.OnAccent -> onAccent
             OudsColorKeyToken.Always.OnBlack -> onBlack
-            OudsColorKeyToken.Always.OnInfo -> onInfo
-            OudsColorKeyToken.Always.OnNegative -> onNegative
-            OudsColorKeyToken.Always.OnPositive -> onPositive
-            OudsColorKeyToken.Always.OnWarning -> onWarning
             OudsColorKeyToken.Always.OnWhite -> onWhite
-            OudsColorKeyToken.Always.Positive -> positive
-            OudsColorKeyToken.Always.Warning -> warning
             OudsColorKeyToken.Always.White -> white
         }
     }
@@ -821,27 +499,9 @@ fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Always): Color {
 fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Background): Color {
     return with(backgroundColors) {
         when (token) {
-            OudsColorKeyToken.Background.Brand.Primary -> brandPrimary
             OudsColorKeyToken.Background.Emphasized -> emphasized
             OudsColorKeyToken.Background.Primary -> primary
             OudsColorKeyToken.Background.Secondary -> secondary
-            OudsColorKeyToken.Background.Status.Accent.Emphasized -> statusAccentEmphasized
-            OudsColorKeyToken.Background.Status.Accent.Muted -> statusAccentMuted
-            OudsColorKeyToken.Background.Status.Accent.Muted.OnBgEmphasized -> statusAccentMutedOnBgEmphasized
-            OudsColorKeyToken.Background.Status.Info.Emphasized -> statusInfoEmphasized
-            OudsColorKeyToken.Background.Status.Info.Muted -> statusInfoMuted
-            OudsColorKeyToken.Background.Status.Info.Muted.OnBgEmphasized -> statusInfoMutedOnBgEmphasized
-            OudsColorKeyToken.Background.Status.Negative.Emphasized -> statusNegativeEmphasized
-            OudsColorKeyToken.Background.Status.Negative.Muted -> statusNegativeMuted
-            OudsColorKeyToken.Background.Status.Negative.Muted.OnBgEmphasized -> statusNegativeMutedOnBgEmphasized
-            OudsColorKeyToken.Background.Status.Neutral -> statusNeutral
-            OudsColorKeyToken.Background.Status.Neutral.OnBgEmphasized -> statusNeutralOnBgEmphasized
-            OudsColorKeyToken.Background.Status.Positive.Emphasized -> statusPositiveEmphasized
-            OudsColorKeyToken.Background.Status.Positive.Muted -> statusPositiveMuted
-            OudsColorKeyToken.Background.Status.Positive.Muted.OnBgEmphasized -> statusPositiveMutedOnBgEmphasized
-            OudsColorKeyToken.Background.Status.Warning.Emphasized -> statusWarningEmphasized
-            OudsColorKeyToken.Background.Status.Warning.Muted -> statusWarningMuted
-            OudsColorKeyToken.Background.Status.Warning.Muted.OnBgEmphasized -> statusWarningMutedOnBgEmphasized
             OudsColorKeyToken.Background.Tertiary -> tertiary
         }
     }
@@ -852,104 +512,36 @@ fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Border): Color {
     return with(borderColors) {
         when (token) {
             OudsColorKeyToken.Border.Brand.Primary -> brandPrimary
-            OudsColorKeyToken.Border.Brand.Primary.OnBgEmphasized -> brandPrimaryOnBgEmphasized
             OudsColorKeyToken.Border.Default -> default
-            OudsColorKeyToken.Border.Default.OnBgEmphasized -> defaultOnBgEmphasized
             OudsColorKeyToken.Border.Emphasized -> emphasized
-            OudsColorKeyToken.Border.Emphasized.OnBgEmphasized -> emphasizedOnBgEmphasized
             OudsColorKeyToken.Border.Focus -> focus
             OudsColorKeyToken.Border.Focus.Inset -> focusInset
-            OudsColorKeyToken.Border.Focus.Inset.OnBgEmphasized -> focusInsetOnBgEmphasized
-            OudsColorKeyToken.Border.Focus.OnBgEmphasized -> focusOnBgEmphasized
             OudsColorKeyToken.Border.OnBrand.Primary -> onBrandPrimary
         }
     }
 }
 
-@Stable
-fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Brand): Color {
-    return with(brandColors) {
-        when (token) {
-            OudsColorKeyToken.Brand.Accent.Default -> accentDefault
-            OudsColorKeyToken.Brand.Accent.High -> accentHigh
-            OudsColorKeyToken.Brand.Accent.Highest -> accentHighest
-            OudsColorKeyToken.Brand.Accent.Lowest -> accentLowest
-            OudsColorKeyToken.Brand.Info.Default -> infoDefault
-            OudsColorKeyToken.Brand.Info.Highest -> infoHighest
-            OudsColorKeyToken.Brand.Info.Lowest -> infoLowest
-            OudsColorKeyToken.Brand.Negative.Default -> negativeDefault
-            OudsColorKeyToken.Brand.Negative.High -> negativeHigh
-            OudsColorKeyToken.Brand.Negative.Higher -> negativeHigher
-            OudsColorKeyToken.Brand.Negative.Highest -> negativeHighest
-            OudsColorKeyToken.Brand.Negative.Lowest -> negativeLowest
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Black -> neutralEmphasizedBlack
-            OudsColorKeyToken.Brand.Neutral.Emphasized.High -> neutralEmphasizedHigh
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Higher -> neutralEmphasizedHigher
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Highest -> neutralEmphasizedHighest
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Low -> neutralEmphasizedLow
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Lower -> neutralEmphasizedLower
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Lowest -> neutralEmphasizedLowest
-            OudsColorKeyToken.Brand.Neutral.Emphasized.Medium -> neutralEmphasizedMedium
-            OudsColorKeyToken.Brand.Neutral.Muted.Highest -> neutralMutedHighest
-            OudsColorKeyToken.Brand.Neutral.Muted.Low -> neutralMutedLow
-            OudsColorKeyToken.Brand.Neutral.Muted.Lower -> neutralMutedLower
-            OudsColorKeyToken.Brand.Neutral.Muted.Lowest -> neutralMutedLowest
-            OudsColorKeyToken.Brand.Neutral.Muted.Medium -> neutralMutedMedium
-            OudsColorKeyToken.Brand.Neutral.Muted.White -> neutralMutedWhite
-            OudsColorKeyToken.Brand.Positive.Default -> positiveDefault
-            OudsColorKeyToken.Brand.Positive.Highest -> positiveHighest
-            OudsColorKeyToken.Brand.Positive.Lowest -> positiveLowest
-            OudsColorKeyToken.Brand.Primary.Default -> primaryDefault
-            OudsColorKeyToken.Brand.Primary.Low -> primaryLow
-            OudsColorKeyToken.Brand.Warning.Default -> warningDefault
-            OudsColorKeyToken.Brand.Warning.High -> warningHigh
-            OudsColorKeyToken.Brand.Warning.Highest -> warningHighest
-            OudsColorKeyToken.Brand.Warning.Lowest -> warningLowest
-        }
-    }
-}
-
 @Stable
 fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Content): Color {
     return with(contentColors) {
         when (token) {
             OudsColorKeyToken.Content.Brand.Primary -> brandPrimary
-            OudsColorKeyToken.Content.Brand.Primary.OnBgEmphasized -> brandPrimaryOnBgEmphasized
             OudsColorKeyToken.Content.Default -> default
-            OudsColorKeyToken.Content.Default.OnBgEmphasized -> defaultOnBgEmphasized
             OudsColorKeyToken.Content.Disabled -> disabled
-            OudsColorKeyToken.Content.Disabled.OnBgEmphasized -> disabledOnBgEmphasized
             OudsColorKeyToken.Content.Muted -> muted
-            OudsColorKeyToken.Content.Muted.OnBgEmphasized -> mutedOnBgEmphasized
             OudsColorKeyToken.Content.OnAction.Disabled -> onActionDisabled
-            OudsColorKeyToken.Content.OnAction.Disabled.OnBgEmphasized -> onActionDisabledOnBgEmphasized
             OudsColorKeyToken.Content.OnAction.Negative -> onActionNegative
-            OudsColorKeyToken.Content.OnAction.Primary.Enabled -> onActionPrimaryEnabled
-            OudsColorKeyToken.Content.OnAction.Primary.Enabled.OnBgEmphasized -> onActionPrimaryEnabledOnBgEmphasized
-            OudsColorKeyToken.Content.OnAction.Primary.Focus -> onActionPrimaryFocus
-            OudsColorKeyToken.Content.OnAction.Primary.Focus.OnBgEmphasized -> onActionPrimaryFocusOnBgEmphasized
-            OudsColorKeyToken.Content.OnAction.Primary.Hover -> onActionPrimaryHover
-            OudsColorKeyToken.Content.OnAction.Primary.Hover.OnBgEmphasized -> onActionPrimaryHoverOnBgEmphasized
-            OudsColorKeyToken.Content.OnAction.Primary.Loading -> onActionPrimaryLoading
-            OudsColorKeyToken.Content.OnAction.Primary.Loading.OnBgEmphasized -> onActionPrimaryLoadingOnBgEmphasized
-            OudsColorKeyToken.Content.OnAction.Primary.Pressed -> onActionPrimaryPressed
-            OudsColorKeyToken.Content.OnAction.Primary.Pressed.OnBgEmphasized -> onActionPrimaryPressedOnBgEmphasized
+            OudsColorKeyToken.Content.OnAction.Enabled -> onActionEnabled
+            OudsColorKeyToken.Content.OnAction.Focus -> onActionFocus
+            OudsColorKeyToken.Content.OnAction.Highlighted -> onActionHighlighted
+            OudsColorKeyToken.Content.OnAction.Hover -> onActionHover
+            OudsColorKeyToken.Content.OnAction.Loading -> onActionLoading
+            OudsColorKeyToken.Content.OnAction.Pressed -> onActionPressed
             OudsColorKeyToken.Content.OnBrand.Primary -> onBrandPrimary
-            OudsColorKeyToken.Content.OnStatus.Accent.Emphasized -> onStatusAccentEmphasized
-            OudsColorKeyToken.Content.OnStatus.Accent.Muted -> onStatusAccentMuted
-            OudsColorKeyToken.Content.OnStatus.Accent.Muted.OnBgEmphasized -> onStatusAccentMutedOnBgEmphasized
-            OudsColorKeyToken.Content.OnStatus.Info.Emphasized -> onStatusInfoEmphasized
-            OudsColorKeyToken.Content.OnStatus.Info.Muted -> onStatusInfoMuted
-            OudsColorKeyToken.Content.OnStatus.Info.Muted.OnBgEmphasized -> onStatusInfoMutedOnBgEmphasized
-            OudsColorKeyToken.Content.OnStatus.Negative.Emphasized -> onStatusNegativeEmphasized
-            OudsColorKeyToken.Content.OnStatus.Negative.Muted -> onStatusNegativeMuted
-            OudsColorKeyToken.Content.OnStatus.Negative.Muted.OnBgEmphasized -> onStatusNegativeMutedOnBgEmphasized
-            OudsColorKeyToken.Content.OnStatus.Positive.Emphasized -> onStatusPositiveEmphasized
-            OudsColorKeyToken.Content.OnStatus.Positive.Muted -> onStatusPositiveMuted
-            OudsColorKeyToken.Content.OnStatus.Positive.Muted.OnBgEmphasized -> onStatusPositiveMutedOnBgEmphasized
-            OudsColorKeyToken.Content.OnStatus.Warning.Emphasized -> onStatusWarningEmphasized
-            OudsColorKeyToken.Content.OnStatus.Warning.Muted -> onStatusWarningMuted
-            OudsColorKeyToken.Content.OnStatus.Warning.Muted.OnBgEmphasized -> onStatusWarningMutedOnBgEmphasized
+            OudsColorKeyToken.Content.OnOverlay.Emphasized -> onOverlayEmphasized
+            OudsColorKeyToken.Content.OnStatus.Emphasized -> onStatusEmphasized
+            OudsColorKeyToken.Content.OnStatus.Emphasized.Neutral -> onStatusEmphasizedNeutral
+            OudsColorKeyToken.Content.OnStatus.Muted -> onStatusMuted
             OudsColorKeyToken.Content.Status.Info -> statusInfo
             OudsColorKeyToken.Content.Status.Negative -> statusNegative
             OudsColorKeyToken.Content.Status.Positive -> statusPositive
@@ -997,110 +589,129 @@ fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Decorative): Color {
 }
 
 @Stable
-fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Elevation): Color {
-    return with(elevationColors) {
+fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Surface): Color {
+    return with(surfaceColors) {
         when (token) {
-            OudsColorKeyToken.Elevation.Drag -> drag
-            OudsColorKeyToken.Elevation.Drag.OnBgEmphasized -> dragOnBgEmphasized
-            OudsColorKeyToken.Elevation.Drag.OnBgSecondary -> dragOnBgSecondary
-            OudsColorKeyToken.Elevation.Modal -> modal
-            OudsColorKeyToken.Elevation.Overlay.Default -> overlayDefault
-            OudsColorKeyToken.Elevation.Overlay.Default.OnBgEmphasized -> overlayDefaultOnBgEmphasized
-            OudsColorKeyToken.Elevation.Overlay.Default.OnBgSecondary -> overlayDefaultOnBgSecondary
-            OudsColorKeyToken.Elevation.Overlay.Emphasized -> overlayEmphasized
-            OudsColorKeyToken.Elevation.Overlay.Emphasized.OnBgEmphasized -> overlayEmphasizedOnBgEmphasized
-            OudsColorKeyToken.Elevation.Overlay.Emphasized.OnBgSecondary -> overlayEmphasizedOnBgSecondary
-            OudsColorKeyToken.Elevation.Raised -> raised
-            OudsColorKeyToken.Elevation.Raised.OnBgEmphasized -> raisedOnBgEmphasized
-            OudsColorKeyToken.Elevation.Raised.OnBgSecondary -> raisedOnBgSecondary
+            OudsColorKeyToken.Surface.Brand.Primary -> brandPrimary
+            OudsColorKeyToken.Surface.Status.Accent.Emphasized -> statusAccentEmphasized
+            OudsColorKeyToken.Surface.Status.Accent.Muted -> statusAccentMuted
+            OudsColorKeyToken.Surface.Status.Info.Emphasized -> statusInfoEmphasized
+            OudsColorKeyToken.Surface.Status.Info.Muted -> statusInfoMuted
+            OudsColorKeyToken.Surface.Status.Negative.Emphasized -> statusNegativeEmphasized
+            OudsColorKeyToken.Surface.Status.Negative.Muted -> statusNegativeMuted
+            OudsColorKeyToken.Surface.Status.Neutral.Emphasized -> statusNeutralEmphasized
+            OudsColorKeyToken.Surface.Status.Neutral.Muted -> statusNeutralMuted
+            OudsColorKeyToken.Surface.Status.Positive.Emphasized -> statusPositiveEmphasized
+            OudsColorKeyToken.Surface.Status.Positive.Muted -> statusPositiveMuted
+            OudsColorKeyToken.Surface.Status.Warning.Emphasized -> statusWarningEmphasized
+            OudsColorKeyToken.Surface.Status.Warning.Muted -> statusWarningMuted
         }
     }
 }
 
 @Stable
-fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Gradient): Color {
-    return with(gradientColors) {
-        when (token) {
-            OudsColorKeyToken.Gradient.Skeleton.Middle -> skeletonMiddle
-            OudsColorKeyToken.Gradient.Skeleton.Middle.OnBgEmphasized -> skeletonMiddleOnBgEmphasized
-            OudsColorKeyToken.Gradient.Skeleton.StartEnd -> skeletonStartEnd
-            OudsColorKeyToken.Gradient.Skeleton.StartEnd.OnBgEmphasized -> skeletonStartEndOnBgEmphasized
-        }
+fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Opacity): Color {
+    return when (token) {
+        OudsColorKeyToken.Opacity.InvisibleBlack -> opacityColors.invisibleBlack
+        OudsColorKeyToken.Opacity.InvisibleWhite -> opacityColors.invisibleWhite
     }
 }
 
+
 @Stable
-fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Transparent): Color {
+fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Overlay): Color {
     return when (token) {
-        OudsColorKeyToken.Transparent.Default -> transparentColors.transparentDefault
+        OudsColorKeyToken.Overlay.Default -> overlayColors.default
+        OudsColorKeyToken.Overlay.Drag -> overlayColors.drag
+        OudsColorKeyToken.Overlay.Emphasized -> overlayColors.emphasized
+        OudsColorKeyToken.Overlay.Modal -> overlayColors.modal
     }
 }
 
-val OudsColorSemanticTokens.materialLightColorScheme: ColorScheme
-    get() = lightColorScheme(
-        primary = backgroundColorTokens.bgBrandPrimaryLight,
-        onPrimary = contentColorTokens.contentDefaultLight,
-        primaryContainer = backgroundColorTokens.bgPrimaryLight,
-        onPrimaryContainer = contentColorTokens.contentDefaultLight,
-        inversePrimary = backgroundColorTokens.bgBrandPrimaryDark,
-        secondary = backgroundColorTokens.bgSecondaryLight,
-        onSecondary = elevationColorTokens.elevationDragOnBgSecondaryLight,
-        secondaryContainer = backgroundColorTokens.bgEmphasizedLight,
-        onSecondaryContainer = contentColorTokens.contentDefaultDark,
-        tertiary = backgroundColorTokens.bgTertiaryLight,
-        onTertiary = contentColorTokens.contentDefaultDark,
-        tertiaryContainer = decorativeColorTokens.decorativeBrandTertiaryLight,
-        onTertiaryContainer = contentColorTokens.contentDefaultOnBgEmphasizedLight,
-        background = backgroundColorTokens.bgPrimaryLight,
-        onBackground = contentColorTokens.contentDefaultLight,
-        surface = elevationColorTokens.elevationRaisedLight,
-        onSurface = contentColorTokens.contentDefaultLight,
-        surfaceVariant = elevationColorTokens.elevationModalLight,
-        onSurfaceVariant = contentColorTokens.contentDefaultLight,
-        surfaceTint = elevationColorTokens.elevationModalLight,
-        inverseSurface = elevationColorTokens.elevationRaisedDark,
-        inverseOnSurface = contentColorTokens.contentDefaultDark,
-        error = backgroundColorTokens.bgStatusNegativeMutedLight,
-        onError = contentColorTokens.contentOnActionNegativeLight,
-        errorContainer = backgroundColorTokens.bgStatusNegativeEmphasizedLight,
-        onErrorContainer = contentColorTokens.contentOnActionDisabledOnBgEmphasizedLight,
-        outline = borderColorTokens.borderBrandPrimaryLight,
-        outlineVariant = borderColorTokens.borderBrandPrimaryLight,
-        scrim = contentColorTokens.contentBrandPrimaryLight,
-    )
+//TODO Material colors must be able to be overridden by a theme
+val materialLightColorScheme: ColorScheme
+    get() = with(OudsAndroidColorLightTokens) {
+        lightColorScheme(
+            primary = primary,
+            onPrimary = onPrimary,
+            primaryContainer = primaryContainer,
+            onPrimaryContainer = onPrimaryContainer,
+            inversePrimary = inversePrimary,
+            secondary = secondary,
+            onSecondary = onSecondary,
+            secondaryContainer = secondaryContainer,
+            onSecondaryContainer = onSecondaryContainer,
+            tertiary = tertiary,
+            onTertiary = onTertiary,
+            tertiaryContainer = tertiaryContainer,
+            onTertiaryContainer = onTertiaryContainer,
+            background = background,
+            onBackground = onBackground,
+            surface = surface,
+            onSurface = onSurface,
+            surfaceDim = surfaceDim,
+            surfaceVariant = surfaceVariant,
+            onSurfaceVariant = onSurfaceVariant,
+            surfaceTint = surfaceTint,
+            inverseSurface = inverseSurface,
+            inverseOnSurface = inverseOnSurface,
+            error = error,
+            onError = onError,
+            errorContainer = errorContainer,
+            onErrorContainer = onErrorContainer,
+            outline = outline,
+            outlineVariant = outlineVariant,
+            scrim = scrim,
+            surfaceBright = surfaceBright,
+            surfaceContainer = surfaceContainer,
+            surfaceContainerHighest = surfaceContainerHighest,
+            surfaceContainerHigh = surfaceContainerHigh,
+            surfaceContainerLow = surfaceContainerLow,
+            surfaceContainerLowest = surfaceContainerLowest,
+        )
+    }
 
-val OudsColorSemanticTokens.materialDarkColorScheme: ColorScheme
-    get() = darkColorScheme(
-        primary = backgroundColorTokens.bgBrandPrimaryDark,
-        onPrimary = contentColorTokens.contentDefaultDark,
-        primaryContainer = backgroundColorTokens.bgPrimaryDark,
-        onPrimaryContainer = contentColorTokens.contentDefaultDark,
-        inversePrimary = backgroundColorTokens.bgBrandPrimaryLight,
-        secondary = backgroundColorTokens.bgSecondaryDark,
-        onSecondary = elevationColorTokens.elevationDragOnBgSecondaryDark,
-        secondaryContainer = backgroundColorTokens.bgEmphasizedDark,
-        onSecondaryContainer = contentColorTokens.contentDefaultOnBgEmphasizedDark,
-        tertiary = backgroundColorTokens.bgTertiaryDark,
-        onTertiary = contentColorTokens.contentDefaultDark,
-        tertiaryContainer = decorativeColorTokens.decorativeBrandTertiaryDark,
-        onTertiaryContainer = contentColorTokens.contentDefaultOnBgEmphasizedDark,
-        background = backgroundColorTokens.bgPrimaryDark,
-        onBackground = contentColorTokens.contentDefaultDark,
-        surface = elevationColorTokens.elevationRaisedDark,
-        onSurface = contentColorTokens.contentDefaultDark,
-        surfaceVariant = elevationColorTokens.elevationModalDark,
-        onSurfaceVariant = contentColorTokens.contentDefaultDark,
-        surfaceTint = elevationColorTokens.elevationModalDark,
-        inverseSurface = elevationColorTokens.elevationRaisedLight,
-        inverseOnSurface = contentColorTokens.contentDefaultLight,
-        error = backgroundColorTokens.bgStatusNegativeMutedDark,
-        onError = contentColorTokens.contentOnActionNegativeDark,
-        errorContainer = backgroundColorTokens.bgStatusNegativeEmphasizedDark,
-        onErrorContainer = contentColorTokens.contentOnStatusNegativeEmphasizedDark,
-        outline = borderColorTokens.borderBrandPrimaryDark,
-        outlineVariant = borderColorTokens.borderBrandPrimaryDark,
-        scrim = contentColorTokens.contentBrandPrimaryDark,
-    )
+val materialDarkColorScheme: ColorScheme
+    get() = with(OudsAndroidColorDarkTokens) {
+        darkColorScheme(
+            primary = primary,
+            onPrimary = onPrimary,
+            primaryContainer = primaryContainer,
+            onPrimaryContainer = onPrimaryContainer,
+            inversePrimary = inversePrimary,
+            secondary = secondary,
+            onSecondary = onSecondary,
+            secondaryContainer = secondaryContainer,
+            onSecondaryContainer = onSecondaryContainer,
+            tertiary = tertiary,
+            onTertiary = onTertiary,
+            tertiaryContainer = tertiaryContainer,
+            onTertiaryContainer = onTertiaryContainer,
+            background = background,
+            onBackground = onBackground,
+            surface = surface,
+            onSurface = onSurface,
+            surfaceDim = surfaceDim,
+            surfaceVariant = surfaceVariant,
+            onSurfaceVariant = onSurfaceVariant,
+            surfaceTint = surfaceTint,
+            inverseSurface = inverseSurface,
+            inverseOnSurface = inverseOnSurface,
+            error = error,
+            onError = onError,
+            errorContainer = errorContainer,
+            onErrorContainer = onErrorContainer,
+            outline = outline,
+            outlineVariant = outlineVariant,
+            scrim = scrim,
+            surfaceBright = surfaceBright,
+            surfaceContainer = surfaceContainer,
+            surfaceContainerHighest = surfaceContainerHighest,
+            surfaceContainerHigh = surfaceContainerHigh,
+            surfaceContainerLow = surfaceContainerLow,
+            surfaceContainerLowest = surfaceContainerLowest,
+        )
+    }
 
 /**
  * Converts an OUDS color token to the local color value provided by the theme.
@@ -1113,10 +724,9 @@ val OudsColorKeyToken.value: Color
         is OudsColorKeyToken.Always -> OudsTheme.colorScheme.fromToken(this)
         is OudsColorKeyToken.Background -> OudsTheme.colorScheme.fromToken(this)
         is OudsColorKeyToken.Border -> OudsTheme.colorScheme.fromToken(this)
-        is OudsColorKeyToken.Brand -> OudsTheme.colorScheme.fromToken(this)
         is OudsColorKeyToken.Content -> OudsTheme.colorScheme.fromToken(this)
         is OudsColorKeyToken.Decorative -> OudsTheme.colorScheme.fromToken(this)
-        is OudsColorKeyToken.Elevation -> OudsTheme.colorScheme.fromToken(this)
-        is OudsColorKeyToken.Transparent -> OudsTheme.colorScheme.fromToken(this)
-        is OudsColorKeyToken.Gradient -> OudsTheme.colorScheme.fromToken(this)
+        is OudsColorKeyToken.Opacity -> OudsTheme.colorScheme.fromToken(this)
+        is OudsColorKeyToken.Overlay -> OudsTheme.colorScheme.fromToken(this)
+        is OudsColorKeyToken.Surface -> OudsTheme.colorScheme.fromToken(this)
     }
\ No newline at end of file
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsOpacities.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsOpacities.kt
index fe1cc660..95372fd4 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsOpacities.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsOpacities.kt
@@ -19,7 +19,7 @@ import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.semantic.OudsOpacitySemanticTokens
 
 data class OudsOpacities(
-    val transparent: Float,
+    val invisible: Float,
     val weaker: Float,
     val weak: Float,
     val medium: Float,
@@ -28,7 +28,7 @@ data class OudsOpacities(
 )
 
 fun OudsOpacitySemanticTokens.getOpacity() = OudsOpacities(
-    transparent = transparent,
+    invisible = invisible,
     weaker = weaker,
     weak = weak,
     medium = medium,
@@ -39,7 +39,7 @@ fun OudsOpacitySemanticTokens.getOpacity() = OudsOpacities(
 @Stable
 fun OudsOpacities.fromToken(token: OudsOpacityKeyToken): Float {
     return when (token) {
-        OudsOpacityKeyToken.Transparent -> transparent
+        OudsOpacityKeyToken.Invisible -> invisible
         OudsOpacityKeyToken.Weaker -> weaker
         OudsOpacityKeyToken.Weak -> weak
         OudsOpacityKeyToken.Medium -> medium
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
index 994d693e..8d9a086e 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
@@ -33,13 +33,13 @@ data class OudsSizes(
         val withBody: WithBody
     ) {
         data class Decorative(
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
+            val extraExtraSmall: Dp,
+            val extraSmall: Dp,
+            val small: Dp,
             val medium: Dp,
-            val tall: Dp,
-            val taller: Dp,
-            val tallest: Dp,
+            val large: Dp,
+            val extraLarge: Dp,
+            val extraExtraLarge: Dp,
         )
 
         data class WithHeading(
@@ -49,27 +49,27 @@ data class OudsSizes(
             val extraLarge: ExtraLarge
         ) {
             data class Small(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
 
             data class Medium(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
 
             data class Large(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
 
             data class ExtraLarge(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
         }
 
@@ -80,29 +80,29 @@ data class OudsSizes(
             val extraLarge: ExtraLarge
         ) {
             data class Small(
-                val sizeShort: Dp,
+                val sizeSmall: Dp,
                 val sizeMedium: Dp,
-                val sizeTall: Dp,
+                val sizeLarge: Dp,
             )
 
             data class Medium(
-                val sizeShort: Dp,
+                val sizeSmall: Dp,
                 val sizeMedium: Dp,
-                val sizeTall: Dp,
+                val sizeLarge: Dp,
             )
 
             data class Large(
-                val sizeShorter: Dp,
-                val sizeShort: Dp,
+                val sizeExtraSmall: Dp,
+                val sizeSmall: Dp,
                 val sizeMedium: Dp,
-                val sizeTall: Dp,
-                val sizeTaller: Dp,
+                val sizeLarge: Dp,
+                val sizeExtraLarge: Dp,
             )
 
             data class ExtraLarge(
-                val sizeShort: Dp,
+                val sizeSmall: Dp,
                 val sizeMedium: Dp,
-                val sizeTall: Dp,
+                val sizeLarge: Dp,
             )
         }
 
@@ -112,21 +112,21 @@ data class OudsSizes(
             val large: Large,
         ) {
             data class Small(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
 
             data class Medium(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
 
             data class Large(
-                val sizeShort: OudsAdaptiveTokenValue<Dp>,
+                val sizeSmall: OudsAdaptiveTokenValue<Dp>,
                 val sizeMedium: OudsAdaptiveTokenValue<Dp>,
-                val sizeTall: OudsAdaptiveTokenValue<Dp>,
+                val sizeLarge: OudsAdaptiveTokenValue<Dp>,
             )
         }
     }
@@ -160,158 +160,158 @@ data class OudsSizes(
 fun OudsSizeSemanticTokens.getSizes() = OudsSizes(
     icon = OudsSizes.Icon(
         decorative = OudsSizes.Icon.Decorative(
-            shortest = iconDecorativeShortest.dp,
-            shorter = iconDecorativeShorter.dp,
-            short = iconDecorativeShort.dp,
-            medium = iconDecorativeMedium.dp,
-            tall = iconDecorativeTall.dp,
-            taller = iconDecorativeTaller.dp,
-            tallest = iconDecorativeTallest.dp,
+            extraExtraSmall = iconDecorative2xs.dp,
+            extraSmall = iconDecorativeXs.dp,
+            small = iconDecorativeSm.dp,
+            medium = iconDecorativeMd.dp,
+            large = iconDecorativeLg.dp,
+            extraLarge = iconDecorativeXl.dp,
+            extraExtraLarge = iconDecorative2xl.dp,
         ),
         withHeading = OudsSizes.Icon.WithHeading(
             small = OudsSizes.Icon.WithHeading.Small(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithHeadingSmallSizeShortMobile.dp,
-                    iconWithHeadingSmallSizeShortMobile.dp,
-                    iconWithHeadingSmallSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithHeadingSmallSizeSmMobile.dp,
+                    iconWithHeadingSmallSizeSmMobile.dp,
+                    iconWithHeadingSmallSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithHeadingSmallSizeMediumMobile.dp,
-                    iconWithHeadingSmallSizeMediumMobile.dp,
-                    iconWithHeadingSmallSizeMediumTablet.dp
+                    iconWithHeadingSmallSizeMdMobile.dp,
+                    iconWithHeadingSmallSizeMdMobile.dp,
+                    iconWithHeadingSmallSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithHeadingSmallSizeTallMobile.dp,
-                    iconWithHeadingSmallSizeTallMobile.dp,
-                    iconWithHeadingSmallSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithHeadingSmallSizeLgMobile.dp,
+                    iconWithHeadingSmallSizeLgMobile.dp,
+                    iconWithHeadingSmallSizeLgTablet.dp
                 ),
             ),
             medium = OudsSizes.Icon.WithHeading.Medium(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithHeadingMediumSizeShortMobile.dp,
-                    iconWithHeadingMediumSizeShortMobile.dp,
-                    iconWithHeadingMediumSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithHeadingMediumSizeSmMobile.dp,
+                    iconWithHeadingMediumSizeSmMobile.dp,
+                    iconWithHeadingMediumSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithHeadingMediumSizeMediumMobile.dp,
-                    iconWithHeadingMediumSizeMediumMobile.dp,
-                    iconWithHeadingMediumSizeMediumTablet.dp
+                    iconWithHeadingMediumSizeMdMobile.dp,
+                    iconWithHeadingMediumSizeMdMobile.dp,
+                    iconWithHeadingMediumSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithHeadingMediumSizeTallMobile.dp,
-                    iconWithHeadingMediumSizeTallMobile.dp,
-                    iconWithHeadingMediumSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithHeadingMediumSizeLgMobile.dp,
+                    iconWithHeadingMediumSizeLgMobile.dp,
+                    iconWithHeadingMediumSizeLgTablet.dp
                 ),
             ),
             large = OudsSizes.Icon.WithHeading.Large(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithHeadingLargeSizeShortMobile.dp,
-                    iconWithHeadingLargeSizeShortMobile.dp,
-                    iconWithHeadingLargeSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithHeadingLargeSizeSmMobile.dp,
+                    iconWithHeadingLargeSizeSmMobile.dp,
+                    iconWithHeadingLargeSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithHeadingLargeSizeMediumMobile.dp,
-                    iconWithHeadingLargeSizeMediumMobile.dp,
-                    iconWithHeadingLargeSizeMediumTablet.dp
+                    iconWithHeadingLargeSizeMdMobile.dp,
+                    iconWithHeadingLargeSizeMdMobile.dp,
+                    iconWithHeadingLargeSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithHeadingLargeSizeTallMobile.dp,
-                    iconWithHeadingLargeSizeTallMobile.dp,
-                    iconWithHeadingLargeSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithHeadingLargeSizeLgMobile.dp,
+                    iconWithHeadingLargeSizeLgMobile.dp,
+                    iconWithHeadingLargeSizeLgTablet.dp
                 ),
             ),
             extraLarge = OudsSizes.Icon.WithHeading.ExtraLarge(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithHeadingXlargeSizeShortMobile.dp,
-                    iconWithHeadingXlargeSizeShortMobile.dp,
-                    iconWithHeadingXlargeSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithHeadingXlargeSizeSmMobile.dp,
+                    iconWithHeadingXlargeSizeSmMobile.dp,
+                    iconWithHeadingXlargeSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithHeadingXlargeSizeMediumMobile.dp,
-                    iconWithHeadingXlargeSizeMediumMobile.dp,
-                    iconWithHeadingXlargeSizeMediumTablet.dp
+                    iconWithHeadingXlargeSizeMdMobile.dp,
+                    iconWithHeadingXlargeSizeMdMobile.dp,
+                    iconWithHeadingXlargeSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithHeadingXlargeSizeTallMobile.dp,
-                    iconWithHeadingXlargeSizeTallMobile.dp,
-                    iconWithHeadingXlargeSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithHeadingXlargeSizeLgMobile.dp,
+                    iconWithHeadingXlargeSizeLgMobile.dp,
+                    iconWithHeadingXlargeSizeLgTablet.dp
                 ),
             )
         ),
         withLabel = OudsSizes.Icon.WithLabel(
             small = OudsSizes.Icon.WithLabel.Small(
-                sizeShort = iconWithLabelSmallSizeShort.dp,
-                sizeMedium = iconWithLabelSmallSizeMedium.dp,
-                sizeTall = iconWithLabelSmallSizeTall.dp,
+                sizeSmall = iconWithLabelSmallSizeSm.dp,
+                sizeMedium = iconWithLabelSmallSizeMd.dp,
+                sizeLarge = iconWithLabelSmallSizeLg.dp,
             ),
             medium = OudsSizes.Icon.WithLabel.Medium(
-                sizeShort = iconWithLabelMediumSizeShort.dp,
-                sizeMedium = iconWithLabelMediumSizeMedium.dp,
-                sizeTall = iconWithLabelMediumSizeTall.dp,
+                sizeSmall = iconWithLabelMediumSizeSm.dp,
+                sizeMedium = iconWithLabelMediumSizeMd.dp,
+                sizeLarge = iconWithLabelMediumSizeLg.dp,
             ),
             large = OudsSizes.Icon.WithLabel.Large(
-                sizeShorter = iconWithLabelLargeSizeShorter.dp,
-                sizeShort = iconWithLabelLargeSizeShort.dp,
-                sizeMedium = iconWithLabelLargeSizeMedium.dp,
-                sizeTall = iconWithLabelLargeSizeTall.dp,
-                sizeTaller = iconWithLabelLargeSizeTaller.dp,
+                sizeExtraSmall = iconWithLabelLargeSizeXs.dp,
+                sizeSmall = iconWithLabelLargeSizeSm.dp,
+                sizeMedium = iconWithLabelLargeSizeMd.dp,
+                sizeLarge = iconWithLabelLargeSizeLg.dp,
+                sizeExtraLarge = iconWithLabelLargeSizeXl.dp,
             ),
             extraLarge = OudsSizes.Icon.WithLabel.ExtraLarge(
-                sizeShort = iconWithLabelXlargeSizeShort.dp,
-                sizeMedium = iconWithLabelXlargeSizeMedium.dp,
-                sizeTall = iconWithLabelXlargeSizeTall.dp,
+                sizeSmall = iconWithLabelXlargeSizeSm.dp,
+                sizeMedium = iconWithLabelXlargeSizeMd.dp,
+                sizeLarge = iconWithLabelXlargeSizeLg.dp,
             )
         ),
         withBody = OudsSizes.Icon.WithBody(
             small = OudsSizes.Icon.WithBody.Small(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithBodySmallSizeShortMobile.dp,
-                    iconWithBodySmallSizeShortMobile.dp,
-                    iconWithBodySmallSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithBodySmallSizeSmMobile.dp,
+                    iconWithBodySmallSizeSmMobile.dp,
+                    iconWithBodySmallSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithBodySmallSizeMediumMobile.dp,
-                    iconWithBodySmallSizeMediumMobile.dp,
-                    iconWithBodySmallSizeMediumTablet.dp
+                    iconWithBodySmallSizeMdMobile.dp,
+                    iconWithBodySmallSizeMdMobile.dp,
+                    iconWithBodySmallSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithBodySmallSizeTallMobile.dp,
-                    iconWithBodySmallSizeTallMobile.dp,
-                    iconWithBodySmallSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithBodySmallSizeLgMobile.dp,
+                    iconWithBodySmallSizeLgMobile.dp,
+                    iconWithBodySmallSizeLgTablet.dp
                 ),
             ),
             medium = OudsSizes.Icon.WithBody.Medium(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithBodyMediumSizeShortMobile.dp,
-                    iconWithBodyMediumSizeShortMobile.dp,
-                    iconWithBodyMediumSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithBodyMediumSizeSmMobile.dp,
+                    iconWithBodyMediumSizeSmMobile.dp,
+                    iconWithBodyMediumSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithBodyMediumSizeMediumMobile.dp,
-                    iconWithBodyMediumSizeMediumMobile.dp,
-                    iconWithBodyMediumSizeMediumTablet.dp
+                    iconWithBodyMediumSizeMdMobile.dp,
+                    iconWithBodyMediumSizeMdMobile.dp,
+                    iconWithBodyMediumSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithBodyMediumSizeTallMobile.dp,
-                    iconWithBodyMediumSizeTallMobile.dp,
-                    iconWithBodyMediumSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithBodyMediumSizeLgMobile.dp,
+                    iconWithBodyMediumSizeLgMobile.dp,
+                    iconWithBodyMediumSizeLgTablet.dp
                 ),
             ),
             large = OudsSizes.Icon.WithBody.Large(
-                sizeShort = OudsAdaptiveTokenValue(
-                    iconWithBodyLargeSizeShortMobile.dp,
-                    iconWithBodyLargeSizeShortMobile.dp,
-                    iconWithBodyLargeSizeShortTablet.dp
+                sizeSmall = OudsAdaptiveTokenValue(
+                    iconWithBodyLargeSizeSmMobile.dp,
+                    iconWithBodyLargeSizeSmMobile.dp,
+                    iconWithBodyLargeSizeSmTablet.dp
                 ),
                 sizeMedium = OudsAdaptiveTokenValue(
-                    iconWithBodyLargeSizeMediumMobile.dp,
-                    iconWithBodyLargeSizeMediumMobile.dp,
-                    iconWithBodyLargeSizeMediumTablet.dp
+                    iconWithBodyLargeSizeMdMobile.dp,
+                    iconWithBodyLargeSizeMdMobile.dp,
+                    iconWithBodyLargeSizeMdTablet.dp
                 ),
-                sizeTall = OudsAdaptiveTokenValue(
-                    iconWithBodyLargeSizeTallMobile.dp,
-                    iconWithBodyLargeSizeTallMobile.dp,
-                    iconWithBodyLargeSizeTallTablet.dp
+                sizeLarge = OudsAdaptiveTokenValue(
+                    iconWithBodyLargeSizeLgMobile.dp,
+                    iconWithBodyLargeSizeLgMobile.dp,
+                    iconWithBodyLargeSizeLgTablet.dp
                 ),
             ),
         ),
@@ -379,114 +379,114 @@ fun OudsSizeSemanticTokens.getSizes() = OudsSizes(
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.Decorative): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.Decorative.Shortest -> icon.decorative.shortest
-        OudsSizeKeyToken.Icon.Decorative.Shorter -> icon.decorative.shorter
-        OudsSizeKeyToken.Icon.Decorative.Short -> icon.decorative.short
+        OudsSizeKeyToken.Icon.Decorative.ExtraExtraSmall -> icon.decorative.extraExtraSmall
+        OudsSizeKeyToken.Icon.Decorative.ExtraSmall -> icon.decorative.extraSmall
+        OudsSizeKeyToken.Icon.Decorative.Small -> icon.decorative.small
         OudsSizeKeyToken.Icon.Decorative.Medium -> icon.decorative.medium
-        OudsSizeKeyToken.Icon.Decorative.Tall -> icon.decorative.tall
-        OudsSizeKeyToken.Icon.Decorative.Taller -> icon.decorative.taller
-        OudsSizeKeyToken.Icon.Decorative.Tallest -> icon.decorative.tallest
+        OudsSizeKeyToken.Icon.Decorative.Large -> icon.decorative.large
+        OudsSizeKeyToken.Icon.Decorative.ExtraLarge -> icon.decorative.extraLarge
+        OudsSizeKeyToken.Icon.Decorative.ExtraExtraLarge -> icon.decorative.extraExtraLarge
     }
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithHeadingExtraLarge, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithHeadingExtraLarge.SizeShort -> icon.withHeading.extraLarge.sizeShort
+        OudsSizeKeyToken.Icon.WithHeadingExtraLarge.SizeSmall -> icon.withHeading.extraLarge.sizeSmall
         OudsSizeKeyToken.Icon.WithHeadingExtraLarge.SizeMedium -> icon.withHeading.extraLarge.sizeMedium
-        OudsSizeKeyToken.Icon.WithHeadingExtraLarge.SizeTall -> icon.withHeading.extraLarge.sizeTall
+        OudsSizeKeyToken.Icon.WithHeadingExtraLarge.SizeLarge -> icon.withHeading.extraLarge.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithHeadingLarge, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithHeadingLarge.SizeShort -> icon.withHeading.large.sizeShort
+        OudsSizeKeyToken.Icon.WithHeadingLarge.SizeSmall -> icon.withHeading.large.sizeSmall
         OudsSizeKeyToken.Icon.WithHeadingLarge.SizeMedium -> icon.withHeading.large.sizeMedium
-        OudsSizeKeyToken.Icon.WithHeadingLarge.SizeTall -> icon.withHeading.large.sizeTall
+        OudsSizeKeyToken.Icon.WithHeadingLarge.SizeLarge -> icon.withHeading.large.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithHeadingMedium, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithHeadingMedium.SizeShort -> icon.withHeading.medium.sizeShort
+        OudsSizeKeyToken.Icon.WithHeadingMedium.SizeSmall -> icon.withHeading.medium.sizeSmall
         OudsSizeKeyToken.Icon.WithHeadingMedium.SizeMedium -> icon.withHeading.medium.sizeMedium
-        OudsSizeKeyToken.Icon.WithHeadingMedium.SizeTall -> icon.withHeading.medium.sizeTall
+        OudsSizeKeyToken.Icon.WithHeadingMedium.SizeLarge -> icon.withHeading.medium.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithHeadingSmall, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithHeadingSmall.SizeShort -> icon.withHeading.small.sizeShort
+        OudsSizeKeyToken.Icon.WithHeadingSmall.SizeSmall -> icon.withHeading.small.sizeSmall
         OudsSizeKeyToken.Icon.WithHeadingSmall.SizeMedium -> icon.withHeading.small.sizeMedium
-        OudsSizeKeyToken.Icon.WithHeadingSmall.SizeTall -> icon.withHeading.small.sizeTall
+        OudsSizeKeyToken.Icon.WithHeadingSmall.SizeLarge -> icon.withHeading.small.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithBodyLarge, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithBodyLarge.SizeShort -> icon.withBody.large.sizeShort
+        OudsSizeKeyToken.Icon.WithBodyLarge.SizeSmall -> icon.withBody.large.sizeSmall
         OudsSizeKeyToken.Icon.WithBodyLarge.SizeMedium -> icon.withBody.large.sizeMedium
-        OudsSizeKeyToken.Icon.WithBodyLarge.SizeTall -> icon.withBody.large.sizeTall
+        OudsSizeKeyToken.Icon.WithBodyLarge.SizeLarge -> icon.withBody.large.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithBodyMedium, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithBodyMedium.SizeShort -> icon.withBody.medium.sizeShort
+        OudsSizeKeyToken.Icon.WithBodyMedium.SizeSmall -> icon.withBody.medium.sizeSmall
         OudsSizeKeyToken.Icon.WithBodyMedium.SizeMedium -> icon.withBody.medium.sizeMedium
-        OudsSizeKeyToken.Icon.WithBodyMedium.SizeTall -> icon.withBody.medium.sizeTall
+        OudsSizeKeyToken.Icon.WithBodyMedium.SizeLarge -> icon.withBody.medium.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithBodySmall, adaptiveWindowType: OudsAdaptiveWindowType): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithBodySmall.SizeShort -> icon.withBody.small.sizeShort
+        OudsSizeKeyToken.Icon.WithBodySmall.SizeSmall -> icon.withBody.small.sizeSmall
         OudsSizeKeyToken.Icon.WithBodySmall.SizeMedium -> icon.withBody.small.sizeMedium
-        OudsSizeKeyToken.Icon.WithBodySmall.SizeTall -> icon.withBody.small.sizeTall
+        OudsSizeKeyToken.Icon.WithBodySmall.SizeLarge -> icon.withBody.small.sizeLarge
     }.getValue(adaptiveWindowType)
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabelExtraLarge): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithLabelExtraLarge.SizeShort -> icon.withLabel.extraLarge.sizeShort
+        OudsSizeKeyToken.Icon.WithLabelExtraLarge.SizeSmall -> icon.withLabel.extraLarge.sizeSmall
         OudsSizeKeyToken.Icon.WithLabelExtraLarge.SizeMedium -> icon.withLabel.extraLarge.sizeMedium
-        OudsSizeKeyToken.Icon.WithLabelExtraLarge.SizeTall -> icon.withLabel.extraLarge.sizeTall
+        OudsSizeKeyToken.Icon.WithLabelExtraLarge.SizeLarge -> icon.withLabel.extraLarge.sizeLarge
     }
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabelLarge): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithLabelLarge.SizeShorter -> icon.withLabel.large.sizeShorter
-        OudsSizeKeyToken.Icon.WithLabelLarge.SizeShort -> icon.withLabel.large.sizeShort
+        OudsSizeKeyToken.Icon.WithLabelLarge.SizeExtraSmall -> icon.withLabel.large.sizeExtraSmall
+        OudsSizeKeyToken.Icon.WithLabelLarge.SizeSmall -> icon.withLabel.large.sizeSmall
         OudsSizeKeyToken.Icon.WithLabelLarge.SizeMedium -> icon.withLabel.large.sizeMedium
-        OudsSizeKeyToken.Icon.WithLabelLarge.SizeTall -> icon.withLabel.large.sizeTall
-        OudsSizeKeyToken.Icon.WithLabelLarge.SizeTaller -> icon.withLabel.large.sizeTaller
+        OudsSizeKeyToken.Icon.WithLabelLarge.SizeLarge -> icon.withLabel.large.sizeLarge
+        OudsSizeKeyToken.Icon.WithLabelLarge.SizeExtraLarge -> icon.withLabel.large.sizeExtraLarge
     }
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabelMedium): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithLabelMedium.SizeShort -> icon.withLabel.medium.sizeShort
+        OudsSizeKeyToken.Icon.WithLabelMedium.SizeSmall -> icon.withLabel.medium.sizeSmall
         OudsSizeKeyToken.Icon.WithLabelMedium.SizeMedium -> icon.withLabel.medium.sizeMedium
-        OudsSizeKeyToken.Icon.WithLabelMedium.SizeTall -> icon.withLabel.medium.sizeTall
+        OudsSizeKeyToken.Icon.WithLabelMedium.SizeLarge -> icon.withLabel.medium.sizeLarge
     }
 }
 
 @Stable
 fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabelSmall): Dp {
     return when (token) {
-        OudsSizeKeyToken.Icon.WithLabelSmall.SizeShort -> icon.withLabel.small.sizeShort
+        OudsSizeKeyToken.Icon.WithLabelSmall.SizeSmall -> icon.withLabel.small.sizeSmall
         OudsSizeKeyToken.Icon.WithLabelSmall.SizeMedium -> icon.withLabel.small.sizeMedium
-        OudsSizeKeyToken.Icon.WithLabelSmall.SizeTall -> icon.withLabel.small.sizeTall
+        OudsSizeKeyToken.Icon.WithLabelSmall.SizeLarge -> icon.withLabel.small.sizeLarge
     }
 }
 
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsSpaces.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsSpaces.kt
index b2d91dfc..9abd028a 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsSpaces.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsSpaces.kt
@@ -62,58 +62,30 @@ data class OudsSpaces(
 
     data class PaddingInline(
         val none: Dp,
+        val smash: Dp,
+        val shortest: Dp,
         val shorter: Dp,
         val short: Dp,
         val medium: Dp,
         val tall: Dp,
         val taller: Dp,
         val tallest: Dp,
-        val withIcon: WithIcon,
-        val withArrow: WithArrow
-    ) {
-        data class WithIcon(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-            val taller: Dp,
-            val tallest: Dp,
-        )
-
-        data class WithArrow(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-            val taller: Dp,
-            val tallest: Dp,
-        )
-    }
+        val huge: Dp,
+    )
 
     data class PaddingBlock(
         val none: Dp,
+        val smash: Dp,
+        val shortest: Dp,
         val shorter: Dp,
         val short: Dp,
         val medium: Dp,
         val tall: Dp,
         val taller: Dp,
         val tallest: Dp,
-        val withIcon: WithIcon
-    ) {
-        data class WithIcon(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-            val taller: Dp,
-        )
-    }
+        val spacious: Dp,
+        val huge: Dp,
+    )
 
     data class Inset(
         val none: Dp,
@@ -130,51 +102,25 @@ data class OudsSpaces(
 
     data class ColumnGap(
         val none: Dp,
+        val smash: Dp,
+        val shortest: Dp,
         val shorter: Dp,
         val short: Dp,
         val medium: Dp,
         val tall: Dp,
         val taller: Dp,
-        val withIcon: WithIcon,
-        val withArrow: WithArrow
-    ) {
-        data class WithIcon(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-        )
-
-        data class WithArrow(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-        )
-    }
+        val tallest: Dp,
+    )
 
     data class RowGap(
         val none: Dp,
+        val smash: Dp,
         val shortest: Dp,
         val shorter: Dp,
         val short: Dp,
         val medium: Dp,
         val tall: Dp,
-        val withIcon: WithIcon
-    ) {
-        data class WithIcon(
-            val none: Dp,
-            val shortest: Dp,
-            val shorter: Dp,
-            val short: Dp,
-            val medium: Dp,
-            val tall: Dp,
-        )
-    }
+    )
 }
 
 fun OudsSpaceSemanticTokens.getSpaces() = OudsSpaces(
@@ -246,50 +192,28 @@ fun OudsSpaceSemanticTokens.getSpaces() = OudsSpaces(
     ),
     paddingInline = OudsSpaces.PaddingInline(
         none = paddingInlineNone.dp,
+        smash = paddingInlineSmash.dp,
+        shortest = paddingInlineShortest.dp,
         shorter = paddingInlineShorter.dp,
         short = paddingInlineShort.dp,
         medium = paddingInlineMedium.dp,
         tall = paddingInlineTall.dp,
         taller = paddingInlineTaller.dp,
         tallest = paddingInlineTallest.dp,
-        withIcon = OudsSpaces.PaddingInline.WithIcon(
-            none = paddingInlineWithIconNone.dp,
-            shortest = paddingInlineWithIconShortest.dp,
-            shorter = paddingInlineWithIconShorter.dp,
-            short = paddingInlineWithIconShort.dp,
-            medium = paddingInlineWithIconMedium.dp,
-            tall = paddingInlineWithIconTall.dp,
-            taller = paddingInlineWithIconTaller.dp,
-            tallest = paddingInlineWithIconTallest.dp,
-        ),
-        withArrow = OudsSpaces.PaddingInline.WithArrow(
-            none = paddingInlineWithArrowNone.dp,
-            shortest = paddingInlineWithArrowShortest.dp,
-            shorter = paddingInlineWithArrowShorter.dp,
-            short = paddingInlineWithArrowShort.dp,
-            medium = paddingInlineWithArrowMedium.dp,
-            tall = paddingInlineWithArrowTall.dp,
-            taller = paddingInlineWithArrowTaller.dp,
-            tallest = paddingInlineWithArrowTallest.dp,
-        ),
+        huge = paddingInlineHuge.dp,
     ),
     paddingBlock = OudsSpaces.PaddingBlock(
         none = paddingBlockNone.dp,
+        smash = paddingBlockSmash.dp,
+        shortest = paddingBlockShortest.dp,
         shorter = paddingBlockShorter.dp,
         short = paddingBlockShort.dp,
         medium = paddingBlockMedium.dp,
         tall = paddingBlockTall.dp,
         taller = paddingBlockTaller.dp,
         tallest = paddingBlockTallest.dp,
-        withIcon = OudsSpaces.PaddingBlock.WithIcon(
-            none = paddingBlockWithIconNone.dp,
-            shortest = paddingBlockWithIconShortest.dp,
-            shorter = paddingBlockWithIconShorter.dp,
-            short = paddingBlockWithIconShort.dp,
-            medium = paddingBlockWithIconMedium.dp,
-            tall = paddingBlockWithIconTall.dp,
-            taller = paddingBlockWithIconTaller.dp,
-        ),
+        spacious = paddingBlockSpacious.dp,
+        huge = paddingBlockHuge.dp,
     ),
     inset = OudsSpaces.Inset(
         none = insetNone.dp,
@@ -305,43 +229,23 @@ fun OudsSpaceSemanticTokens.getSpaces() = OudsSpaces(
     ),
     columnGap = OudsSpaces.ColumnGap(
         none = columnGapNone.dp,
+        smash = columnGapSmash.dp,
+        shortest = columnGapShortest.dp,
         shorter = columnGapShorter.dp,
         short = columnGapShort.dp,
         medium = columnGapMedium.dp,
         tall = columnGapTall.dp,
         taller = columnGapTaller.dp,
-        withIcon = OudsSpaces.ColumnGap.WithIcon(
-            none = columnGapWithIconNone.dp,
-            shortest = columnGapWithIconShortest.dp,
-            shorter = columnGapWithIconShorter.dp,
-            short = columnGapWithIconShort.dp,
-            medium = columnGapWithIconMedium.dp,
-            tall = columnGapWithIconTall.dp,
-        ),
-        withArrow = OudsSpaces.ColumnGap.WithArrow(
-            none = columnGapWithArrowNone.dp,
-            shortest = columnGapWithArrowShortest.dp,
-            shorter = columnGapWithArrowShorter.dp,
-            short = columnGapWithArrowShort.dp,
-            medium = columnGapWithArrowMedium.dp,
-            tall = columnGapWithArrowTall.dp,
-        ),
+        tallest = columnGapTallest.dp,
     ),
     rowGap = OudsSpaces.RowGap(
         none = rowGapNone.dp,
+        smash = rowGapSmash.dp,
         shortest = rowGapShortest.dp,
         shorter = rowGapShorter.dp,
         short = rowGapShort.dp,
         medium = rowGapMedium.dp,
         tall = rowGapTall.dp,
-        withIcon = OudsSpaces.RowGap.WithIcon(
-            none = rowGapWithIconNone.dp,
-            shortest = rowGapWithIconShortest.dp,
-            shorter = rowGapWithIconShorter.dp,
-            short = rowGapWithIconShort.dp,
-            medium = rowGapWithIconMedium.dp,
-            tall = rowGapWithIconTall.dp,
-        )
     )
 )
 
@@ -383,30 +287,15 @@ fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.Scaled, adaptiveWindowType: Ou
 fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.PaddingInline): Dp {
     return when (token) {
         OudsSpaceKeyToken.PaddingInline.None -> paddingInline.none
+        OudsSpaceKeyToken.PaddingInline.Smash -> paddingInline.smash
+        OudsSpaceKeyToken.PaddingInline.Shortest -> paddingInline.shortest
         OudsSpaceKeyToken.PaddingInline.Shorter -> paddingInline.shorter
         OudsSpaceKeyToken.PaddingInline.Short -> paddingInline.short
         OudsSpaceKeyToken.PaddingInline.Medium -> paddingInline.medium
         OudsSpaceKeyToken.PaddingInline.Tall -> paddingInline.tall
         OudsSpaceKeyToken.PaddingInline.Taller -> paddingInline.taller
         OudsSpaceKeyToken.PaddingInline.Tallest -> paddingInline.tallest
-
-        OudsSpaceKeyToken.PaddingInline.WithIcon.None -> paddingInline.withIcon.none
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Shortest -> paddingInline.withIcon.shortest
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Shorter -> paddingInline.withIcon.shorter
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Short -> paddingInline.withIcon.short
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Medium -> paddingInline.withIcon.medium
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Tall -> paddingInline.withIcon.tall
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Taller -> paddingInline.withIcon.taller
-        OudsSpaceKeyToken.PaddingInline.WithIcon.Tallest -> paddingInline.withIcon.tallest
-
-        OudsSpaceKeyToken.PaddingInline.WithArrow.None -> paddingInline.withArrow.none
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Shortest -> paddingInline.withArrow.shortest
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Shorter -> paddingInline.withArrow.shorter
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Short -> paddingInline.withArrow.short
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Medium -> paddingInline.withArrow.medium
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Tall -> paddingInline.withArrow.tall
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Taller -> paddingInline.withArrow.taller
-        OudsSpaceKeyToken.PaddingInline.WithArrow.Tallest -> paddingInline.withArrow.tallest
+        OudsSpaceKeyToken.PaddingInline.Huge -> paddingInline.huge
     }
 }
 
@@ -414,20 +303,17 @@ fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.PaddingInline): Dp {
 fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.PaddingBlock): Dp {
     return when (token) {
         OudsSpaceKeyToken.PaddingBlock.None -> paddingBlock.none
+        OudsSpaceKeyToken.PaddingBlock.Smash -> paddingBlock.smash
+        OudsSpaceKeyToken.PaddingBlock.Shortest -> paddingBlock.shortest
         OudsSpaceKeyToken.PaddingBlock.Shorter -> paddingBlock.shorter
         OudsSpaceKeyToken.PaddingBlock.Short -> paddingBlock.short
         OudsSpaceKeyToken.PaddingBlock.Medium -> paddingBlock.medium
         OudsSpaceKeyToken.PaddingBlock.Tall -> paddingBlock.tall
         OudsSpaceKeyToken.PaddingBlock.Taller -> paddingBlock.taller
         OudsSpaceKeyToken.PaddingBlock.Tallest -> paddingBlock.tallest
+        OudsSpaceKeyToken.PaddingBlock.Spacious -> paddingBlock.spacious
+        OudsSpaceKeyToken.PaddingBlock.Huge -> paddingBlock.huge
 
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.None -> paddingBlock.withIcon.none
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Shortest -> paddingBlock.withIcon.shortest
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Shorter -> paddingBlock.withIcon.shorter
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Short -> paddingBlock.withIcon.short
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Medium -> paddingBlock.withIcon.medium
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Tall -> paddingBlock.withIcon.tall
-        OudsSpaceKeyToken.PaddingBlock.WithIcon.Taller -> paddingBlock.withIcon.taller
     }
 }
 
@@ -451,25 +337,14 @@ fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.Inset): Dp {
 fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.ColumnGap): Dp {
     return when (token) {
         OudsSpaceKeyToken.ColumnGap.None -> columnGap.none
+        OudsSpaceKeyToken.ColumnGap.Smash -> columnGap.smash
+        OudsSpaceKeyToken.ColumnGap.Shortest -> columnGap.shortest
         OudsSpaceKeyToken.ColumnGap.Shorter -> columnGap.shorter
         OudsSpaceKeyToken.ColumnGap.Short -> columnGap.short
         OudsSpaceKeyToken.ColumnGap.Medium -> columnGap.medium
         OudsSpaceKeyToken.ColumnGap.Tall -> columnGap.tall
         OudsSpaceKeyToken.ColumnGap.Taller -> columnGap.taller
-
-        OudsSpaceKeyToken.ColumnGap.WithIcon.None -> columnGap.withIcon.none
-        OudsSpaceKeyToken.ColumnGap.WithIcon.Shortest -> columnGap.withIcon.shortest
-        OudsSpaceKeyToken.ColumnGap.WithIcon.Shorter -> columnGap.withIcon.shorter
-        OudsSpaceKeyToken.ColumnGap.WithIcon.Short -> columnGap.withIcon.short
-        OudsSpaceKeyToken.ColumnGap.WithIcon.Medium -> columnGap.withIcon.medium
-        OudsSpaceKeyToken.ColumnGap.WithIcon.Tall -> columnGap.withIcon.tall
-
-        OudsSpaceKeyToken.ColumnGap.WithArrow.None -> columnGap.withArrow.none
-        OudsSpaceKeyToken.ColumnGap.WithArrow.Shortest -> columnGap.withArrow.shortest
-        OudsSpaceKeyToken.ColumnGap.WithArrow.Shorter -> columnGap.withArrow.shorter
-        OudsSpaceKeyToken.ColumnGap.WithArrow.Short -> columnGap.withArrow.short
-        OudsSpaceKeyToken.ColumnGap.WithArrow.Medium -> columnGap.withArrow.medium
-        OudsSpaceKeyToken.ColumnGap.WithArrow.Tall -> columnGap.withArrow.tall
+        OudsSpaceKeyToken.ColumnGap.Tallest -> columnGap.tallest
     }
 }
 
@@ -477,18 +352,12 @@ fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.ColumnGap): Dp {
 fun OudsSpaces.fromToken(token: OudsSpaceKeyToken.RowGap): Dp {
     return when (token) {
         OudsSpaceKeyToken.RowGap.None -> rowGap.none
+        OudsSpaceKeyToken.RowGap.Smash -> rowGap.smash
         OudsSpaceKeyToken.RowGap.Shortest -> rowGap.shortest
         OudsSpaceKeyToken.RowGap.Shorter -> rowGap.shorter
         OudsSpaceKeyToken.RowGap.Short -> rowGap.short
         OudsSpaceKeyToken.RowGap.Medium -> rowGap.medium
         OudsSpaceKeyToken.RowGap.Tall -> rowGap.tall
-
-        OudsSpaceKeyToken.RowGap.WithIcon.None -> rowGap.withIcon.none
-        OudsSpaceKeyToken.RowGap.WithIcon.Shortest -> rowGap.withIcon.shortest
-        OudsSpaceKeyToken.RowGap.WithIcon.Shorter -> rowGap.withIcon.shorter
-        OudsSpaceKeyToken.RowGap.WithIcon.Short -> rowGap.withIcon.short
-        OudsSpaceKeyToken.RowGap.WithIcon.Medium -> rowGap.withIcon.medium
-        OudsSpaceKeyToken.RowGap.WithIcon.Tall -> rowGap.withIcon.tall
     }
 }
 
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt
index 25fa84b8..168099a5 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt
@@ -13,10 +13,12 @@
 package com.orange.ouds.core.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.orange.ouds.theme.OudsThemeContract
 import com.orange.ouds.theme.tokens.components.OudsComponentsTokens
@@ -24,7 +26,12 @@ import com.orange.ouds.theme.tokens.components.OudsComponentsTokens
 private fun missingCompositionLocalError(compositionLocalName: String): Nothing =
     error("OudsTheme not found. $compositionLocalName CompositionLocal not present.")
 
+private val LocalDarkThemeEnabled = staticCompositionLocalOf<Boolean> { missingCompositionLocalError("LocalDarkThemeEnabled.") }
 private val LocalColorScheme = staticCompositionLocalOf<OudsColorScheme> { missingCompositionLocalError("LocalColorScheme") }
+private val LocalLightColorScheme = compositionLocalOf<OudsColorScheme> { missingCompositionLocalError("LocalLightThemeColorScheme") }
+private val LocalDarkColorScheme = compositionLocalOf<OudsColorScheme> { missingCompositionLocalError("LocalDarkThemeColorScheme") }
+private val LocalMaterialLightColorScheme = compositionLocalOf<ColorScheme> { missingCompositionLocalError("LocalMaterialLightThemeColorScheme") }
+private val LocalMaterialDarkColorScheme = compositionLocalOf<ColorScheme> { missingCompositionLocalError("LocalMaterialDarkThemeColorScheme") }
 private val LocalBorders = staticCompositionLocalOf<OudsBorders> { missingCompositionLocalError("LocalBorders") }
 private val LocalElevations = staticCompositionLocalOf<OudsElevations> { missingCompositionLocalError("LocalElevations") }
 private val LocalTypography = staticCompositionLocalOf<OudsTypography> { missingCompositionLocalError("LocalTypography") }
@@ -35,6 +42,16 @@ private val LocalSpaces = staticCompositionLocalOf<OudsSpaces> { missingComposit
 private val LocalComponentsTokens = staticCompositionLocalOf<OudsComponentsTokens> { missingCompositionLocalError("LocalComponentsTokens") }
 
 object OudsTheme {
+
+    /**
+     * Tweak of the current [OudsTheme] which can be passed to [OudsThemeTweak] composable:
+     *   - Invert set theme in dark when app is in light or in light when app is in dark
+     *   - ForceDark and ForceLight force the theme to be in dark or in light
+     */
+    enum class Tweak {
+        Invert, ForceDark, ForceLight
+    }
+
     val colorScheme: OudsColorScheme
         @Composable
         @ReadOnlyComposable
@@ -96,9 +113,15 @@ fun OudsTheme(
 ) {
 
     val colorScheme = if (darkThemeEnabled) themeContract.colorTokens.darkColorScheme else themeContract.colorTokens.lightColorScheme
+    val materialColorScheme = if (darkThemeEnabled) materialDarkColorScheme else materialLightColorScheme
 
     CompositionLocalProvider(
+        LocalDarkThemeEnabled provides darkThemeEnabled,
         LocalColorScheme provides colorScheme,
+        LocalLightColorScheme provides themeContract.colorTokens.lightColorScheme,
+        LocalDarkColorScheme provides themeContract.colorTokens.darkColorScheme,
+        LocalMaterialLightColorScheme provides materialLightColorScheme,
+        LocalMaterialDarkColorScheme provides materialDarkColorScheme,
         LocalBorders provides themeContract.borderTokens.getBorders(),
         LocalElevations provides themeContract.elevationTokens.getElevation(),
         LocalTypography provides themeContract.fontTokens.getTypography(themeContract.fontFamily),
@@ -106,10 +129,36 @@ fun OudsTheme(
         LocalOpacities provides themeContract.opacityTokens.getOpacity(),
         LocalSizes provides themeContract.sizeTokens.getSizes(),
         LocalSpaces provides themeContract.spaceTokens.getSpaces(),
-        LocalComponentsTokens provides themeContract.componentsTokens
+        LocalComponentsTokens provides themeContract.componentsTokens,
+    ) {
+        MaterialTheme(
+            colorScheme = materialColorScheme,
+            content = content
+        )
+    }
+}
+
+/**
+ * Tweaks the current OUDS theme and displays given [content] according to the selected [tweak].
+ * Note: This composable is directly related to [OudsTheme] and MUST be used inside it.
+ */
+@Composable
+fun OudsThemeTweak(tweak: OudsTheme.Tweak, content: @Composable () -> Unit) {
+    val tweakedToDark = when (tweak) {
+        OudsTheme.Tweak.Invert -> !LocalDarkThemeEnabled.current
+        OudsTheme.Tweak.ForceDark -> true
+        OudsTheme.Tweak.ForceLight -> false
+    }
+    val colors = if (tweakedToDark) LocalDarkColorScheme.current else LocalLightColorScheme.current
+    val materialColorScheme = if (tweakedToDark) LocalMaterialDarkColorScheme.current else LocalMaterialLightColorScheme.current
+
+    CompositionLocalProvider(
+        LocalDarkThemeEnabled provides tweakedToDark,
+        LocalColorScheme provides colors
     ) {
-        MaterialTheme(colorScheme = if (darkThemeEnabled) themeContract.colorTokens.materialDarkColorScheme else themeContract.colorTokens.materialLightColorScheme) {
-            content()
-        }
+        MaterialTheme(
+            colorScheme = materialColorScheme,
+            content = content
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png
index 7074e427..5afd96ce 100644
Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png differ
diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png
index bbaf6908..8a3580e1 100644
Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png differ
diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png
index e3101a5b..d4418d7b 100644
Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png differ
diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png
index 32ea3bd8..df1fadc6 100644
Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png differ
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt
index 5783175a..41b4999e 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt
@@ -36,6 +36,7 @@ object BorderRawTokens {
   const val borderWidth50 = borderBase * 0.5f // 2
   const val borderWidth75 = borderBase * 0.75f // 3
   const val borderWidth100 = borderBase * 1f // 4
+  const val borderWidth125 = borderBase * 1.25f // 5
   const val borderWidth150 = borderBase * 1.5f // 6
   const val borderWidth200 = borderBase * 2f // 8
 }
\ No newline at end of file
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt
index 2467eac1..586daf5a 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt
@@ -131,24 +131,58 @@ object ColorRawTokens {
   val colorFunctionalSun800 = Color(0xff665100)
   val colorFunctionalSun900 = Color(0xff3d3100)
   val colorFunctionalWhite = Color(0xffffffff)
-  val colorTransparentBlack0 = Color(0x00000000)
-  val colorTransparentBlack100 = Color(0x0a000000)
-  val colorTransparentBlack200 = Color(0x14000000)
-  val colorTransparentBlack300 = Color(0x29000000)
-  val colorTransparentBlack400 = Color(0x3d000000)
-  val colorTransparentBlack500 = Color(0x52000000)
-  val colorTransparentBlack600 = Color(0x7a000000)
-  val colorTransparentBlack700 = Color(0xa3000000)
-  val colorTransparentBlack800 = Color(0xe0000000)
-  val colorTransparentBlack900 = Color(0xff000000)
-  val colorTransparentWhite0 = Color(0x00ffffff)
-  val colorTransparentWhite100 = Color(0x0affffff)
-  val colorTransparentWhite200 = Color(0x14ffffff)
-  val colorTransparentWhite300 = Color(0x29ffffff)
-  val colorTransparentWhite400 = Color(0x3dffffff)
-  val colorTransparentWhite500 = Color(0x52ffffff)
-  val colorTransparentWhite600 = Color(0x7affffff)
-  val colorTransparentWhite700 = Color(0xa3ffffff)
-  val colorTransparentWhite800 = Color(0xe0ffffff)
-  val colorTransparentWhite900 = Color(0xffffffff)
+  val colorOpacityBlack0 = Color(0x00000000)
+  val colorOpacityBlack40 = Color(0x0a000000)
+  val colorOpacityBlack80 = Color(0x14000000)
+  val colorOpacityBlack120 = Color(0x1f000000)
+  val colorOpacityBlack160 = Color(0x29000000)
+  val colorOpacityBlack200 = Color(0x33000000)
+  val colorOpacityBlack240 = Color(0x3d000000)
+  val colorOpacityBlack280 = Color(0x47000000)
+  val colorOpacityBlack320 = Color(0x52000000)
+  val colorOpacityBlack360 = Color(0x5c000000)
+  val colorOpacityBlack400 = Color(0x66000000)
+  val colorOpacityBlack440 = Color(0x70000000)
+  val colorOpacityBlack480 = Color(0x7a000000)
+  val colorOpacityBlack520 = Color(0x85000000)
+  val colorOpacityBlack560 = Color(0x8f000000)
+  val colorOpacityBlack600 = Color(0x99000000)
+  val colorOpacityBlack640 = Color(0xa3000000)
+  val colorOpacityBlack680 = Color(0xad000000)
+  val colorOpacityBlack720 = Color(0xb8000000)
+  val colorOpacityBlack760 = Color(0xc2000000)
+  val colorOpacityBlack800 = Color(0xcc000000)
+  val colorOpacityBlack840 = Color(0xd6000000)
+  val colorOpacityBlack880 = Color(0xe0000000)
+  val colorOpacityBlack920 = Color(0xeb000000)
+  val colorOpacityBlack960 = Color(0xf5000000)
+  val colorOpacityDodgerBlue = Color(0x1426b2ff)
+  val colorOpacityMalachite = Color(0x1f3de35a)
+  val colorOpacityScarlet = Color(0x14ea0305)
+  val colorOpacitySun = Color(0x29ffd000)
+  val colorOpacityWhite0 = Color(0x00ffffff)
+  val colorOpacityWhite40 = Color(0x0affffff)
+  val colorOpacityWhite80 = Color(0x14ffffff)
+  val colorOpacityWhite120 = Color(0x1fffffff)
+  val colorOpacityWhite160 = Color(0x29ffffff)
+  val colorOpacityWhite200 = Color(0x33ffffff)
+  val colorOpacityWhite240 = Color(0x3dffffff)
+  val colorOpacityWhite280 = Color(0x47ffffff)
+  val colorOpacityWhite320 = Color(0x52ffffff)
+  val colorOpacityWhite360 = Color(0x5cffffff)
+  val colorOpacityWhite400 = Color(0x66ffffff)
+  val colorOpacityWhite440 = Color(0x70ffffff)
+  val colorOpacityWhite480 = Color(0x7affffff)
+  val colorOpacityWhite520 = Color(0x85ffffff)
+  val colorOpacityWhite560 = Color(0x8fffffff)
+  val colorOpacityWhite600 = Color(0x99ffffff)
+  val colorOpacityWhite640 = Color(0xa3ffffff)
+  val colorOpacityWhite680 = Color(0xadffffff)
+  val colorOpacityWhite720 = Color(0xb8ffffff)
+  val colorOpacityWhite760 = Color(0xc2ffffff)
+  val colorOpacityWhite800 = Color(0xccffffff)
+  val colorOpacityWhite840 = Color(0xd6ffffff)
+  val colorOpacityWhite880 = Color(0xe0ffffff)
+  val colorOpacityWhite920 = Color(0xebffffff)
+  val colorOpacityWhite960 = Color(0xf5ffffff)
 }
\ No newline at end of file
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt
index 5a4633f1..24f0d318 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt
@@ -14,13 +14,28 @@ package com.orange.ouds.tokens.global.raw
 
 object OpacityRawTokens {
   const val opacity0 = 0f
-  const val opacity100 = 0.04f
-  const val opacity200 = 0.08f
-  const val opacity300 = 0.16f
-  const val opacity400 = 0.24f
-  const val opacity500 = 0.32f
-  const val opacity600 = 0.48f
-  const val opacity700 = 0.64f
+  const val opacity40 = 0.04f
+  const val opacity80 = 0.08f
+  const val opacity120 = 0.12f
+  const val opacity160 = 0.16f
+  const val opacity200 = 0.2f
+  const val opacity240 = 0.24f
+  const val opacity280 = 0.28f
+  const val opacity320 = 0.32f
+  const val opacity360 = 0.36f
+  const val opacity400 = 0.4f
+  const val opacity440 = 0.44f
+  const val opacity480 = 0.48f
+  const val opacity520 = 0.52f
+  const val opacity560 = 0.56f
+  const val opacity600 = 0.6f
+  const val opacity640 = 0.64f
+  const val opacity680 = 0.68f
+  const val opacity720 = 0.72f
+  const val opacity760 = 0.76f
   const val opacity800 = 0.8f
-  const val opacity900 = 1f
+  const val opacity880 = 0.88f
+  const val opacity920 = 0.92f
+  const val opacity960 = 0.96f
+  const val opacity1000 = 1f
 }
\ No newline at end of file
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt
index da3604f0..58d4a131 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt
@@ -21,7 +21,7 @@ object OrangeBrandColorRawTokens {
   val colorOrange300 = Color(0xffffa554)
   val colorOrange400 = Color(0xffff9433)
   val colorOrange500 = Color(0xffff7900)
-  val colorOrange550 = Color(0xfff16e00)
+  val colorOrange550 = Color(0xfff15e00)
   val colorOrange600 = Color(0xffe86e00)
   val colorOrange700 = Color(0xffb55600)
   val colorOrange800 = Color(0xff8c4300)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
index aec0a101..c1d07a57 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
@@ -15,15 +15,13 @@ package com.orange.ouds.theme.tokens
 
 sealed interface OudsColorKeyToken {
 
-    sealed interface Transparent : OudsColorKeyToken {
-        data object Default : Transparent
-    }
-
     sealed interface Action : OudsColorKeyToken {
-        sealed interface Disabled : Action {
-            companion object : Disabled
-            data object OnBgEmphasized : Disabled
-        }
+        data object Disabled : Action
+        data object Enabled : Action
+        data object Focus : Action
+        data object Highlighted : Action
+        data object Hover : Action
+        data object Loading : Action
 
         sealed interface Negative : Action {
             data object Enabled : Negative
@@ -33,85 +31,24 @@ sealed interface OudsColorKeyToken {
             data object Pressed : Negative
         }
 
-        sealed interface Primary : Action {
-            sealed interface Enabled : Primary {
-                companion object : Enabled
-                data object OnBgEmphasized : Enabled
-            }
-
-            sealed interface Focus : Primary {
-                companion object : Focus
-                data object OnBgEmphasized : Focus
-            }
-
-            sealed interface Hover : Primary {
-                companion object : Hover
-                data object OnBgEmphasized : Hover
-            }
-
-            sealed interface Loading : Primary {
-                companion object : Loading
-                data object OnBgEmphasized : Loading
-            }
+        data object Pressed : Action
+        data object Selected : Action
 
-            sealed interface Pressed : Primary {
-                companion object : Pressed
-                data object OnBgEmphasized : Pressed
-            }
+        sealed interface Support : Action {
+            data object Enabled : Support
+            data object Focus : Support
+            data object Hover : Support
+            data object Loading : Support
+            data object Pressed : Support
         }
 
-        sealed interface Secondary : Action {
-            sealed interface Enabled : Secondary {
-                companion object : Enabled
-                data object OnBgEmphasized : Enabled
-            }
-
-            sealed interface Focus : Secondary {
-                companion object : Focus
-                data object OnBgEmphasized : Focus
-            }
-
-            sealed interface Hover : Secondary {
-                companion object : Hover
-                data object OnBgEmphasized : Hover
-            }
-
-            sealed interface Loading : Secondary {
-                companion object : Loading
-                data object OnBgEmphasized : Loading
-            }
-
-            sealed interface Pressed : Secondary {
-                companion object : Pressed
-                data object OnBgEmphasized : Pressed
-            }
-        }
-
-        sealed interface Selected : Action {
-            companion object : Selected
-            data object OnBgEmphasized : Selected
-        }
-
-        sealed interface Visited : Action {
-            companion object : Visited
-            data object OnBgEmphasized : Visited
-        }
+        data object Visited : Action
     }
 
     sealed interface Always : OudsColorKeyToken {
-        data object Accent : Always
         data object Black : Always
-        data object Info : Always
-        data object Negative : Always
-        data object OnAccent : Always
         data object OnBlack : Always
-        data object OnInfo : Always
-        data object OnNegative : Always
-        data object OnPositive : Always
-        data object OnWarning : Always
         data object OnWhite : Always
-        data object Positive : Always
-        data object Warning : Always
         data object White : Always
     }
 
@@ -120,86 +57,19 @@ sealed interface OudsColorKeyToken {
         data object Primary : Background
         data object Secondary : Background
         data object Tertiary : Background
-
-        sealed interface Brand : Background {
-            data object Primary : Brand
-        }
-
-        sealed interface Status : Background {
-            sealed interface Accent : Status {
-                data object Emphasized : Accent
-                sealed interface Muted : Accent {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Info : Background {
-                data object Emphasized : Info
-                sealed interface Muted : Info {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Negative : Background {
-                data object Emphasized : Negative
-                sealed interface Muted : Negative {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Neutral : Background {
-                companion object : Neutral
-                data object OnBgEmphasized : Neutral
-            }
-
-            sealed interface Positive : Background {
-                data object Emphasized : Positive
-                sealed interface Muted : Positive {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Warning : Background {
-                data object Emphasized : Warning
-                sealed interface Muted : Warning {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-        }
     }
 
     sealed interface Border : OudsColorKeyToken {
         sealed interface Brand : Border {
-            sealed interface Primary : Brand {
-                companion object : Primary
-                data object OnBgEmphasized : Primary
-            }
+            data object Primary : Brand
         }
 
-        sealed interface Default : Border {
-            companion object : Default
-            data object OnBgEmphasized : Default
-        }
-
-        sealed interface Emphasized : Border {
-            companion object : Emphasized
-            data object OnBgEmphasized : Emphasized
-        }
+        data object Default : Border
+        data object Emphasized : Border
 
         sealed interface Focus : Border {
             companion object : Focus
-
-            sealed interface Inset : Focus {
-                companion object : Inset
-                data object OnBgEmphasized : Inset
-            }
-
-            data object OnBgEmphasized : Focus
+            data object Inset : Focus
         }
 
         sealed interface OnBrand : Border {
@@ -207,172 +77,41 @@ sealed interface OudsColorKeyToken {
         }
     }
 
-    sealed interface Brand : OudsColorKeyToken {
-        sealed interface Accent : Brand {
-            data object Default : Accent
-            data object High : Accent
-            data object Highest : Accent
-            data object Lowest : Accent
-        }
-
-        sealed interface Info : Brand {
-            data object Default : Info
-            data object Highest : Info
-            data object Lowest : Info
-        }
-
-        sealed interface Negative : Brand {
-            data object Default : Negative
-            data object High : Negative
-            data object Higher : Negative
-            data object Highest : Negative
-            data object Lowest : Negative
-        }
-
-        sealed interface Neutral : Brand {
-            sealed interface Emphasized : Neutral {
-                data object Black : Emphasized
-                data object High : Emphasized
-                data object Higher : Emphasized
-                data object Highest : Emphasized
-                data object Low : Emphasized
-                data object Lower : Emphasized
-                data object Lowest : Emphasized
-                data object Medium : Emphasized
-            }
-
-            sealed interface Muted : Neutral {
-                data object Highest : Muted
-                data object Low : Muted
-                data object Lower : Muted
-                data object Lowest : Muted
-                data object Medium : Muted
-                data object White : Muted
-            }
-        }
-
-        sealed interface Positive : Brand {
-            data object Default : Positive
-            data object Highest : Positive
-            data object Lowest : Positive
-        }
-
-        sealed interface Primary : Brand {
-            data object Default : Primary
-            data object Low : Primary
-        }
-
-        sealed interface Warning : Brand {
-            data object Default : Warning
-            data object High : Warning
-            data object Highest : Warning
-            data object Lowest : Warning
-        }
-    }
-
     sealed interface Content : OudsColorKeyToken {
         sealed interface Brand : Content {
-            sealed interface Primary : Brand {
-                companion object : Primary
-                data object OnBgEmphasized : Primary
-            }
-        }
-
-        sealed interface Default : Content {
-            companion object : Default
-            data object OnBgEmphasized : Default
-        }
-
-        sealed interface Disabled : Content {
-            companion object : Disabled
-            data object OnBgEmphasized : Disabled
+            data object Primary : Brand
         }
 
-        sealed interface Muted : Content {
-            companion object : Muted
-            data object OnBgEmphasized : Muted
-        }
+        data object Default : Content
+        data object Disabled : Content
+        data object Muted : Content
 
         sealed interface OnAction : Content {
-            sealed interface Disabled : OnAction {
-                companion object : Disabled
-                data object OnBgEmphasized : Disabled
-            }
-
+            data object Disabled : OnAction
+            data object Enabled : OnAction
+            data object Focus : OnAction
+            data object Highlighted : OnAction
+            data object Hover : OnAction
+            data object Loading : OnAction
             data object Negative : OnAction
-
-            sealed interface Primary : OnAction {
-                sealed interface Enabled : Primary {
-                    companion object : Enabled
-                    data object OnBgEmphasized : Enabled
-                }
-
-                sealed interface Focus : Primary {
-                    companion object : Focus
-                    data object OnBgEmphasized : Focus
-                }
-
-                sealed interface Hover : Primary {
-                    companion object : Hover
-                    data object OnBgEmphasized : Hover
-                }
-
-                sealed interface Loading : Primary {
-                    companion object : Loading
-                    data object OnBgEmphasized : Loading
-                }
-
-                sealed interface Pressed : Primary {
-                    companion object : Pressed
-                    data object OnBgEmphasized : Pressed
-                }
-            }
+            data object Pressed : OnAction
         }
 
         sealed interface OnBrand : Content {
             data object Primary : OnBrand
         }
 
-        sealed interface OnStatus : Content {
-            sealed interface Accent : OnStatus {
-                data object Emphasized : Accent
-                sealed interface Muted : Accent {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Info : OnStatus {
-                data object Emphasized : Info
-                sealed interface Muted : Info {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
-
-            sealed interface Negative : OnStatus {
-                data object Emphasized : Negative
-                sealed interface Muted : Negative {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
+        sealed interface OnOverlay : Content {
+            data object Emphasized : OnOverlay
+        }
 
-            sealed interface Positive : OnStatus {
-                data object Emphasized : Positive
-                sealed interface Muted : Positive {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
+        sealed interface OnStatus : Content {
+            sealed interface Emphasized : OnStatus {
+                companion object : Emphasized
+                data object Neutral : Emphasized
             }
 
-            sealed interface Warning : OnStatus {
-                data object Emphasized : Warning
-                sealed interface Muted : Warning {
-                    companion object : Muted
-                    data object OnBgEmphasized : Muted
-                }
-            }
+            data object Muted : OnStatus
         }
 
         sealed interface Status : Content {
@@ -383,50 +122,6 @@ sealed interface OudsColorKeyToken {
         }
     }
 
-    sealed interface Elevation : OudsColorKeyToken {
-        sealed interface Drag : Elevation {
-            companion object : Drag
-            data object OnBgEmphasized : Drag
-            data object OnBgSecondary : Drag
-        }
-
-        data object Modal : Elevation
-
-        sealed interface Overlay : Elevation {
-            sealed interface Default : Overlay {
-                companion object : Default
-                data object OnBgEmphasized : Default
-                data object OnBgSecondary : Default
-            }
-
-            sealed interface Emphasized : Overlay {
-                companion object : Emphasized
-                data object OnBgEmphasized : Emphasized
-                data object OnBgSecondary : Emphasized
-            }
-        }
-
-        sealed interface Raised : Elevation {
-            companion object : Raised
-            data object OnBgEmphasized : Raised
-            data object OnBgSecondary : Raised
-        }
-    }
-
-    sealed interface Gradient : OudsColorKeyToken {
-        sealed interface Skeleton : Gradient {
-            sealed interface Middle : Skeleton {
-                companion object : Skeleton
-                data object OnBgEmphasized : Skeleton
-            }
-
-            sealed interface StartEnd : Skeleton {
-                companion object : Skeleton
-                data object OnBgEmphasized : Skeleton
-            }
-        }
-    }
-
     sealed interface Decorative : OudsColorKeyToken {
         sealed interface Accent : Decorative {
             sealed interface One : Accent {
@@ -484,4 +179,55 @@ sealed interface OudsColorKeyToken {
             data object Tint900 : Skin
         }
     }
+
+    sealed interface Opacity : OudsColorKeyToken {
+        data object InvisibleBlack : Opacity
+        data object InvisibleWhite : Opacity
+    }
+
+    sealed interface Overlay : OudsColorKeyToken {
+        data object Default : Overlay
+        data object Drag : Overlay
+        data object Emphasized : Overlay
+        data object Modal : Overlay
+    }
+
+    sealed interface Surface : OudsColorKeyToken {
+        sealed interface Brand : Surface {
+            data object Primary : Brand
+        }
+
+        sealed interface Status : Surface {
+            sealed interface Accent : Status {
+                data object Emphasized : Accent
+                data object Muted : Accent
+            }
+
+            sealed interface Info : Status {
+                data object Emphasized : Info
+                data object Muted : Info
+            }
+
+            sealed interface Negative : Status {
+                data object Emphasized : Negative
+                data object Muted : Negative
+            }
+
+            sealed interface Neutral : Status {
+                data object Emphasized : Neutral
+                data object Muted : Neutral
+            }
+
+            sealed interface Positive : Status {
+                data object Emphasized : Positive
+                data object Muted : Positive
+            }
+
+            sealed interface Warning : Status {
+                data object Emphasized : Warning
+                data object Muted : Warning
+            }
+        }
+    }
+
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
index 1012b4a8..7346c7a8 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
@@ -13,8 +13,8 @@
 package com.orange.ouds.theme.tokens
 
 sealed interface OudsOpacityKeyToken {
-    
-    data object Transparent : OudsOpacityKeyToken
+
+    data object Invisible : OudsOpacityKeyToken
     data object Weaker : OudsOpacityKeyToken
     data object Weak : OudsOpacityKeyToken
     data object Medium : OudsOpacityKeyToken
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
index fe730ce2..49db4dbf 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
@@ -16,81 +16,81 @@ sealed interface OudsSizeKeyToken {
 
     sealed interface Icon : OudsSizeKeyToken {
         sealed interface Decorative : Icon {
-            data object Shortest : Decorative
-            data object Shorter : Decorative
-            data object Short : Decorative
+            data object ExtraExtraSmall : Decorative
+            data object ExtraSmall : Decorative
+            data object Small : Decorative
             data object Medium : Decorative
-            data object Tall : Decorative
-            data object Taller : Decorative
-            data object Tallest : Decorative
+            data object Large : Decorative
+            data object ExtraLarge : Decorative
+            data object ExtraExtraLarge : Decorative
         }
 
         sealed interface WithHeadingExtraLarge : Icon {
-            data object SizeShort : WithHeadingExtraLarge
+            data object SizeSmall : WithHeadingExtraLarge
             data object SizeMedium : WithHeadingExtraLarge
-            data object SizeTall : WithHeadingExtraLarge
+            data object SizeLarge : WithHeadingExtraLarge
         }
 
         sealed interface WithHeadingLarge : Icon {
-            data object SizeShort : WithHeadingLarge
+            data object SizeSmall : WithHeadingLarge
             data object SizeMedium : WithHeadingLarge
-            data object SizeTall : WithHeadingLarge
+            data object SizeLarge : WithHeadingLarge
         }
 
         sealed interface WithHeadingMedium : Icon {
-            data object SizeShort : WithHeadingMedium
+            data object SizeSmall : WithHeadingMedium
             data object SizeMedium : WithHeadingMedium
-            data object SizeTall : WithHeadingMedium
+            data object SizeLarge : WithHeadingMedium
         }
 
         sealed interface WithHeadingSmall : Icon {
-            data object SizeShort : WithHeadingSmall
+            data object SizeSmall : WithHeadingSmall
             data object SizeMedium : WithHeadingSmall
-            data object SizeTall : WithHeadingSmall
+            data object SizeLarge : WithHeadingSmall
         }
 
         sealed interface WithBodyLarge : Icon {
-            data object SizeShort : WithBodyLarge
+            data object SizeSmall : WithBodyLarge
             data object SizeMedium : WithBodyLarge
-            data object SizeTall : WithBodyLarge
+            data object SizeLarge : WithBodyLarge
         }
 
         sealed interface WithBodyMedium : Icon {
-            data object SizeShort : WithBodyMedium
+            data object SizeSmall : WithBodyMedium
             data object SizeMedium : WithBodyMedium
-            data object SizeTall : WithBodyMedium
+            data object SizeLarge : WithBodyMedium
         }
 
         sealed interface WithBodySmall : Icon {
-            data object SizeShort : WithBodySmall
+            data object SizeSmall : WithBodySmall
             data object SizeMedium : WithBodySmall
-            data object SizeTall : WithBodySmall
+            data object SizeLarge : WithBodySmall
         }
 
         sealed interface WithLabelExtraLarge : Icon {
-            data object SizeShort : WithLabelExtraLarge
+            data object SizeSmall : WithLabelExtraLarge
             data object SizeMedium : WithLabelExtraLarge
-            data object SizeTall : WithLabelExtraLarge
+            data object SizeLarge : WithLabelExtraLarge
         }
 
         sealed interface WithLabelLarge : Icon {
-            data object SizeShorter : WithLabelLarge
-            data object SizeShort : WithLabelLarge
+            data object SizeExtraSmall : WithLabelLarge
+            data object SizeSmall : WithLabelLarge
             data object SizeMedium : WithLabelLarge
-            data object SizeTall : WithLabelLarge
-            data object SizeTaller : WithLabelLarge
+            data object SizeLarge : WithLabelLarge
+            data object SizeExtraLarge : WithLabelLarge
         }
 
         sealed interface WithLabelMedium : Icon {
-            data object SizeShort : WithLabelMedium
+            data object SizeSmall : WithLabelMedium
             data object SizeMedium : WithLabelMedium
-            data object SizeTall : WithLabelMedium
+            data object SizeLarge : WithLabelMedium
         }
 
         sealed interface WithLabelSmall : Icon {
-            data object SizeShort : WithLabelSmall
+            data object SizeSmall : WithLabelSmall
             data object SizeMedium : WithLabelSmall
-            data object SizeTall : WithLabelSmall
+            data object SizeLarge : WithLabelSmall
         }
     }
 
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
index ed9c966c..b81af1c9 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
@@ -44,54 +44,29 @@ sealed interface OudsSpaceKeyToken {
 
     sealed interface PaddingInline : OudsSpaceKeyToken {
         data object None : PaddingInline
+        data object Smash : PaddingInline
+        data object Shortest : PaddingInline
         data object Shorter : PaddingInline
         data object Short : PaddingInline
         data object Medium : PaddingInline
         data object Tall : PaddingInline
         data object Taller : PaddingInline
         data object Tallest : PaddingInline
-
-        sealed interface WithIcon : PaddingInline {
-            data object None : WithIcon
-            data object Shortest : WithIcon
-            data object Shorter : WithIcon
-            data object Short : WithIcon
-            data object Medium : WithIcon
-            data object Tall : WithIcon
-            data object Taller : WithIcon
-            data object Tallest : WithIcon
-        }
-
-        sealed interface WithArrow : PaddingInline {
-            data object None : WithArrow
-            data object Shortest : WithArrow
-            data object Shorter : WithArrow
-            data object Short : WithArrow
-            data object Medium : WithArrow
-            data object Tall : WithArrow
-            data object Taller : WithArrow
-            data object Tallest : WithArrow
-        }
+        data object Huge : PaddingInline
     }
 
     sealed interface PaddingBlock : OudsSpaceKeyToken {
         data object None : PaddingBlock
+        data object Smash : PaddingBlock
+        data object Shortest : PaddingBlock
         data object Shorter : PaddingBlock
         data object Short : PaddingBlock
         data object Medium : PaddingBlock
         data object Tall : PaddingBlock
         data object Taller : PaddingBlock
         data object Tallest : PaddingBlock
-
-        sealed interface WithIcon : PaddingBlock {
-            data object None : WithIcon
-            data object Shortest : WithIcon
-            data object Shorter : WithIcon
-            data object Short : WithIcon
-            data object Medium : WithIcon
-            data object Tall : WithIcon
-            data object Taller : WithIcon
-        }
+        data object Spacious : PaddingBlock
+        data object Huge : PaddingBlock
     }
 
     sealed interface Inset : OudsSpaceKeyToken {
@@ -109,46 +84,23 @@ sealed interface OudsSpaceKeyToken {
 
     sealed interface ColumnGap : OudsSpaceKeyToken {
         data object None : ColumnGap
+        data object Smash : ColumnGap
+        data object Shortest : ColumnGap
         data object Shorter : ColumnGap
         data object Short : ColumnGap
         data object Medium : ColumnGap
         data object Tall : ColumnGap
         data object Taller : ColumnGap
-
-        sealed interface WithIcon : ColumnGap {
-            data object None : WithIcon
-            data object Shortest : WithIcon
-            data object Shorter : WithIcon
-            data object Short : WithIcon
-            data object Medium : WithIcon
-            data object Tall : WithIcon
-        }
-
-        sealed interface WithArrow : ColumnGap {
-            data object None : WithArrow
-            data object Shortest : WithArrow
-            data object Shorter : WithArrow
-            data object Short : WithArrow
-            data object Medium : WithArrow
-            data object Tall : WithArrow
-        }
+        data object Tallest : ColumnGap
     }
 
     sealed interface RowGap : OudsSpaceKeyToken {
         data object None : RowGap
+        data object Smash : RowGap
         data object Shortest : RowGap
         data object Shorter : RowGap
         data object Short : RowGap
         data object Medium : RowGap
         data object Tall : RowGap
-
-        sealed interface WithIcon : RowGap {
-            data object None : WithIcon
-            data object Shortest : WithIcon
-            data object Shorter : WithIcon
-            data object Short : WithIcon
-            data object Medium : WithIcon
-            data object Tall : WithIcon
-        }
     }
 }
\ No newline at end of file
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorDarkTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorDarkTokens.kt
new file mode 100644
index 00000000..f24515a4
--- /dev/null
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorDarkTokens.kt
@@ -0,0 +1,55 @@
+/*
+ * Software Name: OUDS Android
+ * SPDX-FileCopyrightText: Copyright (c) Orange SA
+ * SPDX-License-Identifier: MIT
+ *
+ * This software is distributed under the MIT license
+ * the text of which is available at https://opensource.org/license/MIT/
+ * or see the "LICENSE" file for more details.
+ *
+ * Software description: Android library of reusable graphical components 
+ */
+
+package com.orange.ouds.theme.tokens.android
+
+import androidx.compose.ui.graphics.Color
+import com.orange.ouds.tokens.global.raw.ColorRawTokens
+
+object OudsAndroidColorDarkTokens {
+    val primary: Color = ColorRawTokens.colorFunctionalLightGray160
+    val onPrimary: Color = ColorRawTokens.colorFunctionalBlack
+    val primaryContainer: Color = ColorRawTokens.colorFunctionalLightGray160
+    val onPrimaryContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val inversePrimary: Color = ColorRawTokens.colorFunctionalBlack
+    val secondary: Color = ColorRawTokens.colorFunctionalLightGray160
+    val onSecondary: Color = ColorRawTokens.colorFunctionalBlack
+    val secondaryContainer: Color = ColorRawTokens.colorFunctionalLightGray160
+    val onSecondaryContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val tertiary: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val onTertiary: Color = ColorRawTokens.colorFunctionalLightGray160
+    val tertiaryContainer: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val onTertiaryContainer: Color = ColorRawTokens.colorFunctionalLightGray160
+    val background: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val onBackground: Color = ColorRawTokens.colorFunctionalLightGray160
+    val surface: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val surfaceVariant: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val surfaceTint: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val onSurface: Color = ColorRawTokens.colorFunctionalLightGray160
+    val onSurfaceVariant: Color = ColorRawTokens.colorOpacityWhite640
+    val surfaceBright: Color = ColorRawTokens.colorFunctionalDarkGray640
+    val surfaceDim: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val inverseSurface: Color = ColorRawTokens.colorFunctionalLightGray160
+    val inverseOnSurface: Color = ColorRawTokens.colorFunctionalBlack
+    val error: Color = ColorRawTokens.colorFunctionalScarlet300
+    val onError: Color = ColorRawTokens.colorFunctionalBlack
+    val errorContainer: Color = ColorRawTokens.colorFunctionalScarlet900
+    val onErrorContainer: Color = ColorRawTokens.colorFunctionalLightGray160
+    val outline: Color = ColorRawTokens.colorFunctionalLightGray160
+    val outlineVariant: Color = ColorRawTokens.colorOpacityWhite200
+    val scrim: Color = ColorRawTokens.colorFunctionalBlack
+    val surfaceContainer: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerHigh: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerHighest: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerLow: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val surfaceContainerLowest: Color = ColorRawTokens.colorFunctionalDarkGray880
+}
\ No newline at end of file
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorLightTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorLightTokens.kt
new file mode 100644
index 00000000..69b65739
--- /dev/null
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorLightTokens.kt
@@ -0,0 +1,55 @@
+/*
+ * Software Name: OUDS Android
+ * SPDX-FileCopyrightText: Copyright (c) Orange SA
+ * SPDX-License-Identifier: MIT
+ *
+ * This software is distributed under the MIT license
+ * the text of which is available at https://opensource.org/license/MIT/
+ * or see the "LICENSE" file for more details.
+ *
+ * Software description: Android library of reusable graphical components 
+ */
+
+package com.orange.ouds.theme.tokens.android
+
+import androidx.compose.ui.graphics.Color
+import com.orange.ouds.tokens.global.raw.ColorRawTokens
+
+object OudsAndroidColorLightTokens {
+    val primary: Color = ColorRawTokens.colorFunctionalBlack
+    val onPrimary: Color = ColorRawTokens.colorFunctionalLightGray160
+    val primaryContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val onPrimaryContainer: Color = ColorRawTokens.colorFunctionalWhite
+    val inversePrimary: Color = ColorRawTokens.colorFunctionalWhite
+    val secondary: Color = ColorRawTokens.colorFunctionalBlack
+    val onSecondary: Color = ColorRawTokens.colorFunctionalLightGray160
+    val secondaryContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val onSecondaryContainer: Color = ColorRawTokens.colorFunctionalWhite
+    val tertiary: Color = ColorRawTokens.colorFunctionalWhite
+    val onTertiary: Color = ColorRawTokens.colorFunctionalBlack
+    val tertiaryContainer: Color = ColorRawTokens.colorFunctionalWhite
+    val onTertiaryContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val background: Color = ColorRawTokens.colorFunctionalWhite
+    val onBackground: Color = ColorRawTokens.colorFunctionalBlack
+    val surface: Color = ColorRawTokens.colorFunctionalWhite
+    val surfaceVariant: Color = ColorRawTokens.colorFunctionalWhite
+    val surfaceTint: Color = ColorRawTokens.colorFunctionalWhite
+    val onSurface: Color = ColorRawTokens.colorFunctionalBlack
+    val onSurfaceVariant: Color = ColorRawTokens.colorOpacityBlack680
+    val surfaceBright: Color = ColorRawTokens.colorFunctionalWhite
+    val surfaceDim: Color = ColorRawTokens.colorFunctionalLightGray80
+    val inverseSurface: Color = ColorRawTokens.colorFunctionalDarkGray720
+    val inverseOnSurface: Color = ColorRawTokens.colorFunctionalWhite
+    val error: Color = ColorRawTokens.colorFunctionalScarlet600
+    val onError: Color = ColorRawTokens.colorFunctionalWhite
+    val errorContainer: Color = ColorRawTokens.colorFunctionalScarlet100
+    val onErrorContainer: Color = ColorRawTokens.colorFunctionalBlack
+    val outline: Color = ColorRawTokens.colorFunctionalBlack
+    val outlineVariant: Color = ColorRawTokens.colorOpacityBlack200
+    val scrim: Color = ColorRawTokens.colorFunctionalBlack
+    val surfaceContainer: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerHigh: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerHighest: Color = ColorRawTokens.colorFunctionalLightGray80
+    val surfaceContainerLow: Color = ColorRawTokens.colorFunctionalWhite
+    val surfaceContainerLowest: Color = ColorRawTokens.colorFunctionalWhite
+}
\ No newline at end of file
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
index 32ec9cf1..de1c247c 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
@@ -19,10 +19,10 @@ import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.OudsTypographyKeyToken
 
 open class OudsButtonTokens(
-    val containerColor: OudsColorKeyToken = OudsColorKeyToken.Background.Brand.Primary,
-    val contentColor: OudsColorKeyToken = OudsColorKeyToken.Content.Brand.Primary,
+    val containerColor: OudsColorKeyToken = OudsColorKeyToken.Action.Enabled,
+    val contentColor: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Enabled,
     val disabledContainerColor: OudsColorKeyToken = OudsColorKeyToken.Action.Disabled,
-    val disabledContentColor: OudsColorKeyToken = OudsColorKeyToken.Content.Disabled,
+    val disabledContentColor: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Disabled,
     val cornerRadius: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     val defaultElevation: OudsElevationKeyToken = OudsElevationKeyToken.None,
     val pressedElevation: OudsElevationKeyToken = OudsElevationKeyToken.None,
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
index ae4dd5e9..3cbd8a14 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
@@ -15,20 +15,20 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.BorderRawTokens
 
 data class OudsBorderSemanticTokens(
-  val radiusDefault: Float = BorderRawTokens.borderRadius0,
-  val radiusMedium: Float = BorderRawTokens.borderRadius150,
-  val radiusNone: Float = BorderRawTokens.borderRadius0,
-  val radiusPill: Float = BorderRawTokens.borderRadius9999,
-  val radiusShort: Float = BorderRawTokens.borderRadius75,
-  val radiusTall: Float = BorderRawTokens.borderRadius300,
-  val styleDefault: String = BorderRawTokens.borderStyleSolid,
-  val styleDrag: String = BorderRawTokens.borderStyleDashed,
-  val widthDefault: Float = BorderRawTokens.borderWidth25,
-  val widthFocus: Float = BorderRawTokens.borderWidth50,
-  val widthFocusInset: Float = BorderRawTokens.borderWidth100,
-  val widthMedium: Float = BorderRawTokens.borderWidth50,
-  val widthNone: Float = BorderRawTokens.borderWidth0,
-  val widthThick: Float = BorderRawTokens.borderWidth75,
-  val widthThicker: Float = BorderRawTokens.borderWidth100,
-  val widthThin: Float = BorderRawTokens.borderWidth25
+    val radiusDefault: Float = BorderRawTokens.borderRadius0,
+    val radiusMedium: Float = BorderRawTokens.borderRadius150,
+    val radiusNone: Float = BorderRawTokens.borderRadius0,
+    val radiusPill: Float = BorderRawTokens.borderRadius9999,
+    val radiusShort: Float = BorderRawTokens.borderRadius75,
+    val radiusTall: Float = BorderRawTokens.borderRadius300,
+    val styleDefault: String = BorderRawTokens.borderStyleSolid,
+    val styleDrag: String = BorderRawTokens.borderStyleDashed,
+    val widthDefault: Float = BorderRawTokens.borderWidth25,
+    val widthFocus: Float = BorderRawTokens.borderWidth125,
+    val widthFocusInset: Float = BorderRawTokens.borderWidth50,
+    val widthMedium: Float = BorderRawTokens.borderWidth50,
+    val widthNone: Float = BorderRawTokens.borderWidth0,
+    val widthThick: Float = BorderRawTokens.borderWidth75,
+    val widthThicker: Float = BorderRawTokens.borderWidth100,
+    val widthThin: Float = BorderRawTokens.borderWidth25
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
index c25343d0..76c9f7c3 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
@@ -17,66 +17,42 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens
 import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorActionSemanticTokens(
-  val actionDisabledLight: Color = ColorRawTokens.colorFunctionalLightGray400,
-  val actionDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val actionNegativeEnabledLight: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val actionNegativeFocusLight: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val actionNegativeHoverLight: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val actionNegativeLoadingLight: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val actionNegativePressedLight: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val actionNegativeEnabledDark: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val actionNegativeFocusDark: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val actionNegativeHoverDark: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val actionNegativeLoadingDark: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val actionNegativePressedDark: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val actionPrimaryEnabledLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val actionPrimaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionPrimaryFocusLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val actionPrimaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryHoverLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val actionPrimaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryLoadingLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val actionPrimaryLoadingOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionPrimaryPressedLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val actionPrimaryPressedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionPrimaryEnabledDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionPrimaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionPrimaryFocusDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryHoverDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val actionPrimaryLoadingDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionPrimaryLoadingOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionPrimaryPressedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionPrimaryPressedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionSecondaryEnabledLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val actionSecondaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val actionSecondaryFocusLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionSecondaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryHoverLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionSecondaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryLoadingLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionSecondaryLoadingOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryPressedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val actionSecondaryPressedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryEnabledDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val actionSecondaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val actionSecondaryFocusDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryHoverDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryLoadingDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryLoadingOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryPressedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSecondaryPressedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val actionSelectedLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val actionSelectedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionVisitedLight: Color = ColorRawTokens.colorDecorativeAmethyst600,
-  val actionVisitedOnBgEmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst400,
-  val actionDisabledDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val actionDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val actionSelectedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionSelectedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val actionVisitedDark: Color = ColorRawTokens.colorDecorativeAmethyst400,
-  val actionVisitedOnBgEmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst400
+    val actionDisabledLight: Color = ColorRawTokens.colorOpacityBlack200,
+    val actionEnabledLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val actionFocusLight: Color = ColorRawTokens.colorOpacityBlack680,
+    val actionHighlightedLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val actionHoverLight: Color = ColorRawTokens.colorOpacityBlack680,
+    val actionLoadingLight: Color = OrangeBrandColorRawTokens.colorOrange550,
+    val actionNegativeEnabledLight: Color = ColorRawTokens.colorFunctionalScarlet600,
+    val actionNegativeFocusLight: Color = ColorRawTokens.colorFunctionalScarlet700,
+    val actionNegativeHoverLight: Color = ColorRawTokens.colorFunctionalScarlet700,
+    val actionNegativeLoadingLight: Color = ColorRawTokens.colorFunctionalScarlet800,
+    val actionNegativePressedLight: Color = ColorRawTokens.colorFunctionalScarlet800,
+    val actionNegativeEnabledDark: Color = ColorRawTokens.colorFunctionalScarlet300,
+    val actionNegativeFocusDark: Color = ColorRawTokens.colorFunctionalScarlet200,
+    val actionNegativeHoverDark: Color = ColorRawTokens.colorFunctionalScarlet200,
+    val actionNegativeLoadingDark: Color = ColorRawTokens.colorFunctionalScarlet100,
+    val actionNegativePressedDark: Color = ColorRawTokens.colorFunctionalScarlet100,
+    val actionPressedLight: Color = OrangeBrandColorRawTokens.colorOrange550,
+    val actionSelectedLight: Color = OrangeBrandColorRawTokens.colorOrange550,
+    val actionSupportEnabledLight: Color = ColorRawTokens.colorOpacityBlack40,
+    val actionSupportFocusLight: Color = ColorRawTokens.colorOpacityBlack80,
+    val actionSupportHoverLight: Color = ColorRawTokens.colorOpacityBlack80,
+    val actionSupportLoadingLight: Color = ColorRawTokens.colorOpacityBlack80,
+    val actionSupportPressedLight: Color = ColorRawTokens.colorOpacityBlack80,
+    val actionSupportEnabledDark: Color = ColorRawTokens.colorOpacityWhite40,
+    val actionSupportFocusDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val actionSupportHoverDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val actionSupportLoadingDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val actionSupportPressedDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val actionVisitedLight: Color = ColorRawTokens.colorDecorativeAmethyst600,
+    val actionDisabledDark: Color = ColorRawTokens.colorOpacityWhite200,
+    val actionEnabledDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val actionFocusDark: Color = ColorRawTokens.colorOpacityWhite640,
+    val actionHighlightedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val actionHoverDark: Color = ColorRawTokens.colorOpacityWhite640,
+    val actionLoadingDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val actionPressedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val actionSelectedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val actionVisitedDark: Color = ColorRawTokens.colorDecorativeAmethyst400
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
index 61f88937..75792fba 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
@@ -14,35 +14,14 @@ package com.orange.ouds.theme.tokens.semantic
 
 import androidx.compose.ui.graphics.Color
 import com.orange.ouds.tokens.global.raw.ColorRawTokens
-import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorAlwaysSemanticTokens(
-  val alwaysAccentLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val alwaysBlackLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val alwaysNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val alwaysOnAccentLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysOnBlackLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val alwaysOnInfoLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysOnNegativeLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val alwaysOnPositiveLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysOnWarningLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysOnWhiteLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val alwaysWarningLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val alwaysWhiteLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val alwaysAccentDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val alwaysBlackDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val alwaysInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val alwaysNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val alwaysOnAccentDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val alwaysOnBlackDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val alwaysOnInfoDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val alwaysOnNegativeDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val alwaysOnPositiveDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val alwaysOnWarningDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val alwaysOnWhiteDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val alwaysPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val alwaysWarningDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val alwaysWhiteDark: Color = ColorRawTokens.colorFunctionalWhite
+    val alwaysBlackLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val alwaysOnBlackLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val alwaysOnWhiteLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val alwaysWhiteLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val alwaysBlackDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val alwaysOnBlackDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val alwaysOnWhiteDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val alwaysWhiteDark: Color = ColorRawTokens.colorFunctionalWhite
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
index 69bd1e03..31a8794e 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
@@ -17,48 +17,12 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens
 import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorBgSemanticTokens(
-  val bgBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val bgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val bgPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val bgSecondaryLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val bgStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val bgStatusAccentMutedLight: Color = OrangeBrandColorRawTokens.colorWarmGray100,
-  val bgStatusAccentMutedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorWarmGray900,
-  val bgStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val bgStatusInfoMutedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue100,
-  val bgStatusInfoMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
-  val bgStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val bgStatusNegativeMutedLight: Color = ColorRawTokens.colorFunctionalScarlet100,
-  val bgStatusNegativeMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet900,
-  val bgStatusNeutralLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val bgStatusNeutralOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val bgStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val bgStatusPositiveMutedLight: Color = ColorRawTokens.colorFunctionalMalachite100,
-  val bgStatusPositiveMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite900,
-  val bgStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val bgStatusWarningMutedLight: Color = ColorRawTokens.colorFunctionalSun100,
-  val bgStatusWarningMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun900,
-  val bgStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val bgStatusAccentMutedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900,
-  val bgStatusAccentMutedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900,
-  val bgStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val bgStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
-  val bgStatusInfoMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
-  val bgStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val bgStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalScarlet900,
-  val bgStatusNegativeMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet900,
-  val bgStatusNeutralDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val bgStatusNeutralOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val bgStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val bgStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalMalachite900,
-  val bgStatusPositiveMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite900,
-  val bgStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val bgStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalSun900,
-  val bgStatusWarningMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun900,
-  val bgTertiaryLight: Color = OrangeBrandColorRawTokens.colorWarmGray100,
-  val bgBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val bgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val bgPrimaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val bgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val bgTertiaryDark: Color = OrangeBrandColorRawTokens.colorWarmGray900
+    val bgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880,
+    val bgPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val bgSecondaryLight: Color = ColorRawTokens.colorFunctionalLightGray80,
+    val bgTertiaryLight: Color = OrangeBrandColorRawTokens.colorWarmGray100,
+    val bgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
+    val bgPrimaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
+    val bgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray800,
+    val bgTertiaryDark: Color = OrangeBrandColorRawTokens.colorWarmGray900
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
index 813b449b..67843fb5 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
@@ -17,26 +17,16 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens
 import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorBorderSemanticTokens(
-  val borderBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val borderBrandPrimaryOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val borderDefaultLight: Color = ColorRawTokens.colorFunctionalLightGray400,
-  val borderDefaultOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val borderEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val borderEmphasizedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderFocusLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val borderFocusInsetLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val borderFocusInsetOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val borderFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val borderOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val borderBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val borderBrandPrimaryOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val borderDefaultDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val borderDefaultOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val borderEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderEmphasizedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderFocusDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderFocusInsetDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val borderFocusInsetOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val borderFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray880
+    val borderBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550,
+    val borderDefaultLight: Color = ColorRawTokens.colorOpacityBlack200,
+    val borderEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val borderFocusLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val borderFocusInsetLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val borderOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val borderOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val borderBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val borderDefaultDark: Color = ColorRawTokens.colorOpacityWhite200,
+    val borderEmphasizedDark: Color = ColorRawTokens.colorOpacityWhite920,
+    val borderFocusDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val borderFocusInsetDark: Color = ColorRawTokens.colorFunctionalDarkGray880
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBrandSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBrandSemanticTokens.kt
deleted file mode 100644
index 75abf80b..00000000
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBrandSemanticTokens.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Software Name: OUDS Android
-// SPDX-FileCopyrightText: Copyright (c) Orange SA
-// SPDX-License-Identifier: MIT
-//
-// This software is distributed under the MIT license,
-// the text of which is available at https://opensource.org/license/MIT/
-// or see the "LICENSE" file for more details.
-//
-// Software description: Android library of reusable graphical components
-//
-
-package com.orange.ouds.theme.tokens.semantic
-
-import androidx.compose.ui.graphics.Color
-import com.orange.ouds.tokens.global.raw.ColorRawTokens
-import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
-
-data class OudsColorBrandSemanticTokens(
-  val brandAccentDefaultLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val brandAccentHighLight: Color = ColorRawTokens.colorFunctionalSun600,
-  val brandAccentHighestLight: Color = OrangeBrandColorRawTokens.colorWarmGray900,
-  val brandAccentLowestLight: Color = OrangeBrandColorRawTokens.colorWarmGray100,
-  val brandAccentDefaultDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val brandAccentHighDark: Color = ColorRawTokens.colorFunctionalSun600,
-  val brandAccentHighestDark: Color = OrangeBrandColorRawTokens.colorWarmGray900,
-  val brandAccentLowestDark: Color = OrangeBrandColorRawTokens.colorWarmGray100,
-  val brandInfoDefaultLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val brandInfoHighestLight: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
-  val brandInfoLowestLight: Color = ColorRawTokens.colorFunctionalDodgerBlue100,
-  val brandInfoDefaultDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val brandInfoHighestDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
-  val brandInfoLowestDark: Color = ColorRawTokens.colorFunctionalDodgerBlue100,
-  val brandNegativeDefaultLight: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val brandNegativeHighLight: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val brandNegativeHigherLight: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val brandNegativeHighestLight: Color = ColorRawTokens.colorFunctionalScarlet900,
-  val brandNegativeLowestLight: Color = ColorRawTokens.colorFunctionalScarlet100,
-  val brandNegativeDefaultDark: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val brandNegativeHighDark: Color = ColorRawTokens.colorFunctionalScarlet700,
-  val brandNegativeHigherDark: Color = ColorRawTokens.colorFunctionalScarlet800,
-  val brandNegativeHighestDark: Color = ColorRawTokens.colorFunctionalScarlet900,
-  val brandNegativeLowestDark: Color = ColorRawTokens.colorFunctionalScarlet100,
-  val brandNeutralEmphasizedBlackLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val brandNeutralEmphasizedHighLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val brandNeutralEmphasizedHigherLight: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val brandNeutralEmphasizedHighestLight: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val brandNeutralEmphasizedLowLight: Color = ColorRawTokens.colorFunctionalDarkGray560,
-  val brandNeutralEmphasizedLowerLight: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val brandNeutralEmphasizedLowestLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val brandNeutralEmphasizedMediumLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val brandNeutralEmphasizedBlackDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val brandNeutralEmphasizedHighDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val brandNeutralEmphasizedHigherDark: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val brandNeutralEmphasizedHighestDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val brandNeutralEmphasizedLowDark: Color = ColorRawTokens.colorFunctionalDarkGray560,
-  val brandNeutralEmphasizedLowerDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val brandNeutralEmphasizedLowestDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val brandNeutralEmphasizedMediumDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val brandNeutralMutedHighestLight: Color = ColorRawTokens.colorFunctionalDarkGray160,
-  val brandNeutralMutedLowLight: Color = ColorRawTokens.colorFunctionalLightGray400,
-  val brandNeutralMutedLowerLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val brandNeutralMutedLowestLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val brandNeutralMutedMediumLight: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val brandNeutralMutedWhiteLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val brandNeutralMutedHighestDark: Color = ColorRawTokens.colorFunctionalDarkGray160,
-  val brandNeutralMutedLowDark: Color = ColorRawTokens.colorFunctionalLightGray400,
-  val brandNeutralMutedLowerDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val brandNeutralMutedLowestDark: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val brandNeutralMutedMediumDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val brandNeutralMutedWhiteDark: Color = ColorRawTokens.colorFunctionalWhite,
-  val brandPositiveDefaultLight: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val brandPositiveHighestLight: Color = ColorRawTokens.colorFunctionalMalachite900,
-  val brandPositiveLowestLight: Color = ColorRawTokens.colorFunctionalMalachite100,
-  val brandPositiveDefaultDark: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val brandPositiveHighestDark: Color = ColorRawTokens.colorFunctionalMalachite900,
-  val brandPositiveLowestDark: Color = ColorRawTokens.colorFunctionalMalachite100,
-  val brandPrimaryDefaultLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val brandPrimaryLowLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val brandPrimaryDefaultDark: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val brandPrimaryLowDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val brandWarningDefaultLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val brandWarningHighLight: Color = ColorRawTokens.colorFunctionalSun600,
-  val brandWarningHighestLight: Color = ColorRawTokens.colorFunctionalSun900,
-  val brandWarningLowestLight: Color = ColorRawTokens.colorFunctionalSun100,
-  val brandWarningDefaultDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val brandWarningHighDark: Color = ColorRawTokens.colorFunctionalSun600,
-  val brandWarningHighestDark: Color = ColorRawTokens.colorFunctionalSun900,
-  val brandWarningLowestDark: Color = ColorRawTokens.colorFunctionalSun100
-)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
index 459c0395..c514fbf1 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
@@ -17,86 +17,46 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens
 import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorContentSemanticTokens(
-  val contentBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550,
-  val contentBrandPrimaryOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val contentDefaultLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentDefaultOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentDisabledLight: Color = ColorRawTokens.colorFunctionalLightGray400,
-  val contentDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val contentMutedLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val contentMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val contentOnActionDisabledLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionNegativeLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryEnabledLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryFocusLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryHoverLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryLoadingLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryLoadingOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryPressedLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnActionPrimaryPressedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryEnabledDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryFocusDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryHoverDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryLoadingDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryLoadingOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryPressedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionPrimaryPressedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionDisabledDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnActionNegativeDark: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusAccentMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusAccentMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusInfoMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusInfoMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnStatusNegativeMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusNegativeMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusPositiveMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusPositiveMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusWarningMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusWarningMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusAccentMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusAccentMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusInfoMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalWhite,
-  val contentOnStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusNegativeMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusPositiveMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
-  val contentOnStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentOnStatusWarningMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentStatusInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val contentStatusNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val contentStatusPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val contentStatusWarningLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val contentStatusInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
-  val contentStatusNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600,
-  val contentStatusPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500,
-  val contentStatusWarningDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val contentBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val contentBrandPrimaryOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val contentDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentDefaultOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val contentDisabledDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val contentDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val contentMutedDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val contentMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560
+    val contentBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550,
+    val contentDefaultLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentDisabledLight: Color = ColorRawTokens.colorOpacityBlack200,
+    val contentMutedLight: Color = ColorRawTokens.colorOpacityBlack680,
+    val contentOnActionDisabledLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionEnabledLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionFocusLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionHighlightedLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionHoverLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionLoadingLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionNegativeLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionPressedLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnActionDisabledDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionEnabledDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionFocusDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionHighlightedDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionHoverDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionLoadingDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionNegativeDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnActionPressedDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnOverlayEmphasizedLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnOverlayEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnStatusEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnStatusEmphasizedNeutralLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val contentOnStatusMutedLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnStatusEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnStatusEmphasizedNeutralDark: Color = ColorRawTokens.colorFunctionalBlack,
+    val contentOnStatusMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val contentStatusInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
+    val contentStatusNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600,
+    val contentStatusPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500,
+    val contentStatusWarningLight: Color = ColorRawTokens.colorFunctionalSun500,
+    val contentStatusInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
+    val contentStatusNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600,
+    val contentStatusPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500,
+    val contentStatusWarningDark: Color = ColorRawTokens.colorFunctionalSun500,
+    val contentBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val contentDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val contentDisabledDark: Color = ColorRawTokens.colorOpacityWhite200,
+    val contentMutedDark: Color = ColorRawTokens.colorOpacityWhite640
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt
index 1d08e919..010fdef0 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt
@@ -17,64 +17,64 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens
 import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
 data class OudsColorDecorativeSemanticTokens(
-  val decorativeAccent1DefaultLight: Color = ColorRawTokens.colorDecorativeEmerald500,
-  val decorativeAccent1EmphasizedLight: Color = ColorRawTokens.colorDecorativeEmerald700,
-  val decorativeAccent1MutedLight: Color = ColorRawTokens.colorDecorativeEmerald200,
-  val decorativeAccent1DefaultDark: Color = ColorRawTokens.colorDecorativeEmerald500,
-  val decorativeAccent1EmphasizedDark: Color = ColorRawTokens.colorDecorativeEmerald700,
-  val decorativeAccent1MutedDark: Color = ColorRawTokens.colorDecorativeEmerald200,
-  val decorativeAccent2DefaultLight: Color = ColorRawTokens.colorDecorativeSky400,
-  val decorativeAccent2EmphasizedLight: Color = ColorRawTokens.colorDecorativeSky700,
-  val decorativeAccent2MutedLight: Color = ColorRawTokens.colorDecorativeSky200,
-  val decorativeAccent2DefaultDark: Color = ColorRawTokens.colorDecorativeSky400,
-  val decorativeAccent2EmphasizedDark: Color = ColorRawTokens.colorDecorativeSky700,
-  val decorativeAccent2MutedDark: Color = ColorRawTokens.colorDecorativeSky200,
-  val decorativeAccent3DefaultLight: Color = ColorRawTokens.colorFunctionalSun500,
-  val decorativeAccent3EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmber500,
-  val decorativeAccent3MutedLight: Color = ColorRawTokens.colorFunctionalSun200,
-  val decorativeAccent3DefaultDark: Color = ColorRawTokens.colorFunctionalSun500,
-  val decorativeAccent3EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmber500,
-  val decorativeAccent3MutedDark: Color = ColorRawTokens.colorFunctionalSun200,
-  val decorativeAccent4DefaultLight: Color = ColorRawTokens.colorDecorativeAmethyst400,
-  val decorativeAccent4EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst800,
-  val decorativeAccent4MutedLight: Color = ColorRawTokens.colorDecorativeAmethyst200,
-  val decorativeAccent4DefaultDark: Color = ColorRawTokens.colorDecorativeAmethyst400,
-  val decorativeAccent4EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst800,
-  val decorativeAccent4MutedDark: Color = ColorRawTokens.colorDecorativeAmethyst200,
-  val decorativeAccent5DefaultLight: Color = ColorRawTokens.colorDecorativeShockingPink200,
-  val decorativeAccent5EmphasizedLight: Color = ColorRawTokens.colorDecorativeShockingPink300,
-  val decorativeAccent5MutedLight: Color = ColorRawTokens.colorDecorativeShockingPink100,
-  val decorativeAccent5DefaultDark: Color = ColorRawTokens.colorDecorativeShockingPink200,
-  val decorativeAccent5EmphasizedDark: Color = ColorRawTokens.colorDecorativeShockingPink300,
-  val decorativeAccent5MutedDark: Color = ColorRawTokens.colorDecorativeShockingPink100,
-  val decorativeBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val decorativeBrandSecondaryLight: Color = ColorRawTokens.colorFunctionalBlack,
-  val decorativeBrandTertiaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val decorativeBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
-  val decorativeBrandSecondaryDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val decorativeBrandTertiaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
-  val decorativeNeutralDefaultLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val decorativeNeutralEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val decorativeNeutralMutedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val decorativeNeutralDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray560,
-  val decorativeNeutralEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val decorativeNeutralMutedDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val decorativeSkinTint100Light: Color = ColorRawTokens.colorDecorativeDeepPeach100,
-  val decorativeSkinTint200Light: Color = ColorRawTokens.colorDecorativeDeepPeach200,
-  val decorativeSkinTint300Light: Color = ColorRawTokens.colorDecorativeDeepPeach300,
-  val decorativeSkinTint400Light: Color = ColorRawTokens.colorDecorativeDeepPeach400,
-  val decorativeSkinTint500Light: Color = ColorRawTokens.colorDecorativeDeepPeach500,
-  val decorativeSkinTint600Light: Color = ColorRawTokens.colorDecorativeDeepPeach600,
-  val decorativeSkinTint700Light: Color = ColorRawTokens.colorDecorativeDeepPeach700,
-  val decorativeSkinTint800Light: Color = ColorRawTokens.colorDecorativeDeepPeach800,
-  val decorativeSkinTint900Light: Color = ColorRawTokens.colorDecorativeDeepPeach900,
-  val decorativeSkinTint100Dark: Color = ColorRawTokens.colorDecorativeDeepPeach100,
-  val decorativeSkinTint200Dark: Color = ColorRawTokens.colorDecorativeDeepPeach200,
-  val decorativeSkinTint300Dark: Color = ColorRawTokens.colorDecorativeDeepPeach300,
-  val decorativeSkinTint400Dark: Color = ColorRawTokens.colorDecorativeDeepPeach400,
-  val decorativeSkinTint500Dark: Color = ColorRawTokens.colorDecorativeDeepPeach500,
-  val decorativeSkinTint600Dark: Color = ColorRawTokens.colorDecorativeDeepPeach600,
-  val decorativeSkinTint700Dark: Color = ColorRawTokens.colorDecorativeDeepPeach700,
-  val decorativeSkinTint800Dark: Color = ColorRawTokens.colorDecorativeDeepPeach800,
-  val decorativeSkinTint900Dark: Color = ColorRawTokens.colorDecorativeDeepPeach900
+    val decorativeAccent1DefaultLight: Color = ColorRawTokens.colorDecorativeEmerald500,
+    val decorativeAccent1EmphasizedLight: Color = ColorRawTokens.colorDecorativeEmerald700,
+    val decorativeAccent1MutedLight: Color = ColorRawTokens.colorDecorativeEmerald200,
+    val decorativeAccent1DefaultDark: Color = ColorRawTokens.colorDecorativeEmerald500,
+    val decorativeAccent1EmphasizedDark: Color = ColorRawTokens.colorDecorativeEmerald700,
+    val decorativeAccent1MutedDark: Color = ColorRawTokens.colorDecorativeEmerald200,
+    val decorativeAccent2DefaultLight: Color = ColorRawTokens.colorDecorativeSky400,
+    val decorativeAccent2EmphasizedLight: Color = ColorRawTokens.colorDecorativeSky700,
+    val decorativeAccent2MutedLight: Color = ColorRawTokens.colorDecorativeSky200,
+    val decorativeAccent2DefaultDark: Color = ColorRawTokens.colorDecorativeSky400,
+    val decorativeAccent2EmphasizedDark: Color = ColorRawTokens.colorDecorativeSky700,
+    val decorativeAccent2MutedDark: Color = ColorRawTokens.colorDecorativeSky200,
+    val decorativeAccent3DefaultLight: Color = ColorRawTokens.colorFunctionalSun500,
+    val decorativeAccent3EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmber500,
+    val decorativeAccent3MutedLight: Color = ColorRawTokens.colorFunctionalSun200,
+    val decorativeAccent3DefaultDark: Color = ColorRawTokens.colorFunctionalSun500,
+    val decorativeAccent3EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmber500,
+    val decorativeAccent3MutedDark: Color = ColorRawTokens.colorFunctionalSun200,
+    val decorativeAccent4DefaultLight: Color = ColorRawTokens.colorDecorativeAmethyst400,
+    val decorativeAccent4EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst800,
+    val decorativeAccent4MutedLight: Color = ColorRawTokens.colorDecorativeAmethyst200,
+    val decorativeAccent4DefaultDark: Color = ColorRawTokens.colorDecorativeAmethyst400,
+    val decorativeAccent4EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst800,
+    val decorativeAccent4MutedDark: Color = ColorRawTokens.colorDecorativeAmethyst200,
+    val decorativeAccent5DefaultLight: Color = ColorRawTokens.colorDecorativeShockingPink200,
+    val decorativeAccent5EmphasizedLight: Color = ColorRawTokens.colorDecorativeShockingPink300,
+    val decorativeAccent5MutedLight: Color = ColorRawTokens.colorDecorativeShockingPink100,
+    val decorativeAccent5DefaultDark: Color = ColorRawTokens.colorDecorativeShockingPink200,
+    val decorativeAccent5EmphasizedDark: Color = ColorRawTokens.colorDecorativeShockingPink300,
+    val decorativeAccent5MutedDark: Color = ColorRawTokens.colorDecorativeShockingPink100,
+    val decorativeBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val decorativeBrandSecondaryLight: Color = ColorRawTokens.colorFunctionalBlack,
+    val decorativeBrandTertiaryLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val decorativeBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val decorativeBrandSecondaryDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val decorativeBrandTertiaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880,
+    val decorativeNeutralDefaultLight: Color = ColorRawTokens.colorFunctionalDarkGray400,
+    val decorativeNeutralEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
+    val decorativeNeutralMutedLight: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val decorativeNeutralDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray560,
+    val decorativeNeutralEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val decorativeNeutralMutedDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
+    val decorativeSkinTint100Light: Color = ColorRawTokens.colorDecorativeDeepPeach100,
+    val decorativeSkinTint200Light: Color = ColorRawTokens.colorDecorativeDeepPeach200,
+    val decorativeSkinTint300Light: Color = ColorRawTokens.colorDecorativeDeepPeach300,
+    val decorativeSkinTint400Light: Color = ColorRawTokens.colorDecorativeDeepPeach400,
+    val decorativeSkinTint500Light: Color = ColorRawTokens.colorDecorativeDeepPeach500,
+    val decorativeSkinTint600Light: Color = ColorRawTokens.colorDecorativeDeepPeach600,
+    val decorativeSkinTint700Light: Color = ColorRawTokens.colorDecorativeDeepPeach700,
+    val decorativeSkinTint800Light: Color = ColorRawTokens.colorDecorativeDeepPeach800,
+    val decorativeSkinTint900Light: Color = ColorRawTokens.colorDecorativeDeepPeach900,
+    val decorativeSkinTint100Dark: Color = ColorRawTokens.colorDecorativeDeepPeach100,
+    val decorativeSkinTint200Dark: Color = ColorRawTokens.colorDecorativeDeepPeach200,
+    val decorativeSkinTint300Dark: Color = ColorRawTokens.colorDecorativeDeepPeach300,
+    val decorativeSkinTint400Dark: Color = ColorRawTokens.colorDecorativeDeepPeach400,
+    val decorativeSkinTint500Dark: Color = ColorRawTokens.colorDecorativeDeepPeach500,
+    val decorativeSkinTint600Dark: Color = ColorRawTokens.colorDecorativeDeepPeach600,
+    val decorativeSkinTint700Dark: Color = ColorRawTokens.colorDecorativeDeepPeach700,
+    val decorativeSkinTint800Dark: Color = ColorRawTokens.colorDecorativeDeepPeach800,
+    val decorativeSkinTint900Dark: Color = ColorRawTokens.colorDecorativeDeepPeach900
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorElevationSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorElevationSemanticTokens.kt
deleted file mode 100644
index 0e5f6c38..00000000
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorElevationSemanticTokens.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Software Name: OUDS Android
-// SPDX-FileCopyrightText: Copyright (c) Orange SA
-// SPDX-License-Identifier: MIT
-//
-// This software is distributed under the MIT license,
-// the text of which is available at https://opensource.org/license/MIT/
-// or see the "LICENSE" file for more details.
-//
-// Software description: Android library of reusable graphical components
-//
-
-package com.orange.ouds.theme.tokens.semantic
-
-import androidx.compose.ui.graphics.Color
-import com.orange.ouds.tokens.global.raw.ColorRawTokens
-import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
-
-data class OudsColorElevationSemanticTokens(
-  val elevationDragLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val elevationDragOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val elevationDragOnBgSecondaryLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val elevationModalLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val elevationOverlayDefaultLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val elevationOverlayDefaultOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val elevationOverlayDefaultOnBgSecondaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val elevationOverlayEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val elevationOverlayEmphasizedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val elevationOverlayEmphasizedOnBgSecondaryLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val elevationRaisedLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val elevationRaisedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val elevationRaisedOnBgSecondaryLight: Color = ColorRawTokens.colorFunctionalWhite,
-  val elevationDragDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val elevationDragOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val elevationDragOnBgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val elevationModalDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val elevationOverlayDefaultDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val elevationOverlayDefaultOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val elevationOverlayDefaultOnBgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val elevationOverlayEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val elevationOverlayEmphasizedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400,
-  val elevationOverlayEmphasizedOnBgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val elevationRaisedDark: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val elevationRaisedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray560,
-  val elevationRaisedOnBgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray720
-)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorGradientSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorGradientSemanticTokens.kt
deleted file mode 100644
index 16eb2e79..00000000
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorGradientSemanticTokens.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Software Name: OUDS Android
-// SPDX-FileCopyrightText: Copyright (c) Orange SA
-// SPDX-License-Identifier: MIT
-//
-// This software is distributed under the MIT license,
-// the text of which is available at https://opensource.org/license/MIT/
-// or see the "LICENSE" file for more details.
-//
-// Software description: Android library of reusable graphical components
-//
-
-package com.orange.ouds.theme.tokens.semantic
-
-import androidx.compose.ui.graphics.Color
-import com.orange.ouds.tokens.global.raw.ColorRawTokens
-import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
-
-data class OudsColorGradientSemanticTokens(
-  val gradientSkeletonMiddleLight: Color = ColorRawTokens.colorFunctionalLightGray160,
-  val gradientSkeletonMiddleOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640,
-  val gradientSkeletonStartEndLight: Color = ColorRawTokens.colorFunctionalLightGray80,
-  val gradientSkeletonStartEndOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val gradientSkeletonMiddleDark: Color = ColorRawTokens.colorFunctionalDarkGray720,
-  val gradientSkeletonMiddleOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray480,
-  val gradientSkeletonStartEndDark: Color = ColorRawTokens.colorFunctionalDarkGray800,
-  val gradientSkeletonStartEndOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray560
-)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorTransparentSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
similarity index 59%
rename from theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorTransparentSemanticTokens.kt
rename to theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
index df803827..b90cecc0 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorTransparentSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
@@ -14,9 +14,10 @@ package com.orange.ouds.theme.tokens.semantic
 
 import androidx.compose.ui.graphics.Color
 import com.orange.ouds.tokens.global.raw.ColorRawTokens
-import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
 
-data class OudsColorTransparentSemanticTokens(
-  val transparentDefaultLight: Color = ColorRawTokens.colorTransparentBlack0,
-  val transparentDefaultDark: Color = ColorRawTokens.colorTransparentBlack0
+data class OudsColorOpacitySemanticTokens(
+    val opacityInvisibleBlackLight: Color = ColorRawTokens.colorOpacityBlack0,
+    val opacityInvisibleWhiteLight: Color = ColorRawTokens.colorOpacityWhite0,
+    val opacityInvisibleBlackDark: Color = ColorRawTokens.colorOpacityWhite0,
+    val opacityInvisibleWhiteDark: Color = ColorRawTokens.colorOpacityWhite0
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt
new file mode 100644
index 00000000..653143bc
--- /dev/null
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt
@@ -0,0 +1,27 @@
+//
+// Software Name: OUDS Android
+// SPDX-FileCopyrightText: Copyright (c) Orange SA
+// SPDX-License-Identifier: MIT
+//
+// This software is distributed under the MIT license,
+// the text of which is available at https://opensource.org/license/MIT/
+// or see the "LICENSE" file for more details.
+//
+// Software description: Android library of reusable graphical components
+//
+
+package com.orange.ouds.theme.tokens.semantic
+
+import androidx.compose.ui.graphics.Color
+import com.orange.ouds.tokens.global.raw.ColorRawTokens
+
+data class OudsColorOverlaySemanticTokens(
+    val overlayDefaultLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val overlayDragLight: Color = ColorRawTokens.colorOpacityBlack40,
+    val overlayEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720,
+    val overlayModalLight: Color = ColorRawTokens.colorFunctionalWhite,
+    val overlayDefaultDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val overlayDragDark: Color = ColorRawTokens.colorOpacityWhite200,
+    val overlayEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160,
+    val overlayModalDark: Color = ColorRawTokens.colorFunctionalDarkGray640
+)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSemanticTokens.kt
index a9cc5496..1ee5e411 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSemanticTokens.kt
@@ -13,14 +13,13 @@
 package com.orange.ouds.theme.tokens.semantic
 
 data class OudsColorSemanticTokens(
-    val transparentColorTokens: OudsColorTransparentSemanticTokens = OudsColorTransparentSemanticTokens(),
     val actionColorTokens: OudsColorActionSemanticTokens = OudsColorActionSemanticTokens(),
     val alwaysColorTokens: OudsColorAlwaysSemanticTokens = OudsColorAlwaysSemanticTokens(),
     val backgroundColorTokens: OudsColorBgSemanticTokens = OudsColorBgSemanticTokens(),
     val borderColorTokens: OudsColorBorderSemanticTokens = OudsColorBorderSemanticTokens(),
-    val brandColorTokens: OudsColorBrandSemanticTokens = OudsColorBrandSemanticTokens(),
     val contentColorTokens: OudsColorContentSemanticTokens = OudsColorContentSemanticTokens(),
-    val elevationColorTokens: OudsColorElevationSemanticTokens = OudsColorElevationSemanticTokens(),
-    val gradientColorTokens: OudsColorGradientSemanticTokens = OudsColorGradientSemanticTokens(),
     val decorativeColorTokens: OudsColorDecorativeSemanticTokens = OudsColorDecorativeSemanticTokens(),
+    val opacityColorTokens: OudsColorOpacitySemanticTokens = OudsColorOpacitySemanticTokens(),
+    val overlayColorTokens: OudsColorOverlaySemanticTokens = OudsColorOverlaySemanticTokens(),
+    val surfaceColorTokens: OudsColorSurfaceSemanticTokens = OudsColorSurfaceSemanticTokens()
 )
\ No newline at end of file
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt
new file mode 100644
index 00000000..04b70613
--- /dev/null
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt
@@ -0,0 +1,46 @@
+//
+// Software Name: OUDS Android
+// SPDX-FileCopyrightText: Copyright (c) Orange SA
+// SPDX-License-Identifier: MIT
+//
+// This software is distributed under the MIT license,
+// the text of which is available at https://opensource.org/license/MIT/
+// or see the "LICENSE" file for more details.
+//
+// Software description: Android library of reusable graphical components
+//
+
+package com.orange.ouds.theme.tokens.semantic
+
+import androidx.compose.ui.graphics.Color
+import com.orange.ouds.tokens.global.raw.ColorRawTokens
+import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens
+
+data class OudsColorSurfaceSemanticTokens(
+    val surfaceBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val surfaceBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500,
+    val surfaceStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500,
+    val surfaceStatusAccentMutedLight: Color = ColorRawTokens.colorOpacitySun,
+    val surfaceStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun300,
+    val surfaceStatusAccentMutedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900,
+    val surfaceStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500,
+    val surfaceStatusInfoMutedLight: Color = ColorRawTokens.colorOpacityDodgerBlue,
+    val surfaceStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue300,
+    val surfaceStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900,
+    val surfaceStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet600,
+    val surfaceStatusNegativeMutedLight: Color = ColorRawTokens.colorOpacityScarlet,
+    val surfaceStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet300,
+    val surfaceStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalScarlet900,
+    val surfaceStatusNeutralEmphasizedLight: Color = ColorRawTokens.colorOpacityBlack840,
+    val surfaceStatusNeutralMutedLight: Color = ColorRawTokens.colorOpacityBlack40,
+    val surfaceStatusNeutralEmphasizedDark: Color = ColorRawTokens.colorOpacityWhite800,
+    val surfaceStatusNeutralMutedDark: Color = ColorRawTokens.colorOpacityWhite80,
+    val surfaceStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite500,
+    val surfaceStatusPositiveMutedLight: Color = ColorRawTokens.colorOpacityMalachite,
+    val surfaceStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite300,
+    val surfaceStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalMalachite900,
+    val surfaceStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500,
+    val surfaceStatusWarningMutedLight: Color = ColorRawTokens.colorOpacitySun,
+    val surfaceStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun300,
+    val surfaceStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalSun900
+)
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
index 7f07ad04..dea90a8f 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
@@ -15,84 +15,84 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.FontRawTokens
 
 data class OudsFontSemanticTokens(
-  val letterSpacingBodyLargeMobile: Float = FontRawTokens.fontLetterSpacing250,
-  val letterSpacingBodyLargeTablet: Float = FontRawTokens.fontLetterSpacing250,
-  val letterSpacingBodyMediumMobile: Float = FontRawTokens.fontLetterSpacing200,
-  val letterSpacingBodyMediumTablet: Float = FontRawTokens.fontLetterSpacing200,
-  val letterSpacingBodySmallMobile: Float = FontRawTokens.fontLetterSpacing150,
-  val letterSpacingBodySmallTablet: Float = FontRawTokens.fontLetterSpacing150,
-  val letterSpacingDisplayLargeMobile: Float = FontRawTokens.fontLetterSpacing850,
-  val letterSpacingDisplayLargeTablet: Float = FontRawTokens.fontLetterSpacing1450,
-  val letterSpacingDisplayMediumMobile: Float = FontRawTokens.fontLetterSpacing750,
-  val letterSpacingDisplayMediumTablet: Float = FontRawTokens.fontLetterSpacing1050,
-  val letterSpacingDisplaySmallMobile: Float = FontRawTokens.fontLetterSpacing650,
-  val letterSpacingDisplaySmallTablet: Float = FontRawTokens.fontLetterSpacing850,
-  val letterSpacingHeadingLargeMobile: Float = FontRawTokens.fontLetterSpacing450,
-  val letterSpacingHeadingLargeTablet: Float = FontRawTokens.fontLetterSpacing550,
-  val letterSpacingHeadingMediumMobile: Float = FontRawTokens.fontLetterSpacing350,
-  val letterSpacingHeadingMediumTablet: Float = FontRawTokens.fontLetterSpacing450,
-  val letterSpacingHeadingSmallMobile: Float = FontRawTokens.fontLetterSpacing300,
-  val letterSpacingHeadingSmallTablet: Float = FontRawTokens.fontLetterSpacing350,
-  val letterSpacingHeadingXlargeMobile: Float = FontRawTokens.fontLetterSpacing550,
-  val letterSpacingHeadingXlargeTablet: Float = FontRawTokens.fontLetterSpacing750,
-  val letterSpacingLabelLarge: Float = FontRawTokens.fontLetterSpacing250,
-  val letterSpacingLabelMedium: Float = FontRawTokens.fontLetterSpacing200,
-  val letterSpacingLabelSmall: Float = FontRawTokens.fontLetterSpacing150,
-  val letterSpacingLabelXlarge: Float = FontRawTokens.fontLetterSpacing300,
-  val lineHeightBodyLargeMobile: Int = FontRawTokens.fontLineHeight450,
-  val lineHeightBodyLargeTablet: Int = FontRawTokens.fontLineHeight450,
-  val lineHeightBodyMediumMobile: Int = FontRawTokens.fontLineHeight350,
-  val lineHeightBodyMediumTablet: Int = FontRawTokens.fontLineHeight350,
-  val lineHeightBodySmallMobile: Int = FontRawTokens.fontLineHeight250,
-  val lineHeightBodySmallTablet: Int = FontRawTokens.fontLineHeight250,
-  val lineHeightDisplayLargeMobile: Int = FontRawTokens.fontLineHeight1050,
-  val lineHeightDisplayLargeTablet: Int = FontRawTokens.fontLineHeight1850,
-  val lineHeightDisplayMediumMobile: Int = FontRawTokens.fontLineHeight950,
-  val lineHeightDisplayMediumTablet: Int = FontRawTokens.fontLineHeight1250,
-  val lineHeightDisplaySmallMobile: Int = FontRawTokens.fontLineHeight850,
-  val lineHeightDisplaySmallTablet: Int = FontRawTokens.fontLineHeight1050,
-  val lineHeightHeadingLargeMobile: Int = FontRawTokens.fontLineHeight650,
-  val lineHeightHeadingLargeTablet: Int = FontRawTokens.fontLineHeight750,
-  val lineHeightHeadingMediumMobile: Int = FontRawTokens.fontLineHeight550,
-  val lineHeightHeadingMediumTablet: Int = FontRawTokens.fontLineHeight650,
-  val lineHeightHeadingSmallMobile: Int = FontRawTokens.fontLineHeight450,
-  val lineHeightHeadingSmallTablet: Int = FontRawTokens.fontLineHeight550,
-  val lineHeightHeadingXlargeMobile: Int = FontRawTokens.fontLineHeight750,
-  val lineHeightHeadingXlargeTablet: Int = FontRawTokens.fontLineHeight950,
-  val lineHeightLabelLarge: Int = FontRawTokens.fontLineHeight450,
-  val lineHeightLabelMedium: Int = FontRawTokens.fontLineHeight350,
-  val lineHeightLabelSmall: Int = FontRawTokens.fontLineHeight250,
-  val lineHeightLabelXlarge: Int = FontRawTokens.fontLineHeight450,
-  val sizeBodyLargeMobile: Int = FontRawTokens.fontSize250,
-  val sizeBodyLargeTablet: Int = FontRawTokens.fontSize250,
-  val sizeBodyMediumMobile: Int = FontRawTokens.fontSize200,
-  val sizeBodyMediumTablet: Int = FontRawTokens.fontSize200,
-  val sizeBodySmallMobile: Int = FontRawTokens.fontSize150,
-  val sizeBodySmallTablet: Int = FontRawTokens.fontSize150,
-  val sizeDisplayLargeMobile: Int = FontRawTokens.fontSize850,
-  val sizeDisplayLargeTablet: Int = FontRawTokens.fontSize1450,
-  val sizeDisplayMediumMobile: Int = FontRawTokens.fontSize750,
-  val sizeDisplayMediumTablet: Int = FontRawTokens.fontSize1050,
-  val sizeDisplaySmallMobile: Int = FontRawTokens.fontSize650,
-  val sizeDisplaySmallTablet: Int = FontRawTokens.fontSize850,
-  val sizeHeadingLargeMobile: Int = FontRawTokens.fontSize450,
-  val sizeHeadingLargeTablet: Int = FontRawTokens.fontSize550,
-  val sizeHeadingMediumMobile: Int = FontRawTokens.fontSize350,
-  val sizeHeadingMediumTablet: Int = FontRawTokens.fontSize450,
-  val sizeHeadingSmallMobile: Int = FontRawTokens.fontSize300,
-  val sizeHeadingSmallTablet: Int = FontRawTokens.fontSize350,
-  val sizeHeadingXlargeMobile: Int = FontRawTokens.fontSize550,
-  val sizeHeadingXlargeTablet: Int = FontRawTokens.fontSize750,
-  val sizeLabelLarge: Int = FontRawTokens.fontSize250,
-  val sizeLabelMedium: Int = FontRawTokens.fontSize200,
-  val sizeLabelSmall: Int = FontRawTokens.fontSize150,
-  val sizeLabelXlarge: Int = FontRawTokens.fontSize300,
-  val weightBodyDefault: Int = FontRawTokens.fontWeight400,
-  val weightBodyStrong: Int = FontRawTokens.fontWeight700,
-  val weightDisplay: Int = FontRawTokens.fontWeight700,
-  val weightHeading: Int = FontRawTokens.fontWeight700,
-  val weightLabelDefault: Int = FontRawTokens.fontWeight400,
-  val weightLabelStrong: Int = FontRawTokens.fontWeight700,
-  val weightDefault: Int = FontRawTokens.fontWeight400,
-  val weightStrong: Int = FontRawTokens.fontWeight700
+    val letterSpacingBodyLargeMobile: Float = FontRawTokens.fontLetterSpacing250,
+    val letterSpacingBodyLargeTablet: Float = FontRawTokens.fontLetterSpacing250,
+    val letterSpacingBodyMediumMobile: Float = FontRawTokens.fontLetterSpacing200,
+    val letterSpacingBodyMediumTablet: Float = FontRawTokens.fontLetterSpacing200,
+    val letterSpacingBodySmallMobile: Float = FontRawTokens.fontLetterSpacing150,
+    val letterSpacingBodySmallTablet: Float = FontRawTokens.fontLetterSpacing150,
+    val letterSpacingDisplayLargeMobile: Float = FontRawTokens.fontLetterSpacing850,
+    val letterSpacingDisplayLargeTablet: Float = FontRawTokens.fontLetterSpacing1450,
+    val letterSpacingDisplayMediumMobile: Float = FontRawTokens.fontLetterSpacing750,
+    val letterSpacingDisplayMediumTablet: Float = FontRawTokens.fontLetterSpacing1050,
+    val letterSpacingDisplaySmallMobile: Float = FontRawTokens.fontLetterSpacing650,
+    val letterSpacingDisplaySmallTablet: Float = FontRawTokens.fontLetterSpacing850,
+    val letterSpacingHeadingLargeMobile: Float = FontRawTokens.fontLetterSpacing450,
+    val letterSpacingHeadingLargeTablet: Float = FontRawTokens.fontLetterSpacing550,
+    val letterSpacingHeadingMediumMobile: Float = FontRawTokens.fontLetterSpacing350,
+    val letterSpacingHeadingMediumTablet: Float = FontRawTokens.fontLetterSpacing450,
+    val letterSpacingHeadingSmallMobile: Float = FontRawTokens.fontLetterSpacing300,
+    val letterSpacingHeadingSmallTablet: Float = FontRawTokens.fontLetterSpacing350,
+    val letterSpacingHeadingXlargeMobile: Float = FontRawTokens.fontLetterSpacing550,
+    val letterSpacingHeadingXlargeTablet: Float = FontRawTokens.fontLetterSpacing750,
+    val letterSpacingLabelLarge: Float = FontRawTokens.fontLetterSpacing250,
+    val letterSpacingLabelMedium: Float = FontRawTokens.fontLetterSpacing200,
+    val letterSpacingLabelSmall: Float = FontRawTokens.fontLetterSpacing150,
+    val letterSpacingLabelXlarge: Float = FontRawTokens.fontLetterSpacing300,
+    val lineHeightBodyLargeMobile: Int = FontRawTokens.fontLineHeight450,
+    val lineHeightBodyLargeTablet: Int = FontRawTokens.fontLineHeight450,
+    val lineHeightBodyMediumMobile: Int = FontRawTokens.fontLineHeight350,
+    val lineHeightBodyMediumTablet: Int = FontRawTokens.fontLineHeight350,
+    val lineHeightBodySmallMobile: Int = FontRawTokens.fontLineHeight250,
+    val lineHeightBodySmallTablet: Int = FontRawTokens.fontLineHeight250,
+    val lineHeightDisplayLargeMobile: Int = FontRawTokens.fontLineHeight1050,
+    val lineHeightDisplayLargeTablet: Int = FontRawTokens.fontLineHeight1850,
+    val lineHeightDisplayMediumMobile: Int = FontRawTokens.fontLineHeight950,
+    val lineHeightDisplayMediumTablet: Int = FontRawTokens.fontLineHeight1250,
+    val lineHeightDisplaySmallMobile: Int = FontRawTokens.fontLineHeight850,
+    val lineHeightDisplaySmallTablet: Int = FontRawTokens.fontLineHeight1050,
+    val lineHeightHeadingLargeMobile: Int = FontRawTokens.fontLineHeight650,
+    val lineHeightHeadingLargeTablet: Int = FontRawTokens.fontLineHeight750,
+    val lineHeightHeadingMediumMobile: Int = FontRawTokens.fontLineHeight550,
+    val lineHeightHeadingMediumTablet: Int = FontRawTokens.fontLineHeight650,
+    val lineHeightHeadingSmallMobile: Int = FontRawTokens.fontLineHeight450,
+    val lineHeightHeadingSmallTablet: Int = FontRawTokens.fontLineHeight550,
+    val lineHeightHeadingXlargeMobile: Int = FontRawTokens.fontLineHeight750,
+    val lineHeightHeadingXlargeTablet: Int = FontRawTokens.fontLineHeight950,
+    val lineHeightLabelLarge: Int = FontRawTokens.fontLineHeight450,
+    val lineHeightLabelMedium: Int = FontRawTokens.fontLineHeight350,
+    val lineHeightLabelSmall: Int = FontRawTokens.fontLineHeight250,
+    val lineHeightLabelXlarge: Int = FontRawTokens.fontLineHeight450,
+    val sizeBodyLargeMobile: Int = FontRawTokens.fontSize250,
+    val sizeBodyLargeTablet: Int = FontRawTokens.fontSize250,
+    val sizeBodyMediumMobile: Int = FontRawTokens.fontSize200,
+    val sizeBodyMediumTablet: Int = FontRawTokens.fontSize200,
+    val sizeBodySmallMobile: Int = FontRawTokens.fontSize150,
+    val sizeBodySmallTablet: Int = FontRawTokens.fontSize150,
+    val sizeDisplayLargeMobile: Int = FontRawTokens.fontSize850,
+    val sizeDisplayLargeTablet: Int = FontRawTokens.fontSize1450,
+    val sizeDisplayMediumMobile: Int = FontRawTokens.fontSize750,
+    val sizeDisplayMediumTablet: Int = FontRawTokens.fontSize1050,
+    val sizeDisplaySmallMobile: Int = FontRawTokens.fontSize650,
+    val sizeDisplaySmallTablet: Int = FontRawTokens.fontSize850,
+    val sizeHeadingLargeMobile: Int = FontRawTokens.fontSize450,
+    val sizeHeadingLargeTablet: Int = FontRawTokens.fontSize550,
+    val sizeHeadingMediumMobile: Int = FontRawTokens.fontSize350,
+    val sizeHeadingMediumTablet: Int = FontRawTokens.fontSize450,
+    val sizeHeadingSmallMobile: Int = FontRawTokens.fontSize300,
+    val sizeHeadingSmallTablet: Int = FontRawTokens.fontSize350,
+    val sizeHeadingXlargeMobile: Int = FontRawTokens.fontSize550,
+    val sizeHeadingXlargeTablet: Int = FontRawTokens.fontSize750,
+    val sizeLabelLarge: Int = FontRawTokens.fontSize250,
+    val sizeLabelMedium: Int = FontRawTokens.fontSize200,
+    val sizeLabelSmall: Int = FontRawTokens.fontSize150,
+    val sizeLabelXlarge: Int = FontRawTokens.fontSize300,
+    val weightBodyDefault: Int = FontRawTokens.fontWeight400,
+    val weightBodyStrong: Int = FontRawTokens.fontWeight700,
+    val weightDisplay: Int = FontRawTokens.fontWeight700,
+    val weightHeading: Int = FontRawTokens.fontWeight700,
+    val weightLabelDefault: Int = FontRawTokens.fontWeight400,
+    val weightLabelStrong: Int = FontRawTokens.fontWeight700,
+    val weightDefault: Int = FontRawTokens.fontWeight400,
+    val weightStrong: Int = FontRawTokens.fontWeight700
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
index df50e9d4..e01aa4ee 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
@@ -15,16 +15,16 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.GridRawTokens
 
 data class OudsGridSemanticTokens(
-  val compactColumnGap: Float = GridRawTokens.gridColumnGap100,
-  val compactMargin: Int = GridRawTokens.gridMargin300,
-  val compactMaxWidth: Int = GridRawTokens.gridMaxWidthCompact,
-  val compactMinWidth: Int = GridRawTokens.gridMinWidthCompact,
-  val extraCompactColumnGap: Float = GridRawTokens.gridColumnGap100,
-  val extraCompactMargin: Int = GridRawTokens.gridMargin100,
-  val extraCompactMaxWidth: Int = GridRawTokens.gridMaxWidthExtraCompact,
-  val extraCompactMinWidth: Int = GridRawTokens.gridMinWidthExtraCompact,
-  val mediumColumnGap: Float = GridRawTokens.gridColumnGap400,
-  val mediumMargin: Int = GridRawTokens.gridMargin500,
-  val mediumMaxWidth: Int = GridRawTokens.gridMaxWidthMedium,
-  val mediumMinWidth: Int = GridRawTokens.gridMinWidthMedium
+    val compactColumnGap: Float = GridRawTokens.gridColumnGap100,
+    val compactMargin: Int = GridRawTokens.gridMargin300,
+    val compactMaxWidth: Int = GridRawTokens.gridMaxWidthCompact,
+    val compactMinWidth: Int = GridRawTokens.gridMinWidthCompact,
+    val extraCompactColumnGap: Float = GridRawTokens.gridColumnGap100,
+    val extraCompactMargin: Int = GridRawTokens.gridMargin100,
+    val extraCompactMaxWidth: Int = GridRawTokens.gridMaxWidthExtraCompact,
+    val extraCompactMinWidth: Int = GridRawTokens.gridMinWidthExtraCompact,
+    val mediumColumnGap: Float = GridRawTokens.gridColumnGap400,
+    val mediumMargin: Int = GridRawTokens.gridMargin500,
+    val mediumMaxWidth: Int = GridRawTokens.gridMaxWidthMedium,
+    val mediumMinWidth: Int = GridRawTokens.gridMinWidthMedium
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
index 8f276aff..af60dd62 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
@@ -15,10 +15,10 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.OpacityRawTokens
 
 data class OudsOpacitySemanticTokens(
-  val medium: Float = OpacityRawTokens.opacity500,
-  val opaque: Float = OpacityRawTokens.opacity900,
-  val strong: Float = OpacityRawTokens.opacity700,
-  val transparent: Float = OpacityRawTokens.opacity0,
-  val weak: Float = OpacityRawTokens.opacity300,
-  val weaker: Float = OpacityRawTokens.opacity100
+    val invisible: Float = OpacityRawTokens.opacity0,
+    val medium: Float = OpacityRawTokens.opacity320,
+    val opaque: Float = OpacityRawTokens.opacity1000,
+    val strong: Float = OpacityRawTokens.opacity640,
+    val weak: Float = OpacityRawTokens.opacity160,
+    val weaker: Float = OpacityRawTokens.opacity40
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
index 051c8c65..6182e1cb 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
@@ -15,87 +15,87 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.DimensionRawTokens
 
 data class OudsSizeSemanticTokens(
-  val iconDecorativeMedium: Float = DimensionRawTokens.dimension500,
-  val iconDecorativeShort: Float = DimensionRawTokens.dimension400,
-  val iconDecorativeShorter: Float = DimensionRawTokens.dimension300,
-  val iconDecorativeShortest: Float = DimensionRawTokens.dimension200,
-  val iconDecorativeTall: Float = DimensionRawTokens.dimension600,
-  val iconDecorativeTaller: Float = DimensionRawTokens.dimension700,
-  val iconDecorativeTallest: Float = DimensionRawTokens.dimension900,
-  val iconWithBodyLargeSizeMediumMobile: Float = DimensionRawTokens.dimension300,
-  val iconWithBodyLargeSizeMediumTablet: Float = DimensionRawTokens.dimension300,
-  val iconWithBodyLargeSizeShortMobile: Float = DimensionRawTokens.dimension250,
-  val iconWithBodyLargeSizeShortTablet: Float = DimensionRawTokens.dimension250,
-  val iconWithBodyLargeSizeTallMobile: Float = DimensionRawTokens.dimension350,
-  val iconWithBodyLargeSizeTallTablet: Float = DimensionRawTokens.dimension350,
-  val iconWithBodyMediumSizeMediumMobile: Float = DimensionRawTokens.dimension250,
-  val iconWithBodyMediumSizeMediumTablet: Float = DimensionRawTokens.dimension250,
-  val iconWithBodyMediumSizeShortMobile: Float = DimensionRawTokens.dimension200,
-  val iconWithBodyMediumSizeShortTablet: Float = DimensionRawTokens.dimension200,
-  val iconWithBodyMediumSizeTallMobile: Float = DimensionRawTokens.dimension300,
-  val iconWithBodyMediumSizeTallTablet: Float = DimensionRawTokens.dimension300,
-  val iconWithBodySmallSizeMediumMobile: Float = DimensionRawTokens.dimension200,
-  val iconWithBodySmallSizeMediumTablet: Float = DimensionRawTokens.dimension200,
-  val iconWithBodySmallSizeShortMobile: Float = DimensionRawTokens.dimension150,
-  val iconWithBodySmallSizeShortTablet: Float = DimensionRawTokens.dimension150,
-  val iconWithBodySmallSizeTallMobile: Float = DimensionRawTokens.dimension250,
-  val iconWithBodySmallSizeTallTablet: Float = DimensionRawTokens.dimension250,
-  val iconWithHeadingLargeSizeMediumMobile: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingLargeSizeMediumTablet: Float = DimensionRawTokens.dimension600,
-  val iconWithHeadingLargeSizeShortMobile: Float = DimensionRawTokens.dimension500,
-  val iconWithHeadingLargeSizeShortTablet: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingLargeSizeTallMobile: Float = DimensionRawTokens.dimension600,
-  val iconWithHeadingLargeSizeTallTablet: Float = DimensionRawTokens.dimension650,
-  val iconWithHeadingMediumSizeMediumMobile: Float = DimensionRawTokens.dimension500,
-  val iconWithHeadingMediumSizeMediumTablet: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingMediumSizeShortMobile: Float = DimensionRawTokens.dimension400,
-  val iconWithHeadingMediumSizeShortTablet: Float = DimensionRawTokens.dimension500,
-  val iconWithHeadingMediumSizeTallMobile: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingMediumSizeTallTablet: Float = DimensionRawTokens.dimension600,
-  val iconWithHeadingSmallSizeMediumMobile: Float = DimensionRawTokens.dimension500,
-  val iconWithHeadingSmallSizeMediumTablet: Float = DimensionRawTokens.dimension500,
-  val iconWithHeadingSmallSizeShortMobile: Float = DimensionRawTokens.dimension400,
-  val iconWithHeadingSmallSizeShortTablet: Float = DimensionRawTokens.dimension400,
-  val iconWithHeadingSmallSizeTallMobile: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingSmallSizeTallTablet: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingXlargeSizeMediumMobile: Float = DimensionRawTokens.dimension600,
-  val iconWithHeadingXlargeSizeMediumTablet: Float = DimensionRawTokens.dimension700,
-  val iconWithHeadingXlargeSizeShortMobile: Float = DimensionRawTokens.dimension550,
-  val iconWithHeadingXlargeSizeShortTablet: Float = DimensionRawTokens.dimension650,
-  val iconWithHeadingXlargeSizeTallMobile: Float = DimensionRawTokens.dimension650,
-  val iconWithHeadingXlargeSizeTallTablet: Float = DimensionRawTokens.dimension800,
-  val iconWithLabelLargeSizeMedium: Float = DimensionRawTokens.dimension350,
-  val iconWithLabelLargeSizeShort: Float = DimensionRawTokens.dimension300,
-  val iconWithLabelLargeSizeShorter: Float = DimensionRawTokens.dimension250,
-  val iconWithLabelLargeSizeTall: Float = DimensionRawTokens.dimension400,
-  val iconWithLabelLargeSizeTaller: Float = DimensionRawTokens.dimension550,
-  val iconWithLabelMediumSizeMedium: Float = DimensionRawTokens.dimension250,
-  val iconWithLabelMediumSizeShort: Float = DimensionRawTokens.dimension200,
-  val iconWithLabelMediumSizeTall: Float = DimensionRawTokens.dimension300,
-  val iconWithLabelSmallSizeMedium: Float = DimensionRawTokens.dimension200,
-  val iconWithLabelSmallSizeShort: Float = DimensionRawTokens.dimension150,
-  val iconWithLabelSmallSizeTall: Float = DimensionRawTokens.dimension250,
-  val iconWithLabelXlargeSizeMedium: Float = DimensionRawTokens.dimension500,
-  val iconWithLabelXlargeSizeShort: Float = DimensionRawTokens.dimension400,
-  val iconWithLabelXlargeSizeTall: Float = DimensionRawTokens.dimension550,
-  val maxWidthTypeBodyLargeMobile: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeBodyLargeTablet: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeBodyMediumMobile: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeBodyMediumTablet: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeBodySmallMobile: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeBodySmallTablet: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeDisplayLargeMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeDisplayLargeTablet: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeDisplayMediumMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeDisplayMediumTablet: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeDisplaySmallMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeDisplaySmallTablet: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingLargeMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingLargeTablet: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingMediumMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingMediumTablet: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingSmallMobile: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeHeadingSmallTablet: Float = DimensionRawTokens.dimension6000,
-  val maxWidthTypeHeadingXlargeMobile: Float = DimensionRawTokens.dimension9000,
-  val maxWidthTypeHeadingXlargeTablet: Float = DimensionRawTokens.dimension9000
+    val iconDecorative2xl: Float = DimensionRawTokens.dimension900,
+    val iconDecorative2xs: Float = DimensionRawTokens.dimension200,
+    val iconDecorativeLg: Float = DimensionRawTokens.dimension600,
+    val iconDecorativeMd: Float = DimensionRawTokens.dimension500,
+    val iconDecorativeSm: Float = DimensionRawTokens.dimension400,
+    val iconDecorativeXl: Float = DimensionRawTokens.dimension700,
+    val iconDecorativeXs: Float = DimensionRawTokens.dimension300,
+    val iconWithBodyLargeSizeLgMobile: Float = DimensionRawTokens.dimension350,
+    val iconWithBodyLargeSizeLgTablet: Float = DimensionRawTokens.dimension350,
+    val iconWithBodyLargeSizeMdMobile: Float = DimensionRawTokens.dimension300,
+    val iconWithBodyLargeSizeMdTablet: Float = DimensionRawTokens.dimension300,
+    val iconWithBodyLargeSizeSmMobile: Float = DimensionRawTokens.dimension250,
+    val iconWithBodyLargeSizeSmTablet: Float = DimensionRawTokens.dimension250,
+    val iconWithBodyMediumSizeLgMobile: Float = DimensionRawTokens.dimension300,
+    val iconWithBodyMediumSizeLgTablet: Float = DimensionRawTokens.dimension300,
+    val iconWithBodyMediumSizeMdMobile: Float = DimensionRawTokens.dimension250,
+    val iconWithBodyMediumSizeMdTablet: Float = DimensionRawTokens.dimension250,
+    val iconWithBodyMediumSizeSmMobile: Float = DimensionRawTokens.dimension200,
+    val iconWithBodyMediumSizeSmTablet: Float = DimensionRawTokens.dimension200,
+    val iconWithBodySmallSizeLgMobile: Float = DimensionRawTokens.dimension250,
+    val iconWithBodySmallSizeLgTablet: Float = DimensionRawTokens.dimension250,
+    val iconWithBodySmallSizeMdMobile: Float = DimensionRawTokens.dimension200,
+    val iconWithBodySmallSizeMdTablet: Float = DimensionRawTokens.dimension200,
+    val iconWithBodySmallSizeSmMobile: Float = DimensionRawTokens.dimension150,
+    val iconWithBodySmallSizeSmTablet: Float = DimensionRawTokens.dimension150,
+    val iconWithHeadingLargeSizeLgMobile: Float = DimensionRawTokens.dimension600,
+    val iconWithHeadingLargeSizeLgTablet: Float = DimensionRawTokens.dimension650,
+    val iconWithHeadingLargeSizeMdMobile: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingLargeSizeMdTablet: Float = DimensionRawTokens.dimension600,
+    val iconWithHeadingLargeSizeSmMobile: Float = DimensionRawTokens.dimension500,
+    val iconWithHeadingLargeSizeSmTablet: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingMediumSizeLgMobile: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingMediumSizeLgTablet: Float = DimensionRawTokens.dimension600,
+    val iconWithHeadingMediumSizeMdMobile: Float = DimensionRawTokens.dimension500,
+    val iconWithHeadingMediumSizeMdTablet: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingMediumSizeSmMobile: Float = DimensionRawTokens.dimension400,
+    val iconWithHeadingMediumSizeSmTablet: Float = DimensionRawTokens.dimension500,
+    val iconWithHeadingSmallSizeLgMobile: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingSmallSizeLgTablet: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingSmallSizeMdMobile: Float = DimensionRawTokens.dimension500,
+    val iconWithHeadingSmallSizeMdTablet: Float = DimensionRawTokens.dimension500,
+    val iconWithHeadingSmallSizeSmMobile: Float = DimensionRawTokens.dimension400,
+    val iconWithHeadingSmallSizeSmTablet: Float = DimensionRawTokens.dimension400,
+    val iconWithHeadingXlargeSizeLgMobile: Float = DimensionRawTokens.dimension650,
+    val iconWithHeadingXlargeSizeLgTablet: Float = DimensionRawTokens.dimension800,
+    val iconWithHeadingXlargeSizeMdMobile: Float = DimensionRawTokens.dimension600,
+    val iconWithHeadingXlargeSizeMdTablet: Float = DimensionRawTokens.dimension700,
+    val iconWithHeadingXlargeSizeSmMobile: Float = DimensionRawTokens.dimension550,
+    val iconWithHeadingXlargeSizeSmTablet: Float = DimensionRawTokens.dimension650,
+    val iconWithLabelLargeSizeLg: Float = DimensionRawTokens.dimension400,
+    val iconWithLabelLargeSizeMd: Float = DimensionRawTokens.dimension350,
+    val iconWithLabelLargeSizeSm: Float = DimensionRawTokens.dimension300,
+    val iconWithLabelLargeSizeXl: Float = DimensionRawTokens.dimension550,
+    val iconWithLabelLargeSizeXs: Float = DimensionRawTokens.dimension250,
+    val iconWithLabelMediumSizeLg: Float = DimensionRawTokens.dimension300,
+    val iconWithLabelMediumSizeMd: Float = DimensionRawTokens.dimension250,
+    val iconWithLabelMediumSizeSm: Float = DimensionRawTokens.dimension200,
+    val iconWithLabelSmallSizeLg: Float = DimensionRawTokens.dimension250,
+    val iconWithLabelSmallSizeMd: Float = DimensionRawTokens.dimension200,
+    val iconWithLabelSmallSizeSm: Float = DimensionRawTokens.dimension150,
+    val iconWithLabelXlargeSizeLg: Float = DimensionRawTokens.dimension550,
+    val iconWithLabelXlargeSizeMd: Float = DimensionRawTokens.dimension500,
+    val iconWithLabelXlargeSizeSm: Float = DimensionRawTokens.dimension400,
+    val maxWidthTypeBodyLargeMobile: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeBodyLargeTablet: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeBodyMediumMobile: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeBodyMediumTablet: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeBodySmallMobile: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeBodySmallTablet: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeDisplayLargeMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeDisplayLargeTablet: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeDisplayMediumMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeDisplayMediumTablet: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeDisplaySmallMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeDisplaySmallTablet: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingLargeMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingLargeTablet: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingMediumMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingMediumTablet: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingSmallMobile: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeHeadingSmallTablet: Float = DimensionRawTokens.dimension6000,
+    val maxWidthTypeHeadingXlargeMobile: Float = DimensionRawTokens.dimension9000,
+    val maxWidthTypeHeadingXlargeTablet: Float = DimensionRawTokens.dimension9000
 )
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
index 354f81d7..d3f6e898 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
@@ -15,113 +15,84 @@ package com.orange.ouds.theme.tokens.semantic
 import com.orange.ouds.tokens.global.raw.DimensionRawTokens
 
 data class OudsSpaceSemanticTokens(
-  val columnGapMedium: Float = DimensionRawTokens.dimension200,
-  val columnGapNone: Float = DimensionRawTokens.dimension0,
-  val columnGapShort: Float = DimensionRawTokens.dimension100,
-  val columnGapShorter: Float = DimensionRawTokens.dimension50,
-  val columnGapTall: Float = DimensionRawTokens.dimension300,
-  val columnGapTaller: Float = DimensionRawTokens.dimension400,
-  val columnGapWithArrowMedium: Float = DimensionRawTokens.dimension100,
-  val columnGapWithArrowNone: Float = DimensionRawTokens.dimension0,
-  val columnGapWithArrowShort: Float = DimensionRawTokens.dimension75,
-  val columnGapWithArrowShorter: Float = DimensionRawTokens.dimension50,
-  val columnGapWithArrowShortest: Float = DimensionRawTokens.dimension25,
-  val columnGapWithArrowTall: Float = DimensionRawTokens.dimension200,
-  val columnGapWithIconMedium: Float = DimensionRawTokens.dimension100,
-  val columnGapWithIconNone: Float = DimensionRawTokens.dimension0,
-  val columnGapWithIconShort: Float = DimensionRawTokens.dimension75,
-  val columnGapWithIconShorter: Float = DimensionRawTokens.dimension50,
-  val columnGapWithIconShortest: Float = DimensionRawTokens.dimension25,
-  val columnGapWithIconTall: Float = DimensionRawTokens.dimension200,
-  val fixedHuge: Float = DimensionRawTokens.dimension700,
-  val fixedJumbo: Float = DimensionRawTokens.dimension800,
-  val fixedMedium: Float = DimensionRawTokens.dimension200,
-  val fixedNone: Float = DimensionRawTokens.dimension0,
-  val fixedShort: Float = DimensionRawTokens.dimension150,
-  val fixedShorter: Float = DimensionRawTokens.dimension100,
-  val fixedShortest: Float = DimensionRawTokens.dimension50,
-  val fixedSmash: Float = DimensionRawTokens.dimension25,
-  val fixedSpacious: Float = DimensionRawTokens.dimension600,
-  val fixedTall: Float = DimensionRawTokens.dimension300,
-  val fixedTaller: Float = DimensionRawTokens.dimension400,
-  val fixedTallest: Float = DimensionRawTokens.dimension500,
-  val insetMedium: Float = DimensionRawTokens.dimension150,
-  val insetNone: Float = DimensionRawTokens.dimension0,
-  val insetShort: Float = DimensionRawTokens.dimension100,
-  val insetShorter: Float = DimensionRawTokens.dimension75,
-  val insetShortest: Float = DimensionRawTokens.dimension50,
-  val insetSmash: Float = DimensionRawTokens.dimension25,
-  val insetSpacious: Float = DimensionRawTokens.dimension500,
-  val insetTall: Float = DimensionRawTokens.dimension200,
-  val insetTaller: Float = DimensionRawTokens.dimension300,
-  val insetTallest: Float = DimensionRawTokens.dimension400,
-  val paddingBlockMedium: Float = DimensionRawTokens.dimension150,
-  val paddingBlockNone: Float = DimensionRawTokens.dimension0,
-  val paddingBlockShort: Float = DimensionRawTokens.dimension100,
-  val paddingBlockShorter: Float = DimensionRawTokens.dimension50,
-  val paddingBlockTall: Float = DimensionRawTokens.dimension200,
-  val paddingBlockTaller: Float = DimensionRawTokens.dimension300,
-  val paddingBlockTallest: Float = DimensionRawTokens.dimension400,
-  val paddingBlockWithIconMedium: Float = DimensionRawTokens.dimension100,
-  val paddingBlockWithIconNone: Float = DimensionRawTokens.dimension0,
-  val paddingBlockWithIconShort: Float = DimensionRawTokens.dimension75,
-  val paddingBlockWithIconShorter: Float = DimensionRawTokens.dimension50,
-  val paddingBlockWithIconShortest: Float = DimensionRawTokens.dimension25,
-  val paddingBlockWithIconTall: Float = DimensionRawTokens.dimension150,
-  val paddingBlockWithIconTaller: Float = DimensionRawTokens.dimension200,
-  val paddingInlineMedium: Float = DimensionRawTokens.dimension200,
-  val paddingInlineNone: Float = DimensionRawTokens.dimension0,
-  val paddingInlineShort: Float = DimensionRawTokens.dimension100,
-  val paddingInlineShorter: Float = DimensionRawTokens.dimension50,
-  val paddingInlineTall: Float = DimensionRawTokens.dimension300,
-  val paddingInlineTaller: Float = DimensionRawTokens.dimension350,
-  val paddingInlineTallest: Float = DimensionRawTokens.dimension400,
-  val paddingInlineWithArrowMedium: Float = DimensionRawTokens.dimension100,
-  val paddingInlineWithArrowNone: Float = DimensionRawTokens.dimension0,
-  val paddingInlineWithArrowShort: Float = DimensionRawTokens.dimension75,
-  val paddingInlineWithArrowShorter: Float = DimensionRawTokens.dimension50,
-  val paddingInlineWithArrowShortest: Float = DimensionRawTokens.dimension25,
-  val paddingInlineWithArrowTall: Float = DimensionRawTokens.dimension200,
-  val paddingInlineWithArrowTaller: Float = DimensionRawTokens.dimension250,
-  val paddingInlineWithArrowTallest: Float = DimensionRawTokens.dimension300,
-  val paddingInlineWithIconMedium: Float = DimensionRawTokens.dimension200,
-  val paddingInlineWithIconNone: Float = DimensionRawTokens.dimension0,
-  val paddingInlineWithIconShort: Float = DimensionRawTokens.dimension100,
-  val paddingInlineWithIconShorter: Float = DimensionRawTokens.dimension50,
-  val paddingInlineWithIconShortest: Float = DimensionRawTokens.dimension25,
-  val paddingInlineWithIconTall: Float = DimensionRawTokens.dimension250,
-  val paddingInlineWithIconTaller: Float = DimensionRawTokens.dimension300,
-  val paddingInlineWithIconTallest: Float = DimensionRawTokens.dimension350,
-  val rowGapMedium: Float = DimensionRawTokens.dimension100,
-  val rowGapNone: Float = DimensionRawTokens.dimension0,
-  val rowGapShort: Float = DimensionRawTokens.dimension75,
-  val rowGapShorter: Float = DimensionRawTokens.dimension50,
-  val rowGapShortest: Float = DimensionRawTokens.dimension25,
-  val rowGapTall: Float = DimensionRawTokens.dimension200,
-  val rowGapWithIconMedium: Float = DimensionRawTokens.dimension100,
-  val rowGapWithIconNone: Float = DimensionRawTokens.dimension0,
-  val rowGapWithIconShort: Float = DimensionRawTokens.dimension75,
-  val rowGapWithIconShorter: Float = DimensionRawTokens.dimension50,
-  val rowGapWithIconShortest: Float = DimensionRawTokens.dimension25,
-  val rowGapWithIconTall: Float = DimensionRawTokens.dimension200,
-  val scaledMediumMobile: Float = DimensionRawTokens.dimension200,
-  val scaledMediumTablet: Float = DimensionRawTokens.dimension300,
-  val scaledNoneMobile: Float = DimensionRawTokens.dimension0,
-  val scaledNoneTablet: Float = DimensionRawTokens.dimension0,
-  val scaledShortMobile: Float = DimensionRawTokens.dimension150,
-  val scaledShortTablet: Float = DimensionRawTokens.dimension200,
-  val scaledShorterMobile: Float = DimensionRawTokens.dimension100,
-  val scaledShorterTablet: Float = DimensionRawTokens.dimension150,
-  val scaledShortestMobile: Float = DimensionRawTokens.dimension50,
-  val scaledShortestTablet: Float = DimensionRawTokens.dimension100,
-  val scaledSmashMobile: Float = DimensionRawTokens.dimension25,
-  val scaledSmashTablet: Float = DimensionRawTokens.dimension50,
-  val scaledSpaciousMobile: Float = DimensionRawTokens.dimension600,
-  val scaledSpaciousTablet: Float = DimensionRawTokens.dimension700,
-  val scaledTallMobile: Float = DimensionRawTokens.dimension300,
-  val scaledTallTablet: Float = DimensionRawTokens.dimension400,
-  val scaledTallerMobile: Float = DimensionRawTokens.dimension400,
-  val scaledTallerTablet: Float = DimensionRawTokens.dimension500,
-  val scaledTallestMobile: Float = DimensionRawTokens.dimension500,
-  val scaledTallestTablet: Float = DimensionRawTokens.dimension600
+    val columnGapMedium: Float = DimensionRawTokens.dimension150,
+    val columnGapNone: Float = DimensionRawTokens.dimension0,
+    val columnGapShort: Float = DimensionRawTokens.dimension100,
+    val columnGapShorter: Float = DimensionRawTokens.dimension75,
+    val columnGapShortest: Float = DimensionRawTokens.dimension50,
+    val columnGapSmash: Float = DimensionRawTokens.dimension25,
+    val columnGapTall: Float = DimensionRawTokens.dimension200,
+    val columnGapTaller: Float = DimensionRawTokens.dimension250,
+    val columnGapTallest: Float = DimensionRawTokens.dimension300,
+    val fixedHuge: Float = DimensionRawTokens.dimension700,
+    val fixedJumbo: Float = DimensionRawTokens.dimension800,
+    val fixedMedium: Float = DimensionRawTokens.dimension200,
+    val fixedNone: Float = DimensionRawTokens.dimension0,
+    val fixedShort: Float = DimensionRawTokens.dimension150,
+    val fixedShorter: Float = DimensionRawTokens.dimension100,
+    val fixedShortest: Float = DimensionRawTokens.dimension50,
+    val fixedSmash: Float = DimensionRawTokens.dimension25,
+    val fixedSpacious: Float = DimensionRawTokens.dimension600,
+    val fixedTall: Float = DimensionRawTokens.dimension300,
+    val fixedTaller: Float = DimensionRawTokens.dimension400,
+    val fixedTallest: Float = DimensionRawTokens.dimension500,
+    val insetMedium: Float = DimensionRawTokens.dimension150,
+    val insetNone: Float = DimensionRawTokens.dimension0,
+    val insetShort: Float = DimensionRawTokens.dimension100,
+    val insetShorter: Float = DimensionRawTokens.dimension75,
+    val insetShortest: Float = DimensionRawTokens.dimension50,
+    val insetSmash: Float = DimensionRawTokens.dimension25,
+    val insetSpacious: Float = DimensionRawTokens.dimension500,
+    val insetTall: Float = DimensionRawTokens.dimension200,
+    val insetTaller: Float = DimensionRawTokens.dimension300,
+    val insetTallest: Float = DimensionRawTokens.dimension400,
+    val paddingBlockHuge: Float = DimensionRawTokens.dimension400,
+    val paddingBlockMedium: Float = DimensionRawTokens.dimension150,
+    val paddingBlockNone: Float = DimensionRawTokens.dimension0,
+    val paddingBlockShort: Float = DimensionRawTokens.dimension100,
+    val paddingBlockShorter: Float = DimensionRawTokens.dimension75,
+    val paddingBlockShortest: Float = DimensionRawTokens.dimension50,
+    val paddingBlockSmash: Float = DimensionRawTokens.dimension25,
+    val paddingBlockSpacious: Float = DimensionRawTokens.dimension350,
+    val paddingBlockTall: Float = DimensionRawTokens.dimension200,
+    val paddingBlockTaller: Float = DimensionRawTokens.dimension250,
+    val paddingBlockTallest: Float = DimensionRawTokens.dimension300,
+    val paddingInlineHuge: Float = DimensionRawTokens.dimension400,
+    val paddingInlineMedium: Float = DimensionRawTokens.dimension150,
+    val paddingInlineNone: Float = DimensionRawTokens.dimension0,
+    val paddingInlineShort: Float = DimensionRawTokens.dimension100,
+    val paddingInlineShorter: Float = DimensionRawTokens.dimension75,
+    val paddingInlineShortest: Float = DimensionRawTokens.dimension50,
+    val paddingInlineSmash: Float = DimensionRawTokens.dimension25,
+    val paddingInlineSpacious: Float = DimensionRawTokens.dimension350,
+    val paddingInlineTall: Float = DimensionRawTokens.dimension200,
+    val paddingInlineTaller: Float = DimensionRawTokens.dimension250,
+    val paddingInlineTallest: Float = DimensionRawTokens.dimension300,
+    val rowGapMedium: Float = DimensionRawTokens.dimension150,
+    val rowGapNone: Float = DimensionRawTokens.dimension0,
+    val rowGapShort: Float = DimensionRawTokens.dimension100,
+    val rowGapShorter: Float = DimensionRawTokens.dimension75,
+    val rowGapShortest: Float = DimensionRawTokens.dimension50,
+    val rowGapSmash: Float = DimensionRawTokens.dimension25,
+    val rowGapTall: Float = DimensionRawTokens.dimension200,
+    val scaledMediumMobile: Float = DimensionRawTokens.dimension200,
+    val scaledMediumTablet: Float = DimensionRawTokens.dimension300,
+    val scaledNoneMobile: Float = DimensionRawTokens.dimension0,
+    val scaledNoneTablet: Float = DimensionRawTokens.dimension0,
+    val scaledShortMobile: Float = DimensionRawTokens.dimension150,
+    val scaledShortTablet: Float = DimensionRawTokens.dimension200,
+    val scaledShorterMobile: Float = DimensionRawTokens.dimension100,
+    val scaledShorterTablet: Float = DimensionRawTokens.dimension150,
+    val scaledShortestMobile: Float = DimensionRawTokens.dimension50,
+    val scaledShortestTablet: Float = DimensionRawTokens.dimension100,
+    val scaledSmashMobile: Float = DimensionRawTokens.dimension25,
+    val scaledSmashTablet: Float = DimensionRawTokens.dimension50,
+    val scaledSpaciousMobile: Float = DimensionRawTokens.dimension600,
+    val scaledSpaciousTablet: Float = DimensionRawTokens.dimension700,
+    val scaledTallMobile: Float = DimensionRawTokens.dimension300,
+    val scaledTallTablet: Float = DimensionRawTokens.dimension400,
+    val scaledTallerMobile: Float = DimensionRawTokens.dimension400,
+    val scaledTallerTablet: Float = DimensionRawTokens.dimension500,
+    val scaledTallestMobile: Float = DimensionRawTokens.dimension500,
+    val scaledTallestTablet: Float = DimensionRawTokens.dimension600
 )
diff --git a/theme-orange-country/src/main/java/com/orange/ouds/theme/orangecountry/OrangeCountryTheme.kt b/theme-orange-country/src/main/java/com/orange/ouds/theme/orangecountry/OrangeCountryTheme.kt
index 116a6571..1c377c8d 100644
--- a/theme-orange-country/src/main/java/com/orange/ouds/theme/orangecountry/OrangeCountryTheme.kt
+++ b/theme-orange-country/src/main/java/com/orange/ouds/theme/orangecountry/OrangeCountryTheme.kt
@@ -31,13 +31,13 @@ class OrangeCountryTheme : OrangeTheme() {
     override val colorTokens: OudsColorSemanticTokens
         get() = OudsColorSemanticTokens(
             backgroundColorTokens = OudsColorBgSemanticTokens(
-                bgBrandPrimaryLight = Color(0xFF34D349),
-                bgBrandPrimaryDark = Color(0xFF069D1A)
+                bgPrimaryLight = Color(0xFF34D349),
+                bgPrimaryDark = Color(0xFF069D1A)
             )
         )
 
     override val componentsTokens: OudsComponentsTokens
         get() = OudsComponentsTokens(
-            button = OudsButtonTokens(containerColor = OudsColorKeyToken.Background.Status.Accent.Emphasized, cornerRadius = OudsBorderKeyToken.Radius.Short)
+            button = OudsButtonTokens(containerColor = OudsColorKeyToken.Surface.Status.Warning.Muted, cornerRadius = OudsBorderKeyToken.Radius.Short)
         )
 }
\ No newline at end of file
diff --git a/theme-white-label/src/main/java/com/orange/ouds/theme/whitelabel/tokens/WhiteLabelSemanticColorTokens.kt b/theme-white-label/src/main/java/com/orange/ouds/theme/whitelabel/tokens/WhiteLabelSemanticColorTokens.kt
index e7161a33..2a864e13 100644
--- a/theme-white-label/src/main/java/com/orange/ouds/theme/whitelabel/tokens/WhiteLabelSemanticColorTokens.kt
+++ b/theme-white-label/src/main/java/com/orange/ouds/theme/whitelabel/tokens/WhiteLabelSemanticColorTokens.kt
@@ -19,8 +19,8 @@ import com.orange.ouds.theme.tokens.semantic.OudsColorSemanticTokens
 val whiteLabelSemanticColorTokens = with(WhiteLabelRawColorTokens) {
     OudsColorSemanticTokens(
         backgroundColorTokens = OudsColorBgSemanticTokens(
-            bgBrandPrimaryLight = Color(0xFF34D349),
-            bgBrandPrimaryDark = Color(0xFF069D1A),
+            bgPrimaryLight = Color(0xFF34D349),
+            bgPrimaryDark = Color(0xFF069D1A),
             bgSecondaryLight = secondary40,
             bgSecondaryDark = secondary80,
         )