diff --git a/res/drawable-xhdpi/background_hd_dark.jpg b/res/drawable-xhdpi/background_hd_dark.jpg
index 48ba9cbd0..7339e673f 100644
Binary files a/res/drawable-xhdpi/background_hd_dark.jpg and b/res/drawable-xhdpi/background_hd_dark.jpg differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b8d76c269..99d4f2779 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,6 +22,11 @@
     <color name="gray78">#ff383838</color>
     <color name="gray95">#ff111111</color>
     <color name="purple_led">#9c1ab1</color>
+    <color name="dark_red">#ff330000</color>
+    <color name="dark_purple">#ff260d1a</color>
+    <color name="light_green">#ffefffde</color>
+    <color name="green">#ff70b15c</color>
+    <color name="light_pink">#ffcdb7b5</color>
 
     <color name="transparent_black_30">#30000000</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b6d07b853..46e8def29 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -13,7 +13,7 @@
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66000000</item>
-        <item name="contact_selection_push_user">#ff000000</item>
+        <item name="contact_selection_push_user">@color/black</item>
         <item name="contact_selection_lay_user">#a0000000</item>
         <item name="contact_selection_header_text">@color/delta_primary_dark</item>
 
@@ -35,7 +35,7 @@
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="contact_selection_push_user">#ffeeeeee</item>
+        <item name="contact_selection_push_user">@color/gray5</item>
         <item name="contact_selection_lay_user">#afeeeeee</item>
         <item name="contact_selection_header_text">#66eeeeee</item>
 
@@ -93,7 +93,7 @@
         <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
-        <item name="conversation_list_deaddrop_bg_color">#ffcccccc</item>
+        <item name="conversation_list_deaddrop_bg_color">@color/gray20</item>
         <item name="conversation_list_item_contact_color">@color/core_light_90</item>
         <item name="conversation_list_item_subject_color">@color/core_light_60</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
@@ -108,9 +108,9 @@
         <item name="conversation_group_member_name">#99000000</item>
 
         <!-- light theme -->
-        <item name="conversation_background">#ffdddddd</item>
+        <item name="conversation_background">@color/gray10</item>
         <item name="conversation_editor_background">#22000000</item>
-        <item name="conversation_editor_text_color">#ff111111</item>
+        <item name="conversation_editor_text_color">@color/gray95</item>
         <item name="conversation_input_background">@drawable/compose_background_light</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
@@ -149,18 +149,18 @@
 
 
         <!-- light theme -->
-        <item name="conversation_item_incoming_bubble_color">#ffffffff</item>
-        <item name="conversation_item_incoming_bubble_border_color">#33000000</item>
+        <item name="conversation_item_incoming_bubble_color">@color/white</item>
+        <!-- <item name="conversation_item_incoming_bubble_border_color">#33000000</item> -->
         <item name="conversation_item_incoming_text_primary_color">@color/black</item>
-        <item name="conversation_item_incoming_text_secondary_color">#ff808080</item>
+        <item name="conversation_item_incoming_text_secondary_color">@color/gray50</item>
 
-        <item name="conversation_item_outgoing_bubble_color">#ffefffde</item>
-        <item name="conversation_item_outgoing_bubble_border_color">#80efffde</item>
+        <item name="conversation_item_outgoing_bubble_color">@color/light_green</item>
+        <!-- <item name="conversation_item_outgoing_bubble_border_color">#80efffde</item> -->
         <item name="conversation_item_outgoing_text_primary_color">@color/black</item>
-        <item name="conversation_item_outgoing_text_secondary_color">#ff70b15c</item>
+        <item name="conversation_item_outgoing_text_secondary_color">@color/green</item>
 
         <item name="conversation_item_update_bg_color">@color/universal_overlay</item>
-        <item name="conversation_item_update_text_color">#ffffffff</item>
+        <item name="conversation_item_update_text_color">@color/white</item>
 
         <item name="conversation_item_last_seen_text_color">@color/core_light_90</item>
         <item name="conversation_item_last_seen_line_color">@color/core_light_60</item>
@@ -243,26 +243,26 @@
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
-        <item name="conversation_list_deaddrop_bg_color">#ff333333</item>
-        <item name="conversation_list_item_contact_color">#ffdddddd</item>
-        <item name="conversation_list_item_subject_color">#ffdddddd</item>
+        <item name="conversation_list_deaddrop_bg_color">@color/import_export_item_background_dark</item>
+        <item name="conversation_list_item_contact_color">@color/gray10</item>
+        <item name="conversation_list_item_subject_color">@color/gray10</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>
-        <item name="conversation_list_item_date_color">#ffdddddd</item>
+        <item name="conversation_list_item_date_color">@color/gray10</item>
         <item name="conversation_list_item_unread_color">@color/core_white</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
 
-        <item name="conversation_group_member_name">#99ffffff</item>
+        <item name="conversation_group_member_name">@color/sticker_selected_color</item>
 
         <!-- dark theme -->
-        <item name="conversation_item_incoming_bubble_color">#ff414347</item>
-        <item name="conversation_item_incoming_bubble_border_color">#80414347</item>
+        <item name="conversation_item_incoming_bubble_color">@color/black</item>
+        <!-- <item name="conversation_item_incoming_bubble_border_color">#80414347</item> -->
         <item name="conversation_item_incoming_text_primary_color">@color/core_dark_05</item>
-        <item name="conversation_item_incoming_text_secondary_color">#efefef</item>
+        <item name="conversation_item_incoming_text_secondary_color">@color/core_dark_05</item>
 
-        <item name="conversation_item_outgoing_bubble_color">#ff364e59</item>
-        <item name="conversation_item_outgoing_bubble_border_color">#80364e59</item>
+        <item name="conversation_item_outgoing_bubble_color">@color/dark_red</item>
+        <!-- <item name="conversation_item_outgoing_bubble_border_color">#80364e59</item> -->
         <item name="conversation_item_outgoing_text_primary_color">@color/core_dark_05</item>
-        <item name="conversation_item_outgoing_text_secondary_color">@color/core_dark_30</item>
+        <item name="conversation_item_outgoing_text_secondary_color">@color/light_pink</item>
 
         <item name="conversation_item_update_bg_color">@color/universal_overlay</item>
         <item name="conversation_item_update_text_color">@color/core_light_35</item>
@@ -277,7 +277,7 @@
 
         <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
 
-        <item name="verification_background">#ff333333</item>
+        <item name="verification_background">@color/import_export_item_background_dark</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
@@ -294,9 +294,9 @@
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
         <!-- dark theme -->
-        <item name="conversation_background">#ff000000</item>
+        <item name="conversation_background">@color/black</item>
         <item name="conversation_editor_background">#22ffffff</item>
-        <item name="conversation_editor_text_color">#ffeeeeee</item>
+        <item name="conversation_editor_text_color">@color/gray5</item>
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
@@ -354,7 +354,7 @@
 
         <item name="reminder_header_background">@color/delta_primary_dark</item>
 
-        <item name="pref_icon_tint">#FFFFFF</item>
+        <item name="pref_icon_tint">@color/core_white</item>
 
         <item name="pref_divider">@drawable/preference_divider_dark</item>