diff --git a/res/layout-FR/chat.xml b/res/layout-FR/chat.xml
index 5eeb2081a..550f76634 100644
--- a/res/layout-FR/chat.xml
+++ b/res/layout-FR/chat.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout-RU/chat.xml b/res/layout-RU/chat.xml
index d6cb7d588..85f16d1eb 100644
--- a/res/layout-RU/chat.xml
+++ b/res/layout-RU/chat.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout-small/about.xml b/res/layout-small/about.xml
index ec5bfef5a..101de6012 100644
--- a/res/layout-small/about.xml
+++ b/res/layout-small/about.xml
@@ -36,7 +36,7 @@
 			android:gravity="center" 
 			android:paddingTop="50sp"
 			android:textStyle="bold" 
-			android:textColor="@android:color/black"
+			android:textColor="@color/text_contrast"
 			android:id="@+id/AboutText"/>
 		
 		<Button android:id="@+id/exit"
diff --git a/res/layout-small/chat.xml b/res/layout-small/chat.xml
index 794705cc3..c6994e3d4 100644
--- a/res/layout-small/chat.xml
+++ b/res/layout-small/chat.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout-small/history_detail.xml b/res/layout-small/history_detail.xml
index e07a96436..a0f4d0e37 100644
--- a/res/layout-small/history_detail.xml
+++ b/res/layout-small/history_detail.xml
@@ -32,14 +32,14 @@
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceLarge"
-		    	android:textColor="@android:color/black" />
+		    	android:textColor="@color/text_contrast" />
 	        
 	        <TextView
 	            android:id="@+id/contactAddress"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceSmall"
-		    	android:textColor="@android:color/black" />
+		    	android:textColor="@color/text_contrast" />
         
         </LinearLayout>
         
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:textSize="13sp"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
         <TextView
             android:id="@+id/date"
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:textSize="13sp"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
         <TextView
             android:id="@+id/time"
@@ -79,7 +79,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:textSize="13sp"
-            android:textColor="@android:color/black" />
+            android:textColor="@color/text_contrast" />
         
     </RelativeLayout>
     
diff --git a/res/layout-sw600dp-land/contact.xml b/res/layout-sw600dp-land/contact.xml
index d8f4ba2c3..c3e266003 100644
--- a/res/layout-sw600dp-land/contact.xml
+++ b/res/layout-sw600dp-land/contact.xml
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout/about.xml b/res/layout/about.xml
index e850a1609..5e26106cc 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -31,7 +31,7 @@
 		android:gravity="center" 
 		android:paddingTop="50sp"
 		android:textStyle="bold" 
-		android:textColor="@android:color/black"
+		android:textColor="@color/text_contrast"
 		android:id="@+id/AboutText"/>
 	
 	<Button android:id="@+id/exit"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index b2038a8f7..23ff80b4a 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 5ecb3091e..b663e5357 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -63,7 +63,7 @@
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:textAppearance="?android:attr/textAppearanceLarge"
-		    android:textColor="@android:color/black"
+		    android:textColor="@color/text_contrast"
 		    android:layout_marginLeft="10dp" />
 		
 		<TextView 
@@ -73,7 +73,7 @@
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:textAppearance="?android:attr/textAppearanceSmall"
-		    android:textColor="@android:color/black"
+		    android:textColor="@color/text_contrast"
 		    android:layout_marginLeft="5dp" />
 	    
 	</LinearLayout>
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 040e12e04..f453ac46a 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -47,7 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
     </LinearLayout>
     
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index d29f9454d..10712ec59 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/numpad_background_top"
-        android:textColor="@android:color/white"
+        android:textColor="@color/text_contrast"
         android:layout_marginBottom="10dp"
         android:textStyle="bold" />
     
@@ -42,7 +42,7 @@
 		    android:layout_toRightOf="@id/icon"
 		    android:layout_centerVertical="true"
 		    android:textAppearance="?android:attr/textAppearanceLarge"
-		    android:textColor="@android:color/black"
+		    android:textColor="@color/text_contrast"
 		    android:layout_marginLeft="10dp" />
 		
 		<ImageView 
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 9dde0eef3..a53e93174 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -17,7 +17,7 @@
     	android:scrollHorizontally="true"
     	android:fadingEdge="horizontal"
         android:singleLine="true"
-		android:textColor="@android:color/black"
+		android:textColor="@color/text_contrast"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="left" />
    	
diff --git a/res/layout/edit_contact.xml b/res/layout/edit_contact.xml
index f5e050883..49747f831 100644
--- a/res/layout/edit_contact.xml
+++ b/res/layout/edit_contact.xml
@@ -77,7 +77,7 @@
 				        android:layout_width="match_parent"
 				        android:layout_height="wrap_content"
 				        android:hint="@string/contact_last_name"
-				        android:textColor="@android:color/black"
+				        android:textColor="@color/text_contrast"
 				        android:background="@drawable/chat_fast_address_background"
 				        android:gravity="left"
 				        android:paddingRight="5dp"
@@ -89,7 +89,7 @@
 				        android:layout_width="match_parent"
 				        android:layout_height="wrap_content"
 				        android:hint="@string/contact_first_name"
-				        android:textColor="@android:color/black"
+				        android:textColor="@color/text_contrast"
 				        android:background="@drawable/chat_fast_address_background"
 				        android:gravity="left"
 				        android:paddingRight="5dp"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index e3d41b7a6..e537d693f 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -22,7 +22,7 @@
 	    android:layout_height="wrap_content"
 	    android:layout_weight="0.3"
 	    android:textAppearance="?android:attr/textAppearanceLarge"
-	    android:textColor="@android:color/black"
+	    android:textColor="@color/text_contrast"
 	    android:layout_marginLeft="10dp" />
 	
 	<ImageView 
diff --git a/res/layout/history_cell_simple.xml b/res/layout/history_cell_simple.xml
index 5f07ba7de..e961d8a7d 100644
--- a/res/layout/history_cell_simple.xml
+++ b/res/layout/history_cell_simple.xml
@@ -44,7 +44,7 @@
 	        android:singleLine="true"
 		    android:layout_weight="0.2"
 		    android:textAppearance="?android:attr/textAppearanceLarge"
-		    android:textColor="@android:color/black"
+		    android:textColor="@color/text_contrast"
 		    android:layout_marginLeft="10dp" />
 		
 		<ImageView
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 99bf6a1a7..d8366b4fc 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -32,14 +32,14 @@
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceLarge"
-		    	android:textColor="@android:color/black" />
+		    	android:textColor="@color/text_contrast" />
 	        
 	        <TextView
 	            android:id="@+id/contactAddress"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceSmall"
-		    	android:textColor="@android:color/black" />
+		    	android:textColor="@color/text_contrast" />
         
         </LinearLayout>
         
@@ -57,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
         <TextView
             android:id="@+id/date"
@@ -65,7 +65,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-	    	android:textColor="@android:color/black" />
+	    	android:textColor="@color/text_contrast" />
         
         <TextView
             android:id="@+id/time"
@@ -76,7 +76,7 @@
             android:layout_toRightOf="@id/callDirection"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:textColor="@android:color/black" />
+            android:textColor="@color/text_contrast" />
         
     </RelativeLayout>
     
diff --git a/res/layout/history_group.xml b/res/layout/history_group.xml
index df4882a05..65f4018e9 100644
--- a/res/layout/history_group.xml
+++ b/res/layout/history_group.xml
@@ -21,7 +21,7 @@
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 	    android:textAppearance="?android:attr/textAppearanceLarge"
-	    android:textColor="@android:color/black"
+	    android:textColor="@color/text_contrast"
 	    android:layout_marginLeft="30dp"
 	    android:layout_alignParentLeft="true"
 	    android:layout_toLeftOf="@id/delete" />
diff --git a/res/values/color.xml b/res/values/color.xml
index f07034e8d..4f58128f4 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -25,4 +25,6 @@
     <color name="transparent">#00000000</color>
     
     <color name="landscape_background">#CCCCCC</color>
+    
+    <color name="text_contrast">#ff000000</color> <!-- If background is white, set to black, else set to white -->
 </resources>