From 4611eb6f5780ff8663cf7db9875607355c5b387e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?=
 <david.gonzalezcolorado@telefonica.com>
Date: Tue, 7 Nov 2023 16:59:07 +0100
Subject: [PATCH] ANDROID-13833 VivoNew Override (#312)

* ANDROID-13833 Created a clone of VivoNew to mitigate a inheritance styling problem.

* ANDROID-13833 Omit compose customization

* ANDROID-13833 Add a new parameter in brand to handle inheritances

* ANDROID-13833 Copy VivoNew customizations

* ANDROID-13833 Delete old vivoNewOverriden files

* ANDROID-13833 Extract common functionality and add Override suffix

* Update design tokens (#316)

Co-authored-by: dagonco <dagonco@users.noreply.github.com>

---------

Co-authored-by: Flow <lifecycle-github@telefonica.com>
Co-authored-by: dagonco <dagonco@users.noreply.github.com>
---
 .../catalog/ui/ComponentCatalogActivity.kt    |   8 +-
 .../brand/BlauBrandColorsAutogenerated.kt     |   4 +
 .../brand/MovistarBrandColorsAutogenerated.kt |   4 +
 .../theme/brand/O2BrandColorsAutogenerated.kt |   4 +
 .../TelefonicaBrandColorsAutogenerated.kt     |   4 +
 .../brand/VivoBrandColorsAutogenerated.kt     |   4 +
 .../brand/VivoNewBrandColorsAutogenerated.kt  |   4 +
 .../theme/color/MisticaColorsAutogenerated.kt |  16 +-
 .../themes_blau_autogenerated.xml             |   2 +
 .../themes_movistar_autogenerated.xml         |   2 +
 .../values-night/themes_o2_autogenerated.xml  |   2 +
 .../themes_telefonica_autogenerated.xml       |   2 +
 .../themes_vivoNew_autogenerated.xml          | 111 +++++++++++++
 .../themes_vivo_autogenerated.xml             |   2 +
 .../main/res/values/attrs_autogenerated.xml   |   2 +
 .../res/values/themes_blau_autogenerated.xml  |   2 +
 .../values/themes_movistar_autogenerated.xml  |   2 +
 .../res/values/themes_o2_autogenerated.xml    |   2 +
 .../themes_telefonica_autogenerated.xml       |   2 +
 .../src/main/res/values/themes_vivoNew.xml    |  29 ++++
 .../values/themes_vivoNew_autogenerated.xml   | 156 ++++++++++++++++++
 .../res/values/themes_vivo_autogenerated.xml  |   2 +
 .../com/telefonica/mistica/tokens/Brand.kt    |   1 +
 .../mistica/tokens/TokensGenerator.kt         |   3 +-
 .../mistica/tokens/xml/GenerateXMLFiles.kt    |  71 +++++---
 25 files changed, 412 insertions(+), 29 deletions(-)

diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt
index bd43143da..ee314de54 100644
--- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt
+++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt
@@ -61,12 +61,16 @@ import com.telefonica.mistica.catalog.ui.compose.components.TabsCatalog
 import com.telefonica.mistica.catalog.ui.compose.components.Tags
 import com.telefonica.mistica.catalog.ui.compose.components.Texts
 import com.telefonica.mistica.catalog.ui.compose.components.Titles
-import com.telefonica.mistica.compose.badge.Badge
 import com.telefonica.mistica.compose.theme.MisticaTheme
 import com.telefonica.mistica.compose.theme.brand.BlauBrand
 import com.telefonica.mistica.compose.theme.brand.Brand
 import com.telefonica.mistica.compose.theme.brand.BrandType
-import com.telefonica.mistica.compose.theme.brand.BrandType.*
+import com.telefonica.mistica.compose.theme.brand.BrandType.BLAU
+import com.telefonica.mistica.compose.theme.brand.BrandType.MOVISTAR
+import com.telefonica.mistica.compose.theme.brand.BrandType.O2
+import com.telefonica.mistica.compose.theme.brand.BrandType.TELEFONICA
+import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO
+import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO_NEW
 import com.telefonica.mistica.compose.theme.brand.MovistarBrand
 import com.telefonica.mistica.compose.theme.brand.O2Brand
 import com.telefonica.mistica.compose.theme.brand.TelefonicaBrand
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt
index 878eaca51..46706b45f 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt
@@ -62,6 +62,8 @@ public object BlauBrandColors {
       textLinkSnackbar = BlauPaletteColor.blau_color_blauPurple30,
       control = BlauPaletteColor.blau_color_grey2,
       controlActivated = BlauPaletteColor.blau_color_blauBlueSecondary,
+      controlInverse = BlauPaletteColor.blau_color_white,
+      controlActivatedInverse = BlauPaletteColor.blau_color_white,
       controlError = BlauPaletteColor.blau_color_blauRed,
       loadingBar = BlauPaletteColor.blau_color_blauBlueSecondary,
       loadingBarBackground = BlauPaletteColor.blau_color_blauBlueSecondary10,
@@ -170,6 +172,8 @@ public object BlauBrandColors {
       textLinkSnackbar = BlauPaletteColor.blau_color_blauPurple30,
       control = BlauPaletteColor.blau_color_darkModeGrey6,
       controlActivated = BlauPaletteColor.blau_color_blauBlueSecondary,
+      controlInverse = BlauPaletteColor.blau_color_darkModeGrey6,
+      controlActivatedInverse = BlauPaletteColor.blau_color_blauBlueSecondary,
       controlError = BlauPaletteColor.blau_color_blauRed,
       loadingBar = BlauPaletteColor.blau_color_blauBluePrimary,
       loadingBarBackground = BlauPaletteColor.blau_color_darkModeGrey,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt
index 23c9f0b90..a9e7b638b 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt
@@ -62,6 +62,8 @@ public object MovistarBrandColors {
       textLinkSnackbar = MovistarPaletteColor.movistar_color_movistarBlue30,
       control = MovistarPaletteColor.movistar_color_grey3,
       controlActivated = MovistarPaletteColor.movistar_color_movistarBlue,
+      controlInverse = MovistarPaletteColor.movistar_color_white,
+      controlActivatedInverse = MovistarPaletteColor.movistar_color_white,
       controlError = MovistarPaletteColor.movistar_color_pepper,
       loadingBar = MovistarPaletteColor.movistar_color_movistarBlue30,
       loadingBarBackground = MovistarPaletteColor.movistar_color_movistarBlue55,
@@ -170,6 +172,8 @@ public object MovistarBrandColors {
       textLinkSnackbar = MovistarPaletteColor.movistar_color_movistarBlue30,
       control = MovistarPaletteColor.movistar_color_darkModeGrey6,
       controlActivated = MovistarPaletteColor.movistar_color_movistarBlue,
+      controlInverse = MovistarPaletteColor.movistar_color_darkModeGrey6,
+      controlActivatedInverse = MovistarPaletteColor.movistar_color_movistarBlue,
       controlError = MovistarPaletteColor.movistar_color_pepper,
       loadingBar = MovistarPaletteColor.movistar_color_movistarBlue,
       loadingBarBackground = MovistarPaletteColor.movistar_color_darkModeGrey6,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt
index 54a1b668f..b057e8c19 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt
@@ -61,6 +61,8 @@ public object O2BrandColors {
       textLinkSnackbar = O2PaletteColor.o2_color_o2BluePrimary30,
       control = O2PaletteColor.o2_color_grey3,
       controlActivated = O2PaletteColor.o2_color_o2BluePrimary,
+      controlInverse = O2PaletteColor.o2_color_white,
+      controlActivatedInverse = O2PaletteColor.o2_color_white,
       controlError = O2PaletteColor.o2_color_pepper,
       loadingBar = O2PaletteColor.o2_color_o2BluePrimary,
       loadingBarBackground = O2PaletteColor.o2_color_grey1,
@@ -169,6 +171,8 @@ public object O2BrandColors {
       textLinkSnackbar = O2PaletteColor.o2_color_o2BluePrimary30,
       control = O2PaletteColor.o2_color_darkModeGrey6,
       controlActivated = O2PaletteColor.o2_color_o2BluePrimary30,
+      controlInverse = O2PaletteColor.o2_color_darkModeGrey6,
+      controlActivatedInverse = O2PaletteColor.o2_color_o2BluePrimary30,
       controlError = O2PaletteColor.o2_color_pepper,
       loadingBar = O2PaletteColor.o2_color_darkModeO2BluePrimary,
       loadingBarBackground = O2PaletteColor.o2_color_darkModeGrey6,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt
index d1186f946..56e5f012d 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt
@@ -68,6 +68,8 @@ public object TelefonicaBrandColors {
       textLinkSnackbar = TelefonicaPaletteColor.telefonica_color_telefonicaBlue30,
       control = TelefonicaPaletteColor.telefonica_color_grey3,
       controlActivated = TelefonicaPaletteColor.telefonica_color_telefonicaBlue,
+      controlInverse = TelefonicaPaletteColor.telefonica_color_white,
+      controlActivatedInverse = TelefonicaPaletteColor.telefonica_color_white,
       controlError = TelefonicaPaletteColor.telefonica_color_coral,
       loadingBar = TelefonicaPaletteColor.telefonica_color_telefonicaBlue30,
       loadingBarBackground = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70,
@@ -179,6 +181,8 @@ public object TelefonicaBrandColors {
       textLinkSnackbar = TelefonicaPaletteColor.telefonica_color_telefonicaBlue30,
       control = TelefonicaPaletteColor.telefonica_color_darkModeGrey6,
       controlActivated = TelefonicaPaletteColor.telefonica_color_telefonicaBlue,
+      controlInverse = TelefonicaPaletteColor.telefonica_color_darkModeGrey6,
+      controlActivatedInverse = TelefonicaPaletteColor.telefonica_color_telefonicaBlue,
       controlError = TelefonicaPaletteColor.telefonica_color_coral,
       loadingBar = TelefonicaPaletteColor.telefonica_color_telefonicaBlue,
       loadingBarBackground = TelefonicaPaletteColor.telefonica_color_grey6,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt
index 12084d8c8..ce129862f 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt
@@ -62,6 +62,8 @@ public object VivoBrandColors {
       textLinkSnackbar = VivoPaletteColor.vivo_color_vivoPurpleLight50,
       control = VivoPaletteColor.vivo_color_grey3,
       controlActivated = VivoPaletteColor.vivo_color_vivoPurple,
+      controlInverse = VivoPaletteColor.vivo_color_white,
+      controlActivatedInverse = VivoPaletteColor.vivo_color_white,
       controlError = VivoPaletteColor.vivo_color_pepper,
       loadingBar = VivoPaletteColor.vivo_color_pink,
       loadingBarBackground = VivoPaletteColor.vivo_color_pepperLight30,
@@ -170,6 +172,8 @@ public object VivoBrandColors {
       textLinkSnackbar = VivoPaletteColor.vivo_color_vivoPurpleLight50,
       control = VivoPaletteColor.vivo_color_darkModeGrey6,
       controlActivated = VivoPaletteColor.vivo_color_vivoPurpleLight80,
+      controlInverse = VivoPaletteColor.vivo_color_darkModeGrey6,
+      controlActivatedInverse = VivoPaletteColor.vivo_color_vivoPurpleLight80,
       controlError = VivoPaletteColor.vivo_color_pepper,
       loadingBar = VivoPaletteColor.vivo_color_vivoPurpleLight80,
       loadingBarBackground = VivoPaletteColor.vivo_color_darkModeGrey6,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt
index 944e95ae0..a4d1ec113 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt
@@ -62,6 +62,8 @@ public object VivoNewBrandColors {
       textLinkSnackbar = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight20,
       control = VivoNewPaletteColor.vivoNew_color_grey3,
       controlActivated = VivoNewPaletteColor.vivoNew_color_vivoPurple,
+      controlInverse = VivoNewPaletteColor.vivoNew_color_white,
+      controlActivatedInverse = VivoNewPaletteColor.vivoNew_color_white,
       controlError = VivoNewPaletteColor.vivoNew_color_pepper,
       loadingBar = VivoNewPaletteColor.vivoNew_color_pink,
       loadingBarBackground = VivoNewPaletteColor.vivoNew_color_pepperLight30,
@@ -170,6 +172,8 @@ public object VivoNewBrandColors {
       textLinkSnackbar = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight50,
       control = VivoNewPaletteColor.vivoNew_color_darkModeGrey6,
       controlActivated = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight80,
+      controlInverse = VivoNewPaletteColor.vivoNew_color_darkModeGrey6,
+      controlActivatedInverse = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight80,
       controlError = VivoNewPaletteColor.vivoNew_color_pepper,
       loadingBar = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight80,
       loadingBarBackground = VivoNewPaletteColor.vivoNew_color_darkModeGrey6,
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt
index 724a1bf96..344cce022 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt
@@ -66,6 +66,8 @@ public class MisticaColors(
   textLinkSnackbar: Color = Color.Unspecified,
   control: Color = Color.Unspecified,
   controlActivated: Color = Color.Unspecified,
+  controlInverse: Color = Color.Unspecified,
+  controlActivatedInverse: Color = Color.Unspecified,
   controlError: Color = Color.Unspecified,
   loadingBar: Color = Color.Unspecified,
   loadingBarBackground: Color = Color.Unspecified,
@@ -334,6 +336,13 @@ public class MisticaColors(
   public var controlActivated: Color by mutableStateOf(controlActivated, structuralEqualityPolicy())
     internal set
 
+  public var controlInverse: Color by mutableStateOf(controlInverse, structuralEqualityPolicy())
+    internal set
+
+  public var controlActivatedInverse: Color by mutableStateOf(controlActivatedInverse,
+      structuralEqualityPolicy())
+    internal set
+
   public var controlError: Color by mutableStateOf(controlError, structuralEqualityPolicy())
     internal set
 
@@ -588,6 +597,8 @@ public class MisticaColors(
     textLinkSnackbar: Color = this.textLinkSnackbar,
     control: Color = this.control,
     controlActivated: Color = this.controlActivated,
+    controlInverse: Color = this.controlInverse,
+    controlActivatedInverse: Color = this.controlActivatedInverse,
     controlError: Color = this.controlError,
     loadingBar: Color = this.loadingBar,
     loadingBarBackground: Color = this.loadingBarBackground,
@@ -681,7 +692,8 @@ public class MisticaColors(
       textButtonSecondaryInverse, textButtonSecondaryInverseSelected =
       textButtonSecondaryInverseSelected, textLink = textLink, textLinkInverse = textLinkInverse,
       textLinkDanger = textLinkDanger, textLinkSnackbar = textLinkSnackbar, control = control,
-      controlActivated = controlActivated, controlError = controlError, loadingBar = loadingBar,
+      controlActivated = controlActivated, controlInverse = controlInverse, controlActivatedInverse
+      = controlActivatedInverse, controlError = controlError, loadingBar = loadingBar,
       loadingBarBackground = loadingBarBackground, toggleAndroidInactive = toggleAndroidInactive,
       toggleAndroidBackgroundActive = toggleAndroidBackgroundActive, iosControlKnob =
       iosControlKnob, divider = divider, dividerInverse = dividerInverse, navigationBarDivider =
@@ -764,6 +776,8 @@ public class MisticaColors(
     textLinkSnackbar = other.textLinkSnackbar
     control = other.control
     controlActivated = other.controlActivated
+    controlInverse = other.controlInverse
+    controlActivatedInverse = other.controlActivatedInverse
     controlError = other.controlError
     loadingBar = other.loadingBar
     loadingBarBackground = other.loadingBarBackground
diff --git a/library/src/main/res/values-night/themes_blau_autogenerated.xml b/library/src/main/res/values-night/themes_blau_autogenerated.xml
index e41902aa3..2a6eab79e 100644
--- a/library/src/main/res/values-night/themes_blau_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_blau_autogenerated.xml
@@ -58,6 +58,8 @@
 		<item name="colorTextLinkSnackbar">@color/blau_color_blauPurple30</item>
 		<item name="colorControl">@color/blau_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/blau_color_blauBlueSecondary</item>
+		<item name="colorControlInverse">@color/blau_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/blau_color_blauBlueSecondary</item>
 		<item name="colorControlError">@color/blau_color_blauRed</item>
 		<item name="colorLoadingBar">@color/blau_color_blauBluePrimary</item>
 		<item name="colorLoadingBarBackground">@color/blau_color_darkModeGrey</item>
diff --git a/library/src/main/res/values-night/themes_movistar_autogenerated.xml b/library/src/main/res/values-night/themes_movistar_autogenerated.xml
index 4fc66431b..87f565ec3 100644
--- a/library/src/main/res/values-night/themes_movistar_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_movistar_autogenerated.xml
@@ -58,6 +58,8 @@
 		<item name="colorTextLinkSnackbar">@color/movistar_color_movistarBlue30</item>
 		<item name="colorControl">@color/movistar_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/movistar_color_movistarBlue</item>
+		<item name="colorControlInverse">@color/movistar_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/movistar_color_movistarBlue</item>
 		<item name="colorControlError">@color/movistar_color_pepper</item>
 		<item name="colorLoadingBar">@color/movistar_color_movistarBlue</item>
 		<item name="colorLoadingBarBackground">@color/movistar_color_darkModeGrey6</item>
diff --git a/library/src/main/res/values-night/themes_o2_autogenerated.xml b/library/src/main/res/values-night/themes_o2_autogenerated.xml
index 2f2c10669..e809cb880 100644
--- a/library/src/main/res/values-night/themes_o2_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_o2_autogenerated.xml
@@ -58,6 +58,8 @@
 		<item name="colorTextLinkSnackbar">@color/o2_color_o2BluePrimary30</item>
 		<item name="colorControl">@color/o2_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/o2_color_o2BluePrimary30</item>
+		<item name="colorControlInverse">@color/o2_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/o2_color_o2BluePrimary30</item>
 		<item name="colorControlError">@color/o2_color_pepper</item>
 		<item name="colorLoadingBar">@color/o2_color_darkModeO2BluePrimary</item>
 		<item name="colorLoadingBarBackground">@color/o2_color_darkModeGrey6</item>
diff --git a/library/src/main/res/values-night/themes_telefonica_autogenerated.xml b/library/src/main/res/values-night/themes_telefonica_autogenerated.xml
index bc79b8017..466b0a956 100644
--- a/library/src/main/res/values-night/themes_telefonica_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_telefonica_autogenerated.xml
@@ -58,6 +58,8 @@
 		<item name="colorTextLinkSnackbar">@color/telefonica_color_telefonicaBlue30</item>
 		<item name="colorControl">@color/telefonica_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/telefonica_color_telefonicaBlue</item>
+		<item name="colorControlInverse">@color/telefonica_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/telefonica_color_telefonicaBlue</item>
 		<item name="colorControlError">@color/telefonica_color_coral</item>
 		<item name="colorLoadingBar">@color/telefonica_color_telefonicaBlue</item>
 		<item name="colorLoadingBarBackground">@color/telefonica_color_grey6</item>
diff --git a/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml b/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml
index d12fccff3..9e170e277 100644
--- a/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml
@@ -58,6 +58,117 @@
 		<item name="colorTextLinkSnackbar">@color/vivoNew_color_vivoPurpleLight50</item>
 		<item name="colorControl">@color/vivoNew_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorControlInverse">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorControlError">@color/vivoNew_color_pepper</item>
+		<item name="colorLoadingBar">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorLoadingBarBackground">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorToggleAndroidInactive">@color/vivoNew_color_grey4</item>
+		<item name="colorToggleAndroidBackgroundActive">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorIosControlKnob">@color/vivoNew_color_grey2</item>
+		<item name="colorDivider">@color/vivoNew_color_white_5_alpha</item>
+		<item name="colorDividerInverse">@color/vivoNew_color_white_5_alpha</item>
+		<item name="colorNavigationBarDivider">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBadge">@color/vivoNew_color_pepperDark</item>
+		<item name="colorFeedbackErrorBackground">@color/vivoNew_color_pepper</item>
+		<item name="colorFeedbackInfoBackground">@color/vivoNew_color_grey6</item>
+		<item name="colorBrand">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorBrandHigh">@color/vivoNew_color_white_5_alpha</item>
+		<item name="colorInverse">@color/vivoNew_color_grey2</item>
+		<item name="colorNeutralHigh">@color/vivoNew_color_grey2</item>
+		<item name="colorNeutralMedium">@color/vivoNew_color_grey5</item>
+		<item name="colorNeutralMediumInverse">@color/vivoNew_color_grey5</item>
+		<item name="colorNeutralLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorNeutralLowAlternative">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorTextPrimary">@color/vivoNew_color_grey2</item>
+		<item name="colorTextPrimaryInverse">@color/vivoNew_color_grey2</item>
+		<item name="colorTextSecondary">@color/vivoNew_color_grey4</item>
+		<item name="colorTextSecondaryInverse">@color/vivoNew_color_grey4</item>
+		<item name="colorSuccess">@color/vivoNew_color_vivoGreen</item>
+		<item name="colorWarning">@color/vivoNew_color_orange</item>
+		<item name="colorError">@color/vivoNew_color_pepper</item>
+		<item name="colorPromo">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorHighlight">@color/vivoNew_color_pink</item>
+		<item name="colorSuccessLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorWarningLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorErrorLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorPromoLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorBrandLow">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorSuccessHigh">@color/vivoNew_color_vivoGreenLight30</item>
+		<item name="colorWarningHigh">@color/vivoNew_color_orangeLight40</item>
+		<item name="colorErrorHigh">@color/vivoNew_color_pepperLight40</item>
+		<item name="colorPromoHigh">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorSuccessHighInverse">@color/vivoNew_color_vivoGreenDark</item>
+		<item name="colorWarningHighInverse">@color/vivoNew_color_orangeDark</item>
+		<item name="colorErrorHighInverse">@color/vivoNew_color_pepperDark80</item>
+		<item name="colorPromoHighInverse">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextNavigationBarPrimary">@color/vivoNew_color_grey2</item>
+		<item name="colorTextNavigationBarSecondary">@color/vivoNew_color_grey4</item>
+		<item name="colorTextNavigationSearchBarHint">@color/vivoNew_color_grey4</item>
+		<item name="colorTextNavigationSearchBarText">@color/vivoNew_color_grey2</item>
+		<item name="colorTextAppBar">@color/vivoNew_color_grey5</item>
+		<item name="colorTextAppBarSelected">@color/vivoNew_color_grey2</item>
+		<item name="colorCustomTabsBackground">@color/vivoNew_color_darkModeBlack</item>
+	</style>
+	<style name="VivoNewOverride" parent="VivoNewOverride_Customizations">
+		<item name="colorBackground">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBackgroundAlternative">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBackgroundBrand">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBackgroundBrandSecondary">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBackgroundContainer">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorBackgroundContainerHover">@color/vivoNew_color_white_3_alpha</item>
+		<item name="colorBackgroundContainerPressed">@color/vivoNew_color_white_5_alpha</item>
+		<item name="colorBackgroundContainerBrand">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorBackgroundContainerBrandHover">@color/vivoNew_color_white_3_alpha</item>
+		<item name="colorBackgroundContainerBrandPressed">@color/vivoNew_color_white_5_alpha</item>
+		<item name="colorBackgroundContainerBrandOverInverse">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorBackgroundContainerAlternative">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorBackgroundOverlay">@color/vivoNew_color_darkModeGrey_80_alpha</item>
+		<item name="colorBackgroundSkeleton">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorBackgroundSkeletonInverse">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorBackgroundFeedbackBottom">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorAppBarBackground">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorNavigationBarBackground">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorSkeletonWave">@color/vivoNew_color_grey5</item>
+		<item name="colorBorderLow">@color/vivoNew_color_darkModeBlack</item>
+		<item name="colorBorder">@color/vivoNew_color_darkModeGrey</item>
+		<item name="colorBorderHigh">@color/vivoNew_color_grey5</item>
+		<item name="colorBorderSelected">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorCoverBackgroundHover">@color/vivoNew_color_darkModeBlack_25_alpha</item>
+		<item name="colorCoverBackgroundPressed">@color/vivoNew_color_darkModeBlack_35_alpha</item>
+		<item name="colorButtonDangerBackground">@color/vivoNew_color_pepper</item>
+		<item name="colorButtonDangerBackgroundSelected">@color/vivoNew_color_pepperDark</item>
+		<item name="colorButtonDangerBackgroundHover">@color/vivoNew_color_pepperDark</item>
+		<item name="colorButtonLinkBackgroundSelected">@color/vivoNew_color_white_8_alpha</item>
+		<item name="colorButtonLinkBackgroundInverseSelected">@color/vivoNew_color_white_8_alpha</item>
+		<item name="colorButtonPrimaryBackground">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorButtonPrimaryBackgroundInverse">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorButtonPrimaryBackgroundSelected">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonPrimaryBackgroundHover">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonPrimaryBackgroundInverseSelected">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonSecondaryBackgroundHover">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorButtonSecondaryBackgroundSelected">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorButtonSecondaryBorder">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBorderSelected">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBorderInverse">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBorderInverseSelected">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBackgroundInverseHover">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorButtonSecondaryBackgroundInverseSelected">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorTextButtonPrimary">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonPrimaryInverse">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonPrimaryInverseSelected">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonSecondary">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonSecondarySelected">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonSecondaryInverse">@color/vivoNew_color_grey2</item>
+		<item name="colorTextButtonSecondaryInverseSelected">@color/vivoNew_color_grey2</item>
+		<item name="colorTextLink">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorTextLinkInverse">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorTextLinkDanger">@color/vivoNew_color_pepper</item>
+		<item name="colorTextLinkSnackbar">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorControl">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorControlActive">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorControlInverse">@color/vivoNew_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/vivoNew_color_vivoPurpleLight80</item>
 		<item name="colorControlError">@color/vivoNew_color_pepper</item>
 		<item name="colorLoadingBar">@color/vivoNew_color_vivoPurpleLight80</item>
 		<item name="colorLoadingBarBackground">@color/vivoNew_color_darkModeGrey6</item>
diff --git a/library/src/main/res/values-night/themes_vivo_autogenerated.xml b/library/src/main/res/values-night/themes_vivo_autogenerated.xml
index 28dc605cb..002fcfac5 100644
--- a/library/src/main/res/values-night/themes_vivo_autogenerated.xml
+++ b/library/src/main/res/values-night/themes_vivo_autogenerated.xml
@@ -58,6 +58,8 @@
 		<item name="colorTextLinkSnackbar">@color/vivo_color_vivoPurpleLight50</item>
 		<item name="colorControl">@color/vivo_color_darkModeGrey6</item>
 		<item name="colorControlActive">@color/vivo_color_vivoPurpleLight80</item>
+		<item name="colorControlInverse">@color/vivo_color_darkModeGrey6</item>
+		<item name="colorControlActivatedInverse">@color/vivo_color_vivoPurpleLight80</item>
 		<item name="colorControlError">@color/vivo_color_pepper</item>
 		<item name="colorLoadingBar">@color/vivo_color_vivoPurpleLight80</item>
 		<item name="colorLoadingBarBackground">@color/vivo_color_darkModeGrey6</item>
diff --git a/library/src/main/res/values/attrs_autogenerated.xml b/library/src/main/res/values/attrs_autogenerated.xml
index eafb10b33..075bcafb5 100644
--- a/library/src/main/res/values/attrs_autogenerated.xml
+++ b/library/src/main/res/values/attrs_autogenerated.xml
@@ -59,6 +59,8 @@
 		<attr name="colorControl" format="color|reference"/>
 		<!-- We cannot use colorControlActivated in Android because it overlaps with a framework attribute -->
 		<attr name="colorControlActive" format="color|reference"/>
+		<attr name="colorControlInverse" format="color|reference"/>
+		<attr name="colorControlActivatedInverse" format="color|reference"/>
 		<attr name="colorControlError" format="color|reference"/>
 		<attr name="colorLoadingBar" format="color|reference"/>
 		<attr name="colorLoadingBarBackground" format="color|reference"/>
diff --git a/library/src/main/res/values/themes_blau_autogenerated.xml b/library/src/main/res/values/themes_blau_autogenerated.xml
index b8dedfb72..aa0b05fab 100644
--- a/library/src/main/res/values/themes_blau_autogenerated.xml
+++ b/library/src/main/res/values/themes_blau_autogenerated.xml
@@ -59,6 +59,8 @@
 		<item name="colorTextLinkSnackbar">@color/blau_color_blauPurple30</item>
 		<item name="colorControl">@color/blau_color_grey2</item>
 		<item name="colorControlActive">@color/blau_color_blauBlueSecondary</item>
+		<item name="colorControlInverse">@color/blau_color_white</item>
+		<item name="colorControlActivatedInverse">@color/blau_color_white</item>
 		<item name="colorControlError">@color/blau_color_blauRed</item>
 		<item name="colorLoadingBar">@color/blau_color_blauBlueSecondary</item>
 		<item name="colorLoadingBarBackground">@color/blau_color_blauBlueSecondary10</item>
diff --git a/library/src/main/res/values/themes_movistar_autogenerated.xml b/library/src/main/res/values/themes_movistar_autogenerated.xml
index 676476a09..b1038c760 100644
--- a/library/src/main/res/values/themes_movistar_autogenerated.xml
+++ b/library/src/main/res/values/themes_movistar_autogenerated.xml
@@ -59,6 +59,8 @@
 		<item name="colorTextLinkSnackbar">@color/movistar_color_movistarBlue30</item>
 		<item name="colorControl">@color/movistar_color_grey3</item>
 		<item name="colorControlActive">@color/movistar_color_movistarBlue</item>
+		<item name="colorControlInverse">@color/movistar_color_white</item>
+		<item name="colorControlActivatedInverse">@color/movistar_color_white</item>
 		<item name="colorControlError">@color/movistar_color_pepper</item>
 		<item name="colorLoadingBar">@color/movistar_color_movistarBlue30</item>
 		<item name="colorLoadingBarBackground">@color/movistar_color_movistarBlue55</item>
diff --git a/library/src/main/res/values/themes_o2_autogenerated.xml b/library/src/main/res/values/themes_o2_autogenerated.xml
index 25ced558b..8f0eeb00b 100644
--- a/library/src/main/res/values/themes_o2_autogenerated.xml
+++ b/library/src/main/res/values/themes_o2_autogenerated.xml
@@ -59,6 +59,8 @@
 		<item name="colorTextLinkSnackbar">@color/o2_color_o2BluePrimary30</item>
 		<item name="colorControl">@color/o2_color_grey3</item>
 		<item name="colorControlActive">@color/o2_color_o2BluePrimary</item>
+		<item name="colorControlInverse">@color/o2_color_white</item>
+		<item name="colorControlActivatedInverse">@color/o2_color_white</item>
 		<item name="colorControlError">@color/o2_color_pepper</item>
 		<item name="colorLoadingBar">@color/o2_color_o2BluePrimary</item>
 		<item name="colorLoadingBarBackground">@color/o2_color_grey1</item>
diff --git a/library/src/main/res/values/themes_telefonica_autogenerated.xml b/library/src/main/res/values/themes_telefonica_autogenerated.xml
index 0b5e9c371..b0168cfce 100644
--- a/library/src/main/res/values/themes_telefonica_autogenerated.xml
+++ b/library/src/main/res/values/themes_telefonica_autogenerated.xml
@@ -59,6 +59,8 @@
 		<item name="colorTextLinkSnackbar">@color/telefonica_color_telefonicaBlue30</item>
 		<item name="colorControl">@color/telefonica_color_grey3</item>
 		<item name="colorControlActive">@color/telefonica_color_telefonicaBlue</item>
+		<item name="colorControlInverse">@color/telefonica_color_white</item>
+		<item name="colorControlActivatedInverse">@color/telefonica_color_white</item>
 		<item name="colorControlError">@color/telefonica_color_coral</item>
 		<item name="colorLoadingBar">@color/telefonica_color_telefonicaBlue30</item>
 		<item name="colorLoadingBarBackground">@color/telefonica_color_telefonicaBlue70</item>
diff --git a/library/src/main/res/values/themes_vivoNew.xml b/library/src/main/res/values/themes_vivoNew.xml
index b73dee991..4f2385bbd 100644
--- a/library/src/main/res/values/themes_vivoNew.xml
+++ b/library/src/main/res/values/themes_vivoNew.xml
@@ -29,4 +29,33 @@
 		<item name="titleStyle">title1</item>
 	</style>
 
+	<!-- Just a copy of the above. As themes do no support multiple inheritance -->
+	<style name="VivoNewOverride_Customizations" parent="VivoNewOverride_Base">
+		<!-- Gradients (assistant, pin fingerprint screens) -->
+		<item name="colorGradientBackgroundFirst">?colorBackgroundBrand</item>
+		<item name="colorGradientBackgroundSecond">?colorBackgroundBrand</item>
+		<item name="colorGradientBackgroundThird">?colorBackgroundBrand</item>
+		<item name="colorGradientBackgroundFourth">?colorBackgroundBrand</item>
+		<item name="colorLoginLoadingGradientFirst">?colorBackgroundBrand</item>
+		<item name="colorLoginLoadingGradientSecond">?colorBackgroundBrand</item>
+		<item name="colorLoginLoadingGradientThird">?colorBackgroundBrand</item>
+		<item name="colorLoginLoadingGradientFourth">?colorBackgroundBrand</item>
+
+		<!-- Feedbacks -->
+		<item name="feedbackScreenSuccessWithGradient">false</item>
+		<item name="feedbackScreenSuccessInverse">true</item>
+		<item name="feedbackScreenSuccessAnimation">@raw/feedback_success_vivo_new</item>
+		<item name="feedbackScreenErrorAnimation">@raw/feedback_error</item>
+		<item name="feedbackScreenInfoIcon">@drawable/feedback_info</item>
+
+		<!-- Stepper -->
+		<item name="stepperFinishedStepAnimation">@raw/feedback_success</item>
+
+		<!-- Compose -->
+		<item name="composeBrand">vivoNew</item>
+
+		<!-- Title -->
+		<item name="titleStyle">title1</item>
+	</style>
+
 </resources>
diff --git a/library/src/main/res/values/themes_vivoNew_autogenerated.xml b/library/src/main/res/values/themes_vivoNew_autogenerated.xml
index df309cb14..44f2c21f3 100644
--- a/library/src/main/res/values/themes_vivoNew_autogenerated.xml
+++ b/library/src/main/res/values/themes_vivoNew_autogenerated.xml
@@ -59,6 +59,162 @@
 		<item name="colorTextLinkSnackbar">@color/vivoNew_color_vivoPurpleLight20</item>
 		<item name="colorControl">@color/vivoNew_color_grey3</item>
 		<item name="colorControlActive">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorControlInverse">@color/vivoNew_color_white</item>
+		<item name="colorControlActivatedInverse">@color/vivoNew_color_white</item>
+		<item name="colorControlError">@color/vivoNew_color_pepper</item>
+		<item name="colorLoadingBar">@color/vivoNew_color_pink</item>
+		<item name="colorLoadingBarBackground">@color/vivoNew_color_pepperLight30</item>
+		<item name="colorToggleAndroidInactive">@color/vivoNew_color_grey2</item>
+		<item name="colorToggleAndroidBackgroundActive">@color/vivoNew_color_vivoPurpleLight20</item>
+		<item name="colorIosControlKnob">@color/vivoNew_color_white</item>
+		<item name="colorDivider">@color/vivoNew_color_grey2</item>
+		<item name="colorDividerInverse">@color/vivoNew_color_white_20_alpha</item>
+		<item name="colorNavigationBarDivider">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorBadge">@color/vivoNew_color_pepperDark</item>
+		<item name="colorFeedbackErrorBackground">@color/vivoNew_color_pepper</item>
+		<item name="colorFeedbackInfoBackground">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorBrand">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorBrandHigh">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorInverse">@color/vivoNew_color_white</item>
+		<item name="colorNeutralHigh">@color/vivoNew_color_grey6</item>
+		<item name="colorNeutralMedium">@color/vivoNew_color_grey5</item>
+		<item name="colorNeutralMediumInverse">@color/vivoNew_color_grey5</item>
+		<item name="colorNeutralLow">@color/vivoNew_color_grey1</item>
+		<item name="colorNeutralLowAlternative">@color/vivoNew_color_grey2</item>
+		<item name="colorTextPrimary">@color/vivoNew_color_grey6</item>
+		<item name="colorTextPrimaryInverse">@color/vivoNew_color_white</item>
+		<item name="colorTextSecondary">@color/vivoNew_color_grey5</item>
+		<item name="colorTextSecondaryInverse">@color/vivoNew_color_vivoPurpleLight20</item>
+		<item name="colorSuccess">@color/vivoNew_color_vivoGreen</item>
+		<item name="colorWarning">@color/vivoNew_color_orange</item>
+		<item name="colorError">@color/vivoNew_color_pepper</item>
+		<item name="colorPromo">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorHighlight">@color/vivoNew_color_pink</item>
+		<item name="colorSuccessLow">@color/vivoNew_color_vivoGreenLight10</item>
+		<item name="colorWarningLow">@color/vivoNew_color_orangeLight10</item>
+		<item name="colorErrorLow">@color/vivoNew_color_pepperLight10</item>
+		<item name="colorPromoLow">@color/vivoNew_color_vivoPurpleLight10</item>
+		<item name="colorBrandLow">@color/vivoNew_color_vivoPurpleLight10</item>
+		<item name="colorSuccessHigh">@color/vivoNew_color_vivoGreenDark</item>
+		<item name="colorWarningHigh">@color/vivoNew_color_orangeDark</item>
+		<item name="colorErrorHigh">@color/vivoNew_color_pepperDark80</item>
+		<item name="colorPromoHigh">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorSuccessHighInverse">@color/vivoNew_color_vivoGreenDark</item>
+		<item name="colorWarningHighInverse">@color/vivoNew_color_orangeDark</item>
+		<item name="colorErrorHighInverse">@color/vivoNew_color_pepperDark80</item>
+		<item name="colorPromoHighInverse">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextNavigationBarPrimary">@color/vivoNew_color_white</item>
+		<item name="colorTextNavigationBarSecondary">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorTextNavigationSearchBarHint">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorTextNavigationSearchBarText">@color/vivoNew_color_white</item>
+		<item name="colorTextAppBar">@color/vivoNew_color_grey4</item>
+		<item name="colorTextAppBarSelected">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorCustomTabsBackground">@color/vivoNew_color_vivoPurple</item>
+		<!-- Border radius -->
+		<item name="avatarBorderRadius">50%</item>
+		<item name="barBorderRadius">999dp</item>
+		<item name="buttonBorderRadius">999dp</item>
+		<item name="checkboxBorderRadius">2dp</item>
+		<item name="containerBorderRadius">16dp</item>
+		<item name="indicatorBorderRadius">999dp</item>
+		<item name="inputBorderRadius">12dp</item>
+		<item name="legacyDisplayBorderRadius">16dp</item>
+		<item name="popupBorderRadius">8dp</item>
+		<item name="sheetBorderRadius">16dp</item>
+		<!-- Preset fonts -->
+		<item name="cardTitleFont">?font_family_regular</item>
+		<item name="buttonFont">?font_family_regular</item>
+		<item name="tabsLabelFont">?font_family_regular</item>
+		<item name="linkFont">?font_family_regular</item>
+		<item name="title1Font">?font_family_regular</item>
+		<item name="title2Font">?font_family_regular</item>
+		<item name="indicatorFont">?font_family_regular</item>
+		<item name="navigationBarFont">?font_family_regular</item>
+		<item name="text5Font">?font_family_regular</item>
+		<item name="text6Font">?font_family_regular</item>
+		<item name="text7Font">?font_family_regular</item>
+		<item name="text8Font">?font_family_regular</item>
+		<item name="text9Font">?font_family_regular</item>
+		<item name="text10Font">?font_family_regular</item>
+		<!-- Preset styles -->
+		<item name="cardTitleTextStyle">normal</item>
+		<item name="buttonTextStyle">normal</item>
+		<item name="tabsLabelTextStyle">normal</item>
+		<item name="linkTextStyle">normal</item>
+		<item name="title1TextStyle">normal</item>
+		<item name="title2TextStyle">normal</item>
+		<item name="indicatorTextStyle">normal</item>
+		<item name="navigationBarTextStyle">normal</item>
+		<item name="text5TextStyle">normal</item>
+		<item name="text6TextStyle">normal</item>
+		<item name="text7TextStyle">normal</item>
+		<item name="text8TextStyle">normal</item>
+		<item name="text9TextStyle">normal</item>
+		<item name="text10TextStyle">normal</item>
+		<!-- Preset sizes -->
+		<item name="tabsLabelTextSize">18sp</item>
+		<item name="title2TextSize">18sp</item>
+	</style>
+	<style name="VivoNewOverride" parent="VivoNewOverride_Customizations"/>
+	<style name="VivoNewOverride_Base">
+		<item name="colorBackground">@color/vivoNew_color_white</item>
+		<item name="colorBackgroundAlternative">@color/vivoNew_color_grey1</item>
+		<item name="colorBackgroundBrand">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorBackgroundBrandSecondary">@color/vivoNew_color_vivoPurpleLight80</item>
+		<item name="colorBackgroundContainer">@color/vivoNew_color_white</item>
+		<item name="colorBackgroundContainerHover">@color/vivoNew_color_darkModeBlack_3_alpha</item>
+		<item name="colorBackgroundContainerPressed">@color/vivoNew_color_darkModeBlack_5_alpha</item>
+		<item name="colorBackgroundContainerBrand">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorBackgroundContainerBrandHover">@color/vivoNew_color_darkModeBlack_20_alpha</item>
+		<item name="colorBackgroundContainerBrandPressed">@color/vivoNew_color_darkModeBlack_40_alpha</item>
+		<item name="colorBackgroundContainerBrandOverInverse">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorBackgroundContainerAlternative">@color/vivoNew_color_grey1</item>
+		<item name="colorBackgroundOverlay">@color/vivoNew_color_grey6_60_alpha</item>
+		<item name="colorBackgroundSkeleton">@color/vivoNew_color_grey2</item>
+		<item name="colorBackgroundSkeletonInverse">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorBackgroundFeedbackBottom">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorAppBarBackground">@color/vivoNew_color_white</item>
+		<item name="colorNavigationBarBackground">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorSkeletonWave">@color/vivoNew_color_grey2</item>
+		<item name="colorBorderLow">@color/vivoNew_color_grey1</item>
+		<item name="colorBorder">@color/vivoNew_color_grey3</item>
+		<item name="colorBorderHigh">@color/vivoNew_color_grey5</item>
+		<item name="colorBorderSelected">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorCoverBackgroundHover">@color/vivoNew_color_darkModeBlack_25_alpha</item>
+		<item name="colorCoverBackgroundPressed">@color/vivoNew_color_darkModeBlack_35_alpha</item>
+		<item name="colorButtonDangerBackground">@color/vivoNew_color_pepper</item>
+		<item name="colorButtonDangerBackgroundSelected">@color/vivoNew_color_pepperDark</item>
+		<item name="colorButtonDangerBackgroundHover">@color/vivoNew_color_pepperDark</item>
+		<item name="colorButtonLinkBackgroundSelected">@color/vivoNew_color_vivoPurpleLight10</item>
+		<item name="colorButtonLinkBackgroundInverseSelected">@color/vivoNew_color_white_10_alpha</item>
+		<item name="colorButtonPrimaryBackground">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorButtonPrimaryBackgroundInverse">@color/vivoNew_color_white</item>
+		<item name="colorButtonPrimaryBackgroundSelected">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonPrimaryBackgroundHover">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonPrimaryBackgroundInverseSelected">@color/vivoNew_color_vivoPurpleLight50</item>
+		<item name="colorButtonSecondaryBorder">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorButtonSecondaryBorderSelected">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorButtonSecondaryBackgroundHover">@color/vivoNew_color_vivoPurpleLight10</item>
+		<item name="colorButtonSecondaryBackgroundSelected">@color/vivoNew_color_vivoPurpleLight10</item>
+		<item name="colorButtonSecondaryBorderInverse">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBorderInverseSelected">@color/vivoNew_color_white</item>
+		<item name="colorButtonSecondaryBackgroundInverseHover">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorButtonSecondaryBackgroundInverseSelected">@color/vivoNew_color_white_15_alpha</item>
+		<item name="colorTextButtonPrimary">@color/vivoNew_color_white</item>
+		<item name="colorTextButtonPrimaryInverse">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextButtonPrimaryInverseSelected">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextButtonSecondary">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextButtonSecondarySelected">@color/vivoNew_color_vivoPurpleDark</item>
+		<item name="colorTextButtonSecondaryInverse">@color/vivoNew_color_white</item>
+		<item name="colorTextButtonSecondaryInverseSelected">@color/vivoNew_color_white</item>
+		<item name="colorTextLink">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorTextLinkInverse">@color/vivoNew_color_white</item>
+		<item name="colorTextLinkDanger">@color/vivoNew_color_pepper</item>
+		<item name="colorTextLinkSnackbar">@color/vivoNew_color_vivoPurpleLight20</item>
+		<item name="colorControl">@color/vivoNew_color_grey3</item>
+		<item name="colorControlActive">@color/vivoNew_color_vivoPurple</item>
+		<item name="colorControlInverse">@color/vivoNew_color_white</item>
+		<item name="colorControlActivatedInverse">@color/vivoNew_color_white</item>
 		<item name="colorControlError">@color/vivoNew_color_pepper</item>
 		<item name="colorLoadingBar">@color/vivoNew_color_pink</item>
 		<item name="colorLoadingBarBackground">@color/vivoNew_color_pepperLight30</item>
diff --git a/library/src/main/res/values/themes_vivo_autogenerated.xml b/library/src/main/res/values/themes_vivo_autogenerated.xml
index 73a10d2d8..61c4f2f49 100644
--- a/library/src/main/res/values/themes_vivo_autogenerated.xml
+++ b/library/src/main/res/values/themes_vivo_autogenerated.xml
@@ -59,6 +59,8 @@
 		<item name="colorTextLinkSnackbar">@color/vivo_color_vivoPurpleLight50</item>
 		<item name="colorControl">@color/vivo_color_grey3</item>
 		<item name="colorControlActive">@color/vivo_color_vivoPurple</item>
+		<item name="colorControlInverse">@color/vivo_color_white</item>
+		<item name="colorControlActivatedInverse">@color/vivo_color_white</item>
 		<item name="colorControlError">@color/vivo_color_pepper</item>
 		<item name="colorLoadingBar">@color/vivo_color_pink</item>
 		<item name="colorLoadingBarBackground">@color/vivo_color_pepperLight30</item>
diff --git a/tokens/src/main/java/com/telefonica/mistica/tokens/Brand.kt b/tokens/src/main/java/com/telefonica/mistica/tokens/Brand.kt
index 7f1281b23..ea16557d2 100644
--- a/tokens/src/main/java/com/telefonica/mistica/tokens/Brand.kt
+++ b/tokens/src/main/java/com/telefonica/mistica/tokens/Brand.kt
@@ -3,4 +3,5 @@ package com.telefonica.mistica.tokens
 data class Brand(
     val name: String,
     val file: String,
+    val createDuplicateWithoutInheritMistica: Boolean = false
 )
diff --git a/tokens/src/main/java/com/telefonica/mistica/tokens/TokensGenerator.kt b/tokens/src/main/java/com/telefonica/mistica/tokens/TokensGenerator.kt
index c31ce9852..5b5b036fe 100644
--- a/tokens/src/main/java/com/telefonica/mistica/tokens/TokensGenerator.kt
+++ b/tokens/src/main/java/com/telefonica/mistica/tokens/TokensGenerator.kt
@@ -29,8 +29,9 @@ class TokensGenerator(
             Brand("o2", "o2"),
             Brand("telefonica", "telefonica"),
             Brand("vivo", "vivo"),
-            Brand("vivoNew", "vivo-new")
+            Brand("vivoNew", "vivo-new", createDuplicateWithoutInheritMistica = true),
         )
+
         val ALPHA_REGEX = "0\\.\\d{1,2}".toRegex()
         const val AUTOGENERATED_COMMENT = "Code generated automatically, DO NOT EDIT manually. Use Import design tokens GitHub Action."
         const val MISTICA_TOKENS_DIR = "../temp/mistica-design/tokens"
diff --git a/tokens/src/main/java/com/telefonica/mistica/tokens/xml/GenerateXMLFiles.kt b/tokens/src/main/java/com/telefonica/mistica/tokens/xml/GenerateXMLFiles.kt
index 792849fd6..ebd386b12 100644
--- a/tokens/src/main/java/com/telefonica/mistica/tokens/xml/GenerateXMLFiles.kt
+++ b/tokens/src/main/java/com/telefonica/mistica/tokens/xml/GenerateXMLFiles.kt
@@ -1,6 +1,7 @@
 package com.telefonica.mistica.tokens.xml
 
 import com.squareup.moshi.JsonAdapter
+import com.telefonica.mistica.tokens.Brand
 import com.telefonica.mistica.tokens.TokensGenerator.Companion.ALPHA_REGEX
 import com.telefonica.mistica.tokens.TokensGenerator.Companion.AUTOGENERATED_COMMENT
 import com.telefonica.mistica.tokens.TokensGenerator.Companion.BOLD
@@ -40,20 +41,20 @@ class GenerateXMLFiles(
             if (tokens == null) {
                 throw Exception("Invalid JSON")
             } else {
-                generateColorsFiles(tokens, brand.name)
-                generateLightThemesFiles(tokens, brand.name)
-                generateDarkThemesFiles(tokens, brand.name)
+                generateColorsFiles(tokens, brand)
+                generateLightThemesFiles(tokens, brand)
+                generateDarkThemesFiles(tokens, brand)
             }
         }
     }
 
-    private fun generateColorsFiles(tokens: TokensDTO, brandName: String) {
-        val colorsWithAlpha = getColorsWithAlpha(tokens, brandName)
+    private fun generateColorsFiles(tokens: TokensDTO, brand: Brand) {
+        val colorsWithAlpha = getColorsWithAlpha(tokens, brand.name)
         val colorsXml = xml("resources", "utf-8", XmlVersion.V10) {
             comment(AUTOGENERATED_COMMENT)
 
             tokens.global.palette.forEach { color ->
-                val colorName = "${brandName}_color_${color.key}"
+                val colorName = "${brand.name}_color_${color.key}"
 
                 "color" {
                     attribute("name", colorName)
@@ -69,22 +70,20 @@ class GenerateXMLFiles(
             }
         }
 
-        File("$VALUES_DIR/${COLORS_FILE.format(brandName)}").writeText(colorsXml.toString(PrintOptions(singleLineTextElements = true)))
+        File("$VALUES_DIR/${COLORS_FILE.format(brand.name)}").writeText(colorsXml.toString(PrintOptions(singleLineTextElements = true)))
     }
 
-    private fun generateLightThemesFiles(tokens: TokensDTO, brandName: String) {
-        val lightThemesXml = xml("resources", "utf-8", XmlVersion.V10) {
-            comment(AUTOGENERATED_COMMENT)
+    private fun generateLightThemesFiles(tokens: TokensDTO, brand: Brand) {
 
+        fun Node.generateTheme(themeName: String) {
             "style" {
-                attribute("name", "MisticaTheme.${brandName.capitalizeString()}")
-                attribute("parent", "MisticaTheme.${brandName.capitalizeString()}_Customizations")
+                attribute("name", themeName)
+                attribute("parent", "${themeName}_Customizations")
             }
 
             "style" {
-                attribute("name", "MisticaTheme.${brandName.capitalizeString()}_Base")
-
-                mapColors(tokens.light, brandName)
+                attribute("name", "${themeName}_Base")
+                mapColors(tokens.light, brand)
                 borderRadius(tokens)
                 presetFonts(tokens)
                 presetStyles(tokens)
@@ -92,7 +91,19 @@ class GenerateXMLFiles(
             }
         }
 
-        File("$VALUES_DIR/${THEMES_FILE.format(brandName)}").writeText(lightThemesXml.toString(PrintOptions(singleLineTextElements = true)))
+        val lightThemesXml = xml("resources", "utf-8", XmlVersion.V10) {
+            comment(AUTOGENERATED_COMMENT)
+
+            val brandName = brand.name.capitalizeString()
+
+            generateTheme("MisticaTheme.$brandName")
+
+            if (brand.createDuplicateWithoutInheritMistica) {
+                generateTheme("${brandName}Override")
+            }
+        }
+
+        File("$VALUES_DIR/${THEMES_FILE.format(brand.name)}").writeText(lightThemesXml.toString(PrintOptions(singleLineTextElements = true)))
     }
 
     private fun Node.borderRadius(tokens: TokensDTO) {
@@ -153,22 +164,32 @@ class GenerateXMLFiles(
         }
     }
 
-    private fun generateDarkThemesFiles(tokens: TokensDTO, brandName: String) {
+    private fun generateDarkThemesFiles(tokens: TokensDTO, brand: Brand) {
+
+        fun Node.generateTheme(themeName: String) {
+            "style" {
+                attribute("name", themeName)
+                attribute("parent", "${themeName}_Customizations")
+                mapColors(tokens.dark, brand)
+            }
+        }
+
         val darkThemesXml = xml("resources", "utf-8", XmlVersion.V10) {
             comment(AUTOGENERATED_COMMENT)
 
-            "style" {
-                attribute("name", "MisticaTheme.${brandName.capitalizeString()}")
-                attribute("parent", "MisticaTheme.${brandName.capitalizeString()}_Customizations")
+            val brandName = brand.name.capitalizeString()
+
+            generateTheme("MisticaTheme.$brandName")
 
-                mapColors(tokens.dark, brandName)
+            if (brand.createDuplicateWithoutInheritMistica) {
+                generateTheme("${brandName}Override")
             }
         }
 
-        File("$VALUES_NIGHT_DIR/${THEMES_FILE.format(brandName)}").writeText(darkThemesXml.toString(PrintOptions(singleLineTextElements = true)))
+        File("$VALUES_NIGHT_DIR/${THEMES_FILE.format(brand.name)}").writeText(darkThemesXml.toString(PrintOptions(singleLineTextElements = true)))
     }
 
-    private fun Node.mapColors(colors: Map<String, ColorDTO>, brandName: String) {
+    private fun Node.mapColors(colors: Map<String, ColorDTO>, brand: Brand) {
         colors.forEach { color ->
             val colorName = if (color.key == "controlActivated") {
                 "colorControlActive"
@@ -179,7 +200,7 @@ class GenerateXMLFiles(
             if (color.value.value.contains("rgba(")) {
                 val alpha = ALPHA_REGEX.find(color.value.value)?.value?.toDouble()
                 if (alpha != null) {
-                    val colorValue = getColorNameWithAlpha(brandName, color.value.description, alpha)
+                    val colorValue = getColorNameWithAlpha(brand.name, color.value.description, alpha)
                     "item" {
                         attribute("name", colorName)
                         -"@color/$colorValue"
@@ -188,7 +209,7 @@ class GenerateXMLFiles(
             } else {
                 "item" {
                     attribute("name", colorName)
-                    -"@color/${brandName}_color_${color.value.description}"
+                    -"@color/${brand.name}_color_${color.value.description}"
                 }
             }
         }