From 1793885ec69c56c8e91058d89789a32443d5a78f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 20:20:19 +0200
Subject: [PATCH] TextAppearances: import from figma and apply to login screens

---
 .../layout/activity_debug_button_styles.xml   |   7 ++
 .../layout/activity_test_material_theme.xml   |  12 ++-
 .../res/layout/debug_text_appearance.xml      |  74 +++++++++++++
 .../main/res/layout/activity_signed_out.xml   |   6 +-
 vector/src/main/res/layout/fragment_login.xml |  12 ++-
 .../layout/fragment_login_account_created.xml |  15 ++-
 .../res/layout/fragment_login_captcha.xml     |   5 +-
 ...fragment_login_generic_text_input_form.xml |   9 +-
 ...agment_login_generic_text_input_form_2.xml |  12 ++-
 .../layout/fragment_login_reset_password.xml  |   6 +-
 .../fragment_login_reset_password_2.xml       |  12 ++-
 ...login_reset_password_mail_confirmation.xml |   9 +-
 ...gin_reset_password_mail_confirmation_2.xml |   9 +-
 .../fragment_login_reset_password_success.xml |   9 +-
 ...ragment_login_reset_password_success_2.xml |   9 +-
 .../fragment_login_server_selection.xml       |  19 ++--
 .../fragment_login_server_selection_2.xml     |  20 ++--
 .../layout/fragment_login_server_url_form.xml |  13 ++-
 .../fragment_login_server_url_form_2.xml      |   5 +-
 .../fragment_login_signin_password_2.xml      |   8 +-
 .../layout/fragment_login_signin_to_any_2.xml |   6 +-
 .../fragment_login_signin_username_2.xml      |   9 +-
 .../fragment_login_signup_password_2.xml      |  15 ++-
 ...fragment_login_signup_signin_selection.xml |   9 +-
 .../fragment_login_signup_username_2.xml      |  12 ++-
 .../main/res/layout/fragment_login_splash.xml |  12 ++-
 .../res/layout/fragment_login_splash_2.xml    |  12 ++-
 .../res/layout/fragment_login_sso_only_2.xml  |   3 +-
 .../main/res/layout/fragment_login_terms.xml  |   6 +-
 .../res/layout/fragment_login_terms_2.xml     |   6 +-
 .../layout/fragment_login_wait_for_email.xml  |   6 +-
 .../fragment_login_wait_for_email_2.xml       |   9 +-
 .../res/layout/fragment_reauth_confirm.xml    |   4 +-
 .../fragment_room_preview_no_preview.xml      |  10 +-
 .../src/main/res/layout/item_login_text.xml   |   3 +-
 .../src/main/res/layout/item_login_title.xml  |   3 +-
 .../res/layout/item_login_title_small.xml     |   3 +-
 vector/src/main/res/layout/item_policy.xml    |   6 +-
 .../main/res/layout/vector_invite_view.xml    |   9 +-
 .../layout/vector_preference_push_rule.xml    |   7 +-
 .../res/layout/view_room_widgets_banner.xml   |   2 +-
 vector/src/main/res/values/styles_buttons.xml |   4 -
 .../src/main/res/values/styles_text_view.xml  |   8 ++
 .../src/main/res/values/text_appearances.xml  | 102 ++++++++++--------
 vector/src/main/res/values/theme_dark.xml     |  11 ++
 vector/src/main/res/values/theme_light.xml    |  11 ++
 46 files changed, 395 insertions(+), 164 deletions(-)
 create mode 100644 vector/src/debug/res/layout/debug_text_appearance.xml
 create mode 100644 vector/src/main/res/values/styles_text_view.xml

diff --git a/vector/src/debug/res/layout/activity_debug_button_styles.xml b/vector/src/debug/res/layout/activity_debug_button_styles.xml
index 3973f7cbb6..b0baab6e38 100644
--- a/vector/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/vector/src/debug/res/layout/activity_debug_button_styles.xml
@@ -12,12 +12,19 @@
         android:orientation="vertical"
         android:padding="16dp">
 
+        <!-- Note: Default style is @style/VectorButtonStyle in the theme -->
         <Button
             style="@style/VectorButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
+        <Button
+            style="@style/VectorButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Line1\nLine 2" />
+
         <Button
             style="@style/VectorButtonStyle"
             android:layout_width="wrap_content"
diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/vector/src/debug/res/layout/activity_test_material_theme.xml
index 486c23478f..07b54ec0dd 100644
--- a/vector/src/debug/res/layout/activity_test_material_theme.xml
+++ b/vector/src/debug/res/layout/activity_test_material_theme.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".features.debug.DebugMaterialThemeActivity"
-    tools:ignore="HardcodedText">
+    tools:ignore="HardcodedText,MissingPrefix">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -441,6 +441,16 @@
 
                 </com.google.android.material.card.MaterialCardView>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Text appearance" />
+
+                <include
+                    layout="@layout/debug_text_appearance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/vector/src/debug/res/layout/debug_text_appearance.xml b/vector/src/debug/res/layout/debug_text_appearance.xml
new file mode 100644
index 0000000000..39db326618
--- /dev/null
+++ b/vector/src/debug/res/layout/debug_text_appearance.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle"
+        android:textAppearance="@style/VectorTextAppearanceTitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle.M"
+        android:textAppearance="@style/VectorTextAppearanceTitle.M" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceHeadlineM"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle.M"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody\nVectorTextAppearanceBody"
+        android:textAppearance="@style/VectorTextAppearanceBody" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody.M"
+        android:textAppearance="@style/VectorTextAppearanceBody.M" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceButton"
+        android:textAppearance="@style/VectorTextAppearanceButton" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceCaption"
+        android:textAppearance="@style/VectorTextAppearanceCaption" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceMicro"
+        android:textAppearance="@style/VectorTextAppearanceMicro" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Default (VectorTextAppearanceBody)" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index 1e09430254..d3c291b23f 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -28,7 +29,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/signed_out_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/signedOutSubmit"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 555e9c7639..24714aca83 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -29,7 +29,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
             <TextView
@@ -38,7 +39,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_matrix_org_text" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -103,7 +105,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="start"
                 android:text="@string/login_signin_matrix_id_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -149,7 +152,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 87af814769..349ecc9ec5 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -20,14 +20,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
@@ -35,14 +37,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_account_created_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/loginAccountCreatedMessage"
@@ -108,7 +112,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_instruction"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <FrameLayout
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 4d7219b0d8..fed793cc8c 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,11 +22,12 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceCaption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="@string/auth_recaptcha_message" />
+            android:text="@string/auth_recaptcha_message"
+            android:textColor="?vctr_content_secondary" />
 
         <!-- contentDescription does not work on WebView? -->
         <WebView
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index 4456ade772..67f7e1f9c6 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -19,7 +19,8 @@
                 android:id="@+id/loginGenericTextInputFormTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title" />
 
             <TextView
@@ -29,7 +30,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice" />
 
             <TextView
@@ -37,7 +39,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index e66995e96c..264f68685c 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title_2" />
 
             <TextView
@@ -30,7 +31,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice_2" />
 
             <TextView
@@ -39,7 +41,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_email_mandatory_notice_2"
                 tools:visibility="visible" />
@@ -49,7 +52,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 147220990b..c9c2ba2d2d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -18,7 +18,8 @@
                 android:id="@+id/resetPasswordTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
@@ -28,7 +29,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/resetPasswordEmailTil"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index 8ad180b6cd..03d27b1f2d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -19,7 +19,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
@@ -28,7 +29,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_enter_your_email"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/resetPasswordEmailTil"
@@ -54,7 +56,8 @@
                 android:layout_marginTop="8dp"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -62,7 +65,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="16dp"
                 android:text="@string/login_choose_a_new_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <FrameLayout
                 android:id="@+id/passwordContainer"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index cbddb32316..42b8258d99 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -17,14 +17,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
@@ -32,7 +34,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index bae1f2f5e6..f7ee600faf 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -18,14 +18,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
@@ -33,7 +35,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index bce973f9e5..28c11e774e 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -17,7 +17,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
@@ -25,14 +26,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index 6ace2adc20..5a727de099 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -18,7 +18,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
@@ -26,14 +27,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
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 812607bc2c..7a5c9cc74f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -23,7 +23,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:text="@string/login_server_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +37,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
@@ -76,7 +78,8 @@
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -118,7 +121,8 @@
                     android:layout_marginTop="7dp"
                     android:gravity="start"
                     android:text="@string/login_server_modular_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
                     app:layout_constraintStart_toStartOf="parent"
@@ -130,7 +134,7 @@
                     android:layout_height="wrap_content"
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?colorPrimary"
                     app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -158,7 +162,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_server_other_title"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@@ -173,7 +177,8 @@
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index c6f0106da6..3471bf2205 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -20,7 +20,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_server"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId" />
 
             <TextView
@@ -30,7 +31,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
             <im.vector.app.core.platform.CheckableConstraintLayout
@@ -64,7 +66,8 @@
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +81,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:text="@string/login_if_you_re_not_sure_select_this_option"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <im.vector.app.core.platform.CheckableConstraintLayout
@@ -98,7 +102,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_element_matrix_server_and_others"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@@ -113,7 +117,8 @@
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -129,7 +134,8 @@
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_server_modular_learn_more_about_ems"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index fc5fc66285..045e20a1de 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -30,7 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_connect_to_modular" />
 
             <TextView
@@ -39,7 +40,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_modular_text" />
 
             <TextView
@@ -48,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="@string/login_server_modular_learn_more"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?colorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -77,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
@@ -88,7 +90,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_common_notice" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index 1fad3da4b8..fe108fa4aa 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -21,7 +21,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_server_url_form_common_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginServerUrlFormHomeServerUrlTil"
@@ -52,7 +53,7 @@
                 android:paddingEnd="0dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 42a6ca7c67..8862556fd3 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -20,7 +20,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <ImageView
                 android:id="@+id/loginUserIcon"
@@ -36,7 +37,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="Welcome back user!" />
 
             <TextView
@@ -45,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_unknown_user_warning"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="@color/vector_warning_color_2"
                 android:visibility="gone"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index bc7ea032fa..8d7ea34f8a 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -123,7 +124,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index 2b39acb3d6..351fcafd8c 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -21,7 +21,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
@@ -29,7 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFieldTil"
@@ -64,7 +66,8 @@
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_enter_identifier_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/loginChooseAServer"
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index 4087426056..f41ac24b51 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -20,21 +20,24 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_your_matrix_identifier"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="\@user:domain.org" />
 
             <TextView
@@ -42,7 +45,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/login_press_back_to_change"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <TextView
@@ -51,7 +55,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_choose_a_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <FrameLayout
                 android:id="@+id/passwordContainer"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 88b8dd37f3..c16fabc81c 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -36,7 +36,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
                 app:layout_goneMarginTop="0dp"
@@ -48,7 +49,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
@@ -102,7 +104,8 @@
                     android:layout_marginTop="27dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index ae2d3dc563..25ec1ea52a 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -21,14 +21,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_user_name"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_signup_to" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -53,7 +55,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <Button
@@ -84,7 +87,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 79312e1666..38144f0206 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -66,7 +66,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
         app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +110,8 @@
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@@ -133,7 +135,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@@ -157,7 +160,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 0829ae0520..9c6686b140 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -66,7 +66,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
         app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +110,8 @@
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@@ -133,7 +135,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@@ -157,7 +160,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index ef6fc12e04..d41b834ed3 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -18,7 +18,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId"
                 tools:text="@string/login_connect_to" />
 
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index bad4849df9..b295719e09 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,24 +20,26 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/TextAppearance.Vector.Login.Title"
+            style="@style/VectorTextAppearanceTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/login_terms_title"
+            android:textColor="?vctr_content_primary"
             app:layout_constraintTop_toBottomOf="@id/loginLogo" />
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceBody"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 33b369f2f0..00c73d38ed 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -27,7 +27,8 @@
             android:layout_marginTop="52dp"
             android:layout_marginEnd="36dp"
             android:text="@string/login_terms_title"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            android:textAppearance="@style/VectorTextAppearanceTitle"
+            android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginLogo"
@@ -35,13 +36,14 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceBody"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index 9b5132f537..ae1be34abc 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -19,7 +19,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
@@ -27,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_wait_for_email_notice" />
 
             <ProgressBar
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index accb43e244..bb209d0175 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -19,7 +19,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
@@ -27,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_wait_for_email_notice_2" />
 
             <TextView
@@ -37,7 +39,8 @@
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_wait_for_email_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
                 style="@style/VectorHorizontalProgressBar"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 9390edf7a2..a5d40c4f0c 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"-->
+        <!--            android:textAppearance="@style/VectorTextAppearanceCaption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -83,7 +83,7 @@
             android:layout_height="wrap_content"
             android:gravity="start"
             android:text="@string/authentication_error"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?colorError"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 8983498451..8b872778e2 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -94,7 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Title"
+                    android:textAppearance="@style/VectorTextAppearanceTitle"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="15sp"
                     android:textStyle="bold"
                     tools:text="@sample/rooms.json/data/name" />
@@ -106,8 +107,8 @@
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:autoLink="web"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Subtitle"
-                    android:textSize="15sp"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                    android:textColor="?vctr_content_secondary"
                     tools:text="@sample/rooms.json/data/topic" />
 
                 <TextView
@@ -116,7 +117,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp"
                     tools:text="@string/room_preview_no_preview" />
 
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 436d6465c1..65c6024335 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="12dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+    android:textColor="?vctr_content_secondary"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index 81b9570e7e..d09c4f36b4 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="32dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+    android:textAppearance="@style/VectorTextAppearanceTitle"
+    android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 16a77ce9cd..a0252d96ee 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="16dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+    android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index 12ec6c91aa..52baf61315 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,10 +19,11 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/TextAppearance.Vector.Login.Text"
+        style="@style/VectorTextAppearanceBody"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
+        android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@+id/adapter_item_policy_subtitle"
         app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
         app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
@@ -32,11 +33,12 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/TextAppearance.Vector.Login.Text.Small"
+        style="@style/VectorTextAppearanceCaption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:drawablePadding="8dp"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
         app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 7af3262248..78a8e6359e 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -26,7 +26,8 @@
         android:layout_marginTop="40dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/TextAppearance.Vector.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
@@ -39,7 +40,8 @@
         android:layout_marginTop="8dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/TextAppearance.Vector.Subtitle"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteNameView"
@@ -51,7 +53,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:text="@string/send_you_invite"
-        android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index 9df48bbe5d..1028b3210c 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -23,8 +23,8 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:textSize="16sp"
+            android:textAppearance="?textAppearanceListItem"
+            android:textColor="?vctr_content_primary"
             tools:text="Title" />
 
         <TextView
@@ -35,9 +35,8 @@
             android:layout_alignStart="@android:id/title"
             android:maxLines="2"
             android:paddingTop="6dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?textAppearanceListItemSecondary"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             tools:text="Summary"
             tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index 6575078626..c0f6c2efd4 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -17,7 +17,7 @@
         android:paddingTop="8dp"
         android:paddingEnd="12dp"
         android:paddingBottom="8dp"
-        android:textAppearance="@style/TextAppearance.Vector.Title"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_room_active_widgets_banner_text"
         tools:text="2 active widgets" />
 
diff --git a/vector/src/main/res/values/styles_buttons.xml b/vector/src/main/res/values/styles_buttons.xml
index 71f23d71da..9f0b1aace0 100644
--- a/vector/src/main/res/values/styles_buttons.xml
+++ b/vector/src/main/res/values/styles_buttons.xml
@@ -5,8 +5,6 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="VectorButtonStyle.Destructive">
@@ -31,8 +29,6 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="VectorButtonStyleUnelevated.Bot">
diff --git a/vector/src/main/res/values/styles_text_view.xml b/vector/src/main/res/values/styles_text_view.xml
new file mode 100644
index 0000000000..2efd1cee08
--- /dev/null
+++ b/vector/src/main/res/values/styles_text_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView">
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
index 750dcaf10e..d65bcdc6d0 100644
--- a/vector/src/main/res/values/text_appearances.xml
+++ b/vector/src/main/res/values/text_appearances.xml
@@ -1,63 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="TextAppearance.Vector.Title" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
+    <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">32sp</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
+    <style name="VectorTextAppearanceTitle.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle2" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">14sp</item>
+    <style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
+        <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Login.Title" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:letterSpacing">0</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Login.Title.Small">
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Login.Text" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">16sp</item>
+    <style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0</item>
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Login.Text.Small">
+    <style name="VectorTextAppearanceSubtitle.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <!-- Note: this is the default text appearance for all the TextViews -->
+    <style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">20sp</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+    <style name="VectorTextAppearanceBody.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">12sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">16sp</item>
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
+    <style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">10sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">16sp</item>
+    </style>
+
+    <style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
+        <item name="lineHeight">24sp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 50a6e99d9b..bf03ab878d 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -63,7 +63,18 @@
         <item name="android:colorBackground">@color/element_background_dark</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
+        <!--Material type attributes-->
+        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
+        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <!-- Default Text appearance for TextViews -->
+        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
+        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+
         <!-- Default styles -->
+        <item name="android:textViewStyle">@style/VectorTextView</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 256695f833..758b120c5f 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -63,7 +63,18 @@
         <item name="android:colorBackground">@color/element_background_light</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
+        <!--Material type attributes-->
+        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
+        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <!-- Default Text appearance for TextViews -->
+        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <!-- Text appearance for List item -->
+        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+
         <!-- Default styles -->
+        <item name="android:textViewStyle">@style/VectorTextView</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>