diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9f049d4424..095866d4b6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -389,8 +389,6 @@
         <item name="message_selected">@color/classic_dark_2</item>
     </style>
 
-    <style name="Classic.Dark.Test" parent="Theme.Session.DayNight.NoActionBar"/>
-
     <style name="Classic.Light">
         <!-- Main styles -->
         <item name="sessionLogoTint">@color/classic_light_0</item>
@@ -645,4 +643,86 @@
         <item name="message_selected">@color/ocean_light_5</item>
     </style>
 
+    <!-- For testing / XML rendering -->
+    <style name="Theme.Session.DayNight.NoActionBar.Test" parent="Base.Theme.Session">
+        <item name="dividerVertical">?android:textColorTertiary</item>
+        <item name="dividerHorizontal">?dividerVertical</item>
+        <item name="colorAccent">@color/classic_accent</item>
+
+        <item name="sessionLogoTint">@color/classic_dark_6</item>
+        <item name="colorPrimary">@color/classic_dark_0</item>
+        <item name="colorPrimaryDark">@color/classic_dark_0</item>
+        <item name="colorControlNormal">?android:textColorPrimary</item>
+        <item name="colorControlActivated">?colorAccent</item>
+        <item name="android:colorControlHighlight">?colorAccent</item>
+        <item name="android:textColorPrimary">@color/classic_dark_6</item>
+        <item name="android:textColorSecondary">?android:textColorPrimary</item>
+        <item name="android:textColorTertiary">@color/classic_dark_5</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textColorHint">@color/gray27</item>
+        <item name="android:windowBackground">?colorPrimary</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
+        <item name="dialog_background_color">@color/classic_dark_1</item>
+        <item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
+        <item name="actionMenuTextColor">?android:textColorPrimary</item>
+        <item name="popupTheme">?actionBarPopupTheme</item>
+        <item name="colorCellBackground">@color/classic_dark_1</item>
+        <item name="colorSettingsBackground">@color/classic_dark_1</item>
+        <item name="colorDividerBackground">@color/classic_dark_3</item>
+        <item name="colorCellRipple">@color/classic_dark_3</item>
+        <item name="actionBarPopupTheme">@style/Dark.Popup</item>
+        <item name="actionBarWidgetTheme">@null</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
+        <item name="prominentButtonColor">?colorAccent</item>
+        <item name="elementBorderColor">@color/classic_dark_3</item>
+
+        <!-- Home screen -->
+        <item name="searchBackgroundColor">#1B1B1B</item>
+        <item name="searchIconColor">#E5E5E8</item>
+        <item name="searchHintColor">@color/classic_dark_5</item>
+        <item name="searchTextColor">?android:textColorPrimary</item>
+        <item name="searchHighlightTint">?colorAccent</item>
+        <item name="home_gradient_start">#00000000</item>
+        <item name="home_gradient_end">@color/classic_dark_1</item>
+        <item name="conversation_pinned_background_color">?colorCellBackground</item>
+        <item name="conversation_unread_background_color">@color/classic_dark_2</item>
+        <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
+        <item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
+        <item name="unreadIndicatorTextColor">@color/classic_dark_6</item>
+
+        <!-- New conversation button -->
+        <item name="conversation_color_non_main">@color/classic_dark_2</item>
+        <item name="conversation_shadow_non_main">@color/transparent_black_30</item>
+        <item name="conversation_shadow_main">?colorAccent</item>
+        <item name="conversation_menu_background_color">@color/classic_dark_1</item>
+        <item name="conversation_menu_cell_color">?conversation_menu_background_color</item>
+        <item name="conversation_menu_border_color">@color/classic_dark_3</item>
+        <item name="conversationMenuSearchBackgroundColor">@color/classic_dark_0</item>
+
+        <!-- Conversation -->
+        <item name="message_received_background_color">@color/classic_dark_3</item>
+        <item name="message_received_text_color">@color/classic_dark_6</item>
+        <item name="message_sent_background_color">?colorAccent</item>
+        <item name="message_sent_text_color">@color/classic_dark_0</item>
+        <item name="message_status_color">@color/classic_dark_5</item>
+        <item name="input_bar_background">@color/classic_dark_1</item>
+        <item name="input_bar_text_hint">@color/classic_dark_5</item>
+        <item name="input_bar_text_user">@color/classic_dark_6</item>
+        <item name="input_bar_border">@color/classic_dark_3</item>
+        <item name="input_bar_button_background">@color/classic_dark_2</item>
+        <item name="input_bar_button_text_color">@color/classic_dark_6</item>
+        <item name="input_bar_button_background_opaque">@color/classic_dark_2</item>
+        <item name="input_bar_button_background_opaque_border">@color/classic_dark_3</item>
+        <item name="input_bar_lock_view_background">@color/classic_dark_2</item>
+        <item name="input_bar_lock_view_border">@color/classic_dark_3</item>
+        <item name="mention_candidates_view_background">@color/classic_dark_2</item>
+        <item name="mention_candidates_view_background_ripple">@color/classic_dark_3</item>
+        <item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
+        <item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
+        <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
+        <item name="message_selected">@color/classic_dark_2</item>
+    </style>
+
+
 </resources>