more theme working

24 files changed, 95 insertions, 90 deletions

diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index af61483ab..2e503d8bd 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -23,7 +23,8 @@
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin">
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:background="?attr/color_background_primary">
 
                 <ImageView
                     android:id="@+id/logo"
@@ -43,7 +44,8 @@
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin">
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:background="?attr/color_background_primary">
 
                 <TextView
                     android:id="@+id/aboutmessage"
@@ -57,7 +59,7 @@
                     android:linksClickable="true"
                     android:paddingBottom="@dimen/activity_vertical_margin"
                     android:text="@string/pref_about_message"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/text_Color_Main"
                     android:textSize="?attr/TextSizeBody"
                     android:typeface="monospace" />
 
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 191694b7e..f39c59fc2 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -30,24 +30,22 @@
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin">
 
-                    <RelativeLayout
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:orientation="vertical"
                         android:padding="@dimen/card_padding_regular">
 
                         <android.support.text.emoji.widget.EmojiTextView
                             android:id="@+id/contact_display_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentTop="true"
-                            android:layout_centerHorizontal="true"
                             android:layout_gravity="center_horizontal"
                             android:paddingBottom="5dp"
                             android:text="@string/contact"
                             android:textAlignment="center"
-                            android:textColor="@color/black87"
+                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
                             android:textIsSelectable="false"
-                            android:textSize="?attr/TextSizeHeadline"
                             android:textStyle="bold" />
 
                         <QuickContactBadge
@@ -169,7 +167,7 @@
                             android:text="@string/using_account"
                             android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                             android:visibility="gone" />
-                    </RelativeLayout>
+                    </LinearLayout>
                 </android.support.v7.widget.CardView>
 
                 <android.support.v7.widget.CardView
@@ -196,7 +194,6 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/notification_status_button"
                             android:text="@string/notify_on_all_messages"
-                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <ImageButton
@@ -207,9 +204,10 @@
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:layout_gravity="center_horizontal"
+                            android:alpha="?attr/icon_alpha"
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:padding="@dimen/image_button_padding"
-                            android:src="@drawable/ic_notifications_grey600_24dp" />
+                            android:src="@drawable/ic_notifications_black_24dp" />
                     </RelativeLayout>
 
                 </android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 6050a72ab..96e82e40d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -70,10 +70,12 @@
 
                                 <AutoCompleteTextView
                                     android:id="@+id/account_jid"
+                                    style="@style/Widget.Conversations.EditText"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:imeOptions="actionNext"
-                                    android:inputType="textEmailAddress" />
+                                    android:inputType="textEmailAddress"
+                                    android:textColor="?attr/text_Color_Main" />
                             </android.support.design.widget.TextInputLayout>
 
                             <android.support.design.widget.TextInputLayout
@@ -493,7 +495,7 @@
                                 android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
                                 android:alpha="1.0"
-                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:background="?attr/color_background_secondary"
                                 android:padding="@dimen/image_button_padding"
                                 android:src="?attr/icon_remove"
                                 android:visibility="visible" />
@@ -534,7 +536,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
-                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:background="?attr/color_background_secondary"
                                 android:contentDescription="@string/copy_otr_clipboard_description"
                                 android:padding="@dimen/image_button_padding"
                                 android:src="?attr/icon_copy"
@@ -580,7 +582,7 @@
                                     android:id="@+id/action_copy_axolotl_to_clipboard"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:background="?attr/color_background_secondary"
                                     android:contentDescription="@string/copy_omemo_clipboard_description"
                                     android:padding="@dimen/image_button_padding"
                                     android:src="?attr/icon_copy"
@@ -590,7 +592,7 @@
                                     android:id="@+id/action_regenerate_omemo_key"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:background="?attr/color_background_secondary"
                                     android:contentDescription="@string/regenerate_omemo_key"
                                     android:padding="@dimen/image_button_padding"
                                     android:src="?attr/icon_refresh"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 4a74883ad..676f2eaf9 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -14,8 +14,7 @@
 
         <ScrollView
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/grey200">
+            android:layout_height="fill_parent">
 
             <LinearLayout
                 android:id="@+id/muc_main_layout"
@@ -42,15 +41,12 @@
                             android:id="@+id/conference_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentTop="true"
-                            android:layout_centerHorizontal="true"
                             android:layout_gravity="center_horizontal"
                             android:paddingBottom="5dp"
                             android:text="@string/conference_subject"
                             android:textAlignment="center"
-                            android:textColor="@color/black87"
+                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
                             android:textIsSelectable="false"
-                            android:textSize="?attr/TextSizeHeadline"
                             android:textStyle="bold" />
 
                         <RelativeLayout
@@ -76,6 +72,7 @@
                                 android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
                                 android:layout_gravity="center_horizontal"
+                                android:alpha="?attr/icon_alpha"
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:padding="@dimen/image_button_padding"
                                 android:src="?attr/icon_settings" />
@@ -160,7 +157,7 @@
                                 android:layout_alignParentLeft="true"
                                 android:layout_alignParentRight="false"
                                 android:padding="1dp"
-                                app:riv_border_color="@color/grey500"
+                                app:riv_border_color="?attr/color_border"
                                 app:riv_border_width="1dp"
                                 app:riv_corner_radius="36dp" />
 
diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml
index b1bcb2a65..c6a57f98d 100644
--- a/src/main/res/layout/activity_recording.xml
+++ b/src/main/res/layout/activity_recording.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/grey50">
+    android:background="?attr/color_background_primary">
 
     <LinearLayout
         android:id="@+id/button_bar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/timer"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/timer">
 
         <Button
             android:id="@+id/cancel_button"
@@ -19,14 +19,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/primary" />
+            android:textColor="?attr/colorAccent" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/accent" />
+            android:textColor="?attr/colorAccent" />
 
         <Button
             android:id="@+id/share_button"
@@ -35,18 +35,18 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/share"
-            android:textColor="@color/primary" />
+            android:textColor="?attr/colorAccent" />
     </LinearLayout>
 
     <TextView
+        android:id="@+id/timer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="50sp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
         android:text="0:00.0"
-        android:textColor="@color/primary"
-        android:typeface="monospace"
+        android:textColor="?attr/colorAccent"
+        android:textSize="50sp"
         android:textStyle="bold"
-        android:id="@+id/timer"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true" />
+        android:typeface="monospace" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 8ecf792a8..b129e9eb8 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -57,7 +57,7 @@
                         android:layout_marginBottom="-8dp"
                         android:layout_marginRight="-8dp"
                         android:text="@string/change_presence"
-                        android:textColor="@color/accent" />
+                        android:textColor="?attr/colorAccent" />
                 </LinearLayout>
             </android.support.v7.widget.CardView>
 
diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
index c6f811997..055db4178 100644
--- a/src/main/res/layout/activity_share_locaction.xml
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -74,15 +74,13 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/cancel"
-                android:textColor="@color/primary" />
+                android:text="@string/cancel" />
 
             <View
                 android:layout_width="1dp"
                 android:layout_height="fill_parent"
                 android:layout_marginBottom="7dp"
-                android:layout_marginTop="7dp"
-                android:background="@color/primary" />
+                android:layout_marginTop="7dp" />
 
             <Button
                 android:id="@+id/share_button"
@@ -91,8 +89,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:enabled="false"
-                android:text="@string/share"
-                android:textColor="@color/primary" />
+                android:text="@string/share" />
         </LinearLayout>
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 08e793ef0..0fd402a10 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,7 +13,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:layout_alignParentLeft="true"
-            app:riv_border_color="@color/grey500"
+            app:riv_border_color="?attr/color_border"
             app:riv_border_width="1dp"
             app:riv_corner_radius="28dp" />
 
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 45b1c5ca3..ebd2508cd 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -47,7 +47,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="?attr/icon_alpha"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="?attr/color_background_secondary"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_remove"
                 android:visibility="gone" />
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="?attr/icon_alpha"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="?attr/color_background_secondary"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_enable_undecided_device"
                 android:visibility="gone" />
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 1e034482f..8936f7622 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -7,18 +7,18 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:background="@color/primary" />
+        android:background="?attr/color_background_primary" />
 
     <FrameLayout
         android:id="@+id/swipeable_item"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?attr/color_background_secondary"
             android:orientation="horizontal"
             android:padding="8dp">
 
@@ -30,7 +30,7 @@
                 android:background="@drawable/message_border"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                app:riv_border_color="@color/grey500"
+                app:riv_border_color="?attr/color_border"
                 app:riv_border_width="1dp"
                 app:riv_corner_radius="28dp" />
 
@@ -50,6 +50,7 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:paddingRight="4dp"
+                    android:textColor="?attr/text_Color_Main"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
                 <RelativeLayout
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 3209d1e62..d9e7363ed 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/also_end_conversation"
-        android:textColor="@color/black87"
+        android:textColor="?attr/text_Color_Main"
         android:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 164a79840..8ec44be56 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -47,11 +47,13 @@
 
             <de.pixart.messenger.ui.widget.ImmediateAutoCompleteTextView
                 android:id="@+id/status_message"
+                style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:hint="@string/status_message"
-                android:inputType="textShortMessage"/>
+                android:inputType="textShortMessage"
+                android:textColor="?attr/text_Color_Main" />
         </android.support.design.widget.TextInputLayout>
 
     </LinearLayout>
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index dff8f3459..703fb4e5b 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -32,9 +32,11 @@
 
             <AutoCompleteTextView
                 android:id="@+id/jid"
+                style="@style/Widget.Conversations.EditText"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textEmailAddress" />
+                android:inputType="textEmailAddress"
+                android:textColor="?attr/text_Color_Main" />
         </android.support.design.widget.TextInputLayout>
 
     </LinearLayout>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 8c4acf3c6..54c608f13 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/grey200"
-        android:clickable="false">
+        android:clickable="false"
+        android:background="?attr/color_background_secondary">
 
         <ListView
             android:id="@+id/messages_view"
@@ -14,7 +15,7 @@
             android:layout_above="@+id/snackbar"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:background="@color/grey200"
+            android:background="?attr/color_background_secondary"
             android:divider="@null"
             android:dividerHeight="0dp"
             android:listSelector="@android:color/transparent"
@@ -34,7 +35,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:background="@color/grey500"
+                android:background="?attr/color_border"
                 android:minHeight="50dp"
                 android:visibility="gone">
 
@@ -86,7 +87,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:background="@color/grey200"
+                android:background="?attr/color_background_primary"
                 android:clickable="true"
                 android:paddingBottom="2dp"
                 android:paddingLeft="2dp"
@@ -98,7 +99,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_toLeftOf="@+id/textSendButton"
-                    android:background="@color/grey50"
+                    android:background="?attr/color_background_secondary"
+                    android:textColor="?attr/text_Color_Main"
                     android:ems="10"
                     android:imeOptions="flagNoExtractUi|actionSend"
                     android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -109,8 +111,7 @@
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:paddingTop="12dp"
-                    android:singleLine="false"
-                    android:textColor="@color/black87">
+                    android:singleLine="false">
 
                 </de.pixart.messenger.ui.widget.EditMessage>
 
@@ -120,7 +121,7 @@
                     android:layout_height="48dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:background="@color/grey200"
+                    android:background="?attr/color_background_primary"
                     android:contentDescription="@string/send_message"
                     android:src="@drawable/ic_send_text_offline" />
             </RelativeLayout>
@@ -136,7 +137,7 @@
             android:layout_marginRight="8dp"
             android:background="@drawable/snackbar"
             android:minHeight="48dp"
-            android:visibility="gone">
+            android:visibility="visible">
 
             <TextView
                 android:id="@+id/snackbar_message"
@@ -181,7 +182,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:paddingLeft="24dp"
-                android:textColor="@color/realgreen"
+                android:textColor="@color/realblack"
                 android:textSize="?attr/TextSizeBody" />
         </RelativeLayout>
 
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 339514059..ddcc6ac14 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -3,13 +3,13 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/color_background_primary">
+        android:background="?attr/color_background_secondary">
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_secondary"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp" />
 
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index edf16221f..5262d0635 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -32,9 +32,11 @@
 
             <AutoCompleteTextView
                 android:id="@+id/jid"
+                style="@style/Widget.Conversations.EditText"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textEmailAddress" />
+                android:inputType="textEmailAddress"
+                android:textColor="?attr/text_Color_Main" />
         </android.support.design.widget.TextInputLayout>
 
         <CheckBox
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index 5fb080368..43727a11d 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -71,7 +71,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:text="@string/next"
-                    android:textColor="@color/accent" />
+                    android:textColor="?attr/colorAccent" />
             </LinearLayout>
 
             <RelativeLayout
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index e1b06913e..37f374f65 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,7 +13,7 @@
         android:maxHeight="500dp"
         android:maxWidth="500dp"
         android:scaleType="centerCrop"
-        app:riv_border_color="@color/grey500"
+        app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
         app:riv_corner_radius="5dp" />
 
@@ -43,8 +43,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:alpha="1.0"
-            android:background="?attr/selectableItemBackgroundBorderless" />
+            android:alpha="?attr/icon_alpha"
+            android:background="?android:selectableItemBackground" />
 
         <TextView
             android:id="@+id/runtime"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index a668f4bc1..cb42861a4 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        app:riv_border_color="@color/grey500"
+        app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dip"
         app:riv_corner_radius="24dp" />
 
@@ -28,7 +28,7 @@
         android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
         android:layout_toRightOf="@+id/message_photo"
-        android:background="@drawable/message_bubble_received_white"
+        android:background="@drawable/message_bubble_received_light"
         android:longClickable="true"
         android:minHeight="48dp">
 
@@ -63,8 +63,9 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
+                    android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_lock_blue_18dp" />
+                    android:src="@drawable/ic_lock_white_18dp" />
 
                 <ImageView
                     android:id="@+id/edit_indicator"
@@ -73,7 +74,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_blue_18dp" />
+                    android:src="@drawable/ic_mode_edit_white_18dp" />
 
                 <TextView
                     android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index d51f2d998..abddee902 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -17,7 +17,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:scaleType="fitXY"
-        app:riv_border_color="@color/grey500"
+        app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
         app:riv_corner_radius="24dp" />
 
@@ -30,7 +30,7 @@
         android:layout_marginRight="4dp"
         android:layout_toLeftOf="@+id/message_photo"
         android:layout_toStartOf="@+id/message_photo"
-        android:background="@drawable/message_bubble_sent_lightblue"
+        android:background="@drawable/message_bubble_sent_blue"
         android:longClickable="true"
         android:minHeight="48dp">
 
@@ -72,8 +72,9 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_lock_blue_18dp" />
+                    android:src="@drawable/ic_lock_black_18dp" />
 
                 <ImageView
                     android:id="@+id/edit_indicator"
@@ -82,7 +83,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_blue_18dp" />
+                    android:src="@drawable/ic_mode_edit_black_18dp" />
 
                 <ImageView
                     android:id="@+id/indicator_received"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index b6edbc0b1..e9d6fcaf4 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,7 +29,7 @@
         android:padding="0dp"
         android:scaleType="fitXY"
         android:visibility="gone"
-        app:riv_border_color="@color/grey500"
+        app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
         app:riv_corner_radius="16dp" />
 
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 3d64ea468..42f374a7b 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -44,7 +44,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?attr/color_background_secondary"
         android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml
index c54fd7833..c8e90f8ef 100644
--- a/src/main/res/layout/simple_list_item.xml
+++ b/src/main/res/layout/simple_list_item.xml
@@ -17,9 +17,8 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textColor="@color/black87"
-    android:textSize="?attr/TextSizeBody"
     android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
+    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index bbe98e90b..ff99efdde 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -14,7 +14,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/grey50">
+            android:background="?attr/color_background_secondary">
 
             <LinearLayout
                 android:id="@+id/linearLayout"
@@ -53,7 +53,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/import_text"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/text_Color_Main"
                     android:textSize="?attr/TextSizeBody"
                     android:visibility="gone" />
 
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:text="@string/import_database"
-                    android:textColor="@color/accent"
+                    android:textColor="?attr/colorAccent"
                     android:visibility="gone" />
 
                 <Button
@@ -74,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:text="@string/create_account"
-                    android:textColor="@color/accent" />
+                    android:textColor="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/use_existing_account"
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:text="@string/use_existing_accout"
-                    android:textColor="@color/black54" />
+                    android:textColor="?attr/colorAccent" />
             </LinearLayout>
 
             <RelativeLayout