Daisy settings reorder

apps/daisy/settings.js

@@ -7,7 +7,6 @@
     'color': 'Green',
     'check_idle' : true,
     'batt_hours' : false,
-           'hr_12' : false,
     'hourly_buzz' : false,
     'ring' : 'Steps',
     'idxInfo' : 0,
@@ -64,7 +63,7 @@
         },
       };
     } 
-    appMenu['Colour'] = {
+    appMenu['Color'] = {
       value: 0 | color_options.indexOf(s.color),
       min: 0, max: color_options.length - 1,
       format: v => color_options[v],
@@ -75,13 +74,6 @@
         save();
       },
     };
-    appMenu['Idle Warning'] = {
-      value: !!s.idle_check,
-      onchange: v => {
-        s.idle_check = v;
-        save();
-      },
-    };
     appMenu['Hourly Buzz'] = {
       value: !!s.hourly_buzz,
       onchange: v => {
@@ -89,8 +81,16 @@
         save();
       },
     };
-    appMenu['Expected Battery Life In Days Not Percentage'] = {
+    appMenu['Idle Warning'] = {
+      value: !!s.idle_check,
+      onchange: v => {
+        s.idle_check = v;
+        save();
+      },
+    };
+    appMenu['Battery Life Format'] = {
       value: !!s.batt_hours,
+      format: value => value?"Days":"%",
       onchange: v => {
         s.batt_hours = v;
         save();