diff --git a/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
index 677c469b7c..e33a89c972 100644
--- a/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
@@ -29,12 +29,15 @@ class ColorProvider @Inject constructor(val context: Context) {
 
     @ColorInt
     fun getColor(@ColorRes colorRes: Int): Int {
+        return ContextCompat.getColor(context, colorRes)
+        /*
         return when(colorRes) {
             R.color.riotx_accent -> getColorFromAttribute(R.attr.colorAccent)
             R.color.riotx_positive_accent -> getColorFromAttribute(R.attr.riotx_positive_accent)
             R.color.riotx_positive_accent_alpha12 -> getColorFromAttribute(R.attr.riotx_positive_accent_alpha12)
             else -> ContextCompat.getColor(context, colorRes)
         }
+         */
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 5067effe84..ff9f86d6bc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -648,7 +648,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
 
     private fun removeFooterOverlayStyle(holder: H, density: Float) {
         holder.bubbleFootView.background = null
-        tintFooter(holder, ThemeUtils.getColor(holder.bubbleFootView.context, R.attr.riotx_text_secondary))
+        tintFooter(holder, ThemeUtils.getColor(holder.bubbleFootView.context, R.attr.vctr_content_secondary))
         holder.bubbleFootView.setPaddingRelative(
                 0,
                 round(4*density).toInt(),
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 0fa91ac332..aea17e907a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -63,7 +63,7 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
 
             if (vectorPreferences.labAllowMarkUnread()) {
                 // Mark read/unread
-                dividerItem {
+                bottomSheetDividerItem {
                     id("mark_unread_separator")
                 }
                 if (roomSummary.scIsUnread(scSdkPreferences)) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index d7fc324f52..f9c52758a7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -110,8 +110,8 @@ class CreateRoomController @Inject constructor(
                     id("alias")
                     enabled(enableFormElement)
                     value(viewState.roomVisibilityType.aliasLocalPart)
-                    suffixText(":" + viewState.homeServerName)
-                    prefixText("#")
+                    //suffixText(":" + viewState.homeServerName)
+                    //prefixText("#")
                     hint(host.stringProvider.getString(R.string.room_alias_address_hint))
                     errorMessage(
                             host.roomAliasErrorFormatter.format(
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 05b7438636..7f2cab15a5 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -308,10 +308,8 @@ object ThemeUtils {
                 color.data
             } catch (e: Exception) {
                 when (colorAttribute) {
-                    android.R.attr.colorAccent           -> ContextCompat.getColor(c, R.color.riotx_accent)
-                    R.attr.colorAccent                   -> ContextCompat.getColor(c, R.color.riotx_accent)
-                    R.attr.riotx_positive_accent         -> ContextCompat.getColor(c, R.color.riotx_positive_accent)
-                    R.attr.riotx_positive_accent_alpha12 -> ContextCompat.getColor(c, R.color.riotx_positive_accent_alpha12)
+                    android.R.attr.colorAccent           -> ContextCompat.getColor(c, R.color.accent_sc)
+                    R.attr.colorAccent                   -> ContextCompat.getColor(c, R.color.accent_sc)
                     else                                 -> {
                         Timber.e(e, "Unable to get color")
                         ContextCompat.getColor(c, android.R.color.holo_red_dark)
diff --git a/vector/src/main/res/color/button_background_tint_selector.xml b/vector/src/main/res/color/button_background_tint_selector.xml
index 57135b1eb9..7b903c3c76 100644
--- a/vector/src/main/res/color/button_background_tint_selector.xml
+++ b/vector/src/main/res/color/button_background_tint_selector.xml
@@ -2,4 +2,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/color_primary_alpha25" android:state_enabled="false" />
     <item android:color="?colorPrimary" android:state_enabled="true" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/vector/src/main/res/color/button_background_tint_selector_sc.xml b/vector/src/main/res/color/button_background_tint_selector_sc.xml
deleted file mode 100644
index 88d99bc59e..0000000000
--- a/vector/src/main/res/color/button_background_tint_selector_sc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/accent_sc_alpha25" android:state_enabled="false" />
-    <item android:color="@color/accent_sc" android:state_enabled="true" />
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index 894a19ee78..32eca864a7 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -68,7 +68,7 @@
         android:layout_margin="16dp"
         android:contentDescription="@string/send"
         android:src="@drawable/ic_send"
-        app:tint="?attr/riotx_text_primary"
+        app:tint="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/attachmentPreviewerBottomContainer" />
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 45419196ce..2d8da95689 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -64,7 +64,7 @@
                     android:gravity="start"
                     android:text="@string/login_connect_using_matrix_id_title_sc"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:textColor="?riotx_text_primary"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmitText"
                     app:layout_constraintStart_toStartOf="parent"
@@ -107,7 +107,7 @@
                     android:gravity="start"
                     android:text="@string/login_server_other_title_sc"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:textColor="?riotx_text_primary"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
index 9fea5e73c3..8751eb1f32 100644
--- a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
+++ b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?riotx_background">
+    android:background="?android:colorBackground">
 
     <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
@@ -65,7 +65,7 @@
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_on"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:textColor="?riotx_text_primary"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText"
                     app:layout_constraintStart_toStartOf="parent"
@@ -109,7 +109,7 @@
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_off"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:textColor="?riotx_text_primary"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOffText"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 705cbd47be..bd8b97fb02 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -227,7 +227,7 @@
         android:src="@drawable/ic_expand_more"
         app:backgroundTint="?android:colorAccent"
         app:badgeBackgroundColor="?colorAccent"
-        app:badgeTextColor="@color/white"
+        app:badgeTextColor="@android:color/white"
         app:badgeTextPadding="2dp"
         app:badgeTextSize="10sp"
         app:layout_constraintBottom_toTopOf="@id/badgeBarrier"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index e11b8baf45..6cd1b382e3 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -83,7 +83,7 @@
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="28dp"
-        app:tint="?riotx_text_secondary"
+        app:tint="?vctr_content_secondary"
         tools:ignore="MissingConstraints,MissingPrefix"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index dbb0ffc6e3..cae9710b40 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -110,7 +110,7 @@
                 android:layout_toStartOf="@id/bubbleMessageTimeView"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="?riotx_text_primary"
+                android:textColor="?vctr_content_primary"
                 android:textSize="15sp"
                 android:textStyle="bold"
                 tools:text="@sample/matrix.json/data/displayName" />
@@ -123,7 +123,7 @@
                 android:layout_alignEnd="@id/viewStubContainer"
                 android:layout_marginBottom="4dp"
                 android:maxLines="1"
-                android:textColor="?riotx_text_secondary"
+                android:textColor="?vctr_content_secondary"
                 android:textSize="12sp"
                 tools:text="@tools:sample/date/hhmm" />
 
@@ -198,7 +198,7 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="0dp"
                 android:maxLines="1"
-                android:textColor="?riotx_text_secondary"
+                android:textColor="?vctr_content_secondary"
                 android:textSize="12sp"
                 tools:text="@tools:sample/date/hhmm" />
                 -->
@@ -222,7 +222,7 @@
                     android:paddingStart="4dp"
                     android:paddingEnd="0dp"
                     android:maxLines="1"
-                    tools:textColor="?riotx_text_secondary"
+                    tools:textColor="?vctr_content_secondary"
                     android:textSize="12sp"
                     android:layout_gravity="bottom"
                     tools:text="@tools:sample/date/hhmm" />
@@ -236,7 +236,7 @@
                     android:paddingStart="4dp"
                     android:paddingEnd="0dp"
                     android:layout_gravity="bottom"
-                    tools:tint="?riotx_text_secondary"
+                    tools:tint="?vctr_content_secondary"
                     tools:src="@drawable/ic_processing_msg"
                     android:contentDescription="@string/footer_read_receipt_content_description" />
             </LinearLayout>
diff --git a/vector/src/main/res/values-v23/theme_sc.xml b/vector/src/main/res/values-v23/theme_sc.xml
index 5bf8307c7b..bd2aca8466 100644
--- a/vector/src/main/res/values-v23/theme_sc.xml
+++ b/vector/src/main/res/values-v23/theme_sc.xml
@@ -18,7 +18,7 @@
     </style>
 
     <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
+        <item name="android:statusBarColor">@color/android_status_bar_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
index 6e672c8b34..e39c6de7e2 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -7,8 +7,6 @@
         <attr name="sc_message_bg_outgoing" format="color" />
 
         <attr name="colorAccentPale" format="color" />
-        <attr name="riotx_positive_accent" format="color" />
-        <attr name="riotx_positive_accent_alpha12" format="color" />
         <attr name="riotx_toolbar_bg" format="color" />
 
         <attr name="riotx_unread_unimportant_room_badge" format="color" />
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 8d2e969738..50ca381791 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -35,12 +35,12 @@
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="Style.Vector.Login.Button" parent="VectorButtonStyle.SC">
+    <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined.SC">
+    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/vector/src/main/res/values/styles_sc.xml b/vector/src/main/res/values/styles_sc.xml
index 76acccaab1..71d0272a99 100644
--- a/vector/src/main/res/values/styles_sc.xml
+++ b/vector/src/main/res/values/styles_sc.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorButtonStyle.SC">
-        <item name="backgroundTint">@color/button_background_tint_selector_sc</item>
-    </style>
-
     <style name="VectorAlertDialogStyleDark.SC">
-        <item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle.SC</item>
+        <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
+        <item name="colorSurface">@color/background_sc</item>
+        <item name="colorOnSurface">@color/text_color_primary_sc</item>
+        <item name="colorError">@color/element_alert_dark</item>
     </style>
 
     <style name="VectorAlertDialogStyleLight.SC">
-        <item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle.SC</item>
+        <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
     </style>
 
-    <style name="VectorAlertDialogButtonStyle.SC">
-        <item name="android:textColor">?colorAccent</item>
-    </style>
-
     <!-- custom action bar -->
     <style name="Vector.Styled.ActionBar.SC">
         <item name="android:background">@color/background_dark_sc</item>
@@ -27,11 +22,16 @@
 
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.SC" parent="Vector.BottomSheet.Dark">
+        <item name="colorPrimary">@color/text_color_primary_sc</item>
+        <item name="colorSecondary">@color/text_color_secondary_sc</item>
+        <item name="colorSurface">@color/background_floating_sc</item>
+        <item name="colorOnSurface">@color/text_color_primary_sc</item>
+        <item name="colorError">@color/element_alert_dark</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">@color/text_color_primary_sc</item>
+        <item name="android:textColorLink">@color/element_link_dark</item>
         <item name="android:textColorPrimary">@color/text_color_primary_sc</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_sc</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/text_color_tertiary_sc</item>
-        <item name="android:textColorLink">@color/link_color_dark</item>
         <!-- Accent color -->
         <item name="android:colorAccent">@color/accent_sc</item>
         <item name="colorAccent">@color/accent_sc</item>
@@ -43,8 +43,4 @@
         <item name="colorAccent">@color/accent_sc</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined.SC">
-        <item name="strokeColor">@color/button_background_tint_selector_sc</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index c7f71b99b4..2e9aaf2d48 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -129,10 +129,8 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FF465561</item>
         <item name="sc_message_bg_outgoing">#ff343b47</item>
-        <item name="riotx_positive_accent">@color/riotx_positive_accent</item>
-        <item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item>
-        <item name="riotx_toolbar_bg">?riotx_background</item>
-        <item name="riotx_unread_unimportant_room_badge">@color/riotx_unread_room_badge_dark</item>
+        <item name="riotx_toolbar_bg">?android:colorBackground</item>
+        <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_dark</item>
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index be2cf04711..1dce893a68 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -17,7 +17,7 @@
 
         <!-- other colors -->
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
-        <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_light</item>
+        <item name="vctr_unread_room_badge">?colorPrimary</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item>
@@ -129,10 +129,8 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FFEEEEEE</item>
         <item name="sc_message_bg_outgoing">#FFDDDDDD</item>
-        <item name="riotx_positive_accent">@color/riotx_positive_accent</item>
-        <item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item>
-        <item name="riotx_toolbar_bg">?riotx_background</item>
-        <item name="riotx_unread_unimportant_room_badge">@color/riotx_unread_room_badge_light</item>
+        <item name="riotx_toolbar_bg">?android:colorBackground</item>
+        <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index 0b5db039fe..b56e596c96 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -3,134 +3,82 @@
 
     <!-- SC THEME COLORS -->
     <style name="AppTheme.Base.SC" parent="AppTheme.Base.Black">
-        <!-- Riotx attribute for palette -->
-        <item name="riotx_background">@color/background_black_sc</item>
-        <item name="vctr_home_drawer_header_background">?riotx_background</item>
-        <item name="riotx_header_panel_background">@color/background_black_sc</item>
-        <item name="riotx_header_panel_border_mobile">#20ffffff</item>
-        <item name="riotx_header_panel_text_secondary">@color/text_color_secondary_sc</item>
-        <item name="riotx_text_primary">@color/text_color_primary_sc</item>
-        <item name="riotx_text_secondary">@color/text_color_secondary_sc</item>
-        <item name="riotx_text_tertiary">@color/text_color_tertiary_sc</item>
-        <item name="riotx_text_primary_body_contrast">@color/text_color_primary_sc</item>
-        <item name="riotx_android_secondary">@color/text_color_secondary_sc</item>
-        <item name="riotx_unread_room_indent">@color/background_dark_sc</item>
-        <item name="riotx_unread_room_badge">?colorAccent</item>
-        <item name="riotx_fab_label_bg">@color/background_floating_sc</item>
-        <item name="riotx_fab_label_stroke">@color/black</item>
-        <item name="riotx_fab_label_color">#ffffff</item>
-        <item name="riotx_touch_guard_bg">@color/background_touch_guard_sc</item>
-        <item name="riotx_attachment_selector_background">?riotx_background</item>
-        <item name="riotx_attachment_selector_border">@color/background_dark_sc</item>
+        <!-- Element attribute for palette -->
+        <!-- content colors -->
+        <item name="vctr_content_primary">@color/text_color_primary_sc</item>
+        <item name="vctr_content_secondary">@color/text_color_secondary_sc</item>
+        <item name="vctr_content_tertiary">@color/text_color_tertiary_sc</item>
+        <item name="vctr_content_quaternary">@color/text_color_disabled_sc</item>
+        <item name="vctr_content_quinary">@color/text_color_disabled_sc</item>
 
-        <item name="riotx_keys_backup_banner_accent_color">@color/background_floating_sc</item>
+        <!-- system colors -->
+        <item name="vctr_system">@color/background_dark_sc</item>
 
-        <item name="riotx_bottom_nav_icon_color">#ff808080</item>
-
-        <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
-        <item name="colorPrimary">@color/accent_sc</item>
-        <item name="colorPrimaryVariant">@color/background_dark_sc</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
-        <item name="colorSecondary">@color/accent_sc</item>
-        <item name="colorSecondaryVariant">@color/background_black_sc</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorError">@color/riotx_notice</item>
-        <item name="colorOnError">#FFFFFF</item>
-        <!--item name="colorSurface">#FFFFFF</item>
-        <item name="colorOnSurface">#212121</item-->
-        <item name="android:colorBackground">?riotx_background</item>
-        <item name="colorOnBackground">?riotx_text_primary</item>
-
-        <item name="riotx_bottom_sheet_background">@color/background_dark_sc</item>
-
-        <!-- Keep color accent for legacy widget-->
-        <item name="colorAccent">@color/accent_sc</item>
-        <item name="android:colorAccent">@color/accent_sc</item>
-
-        <item name="materialButtonStyle">@style/VectorButtonStyle.SC</item>
-        <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
-
-        <!-- Menu text color -->
-        <item name="android:actionMenuTextColor">?colorAccent</item>
-
-        <!-- default background color -->
-        <item name="riotx_bottom_nav_background_color">@color/background_dark_sc</item>
-        <item name="riotx_bottom_nav_background_border_color">@color/background_black_sc</item>
-
-        <!-- waiting view background -->
-        <item name="riotx_waiting_background_color">#55555555</item>
-
-
-        <!-- application bar text color -->
-        <item name="vctr_toolbar_primary_text_color">@color/text_color_primary_sc</item>
-        <item name="vctr_toolbar_secondary_text_color">@color/text_color_secondary_sc</item>
-        <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
+        <!-- other colors -->
+        <item name="vctr_home_drawer_header_background">?android:colorBackground</item>
+        <item name="vctr_unread_room_badge">?colorAccent</item>
+        <item name="vctr_fab_label_bg">@color/background_floating_sc</item>
+        <item name="vctr_fab_label_stroke">@android:color/black</item>
+        <item name="vctr_fab_label_color">@android:color/white</item>
+        <item name="vctr_touch_guard_bg">@color/background_touch_guard_sc</item>
+        <item name="vctr_keys_backup_banner_accent_color">@color/background_floating_sc</item>
+        <item name="vctr_attachment_selector_background">?colorBackgroundFloating</item>
+        <item name="vctr_attachment_selector_border">@color/background_dark_sc</item>
+        <item name="vctr_room_active_widgets_banner_bg">@color/background_floating_sc</item>
+        <item name="vctr_room_active_widgets_banner_text">?vctr_content_secondary</item>
+        <item name="vctr_reaction_background_off">@color/background_sc</item>
+        <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_dark</item>
+        <item name="vctr_bottom_nav_icon_color">#ff808080</item>
+        <item name="vctr_waiting_background_color">#555555</item>
+        <item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
 
         <!-- room message colors -->
-        <!--Unread Room Indent-->
-        <item name="vctr_notice_secondary">@color/text_color_secondary_sc</item>
-        <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
-        <item name="vctr_message_text_color">@android:color/white</item>
-        <item name="vctr_notice_text_color">@color/text_color_primary_sc</item>
+        <item name="vctr_notice_secondary">?vctr_content_secondary</item>
+        <item name="vctr_unsent_message_text_color">?colorError</item>
+        <item name="vctr_message_text_color">?vctr_content_primary</item>
+        <item name="vctr_notice_text_color">?vctr_content_primary</item>
         <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
-        <item name="vctr_sending_message_text_color">@color/text_color_secondary_sc</item>
+        <item name="vctr_sending_message_text_color">?vctr_content_secondary</item>
         <item name="vctr_markdown_block_background_color">@android:color/black</item>
         <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
 
-        <item name="riot_primary_text_color">@color/text_color_primary_sc</item>
-        <item name="riot_primary_text_color_disabled">@color/text_color_disabled_sc</item>
+        <!-- Some alias -->
+        <item name="vctr_header_background">?vctr_content_quinary</item>
+        <item name="vctr_list_separator">@color/background_black_sc</item>
+        <item name="vctr_list_separator_system">?vctr_system</item>
+        <item name="vctr_list_separator_on_surface">?vctr_system</item>
 
-        <!-- list colors -->
-        <!--Header/Panel Background-->
-        <item name="vctr_list_header_background_color">@color/background_dark_sc</item>
+        <!-- Material color -->
+        <item name="colorPrimary">?colorAccent</item>
+        <item name="colorPrimaryVariant">?colorAccent</item>
+        <item name="colorOnPrimary">?vctr_content_primary</item>
+        <item name="colorSecondary">?colorAccent</item>
+        <item name="colorSecondaryVariant">?colorAccent</item>
+        <item name="colorOnSecondary">?vctr_content_primary</item>
+        <item name="colorError">@color/element_alert_dark</item>
+        <item name="colorOnError">?vctr_content_primary</item>
+        <item name="colorSurface">@color/element_system_dark</item>
+        <item name="colorOnSurface">?vctr_content_primary</item>
+        <item name="android:colorBackground">@color/background_dark_sc</item>
+        <item name="colorOnBackground">?vctr_content_primary</item>
 
-        <item name="riotx_list_bottom_sheet_divider_color">#1fffffff</item>
-        <item name="vctr_list_divider_color">@color/background_dark_sc</item>
+        <!-- TODO styles? -->
 
-        <!-- room notification text color (typing, unsent...) -->
-        <!--Notice (secondary)-->
-        <item name="vctr_room_notification_text_color">@color/text_color_secondary_sc</item>
+        <item name="android:textColorLink">@color/element_link_dark</item>
 
-        <!-- icon colors -->
-        <item name="vctr_settings_icon_tint_color">@android:color/white</item>
-        <item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item>
+        <!-- Menu text color -->
+        <item name="android:actionMenuTextColor">?colorSecondary</item>
 
-        <item name="list_divider_color">@color/list_divider_color_sc</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">?vctr_content_tertiary</item>
 
-        <!-- activities background -->
-        <item name="android:windowBackground">?riotx_background</item>
+        <!-- TODO styles? -->
+        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
 
         <!-- custom action bar -->
         <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
         <item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
 
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/Vector.ActionBarTheme</item>
-
-        <!-- remove the shadow under the actionbar -->
-        <item name="android:windowContentOverlay">@null</item>
-
-        <item name="android:popupMenuStyle">@style/Vector.PopupMenu</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView</item>
-
-        <!-- tabbar text color -->
-        <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
-        <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
-
-        <item name="tab_bar_selected_background_color">@color/background_dark_sc</item>
-        <item name="tab_bar_unselected_background_color">@color/background_dark_sc</item>
-
-        <!-- Preference -->
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC</item>
 
         <!-- SnackBar -->
@@ -142,34 +90,23 @@
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
 
         <!-- SC additions -->
+        <item name="colorAccent">@color/accent_sc</item>
+        <item name="android:colorAccent">@color/accent_sc</item>
         <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
         <item name="sc_message_bg_outgoing">@color/background_sc</item>
-        <item name="riotx_positive_accent">@color/accent_sc</item>
-        <item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
-        <item name="riotx_toolbar_bg">?riotx_background</item>
+        <item name="riotx_toolbar_bg">?android:colorBackground</item>
         <item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
-        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</item>
 
         <item name="android:statusBarColor">@color/background_black_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
-
-        <!-- enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-
-        <item name="riotx_reaction_background_off">@color/background_sc</item>
-        <item name="riotx_reaction_background_on">@color/sc_reaction_background_on_dark</item>
     </style>
 
     <style name="AppTheme.Base.SC.Dark">
         <item name="riotx_toolbar_bg">@color/background_sc</item>
-        <item name="riotx_background">@color/background_dark_sc</item>
+        <item name="android:colorBackground">@color/background_dark_sc</item>
         <item name="vctr_home_drawer_header_background">@color/background_sc</item>
-        <item name="riotx_header_panel_background">@color/background_sc</item>
+        <item name="vctr_header_background">@color/background_sc</item>
 
         <item name="android:statusBarColor">@color/background_dark_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
diff --git a/vector/src/main/res/values/theme_sc_light.xml b/vector/src/main/res/values/theme_sc_light.xml
index f469becf82..c118b495f7 100644
--- a/vector/src/main/res/values/theme_sc_light.xml
+++ b/vector/src/main/res/values/theme_sc_light.xml
@@ -3,21 +3,18 @@
 
     <!-- SC THEME COLORS -->
     <style name="AppTheme.Base.SC.Light" parent="AppTheme.Base.Light">
-        <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/accent_sc</item>
+        <item name="colorPrimaryVariant">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
+        <item name="colorSecondaryVariant">@color/accent_sc</item>
 
         <!-- Keep color accent for legacy widget-->
         <item name="colorAccent">@color/accent_sc</item>
 
-        <item name="materialButtonStyle">@style/VectorButtonStyle.SC</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item>
 
         <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
 
-        <!-- icon colors -->
-        <item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item>
-
         <!-- custom action bar -->
         <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
         <item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
@@ -25,19 +22,16 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FFEEEEEE</item>
         <item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item>
-        <item name="riotx_positive_accent">@color/accent_sc</item>
-        <item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
-        <item name="riotx_toolbar_bg">?riotx_background</item>
-        <item name="riotx_unread_unimportant_room_badge">?riotx_header_panel_text_secondary</item>
+        <item name="riotx_toolbar_bg">?android:colorBackground</item>
+        <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
-        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</item>
 
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
 
-        <item name="riotx_unread_room_badge">?colorAccent</item>
+        <item name="vctr_unread_room_badge">?colorAccent</item>
 
         <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
+        <item name="android:statusBarColor">@color/background_black_sc</item>
         <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
         <item name="android:navigationBarColor">@color/background_black_sc</item>
 
@@ -48,8 +42,8 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="riotx_reaction_background_off">@color/riotx_reaction_background_off_light</item>
-        <item name="riotx_reaction_background_on">@color/sc_reaction_background_on_light</item>
+        <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
+        <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_light</item>
     </style>
 
     <!-- Default AppTheme for usage where settings don't apply -->