diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 191d744..fc8ddff 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -5,22 +5,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:allowDividerAbove="false"
-        app:title="Shortcuts">
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="4"
-            app:entries="@array/shortcut_options"
-            app:entryValues="@array/shortcut_options"
-            app:key="shortcutNo"
-            app:title="Number of Shortcuts"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:allowDividerAbove="false"
-        app:title="Colors">
+        app:title="General UI">
         <ListPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -39,11 +24,27 @@
             app:key="textColor"
             app:title="Text Color"
             app:useSimpleSummaryProvider="true" />
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="false"
+            android:title="Show Status Bar"
+            app:key="barVisibility" />
     </PreferenceCategory>
     <PreferenceCategory
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:allowDividerAbove="false"
-        app:title="Alignment">
-
+        app:title="Home Screen">
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="4"
+            app:entries="@array/shortcut_options"
+            app:entryValues="@array/shortcut_options"
+            app:key="shortcutNo"
+            app:title="Number of Shortcuts"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             app:defaultValue="left"
             app:entries="@array/h_alignment_options"
@@ -51,39 +52,6 @@
             app:key="clockAlignment"
             app:title="Clock Alignment"
             app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="left"
-            app:entries="@array/h_alignment_options"
-            app:entryValues="@array/h_alignment_values"
-            app:key="shortcutAlignment"
-            app:title="Shortcut Alignment"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="left"
-            app:entries="@array/h_alignment_options"
-            app:entryValues="@array/h_alignment_values"
-            app:key="appMenuAlignment"
-            app:title="App Menu Alignment"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="left"
-            app:entries="@array/h_alignment_options"
-            app:entryValues="@array/h_alignment_values"
-            app:key="searchAlignment"
-            app:title="Search Alignment"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        app:allowDividerAbove="false"
-        app:title="Dimensions">
         <ListPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -102,6 +70,15 @@
             app:key="dateSize"
             app:title="Date Size"
             app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="left"
+            app:entries="@array/h_alignment_options"
+            app:entryValues="@array/h_alignment_values"
+            app:key="shortcutAlignment"
+            app:title="Shortcut Alignment"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,80 +88,12 @@
             app:key="shortcutSize"
             app:title="Shortcut Size"
             app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="medium"
-            app:entries="@array/size_options"
-            app:entryValues="@array/size_values"
-            app:key="appMenuSize"
-            app:title="App Menu Size"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:defaultValue="medium"
-            app:entries="@array/size_options"
-            app:entryValues="@array/size_values"
-            app:key="searchSize"
-            app:title="Search Size"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:allowDividerAbove="false"
-        app:title="System Bars">
         <SwitchPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:defaultValue="false"
-            android:title="Show Status Bar"
-            app:key="barVisibility" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:allowDividerAbove="false"
-        app:title="Gestures">
-        <SwitchPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:defaultValue="false"
-            android:title="Swipe Left"
-            app:key="leftSwipe" />
-        <Preference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:dependency="leftSwipe"
-            app:key="leftSwipeApp"
-            app:selectable="true"
-            app:title="Left Swipe App" />
-        <SwitchPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:defaultValue="false"
-            android:title="Swipe Right"
-            app:key="rightSwipe" />
-        <Preference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:dependency="rightSwipe"
-            app:key="rightSwipeApp"
-            app:selectable="true"
-            app:title="Right Swipe App" />
-        <SwitchPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:defaultValue="false"
-            android:title="Double Tap to Lock Screen"
-            app:key="doubleTap" />
-        <SwitchPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:defaultValue="false"
-            android:title="Automatically Open Keyboard"
-            app:key="autoKeyboard" />
+            android:title="Battery Indicator"
+            app:key="battery_enabled" />
     </PreferenceCategory>
     <PreferenceCategory
         android:layout_width="wrap_content"
@@ -226,14 +135,89 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:allowDividerAbove="false"
-        app:title="Battery">
+        app:title="Gestures">
         <SwitchPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:defaultValue="false"
-            android:title="Battery Indicator"
-            app:key="battery_enabled" />
+            android:title="Swipe Left"
+            app:key="leftSwipe" />
+        <Preference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:dependency="leftSwipe"
+            app:key="leftSwipeApp"
+            app:selectable="true"
+            app:title="Left Swipe App" />
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="false"
+            android:title="Swipe Right"
+            app:key="rightSwipe" />
+        <Preference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:dependency="rightSwipe"
+            app:key="rightSwipeApp"
+            app:selectable="true"
+            app:title="Right Swipe App" />
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="false"
+            android:title="Double Tap to Lock Screen"
+            app:key="doubleTap" />
     </PreferenceCategory>
+    <PreferenceCategory
+        app:allowDividerAbove="false"
+        app:title="Application Menu">
+
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="left"
+            app:entries="@array/h_alignment_options"
+            app:entryValues="@array/h_alignment_values"
+            app:key="appMenuAlignment"
+            app:title="App Menu Alignment"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="left"
+            app:entries="@array/h_alignment_options"
+            app:entryValues="@array/h_alignment_values"
+            app:key="searchAlignment"
+            app:title="Search Alignment"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="medium"
+            app:entries="@array/size_options"
+            app:entryValues="@array/size_values"
+            app:key="appMenuSize"
+            app:title="App Menu Size"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:defaultValue="medium"
+            app:entries="@array/size_options"
+            app:entryValues="@array/size_values"
+            app:key="searchSize"
+            app:title="Search Size"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="false"
+            android:title="Automatically Open Keyboard"
+            app:key="autoKeyboard" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"