diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml
index 8c2cefc24ef0fb696ca47e192d1e9152703c4e85..5b6037f712969ac0eb4249f0062e97a891f29351 100644
--- a/res/drawable/es_slidingpane_shadow.xml
+++ b/res/drawable/es_slidingpane_shadow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 <gradient
-    android:endColor="#cccccc"
-    android:startColor="#00000000" />
+    android:endColor="@color/divider"
+    android:startColor="@android:color/transparent" />
 <size android:width="3.0dp" android:height="0.5dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml
index 1477fbe87e09c46eaa6ee49e8c092e06bacc7028..4a581e7df37e786f1425841de401840afdd0e05e 100644
--- a/res/drawable/message_border.xml
+++ b/res/drawable/message_border.xml
@@ -2,5 +2,5 @@
   <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
   <corners android:radius="2dp"/>
   <padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/>
-  <solid android:color="#cecece"/>
+  <solid android:color="@color/divider"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml
index 25f148ce20099388166d3d3dd05fab406310e738..e4cb9742708f2a65844bb83bf2a8a4997f3c4bc4 100644
--- a/res/drawable/section_header.xml
+++ b/res/drawable/section_header.xml
@@ -4,7 +4,7 @@
 
     <size
         android:height="1.5dp"
-        android:width="1000dp" />
+        android:width="2000dp" />
 
-    <solid android:color="#b7b7b7" />
+    <solid android:color="@color/divider" />
 </shape>
\ No newline at end of file
diff --git a/res/layout-sw320dp/fragment_conversations_overview.xml b/res/layout-sw320dp/fragment_conversations_overview.xml
index fcb1949c505ef00ec3b20d2ef34a965f0d97a77d..b85f111671c3fce7ac8492500f5fb925fba2aba8 100644
--- a/res/layout-sw320dp/fragment_conversations_overview.xml
+++ b/res/layout-sw320dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
     android:layout_width="288dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="#eeeeee"
+    android:background="@color/primarybackground"
     >
  
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="#b5b5b5"
+        android:divider="@color/divider"
         android:dividerHeight="1dp"
-        android:background="#eeeeee"
+        android:background="@color/primarybackground"
      />
  
 </LinearLayout>
@@ -25,7 +25,6 @@
     android:layout_width="fill_parent"
 	android:layout_height="match_parent"
 	android:layout_weight="1"
-	android:background="#e5e5e5"
 	android:orientation="vertical">
 </LinearLayout>      
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml
index 939950c238b7c3ccd3630c06c9f92b016a5436bb..ceb3b5fa85ca4450fcebee8fe8fe0806dbab0e97 100644
--- a/res/layout-sw360dp/fragment_conversations_overview.xml
+++ b/res/layout-sw360dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
     android:layout_width="324dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="#eeeeee"
+    android:background="@color/primarybackground"
     >
  
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="#b5b5b5"
+        android:divider="@color/divider"
         android:dividerHeight="1dp"
-        android:background="#eeeeee"
+        android:background="@color/primarybackground"
      />
  
 </LinearLayout>
@@ -25,7 +25,6 @@
     android:layout_width="fill_parent"
 	android:layout_height="match_parent"
 	android:layout_weight="1"
-	android:background="#e5e5e5"
 	android:orientation="vertical">
 </LinearLayout>      
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml
index e48cf9ecfbb459d46f029bbef12b9b2c31ca1d60..26d79d233d4ed87ede554f1388b5048ab958b82e 100644
--- a/res/layout-sw384dp/fragment_conversations_overview.xml
+++ b/res/layout-sw384dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
     android:layout_width="345dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="#eeeeee"
+    android:background="@color/primarybackground"
     >
  
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="#b5b5b5"
+        android:divider="@color/divider"
         android:dividerHeight="1dp"
-        android:background="#eeeeee"
+        android:background="@color/primarybackground"
      />
  
 </LinearLayout>
@@ -25,7 +25,6 @@
     android:layout_width="fill_parent"
 	android:layout_height="match_parent"
 	android:layout_weight="1"
-	android:background="#e5e5e5"
 	android:orientation="vertical">
 </LinearLayout>      
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml
index fac95f9cf9c96d5b4637dd826bfca2a93b5f22fb..f26c840b4df2fb1d16771c49d3cab6959c147f8e 100644
--- a/res/layout-sw600dp/fragment_conversations_overview.xml
+++ b/res/layout-sw600dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
     android:layout_width="240dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="#eeeeee"
+    android:background="@color/primarybackground"
     >
  
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="#b5b5b5"
+        android:divider="@color/divider"
         android:dividerHeight="1dp"
-        android:background="#eeeeee"
+        android:background="@color/primarybackground"
      />
  
 </LinearLayout>
@@ -25,7 +25,6 @@
     android:layout_width="fill_parent"
 	android:layout_height="match_parent"
 	android:layout_weight="1"
-	android:background="#e5e5e5"
 	android:orientation="vertical">
 </LinearLayout>      
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml
index fcb1949c505ef00ec3b20d2ef34a965f0d97a77d..b85f111671c3fce7ac8492500f5fb925fba2aba8 100644
--- a/res/layout-sw720dp/fragment_conversations_overview.xml
+++ b/res/layout-sw720dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
     android:layout_width="288dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="#eeeeee"
+    android:background="@color/primarybackground"
     >
  
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="#b5b5b5"
+        android:divider="@color/divider"
         android:dividerHeight="1dp"
-        android:background="#eeeeee"
+        android:background="@color/primarybackground"
      />
  
 </LinearLayout>
@@ -25,7 +25,6 @@
     android:layout_width="fill_parent"
 	android:layout_height="match_parent"
 	android:layout_weight="1"
-	android:background="#e5e5e5"
 	android:orientation="vertical">
 </LinearLayout>      
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 248b17f70b2005221188ab5ac005f75aa8918be4..0c18d9b2ffbda382167ccb7bdd7546b94ea580f4 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -20,6 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
+            android:textColor="@color/primarytext"
             android:singleLine="true"
 	        android:scrollHorizontally="false"/>
 
@@ -35,14 +36,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/account_status"
                 android:textStyle="bold"
-               	android:textSize="14sp" />
+               	android:textSize="14sp"
+               	android:textColor="@color/primarytext"/>
 
             <TextView
                 android:id="@+id/account_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="4dp"
-                android:textColor="#669900"
                 android:text="@string/account_status_unknown"
                 android:textStyle="bold"
                 android:textSize="14sp"/>
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index ae3aaf7cbe2cd690b911f724d82ae74423462675..d55dcc9c36500f982fe5cb8d99e423df21047e0f 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-        android:background="#e5e5e5">
+        android:background="@color/primarybackground">
 
 <LinearLayout 
     android:layout_width="match_parent"
@@ -14,7 +14,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/action_contact_details" />
+        android:text="@string/action_contact_details"
+        android:textColor="@color/primarytext"/>
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,8 +44,8 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="8dp"
                 android:singleLine="true"
-                android:textColor="#5b5b5b"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:textColor="@color/primarytext"/>
 
             <TextView
                 android:id="@+id/details_contactstatus"
@@ -52,6 +53,7 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="16dp"
                 android:textSize="18sp"
+                android:textColor="@color/primarytext"
                 android:textStyle="bold" />
             <TextView
                 android:id="@+id/details_lastseen"
@@ -59,8 +61,8 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="8dp"
                 android:singleLine="true"
-                android:textColor="#5b5b5b"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:textColor="@color/primarytext"/>
         </LinearLayout>
           
     </RelativeLayout>
@@ -71,20 +73,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/your_account" />
+        android:text="@string/your_account"
+        android:textColor="@color/primarytext"/>
     <TextView
         android:id="@+id/details_account"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
         android:textSize="14sp"
-        android:textColor="#5b5b5b" />
+        android:textColor="@color/primarytext" />
    <TextView
         style="@style/sectionHeader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/subscriptions" />
+        android:text="@string/subscriptions"
+        android:textColor="@color/primarytext"/>
 
     <CheckBox
         android:id="@+id/details_send_presence"
@@ -92,7 +96,7 @@
         android:layout_height="wrap_content"
         android:text="@string/send_presence_updates"
         android:textSize="14sp"
-        android:textColor="#5b5b5b" />
+        android:textColor="@color/primarytext" />
 
         <CheckBox
         android:id="@+id/details_receive_presence"
@@ -100,7 +104,7 @@
         android:layout_height="wrap_content"
         android:text="@string/receive_presence_updates"
         android:textSize="14sp"
-        android:textColor="#5b5b5b" />
+        android:textColor="@color/primarytext" />
         
 	<TextView 
 	    android:id="@+id/ask_again"
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index ebd3db0f6d384c2de32f61e7cb1062cbee634f95..15f09c7c593e7737aea451f9ac8141314cc80358 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:background="@color/secondarybackground">
 
 <LinearLayout
     android:layout_width="wrap_content"
@@ -13,11 +13,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/muc_details_conference" />
+        android:text="@string/muc_details_conference"
+        android:textColor="@color/primarytext"/>
        <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#eee" >
+        android:background="@color/primarybackground" >
         
 
         <EditText
@@ -26,7 +27,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/muc_edit_subject"
-            android:background="#eee"
+            android:background="@color/primarybackground"
             android:ems="10"
             android:hint="@string/muc_details_conference_subject"
             android:inputType="textAutoComplete"
@@ -52,8 +53,8 @@
         android:layout_height="wrap_content"
         android:padding="8dp"
         android:singleLine="true"
-        android:textColor="#5b5b5b"
-        android:textSize="14sp"/>
+        android:textSize="14sp"
+        android:textColor="@color/primarytext"/>
 
     <TextView
         style="@style/sectionHeader"
@@ -62,12 +63,13 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="8dp"
-        android:text="@string/muc_details_your_nickname" />
+        android:text="@string/muc_details_your_nickname"
+        android:textColor="@color/primarytext"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#eee" >
+        android:background="@color/primarybackground" >
         
 
         <EditText
@@ -76,7 +78,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/muc_edit_nick"
-            android:background="#eee"
+            android:background="@color/primarybackground"
             android:ems="10"
             android:hint="@string/muc_details_your_nickname"
             android:inputType="textEmailAddress"
@@ -103,7 +105,7 @@
         android:padding="8dp"
         android:singleLine="true"
         android:textSize="14sp"
-        android:textColor="#5b5b5b"/>
+        android:textColor="@color/primarytext"/>
     
     <LinearLayout
         android:id="@+id/muc_more_details"
@@ -119,12 +121,13 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="8dp"
-        android:text="@string/muc_details_other_members" />
+        android:text="@string/muc_details_other_members"
+        android:textColor="@color/primarytext"/>
 
     <LinearLayout
         android:id="@+id/muc_members"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="0dp"
         android:layout_weight="1" 
         android:orientation="vertical"
         android:divider="?android:dividerHorizontal"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index e637e4b1240bd7d536101b3d67dde4ba0cc6158b..8432c7a3ee75327e46202f4004e02900b4b7e232 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -25,23 +25,23 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
-        android:textColor="#5b5b5b"
+        android:textColor="@color/primarytext"
         android:singleLine="true"
         />
     <TextView 
         android:id="@+id/contact_jid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#5b5b5b"
         android:singleLine="true"
         android:textSize="14sp"
+        android:textColor="@color/primarytext"
         />
     <TextView 
         android:id="@+id/key"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
-        android:textColor="#5b5b5b"
+        android:textColor="@color/primarytext"
         android:typeface="monospace"
         android:visibility="gone"
         />
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index dcac42e98277d2886a1882d73f79339579b26bf8..0c457c25d2a60ffc105b5b0ea487fa357b9cc47b 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -10,13 +10,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
-        android:textColor="#5b5b5b"
+        android:textColor="@color/primarytext"
         android:typeface="monospace"
         />
     <TextView 
         android:id="@+id/key_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#5b5b5b"
+        android:textColor="@color/secondarytext"
         />
     </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 8b9c461d760b3ce5bbc29f6a7038253c90508860..97985737ec6402f2168e77e34f765b8e2985d27a 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -25,8 +25,8 @@
 	        android:layout_alignLeft="@+id/conversation_lastwrapper"
 	        android:layout_toLeftOf="@+id/conversation_lastupdate"
 	        android:singleLine="true"
-	        android:textColor="#636363"
 	        android:textSize="18sp"
+	        android:textColor="@color/primarytext"
 	        android:typeface="sans" />
 	 
 	    <LinearLayout
@@ -41,9 +41,8 @@
 	        android:id="@+id/conversation_lastmsg"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
-	        
-	        android:textColor="#636363"
 	        android:textSize="14sp"
+	        android:textColor="@color/primarytext"
 	        android:singleLine="true"
 	        android:scrollHorizontally="false"
 	        />
@@ -52,7 +51,7 @@
 	        android:id="@+id/conversation_lastimage"
 	        android:layout_width="fill_parent"
 	        android:layout_height="36dp"
-	        android:background="#333333"
+	        android:background="@color/primarytext"
 	        android:scaleType="centerCrop" />
 
 	</LinearLayout>
@@ -63,8 +62,8 @@
 	        android:layout_alignBaseline="@+id/conversation_name"
 	        android:layout_alignParentRight="true"
 	        android:gravity="right"
-	        android:textColor="#636363"
-	        android:textSize="12sp" />
+	        android:textSize="12sp"
+	        android:textColor="@color/secondarytext"/>
 
  	</RelativeLayout>
  
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index a55dce0174f0e32e1136d34e6b2c27f00abad1a6..c518c64707d0760a69bd83721f5d6274baa67e48 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:text="Jabber ID"
-        android:textColor="#33B5E5"
+        android:textColor="@color/primarytext"
         android:textSize="18sp"/>
 
     <TextView
@@ -20,13 +20,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:textColor="@color/secondarytext"/>
      <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
-        android:text="OTR fingerprint"
-        android:textColor="#33B5E5"
+        android:text="@string/otr_fingerprint"
+        android:textColor="@color/primarytext"
         android:textSize="18sp"/>
 
     <TextView
@@ -35,14 +36,15 @@
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
         android:textSize="14sp"
-        android:typeface="monospace"/>
+        android:typeface="monospace"
+        android:textColor="@color/secondarytext"/>
      <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
-        android:text="Your fingerprint"
-        android:textColor="#33B5E5"
-        android:textSize="18sp"/>
+        android:text="@string/your_fingerprint"
+        android:textSize="18sp"
+        android:textColor="@color/primarytext"/>
 
     <TextView
         android:id="@+id/verify_otr_yourprint"
@@ -50,5 +52,6 @@
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
         android:textSize="14sp"
-        android:typeface="monospace"/>
+        android:typeface="monospace"
+        android:textColor="@color/secondarytext"/>
 </LinearLayout>
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
index 206c74323070df5807ec3c604a8262c8a8d02257..42f0fb88e8ce1679ac24d360a6e4831b7121fc47 100644
--- a/res/layout/edit_contact_name.xml
+++ b/res/layout/edit_contact_name.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/enter_new_name"
-        android:textColor="#5b5b5b"
+        android:textColor="@color/primarytext"
         android:textSize="18sp" />
 
     <EditText
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 4bf93eab3b1b0fbc1130e96eee49b0dcea470f77..749d97b26a67c78758668e0e313bd9cf1144b9fb 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5" >
+    android:background="@color/primarybackground" >
 
     <RelativeLayout
         android:id="@+id/textsend"
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#eee" >
+        android:background="@color/primarybackground" >
 
         <EditText
             android:id="@+id/textinput"
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
-            android:background="#eee"
+            android:background="@color/primarybackground"
             android:ems="10"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
             android:minHeight="48dp"
@@ -27,7 +27,8 @@
             android:paddingBottom="12dp"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
-            android:paddingTop="12dp" >
+            android:paddingTop="12dp"
+            android:textColor="@color/primarytext">
 
             <requestFocus />
         </EditText>
@@ -49,7 +50,7 @@
         android:layout_above="@+id/textsend"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/info_box"
-        android:background="#e5e5e5"
+        android:background="@color/secondarybackground"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml
index 0866477a3aef0034b1909210ad5c5d556de45472..a2a01bf1bd3195958cf1e7fcc4685ebab33d62f5 100644
--- a/res/layout/manage_accounts.xml
+++ b/res/layout/manage_accounts.xml
@@ -8,7 +8,8 @@
         android:id="@+id/account_list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/account_row">
+        android:divider="@color/divider"
+        android:dividerHeight="1dp">
     </ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 7949f2e1b15e4303efcbad182971c9bf33ccf4c9..563d730d137c8cb2a08496a246bb4eb024a171fc 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -20,7 +20,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="#ededed"
+            android:background="@color/primarybackground"
             android:orientation="vertical"
             android:gravity="center_vertical"
             android:paddingTop="4dp"
@@ -35,7 +35,7 @@
                 android:adjustViewBounds="true"
                 android:paddingBottom="2dp"
                 android:scaleType="fitXY"
-                android:background="#333333"
+                android:background="@color/primarytext"
                 />
             
             <TextView
@@ -44,8 +44,8 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textIsSelectable="true"
-                android:textColor="#333333"
-                android:textSize="14sp"/>
+                android:textSize="14sp"
+                android:textColor="@color/primarytext"/>
 
             <Button
                 android:id="@+id/download_button"
@@ -79,8 +79,8 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="#8e8e8e"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    android:textColor="@color/secondarytext"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index b9c2ee1007132e6e532f55d2714767fd327d1bc3..d4970e6fab753f46495bbea717b6f20dc1a9555b 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -20,7 +20,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="#ededed"
+            android:background="@color/primarybackground"
             android:orientation="vertical"
             android:gravity="center_vertical"
             android:paddingTop="4dp"
@@ -35,7 +35,7 @@
                 android:adjustViewBounds="true"
                 android:paddingBottom="2dp"
                 android:scaleType="fitXY"
-                android:background="#333333"
+                android:background="@color/primarytext"
                 />
 
             <TextView
@@ -44,8 +44,8 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textIsSelectable="true"
-                android:textColor="#333333"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:textColor="@color/primarytext"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -61,8 +61,8 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="#8e8e8e"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    android:textColor="@color/secondarytext"/>
                 
                  <ImageView
                     android:id="@+id/security_indicator"
diff --git a/res/values-fr/styles.xml b/res/values-fr/styles.xml
deleted file mode 100644
index 1468283ed128ec1b6f98efb8276b63d6f9fbe5ce..0000000000000000000000000000000000000000
--- a/res/values-fr/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">#5b5b5b</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="Divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1.5dp</item>
-        <item name="android:background">#b7b7b7</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..382b5471d1e72f2a3493f355fc9c3d7b71d48571
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="primarytext" type="color">#de000000</color>
+    <color name="secondarytext" type="color">#8a000000</color>
+    <color name="primarybackground" type="color">#fffafafa</color>
+    <color name="secondarybackground" type="color">#ffeeeeee</color>
+    <color name="divider">#1f000000</color>
+    <color name="red">#ffe51c23</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index af372357c84857ac5631e01e4892aaf664d4e40c..dcaf58d2f01349c33bddc825e78404cef6a64198 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,4 +250,6 @@
     <string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
     <string name="reception_failed">Reception failed</string>
     <string name="no_muc_server_found">No suitable Conference Server found</string>
+    <string name="your_fingerprint">Your fingerprint</string>
+    <string name="otr_fingerprint">OTR fingerprint</string>
 </resources>
\ No newline at end of file