diff --git a/src/cheogram/res/values/themes.xml b/src/cheogram/res/values/themes.xml
index 10ff4aba12a3a6d7761c5ac1ed6a6810e75be7c6..b2a12c54b7e777f6331ca8b7be0ec3ad7ca46b1d 100644
--- a/src/cheogram/res/values/themes.xml
+++ b/src/cheogram/res/values/themes.xml
@@ -7,8 +7,8 @@
         <item name="colorAccent">#1E0036</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
 
-        <item name="message_bubble_received_bg">@color/perpy</item>
-        <item name="message_bubble_sent_bg">#D8D8D8</item>
+        <item name="message_bubble_received_bg">?colorPrimary</item>
+        <item name="message_bubble_sent_bg">?color_background_primary</item>
 
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>
@@ -158,8 +158,8 @@
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
 
-        <item name="message_bubble_received_bg">@color/perpy</item>
-        <item name="message_bubble_sent_bg">@color/black26</item>
+        <item name="message_bubble_received_bg">?colorPrimary</item>
+        <item name="message_bubble_sent_bg">?color_background_primary</item>
 
         <item name="color_background_primary">@color/grey800</item>
         <item name="color_background_secondary">@color/grey900</item>
@@ -315,8 +315,8 @@
         <item name="colorPrimaryDark">#1E0036</item>
         <item name="colorAccent">@color/yeller</item>
 
-        <item name="message_bubble_received_bg">@color/grey900</item>
-        <item name="message_bubble_sent_bg">#1E0036</item>
+        <item name="message_bubble_received_bg">?colorPrimary</item>
+        <item name="message_bubble_sent_bg">?color_background_primary</item>
 
         <item name="color_background_primary">#0E0020</item>
         <item name="color_background_secondary">@color/black</item>