diff --git a/res/values/settings.xml b/res/values/settings.xml
index c34bbfd..811498d 100644
--- a/res/values/settings.xml
+++ b/res/values/settings.xml
@@ -7,7 +7,10 @@
 	<string name="default_show_icons">true</string>
 	
 	<string name="key_show_colors">show_colors</string>
-	<string name="default_show_colors">true</string><string name="key_show_colors_nick">show_colors_nick</string><string name="default_show_colors_nick">true</string>
+	<string name="default_show_colors">true</string>
+	
+	<string name="key_show_colors_nick">show_colors_nick</string>
+	<string name="default_show_colors_nick">true</string>
 	
 	<string name="key_24h_format">24h_format</string>
 	<string name="default_24h_format">true</string>
@@ -23,9 +26,4 @@
 	
 	<string name="key_voice_recognition">voice_recognition</string>
 	<string name="default_voice_recognition">true</string>
-
-
-
-
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f4b666..8199833 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -171,9 +171,4 @@
 	<string name="settings_fontsize_dialog_title">Font size</string>
 	<string name="settings_voice_recognition_title">Voice recognition</string>
 	<string name="settings_voice_recognition_desc">Show button for voice recognition</string>
-
-
-
-
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 858257c..ff3eba2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -47,11 +47,13 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 		<CheckBoxPreference
 			android:title="@string/settings_colors_title"
 			android:summary="@string/settings_colors_desc"
-			android:key="@string/key_show_colors" android:defaultValue="@string/default_show_colors"/>
+			android:key="@string/key_show_colors"
+			android:defaultValue="@string/default_show_colors"/>
 		<CheckBoxPreference
 			android:title="@string/settings_colors_nick_title"
 			android:key="@string/key_show_colors_nick"
-			android:summary="@string/settings_colors_nick_desc" android:defaultValue="@string/default_show_colors_nick"/>
+			android:summary="@string/settings_colors_nick_desc"
+			android:defaultValue="@string/default_show_colors_nick"/>
 		<CheckBoxPreference
 			android:title="@string/settings_timestamp_title"
 			android:summary="@string/settings_timestamp_desc"
@@ -63,8 +65,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 			android:key="@string/key_24h_format"
 			android:defaultValue="@string/default_24h_format"
 			android:dependency="@string/key_show_timestamp" />
-	
-</PreferenceCategory>
+    </PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/settings_misc">
         <CheckBoxPreference