Dark theme, theme switch, icons, style, strings

added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc

purged ic_action_chat as it wasn't used

preference use_white_background changed to use_green_background, default true

grey chat bubbles darker, text white

replaced all grey600 with black icons and 0.54 alpha attribute

highlightColor in dark grey chat bubble now darker than background

31 files changed, 196 insertions, 191 deletions

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index cac9a9fa..605f63ef 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:scrollHorizontally="false"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </LinearLayout>
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 247e96e5..cae60ebb 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,9 +1,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.siacs.conversations.ui.AboutActivity"
-    android:background="@color/grey50"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:background="?attr/color_background_primary">
 
     <TextView
         android:text="@string/pref_about_message"
@@ -15,7 +15,6 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
-        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"
         android:fontFamily="monospace"/>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6fb1d013..886c45c6 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200">
+                android:background="?attr/color_background_secondary">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -15,7 +15,7 @@
 				android:layout_marginRight="@dimen/activity_horizontal_margin"
 				android:layout_marginTop="@dimen/activity_vertical_margin"
 				android:layout_marginBottom="@dimen/activity_vertical_margin"
-				android:background="@drawable/infocard_border"
+				android:background="?attr/infocard_border"
 				android:padding="@dimen/infocard_padding"
 				android:orientation="vertical">
 
@@ -24,7 +24,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/current_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -34,15 +34,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/new_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -52,15 +52,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/account_settings_confirm_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -69,8 +69,8 @@
 				android:layout_height="wrap_content"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 		</LinearLayout>
 	</ScrollView>
@@ -96,7 +96,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/black12"/>
+			android:background="?attr/divider"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 3c9d203b..e457100c 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/grey200" >
+    android:background="?attr/color_background_secondary" >
 
     <LinearLayout
         android:id="@+id/details_main_layout"
@@ -17,7 +17,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:padding="@dimen/infocard_padding" >
 
             <QuickContactBadge
@@ -40,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_example_jabber_id"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold" />
 
@@ -66,7 +66,7 @@
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_secondary"
                     android:textStyle="italic"
                     android:textSize="?attr/TextSizeBody" />
 
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/send_presence_updates"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
@@ -91,7 +91,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/receive_presence_updates"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
 
@@ -103,7 +103,7 @@
                 android:layout_below="@+id/details_jidbox"
                 android:layout_marginTop="32dp"
                 android:text="@string/using_account"
-                android:textColor="@color/black54"
+                android:textColor="?attr/color_text_secondary"
                 android:textSize="?attr/TextSizeInfo" />
         </RelativeLayout>
 
@@ -115,7 +115,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:divider="?android:dividerHorizontal"
             android:orientation="vertical"
             android:padding="@dimen/infocard_padding"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d308b4ce..e180f1be 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -4,7 +4,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200">
+                android:background="?attr/color_background_secondary">
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -26,7 +26,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding">
                 <com.makeramen.roundedimageview.RoundedImageView
@@ -47,7 +47,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/account_settings_jabber_id"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <AutoCompleteTextView
@@ -56,8 +56,8 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/account_settings_example_jabber_id"
                         android:inputType="textEmailAddress"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <TextView
@@ -65,7 +65,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="@string/account_settings_password"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <EditText
@@ -74,8 +74,8 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/password"
                         android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <LinearLayout
@@ -95,7 +95,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_hostname"
-                                android:textColor="@color/black87"
+                                android:textColor="?attr/color_text_primary"
                                 android:textSize="?attr/TextSizeBody"/>
                             <EditText
                                 android:id="@+id/hostname"
@@ -103,8 +103,8 @@
                                 android:layout_height="wrap_content"
                                 android:hint="@string/hostname_or_onion"
                                 android:inputType="textNoSuggestions"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
+                                android:textColor="?attr/color_text_primary"
+                                android:textColorHint="?attr/color_text_secondary"
                                 android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                         <LinearLayout
@@ -117,7 +117,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_port"
-                                android:textColor="@color/black87"
+                                android:textColor="?attr/color_text_primary"
                                 android:textSize="?attr/TextSizeBody"/>
                             <EditText
                                 android:id="@+id/port"
@@ -125,8 +125,8 @@
                                 android:layout_height="match_parent"
                                 android:inputType="number"
                                 android:maxLength="5"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
+                                android:textColor="?attr/color_text_primary"
+                                android:textColorHint="?attr/color_text_secondary"
                                 android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                     </LinearLayout>
@@ -136,7 +136,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="@string/register_account"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <TextView
@@ -144,7 +144,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/account_settings_confirm_password"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"
                         android:visibility="gone"/>
 
@@ -155,8 +155,8 @@
                         android:layout_marginTop="8dp"
                         android:hint="@string/confirm_password"
                         android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"
                         android:visibility="gone"/>
                 </LinearLayout>
@@ -170,7 +170,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -179,7 +179,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/battery_optimizations_enabled"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
                 <TextView
@@ -190,7 +190,7 @@
                     android:layout_marginBottom="8dp"
                     android:layout_marginTop="8dp"
                     android:text="@string/battery_optimizations_enabled_explained"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody"/>
                 <Button
                     android:id="@+id/batt_op_disable"
@@ -213,7 +213,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -232,7 +232,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -240,7 +240,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -261,7 +261,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -269,7 +269,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -282,7 +282,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -290,7 +290,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -303,7 +303,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -311,7 +311,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -324,7 +324,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -332,7 +332,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -345,7 +345,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -353,7 +353,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -366,7 +366,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -374,7 +374,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -387,7 +387,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -395,7 +395,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -408,7 +408,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_push"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -416,7 +416,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                     <TableRow
@@ -427,7 +427,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_http_upload"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -435,7 +435,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                 </TableLayout>
@@ -458,7 +458,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="monospace"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace"/>
 
@@ -466,7 +466,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/otr_fingerprint"
-                            android:textColor="@color/black54"
+                            android:textColor="?attr/color_text_secondary"
                             android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
 
@@ -480,6 +480,7 @@
                         android:contentDescription="@string/copy_otr_clipboard_description"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
+                        android:alpha="?attr/icon_alpha"
                         android:visibility="visible"/>
                 </RelativeLayout>
                 <RelativeLayout
@@ -500,7 +501,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="monospace"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace"/>
 
@@ -508,7 +509,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/this_device_omemo_fingerprint"
-                            android:textColor="@color/black54"
+                            android:textColor="?attr/color_text_secondary"
                             android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
 
@@ -528,6 +529,7 @@
                             android:contentDescription="@string/copy_omemo_clipboard_description"
                             android:padding="@dimen/image_button_padding"
                             android:src="?attr/icon_copy"
+                            android:alpha="?attr/icon_alpha"
                             android:visibility="visible"/>
                         <ImageButton
                             android:id="@+id/action_regenerate_axolotl_key"
@@ -536,6 +538,7 @@
                             android:background="?android:selectableItemBackground"
                             android:contentDescription="@string/regenerate_omemo_key"
                             android:padding="@dimen/image_button_padding"
+                            android:alpha="?attr/icon_alpha"
                             android:src="?attr/icon_refresh"
                             android:visibility="gone"/>
 
@@ -550,7 +553,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -560,7 +563,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/other_devices"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
 
@@ -593,14 +596,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87"/>
+            android:textColor="?attr/color_text_primary"/>
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12"/>
+            android:background="?attr/divider"/>
 
         <Button
             android:id="@+id/save_button"
@@ -610,7 +613,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/black54"/>
+            android:textColor="?attr/color_text_secondary"/>
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index e7b11d9f..7ff91e15 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -3,7 +3,7 @@
 			xmlns:app="http://schemas.android.com/apk/res-auto"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:background="@color/grey200">
+			android:background="?attr/color_background_secondary">
 
 	<LinearLayout
 		android:id="@+id/muc_main_layout"
@@ -18,7 +18,7 @@
 			android:layout_marginRight="@dimen/activity_horizontal_margin"
 			android:layout_marginTop="@dimen/activity_vertical_margin"
 			android:layout_marginBottom="@dimen/activity_vertical_margin"
-			android:background="@drawable/infocard_border"
+			android:background="?attr/infocard_border"
 			android:orientation="vertical"
 			android:padding="@dimen/infocard_padding">
 
@@ -28,7 +28,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="16dp"
 				android:text="@string/account_settings_example_jabber_id"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeHeadline"
 				android:textStyle="bold"/>
 
@@ -58,7 +58,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeHeadline"/>
 
 					<TextView
@@ -66,7 +66,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody"/>
 				</LinearLayout>
 
@@ -78,7 +78,8 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="@dimen/image_button_padding"
-					android:src="?attr/icon_edit_dark"/>
+					android:alpha="?attr/icon_alpha"
+					android:src="?attr/icon_edit_body"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -90,7 +91,7 @@
 				android:layout_height="wrap_content"
 				android:text="@string/private_conference"
 				android:layout_centerVertical="true"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"
 				android:layout_alignParentLeft="true"
 				android:layout_toLeftOf="@+id/change_conference_button"
@@ -105,6 +106,7 @@
 				android:layout_centerVertical="true"
 				android:background="?android:selectableItemBackground"
 				android:padding="@dimen/image_button_padding"
+				android:alpha="?attr/icon_alpha"
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
@@ -117,7 +119,7 @@
 					android:layout_height="wrap_content"
 					android:text="@string/notify_on_all_messages"
 					android:layout_centerVertical="true"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:layout_alignParentLeft="true"
 					android:layout_toLeftOf="@+id/notification_status_button"
@@ -132,7 +134,7 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="@dimen/image_button_padding"
-					android:src="@drawable/ic_notifications_grey600_24dp"/>
+					android:src="?attr/icon_notifications"/>
 			</RelativeLayout>
 
 			<TableLayout
@@ -150,7 +152,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:text="@string/server_info_mam"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody" />
 
 					<TextView
@@ -158,7 +160,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_gravity="right"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody" />
 				</TableRow>
 
@@ -171,7 +173,7 @@
 				android:layout_gravity="right"
 				android:layout_marginTop="32dp"
 				android:text="@string/using_account"
-				android:textColor="@color/black54"
+				android:textColor="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeInfo"/>
 		</LinearLayout>
 
@@ -183,7 +185,7 @@
 			android:layout_marginRight="@dimen/activity_horizontal_margin"
 			android:layout_marginTop="@dimen/activity_vertical_margin"
 			android:layout_marginBottom="@dimen/activity_vertical_margin"
-			android:background="@drawable/infocard_border"
+			android:background="?attr/infocard_border"
 			android:orientation="vertical"
 			android:padding="@dimen/infocard_padding">
 
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 8c7c359b..de0e1de3 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_primary" >
 
     <LinearLayout
         android:id="@+id/account_image_wrapper"
@@ -27,7 +27,7 @@
         android:layout_below="@id/account_image_wrapper"
         android:layout_centerHorizontal="true"
         android:text="@string/touch_to_choose_picture"
-        android:textColor="@color/black54" />
+        android:textColor="?attr/color_text_secondary" />
 
     <TextView
         android:id="@+id/secondary_hint"
@@ -36,7 +36,7 @@
         android:layout_below="@id/hint"
         android:layout_centerHorizontal="true"
         android:text="@string/or_long_press_for_default"
-        android:textColor="@color/black54" />
+        android:textColor="?attr/color_text_secondary" />
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -53,14 +53,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="?attr/color_text_primary" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="?attr/divider" />
 
         <Button
             android:id="@+id/publish_button"
@@ -70,7 +70,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/publish"
-            android:textColor="@color/black54" />
+            android:textColor="?attr/color_text_secondary" />
     </LinearLayout>
 
     <LinearLayout
@@ -89,7 +89,7 @@
             android:id="@+id/account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -99,7 +99,7 @@
             android:layout_marginTop="8dp"
             android:minLines="3"
             android:text="@string/publish_avatar_explanation"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeBody" />
     </LinearLayout>
 
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 8195092f..dcdaaaf0 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:background="@color/grey200"
+            android:background="?attr/color_background_secondary"
             android:id="@+id/scroll_view">
 
     <LinearLayout
@@ -17,7 +17,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:padding="@dimen/infocard_padding"
             android:orientation="vertical">
             <EditText
@@ -26,7 +26,7 @@
                 android:inputType="textMultiLine"
                 android:hint="@string/status_message"
                 android:id="@+id/presence_status_message"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:layout_marginBottom="8dp"
                 android:textSize="?attr/TextSizeBody"/>
             <Spinner
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/all_accounts_on_this_device"
                 android:id="@+id/all_accounts"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <Button
                 android:id="@+id/change_presence"
@@ -62,7 +62,7 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:background="@drawable/infocard_border"
+        android:background="?attr/infocard_border"
         android:padding="@dimen/infocard_padding"
         android:orientation="vertical"
         android:divider="?android:dividerHorizontal"
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index d55ec196..b1077727 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -3,6 +3,6 @@
     android:id="@+id/start_conversation_view_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_primary" >
 
 </android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index d7bb7628..cf14e8e9 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -3,7 +3,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200" >
+                android:background="?attr/color_background_secondary" >
     <ScrollView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -32,7 +32,7 @@
                     android:id="@+id/key_error_message_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"
                     android:text="@string/error_trustkeys_title"/>
@@ -41,7 +41,7 @@
                     android:id="@+id/key_error_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody"
                     android:padding="8dp"/>
 
@@ -55,7 +55,7 @@
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -64,7 +64,7 @@
                     android:id="@+id/own_keys_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
 
@@ -107,14 +107,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="?attr/color_text_primary" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="?attr/divider" />
 
         <Button
             android:id="@+id/save_button"
@@ -123,7 +123,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:enabled="true"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:text="@string/done"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index c15f19d5..de61a66f 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey50">
+                android:background="?attr/color_background_primary">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -34,7 +34,7 @@
 					android:id="@+id/your_fingerprint"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"
 					android:fontFamily="monospace"/>
@@ -43,7 +43,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="@string/your_fingerprint"
-					android:textColor="@color/black54"
+					android:textColor="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeInfo"/>
 
 				<TextView
@@ -51,7 +51,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="20dp"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"
 					android:fontFamily="monospace"/>
@@ -61,7 +61,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="20dp"
 					android:text="@string/remote_fingerprint"
-					android:textColor="@color/black54"
+					android:textColor="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeInfo"/>
 
 			</LinearLayout>
@@ -79,7 +79,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_horizontal"
 					android:text="@string/verified"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeHeadline"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -89,7 +89,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="8dp"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -101,8 +101,8 @@
 					android:layout_marginBottom="8dp"
 					android:hint="@string/shared_secret_hint"
 					android:inputType="textAutoComplete"
-					android:textColor="@color/black87"
-					android:textColorHint="@color/black54"
+					android:textColor="?attr/color_text_primary"
+					android:textColorHint="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeBody"/>
 
 				<EditText
@@ -112,8 +112,8 @@
 					android:layout_marginTop="8dp"
 					android:hint="@string/shared_secret_secret"
 					android:inputType="textPassword"
-					android:textColor="@color/black87"
-					android:textColorHint="@color/black54"
+					android:textColor="?attr/color_text_primary"
+					android:textColorHint="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeBody"/>
 			</LinearLayout>
 		</LinearLayout>
@@ -139,7 +139,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/black12"/>
+			android:background="?attr/divider"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/captcha.xml b/src/main/res/layout/captcha.xml
index ea77b835..f0850dec 100644
--- a/src/main/res/layout/captcha.xml
+++ b/src/main/res/layout/captcha.xml
@@ -16,8 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="textNoSuggestions"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"
         android:hint="@string/captcha_hint">
 
diff --git a/src/main/res/layout/certificate_information.xml b/src/main/res/layout/certificate_information.xml
index 4c085459..3c387585 100644
--- a/src/main/res/layout/certificate_information.xml
+++ b/src/main/res/layout/certificate_information.xml
@@ -9,79 +9,79 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_subject"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_cn"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/subject_cn"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_o"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/subject_o"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="16dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_issuer"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_cn"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/issuer_cn"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_o"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/issuer_o"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="16dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_sha1"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/sha1"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"
         android:fontFamily="monospace"/>
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 56443c34..a67bf3ae 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeBody" />
         <LinearLayout
             android:id="@+id/tags"
@@ -49,7 +49,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline"
             android:typeface="monospace"
             android:fontFamily="monospace"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index a4fd29e9..7076dad2 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -16,7 +16,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
@@ -27,7 +27,7 @@
             android:id="@+id/key_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:layout_alignParentLeft="true"
             android:layout_below="@+id/key"
             android:maxLines="1"
@@ -40,7 +40,7 @@
             android:layout_alignParentRight="true"
             android:layout_below="@+id/key"
             android:visibility="gone"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:textSize="?attr/TextSizeInfo"/>
 
     <ImageButton
@@ -52,6 +52,7 @@
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
+        android:alpha="?attr/icon_alpha"
         android:src="?attr/icon_remove"
         android:visibility="gone" />
 
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cd3f9266..94e922f7 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -13,7 +13,7 @@
         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"
@@ -46,7 +46,7 @@
                     android:paddingRight="4dp"
                     android:singleLine="true"
                     android:text="Awesome groupchat"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:typeface="sans"/>
 
@@ -70,7 +70,7 @@
                             android:scrollHorizontally="false"
                             android:singleLine="true"
                             android:text="This is a placeholder text to show the last messages"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <com.makeramen.roundedimageview.RoundedImageView
@@ -89,7 +89,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
-                        android:src="@drawable/ic_notifications_grey600_24dp"
+                        android:src="?attr/icon_notifications"
                         />
                 </RelativeLayout>
 
@@ -101,7 +101,7 @@
                     android:layout_alignParentRight="true"
                     android:gravity="right"
                     android:text="23:42"
-                    android:textColor="@color/black54"
+                    android:textColor="?attr/color_text_secondary"
                     android:textSize="?attr/TextSizeInfo"/>
             </RelativeLayout>
         </RelativeLayout>
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index d4af0dfc..f8a861a9 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <Spinner
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <AutoCompleteTextView
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index fd553acb..df39741d 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -8,6 +8,6 @@
         android:id="@+id/field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index 31b521e8..4c4c7ce9 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -8,14 +8,14 @@
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <EditText
         android:id="@+id/field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f..6a621287 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/grey200" >
+    android:layout_height="match_parent">
 
     <ListView
         android:id="@+id/messages_view"
@@ -12,7 +11,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"
@@ -27,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@color/grey50" >
+        android:background="?attr/color_background_primary" >
 
         <eu.siacs.conversations.ui.EditMessage
             android:id="@+id/textinput"
@@ -35,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -45,7 +44,7 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="12dp"
-            android:textColor="@color/black87" >
+            android:textColor="?attr/color_text_primary" >
 
             <requestFocus />
         </eu.siacs.conversations.ui.EditMessage>
@@ -56,8 +55,8 @@
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_send_text_offline" />
+            android:background="?attr/color_background_primary"
+            android:src="?attr/ic_send_text_offline" />
     </RelativeLayout>
 
     <RelativeLayout
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 2223219a..dcf9feb9 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -7,14 +7,14 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="@dimen/conversations_overview_width"
         android:layout_height="match_parent"
-        android:background="@color/grey50"
+        android:background="?attr/color_background_primary"
         android:orientation="vertical" >
 
         <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:divider="@color/black12"
             android:dividerHeight="1dp" />
     </LinearLayout>
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index f7aa3c46..6339a8a6 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody" />
 
     <Spinner
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/conference_address"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/conference_address_example"
         android:inputType="textEmailAddress"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
 
     <CheckBox
@@ -47,7 +47,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/save_as_bookmark"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index d3271d1b..e0fb5433 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -7,7 +7,7 @@
               android:layout_marginLeft="@dimen/activity_horizontal_margin"
               android:layout_marginRight="@dimen/activity_horizontal_margin"
               android:layout_marginTop="@dimen/activity_vertical_margin"
-              android:background="@drawable/infocard_border"
+              android:background="?attr/infocard_border"
               android:orientation="vertical"
               android:padding="@dimen/infocard_padding">
 
@@ -15,7 +15,7 @@
         android:id="@+id/foreign_keys_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"
         android:textStyle="bold"/>
 
@@ -33,7 +33,7 @@
         android:id="@+id/no_keys_to_accept"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:text="@string/no_keys_just_confirm"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index c4adc029..e21ce5c0 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/pick_your_username"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeHeadline"
                 android:textStyle="bold"/>
             <TextView
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/magic_create_text"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <EditText
                 android:id="@+id/username"
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/your_full_jid_will_be"
-                android:textColor="@color/black54"
+                android:textColor="?attr/color_text_secondary"
                 android:textSize="?attr/TextSizeInfo"
                 android:visibility="invisible"/>
             <Button
diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 90ca7de0..debd86f1 100644
--- a/src/main/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_secondary" >
 
     <ListView
         android:id="@+id/account_list"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index fc68c389..37ab9da1 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
-        android:background="@drawable/message_bubble_sent"
+        android:background="?attr/message_bubble_sent"
         android:minHeight="53dp"
         android:layout_marginLeft="-4dp"
         android:longClickable="true">
@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textColorLink="@color/black87"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
@@ -80,7 +80,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/black54"
+                    android:textColor="?attr/color_text_secondary"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 93a80d84..71f278ec 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -39,7 +39,7 @@
         android:layout_toEndOf="@+id/message_photo"
         android:layout_toRightOf="@+id/message_photo"
         android:text="@string/contact_has_read_up_to_this_point"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeInfo"
         android:textStyle="italic"/>
 
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index aa4ded5a..63b38f94 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/presence_status_message"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:id="@+id/status"
@@ -45,5 +45,6 @@
         android:layout_alignParentEnd="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
+        android:alpha="?attr/icon_alpha"
         android:src="?attr/icon_remove"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index ff6b0413..cba8b639 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPersonName"
-        android:textColor="@color/black87" >
+        android:textColor="?attr/color_text_primary" >
 
         <requestFocus />
     </EditText>
diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml
index 8cbc1f92..70211960 100644
--- a/src/main/res/layout/simple_list_item.xml
+++ b/src/main/res/layout/simple_list_item.xml
@@ -18,7 +18,7 @@
           android:id="@android:id/text1"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:textColor="@color/black87"
+          android:textColor="?attr/color_text_primary"
           android:textSize="?attr/TextSizeBody"
           android:gravity="center_vertical"
           android:paddingLeft="8dp"
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 25f7c46f..3d618675 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/welcome_header"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeHeadline"
                 android:textStyle="bold"/>
             <TextView
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/welcome_text"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <Button
                 android:id="@+id/create_account"
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:text="@string/use_own_provider"
-                android:textColor="@color/black54"/>
+                android:textColor="?attr/color_text_secondary"/>
         </LinearLayout>
         <RelativeLayout
             android:layout_width="match_parent"