From 886076403da606276fe9bdbb1389b8d979aa38b3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Dec 2022 12:56:48 +0100
Subject: [PATCH] Remove unused resources

---
 .../color/button_background_tint_selector.xml |   5 -
 .../main/res/color/color_primary_alpha25.xml  |   6 -
 .../main/res/drawable/element_logo_green.xml  |  22 ----
 .../transition/image_preview_transition.xml   |  14 ---
 .../res/values/attrs_room_message_colors.xml  |  14 ---
 .../main/res/values/colors_message_bubble.xml |  11 --
 .../main/res/values/style_action_button.xml   |   9 --
 .../src/main/res/values/style_snackbar.xml    |  16 ---
 .../main/res/values/styles_action_mode.xml    |  12 --
 .../main/res/values/styles_alert_dialog.xml   |  40 -------
 .../main/res/values/styles_app_bar_layout.xml |   9 --
 .../main/res/values/styles_bottom_sheet.xml   |  56 ----------
 .../src/main/res/values/styles_buttons.xml    |  76 -------------
 .../res/values/styles_devices_management.xml  |  17 ---
 .../src/main/res/values/styles_edit_text.xml  |  12 +-
 .../main/res/values/styles_jump_to_unread.xml |  27 -----
 .../src/main/res/values/styles_location.xml   |  57 ----------
 .../src/main/res/values/styles_login.xml      |  53 ---------
 .../src/main/res/values/styles_popup.xml      |  11 --
 .../res/values/styles_text_input_layout.xml   |  17 ---
 .../src/main/res/values/styles_text_view.xml  |  56 ----------
 .../src/main/res/values/styles_timeline.xml   |  30 -----
 .../src/main/res/values/styles_toolbar.xml    |  52 ---------
 .../res/values/styles_voice_broadcast.xml     |  19 ----
 .../src/main/res/values/text_appearances.xml  | 104 ------------------
 .../src/main/res/values/theme_light.xml       |  51 +--------
 .../color/selector_rich_text_menu_icon.xml    |   0
 .../bg_composer_rich_bottom_sheet.xml         |   7 --
 .../src/main/res/drawable/bg_send.xml         |  13 ---
 .../src/main/res/drawable/ic_attachment.xml   |  21 ----
 .../src/main/res/drawable/ic_edit.xml         |  20 ----
 .../src/main/res/drawable/ic_send.xml         |  10 --
 32 files changed, 2 insertions(+), 865 deletions(-)
 delete mode 100644 libraries/elementresources/src/main/res/color/button_background_tint_selector.xml
 delete mode 100644 libraries/elementresources/src/main/res/color/color_primary_alpha25.xml
 delete mode 100644 libraries/elementresources/src/main/res/drawable/element_logo_green.xml
 delete mode 100644 libraries/elementresources/src/main/res/transition/image_preview_transition.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/attrs_room_message_colors.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/colors_message_bubble.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/style_action_button.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/style_snackbar.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_action_mode.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_alert_dialog.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_app_bar_layout.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_buttons.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_devices_management.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_jump_to_unread.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_location.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_login.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_popup.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_text_input_layout.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_text_view.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_timeline.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_toolbar.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/styles_voice_broadcast.xml
 delete mode 100644 libraries/elementresources/src/main/res/values/text_appearances.xml
 rename libraries/{elementresources => textcomposer}/src/main/res/color/selector_rich_text_menu_icon.xml (100%)
 delete mode 100644 libraries/textcomposer/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml
 delete mode 100644 libraries/textcomposer/src/main/res/drawable/bg_send.xml
 delete mode 100644 libraries/textcomposer/src/main/res/drawable/ic_attachment.xml
 delete mode 100644 libraries/textcomposer/src/main/res/drawable/ic_edit.xml
 delete mode 100644 libraries/textcomposer/src/main/res/drawable/ic_send.xml

diff --git a/libraries/elementresources/src/main/res/color/button_background_tint_selector.xml b/libraries/elementresources/src/main/res/color/button_background_tint_selector.xml
deleted file mode 100644
index 57135b1eb9..0000000000
--- a/libraries/elementresources/src/main/res/color/button_background_tint_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/color_primary_alpha25" android:state_enabled="false" />
-    <item android:color="?colorPrimary" android:state_enabled="true" />
-</selector>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/color/color_primary_alpha25.xml b/libraries/elementresources/src/main/res/color/color_primary_alpha25.xml
deleted file mode 100644
index 5afa385f3c..0000000000
--- a/libraries/elementresources/src/main/res/color/color_primary_alpha25.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:alpha="0.25" android:color="?colorPrimary" />
-
-</selector>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/drawable/element_logo_green.xml b/libraries/elementresources/src/main/res/drawable/element_logo_green.xml
deleted file mode 100644
index 33c066a636..0000000000
--- a/libraries/elementresources/src/main/res/drawable/element_logo_green.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-    <path
-        android:pathData="M23.04,3.84C23.04,1.7192 24.7593,0 26.88,0C41.0185,0 52.48,11.4615 52.48,25.6C52.48,27.7208 50.7608,29.44 48.64,29.44C46.5193,29.44 44.8,27.7208 44.8,25.6C44.8,15.7031 36.777,7.68 26.88,7.68C24.7593,7.68 23.04,5.9608 23.04,3.84Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M40.96,60.16C40.96,62.2808 39.2407,64 37.12,64C22.9815,64 11.52,52.5385 11.52,38.4C11.52,36.2792 13.2392,34.56 15.36,34.56C17.4807,34.56 19.2,36.2792 19.2,38.4C19.2,48.2969 27.223,56.32 37.12,56.32C39.2407,56.32 40.96,58.0392 40.96,60.16Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M3.84,40.96C1.7192,40.96 -0,39.2407 -0,37.12C-0,22.9815 11.4615,11.52 25.6,11.52C27.7208,11.52 29.44,13.2392 29.44,15.36C29.44,17.4807 27.7208,19.2 25.6,19.2C15.7031,19.2 7.68,27.223 7.68,37.12C7.68,39.2407 5.9608,40.96 3.84,40.96Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M60.16,23.04C62.2808,23.04 64,24.7593 64,26.88C64,41.0185 52.5385,52.48 38.4,52.48C36.2792,52.48 34.56,50.7608 34.56,48.64C34.56,46.5193 36.2792,44.8 38.4,44.8C48.2969,44.8 56.32,36.777 56.32,26.88C56.32,24.7593 58.0392,23.04 60.16,23.04Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd" />
-</vector>
diff --git a/libraries/elementresources/src/main/res/transition/image_preview_transition.xml b/libraries/elementresources/src/main/res/transition/image_preview_transition.xml
deleted file mode 100644
index 4ad8f83dfd..0000000000
--- a/libraries/elementresources/src/main/res/transition/image_preview_transition.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-    The transitions which us used for the entrance and exit of shared elements. Here we declare
-    two different transitions which are targeting specific views.
--->
-<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200">
-
-    <!-- changeBounds is used for the TextViews which are shared -->
-    <changeBounds />
-
-    <!-- changeImageTransform is used for the ImageViews which are shared -->
-    <changeImageTransform />
-
-</transitionSet>
diff --git a/libraries/elementresources/src/main/res/values/attrs_room_message_colors.xml b/libraries/elementresources/src/main/res/values/attrs_room_message_colors.xml
deleted file mode 100644
index 68b64c21b0..0000000000
--- a/libraries/elementresources/src/main/res/values/attrs_room_message_colors.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- room message colors -->
-    <attr name="vctr_unsent_message_text_color" format="color" />
-    <attr name="vctr_message_text_color" format="color" />
-    <attr name="vctr_notice_text_color" format="color" />
-    <attr name="vctr_notice_secondary" format="color" />
-    <attr name="vctr_encrypting_message_text_color" format="color" />
-    <attr name="vctr_sending_message_text_color" format="color" />
-    <attr name="vctr_markdown_block_background_color" format="color" />
-    <attr name="vctr_spoiler_background_color" format="color" />
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/colors_message_bubble.xml b/libraries/elementresources/src/main/res/values/colors_message_bubble.xml
deleted file mode 100644
index 7ac68574b6..0000000000
--- a/libraries/elementresources/src/main/res/values/colors_message_bubble.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Timeline bubble background colors -->
-    <attr name="vctr_message_bubble_inbound" format="color" />
-    <color name="vctr_message_bubble_inbound_light">#E8EDF4</color>
-    <color name="vctr_message_bubble_inbound_dark">#21262C</color>
-    <attr name="vctr_message_bubble_outbound" format="color" />
-    <color name="vctr_message_bubble_outbound_light">#E7F8F3</color>
-    <color name="vctr_message_bubble_outbound_dark">#133A34</color>
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/style_action_button.xml b/libraries/elementresources/src/main/res/values/style_action_button.xml
deleted file mode 100644
index dd5c424707..0000000000
--- a/libraries/elementresources/src/main/res/values/style_action_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.ActionButton" parent="Widget.AppCompat.ActionButton">
-        <item name="android:paddingStart">5dp</item>
-        <item name="android:paddingEnd">5dp</item>
-        <item name="android:minWidth">0dp</item>
-    </style>
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/style_snackbar.xml b/libraries/elementresources/src/main/res/values/style_snackbar.xml
deleted file mode 100644
index 82b2120c71..0000000000
--- a/libraries/elementresources/src/main/res/values/style_snackbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.SnackBar" parent="@style/Widget.MaterialComponents.Snackbar">
-        <!--        <item name="android:background">@color/notification_accent_color</item>-->
-    </style>
-
-    <style name="Widget.Vector.SnackBar.Button" parent="@style/Widget.Vector.Button.Text.OnPrimary">
-        <!--        <item name="android:textColor">@color/white</item>-->
-    </style>
-
-    <style name="Widget.Vector.SnackBar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
-        <!--        <item name="android:textColor">@color/white</item>-->
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_action_mode.xml b/libraries/elementresources/src/main/res/values/styles_action_mode.xml
deleted file mode 100644
index f6e6079633..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_action_mode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Action mode style -->
-    <style name="Widget.Vector.ActionMode" parent="Widget.AppCompat.ActionMode">
-        <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/Widget.Vector.TextView.Title</item>
-        <item name="subtitleTextStyle">@style/Widget.Vector.TextView.Subtitle</item>
-        <item name="actionMenuTextColor">?colorOnPrimary</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_alert_dialog.xml b/libraries/elementresources/src/main/res/values/styles_alert_dialog.xml
deleted file mode 100644
index 69abc85c39..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_alert_dialog.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ThemeOverlay.Vector.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.Vector.Title.Text</item>
-        <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.Vector.Body.Text</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
-    </style>
-
-    <style name="ThemeOverlay.Vector.MaterialAlertDialog.Destructive">
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog.Destructive</item>
-    </style>
-
-    <style name="ThemeOverlay.Vector.MaterialAlertDialog.NegativeDestructive">
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog.Destructive</item>
-    </style>
-
-    <!-- Title -->
-    <style name="MaterialAlertDialog.Vector.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
-    </style>
-
-    <!-- Body -->
-    <style name="MaterialAlertDialog.Vector.Body.Text" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
-        <item name="lineHeight">20sp</item>
-    </style>
-
-    <!-- Buttons -->
-    <style name="Widget.Vector.Button.TextButton.Dialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
-    </style>
-
-    <style name="Widget.Vector.Button.TextButton.Dialog.Destructive">
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_app_bar_layout.xml b/libraries/elementresources/src/main/res/values/styles_app_bar_layout.xml
deleted file mode 100644
index 973a2c5e4a..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_app_bar_layout.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Primary">
-        <item name="android:background">?vctr_toolbar_background</item>
-        <item name="elevation">4dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_bottom_sheet.xml b/libraries/elementresources/src/main/res/values/styles_bottom_sheet.xml
index f6c30040d9..a48071cb71 100644
--- a/libraries/elementresources/src/main/res/values/styles_bottom_sheet.xml
+++ b/libraries/elementresources/src/main/res/values/styles_bottom_sheet.xml
@@ -1,62 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- BottomSheet theming -->
-    <style name="Theme.Vector.BottomSheetDialog.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_light</item>
-        <item name="colorOnPrimary">@color/palette_white</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorOnSecondary">@color/palette_white</item>
-        <item name="colorSurface">@color/element_background_light</item>
-        <item name="colorOnSurface">@color/element_content_primary_light</item>
-        <item name="colorError">@color/element_alert_light</item>
-        <item name="colorOnError">@color/palette_white</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_light</item>
-        <item name="android:textColorLink">@color/element_link_light</item>
-    </style>
-
-    <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_dark</item>
-        <item name="colorOnPrimary">@color/palette_white</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorOnSecondary">@color/palette_white</item>
-        <item name="colorSurface">@color/element_background_dark</item>
-        <item name="colorOnSurface">@color/element_content_primary_dark</item>
-        <item name="colorError">@color/element_alert_dark</item>
-        <item name="colorOnError">@color/palette_white</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
-        <item name="android:textColorLink">@color/element_link_dark</item>
-    </style>
-
-    <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
-        <item name="colorSurface">@color/element_background_black</item>
-    </style>
-
-    <!-- BottomSheet style -->
-    <style name="BottomSheetItemTextMain">
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="BottomSheetItemTextSecondary">
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <style name="BottomSheetItemTime">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/libraries/elementresources/src/main/res/values/styles_buttons.xml b/libraries/elementresources/src/main/res/values/styles_buttons.xml
deleted file mode 100644
index db78fcf338..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_buttons.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.Button" parent="Widget.MaterialComponents.Button">
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
-        <item name="cornerRadius">8dp</item>
-        <item name="lineHeight">24sp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.CallToAction" parent="Widget.Vector.Button">
-        <item name="android:backgroundTint">@color/button_background_tint_selector</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Destructive">
-        <item name="android:minWidth">94dp</item>
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
-    </style>
-
-    <style name="VectorMaterialThemeOverlayDestructive">
-        <item name="colorPrimary">?colorError</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Positive">
-        <item name="android:minWidth">94dp</item>
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
-    </style>
-
-    <style name="VectorMaterialThemeOverlayPositive">
-        <!-- Keep default colors from the theme -->
-    </style>
-
-    <style name="Widget.Vector.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="colorControlHighlight">?colorSecondary</item>
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
-        <item name="cornerRadius">8dp</item>
-        <item name="lineHeight">24sp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.Destructive">
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.OnPrimary">
-        <item name="colorControlHighlight">?colorOnPrimary</item>
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textAllCaps">false</item>
-        <item name="strokeColor">@color/button_background_tint_selector</item>
-        <item name="strokeWidth">1dp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
-        <item name="cornerRadius">8dp</item>
-        <item name="lineHeight">24sp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.Alerter">
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
-    </style>
-
-    <style name="VectorMaterialThemeOverlayOnPrimary">
-        <item name="colorPrimary">?colorOnPrimary</item>
-    </style>
-
-    <style name="Widget.Vector.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_devices_management.xml b/libraries/elementresources/src/main/res/values/styles_devices_management.xml
deleted file mode 100644
index 6b42b85ffd..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_devices_management.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="TextAppearance.Vector.Subtitle.DevicesManagement">
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Subtitle.Medium.DevicesManagement">
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.DevicesManagement">
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:drawablePadding">12dp</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_edit_text.xml b/libraries/elementresources/src/main/res/values/styles_edit_text.xml
index 94f4d86160..a4458d8e4e 100644
--- a/libraries/elementresources/src/main/res/values/styles_edit_text.xml
+++ b/libraries/elementresources/src/main/res/values/styles_edit_text.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Vector.EditText.Composer" parent="Widget.AppCompat.EditText">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:inputType">textCapSentences|textMultiLine</item>
-        <item name="android:maxLines">10</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="android:padding">8dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">?vctr_message_text_color</item>
-    </style>
-
     <style name="Widget.Vector.EditText.RichTextComposer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
@@ -21,7 +11,7 @@
         <item name="paddingStart">12dp</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:textSize">15sp</item>
-        <item name="android:textColor">?vctr_message_text_color</item>
+        <item name="android:textColor">@color/element_content_primary_light</item>
     </style>
 
 </resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_jump_to_unread.xml b/libraries/elementresources/src/main/res/values/styles_jump_to_unread.xml
deleted file mode 100644
index 21f0ebd5d4..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_jump_to_unread.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <attr name="vctr_jump_to_unread_style" format="reference" />
-
-    <style name="Widget.Vector.JumpToUnread.Base" parent="Widget.MaterialComponents.Chip.Action">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
-        <item name="chipEndPadding">12dp</item>
-        <item name="chipIconSize">24dp</item>
-        <item name="chipMinHeight">44dp</item>
-        <item name="chipStartPadding">12dp</item>
-        <item name="closeIconVisible">true</item>
-        <item name="android:elevation">6dp</item>
-        <item name="closeIconSize">24dp</item>
-    </style>
-
-    <style name="Widget.Vector.JumpToUnread.Light" parent="Widget.Vector.JumpToUnread.Base">
-        <item name="chipBackgroundColor">@color/element_background_light</item>
-        <item name="closeIconTint">?vctr_content_secondary</item>
-    </style>
-
-    <style name="Widget.Vector.JumpToUnread.Dark" parent="Widget.Vector.JumpToUnread.Base">
-        <item name="chipBackgroundColor">@color/element_system_dark</item>
-        <item name="closeIconTint">?vctr_content_quaternary</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_location.xml b/libraries/elementresources/src/main/res/values/styles_location.xml
deleted file mode 100644
index ee893046ba..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_location.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.Button.Text.OnPrimary.LiveLocation">
-        <item name="android:foreground">?selectableItemBackground</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">0dp</item>
-        <item name="android:minWidth">0dp</item>
-        <item name="android:insetRight">8dp</item>
-        <item name="android:insetLeft">8dp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.LiveLocation">
-        <item name="android:foreground">?selectableItemBackground</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
-        <item name="android:textColor">?colorError</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">0dp</item>
-        <item name="android:minWidth">0dp</item>
-        <item name="android:insetRight">12dp</item>
-        <item name="android:insetLeft">12dp</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.BottomSheetDisplayName">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.BottomSheetRemainingTime">
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.BottomSheetLastUpdatedAt">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">?vctr_content_tertiary</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.BottomSheetStopSharing">
-        <item name="android:foreground">?selectableItemBackground</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
-        <item name="android:textColor">?colorError</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">0dp</item>
-        <item name="android:minWidth">0dp</item>
-        <item name="android:insetRight">16dp</item>
-        <item name="android:insetLeft">16dp</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Nano.Copyright">
-        <!-- Static map view is always light in both light and dark theme. So we need to use a static dark color -->
-        <item name="android:textColor">@color/element_content_primary_light</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_login.xml b/libraries/elementresources/src/main/res/values/styles_login.xml
deleted file mode 100644
index ab2cb44c5a..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_login.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <item name="loginLogo" type="id" />
-    <item name="loginFormScrollView" type="id" />
-    <item name="loginFormContainer" type="id" />
-
-    <style name="LoginLogo">
-        <item name="android:id">@id/loginLogo</item>
-        <item name="android:layout_width">60dp</item>
-        <item name="android:layout_height">60dp</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:layout_marginBottom">36dp</item>
-        <item name="android:src">@drawable/element_logo_green</item>
-        <item name="android:transitionName">loginLogoTransition</item>
-        <item name="android:importantForAccessibility">no</item>
-    </style>
-
-    <style name="LoginFormContainer">
-        <item name="android:id">@id/loginFormContainer</item>
-        <item name="android:paddingTop">36dp</item>
-        <item name="android:paddingStart">36dp</item>
-        <item name="android:paddingEnd">36dp</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="LoginFormScrollView">
-        <item name="android:id">@id/loginFormScrollView</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:clipToPadding">false</item>
-        <item name="android:paddingTop">32dp</item>
-        <item name="android:paddingBottom">32dp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Login">
-        <item name="android:minHeight">52dp</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Outlined.Login">
-        <item name="android:minHeight">52dp</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Text.Login">
-        <item name="android:minHeight">52dp</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_popup.xml b/libraries/elementresources/src/main/res/values/styles_popup.xml
deleted file mode 100644
index 2aad848989..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_popup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.PopupMenu" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:dropDownHorizontalOffset">0dp</item>
-        <item name="android:dropDownVerticalOffset">0dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_text_input_layout.xml b/libraries/elementresources/src/main/res/values/styles_text_input_layout.xml
deleted file mode 100644
index 4e7a687a7a..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_text_input_layout.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Default style for TextInputLayout -->
-    <style name="Widget.Vector.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
-
-    <style name="Widget.Vector.TextInputLayout.Password">
-        <item name="endIconMode">password_toggle</item>
-        <item name="endIconTint">?vctr_content_secondary</item>
-    </style>
-
-    <style name="Widget.Vector.TextInputLayout.Username">
-        <item name="endIconMode">clear_text</item>
-        <item name="endIconTint">?vctr_content_secondary</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/libraries/elementresources/src/main/res/values/styles_text_view.xml b/libraries/elementresources/src/main/res/values/styles_text_view.xml
deleted file mode 100644
index 0dcaf30f48..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_text_view.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-        Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
-    -->
-
-    <style name="Widget.Vector.TextView" parent="Widget.MaterialComponents.TextView" />
-
-    <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
-    <style name="Widget.Vector.TextView.Title">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
-        <item name="lineHeight">32sp</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Title.Medium">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.HeadlineMedium">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Subtitle">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Subtitle.Medium">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Body">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
-        <item name="lineHeight">20sp</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Body.Medium">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Caption">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
-        <item name="lineHeight">16sp</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Micro">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
-        <item name="lineHeight">16sp</item>
-    </style>
-
-    <style name="Widget.Vector.TextView.Nano">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Nano</item>
-        <item name="lineHeight">16sp</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_timeline.xml b/libraries/elementresources/src/main/res/values/styles_timeline.xml
deleted file mode 100644
index 9cae19d6b2..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_timeline.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="TimelineContentStubBaseParams">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="TimelineContentStubContainerParams">
-        <item name="android:paddingStart">8dp</item>
-        <item name="android:paddingEnd">8dp</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">4dp</item>
-    </style>
-
-    <style name="TimelineReactionView">
-        <item name="android:paddingStart">6dp</item>
-        <item name="android:paddingEnd">6dp</item>
-        <item name="android:paddingTop">1dp</item>
-        <item name="android:paddingBottom">1dp</item>
-        <item name="android:minHeight">28dp</item>
-        <item name="android:minWidth">40dp</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="TimelineFixedSizeCaptionStyle" parent="@style/Widget.Vector.TextView.Caption">
-        <item name="android:textSize" tools:ignore="SpUsage">12dp</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_toolbar.xml b/libraries/elementresources/src/main/res/values/styles_toolbar.xml
deleted file mode 100644
index 893de92aae..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_toolbar.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.Vector.Toolbar.Base" parent="Widget.MaterialComponents.Toolbar">
-        <item name="android:background">?vctr_toolbar_background</item>
-        <item name="elevation">0dp</item>
-
-        <!-- main text -->
-        <item name="titleTextAppearance">@style/TextAppearance.Vector.Widget.ActionBarTitle</item>
-
-        <!-- sub text -->
-        <item name="subtitleTextAppearance">@style/TextAppearance.Vector.Widget.ActionBarSubTitle</item>
-
-        <item name="navigationIconTint">?vctr_content_secondary</item>
-    </style>
-
-    <!-- Default toolbar style -->
-    <style name="Widget.Vector.Toolbar" parent="Widget.Vector.Toolbar.Base">
-        <item name="contentInsetStartWithNavigation">0dp</item>
-    </style>
-
-    <!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
-    <style name="Widget.Vector.Toolbar.Settings" parent="Widget.Vector.Toolbar.Base" />
-
-    <!-- Toolbar text style -->
-    <!-- main text -->
-    <style name="TextAppearance.Vector.Widget.ActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <!-- sub text -->
-    <style name="TextAppearance.Vector.Widget.ActionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <!-- Material 3 -->
-
-    <style name="Widget.Vector.Material3.Toolbar" parent="Widget.Material3.Toolbar" />
-
-    <style name="Widget.Vector.Material3.CollapsingToolbar.Medium" parent="Widget.Material3.CollapsingToolbar.Medium">
-        <item name="expandedTitleTextAppearance">@style/TextAppearance.Vector.Title.Medium</item>
-        <item name="expandedTitleMarginBottom">20dp</item>
-        <item name="collapsedTitleTextAppearance">@style/TextAppearance.Vector.Headline.Bold</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/styles_voice_broadcast.xml b/libraries/elementresources/src/main/res/values/styles_voice_broadcast.xml
deleted file mode 100644
index eb85378141..0000000000
--- a/libraries/elementresources/src/main/res/values/styles_voice_broadcast.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="VoiceBroadcastLiveIndicator" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">20dp</item>
-        <item name="android:backgroundTint">?colorError</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:maxWidth">100dp</item>
-        <item name="android:paddingEnd">4dp</item>
-        <item name="android:paddingStart">4dp</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textColor">?colorOnError</item>
-        <item name="drawableTint">?colorOnError</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/text_appearances.xml b/libraries/elementresources/src/main/res/values/text_appearances.xml
deleted file mode 100644
index 570d26fdfd..0000000000
--- a/libraries/elementresources/src/main/res/values/text_appearances.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!--
-    Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
-
-    Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d
-    List of supported attributes for a TextAppearance:
-    https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723
-
-    Do not use TextAppearance directly, use Widget.Vector.TextView style instead
-    -->
-
-    <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_title</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Title.Medium">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Headline.Medium" parent="TextAppearance.MaterialComponents.Headline1">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">@dimen/text_size_headline</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Headline.Bold" parent="TextAppearance.MaterialComponents.Headline1">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">@dimen/text_size_headline</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_subtitle</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Subtitle.Medium">
-        <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="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_body</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.Medium">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Body.OnError">
-        <item name="android:textColor">?colorOnError</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Caption" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_caption</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Micro" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_micro</item>
-        <item name="android:letterSpacing">0</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">@dimen/text_size_button</item>
-        <item name="android:letterSpacing">0.02</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Nano" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_nano</item>
-        <item name="android:letterSpacing">0</item>
-    </style>
-
-</resources>
diff --git a/libraries/elementresources/src/main/res/values/theme_light.xml b/libraries/elementresources/src/main/res/values/theme_light.xml
index 1e391e2c85..81839a70c1 100644
--- a/libraries/elementresources/src/main/res/values/theme_light.xml
+++ b/libraries/elementresources/src/main/res/values/theme_light.xml
@@ -26,20 +26,8 @@
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_light</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_light</item>
         <item name="vctr_toolbar_background">@color/element_background_light</item>
-        <item name="vctr_message_bubble_inbound">@color/vctr_message_bubble_inbound_light</item>
-        <item name="vctr_message_bubble_outbound">@color/vctr_message_bubble_outbound_light</item>
         <item name="vctr_badge_color_border">@color/vctr_badge_color_border_light</item>
 
-        <!-- room message colors -->
-        <item name="vctr_notice_secondary">#61708B</item>
-        <item name="vctr_unsent_message_text_color">?colorError</item>
-        <item name="vctr_message_text_color">@color/element_content_primary_light</item>
-        <item name="vctr_notice_text_color">#FF61708b</item>
-        <item name="vctr_encrypting_message_text_color">@color/palette_element_green</item>
-        <item name="vctr_sending_message_text_color">@color/element_content_secondary_light</item>
-        <item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
-        <item name="vctr_spoiler_background_color">#FF000000</item>
-
         <!-- Presence Indicator colors -->
         <item name="vctr_presence_indicator_offline">@color/vctr_presence_indicator_offline_light</item>
         <item name="vctr_presence_indicator_online">@color/vctr_presence_indicator_online_light</item>
@@ -67,36 +55,7 @@
         <item name="android:colorBackground">@color/element_background_light</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
-        <!--Material type attributes-->
-        <item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
-        <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
-        <!-- Default Text appearance for TextViews -->
-        <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
-        <!-- Text appearance for List item -->
-        <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
-        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
-        <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
-
-        <!-- Default styles -->
-        <item name="android:textViewStyle">@style/Widget.Vector.TextView.Body</item>
-        <item name="materialButtonStyle">@style/Widget.Vector.Button</item>
-        <item name="toolbarStyle">@style/Widget.Vector.Toolbar</item>
-        <!--
-        <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
-        <item name="searchViewStyle">@style/Widget.Vector.SearchView</item>
-        -->
-        <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
-        <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
-        <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
-        <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
-        <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
-        <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
-        <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
-
         <!-- Default theme -->
-        <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Vector.MaterialAlertDialog</item>
-
         <item name="android:textColorLink">@color/element_link_light</item>
 
         <!-- Menu text color -->
@@ -132,10 +91,6 @@
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
 
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-
         <!--
         <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light</item>
         <item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Light</item>
@@ -145,8 +100,6 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
         -->
 
-        <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
-
         <!-- Keywords -->
         <!--
         <item name="vctr_keyword_style">@style/Widget.Vector.Keyword</item>
@@ -154,8 +107,6 @@
 
         <item name="vctr_toast_background">@color/vctr_toast_background_light</item>
 
-        <item name="android:actionButtonStyle">@style/Widget.Vector.ActionButton</item>
-
         <!-- Location sharing -->
         <item name="vctr_live_location">@color/vctr_live_location_light</item>
 
@@ -166,4 +117,4 @@
         <item name="vctr_rich_text_editor_menu_button_background">@color/vctr_rich_text_editor_menu_button_background_light</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/libraries/elementresources/src/main/res/color/selector_rich_text_menu_icon.xml b/libraries/textcomposer/src/main/res/color/selector_rich_text_menu_icon.xml
similarity index 100%
rename from libraries/elementresources/src/main/res/color/selector_rich_text_menu_icon.xml
rename to libraries/textcomposer/src/main/res/color/selector_rich_text_menu_icon.xml
diff --git a/libraries/textcomposer/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml b/libraries/textcomposer/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml
deleted file mode 100644
index ab91f2f496..0000000000
--- a/libraries/textcomposer/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?android:colorBackground" />
-    <corners
-        android:topLeftRadius="24dp"
-        android:topRightRadius="24dp" />
-</shape>
diff --git a/libraries/textcomposer/src/main/res/drawable/bg_send.xml b/libraries/textcomposer/src/main/res/drawable/bg_send.xml
deleted file mode 100644
index 06090b3f96..0000000000
--- a/libraries/textcomposer/src/main/res/drawable/bg_send.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:top="10dp">
-        <shape android:shape="oval">
-            <solid android:color="?colorPrimary" />
-        </shape>
-    </item>
-    <item android:drawable="?attr/selectableItemBackground" />
-</layer-list>
\ No newline at end of file
diff --git a/libraries/textcomposer/src/main/res/drawable/ic_attachment.xml b/libraries/textcomposer/src/main/res/drawable/ic_attachment.xml
deleted file mode 100644
index 8f2deff482..0000000000
--- a/libraries/textcomposer/src/main/res/drawable/ic_attachment.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-    <path
-        android:fillColor="?vctr_content_quinary"
-        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M10.0009,16H22.0009"
-        android:strokeWidth="1.5"
-        android:strokeColor="?vctr_content_secondary"
-        android:strokeLineCap="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M16.0009,10V22"
-        android:strokeWidth="1.5"
-        android:strokeColor="?vctr_content_secondary"
-        android:strokeLineCap="round" />
-</vector>
diff --git a/libraries/textcomposer/src/main/res/drawable/ic_edit.xml b/libraries/textcomposer/src/main/res/drawable/ic_edit.xml
deleted file mode 100644
index 048c153f5f..0000000000
--- a/libraries/textcomposer/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M4,18.6666L20,18.6666"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M6.6667,14L16.0001,4.6666"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round" />
-</vector>
diff --git a/libraries/textcomposer/src/main/res/drawable/ic_send.xml b/libraries/textcomposer/src/main/res/drawable/ic_send.xml
deleted file mode 100644
index 7e415e2803..0000000000
--- a/libraries/textcomposer/src/main/res/drawable/ic_send.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector android:autoMirrored="true"
-    android:height="20dp"
-    android:viewportHeight="20"
-    android:viewportWidth="20"
-    android:width="20dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M18.7922,11.1454L2.3564,19.3594C1.2489,19.9131 0.0966,18.7254 0.6379,17.6419C0.6379,17.6419 2.675,13.5282 3.2353,12.4507C3.7956,11.3731 4.437,11.1866 10.3935,10.4168C10.6139,10.3883 10.7943,10.2219 10.7943,9.9998C10.7943,9.778 10.6139,9.6117 10.3935,9.5832C4.437,8.8133 3.7956,8.6268 3.2353,7.5493C2.675,6.4721 0.6379,2.358 0.6379,2.358C0.0966,1.2749 1.2489,0.0869 2.3564,0.6405L18.7922,8.8549C19.7359,9.3262 19.7359,10.6738 18.7922,11.1454Z" />
-</vector>