diff --git a/app/src/main/res/values/dimens_color_picker.xml b/app/src/main/res/values/dimens_color_picker.xml
deleted file mode 100644
index 27517fbae..000000000
--- a/app/src/main/res/values/dimens_color_picker.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="color_swatch_large">64dip</dimen>
-    <dimen name="color_swatch_small">48dip</dimen>
-    <dimen name="color_swatch_margins_large">8dip</dimen>
-    <dimen name="color_swatch_margins_small">4dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens_date_time.xml b/app/src/main/res/values/pickers.xml
similarity index 59%
rename from app/src/main/res/values/dimens_date_time.xml
rename to app/src/main/res/values/pickers.xml
index 201590689..a515da332 100644
--- a/app/src/main/res/values/dimens_date_time.xml
+++ b/app/src/main/res/values/pickers.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
+<?xml version="1.0" encoding="utf-8" ?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <dimen name="color_swatch_large">64dip</dimen>
+    <dimen name="color_swatch_small">48dip</dimen>
+    <dimen name="color_swatch_margins_large">8dip</dimen>
+    <dimen name="color_swatch_margins_small">4dip</dimen>
+
     <item name="circle_radius_multiplier" format="float" type="string" translatable="false">0.82</item>
     <item name="circle_radius_multiplier_24HourMode" format="float" type="string" translatable="false">0.85</item>
     <item name="selection_radius_multiplier" format="float" type="string" translatable="false">0.16</item>
@@ -39,4 +44,22 @@
     <dimen name="day_number_size">16sp</dimen>
     <dimen name="year_label_height">64dp</dimen>
     <dimen name="year_label_text_size">22dp</dimen>
+
+    <string name="color_swatch_description" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>
+    <string name="color_swatch_description_selected" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g> selected</string>
+
+    <!-- Date and time picker -->
+    <string name="hour_picker_description" translatable="false">Hours circular slider</string>
+    <string name="minute_picker_description" translatable="false">Minutes circular slider</string>
+    <string name="day_picker_description" translatable="false">Month grid of days</string>
+    <string name="year_picker_description" translatable="false">Year list</string>
+    <string name="select_day" translatable="false">Select month and day</string>
+    <string name="select_year" translatable="false">Select year</string>
+    <string name="item_is_selected" translatable="false"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
+    <string name="deleted_key" translatable="false"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
+    <string name="time_placeholder" translatable="false">--</string>
+    <string name="time_separator" translatable="false">:</string>
+    <string name="radial_numbers_typeface" translatable="false">sans-serif</string>
+    <string name="sans_serif" translatable="false">sans-serif</string>
+    <string name="day_of_week_label_typeface" translatable="false">sans-serif</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd1e5b642..2a68a68c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
 
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Habits</string>
@@ -21,28 +21,6 @@
     <string name="toast_habit_archived">Habits archived.</string>
     <string name="toast_habit_unarchived">Habits unarchived.</string>
 
-    <string name="color_swatch_description" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>
-    <string name="color_swatch_description_selected" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g> selected</string>
-
-    <!-- Date and time picker -->
-    <string name="done_label">Done</string>
-    <string name="clear_label">Clear</string>
-    <string name="hour_picker_description" translatable="false">Hours circular slider</string>
-    <string name="minute_picker_description" translatable="false">Minutes circular slider</string>
-    <string name="select_hours">Select hours</string>
-    <string name="select_minutes">Select minutes</string>
-    <string name="day_picker_description" translatable="false">Month grid of days</string>
-    <string name="year_picker_description" translatable="false">Year list</string>
-    <string name="select_day">Select month and day</string>
-    <string name="select_year">Select year</string>
-    <string name="item_is_selected" translatable="false"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
-    <string name="deleted_key" translatable="false"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
-    <string name="time_placeholder" translatable="false">--</string>
-    <string name="time_separator" translatable="false">:</string>
-    <string name="radial_numbers_typeface" translatable="false">sans-serif</string>
-    <string name="sans_serif" translatable="false">sans-serif</string>
-    <string name="day_of_week_label_typeface" translatable="false">sans-serif</string>
-
     <string name="title_activity_show_habit" translatable="false"/>
     <string name="overview">Overview</string>
     <string name="habit_strength">Habit strength</string>
@@ -111,6 +89,11 @@
     <string name="select_weekdays">Select days</string>
     <string name="export_to_csv">Export data</string>
 
+    <string name="done_label">Done</string>
+    <string name="clear_label">Clear</string>
+    <string name="select_hours">Select hours</string>
+    <string name="select_minutes">Select minutes</string>
+
     <string-array name="hints">
         <item>@string/hint_drag</item>
         <item>@string/hint_landscape</item>
diff --git a/app/src/main/res/values/styles_show_habit.xml b/app/src/main/res/values/styles_show_habit.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/app/src/main/res/values/styles_show_habit.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file