made all text styleable

28 files changed, 355 insertions, 244 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index d6e875a94..76d13f7ed 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -85,8 +85,6 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
         if (conversation == null) {
             return view;
         }
-        int c = Color.get(activity, conversation == selectedConversation ? R.attr.color_background_secondary : R.attr.color_background_primary);
-        viewHolder.swipeableItem.setBackgroundColor(c);
         if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
             CharSequence name = conversation.getName();
             if (name instanceof Jid) {
@@ -332,7 +330,6 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
     }
 
     public static class ViewHolder {
-        private View swipeableItem;
         private TextView name;
         private TextView lastMessage;
         private ImageView lastMessageIcon;
@@ -353,7 +350,6 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             ViewHolder viewHolder = (ViewHolder) layout.getTag();
             if (viewHolder == null) {
                 viewHolder = new ViewHolder();
-                viewHolder.swipeableItem = layout.findViewById(R.id.swipeable_item);
                 viewHolder.name = layout.findViewById(R.id.conversation_name);
                 viewHolder.lastMessage = layout.findViewById(R.id.conversation_lastmsg);
                 viewHolder.lastMessageIcon = layout.findViewById(R.id.conversation_lastmsg_img);
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index d0cf3d96c..9af3b9653 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -32,14 +32,14 @@
             android:layout_height="wrap_content"
             android:scrollHorizontally="false"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
         <TextView
             android:id="@+id/account_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+            android:textAppearance="@style/TextAppearance.Conversations.Body2" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 2e503d8bd..8192f1d29 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -59,8 +59,8 @@
                     android:linksClickable="true"
                     android:paddingBottom="@dimen/activity_vertical_margin"
                     android:text="@string/pref_about_message"
-                    android:textColor="?attr/text_Color_Main"
                     android:textSize="?attr/TextSizeBody"
+                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                     android:typeface="monospace" />
 
             </android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 26fa2cef4..bebbd32ef 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -32,12 +32,15 @@
                     android:id="@+id/current_password_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                    app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"
                     app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                     app:passwordToggleEnabled="true"
                     app:passwordToggleTint="?android:textColorSecondary">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/current_password"
+                        style="@style/Widget.Conversations.EditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -49,12 +52,15 @@
                     android:id="@+id/new_password_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                    app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"
                     app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                     app:passwordToggleEnabled="true"
                     app:passwordToggleTint="?android:textColorSecondary">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/new_password"
+                        style="@style/Widget.Conversations.EditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f39c59fc2..e82a950cc 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -44,7 +44,7 @@
                             android:paddingBottom="5dp"
                             android:text="@string/contact"
                             android:textAlignment="center"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
+                            android:textAppearance="@style/TextAppearance.Conversations.Title"
                             android:textIsSelectable="false"
                             android:textStyle="bold" />
 
@@ -79,7 +79,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
                                 android:text="@string/account_settings_example_jabber_id"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                                android:textAppearance="@style/TextAppearance.Conversations.Title"
                                 android:textIsSelectable="true"
                                 android:visibility="gone" />
 
@@ -100,7 +100,7 @@
                                 android:layout_gravity="center_horizontal"
                                 android:layout_marginBottom="4dp"
                                 android:layout_marginTop="4dp"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
                             <android.support.text.emoji.widget.EmojiTextView
                                 android:id="@+id/status_message"
@@ -110,7 +110,7 @@
                                 android:layout_marginBottom="4dp"
                                 android:layout_marginTop="4dp"
                                 android:gravity="center_horizontal"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                             <android.support.text.emoji.widget.EmojiTextView
                                 android:id="@+id/resource"
@@ -143,7 +143,7 @@
                                 android:layout_below="@+id/add_contact_button"
                                 android:layout_marginTop="4dp"
                                 android:text="@string/send_presence_updates"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                             <CheckBox
                                 android:id="@+id/details_receive_presence"
@@ -153,7 +153,7 @@
                                 android:layout_alignParentStart="true"
                                 android:layout_below="@+id/details_send_presence"
                                 android:text="@string/receive_presence_updates"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                         </LinearLayout>
 
@@ -165,7 +165,7 @@
                             android:layout_below="@+id/details_jidbox"
                             android:layout_marginTop="32dp"
                             android:text="@string/using_account"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                            android:textAppearance="@style/TextAppearance.Conversations.Caption"
                             android:visibility="gone" />
                     </LinearLayout>
                 </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 c16465f72..3ffb2ff5d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -66,7 +66,9 @@
                                 android:id="@+id/account_jid_layout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/account_settings_jabber_id">
+                                android:hint="@string/account_settings_jabber_id"
+                                app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/account_jid"
@@ -82,12 +84,15 @@
                                 android:id="@+id/account_password_layout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"
                                 app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                                 app:passwordToggleEnabled="true"
                                 app:passwordToggleTint="?android:textColorSecondary">
 
                                 <android.support.design.widget.TextInputEditText
                                     android:id="@+id/account_password"
+                                    style="@style/Widget.Conversations.EditText"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:hint="@string/password"
@@ -112,10 +117,13 @@
                                         android:id="@+id/hostname_layout"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/account_settings_hostname">
+                                        android:hint="@string/account_settings_hostname"
+                                        app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                        app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
                                         <EditText
                                             android:id="@+id/hostname"
+                                            style="@style/Widget.Conversations.EditText"
                                             android:layout_width="fill_parent"
                                             android:layout_height="wrap_content"
                                             android:inputType="textNoSuggestions" />
@@ -132,10 +140,13 @@
                                         android:id="@+id/port_layout"
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
-                                        android:hint="@string/account_settings_port">
+                                        android:hint="@string/account_settings_port"
+                                        app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+                                        app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
                                         <EditText
                                             android:id="@+id/port"
+                                            style="@style/Widget.Conversations.EditText"
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
                                             android:inputType="number"
@@ -180,7 +191,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/battery_optimizations_enabled"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                             <TextView
                                 android:id="@+id/os_optimization_body"
@@ -188,7 +199,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8dp"
                                 android:text="@string/battery_optimizations_enabled_explained"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -485,7 +496,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@string/openpgp_key_id"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
                             </LinearLayout>
 
                             <ImageButton
@@ -526,7 +537,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@string/otr_fingerprint"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
 
                             </LinearLayout>
 
@@ -567,7 +578,7 @@
                                     android:id="@+id/own_fingerprint_desc"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
                             </LinearLayout>
 
                             <LinearLayout
@@ -624,7 +635,7 @@
                             android:layout_height="wrap_content"
                             android:layout_margin="@dimen/list_padding"
                             android:text="@string/other_devices"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                            android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                         <LinearLayout
                             android:id="@+id/other_device_keys"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 676f2eaf9..3e1c41ff7 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -45,7 +45,7 @@
                             android:paddingBottom="5dp"
                             android:text="@string/conference_subject"
                             android:textAlignment="center"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
+                            android:textAppearance="@style/TextAppearance.Conversations.Title"
                             android:textIsSelectable="false"
                             android:textStyle="bold" />
 
@@ -62,7 +62,7 @@
                                 android:layout_centerVertical="true"
                                 android:layout_toLeftOf="@+id/change_conference_button"
                                 android:text="@string/private_conference"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                             <ImageButton
                                 android:id="@+id/change_conference_button"
@@ -90,7 +90,7 @@
                                 android:layout_centerVertical="true"
                                 android:layout_toLeftOf="@+id/notification_status_button"
                                 android:text="@string/notify_on_all_messages"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                             <ImageButton
                                 android:id="@+id/notification_status_button"
@@ -112,7 +112,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="16dp"
                             android:text="@string/account_settings_example_jabber_id"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                            android:textAppearance="@style/TextAppearance.Conversations.Title"
                             android:textIsSelectable="true"
                             android:visibility="gone" />
 
@@ -123,7 +123,7 @@
                             android:layout_gravity="right"
                             android:layout_marginTop="32dp"
                             android:text="@string/using_account"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                            android:textAppearance="@style/TextAppearance.Conversations.Caption"
                             android:visibility="gone" />
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
@@ -174,7 +174,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:singleLine="true"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
                                 <TextView
                                     android:id="@+id/muc_role"
@@ -227,7 +227,7 @@
 
                 <android.support.v7.widget.CardView
                     android:id="@+id/muc_info_more"
-                    android:layout_width="match_parent"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
@@ -258,7 +258,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_mam"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                                 <TextView
                                     android:id="@+id/muc_info_mam"
@@ -266,7 +266,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
                             </TableRow>
                         </TableLayout>
                     </LinearLayout>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index b2c03ed8e..0e5159942 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -48,13 +48,13 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="8sp"
                                 android:text="@string/error_trustkeys_title"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                             <TextView
                                 android:id="@+id/key_error_message"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
                             <TextView
                                 android:id="@+id/key_error_general"
@@ -113,7 +113,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="@dimen/list_padding"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                            android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                         <LinearLayout
                             android:id="@+id/own_keys_details"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 0fd402a10..47a5a74ad 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -30,7 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
             <TextView
                 android:id="@+id/contact_jid"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index ebd2508cd..8e908881c 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -30,7 +30,7 @@
                 android:clickable="true"
                 android:longClickable="true"
                 android:maxLines="1"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+                android:textAppearance="@style/TextAppearance.Conversations.Caption" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 8936f7622..ee73fa296 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -50,8 +50,7 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:paddingRight="4dp"
-                    android:textColor="?attr/text_Color_Main"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
                 <RelativeLayout
                     android:id="@+id/conversation_lastwrapper"
@@ -86,7 +85,7 @@
                             android:id="@+id/conversation_lastmsg_img"
                             android:layout_width="?attr/IconSize"
                             android:layout_height="?attr/IconSize"
-                            android:layout_marginRight="?attr/TextSeparation" />/>
+                            android:layout_marginRight="?attr/TextSeparation" />
 
                         <TextView
                             android:id="@+id/conversation_lastmsg"
@@ -97,7 +96,7 @@
                             android:maxLines="1"
                             android:minHeight="?attr/IconSize"
                             android:scrollHorizontally="false"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                            android:textAppearance="@style/TextAppearance.Conversations.Body1" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -132,11 +131,11 @@
 
                         <ImageView
                             android:id="@+id/notification_status"
-                            android:alpha="?attr/icon_alpha"
                             android:layout_width="?attr/IconSize"
                             android:layout_height="?attr/IconSize"
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="4dp"
+                            android:alpha="?attr/icon_alpha"
                             android:src="@drawable/ic_notifications_grey600_24dp" />
                     </LinearLayout>
                 </RelativeLayout>
@@ -181,7 +180,7 @@
                     android:layout_alignParentRight="true"
                     android:gravity="right"
                     android:paddingLeft="4dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
             </RelativeLayout>
         </RelativeLayout>
     </FrameLayout>
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 36dfae0fe..2cb78b165 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -1,5 +1,6 @@
 <?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">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,10 +33,13 @@
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+            app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/subject"
+                style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/edit_subject_hint"
diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml
index 64b116663..d4cc284eb 100644
--- a/src/main/res/layout/dialog_block_contact.xml
+++ b/src/main/res/layout/dialog_block_contact.xml
@@ -14,7 +14,7 @@
             android:id="@+id/text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+            android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
         <CheckBox
             android:id="@+id/report_spam"
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index d9e7363ed..7c3ebfcbc 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:text="@string/clear_histor_msg"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
     <CheckBox
         android:id="@+id/end_conversation_checkbox"
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 8ec44be56..5ae9ec9de 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -1,5 +1,6 @@
 <?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">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -43,7 +44,9 @@
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+            app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
             <de.pixart.messenger.ui.widget.ImmediateAutoCompleteTextView
                 android:id="@+id/status_message"
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 703fb4e5b..2565e29d6 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -1,5 +1,6 @@
 <?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">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -28,7 +29,9 @@
             android:id="@+id/account_jid_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/account_settings_jabber_id">
+            android:hint="@string/account_settings_jabber_id"
+            app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+            app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
             <AutoCompleteTextView
                 android:id="@+id/jid"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index dcf825dc5..bd0dd2ebd 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -37,14 +37,14 @@
             app:fabSize="mini" />
 
         <de.pixart.messenger.ui.widget.UnreadCountCustomView
-                    android:id="@+id/unread_count_custom_view"
-                    android:layout_width="?attr/IconSize"
-                    android:layout_height="?attr/IconSize"
-                    android:layout_alignTop="@+id/scroll_to_bottom_button"
-                    android:layout_alignEnd="@+id/scroll_to_bottom_button"
-                    android:elevation="8dp"
-                    android:visibility="gone"
-                    app:backgroundColor="?attr/unread_count" />
+            android:id="@+id/unread_count_custom_view"
+            android:layout_width="?attr/IconSize"
+            android:layout_height="?attr/IconSize"
+            android:layout_alignEnd="@+id/scroll_to_bottom_button"
+            android:layout_alignTop="@+id/scroll_to_bottom_button"
+            android:elevation="8dp"
+            android:visibility="gone"
+            app:backgroundColor="?attr/unread_count" />
 
         <RelativeLayout
             android:id="@+id/input"
@@ -118,6 +118,7 @@
 
                 <de.pixart.messenger.ui.widget.EditMessage
                     android:id="@+id/textinput"
+                    style="@style/Widget.Conversations.EditText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 5262d0635..3f46e31cc 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -1,5 +1,6 @@
 <?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">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -28,15 +29,16 @@
             android:id="@+id/account_jid_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/conference_address">
+            android:hint="@string/conference_address"
+            app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
+            app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
             <AutoCompleteTextView
                 android:id="@+id/jid"
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textEmailAddress"
-                android:textColor="?attr/text_Color_Main" />
+                android:inputType="textEmailAddress" />
         </android.support.design.widget.TextInputLayout>
 
         <CheckBox
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 63fd7e2f3..555e80348 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -22,7 +22,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/list_padding"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
             <LinearLayout
                 android:id="@+id/foreign_keys_details"
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/list_padding"
                 android:text="@string/no_keys_just_confirm"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
         </LinearLayout>
     </android.support.v7.widget.CardView>
 </layout>
\ 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 43727a11d..d3aaad1b6 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -38,14 +38,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/pick_your_username"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/magic_create_text"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                 <EditText
                     android:id="@+id/username"
@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/your_full_jid_will_be"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                    android:textAppearance="@style/TextAppearance.Conversations.Caption"
                     android:visibility="invisible" />
 
                 <Button
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index cb42861a4..2460367e5 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -59,8 +59,8 @@
 
                 <ImageView
                     android:id="@+id/security_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
                     android:alpha="0.70"
@@ -69,8 +69,8 @@
 
                 <ImageView
                     android:id="@+id/edit_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
                     android:gravity="center_vertical"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index abddee902..b1c44cbdd 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -68,8 +68,8 @@
 
                 <ImageView
                     android:id="@+id/security_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
                     android:alpha="0.54"
@@ -78,8 +78,8 @@
 
                 <ImageView
                     android:id="@+id/edit_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
                     android:gravity="center_vertical"
@@ -87,8 +87,8 @@
 
                 <ImageView
                     android:id="@+id/indicator_received"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
                     android:gravity="center_vertical"
@@ -96,8 +96,8 @@
 
                 <ImageView
                     android:id="@+id/indicator_read"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_width="?attr/TextSizeCaption"
+                    android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="-8sp"
                     android:adjustViewBounds="false"
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 42f374a7b..61780a55c 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -22,7 +22,7 @@
             android:id="@+id/presence_status_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+            android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
         <android.support.text.emoji.widget.EmojiTextView
             android:id="@+id/status"
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index 9a407972a..0bf2cb5fe 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -7,6 +7,7 @@
 
     <android.support.text.emoji.widget.EmojiEditText
         android:id="@+id/editor"
+        style="@style/Widget.Conversations.EditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index ff99efdde..77615718b 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -38,14 +38,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/welcome_header"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/welcome_text"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                 <TextView
                     android:id="@id/import_text"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 02461ec1a..cbfa86c23 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="TextSizeTitle" format="dimension" />
     <attr name="TextSizeCaption" format="dimension" />
     <attr name="TextSizeInfo" format="dimension" />
+    <attr name="TextSizeTitle" format="dimension" />
+    <attr name="TextSizeSubhead" format="dimension" />
+    <attr name="TextSizeBody1" format="dimension" />
+    <attr name="TextSizeBody2" format="dimension" />
     <attr name="TextSizeInput" format="dimension" />
+    <attr name="TextSeparation" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
-    <attr name="TextSeparation" format="dimension"/>
+
     <attr name="IconSize" format="dimension" />
 
-    <attr name="text_Color_Main" format="reference|color"/>
+    <attr name="text_Color_Main" format="reference|color" />
 
     <attr name="color_background_secondary" format="reference|color" />
     <attr name="color_background_primary" format="reference|color" />
-    <attr name="color_warning" format="reference|color"/>
+    <attr name="color_warning" format="reference|color" />
 
-    <attr name="ic_send_cancel_offline" format="reference"/>
-    <attr name="ic_send_location_offline" format="reference"/>
-    <attr name="ic_send_photo_offline" format="reference"/>
-    <attr name="ic_send_picture_offline" format="reference"/>
-    <attr name="ic_send_text_offline" format="reference"/>
-    <attr name="ic_send_videocam_offline" format="reference"/>
-    <attr name="ic_send_voice_offline" format="reference"/>
+    <attr name="ic_send_cancel_offline" format="reference" />
+    <attr name="ic_send_location_offline" format="reference" />
+    <attr name="ic_send_photo_offline" format="reference" />
+    <attr name="ic_send_picture_offline" format="reference" />
+    <attr name="ic_send_text_offline" format="reference" />
+    <attr name="ic_send_videocam_offline" format="reference" />
+    <attr name="ic_send_voice_offline" format="reference" />
 
     <attr name="unread_count" format="reference|color" />
 
-    <attr name="conversations_overview_background" format="reference|color"/>
+    <attr name="conversations_overview_background" format="reference|color" />
 
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
@@ -52,7 +56,7 @@
     <attr name="icon_import_export" format="reference" />
     <attr name="icon_scan_qr_code" format="reference" />
     <attr name="icon_enable_undecided_device" format="reference" />
-    <attr name="icon_scroll_down" format="reference"/>
+    <attr name="icon_scroll_down" format="reference" />
 
     <attr name="icon_notifications" format="reference" />
     <attr name="icon_notifications_off" format="reference" />
@@ -74,25 +78,25 @@
     <attr name="ic_file_vcard" format="reference" />
     <attr name="ic_file_calendar" format="reference" />
 
-    <attr name="icon_alpha" format="float"/>
+    <attr name="icon_alpha" format="float" />
 
-    <attr name="popupOverlayStyle" format="reference"/>
+    <attr name="popupOverlayStyle" format="reference" />
 
-    <attr name="color_bubble_light" format="reference|color"/>
-    <attr name="color_bubble_blue" format="reference|color"/>
-    <attr name="color_bubble_date" format="reference|color"/>
-    <attr name="color_bubble_warning" format="reference|color"/>
+    <attr name="color_bubble_light" format="reference|color" />
+    <attr name="color_bubble_blue" format="reference|color" />
+    <attr name="color_bubble_date" format="reference|color" />
+    <attr name="color_bubble_warning" format="reference|color" />
 
-    <attr name="color_border" format="reference|color"/>
+    <attr name="color_border" format="reference|color" />
 
     <!-- settings -->
-    <attr name="ic_settings_ui" format="reference"/>
-    <attr name="ic_settings_notifications" format="reference"/>
-    <attr name="ic_settings_attachments" format="reference"/>
-    <attr name="ic_settings_status" format="reference"/>
-    <attr name="ic_settings_security" format="reference"/>
-    <attr name="ic_settings_expert" format="reference"/>
-    <attr name="ic_settings_about" format="reference"/>
+    <attr name="ic_settings_ui" format="reference" />
+    <attr name="ic_settings_notifications" format="reference" />
+    <attr name="ic_settings_attachments" format="reference" />
+    <attr name="ic_settings_status" format="reference" />
+    <attr name="ic_settings_security" format="reference" />
+    <attr name="ic_settings_expert" format="reference" />
+    <attr name="ic_settings_about" format="reference" />
 
     <declare-styleable name="UnreadCountCustomView">
         <attr name="backgroundColor" format="reference|color" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index ae3a66e48..abf61f8ce 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -4,30 +4,55 @@
         <item name="android:textSize">?TextSizeTitle</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textColor">?android:textColorSecondary</item>
+    <style name="TextAppearance.Conversations.Subhead" parent="TextAppearance.AppCompat.Subhead">
+        <item name="android:textSize">?TextSizeSubhead</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
-        <item name="android:typeface">monospace</item>
+    <style name="TextAppearance.Conversations.Body2" parent="TextAppearance.AppCompat.Body2">
+        <item name="android:textSize">?TextSizeBody2</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Body1" parent="TextAppearance.AppCompat.Body1">
+        <item name="android:textSize">?TextSizeBody1</item>
+        <item name="android:textColorLink">?android:textColorPrimary</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption">
+        <item name="android:textSize">?TextSizeCaption</item>
     </style>
 
     <style name="Widget.Conversations.EditText" parent="Widget.AppCompat.EditText">
         <item name="android:textSize">?TextSizeInput</item>
     </style>
 
-    <style name="InputLabel" parent="TextAppearance.AppCompat.Caption">
+    <style name="TextAppearance.Conversations.Design.Hint" parent="TextAppearance.Design.Hint">
+        <item name="android:textSize">?TextSizeCaption</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Design.Error" parent="TextAppearance.Design.Error">
+        <item name="android:textSize">?TextSizeCaption</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.Conversations.Body1">
+        <item name="android:textColor">?android:textColorSecondary</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.Conversations.Body1">
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
+        <item name="android:typeface">monospace</item>
+    </style>
+
+    <style name="InputLabel" parent="TextAppearance.Conversations.Caption">
         <item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item>
         <item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item>
         <item name="android:paddingRight">@dimen/input_label_horizontal_spacing</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Status" parent="TextAppearance.AppCompat.Caption">
+    <style name="TextAppearance.Conversations.Status" parent="TextAppearance.Conversations.Caption">
         <item name="android:textStyle">italic</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Tag" parent="TextAppearance.AppCompat.Caption">
+    <style name="TextAppearance.Conversations.Tag" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/white</item>
     </style>
 
@@ -39,10 +64,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption">
-        <item name="android:textSize">?TextSizeCaption</item>
-    </style>
-
     <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/red800</item>
     </style>
@@ -59,17 +80,12 @@
         <item name="android:textColor">?android:textColorTertiary</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Body1.OnDark" parent="TextAppearance.AppCompat.Body1">
+    <style name="TextAppearance.Conversations.Body1.OnDark" parent="TextAppearance.Conversations.Body1">
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorLink">@color/white</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Body1.Secondary.OnDark" parent="TextAppearance.AppCompat.Body1">
+    <style name="TextAppearance.Conversations.Body1.Secondary.OnDark" parent="TextAppearance.Conversations.Body1">
         <item name="android:textColor">@color/white70</item>
     </style>
-
-    <style name="TextAppearance.Conversations.Body1" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textColorLink">?android:textColorPrimary</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 85c18e84e..4495b2f49 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -24,77 +24,95 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
 
-        <item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+        <item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_white_24dp
+        </item>
 
-        <item name="TextSizeTitle">20sp</item>
         <item name="TextSizeCaption">12sp</item>
+        <item name="TextSizeBody1">14sp</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeSubhead">16sp</item>
+        <item name="TextSizeTitle">20sp</item>
+        <item name="TextSizeInput">16sp</item>
+        <item name="TextSeparation">5sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeInput">14sp</item>
         <item name="TextSizeBody">14sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">16sp</item>
         <item name="TextSizeHeadline">18sp</item>
 
         <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
         <item name="divider">@color/black12</item>
 
-        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item type="reference" name="icon_chat">@drawable/ic_action_chat</item>
-        <item type="reference" name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
-        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item type="reference" name="icon_new">@drawable/ic_contacts_white_24dp</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item type="reference" name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
-        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-        <item type="reference" name="icon_scroll_down">@drawable/ic_scroll_to_end_black</item>
+        <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
+        <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
+        <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>
+        <item name="icon_chat" type="reference">@drawable/ic_action_chat</item>
+        <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item>
+        <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
+        <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
+        <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_edit_body" type="reference">@drawable/ic_edit_black_24dp</item>
+        <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item>
+        <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item>
+        <item name="icon_new" type="reference">@drawable/ic_contacts_white_24dp</item>
+        <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item>
+        <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_quote" type="reference">@drawable/ic_reply_white_24dp</item>
+        <item name="icon_refresh" type="reference">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="icon_remove" type="reference">@drawable/ic_delete_grey600_24dp</item>
+        <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
+        <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_settings" type="reference">@drawable/ic_settings_grey600_24dp</item>
+        <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
+        </item>
+        <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
+        <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item>
+        <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item>
 
         <!-- settings-->
-        <item type="reference" name="ic_settings_ui">@drawable/ic_image_black_24dp</item>
-        <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_black_24dp</item>
-        <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_black_24dp</item>
-        <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_black_24dp</item>
-        <item type="reference" name="ic_settings_security">@drawable/ic_security_black_24dp</item>
-        <item type="reference" name="ic_settings_expert">@drawable/ic_settings_black_24dp</item>
+        <item name="ic_settings_ui" type="reference">@drawable/ic_image_black_24dp</item>
+        <item name="ic_settings_notifications" type="reference">
+            @drawable/ic_notifications_black_24dp
+        </item>
+        <item name="ic_settings_attachments" type="reference">@drawable/ic_attachment_black_24dp
+        </item>
+        <item name="ic_settings_status" type="reference">@drawable/ic_new_releases_black_24dp</item>
+        <item name="ic_settings_security" type="reference">@drawable/ic_security_black_24dp</item>
+        <item name="ic_settings_expert" type="reference">@drawable/ic_settings_black_24dp</item>
 
         <item name="dialog_horizontal_padding">16dp</item>
         <item name="dialog_vertical_padding">16dp</item>
-        <item type="float" name="icon_alpha">0.54</item>
+        <item name="icon_alpha" type="float">0.54</item>
 
-        <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item type="reference" name="ic_attach_document">@drawable/ic_attach_document</item>
-        <item type="reference" name="ic_attach_location">@drawable/ic_attach_location</item>
-        <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item type="reference" name="ic_attach_video">@drawable/ic_attach_video</item>
-        <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item>
+        <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item>
+        <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
+        <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item>
+        <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item>
+        <item name="ic_attach_video" type="reference">@drawable/ic_attach_video</item>
+        <item name="ic_attach_record" type="reference">@drawable/ic_attach_record</item>
 
         <item name="conversations_overview_background">@color/primary</item>
 
-        <item type="reference" name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
-        <item type="reference" name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
-        <item type="reference" name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
-        <item type="reference" name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
-
-        <item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item>
-        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
-        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
-        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
-        <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item>
-        <item type="reference" name="ic_settings_about">@drawable/ic_help_black_24dp</item>
+        <item name="ic_file_apk" type="reference">@drawable/ic_file_grey600_48dp</item>
+        <item name="ic_file_pdf" type="reference">@drawable/ic_file_pdf_grey600_48dp</item>
+        <item name="ic_file_vcard" type="reference">@drawable/ic_account_card_details_grey600_48dp
+        </item>
+        <item name="ic_file_calendar" type="reference">@drawable/ic_calendar_grey600_48dp</item>
+
+        <item name="icon_notifications" type="reference">@drawable/ic_notifications_black_24dp
+        </item>
+        <item name="icon_notifications_off" type="reference">
+            @drawable/ic_notifications_off_black_24dp
+        </item>
+        <item name="icon_notifications_paused" type="reference">
+            @drawable/ic_notifications_paused_black_24dp
+        </item>
+        <item name="icon_notifications_none" type="reference">
+            @drawable/ic_notifications_none_black_24dp
+        </item>
+        <item name="icon_enable_undecided_device" type="reference">
+            @drawable/ic_new_releases_black_24dp
+        </item>
+        <item name="ic_settings_about" type="reference">@drawable/ic_help_black_24dp</item>
     </style>
 
     <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
@@ -120,98 +138,137 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
 
-        <item name="TextSizeTitle">20sp</item>
         <item name="TextSizeCaption">12sp</item>
+        <item name="TextSizeBody1">14sp</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeSubhead">16sp</item>
+        <item name="TextSizeTitle">20sp</item>
+        <item name="TextSizeInput">16sp</item>
+        <item name="TextSeparation">5sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeInput">14sp</item>
         <item name="TextSizeBody">14sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">16sp</item>
         <item name="TextSizeHeadline">18sp</item>
 
         <item name="divider">@color/white12</item>
 
-        <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
-        <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
-        <item type="reference" name="ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item>
-        <item type="reference" name="ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item>
-        <item type="reference" name="ic_send_text_offline">@drawable/ic_send_text_offline_white</item>
-        <item type="reference" name="ic_send_videocam_offline">@drawable/ic_send_videocam_offline_white</item>
-        <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
-
-        <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera_white</item>
-        <item type="reference" name="ic_attach_video">@drawable/ic_attach_videocam_white</item>
-        <item type="reference" name="ic_attach_document">@drawable/ic_attach_document_white</item>
-        <item type="reference" name="ic_attach_location">@drawable/ic_attach_location_white</item>
-        <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo_white</item>
-        <item type="reference" name="ic_attach_record">@drawable/ic_attach_record_white</item>
+        <item name="ic_send_cancel_offline" type="reference">
+            @drawable/ic_send_cancel_offline_white
+        </item>
+        <item name="ic_send_location_offline" type="reference">
+            @drawable/ic_send_location_offline_white
+        </item>
+        <item name="ic_send_photo_offline" type="reference">@drawable/ic_send_photo_offline_white
+        </item>
+        <item name="ic_send_picture_offline" type="reference">
+            @drawable/ic_send_picture_offline_white
+        </item>
+        <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline_white
+        </item>
+        <item name="ic_send_videocam_offline" type="reference">
+            @drawable/ic_send_videocam_offline_white
+        </item>
+        <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline_white
+        </item>
+
+        <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item>
+        <item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item>
+        <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item>
+        <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item>
+        <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo_white</item>
+        <item name="ic_attach_record" type="reference">@drawable/ic_attach_record_white</item>
 
         <item name="conversations_overview_background">@color/primary_dark</item>
 
-        <item type="float" name="icon_alpha">0.7</item>
+        <item name="icon_alpha" type="float">0.7</item>
 
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
-        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item type="reference" name="icon_copy">@drawable/ic_content_copy_white_24dp</item>
-        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
-        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_refresh_white_24dp</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_remove">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_settings">@drawable/ic_settings_white_24dp</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-        <item type="reference" name="icon_scroll_down">@drawable/ic_scroll_to_end_white</item>
-
-        <item type="reference" name="icon_notifications">@drawable/ic_notifications_white_24dp</item>
-        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
-        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
-        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
-        <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_white_24dp</item>
+        <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
+        <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
+        <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>
+        <item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item>
+        <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
+        <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
+        <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_edit_body" type="reference">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item>
+        <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item>
+        <item name="icon_new" type="reference">@drawable/ic_add_white_24dp</item>
+        <item name="icon_quote" type="reference">@drawable/ic_reply_white_24dp</item>
+        <item name="icon_refresh" type="reference">@drawable/ic_refresh_white_24dp</item>
+        <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item>
+        <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_remove" type="reference">@drawable/ic_delete_white_24dp</item>
+        <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
+        <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item>
+        <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
+        </item>
+        <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
+        <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item>
+        <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item>
+
+        <item name="icon_notifications" type="reference">@drawable/ic_notifications_white_24dp
+        </item>
+        <item name="icon_notifications_off" type="reference">
+            @drawable/ic_notifications_off_white_24dp
+        </item>
+        <item name="icon_notifications_paused" type="reference">
+            @drawable/ic_notifications_paused_white_24dp
+        </item>
+        <item name="icon_notifications_none" type="reference">
+            @drawable/ic_notifications_none_white_24dp
+        </item>
+        <item name="icon_enable_undecided_device" type="reference">
+            @drawable/ic_new_releases_white_24dp
+        </item>
 
         <!-- settings-->
-        <item type="reference" name="ic_settings_ui">@drawable/ic_image_white_24dp</item>
-        <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_white_24dp</item>
-        <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_white_24dp</item>
-        <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_white_24dp</item>
-        <item type="reference" name="ic_settings_security">@drawable/ic_security_white_24dp</item>
-        <item type="reference" name="ic_settings_expert">@drawable/ic_settings_white_24dp</item>
-        <item type="reference" name="ic_settings_about">@drawable/ic_help_circle_white_24dp</item>
+        <item name="ic_settings_ui" type="reference">@drawable/ic_image_white_24dp</item>
+        <item name="ic_settings_notifications" type="reference">
+            @drawable/ic_notifications_white_24dp
+        </item>
+        <item name="ic_settings_attachments" type="reference">@drawable/ic_attachment_white_24dp
+        </item>
+        <item name="ic_settings_status" type="reference">@drawable/ic_new_releases_white_24dp</item>
+        <item name="ic_settings_security" type="reference">@drawable/ic_security_white_24dp</item>
+        <item name="ic_settings_expert" type="reference">@drawable/ic_settings_white_24dp</item>
+        <item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
     </style>
 
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
-        <item name="TextSizeTitle">22sp</item>
-        <item name="TextSizeCaption">14sp</item>
-        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeCaption">12sp</item>
+        <item name="TextSizeBody1">14sp</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeSubhead">16sp</item>
+        <item name="TextSizeTitle">20sp</item>
         <item name="TextSizeInput">16sp</item>
-        <item name="TextSizeBody">16sp</item>
+        <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
-        <item name="TextSizeHeadline">20sp</item>
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">18sp</item>
     </style>
 
     <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
 
+        <item name="TextSizeCaption">12sp</item>
+        <item name="TextSizeBody1">14sp</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeSubhead">16sp</item>
+        <item name="TextSizeTitle">20sp</item>
+        <item name="TextSizeInput">16sp</item>
+        <item name="TextSeparation">5sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeInput">14sp</item>
         <item name="TextSizeHeadline">18sp</item>
+
         <item name="colorAccent">@color/accent</item>
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>
@@ -222,9 +279,17 @@
     <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
+
+        <item name="TextSizeCaption">12sp</item>
+        <item name="TextSizeBody1">14sp</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeSubhead">16sp</item>
+        <item name="TextSizeTitle">20sp</item>
+        <item name="TextSizeInput">16sp</item>
+        <item name="TextSeparation">5sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeInput">14sp</item>
         <item name="TextSizeHeadline">18sp</item>
 
         <item name="colorAccent">@color/accent</item>