diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2430179867..07622a079b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -59,6 +59,4 @@
 
     <color name="MediaOverview_Media_selected_overlay">#88000000</color>
 
-    <color name="core_red">#f44336</color>
-    <color name="core_red_highlight">#ef5350</color>
 </resources>
diff --git a/res/values/conversation_colors.xml b/res/values/conversation_colors.xml
new file mode 100644
index 0000000000..385363a410
--- /dev/null
+++ b/res/values/conversation_colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="conversation_red_700">#d32f2f</color>
+    <color name="conversation_pink_600">#d81b60</color>
+    <color name="conversation_indigo_600">#3949ab</color>
+    <color name="conversation_blue_700">#1976d2</color>
+    <color name="conversation_cyan_800">#00838f</color>
+    <color name="conversation_teal_700">#00796b</color>
+    <color name="conversation_green_800">#2e7d32</color>
+    <color name="conversation_deep_orange_900">#bf360c</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/core_colors.xml b/res/values/core_colors.xml
new file mode 100644
index 0000000000..64baca6c0e
--- /dev/null
+++ b/res/values/core_colors.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="core_blue">#2090ea</color>
+    <color name="core_green">#4caf50</color>
+    <color name="core_red">#f44336</color>
+    <color name="core_red_highlight">#ef5350</color>
+
+    <color name="core_white">#ffffff</color>
+    <color name="core_light_02">#F9FAFA</color>
+    <color name="core_light_10">#EEEFEF</color>
+    <color name="core_light_35">#A4A6A9</color>
+    <color name="core_light_45">#8B8E91</color>
+    <color name="core_light_60">#62656A</color>
+    <color name="core_light_90">#070C14</color>
+
+    <color name="core_black">#000000</color>
+    <color name="core_dark_05">#EFEFEF</color>
+    <color name="core_dark_30">#A8A9AA</color>
+    <color name="core_dark_55">#88898C</color>
+    <color name="core_dark_60">#797A7C</color>
+    <color name="core_dark_70">#414347</color>
+    <color name="core_dark_85">#1A1C20</color>
+    <color name="core_dark_95">#0A0C11</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/text_styles.xml b/res/values/text_styles.xml
new file mode 100644
index 0000000000..cec0627bd0
--- /dev/null
+++ b/res/values/text_styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Signal.Text.Headline" parent="Base.TextAppearance.AppCompat.Headline">
+        <item name="android:textSize">28sp</item>
+        <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:letterSpacing">0</item>
+    </style>
+
+    <style name="Signal.Text.Body" parent="Base.TextAppearance.AppCompat.Body1">
+        <item name="android:textSize">16sp</item>
+        <item name="android:lineSpacingExtra">8sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:letterSpacing">0.15</item>
+    </style>
+
+    <style name="Signal.Text.Preview" parent="Base.TextAppearance.AppCompat.Body2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:letterSpacing">0.25</item>
+    </style>
+
+    <style name="Signal.Text.Caption" parent="Base.TextAppearance.AppCompat.Caption">
+        <item name="android:textSize">12sp</item>
+        <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:letterSpacing">0.40</item>
+    </style>
+</resources>
\ No newline at end of file