diff --git a/apps/torch/ChangeLog b/apps/torch/ChangeLog
index 22b1c179a..0ece0538f 100644
--- a/apps/torch/ChangeLog
+++ b/apps/torch/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Add Support For Bangle.js 2
 0.05: Default full Brightness
 0.06: Press upper left corner to exit on Bangle.js 2
+0.07: Code tweaks
diff --git a/apps/torch/app.js b/apps/torch/app.js
index 418463144..4f44faf69 100644
--- a/apps/torch/app.js
+++ b/apps/torch/app.js
@@ -13,12 +13,12 @@ Bangle.setLCDTimeout(0);
 g.reset();
 g.setColor(settings.bg);
 g.fillRect(0,0,g.getWidth(),g.getHeight());
-// Any button turns off
-setWatch(()=>load(), BTN1);
-if (global.BTN2) setWatch(()=>load(), BTN2);
-if (global.BTN3) setWatch(()=>load(), BTN3);
-// Pressing upper left corner turns off (where red back button would be)
 Bangle.setUI({
   mode : 'custom',
-  back : load
+  back : load, // B2: Clicking the hardware button or pressing upper left corner turns off (where red back button would be)
+  btn : (n)=>{ // B1: Any button turns off
+    if (process.env.HWVERSION==1 && (n==1 || n==2 || n==3)) {
+      load();
+    }
+  }
 });
diff --git a/apps/torch/metadata.json b/apps/torch/metadata.json
index 580ae4e8a..88329eb44 100644
--- a/apps/torch/metadata.json
+++ b/apps/torch/metadata.json
@@ -2,7 +2,7 @@
   "id": "torch",
   "name": "Torch",
   "shortName": "Torch",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Turns screen white to help you see in the dark. Select from the launcher or press BTN1,BTN3,BTN1,BTN3 quickly to start when in any app that shows widgets on Bangle.js 1. You can also set the color through the app's setting menu.",
   "icon": "app.png",
   "tags": "tool,torch",