diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector/src/debug/res/layout/item_test_linkify.xml
index 19bebeaf50..89d1dade0d 100644
--- a/vector/src/debug/res/layout/item_test_linkify.xml
+++ b/vector/src/debug/res/layout/item_test_linkify.xml
@@ -12,7 +12,6 @@
         android:orientation="vertical">
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="AutoLink" />
@@ -26,7 +25,6 @@
             tools:text="www.example.org" />
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Custom Link" />
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index e9cf8251de..2e97abc32e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -468,7 +468,7 @@ class MessageItemFactory @Inject constructor(
         spannable.append(linkifiedBody)
         val editedSuffix = stringProvider.getString(R.string.edited_suffix)
         spannable.append(" ").append(editedSuffix)
-        val color = colorProvider.getColorFromAttribute(R.attr.vctr_list_header_secondary_text_color)
+        val color = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
         val editStart = spannable.lastIndexOf(editedSuffix)
         val editEnd = editStart + editedSuffix.length
         spannable.setSpan(
diff --git a/vector/src/main/res/drawable/ic_sliders.xml b/vector/src/main/res/drawable/ic_sliders.xml
deleted file mode 100644
index 55ccfcfb3d..0000000000
--- a/vector/src/main/res/drawable/ic_sliders.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="12dp"
-    android:viewportWidth="14"
-    android:viewportHeight="12">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M2.636,11V7.111M2.636,4.889V1M7,11V6M7,3.778V1M11.364,11V8.222M11.364,6V1M1,7.111h3.273M5.364,3.778h3.272M9.727,8.222H13"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/pill_background_bing.xml b/vector/src/main/res/drawable/pill_background_bing.xml
deleted file mode 100644
index 70a2bda8a4..0000000000
--- a/vector/src/main/res/drawable/pill_background_bing.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/vector_fuchsia_color" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape.xml b/vector/src/main/res/drawable/rounded_rect_shape.xml
deleted file mode 100644
index e9c0a27f59..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <!--<size android:width="40dp" android:height="22dp"/>-->
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <stroke android:width="1dp" android:color="@color/accent_color_light" />
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_off.xml b/vector/src/main/res/drawable/rounded_rect_shape_off.xml
deleted file mode 100644
index 8dac3020e3..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape_off.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:width="40dp" android:height="22dp"/>
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <!--<stroke android:width="1dp" android:color="@color/list_divider_color_light" />-->
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/sticker_description_background.xml b/vector/src/main/res/drawable/sticker_description_background.xml
deleted file mode 100644
index faa6f5b6f4..0000000000
--- a/vector/src/main/res/drawable/sticker_description_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/list_divider_color_light" />
-    <padding
-        android:bottom="5dp"
-        android:left="8dp"
-        android:right="5dp"
-        android:top="5dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/sticker_description_triangle.xml b/vector/src/main/res/drawable/sticker_description_triangle.xml
deleted file mode 100644
index 199c2e7313..0000000000
--- a/vector/src/main/res/drawable/sticker_description_triangle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
-    android:height="12dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-    <group android:name="triableGroup">
-        <path
-            android:name="triangle"
-            android:fillColor="#339D9D9D"
-            android:pathData="m 50,0 l 50,100 -100,0 z" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 2347d84ee3..78a0139e1d 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -75,7 +75,6 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
                     android:hint="@string/send_bug_report_placeholder"
-                    android:textColorHint="?attr/vctr_default_text_hint_color"
                     app:counterEnabled="true"
                     app:counterMaxLength="500">
 
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 9561c59301..10c9dcd59b 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -39,7 +39,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/exportDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/exportDialogText">
@@ -61,7 +60,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:errorEnabled="true"
         app:layout_constraintEnd_toEndOf="@+id/exportDialogTil"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 68621f8230..177dbd1f66 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -29,7 +29,6 @@
         style="@style/VectorTextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/importDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dialog_e2e_keys_passphrase_filename">
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 642119e5f8..0a4206b8c0 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -12,7 +12,7 @@
         android:id="@+id/homeDrawerHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?riotx_base"
+        android:background="?vctr_home_drawer_header_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/values-w480dp/styles.xml b/vector/src/main/res/values-w480dp/styles.xml
deleted file mode 100644
index 5f117273a3..0000000000
--- a/vector/src/main/res/values-w480dp/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Linear Layout orientation, depending on screen size, horizontal for width >= 480dp -->
-    <style name="VectorLinearLayout">
-        <item name="android:gravity">end</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 0b9852634d..ecc64bf07d 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -6,9 +6,6 @@
     <attr name="vctr_toolbar_secondary_text_color" format="color" />
     <attr name="vctr_toolbar_link_text_color" format="color" />
 
-    <!-- default text colors -->
-    <attr name="vctr_default_text_hint_color" format="color" />
-
     <!-- room message colors -->
     <attr name="vctr_unsent_message_text_color" format="color" />
     <attr name="vctr_message_text_color" format="color" />
@@ -19,19 +16,11 @@
     <attr name="vctr_markdown_block_background_color" format="color" />
     <attr name="vctr_spoiler_background_color" format="color" />
 
-    <!-- tab bar colors -->
-    <attr name="vctr_tab_bar_inverted_background_color" format="color" />
-
     <!-- list colors -->
     <attr name="vctr_list_header_background_color" format="color" />
-    <attr name="vctr_list_header_primary_text_color" format="color" />
-    <attr name="vctr_list_header_secondary_text_color" format="color" />
 
     <attr name="vctr_list_divider_color" format="color" />
 
-    <!-- outgoing call background color -->
-    <attr name="vctr_pending_outgoing_view_background_color" format="color" />
-
     <!-- room notification text color (typing, unsent...) -->
     <attr name="vctr_room_notification_text_color" format="color" />
 
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index e4cfa18461..7561e6f843 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -131,7 +131,6 @@
     <color name="riotx_notice">#FFFF4B55</color>
     <color name="riotx_notice_secondary">#FF61708B</color>
     <color name="riotx_notice_secondary_alpha12">#1E61708B</color>
-    <color name="riotx_links">#FF368BD6</color>
 
     <color name="riotx_avatar_fill_1">#FF03B381</color>
     <color name="riotx_avatar_fill_2">#FF368bd6</color>
@@ -156,16 +155,15 @@
       'riotx_<name in the palette snake case>_<theme>'
       -->
 
-
     <attr name="riotx_background" format="color" />
     <color name="riotx_background_light">#FFFFFFFF</color>
     <color name="riotx_background_dark">#FF15191E</color>
     <color name="riotx_background_black">#FF000000</color>
 
-    <attr name="riotx_base" format="color" />
-    <color name="riotx_base_light">#FFF5F7FA</color>
-    <color name="riotx_base_dark">#FF22282F</color>
-    <color name="riotx_base_black">#FF000000</color>
+    <attr name="vctr_home_drawer_header_background" format="color" />
+    <color name="vctr_home_drawer_header_background_light">#FFF5F7FA</color>
+    <color name="vctr_home_drawer_header_background_dark">#FF22282F</color>
+    <color name="vctr_home_drawer_header_background_black">#FF000000</color>
 
     <!-- Background color of bottom sheets -->
     <attr name="riotx_bottom_sheet_background" format="color" />
@@ -173,21 +171,6 @@
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
     <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
-    <attr name="riotx_base_text_icon_primary" format="color" />
-    <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
-    <color name="riotx_base_text_icon_primary_dark">#FFEDF3FF</color>
-    <color name="riotx_base_text_icon_primary_black">#FFEDF3FF</color>
-
-    <attr name="riotx_base_text_icon_secondary" format="color" />
-    <color name="riotx_base_text_icon_secondary_light">#FFFFFFFF</color>
-    <color name="riotx_base_text_icon_secondary_dark">#FFEDF3FF</color>
-    <color name="riotx_base_text_icon_secondary_black">#FFEDF3FF</color>
-
-    <attr name="riotx_search_background_mobile" format="color" />
-    <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
-    <color name="riotx_search_background_mobile_dark">#FF181B21</color>
-    <color name="riotx_search_background_mobile_black">#FF181B21</color>
-
     <attr name="riotx_header_panel_background" format="color" />
     <color name="riotx_header_panel_background_light">#FFF3F8FD</color>
     <color name="riotx_header_panel_background_dark">#FF22262E</color>
@@ -198,11 +181,6 @@
     <color name="riotx_header_panel_border_mobile_dark">#FF181B21</color>
     <color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>
 
-    <attr name="riotx_header_panel_text_primary" format="color" />
-    <color name="riotx_header_panel_text_primary_light">#FF171910</color>
-    <color name="riotx_header_panel_text_primary_dark">#FFFFFFFF</color>
-    <color name="riotx_header_panel_text_primary_black">#FFFFFFFF</color>
-
     <attr name="riotx_header_panel_text_secondary" format="color" />
     <color name="riotx_header_panel_text_secondary_light">#8F97A3</color>
     <color name="riotx_header_panel_text_secondary_dark">#FFA9B2BC</color>
@@ -235,47 +213,17 @@
     <color name="riotx_android_secondary_dark">#FF8F97A3</color>
     <color name="riotx_android_secondary_black">#FFA9B2BC</color>
 
-    <attr name="riotx_search_placeholder" format="color" />
-    <color name="riotx_search_placeholder_light">#FF8F97A3</color>
-    <color name="riotx_search_placeholder_dark">#FFA9B2BC</color>
-    <color name="riotx_search_placeholder_black">#FFA9B2BC</color>
-
-    <attr name="riotx_room_highlight" format="color" />
-    <color name="riotx_room_highlight_light">#FFF6F7F8</color>
-    <color name="riotx_room_highlight_dark">#FF343446</color>
-    <color name="riotx_room_highlight_black">#FF343446</color>
-
     <attr name="riotx_unread_room_indent" format="color" />
     <color name="riotx_unread_room_indent_light">#FF2E3648</color>
     <color name="riotx_unread_room_indent_dark">#FF2E3648</color>
     <color name="riotx_unread_room_indent_black">#FF2E3648</color>
 
-    <attr name="riotx_android_status_bar" format="color" />
-    <color name="riotx_android_status_bar_light">#FF2E3648</color>
-    <color name="riotx_android_status_bar_dark">#FF0D0E10</color>
-    <color name="riotx_android_status_bar_black">#FF0D0E10</color>
-
-    <attr name="riotx_line_break_mobile" format="color" />
-    <color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
-    <color name="riotx_line_break_mobile_dark">#FF61708B</color>
-    <color name="riotx_line_break_mobile_black">#FF61708B</color>
-
     <!-- Other colors, which are not in the pallette -->
     <attr name="riotx_unread_room_badge" format="color" />
     <color name="riotx_unread_room_badge_light">#FF61708B</color>
     <color name="riotx_unread_room_badge_dark">#FF61708B</color>
     <color name="riotx_unread_room_badge_black">#FF61708B</color>
 
-    <attr name="riotx_fab_secondary_bg" format="color" />
-    <color name="riotx_fab_secondary_bg_light">@color/white</color>
-    <color name="riotx_fab_secondary_bg_dark">#FF181B21</color>
-    <color name="riotx_fab_secondary_bg_black">#FF181B21</color>
-
-    <attr name="riotx_fab_secondary_color" format="color" />
-    <color name="riotx_fab_secondary_color_light">@color/black</color>
-    <color name="riotx_fab_secondary_color_dark">@color/white</color>
-    <color name="riotx_fab_secondary_color_black">@color/white</color>
-
     <attr name="riotx_fab_label_bg" format="color" />
     <color name="riotx_fab_label_bg_light">@color/white</color>
     <color name="riotx_fab_label_bg_dark">#FF181B21</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index d81b4cb6e9..89d5ac12e2 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -97,11 +97,6 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <!-- home scroller menu -->
-    <style name="NavigationViewStyle">
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <!-- Styles for login screen -->
     <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
         <item name="android:textSize">16sp</item>
@@ -195,83 +190,13 @@
         <item name="iconifiedByDefault">false</item>
     </style>
 
-    <style name="VectorSearches.EditText" parent="Widget.AppCompat.EditText">
-        <item name="android:textCursorDrawable">@drawable/searches_cursor_background</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="background">@android:color/transparent</item>
-    </style>
-
-    <style name="VectorSearches.Styled.ActionBar" parent="Vector.Styled.ActionBar">
-        <item name="android:background">?android:attr/colorBackground</item>
-        <item name="background">?android:attr/colorBackground</item>
-    </style>
-
-    <!-- tabbar text color -->
-    <style name="VectorSearches.TabText" parent="Widget.AppCompat.ActionBar.TabText">
-        <item name="android:textColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="VectorSearches.ActionBarTheme" parent="ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?attr/colorAccent</item>
-    </style>
-
-    <style name="VectorPeopleSearches.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabGravity">fill</item>
-        <item name="tabMode">fixed</item>
-        <item name="tabPaddingStart">0dp</item>
-        <item name="tabPaddingEnd">0dp</item>
-        <item name="tabBackground">?attr/colorAccent</item>
-        <item name="tabTextColor">@android:color/white</item>
-        <item name="tabSelectedTextColor">@android:color/white</item>
-        <item name="tabIndicatorColor">@android:color/white</item>
-        <item name="tabMaxWidth">0dp</item>
-    </style>
-
-    <style name="VectorUnifiedSearches.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabGravity">fill</item>
-        <item name="tabMode">fixed</item>
-        <item name="tabPaddingStart">0dp</item>
-        <item name="tabPaddingEnd">0dp</item>
-        <item name="tabBackground">?attr/vctr_tab_bar_inverted_background_color</item>
-        <item name="tabTextColor">?attr/colorAccent</item>
-        <item name="tabSelectedTextColor">?attr/colorAccent</item>
-        <item name="tabIndicatorColor">?attr/colorAccent</item>
-        <item name="tabMaxWidth">0dp</item>
-    </style>
-
-    <style name="ListHeader">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?vctr_list_header_primary_text_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:background">?vctr_list_header_background_color</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
-    </style>
-
-    <style name="SpinnerTheme">
-        <item name="colorControlNormal">?attr/vctr_list_header_primary_text_color</item>
-    </style>
-
-    <style name="PopMenuStyle" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <!-- Linear Layout orientation, depending on screen size. Vertical by default -->
-    <style name="VectorLinearLayout">
-        <item name="android:gravity">end</item>
-        <item name="android:orientation">vertical</item>
-    </style>
-
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.Dark" parent="Theme.Design.BottomSheetDialog">
         <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
     </style>
 
     <style name="Vector.BottomSheet.Light" parent="Theme.Design.Light.BottomSheetDialog">
@@ -279,7 +204,7 @@
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
     </style>
 
 
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index e5c6851f40..8a03e29375 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -8,27 +8,17 @@
 
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_black</item>
-        <item name="riotx_base">@color/riotx_base_black</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_black</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_black</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_black</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_black</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_black</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_black</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_black</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_black</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_black</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_black</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_black</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
@@ -41,8 +31,6 @@
         <item name="riotx_reaction_background_on">@color/riotx_reaction_background_on_black</item>
         <item name="riotx_alerter_background">@color/riotx_alerter_background_black</item>
 
-        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</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/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
@@ -66,8 +54,6 @@
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
-
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 953691a6b7..5d22683b82 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -6,27 +6,17 @@
     <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_dark</item>
-        <item name="riotx_base">@color/riotx_base_dark</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_dark</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_dark</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_dark</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_dark</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_dark</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_dark</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_dark</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_dark</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_dark</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_dark</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
@@ -66,7 +56,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
@@ -84,9 +74,6 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riot_secondary_text_color_dark</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
 
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_dark</item>
-
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
@@ -100,23 +87,13 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">@color/primary_color_dark</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FFA1B2D1</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
 
-        <!-- outgoing call background color -->
-        <item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index cae2ef7794..049f8dd1db 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -6,27 +6,17 @@
     <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_light</item>
-        <item name="riotx_base">@color/riotx_base_light</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_light</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_light</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_light</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_light</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_light</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_light</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_light</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_light</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
@@ -65,7 +55,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
@@ -82,10 +72,7 @@
         <item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
         <!-- Base Text Secondary-->
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
-        <item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
-
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
+        <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
@@ -100,23 +87,13 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FFF3F8FD</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FF61708B</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
 
-        <!-- outgoing call background color -->
-        <item name="vctr_pending_outgoing_view_background_color">#33000000</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>