diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index eb50c4e38..a259a7862 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -12,17 +12,17 @@ function updateSettings() {
 
 function updateOptions() {
   var o = settings.options;
-  // Check to make sure nobody disabled all unlocks and locked themselves out!
+  // Check to make sure nobody disabled all wakeups and locked themselves out!
   if (BANGLEJS2) {
-    if (!(o.unlockOnBTN1||o.unlockOnFaceUp||o.unlockOnTouch||o.unlockOnTwist)) {
-      o.unlockOnBTN1 = true;
+    if (!(o.wakeOnBTN1||o.wakeOnFaceUp||o.wakeOnTouch||o.wakeOnTwist)) {
+      o.wakeOnBTN1 = true;
     }
   } else {
-    if (!(o.unlockOnBTN1||o.unlockOnBTN2||o.unlockOnBTN3||o.unlockOnFaceUp||o.unlockOnTouch||o.unlockOnTwist))
-      o.unlockOnBTN2 = true;
+    if (!(o.wakeOnBTN1||o.wakeOnBTN2||o.wakeOnBTN3||o.wakeOnFaceUp||o.wakeOnTouch||o.wakeOnTwist))
+      o.wakeOnBTN2 = true;
   }
   updateSettings();
-  Bangle.setOptions(o);
+  Bangle.setOptions(o)
 }
 
 
@@ -51,14 +51,6 @@ function resetSettings() {
       wakeOnFaceUp: false,
       wakeOnTouch: false,
       wakeOnTwist: false,
-
-      unlockOnBTN1: true,
-      unlockOnBTN2: true,
-      unlockOnBTN3: true,
-      unlockOnFaceUp: false,
-      unlockOnTouch: false,
-      unlockOnTwist: false,
-
       twistThreshold: 819.2,
       twistMaxY: -800,
       twistTimeout: 1000
@@ -220,7 +212,7 @@ function showThemeMenu() {
     updateSettings();
     delete g.reset;
     g._reset = g.reset;
-    g.reset = function() { return g._reset().setColor(th.fg).setBgColor(th.bg); };
+    g.reset = function(n) { return g._reset().setColor(th.fg).setBgColor(th.bg); };
     g.clear = function(n) { if (n) g.reset(); return g.clearRect(0,0,g.getWidth(),g.getHeight()); };
     g.clear(1);
     Bangle.drawWidgets();
@@ -468,26 +460,12 @@ function showLCDMenu() {
           updateOptions();
         }
       },
-      /*LANG*/'Unlock on Button': {
-        value: settings.options.unlockOnBTN1,
-        onchange: () => {
-          settings.options.unlockOnBTN1 = !settings.options.unlockOnBTN1;
-          updateOptions();
-        }
-      },
       /*LANG*/'Wake on Tap': {
         value: settings.options.wakeOnTouch,
         onchange: () => {
           settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
           updateOptions();
         }
-      },
-      /*LANG*/'Unlock on Tap': {
-        value: settings.options.unlockOnTouch,
-        onchange: () => {
-          settings.options.unlockOnTouch = !settings.options.unlockOnTouch;
-          updateOptions();
-        }
       }
     });
   else
@@ -499,16 +477,6 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-   /*LANG*/'Unlock on BTN1': {
-      value: settings.options.unlockOnBTN1,
-      onchange: () => {
-        settings.options.unlockOnBTN1 = !settings.options.unlockOnBTN1;
-        updateOptions();
-      }
-    }
-  });
-  if (!BANGLEJS2)
-    Object.assign(lcdMenu, {
     /*LANG*/'Wake on BTN2': {
       value: settings.options.wakeOnBTN2,
       onchange: () => {
@@ -516,13 +484,6 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-    /*LANG*/'Unlock on BTN2': {
-      value: settings.options.unlockOnBTN2,
-      onchange: () => {
-        settings.options.unlockOnBTN2 = !settings.options.unlockOnBTN2;
-        updateOptions();
-      }
-    },
     /*LANG*/'Wake on BTN3': {
       value: settings.options.wakeOnBTN3,
       onchange: () => {
@@ -530,28 +491,13 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-    /*LANG*/'Unlock on BTN3': {
-      value: settings.options.unlockOnBTN3,
-      onchange: () => {
-        settings.options.unlockOnBTN3 = !settings.options.unlockOnBTN3;
-        updateOptions();
-      }
-    },
     /*LANG*/'Wake on Touch': {
       value: settings.options.wakeOnTouch,
       onchange: () => {
         settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
         updateOptions();
       }
-    },
-    /*LANG*/'Unlock on Touch': {
-      value: settings.options.unlockOnTouch,
-      onchange: () => {
-        settings.options.unlockOnTouch = !settings.options.unlockOnTouch;
-        updateOptions();
-      }
-    }
-  });
+    }});
   Object.assign(lcdMenu, {
     /*LANG*/'Wake on FaceUp': {
       value: settings.options.wakeOnFaceUp,
@@ -560,13 +506,6 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-    /*LANG*/'Unlock on FaceUp': {
-      value: settings.options.unlockOnFaceUp,
-      onchange: () => {
-        settings.options.unlockOnFaceUp = !settings.options.unlockOnFaceUp;
-        updateOptions();
-      }
-    },
     /*LANG*/'Wake on Twist': {
       value: settings.options.wakeOnTwist,
       onchange: () => {
@@ -574,13 +513,6 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-    /*LANG*/'Unlock on Twist': {
-      value: settings.options.unlockOnTwist,
-      onchange: () => {
-        settings.options.unlockOnTwist = !settings.options.unlockOnTwist;
-        updateOptions();
-      }
-    },
     /*LANG*/'Twist Threshold': {
       value: internalToG(settings.options.twistThreshold),
       min: -0.5,
diff --git a/apps/setting/settings.min.json b/apps/setting/settings.min.json
index ffccd2f82..42d2babc4 100644
--- a/apps/setting/settings.min.json
+++ b/apps/setting/settings.min.json
@@ -1 +1 @@
-{"ble":true,"blerepl":true,"log":false,"timeout":10,"vibrate":true,"beep":"vib","timezone":0,"HID":false,"clock":null,"12hour":false,"brightness":1,"options":{"wakeOnBTN1":true,"wakeOnBTN2":true,"wakeOnBTN3":true,"wakeOnFaceUp":false,"wakeOnTouch":true,"wakeOnTwist":true,"unlockOnBTN1":true,"unlockOnBTN2":true,"unlockOnBTN3":true,"unlockOnFaceUp":false,"unlockOnTouch":true,"unlockOnTwist":false,"twistThreshold":819.2,"twistMaxY":-800,"twistTimeout":1000}}
+{"ble":true,"blerepl":true,"log":false,"timeout":10,"vibrate":true,"beep":"vib","timezone":0,"HID":false,"clock":null,"12hour":false,"brightness":1,"options":{"wakeOnBTN1":true,"wakeOnBTN2":true,"wakeOnBTN3":true,"wakeOnFaceUp":false,"wakeOnTouch":false,"wakeOnTwist":false,"twistThreshold":819.2,"twistMaxY":-800,"twistTimeout":1000}}
\ No newline at end of file