diff --git a/README.md b/README.md
index ee1c22061..d595c7df1 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@ Bangle.js App Loader (and Apps)
 * Try the **release version** at [banglejs.com/apps](https://banglejs.com/apps)
 * Try the **development version** at [espruino.github.io](https://espruino.github.io/BangleApps/)
 
+The release version is manually refreshed with regular intervals while the development version is continuously updated as new code is committed to this repository.
+
 **All software (including apps) in this repository is MIT Licensed - see [LICENSE](LICENSE)** By
 submitting code to this repository you confirm that you are happy with it being MIT licensed,
 and that it is not licensed in another way that would make this impossible.
@@ -403,7 +405,7 @@ in an iframe.
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <div id="t">Loading...</div>
     <script>
       function onInit() {
diff --git a/apps/.eslintrc.js b/apps/.eslintrc.js
deleted file mode 100644
index 4c86b8174..000000000
--- a/apps/.eslintrc.js
+++ /dev/null
@@ -1,203 +0,0 @@
-const lintExemptions = require("./lint_exemptions.js");
-
-module.exports = {
-    "env": {
-        // TODO: "espruino": false
-        // TODO: "banglejs": false
-        // For a prototype of the above, see https://github.com/espruino/BangleApps/pull/3237
-    },
-    "extends": "eslint:recommended",
-    "globals": {
-        // Methods and Fields at https://banglejs.com/reference
-        "Array": "readonly",
-        "ArrayBuffer": "readonly",
-        "ArrayBufferView": "readonly",
-        "Bangle": "readonly",
-        "BluetoothDevice": "readonly",
-        "BluetoothRemoteGATTCharacteristic": "readonly",
-        "BluetoothRemoteGATTServer": "readonly",
-        "BluetoothRemoteGATTService": "readonly",
-        "Boolean": "readonly",
-        "console": "readonly",
-        "DataView": "readonly",
-        "Date": "readonly",
-        "E": "readonly",
-        "Error": "readonly",
-        "Flash": "readonly",
-        "Float32Array": "readonly",
-        "Float64Array": "readonly",
-        "Function": "readonly",
-        "Graphics": "readonly",
-        "I2C": "readonly",
-        "Int16Array": "readonly",
-        "Int32Array": "readonly",
-        "Int8Array": "readonly",
-        "InternalError": "readonly",
-        "JSON": "readonly",
-        "Math": "readonly",
-        "Modules": "readonly",
-        "NRF": "readonly",
-        "Number": "readonly",
-        "Object": "readonly",
-        "OneWire": "readonly",
-        "Pin": "readonly",
-        "process": "readonly",
-        "Promise": "readonly",
-        "ReferenceError": "readonly",
-        "RegExp": "readonly",
-        "Serial": "readonly",
-        "SPI": "readonly",
-        "StorageFile": "readonly",
-        "String": "readonly",
-        "SyntaxError": "readonly",
-        "TFMicroInterpreter": "readonly",
-        "TypeError": "readonly",
-        "Uint16Array": "readonly",
-        "Uint24Array": "readonly",
-        "Uint32Array": "readonly",
-        "Uint8Array": "readonly",
-        "Uint8ClampedArray": "readonly",
-        "Unistroke": "readonly",
-        "Waveform": "readonly",
-        // Methods and Fields at https://banglejs.com/reference
-        "__FILE__": "readonly",
-        "analogRead": "readonly",
-        "analogWrite": "readonly",
-        "arguments": "readonly",
-        "atob": "readonly",
-        "Bluetooth": "readonly",
-        "BTN": "readonly",
-        "BTN1": "readonly",
-        "BTN2": "readonly",
-        "BTN3": "readonly",
-        "BTN4": "readonly",
-        "BTN5": "readonly",
-        "btoa": "readonly",
-        "changeInterval": "readonly",
-        "clearInterval": "readonly",
-        "clearTimeout": "readonly",
-        "clearWatch": "readonly",
-        "decodeURIComponent": "readonly",
-        "digitalPulse": "readonly",
-        "digitalRead": "readonly",
-        "digitalWrite": "readonly",
-        "dump": "readonly",
-        "echo": "readonly",
-        "edit": "readonly",
-        "encodeURIComponent": "readonly",
-        "eval": "readonly",
-        "getPinMode": "readonly",
-        "getSerial": "readonly",
-        "getTime": "readonly",
-        "global": "readonly",
-        "HIGH": "readonly",
-        "I2C1": "readonly",
-        "Infinity": "readonly",
-        "isFinite": "readonly",
-        "isNaN": "readonly",
-        "LED": "readonly",
-        "LED1": "readonly",
-        "LED2": "readonly",
-        "load": "readonly",
-        "LoopbackA": "readonly",
-        "LoopbackB": "readonly",
-        "LOW": "readonly",
-        "NaN": "readonly",
-        "parseFloat": "readonly",
-        "parseInt": "readonly",
-        "peek16": "readonly",
-        "peek32": "readonly",
-        "peek8": "readonly",
-        "pinMode": "readonly",
-        "poke16": "readonly",
-        "poke32": "readonly",
-        "poke8": "readonly",
-        "print": "readonly",
-        "require": "readonly",
-        "reset": "readonly",
-        "save": "readonly",
-        "Serial1": "readonly",
-        "setBusyIndicator": "readonly",
-        "setInterval": "readonly",
-        "setSleepIndicator": "readonly",
-        "setTime": "readonly",
-        "setTimeout": "readonly",
-        "setWatch": "readonly",
-        "shiftOut": "readonly",
-        "SPI1": "readonly",
-        "Terminal": "readonly",
-        "trace": "readonly",
-        "VIBRATE": "readonly",
-        // Aliases and not defined at https://banglejs.com/reference
-        "g": "readonly",
-        "WIDGETS": "readonly",
-        "module": "readonly",
-        "exports": "writable",
-        "D0": "readonly",
-        "D1": "readonly",
-        "D2": "readonly",
-        "D3": "readonly",
-        "D4": "readonly",
-        "D5": "readonly",
-        "D6": "readonly",
-        "D7": "readonly",
-        "D8": "readonly",
-        "D9": "readonly",
-        "D10": "readonly",
-        "D11": "readonly",
-        "D12": "readonly",
-        "D13": "readonly",
-        "D14": "readonly",
-        "D15": "readonly",
-        "D16": "readonly",
-        "D17": "readonly",
-        "D18": "readonly",
-        "D19": "readonly",
-        "D20": "readonly",
-        "D21": "readonly",
-        "D22": "readonly",
-        "D23": "readonly",
-        "D24": "readonly",
-        "D25": "readonly",
-        "D26": "readonly",
-        "D27": "readonly",
-        "D28": "readonly",
-        "D29": "readonly",
-        "D30": "readonly",
-        "D31": "readonly",
-
-        "bleServiceOptions": "writable", // available in boot.js code that's called ad part of bootupdate
-    },
-    "parserOptions": {
-        "ecmaVersion": 11
-    },
-    "rules": {
-        "indent": [
-            "off",
-            2,
-            {
-                "SwitchCase": 1
-            }
-        ],
-        "no-constant-condition": "off",
-        "no-delete-var": "off",
-        "no-empty": ["warn", { "allowEmptyCatch": true }],
-        "no-global-assign": "off",
-        "no-inner-declarations": "off",
-        "no-prototype-builtins": "off",
-        "no-redeclare": "off",
-        "no-unreachable": "warn",
-        "no-cond-assign": "warn",
-        "no-useless-catch": "warn",
-        "no-undef": "warn",
-        "no-unused-vars": ["warn", { "args": "none" } ],
-        "no-useless-escape": "off",
-        "no-control-regex" : "off"
-    },
-    overrides: [
-        ...Object.entries(lintExemptions).map(([filePath, {rules}]) => ({
-            files: [filePath],
-            rules: Object.fromEntries(rules.map(rule => [rule, "off"])),
-        })),
-    ],
-}
diff --git a/apps/_example_app/metadata.json b/apps/_example_app/metadata.json
index e0d664338..42dfca2b8 100644
--- a/apps/_example_app/metadata.json
+++ b/apps/_example_app/metadata.json
@@ -5,7 +5,7 @@
   "description": "A detailed description of my great app",
   "icon": "app.png",
   "tags": "",
-  "supports" : ["BANGLEJS2"],  
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"7chname.app.js","url":"app.js"},
diff --git a/apps/_example_clock/clock.js b/apps/_example_clock/clock.js
deleted file mode 100644
index 7e97cf758..000000000
--- a/apps/_example_clock/clock.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// timeout used to update every minute
-var drawTimeout;
-
-// schedule a draw for the next minute
-function queueDraw() {
-  if (drawTimeout) clearTimeout(drawTimeout);
-  drawTimeout = setTimeout(function() {
-    drawTimeout = undefined;
-    draw();
-  }, 60000 - (Date.now() % 60000));
-}
-
-function draw() {
-  // queue next draw in one minute
-  queueDraw();
-  // Work out where to draw...
-  var x = g.getWidth()/2;
-  var y = g.getHeight()/2;
-  g.reset();
-  // work out locale-friendly date/time
-  var date = new Date();
-  var timeStr = require("locale").time(date,1);
-  var dateStr = require("locale").date(date);
-  // draw time
-  g.setFontAlign(0,0).setFont("Vector",48);
-  g.clearRect(0,y-15,g.getWidth(),y+25); // clear the background
-  g.drawString(timeStr,x,y);
-  // draw date
-  y += 35;
-  g.setFontAlign(0,0).setFont("6x8");
-  g.clearRect(0,y-4,g.getWidth(),y+4); // clear the background
-  g.drawString(dateStr,x,y);
-}
-
-// Clear the screen once, at startup
-g.clear();
-// draw immediately at first, queue update
-draw();
-
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
\ No newline at end of file
diff --git a/apps/_example_clock/metadata.json b/apps/_example_clock/metadata.json
index c6e1256d3..d9150af3c 100644
--- a/apps/_example_clock/metadata.json
+++ b/apps/_example_clock/metadata.json
@@ -4,6 +4,7 @@
   "version":"0.01",
   "description": "A detailed description of my clock",
   "icon": "icon.png",
+  "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
   "tags": "clock",
   "supports" : ["BANGLEJS2"],
diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog
index 76f0945c8..df6bcaf6b 100644
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@@ -9,3 +9,4 @@
 0.09: New app screen (instead of showing settings or the alert) and some optimisations
 0.10: Add software back button via setUI
 0.11: Add setting to unlock screen
+0.12: Fix handling that dates can be given as ms since epoch.
diff --git a/apps/activityreminder/lib.js b/apps/activityreminder/lib.js
index a5c35190c..583662ab1 100644
--- a/apps/activityreminder/lib.js
+++ b/apps/activityreminder/lib.js
@@ -29,16 +29,13 @@ exports.loadData = function () {
     dismissDate: new Date(1970),
     pauseDate: new Date(1970),
   },
-    require("Storage").readJSON("activityreminder.data.json") || {});
+  
+  require("Storage").readJSON("activityreminder.data.json") || {});
 
-  if (typeof (data.stepsDate) == "string")
-    data.stepsDate = new Date(data.stepsDate);
-  if (typeof (data.okDate) == "string")
-    data.okDate = new Date(data.okDate);
-  if (typeof (data.dismissDate) == "string")
-    data.dismissDate = new Date(data.dismissDate);
-  if (typeof (data.pauseDate) == "string")
-    data.pauseDate = new Date(data.pauseDate);
+  data.stepsDate = new Date(typeof data.stepsDate === 'string' ? data.stepsDate : data.stepsDate.ms);
+  data.okDate = new Date(typeof data.okDate === 'string' ? data.okDate : data.okDate.ms);
+  data.dismissDate = new Date(typeof data.dismissDate === 'string' ? data.dismissDate : data.dismissDate.ms);
+  data.pauseDate = new Date(typeof data.pauseDate === 'string' ? data.pauseDate : data.pauseDate.ms);
 
   return data;
 };
diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json
index a5df15a26..1cbe4683e 100644
--- a/apps/activityreminder/metadata.json
+++ b/apps/activityreminder/metadata.json
@@ -3,10 +3,10 @@
   "name": "Activity Reminder",
   "shortName":"Activity Reminder",
   "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.11",
+  "version":"0.12",
   "icon": "app.png",
   "type": "app",
-  "tags": "tool,activity",
+  "tags": "tool,activity,health",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/advcasio/ChangeLog b/apps/advcasio/ChangeLog
index bc4850635..0bca28a1c 100644
--- a/apps/advcasio/ChangeLog
+++ b/apps/advcasio/ChangeLog
@@ -2,4 +2,5 @@
 0.02: Remove un-needed fonts to improve memory usage
 0.03: Tell clock widgets to hide.
 0.04: Swipe down to see widgets, step counter now just uses getHealthStatus
-0.05: Report latest HRM rather than HRM 10 minutes ago (fix #2395)
\ No newline at end of file
+0.05: Report latest HRM rather than HRM 10 minutes ago (fix #2395)
+0.06: Use watch temperature
\ No newline at end of file
diff --git a/apps/advcasio/README.md b/apps/advcasio/README.md
index 3ce771497..bce3f71d7 100644
--- a/apps/advcasio/README.md
+++ b/apps/advcasio/README.md
@@ -3,8 +3,7 @@
 <img src="https://user-images.githubusercontent.com/2981891/175355586-1dfc0d66-6555-4385-b124-1605fdb71a11.jpg" width="250" />
 
 An over-engineered clock inspired by Casio watches.<br/>
-It has a dedicated timer, a scratchpad and can display the weather condition 4 days ahead.<br/>
-It uses a <a target="_blank" href="https://dotgreg.github.io/advCasioBangleClock/">custom web app</a> to update its content.<br/>
+It has a dedicated timer, a scratchpad and displays the current temperature.<br/>
 Forked from the awesome Cassio Watch.<br/>
 
 ## Todo
@@ -21,7 +20,7 @@ Forked from the awesome Cassio Watch.<br/>
 - Footsteps
 - Battery
 - Simple Timer embedded  
-- Weather forecast (7 days)
+- Current temperature
 - Scratchpad 
 
 ## Screenshots
@@ -36,14 +35,6 @@ Web interface to update weather & scratchpad <br/>
 <img src="https://user-images.githubusercontent.com/2981891/175519121-851bb209-7192-40db-a014-490c344f7597.jpg" width="250" />
 
 ## Usage
-### How to update the tasks list / weather
-- you will need a <a target="_blank" href="https://openweathermap.org/price#weather">free openweathermap.org api key</a>. 
-- go to https://dotgreg.github.io/advCasioBangleClock/
-  - Alternatively you can install it on your own server/heroku/service/github pages, the web-app code is <a target="_blank" href="https://github.com/dotgreg/advCasioBangleClock/tree/master/web-app">here</a>
-- fill the location and the api key (it will be saved on your browser, no need to do it each time)
-- edit the scratchpad with what you want
-- click on sync
-- reload your clock!
 
 ### How to start/stop the timer
 - swipe up : add time (+5min)
diff --git a/apps/advcasio/app.js b/apps/advcasio/app.js
index d951da4cc..796fac2a7 100644
--- a/apps/advcasio/app.js
+++ b/apps/advcasio/app.js
@@ -88,9 +88,9 @@ function drawRocket() {
 
 function getTemperature(){
   try {
-    var weatherJson = storage.readJSON('weather.json');
-    var weather = weatherJson.weather;
-    return Math.round(weather.temp-273.15);
+    var temperature = E.getTemperature()
+    var formatted = require("locale").temp(temperature).replace(/[^\d-]/g, '');
+    return formatted;
 
   } catch(ex) {
     print(ex)
diff --git a/apps/advcasio/metadata.json b/apps/advcasio/metadata.json
index 32f5de7d3..e3df73555 100644
--- a/apps/advcasio/metadata.json
+++ b/apps/advcasio/metadata.json
@@ -1,8 +1,8 @@
 { "id": "advcasio",
   "name": "Advanced Casio Clock",
   "shortName":"advcasio",
-  "version":"0.05",
-  "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
+  "version":"0.06",
+  "description": "An over-engineered clock inspired by Casio watches. It has current temperature, a timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
   "icon": "app.png",
   "tags": "clock",
 	"type": "clock",
@@ -18,8 +18,5 @@
   "storage": [
 			{"name":"advcasio.app.js","url":"app.js"},
 			{"name":"advcasio.img","url":"app-icon.js","evaluate":true}
-  ],
-	"data": [
-			{ "name": "advcasio.data.json", "url": "data.json", "storageFile": true }
   ]
 }
diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index 57ba2f710..a3a5dfc1c 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -49,3 +49,5 @@
 0.44: Add "delete timer after expiration" setting to events.
 0.45: Fix new alarm when selectedAlarm is undefined
 0.46: Show alarm groups if the Show Group setting is ON.  Scroll alarms menu back to previous position when getting back to it.
+0.47: Fix wrap around when snoozed through midnight
+0.48: Use datetimeinput for Events, if available. Scroll back when getting out of group.  Menu date format setting for shorter dates on current year.
diff --git a/apps/alarm/README.md b/apps/alarm/README.md
index 43f72665e..77aa61d2c 100644
--- a/apps/alarm/README.md
+++ b/apps/alarm/README.md
@@ -2,7 +2,7 @@
 
 This app allows you to add/modify any alarms, timers and events.
 
-Optional: When a keyboard app is detected, you can add a message to display when any of these is triggered.
+Optional: When a keyboard app is detected, you can add a message to display when any of these is triggered.  If a datetime input app (e.g. datetime_picker) is detected, it will be used for the selection of the date+time of events.
 
 It uses the [`sched` library](https://github.com/espruino/BangleApps/blob/master/apps/sched) to handle the alarm scheduling in an efficient way that can work alongside other apps.
 
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index cdb0d0041..053505187 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -28,6 +28,8 @@ const iconTimerOff = "\0" + (g.theme.dark
 
 // An array of alarm objects (see sched/README.md)
 var alarms = require("sched").getAlarms();
+// Fix possible wrap around in existing alarms #3281, broken alarms still needs to be saved to get fixed
+alarms.forEach(e => e.t %= 86400000); // This can probably be removed in the future when we are sure there are no more broken alarms
 
 function handleFirstDayOfWeek(dow) {
   if (firstDayOfWeek == 1) {
@@ -48,13 +50,17 @@ function handleFirstDayOfWeek(dow) {
 alarms.filter(e => e.timer === undefined).forEach(a => a.dow = handleFirstDayOfWeek(a.dow));
 
 function getLabel(e) {
-  const dateStr = e.date && require("locale").date(new Date(e.date), 1);
+  const dateStr = getDateText(e.date);
   return (e.timer
       ? require("time_utils").formatDuration(e.timer)
       : (dateStr ? `${dateStr}${e.rp?"*":""} ${require("time_utils").formatTime(e.t)}` : require("time_utils").formatTime(e.t) + (e.rp ? ` ${decodeRepeat(e)}` : ""))
       ) + (e.msg ? ` ${e.msg}` : "");
 }
 
+function getDateText(d) {
+  return d && (settings.menuDateFormat === "mmdd" ? d.substring(d.startsWith(new Date().getFullYear()) ? 5 : 0) : require("locale").date(new Date(d), 1));
+}
+
 function trimLabel(label, maxLength) {
   if(settings.showOverflow) return label;
   return (label.length > maxLength
@@ -73,10 +79,10 @@ function formatAlarmProperty(msg) {
   }
 }
 
-function showMainMenu(scroll, group) {
+function showMainMenu(scroll, group, scrollback) {
   const menu = {
     "": { "title": group || /*LANG*/"Alarms & Timers", scroll: scroll },
-    "< Back": () => group ? showMainMenu() : load(),
+    "< Back": () => group ? showMainMenu(scrollback) : load(),
     /*LANG*/"New...": () => showNewMenu(group)
   };
   const getGroups = settings.showGroup && !group;
@@ -96,7 +102,7 @@ function showMainMenu(scroll, group) {
   });
 
   if (!group) {
-    Object.keys(groups).sort().forEach(g => menu[g] = () => showMainMenu(null, g));
+    Object.keys(groups).sort().forEach(g => menu[g] = () => showMainMenu(null, g, scroller.scroll));
     menu[/*LANG*/"Advanced"] = () => showAdvancedMenu();
   }
 
@@ -136,6 +142,8 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate, scroll, group) {
   var title = date ? (isNew ? /*LANG*/"New Event" : /*LANG*/"Edit Event") : (isNew ? /*LANG*/"New Alarm" : /*LANG*/"Edit Alarm");
   var keyboard = "textinput";
   try {keyboard = require(keyboard);} catch(e) {keyboard = null;}
+  var datetimeinput;
+  try {datetimeinput = require("datetimeinput");} catch(e) {datetimeinput = null;}
 
   const menu = {
     "": { "title": title },
@@ -143,41 +151,66 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate, scroll, group) {
       prepareAlarmForSave(alarm, alarmIndex, time, date);
       saveAndReload();
       showMainMenu(scroll, group);
-    },
-    /*LANG*/"Hour": {
-      value: time.h,
-      format: v => ("0" + v).substr(-2),
-      min: 0,
-      max: 23,
-      wrap: true,
-      onchange: v => time.h = v
-    },
-    /*LANG*/"Minute": {
-      value: time.m,
-      format: v => ("0" + v).substr(-2),
-      min: 0,
-      max: 59,
-      wrap: true,
-      onchange: v => time.m = v
-    },
-    /*LANG*/"Day": {
-      value: date ? date.getDate() : null,
-      min: 1,
-      max: 31,
-      wrap: true,
-      onchange: v => date.setDate(v)
-    },
-    /*LANG*/"Month": {
-      value: date ? date.getMonth() + 1 : null,
-      format: v => require("date_utils").month(v),
-      onchange: v => date.setMonth((v+11)%12)
-    },
-    /*LANG*/"Year": {
-      value: date ? date.getFullYear() : null,
-      min: new Date().getFullYear(),
-      max: 2100,
-      onchange: v => date.setFullYear(v)
-    },
+    }
+  };
+
+  if (alarm.date && datetimeinput) {
+    menu[`${getDateText(date.toLocalISOString().slice(0,10))} ${require("time_utils").formatTime(time)}`] = {
+      value: date,
+      format: v => "",
+      onchange: v => {
+        setTimeout(() => {
+          var datetime = new Date(v.getTime());
+          datetime.setHours(time.h, time.m);
+          datetimeinput.input({datetime}).then(result => {
+            time.h = result.getHours();
+            time.m = result.getMinutes();
+            prepareAlarmForSave(alarm, alarmIndex, time, result, true);
+            setTimeout(showEditAlarmMenu, 10, alarm, alarmIndex, withDate, scroll, group);
+          });
+        }, 100);
+      }
+    };
+  } else {
+    Object.assign(menu, {
+      /*LANG*/"Hour": {
+        value: time.h,
+        format: v => ("0" + v).substr(-2),
+        min: 0,
+        max: 23,
+        wrap: true,
+        onchange: v => time.h = v
+      },
+      /*LANG*/"Minute": {
+        value: time.m,
+        format: v => ("0" + v).substr(-2),
+        min: 0,
+        max: 59,
+        wrap: true,
+        onchange: v => time.m = v
+      },
+      /*LANG*/"Day": {
+        value: date ? date.getDate() : null,
+        min: 1,
+        max: 31,
+        wrap: true,
+        onchange: v => date.setDate(v)
+      },
+      /*LANG*/"Month": {
+        value: date ? date.getMonth() + 1 : null,
+        format: v => require("date_utils").month(v),
+        onchange: v => date.setMonth((v+11)%12)
+      },
+      /*LANG*/"Year": {
+        value: date ? date.getFullYear() : null,
+        min: new Date().getFullYear(),
+        max: 2100,
+        onchange: v => date.setFullYear(v)
+      }
+    });
+  }
+
+  Object.assign(menu, {
     /*LANG*/"Message": {
       value: alarm.msg,
       format: formatAlarmProperty,
@@ -239,7 +272,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate, scroll, group) {
       saveAndReload();
       showMainMenu(scroll, group);
     }
-  };
+  });
 
   if (!keyboard) delete menu[/*LANG*/"Message"];
   if (!keyboard || !settings.showGroup) delete menu[/*LANG*/"Group"];
@@ -497,7 +530,7 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
 
 function prepareTimerForSave(timer, timerIndex, time, temp) {
   timer.timer = require("time_utils").encodeTime(time);
-  timer.t = require("time_utils").getCurrentTimeMillis() + timer.timer;
+  timer.t = (require("time_utils").getCurrentTimeMillis() + timer.timer) % 86400000;
   timer.last = 0;
 
   if (!temp) {
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index c612324c7..78cd4bd4e 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.46",
+  "version": "0.48",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm",
diff --git a/apps/andark/ChangeLog b/apps/andark/ChangeLog
index 341868930..7d7f9567b 100644
--- a/apps/andark/ChangeLog
+++ b/apps/andark/ChangeLog
@@ -1,4 +1,7 @@
 0.01: Release
 0.02: Rename app
 0.03: Add type "clock"
-0.04: changed update cylce, when locked 
+0.04: Changed update cylce, when locked
+0.05: Fix support for dark theme + support widgets +
+      add settings for widgets, order of drawing and hour hand length
+0.06: Fix issue showing widgets when app is fast-loaded into from launcher with widgets disabled
diff --git a/apps/andark/README.md b/apps/andark/README.md
index 3770c1017..9034677c2 100644
--- a/apps/andark/README.md
+++ b/apps/andark/README.md
@@ -1,10 +1,16 @@
-# Analog Clock 
+# Dark Analog Clock
 
 ## Features
 
-* second hand
+* second hand (only on unlocked screen)
 * date
-* battery percantage
-* no widgets
+* battery percentage (showing charge status with color)
+* turned off or swipeable widgets (choose in settings)
 
 ![logo](andark_screen.png)
+
+## Settings
+
+* whether to load widgets, or not; if widgets are loaded, they are swipeable from the top; if not, NO ACTIONS of widgets are available
+* date and battery can be printed both below hands (as if hands were physical) and above (more readable)
+* hour hand can be made slighly shorter to improve readability when minute hand is behind a number
diff --git a/apps/andark/andark_screen.png b/apps/andark/andark_screen.png
index 2ac54c1cd..1f0e5b089 100644
Binary files a/apps/andark/andark_screen.png and b/apps/andark/andark_screen.png differ
diff --git a/apps/andark/app.js b/apps/andark/app.js
index 865e3e708..e6b5204f0 100644
--- a/apps/andark/app.js
+++ b/apps/andark/app.js
@@ -1,22 +1,43 @@
+const defaultSettings = {
+  loadWidgets    : false,
+  textAboveHands : false,
+  shortHrHand    : false
+};
+const settings = Object.assign(defaultSettings, require('Storage').readJSON('andark.json',1)||{});
+
 const c={"x":g.getWidth()/2,"y":g.getHeight()/2};
-let zahlpos=[];
+
+const zahlpos=(function() {
+  let z=[];
+  let sk=1;
+  for(let i=-10;i<50;i+=5){
+     let win=i*2*Math.PI/60;
+     let xsk =c.x+2+Math.cos(win)*(c.x-10),
+         ysk =c.y+2+Math.sin(win)*(c.x-10);
+    if(sk==3){xsk-=10;}
+    if(sk==6){ysk-=10;}
+    if(sk==9){xsk+=10;}
+    if(sk==12){ysk+=10;}
+    if(sk==10){xsk+=3;}
+    z.push([sk,xsk,ysk]);
+    sk+=1;
+  }
+  return z;
+})();
+
 let unlock = false;
 
 function zeiger(len,dia,tim){
-  const x =c.x+ Math.cos(tim)*len/2,
-        y =c.y + Math.sin(tim)*len/2,
+  const x=c.x+ Math.cos(tim)*len/2,
+        y=c.y + Math.sin(tim)*len/2,
         d={"d":3,"x":dia/2*Math.cos(tim+Math.PI/2),"y":dia/2*Math.sin(tim+Math.PI/2)},
         pol=[c.x-d.x,c.y-d.y,c.x+d.x,c.y+d.y,x+d.x,y+d.y,x-d.x,y-d.y];
   return pol;
 
 }
 
-function draw(){
-  const d=new Date();
+function drawHands(d) {
   let m=d.getMinutes(), h=d.getHours(), s=d.getSeconds();
-  //draw black rectangle in the middle to clear screen from scale and hands
-  g.setColor(0,0,0);
-  g.fillRect(10,10,2*c.x-10,2*c.x-10);
   g.setColor(1,1,1);
 
   if(h>12){
@@ -29,30 +50,64 @@ function draw(){
   m=2*Math.PI/60*(m)-Math.PI/2;
 
   s=2*Math.PI/60*s-Math.PI/2;
-  g.setFontAlign(0,0);
-  g.setFont("Vector",10);
-  let dateStr = "    "+require("locale").date(d)+"    ";
-  g.drawString(dateStr, c.x, c.y+20, true);
- // g.drawString(d.getDate(),1.4*c.x,c.y,true);
-  g.drawString(Math.round(E.getBattery()/5)*5+"%",c.x,c.y+40,true);
-  drawlet();
   //g.setColor(1,0,0);
-  const hz = zeiger(100,5,h);
+  const hz = zeiger(settings.shortHrHand?88:100,5,h);
   g.fillPoly(hz,true);
- // g.setColor(1,1,1);
+  //g.setColor(1,1,1);
   const minz = zeiger(150,5,m);
   g.fillPoly(minz,true);
   if (unlock){
-  const sekz = zeiger(150,2,s);
-  g.fillPoly(sekz,true);
+    const sekz = zeiger(150,2,s);
+    g.fillPoly(sekz,true);
   }
   g.fillCircle(c.x,c.y,4);
-
-
-
 }
+
+function drawText(d) {
+  g.setFont("Vector",10);
+  g.setBgColor(0,0,0);
+  g.setColor(1,1,1);
+  let dateStr = require("locale").date(d);
+  g.drawString(dateStr, c.x, c.y+20, true);
+  let batStr = Math.round(E.getBattery()/5)*5+"%";
+  if (Bangle.isCharging()) {
+    g.setBgColor(1,0,0);
+  }
+  g.drawString(batStr, c.x, c.y+40, true);
+}
+
+function drawNumbers() {
+  //draws the numbers on the screen
+  g.setFont("Vector",20);
+  g.setColor(1,1,1);
+  g.setBgColor(0,0,0);
+  for(let i = 0;i<12;i++){
+     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2],true);
+  }
+}
+
+function draw(){
+  // draw black rectangle in the middle to clear screen from scale and hands
+  g.setColor(0,0,0);
+  g.fillRect(10,10,2*c.x-10,2*c.x-10);
+  // prepare for drawing the text
+  g.setFontAlign(0,0);
+  // do drawing
+  drawNumbers();
+  const d=new Date();
+  if (settings.textAboveHands) {
+    drawHands(d); drawText(d);
+  } else {
+    drawText(d); drawHands(d);
+  }
+}
+
 //draws the scale once the app is startet
 function drawScale(){
+  // clear the screen
+  g.setBgColor(0,0,0);
+  g.clear();
+  // draw the ticks of the scale
   for(let i=-14;i<47;i++){
     const win=i*2*Math.PI/60;
     let d=2;
@@ -64,61 +119,34 @@ function drawScale(){
   }
 }
 
-//draws the numbers on the screen
+//// main running sequence ////
 
-function drawlet(){
-  g.setFont("Vector",20);
-  for(let i = 0;i<12;i++){
-     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2]);
-  }
-}
-//calcultes the Position of the numbers when app starts and saves them in an array
-function setlet(){
-  let sk=1;
-  for(let i=-10;i<50;i+=5){
-     let win=i*2*Math.PI/60;
-     let xsk =c.x+2+Math.cos(win)*(c.x-10),
-         ysk =c.y+2+Math.sin(win)*(c.x-10);
-    if(sk==3){xsk-=10;}
-    if(sk==6){ysk-=10;}
-    if(sk==9){xsk+=10;}
-    if(sk==12){ysk+=10;}
-    if(sk==10){xsk+=3;}
-    zahlpos.push([sk,xsk,ysk]);
-    sk+=1;
-  }
-}
-setlet();
+// Show launcher when middle button pressed, and widgets that we're clock
+Bangle.setUI("clock");
+// Load widgets if needed, and make them show swipeable
+if (settings.loadWidgets) {
+  Bangle.loadWidgets();
+  require("widget_utils").swipeOn();
+} else if (global.WIDGETS) require("widget_utils").hide();
 // Clear the screen once, at startup
-g.setBgColor(0,0,0);
-g.clear();
 drawScale();
 draw();
 
-let secondInterval= setInterval(draw, 1000);
-// Stop updates when LCD is off, restart when on
+let secondInterval = setInterval(draw, 1000);
 
+// Stop updates when LCD is off, restart when on
 Bangle.on('lcdPower',on=>{
   if (secondInterval) clearInterval(secondInterval);
   secondInterval = undefined;
   if (on) {
-      secondInterval = setInterval(draw, 1000);
-      draw(); // draw immediately
+    secondInterval = setInterval(draw, 1000);
+    draw(); // draw immediately
   }
 });
 Bangle.on('lock',on=>{
+  unlock = !on;
   if (secondInterval) clearInterval(secondInterval);
-  secondInterval = undefined;
-  if (!on) {
-      secondInterval = setInterval(draw, 1000);
-      unlock = true;
-      draw(); // draw immediately
-  }else{
-     secondInterval = setInterval(draw, 60000);
-     unlock = false;
-     draw();
-  }
- });
-
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
+  secondInterval = setInterval(draw, unlock ? 1000 : 60000);
+  draw(); // draw immediately
+});
+Bangle.on('charging',on=>{draw();});
diff --git a/apps/andark/metadata.json b/apps/andark/metadata.json
index 3e2b3116e..fc8872f4b 100644
--- a/apps/andark/metadata.json
+++ b/apps/andark/metadata.json
@@ -1,15 +1,18 @@
 { "id": "andark",
   "name": "Analog Dark",
   "shortName":"AnDark",
-  "version":"0.04",
+  "version":"0.06",
   "description": "analog clock face without disturbing widgets",
   "icon": "andark_icon.png",
   "type": "clock",
   "tags": "clock",
   "supports" : ["BANGLEJS2"],
+  "screenshots": [{"url":"andark_screen.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"andark.app.js","url":"app.js"},
+    {"name":"andark.settings.js","url":"settings.js"},
     {"name":"andark.img","url":"app_icon.js","evaluate":true}
-  ]
+  ],
+  "data": [{"name":"andark.json"}]
 }
diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index de5130a91..11c78588a 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -34,3 +34,6 @@
 0.32: Added support for loyalty cards from gadgetbridge
 0.33: Fix alarms created in Gadgetbridge not repeating
 0.34: Implement API for activity tracks fetching (Recorder app logs).
+0.35: Implement API to enable/disable acceleration data tracking.
+0.36: Move from wrapper function to {} and let - faster execution at boot
+      Allow `calendar-` to take an array of items to remove
\ No newline at end of file
diff --git a/apps/android/README.md b/apps/android/README.md
index c76e6e528..f322e6a4e 100644
--- a/apps/android/README.md
+++ b/apps/android/README.md
@@ -44,6 +44,10 @@ The boot code also provides some useful functions:
   * `id` - a custom (string) ID
   * `timeout` - a timeout for the request in milliseconds (default 30000ms)
   * `xpath` an xPath query to run on the request (but right now the URL requested must be XML - HTML is rarely XML compliant)
+  * `return`  for xpath, if not specified, one result is returned. If `return:"array"` an array of results is returned.
+  * `method` HTTP method (default is `get`) - `get/post/head/put/patch/delete`
+  * `body` the body of the HTTP request
+  * `headers` an object of headers, eg `{HeaderOne : "headercontents"}`
 
 eg:
 
diff --git a/apps/android/boot.js b/apps/android/boot.js
index 666cac6d3..729ed2b47 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -1,21 +1,22 @@
-(function() {
-  function gbSend(message) {
+/* global GB */
+{
+  let gbSend = function(message) {
     Bluetooth.println("");
     Bluetooth.println(JSON.stringify(message));
   }
-  var lastMsg; // for music messages - may not be needed now...
-  var actInterval; // Realtime activity reporting interval when `act` is true
-  var actHRMHandler; // For Realtime activity reporting
-  var gpsState = {}; // keep information on GPS via Gadgetbridge
+  let lastMsg; // for music messages - may not be needed now...
+  let actInterval; // Realtime activity reporting interval when `act` is true
+  let actHRMHandler; // For Realtime activity reporting
+  let gpsState = {}; // keep information on GPS via Gadgetbridge
 
   // this settings var is deleted after this executes to save memory
-  var settings = require("Storage").readJSON("android.settings.json",1)||{};
+  let settings = require("Storage").readJSON("android.settings.json",1)||{};
   //default alarm settings
   if (settings.rp == undefined) settings.rp = true;
   if (settings.as == undefined) settings.as = true;
   if (settings.vibrate == undefined) settings.vibrate = "..";
   require('Storage').writeJSON("android.settings.json", settings);
-  var _GB = global.GB;
+  let _GB = global.GB;
   let fetchRecInterval;
   global.GB = (event) => {
     // feed a copy to other handlers if there were any
@@ -121,7 +122,10 @@
         var cal = require("Storage").readJSON("android.calendar.json",true);
         //if any of those happen we are out of sync!
         if (!cal || !Array.isArray(cal)) cal = [];
-        cal = cal.filter(e=>e.id!=event.id);
+        if (Array.isArray(event.id))
+          cal = cal.filter(e=>!event.id.includes(e.id));
+        else
+          cal = cal.filter(e=>e.id!=event.id);
         require("Storage").writeJSON("android.calendar.json", cal);
       },
       //triggered by GB, send all ids
@@ -292,6 +296,10 @@
         // we receive all, just override what we have
         if (Array.isArray(event.d))
           require("Storage").writeJSON("android.cards.json", event.d);
+      },
+      "accelsender": function () {
+        require("Storage").writeJSON("accelsender.json", {enabled: event.enable, interval: event.interval});
+        load();
       }
     };
     var h = HANDLERS[event.t];
@@ -332,7 +340,7 @@
   };
 
   // Battery monitor
-  function sendBattery() { gbSend({ t: "status", bat: E.getBattery(), chg: Bangle.isCharging()?1:0 }); }
+  let sendBattery = function() { gbSend({ t: "status", bat: E.getBattery(), chg: Bangle.isCharging()?1:0 }); }
   Bangle.on("charging", sendBattery);
   NRF.on("connect", () => setTimeout(function() {
     sendBattery();
@@ -427,4 +435,4 @@
 
   // remove settings object so it's not taking up RAM
   delete settings;
-})();
+}
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index 72055f557..7768efb6c 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.34",
+  "version": "0.36",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",
diff --git a/apps/android/test.js b/apps/android/test.js
deleted file mode 100644
index 007b06fc7..000000000
--- a/apps/android/test.js
+++ /dev/null
@@ -1,153 +0,0 @@
-let result = true;
-
-function assertTrue(condition, text) {
-  if (!condition) {
-    result = false;
-    print("FAILURE: " + text);
-  } else print("OK: " + text);
-}
-
-function assertFalse(condition, text) {
-  assertTrue(!condition, text);
-}
-
-function assertUndefinedOrEmpty(array, text) {
-  assertTrue(!array || array.length == 0, text);
-}
-
-function assertNotEmpty(array, text) {
-  assertTrue(array && array.length > 0, text);
-}
-
-let internalOn = () => {
-  return getPinMode((process.env.HWVERSION==2)?D30:D26) == "input";
-};
-
-let sec = {
-  connected: false
-};
-
-NRF.getSecurityStatus = () => sec;
-// add an empty starting point to make the asserts work
-Bangle._PWR={};
-
-let teststeps = [];
-
-teststeps.push(()=>{
-  print("Not connected, should use internal GPS");
-  assertTrue(!NRF.getSecurityStatus().connected, "Not connected");
-
-  assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-  assertFalse(Bangle.isGPSOn(), "isGPSOn");
-
-  assertTrue(Bangle.setGPSPower(1, "test"), "Switch GPS on");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertTrue(internalOn(), "Internal GPS on");
-
-  assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
-
-  assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-  assertFalse(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
-
-});
-
-teststeps.push(()=>{
-  print("Connected, should use GB GPS");
-  sec.connected = true;
-
-  assertTrue(NRF.getSecurityStatus().connected, "Connected");
-
-  assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-  assertFalse(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
-
-
-  print("Internal GPS stays on until the first GadgetBridge event arrives");
-  assertTrue(Bangle.setGPSPower(1, "test"), "Switch GPS on");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertTrue(internalOn(), "Internal GPS on");
-
-  print("Send minimal GadgetBridge GPS event to trigger switch");
-  GB({t:"gps"});
-});
-
-teststeps.push(()=>{
-  print("GPS should be on, internal off");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
-});
-
-teststeps.push(()=>{
-  print("Switching GPS off turns both GadgetBridge as well as internal off");
-  assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
-
-  assertUndefinedOrEmpty(Bangle._PWR.GPS, "No GPS");
-  assertFalse(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
-});
-
-teststeps.push(()=>{
-  print("Wait for all timeouts to run out");
-  return 12000;
-});
-
-teststeps.push(()=>{
-  print("Check auto switch when no GPS event arrives");
-
-  assertTrue(Bangle.setGPSPower(1, "test"), "Switch GPS on");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertTrue(internalOn(), "Internal GPS on");
-
-  print("Send minimal GadgetBridge GPS event to trigger switch");
-  GB({t:"gps"});
-
-  print("Internal should be switched off now");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertFalse(internalOn(), "Internal GPS off");
-
-  //wait on next test
-  return 12000;
-});
-
-teststeps.push(()=>{
-  print("Check state and disable GPS, internal should be on");
-
-  assertNotEmpty(Bangle._PWR.GPS, "GPS");
-  assertTrue(Bangle.isGPSOn(), "isGPSOn");
-  assertTrue(internalOn(), "Internal GPS on");
-
-  assertFalse(Bangle.setGPSPower(0, "test"), "Switch GPS off");
-});
-
-teststeps.push(()=>{
-  print("Result Overall is " + (result ? "OK" : "FAIL"));
-});
-
-let wrap = (functions) => {
-  if (functions.length > 0) {
-    setTimeout(()=>{
-      let waitingTime = functions.shift()();
-      if (waitingTime){
-        print("WAITING: ", waitingTime);
-        setTimeout(()=>{wrap(functions);}, waitingTime);
-      } else
-        wrap(functions);
-    },0);
-  }
-};
-
-setTimeout(()=>{
-  wrap(teststeps);
-}, 5000);
-
diff --git a/apps/astrocalc/ChangeLog b/apps/astrocalc/ChangeLog
index ee9c7bbe4..df039ba0e 100644
--- a/apps/astrocalc/ChangeLog
+++ b/apps/astrocalc/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Fix azimuth (bug #2651), only show degrees
 0.07: Minor code improvements
 0.08: Minor code improvements
+0.09: Fix: Handle when the moon rise/set do not occur on the current day
diff --git a/apps/astrocalc/astrocalc-app.js b/apps/astrocalc/astrocalc-app.js
index cd1965290..283c5aab7 100644
--- a/apps/astrocalc/astrocalc-app.js
+++ b/apps/astrocalc/astrocalc-app.js
@@ -180,8 +180,8 @@ function drawMoonTimesPage(gps, title) {
   const moonColor = g.theme.dark ? {r: 1, g: 1, b: 1} : {r: 0, g: 0, b: 0};
 
   const pageData = {
-    Rise: dateToTimeString(times.rise),
-    Set: dateToTimeString(times.set),
+    Rise: times.rise ? dateToTimeString(times.rise) : "Not today",
+    Set: times.set ? dateToTimeString(times.set) : "Not today",
   };
 
   drawData(title, pageData, null, g.getHeight()/2 - Object.keys(pageData).length/2*20 + 5);
@@ -240,7 +240,7 @@ function sunIndexPageMenu(gps) {
       "title": "-- Sun --",
     },
     "Current Pos": () => {
-      m = E.showMenu();
+      E.showMenu();
       drawSunShowPage(gps, "Current Pos", new Date());
     },
   };
@@ -248,13 +248,13 @@ function sunIndexPageMenu(gps) {
   Object.keys(sunTimes).sort().reduce((menu, key) => {
     const title = titlizeKey(key);
     menu[title] = () => {
-      m = E.showMenu();
+      E.showMenu();
       drawSunShowPage(gps, key, sunTimes[key]);
     };
     return menu;
   }, sunMenu);
 
-  sunMenu["< Back"] = () => m = indexPageMenu(gps);
+  sunMenu["< Back"] = () => indexPageMenu(gps);
 
   return E.showMenu(sunMenu);
 }
@@ -266,18 +266,18 @@ function moonIndexPageMenu(gps) {
       "title": "-- Moon --",
     },
     "Times": () => {
-      m = E.showMenu();
+      E.showMenu();
       drawMoonTimesPage(gps, /*LANG*/"Times");
     },
     "Position": () => {
-      m = E.showMenu();
+      E.showMenu();
       drawMoonPositionPage(gps, /*LANG*/"Position");
     },
     "Illumination": () => {
-      m = E.showMenu();
+      E.showMenu();
       drawMoonIlluminationPage(gps, /*LANG*/"Illumination");
     },
-    "< Back": () => m = indexPageMenu(gps),
+    "< Back": () => indexPageMenu(gps),
   };
 
   return E.showMenu(moonMenu);
@@ -289,10 +289,10 @@ function indexPageMenu(gps) {
       "title": /*LANG*/"Select",
     },
     /*LANG*/"Sun": () => {
-      m = sunIndexPageMenu(gps);
+      sunIndexPageMenu(gps);
     },
     /*LANG*/"Moon": () => {
-      m = moonIndexPageMenu(gps);
+      moonIndexPageMenu(gps);
     },
     "< Back": () => { load(); }
   };
@@ -300,9 +300,9 @@ function indexPageMenu(gps) {
   return E.showMenu(menu);
 }
 
-function getCenterStringX(str) {
-  return (g.getWidth() - g.stringWidth(str)) / 2;
-}
+//function getCenterStringX(str) {
+//  return (g.getWidth() - g.stringWidth(str)) / 2;
+//}
 
 function init() {
   let location = require("Storage").readJSON("mylocation.json",1)||{"lat":51.5072,"lon":0.1276,"location":"London"};
@@ -311,5 +311,4 @@ function init() {
   Bangle.drawWidgets();
 }
 
-let m;
 init();
diff --git a/apps/astrocalc/metadata.json b/apps/astrocalc/metadata.json
index a43534325..d88037d09 100644
--- a/apps/astrocalc/metadata.json
+++ b/apps/astrocalc/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "astrocalc",
   "name": "Astrocalc",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Calculates interesting information on the sun like sunset and sunrise and moon cycles for the current day based on your location from MyLocation app",
   "icon": "astrocalc.png",
   "tags": "app,sun,moon,cycles,tool,outdoors",
diff --git a/apps/autoreset/ChangeLog b/apps/autoreset/ChangeLog
index 5560f00bc..cef136817 100644
--- a/apps/autoreset/ChangeLog
+++ b/apps/autoreset/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Add black- and whitelist for apps. Configure the timout time.
diff --git a/apps/autoreset/README.md b/apps/autoreset/README.md
index 965b2e291..3d086ee0e 100644
--- a/apps/autoreset/README.md
+++ b/apps/autoreset/README.md
@@ -6,11 +6,11 @@ Sets a timeout to load the clock face. The timeout is stopped and started again
 
 Install with app loader and Auto Reset will run in background. If you don't interact with the watch it will time out to the clock face after 10 minutes.
 
+Through the settings apps can be black-/whitelisted and the timeout length can be configured.
+
 ## TODO
 
-- Add settings page
-  - set how many minutes the timeout should count down.
-  - whitelist/blacklist for apps.
+- per app specific timeout lengths?
 
 ## Requests
 
diff --git a/apps/autoreset/boot.js b/apps/autoreset/boot.js
index 3302eca08..fc8d9ec0a 100644
--- a/apps/autoreset/boot.js
+++ b/apps/autoreset/boot.js
@@ -1,12 +1,29 @@
 {
+const DEFAULTS = {
+  mode: 0,
+  apps: [],
+  timeout: 10
+};
+const settings = require("Storage").readJSON("autoreset.json", 1) || DEFAULTS;
+
+// Check if the back button should be enabled for the current app.
+// app is the src file of the app.
+// Derivative of the backswipe app's logic.
+function enabledForApp(app) {
+  if (Bangle.CLOCK==1) return false;
+  if (!settings) return true;
+  let isListed = settings.apps.filter((a) => a.files.includes(app)).length > 0;
+  return settings.mode===0?!isListed:isListed;
+}
+
 let timeoutAutoreset;
-let resetTimeoutAutoreset = (force)=>{
+const resetTimeoutAutoreset = (force)=>{
   if (timeoutAutoreset) clearTimeout(timeoutAutoreset);
   setTimeout(()=>{ // Short outer timeout to make sure we have time to leave clock face before checking `Bangle.CLOCK!=1`.
-    if (Bangle.CLOCK!=1) { // Only add timeout if not already on clock face.
+    if (enabledForApp(global.__FILE__)) {
       timeoutAutoreset = setTimeout(()=>{
         if (Bangle.CLOCK!=1) Bangle.showClock();
-      }, 10*60*1000);
+      }, settings.timeout*60*1000);
     }
   },200);
 };
diff --git a/apps/autoreset/metadata.json b/apps/autoreset/metadata.json
index ca35b4d7a..c8866924b 100644
--- a/apps/autoreset/metadata.json
+++ b/apps/autoreset/metadata.json
@@ -1,6 +1,6 @@
 { "id": "autoreset",
   "name": "Auto Reset",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Sets a timeout to load the clock face. The timeout is stopped and started again upon user input.",
   "icon": "app.png",
   "type": "bootloader",
@@ -8,6 +8,10 @@
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"autoreset.boot.js","url":"boot.js"}
+    {"name":"autoreset.boot.js","url":"boot.js"},
+    {"name":"autoreset.settings.js","url":"settings.js"}
+  ],
+  "data":[
+    {"name":"autoreset.json"}
   ]
 }
diff --git a/apps/backswipe/ChangeLog b/apps/backswipe/ChangeLog
index 54ffebfc7..4e81269fe 100644
--- a/apps/backswipe/ChangeLog
+++ b/apps/backswipe/ChangeLog
@@ -1,3 +1,6 @@
 0.01: New App!
 0.02: Don't fire if the app uses swipes already.
 0.03: Only count defined handlers in the handler array.
+0.04: Fix messages auto opened by `messagegui` could not be blacklisted. Needs
+	a refresh by deselecting and reselecting the "Messages" app throught Back Swipe
+	settings.
diff --git a/apps/backswipe/boot.js b/apps/backswipe/boot.js
index d5d54cd59..8ff277634 100644
--- a/apps/backswipe/boot.js
+++ b/apps/backswipe/boot.js
@@ -47,9 +47,9 @@
   function enabledForApp(app) {
     if (!settings) return true;
     if (settings.mode === 0) {
-      return !(settings.apps.filter((a) => a.src === app).length > 0);
+      return !(settings.apps.filter((a) => (a.src===app)||(a.files&&a.files.includes(app))).length > 0); // The `a.src===app` and `a.files&&...` checks are for backwards compatibility. Otherwise only `a.files.includes(app)` is needed.
     } else if (settings.mode === 1) {
-      return settings.apps.filter((a) => a.src === app).length > 0;
+      return settings.apps.filter((a) => (a.src===app)||(a.files&&a.files.includes(app))).length > 0;
     } else {
       return settings.mode === 2 ? true : false;
     }
diff --git a/apps/backswipe/metadata.json b/apps/backswipe/metadata.json
index add609a0f..4324286b5 100644
--- a/apps/backswipe/metadata.json
+++ b/apps/backswipe/metadata.json
@@ -1,7 +1,7 @@
 { "id": "backswipe",
   "name": "Back Swipe",
   "shortName":"BackSwipe",
-  "version":"0.03",
+  "version":"0.04",
   "description": "Service that allows you to use an app's back button using left to right swipe gesture",
   "icon": "app.png",
   "tags": "back,gesture,swipe",
diff --git a/apps/backswipe/settings.js b/apps/backswipe/settings.js
index 42ca7ae7d..c98f706eb 100644
--- a/apps/backswipe/settings.js
+++ b/apps/backswipe/settings.js
@@ -26,7 +26,8 @@
       return appInfo && {
         'name': appInfo.name,
         'sortorder': appInfo.sortorder,
-        'src': appInfo.src
+        'src': appInfo.src,
+        'files': appInfo.files
       };
     }).filter(app => app && !!app.src);
     apps.sort((a, b) => {
diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 9af3b7ea8..4089c823d 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Tell clock widgets to hide.
 0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge
 0.08: Minor code improvements
+0.09: Something was changing the value of the "width" variable, which caused the battery usage feature to malfunction. The "width" variable has been renamed - the cause remains a mystery.
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index 3f8607495..0ebc33bed 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -12,7 +12,7 @@ Graphics.prototype.setFontOpenSans = function(scale) {
 
 var drawTimeout;
 var lastBattCheck = 0;
-var width = 0;
+var batteryUsedWidth = 0;
 
 function queueDraw(millis_now) {
     if (drawTimeout) clearTimeout(drawTimeout);
@@ -32,8 +32,8 @@ function draw() {
 
     if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
       lastBattCheck = date.getTime();
-      width = E.getBattery();
-      width += width/2;
+      batteryUsedWidth = E.getBattery();
+      batteryUsedWidth += batteryUsedWidth/2;
     }
 
     g.reset();
@@ -58,7 +58,7 @@ function draw() {
     g.fillRect(167,163,170,167);
     if (Bangle.isCharging()) {
       g.setColor(1,1,0);
-      g.fillRect(12,162,12+width,168);
+      g.fillRect(12,162,12+batteryUsedWidth,168);
     } else {
       g.setColor(1,0,0);
       g.fillRect(12,162,57,168);
@@ -67,16 +67,16 @@ function draw() {
       g.setColor(0,1,0);
       g.fillRect(73,162,162,168);
     }
-    if (width < 150) {
+    if (batteryUsedWidth < 150) {
       g.setColor(g.theme.bg);
-      g.fillRect(12+width+1,162,162,168);
+      g.fillRect(12+batteryUsedWidth+1,162,162,168);
     }
 
     if (Bangle.isCharging()) {
       g.setColor(1,1,0);
-    } else if (width <= 45) {
+    } else if (batteryUsedWidth <= 45) {
       g.setColor(1,0,0);
-    } else if (width <= 60) {
+    } else if (batteryUsedWidth <= 60) {
       g.setColor(1,1,0);
     } else {
       g.setColor(0, 1, 0);
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
index 54a4296bc..dc3bcb143 100644
--- a/apps/bigdclock/metadata.json
+++ b/apps/bigdclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version": "0.08",
+  "version": "0.09",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",
diff --git a/apps/binaryclk/ChangeLog b/apps/binaryclk/ChangeLog
index 76a897247..7f3507499 100644
--- a/apps/binaryclk/ChangeLog
+++ b/apps/binaryclk/ChangeLog
@@ -3,3 +3,10 @@
 0.03: Added setting for fullscreen option
 0.04: Added settings to hide unused squares and show date
 0.05: Minor code improvements
+0.06: Added setting to show battery and added artwork to date
+0.07: Removed percentage from battery and cleaned up logic
+0.08: Changed month to day and text color to black on date
+0.09: Changed day color back to white
+0.10: Add blinking when charging
+0.11: Changed battery to buzz instead of blink and fixed battery counter
+0.12: Got rid of battery counter
\ No newline at end of file
diff --git a/apps/binaryclk/app.js b/apps/binaryclk/app.js
index 05a2a5d1a..afc72aabe 100644
--- a/apps/binaryclk/app.js
+++ b/apps/binaryclk/app.js
@@ -1,13 +1,50 @@
 var settings = Object.assign({
-	fullscreen: false,
+	fullscreen: true,
 	hidesq: false,
-	showdate: false,
+	showdate: true,
+	showbat: true,
 }, require('Storage').readJSON("binaryclk.json", true) || {});
 
-function draw() {
+var gap = 4;
+var mgn = 24;
+var sq = 33;
 
+if (settings.fullscreen) {
+	gap = 8;
+	mgn = 0;
+	sq = 34;
+}
+
+var pos = sq + gap;
+
+function drawbat() {
+	var bat = E.getBattery();
+	if (bat < 20) {
+		g.setColor('#FF0000');
+	} else if (bat < 40) {
+		g.setColor('#FFA500');
+	} else {
+		g.setColor('#00FF00');
+	}
+	g.fillRect(Math.floor(mgn/2) + gap + 2 * pos, mgn + gap, Math.floor(mgn/2) + gap + 2 * pos + Math.floor(bat * sq / 100), mgn + gap + sq);
+}
+
+function drawbatrect() {
+	if (g.theme.dark) {
+		g.setColor(-1);
+	} else {
+		g.setColor(1);
+	}
+	g.drawRect(Math.floor(mgn/2) + gap + 2 * pos, mgn + gap, Math.floor(mgn/2) + gap + 2 * pos + sq, mgn + gap + sq);
+}
+
+function draw() {
+	let i = 0;
 	var dt = new Date();
-	var h = dt.getHours(), m = dt.getMinutes(), d = dt.getDate();
+	var h = dt.getHours();
+	var m = dt.getMinutes();
+	var d = dt.getDate();
+	var day = dt.toString().substring(0,3);
 	const t = [];
 
 	t[0] = Math.floor(h/10);
@@ -18,18 +55,6 @@ function draw() {
 	g.reset();
 	g.clearRect(Bangle.appRect);
 
-	let i = 0;
-	var gap = 8;
-	var mgn = 20;
-
-	if (settings.fullscreen) {
-		gap = 12;
-		mgn = 0;
-	}
-
-	const sq = 29;
-	var pos = sq + gap;
-
 	for (let r = 3; r >= 0; r--) {
 		for (let c = 0; c < 4; c++) {
 			if (t[c] & Math.pow(2, r)) {
@@ -47,25 +72,43 @@ function draw() {
 	if (settings.hidesq) {
 		c1sqhide = 2;
 		c3sqhide = 1;
-	}
-
-	if (settings.hidesq) {
 		g.clearRect(Math.floor(mgn/2), mgn, Math.floor(mgn/2) + pos, mgn + c1sqhide * pos);
 		g.clearRect(Math.floor(mgn/2) + 2 * pos + gap, mgn, Math.floor(mgn/2) + 3 * pos, mgn + c3sqhide * pos);
 	}
+
 	if (settings.showdate) {
-		g.setFontAlign(0, 0);
+		g.setColor(-1).fillRect(Math.floor(mgn/2) + gap, mgn + gap, Math.floor(mgn/2) + gap + sq, mgn + gap + sq);
+		g.setColor('#FF0000').fillRect(Math.floor(mgn/2) + gap, mgn + gap, Math.floor(mgn/2) + gap + sq, mgn + gap + 12);
+		g.setFontAlign(0, -1);
+		g.setFont("Vector",12);
+		g.setColor(-1).drawString(day, Math.ceil(mgn/2) + gap + Math.ceil(sq/2) + 1, mgn + gap + 1);
+		g.setFontAlign(0, 1);
 		g.setFont("Vector",20);
+		g.setColor(1).drawString(d, Math.ceil(mgn/2) + gap + Math.ceil(sq/2) + 1, mgn + gap + sq + 2);
+		if (g.theme.dark) {
+			g.setColor(-1);
+		} else {
+			g.setColor(1);
+			g.drawLine(Math.floor(mgn/2) + gap, mgn + gap + 13, Math.floor(mgn/2) + gap + sq, mgn + gap + 13);
+		}
 		g.drawRect(Math.floor(mgn/2) + gap, mgn + gap, Math.floor(mgn/2) + gap + sq, mgn + gap + sq);
-		g.drawString(d, Math.ceil(mgn/2) + gap + Math.ceil(sq/2) + 1, mgn + gap + Math.ceil(sq/2) + 1);
+	}
+
+	if (settings.showbat) {
+		drawbat();
+		drawbatrect();
 	}
 }
 
 g.clear();
 draw();
-/*var secondInterval =*/ setInterval(draw, 60000);
+setInterval(draw, 60000);
 Bangle.setUI("clock");
 if (!settings.fullscreen) {
 	Bangle.loadWidgets();
 	Bangle.drawWidgets();
-} 
+}
+
+Bangle.on('charging', function(charging) {
+	if(charging) Bangle.buzz();
+});
\ No newline at end of file
diff --git a/apps/binaryclk/metadata.json b/apps/binaryclk/metadata.json
index 83387d2aa..432bed25e 100644
--- a/apps/binaryclk/metadata.json
+++ b/apps/binaryclk/metadata.json
@@ -1,8 +1,8 @@
 {
 	"id": "binaryclk",
 	"name": "Bin Clock",
-	"version": "0.05",
-	"description": "Clock face to show binary time in 24 hour format",
+	"version": "0.12",
+	"description": "Binary clock with date and battery",
 	"icon": "app-icon.png",
 	"screenshots": [{"url":"screenshot.png"}],
 	"type": "clock",
diff --git a/apps/binaryclk/screenshot.png b/apps/binaryclk/screenshot.png
index 504a1926f..2b459c87c 100644
Binary files a/apps/binaryclk/screenshot.png and b/apps/binaryclk/screenshot.png differ
diff --git a/apps/binaryclk/settings.js b/apps/binaryclk/settings.js
index f7e8620de..34b3ae180 100644
--- a/apps/binaryclk/settings.js
+++ b/apps/binaryclk/settings.js
@@ -4,6 +4,7 @@
     fullscreen: false,
     hidesq: false,
     showdate: false,
+    showbat: false,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
@@ -34,5 +35,12 @@
         writeSettings();
       },
     },
+    'Show Battery': {
+      value: settings.showbat,
+      onchange: v => {
+        settings.showbat = v;
+        writeSettings();
+      },
+    },
   });
 })
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index 95a9ff2c6..1d8e44b72 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -69,3 +69,6 @@
 0.58: "Make Connectable" temporarily bypasses the whitelist
 0.59: Whitelist: Try to resolve peer addresses using NRF.resolveAddress() - for 2v19 or 2v18 cutting edge builds
 0.60: Minor code improvements
+0.61: Instead of breaking execution with an Exception when updating boot, just use if..else (fix 'Uncaught undefined')
+0.62: Handle setting for configuring BLE privacy
+0.63: Only set BLE `display:1` if we have a passkey
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 315b60723..aa4a7e7b5 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -14,15 +14,15 @@ if (DEBUG) {
 }
 if (require('Storage').hash) { // new in 2v11 - helps ensure files haven't changed
   let CRC = E.CRC32(require('Storage').read('setting.json'))+require('Storage').hash(/\.boot\.js/)+E.CRC32(process.env.GIT_COMMIT);
-  boot += `if (E.CRC32(require('Storage').read('setting.json'))+require('Storage').hash(/\\.boot\\.js/)+E.CRC32(process.env.GIT_COMMIT)!=${CRC})`;
+  boot += `if(E.CRC32(require('Storage').read('setting.json'))+require('Storage').hash(/\\.boot\\.js/)+E.CRC32(process.env.GIT_COMMIT)!=${CRC})`;
 } else {
   let CRC = E.CRC32(require('Storage').read('setting.json'))+E.CRC32(require('Storage').list(/\.boot\.js/))+E.CRC32(process.env.GIT_COMMIT);
-  boot += `if (E.CRC32(require('Storage').read('setting.json'))+E.CRC32(require('Storage').list(/\\.boot\\.js/))+E.CRC32(process.env.GIT_COMMIT)!=${CRC})`;
+  boot += `if(E.CRC32(require('Storage').read('setting.json'))+E.CRC32(require('Storage').list(/\\.boot\\.js/))+E.CRC32(process.env.GIT_COMMIT)!=${CRC})`;
 }
-boot += ` { eval(require('Storage').read('bootupdate.js')); throw "Storage Updated!"}\n`;
+boot += `{eval(require('Storage').read('bootupdate.js'));print("Storage Updated!")}else{\n`;
 boot += `E.setFlags({pretokenise:1});\n`;
 boot += `var bleServices = {}, bleServiceOptions = { uart : true};\n`;
-bootPost += `NRF.setServices(bleServices, bleServiceOptions);delete bleServices,bleServiceOptions;\n`; // executed after other boot code
+bootPost += `NRF.setServices(bleServices,bleServiceOptions);delete bleServices,bleServiceOptions;\n`; // executed after other boot code
 if (s.ble!==false) {
   if (s.HID) { // Human interface device
     if (s.HID=="joy") boot += `Bangle.HID = E.toUint8Array(atob("BQEJBKEBCQGhAAUJGQEpBRUAJQGVBXUBgQKVA3UBgQMFAQkwCTEVgSV/dQiVAoECwMA="));`;
@@ -78,7 +78,12 @@ if (global.save) boot += `global.save = function() { throw new Error("You can't
 // Apply any settings-specific stuff
 if (s.options) boot+=`Bangle.setOptions(${E.toJS(s.options)});\n`;
 if (s.brightness && s.brightness!=1) boot+=`Bangle.setLCDBrightness(${s.brightness});\n`;
-if (s.passkey!==undefined && s.passkey.length==6) boot+=`NRF.setSecurity({passkey:${E.toJS(s.passkey.toString())}, mitm:1, display:1});\n`;
+if (s.bleprivacy || (s.passkey!==undefined && s.passkey.length==6)) {
+  let passkey = s.passkey ? `passkey:${E.toJS(s.passkey.toString())},display:1,mitm:1,` : "";
+  let privacy = s.bleprivacy ? `privacy:${E.toJS(s.bleprivacy)},` : "";
+  boot+=`NRF.setSecurity({${passkey}${privacy}});\n`;
+}
+if (s.blename === false) boot+=`NRF.setAdvertising({},{showName:false});\n`;
 if (s.whitelist && !s.whitelist_disabled) boot+=`NRF.on('connect', function(addr) { if (!NRF.ignoreWhitelist) { let whitelist = (require('Storage').readJSON('setting.json',1)||{}).whitelist; if (NRF.resolveAddress !== undefined) { let resolvedAddr = NRF.resolveAddress(addr); if (resolvedAddr !== undefined) addr = resolvedAddr + " (resolved)"; } if (!whitelist.includes(addr)) NRF.disconnect(); }});\n`;
 if (s.rotate) boot+=`g.setRotation(${s.rotate&3},${s.rotate>>2});\n` // screen rotation
 // ================================================== FIXING OLDER FIRMWARES
@@ -105,7 +110,7 @@ if (!date.toLocalISOString) boot += `Date.prototype.toLocalISOString = function(
 // show timings
 if (DEBUG) boot += `print(".boot0",0|(Date.now()-_tm),"ms");_tm=Date.now();\n`
 // ================================================== BOOT.JS
-// Append *.boot.js files. 
+// Append *.boot.js files.
 // Name files with a number - eg 'foo.5.boot.js' to enforce order (lowest first). Numbered files get placed before non-numbered
 // These could change bleServices/bleServiceOptions if needed
 let bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{
@@ -122,6 +127,7 @@ let bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{
   return a==b ? 0 : (a>b ? 1 : -1);
 });
 // precalculate file size
+bootPost += "}";
 let fileSize = boot.length + bootPost.length;
 bootFiles.forEach(bootFile=>{
   // match the size of data we're adding below in bootFiles.forEach
diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json
index 07e999797..dcc55da58 100644
--- a/apps/boot/metadata.json
+++ b/apps/boot/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.60",
+  "version": "0.63",
   "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
   "icon": "bootloader.png",
   "type": "bootloader",
diff --git a/apps/bootgattbat/ChangeLog b/apps/bootgattbat/ChangeLog
index df07f6ad0..3df6422e5 100644
--- a/apps/bootgattbat/ChangeLog
+++ b/apps/bootgattbat/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial release.
 0.02: Handle the case where other apps have set bleAdvert to an array
+0.03: Use the bleAdvert module
diff --git a/apps/bootgattbat/boot.js b/apps/bootgattbat/boot.js
index 34d9f8d93..f9b5969e2 100644
--- a/apps/bootgattbat/boot.js
+++ b/apps/bootgattbat/boot.js
@@ -1,26 +1,8 @@
 (() => {
   function advertiseBattery() {
-    if(Array.isArray(Bangle.bleAdvert)){
-      // ensure we're in the cycle
-      var found = false;
-      for(var ad in Bangle.bleAdvert){
-        if(ad[0x180F]){
-          ad[0x180F] = [E.getBattery()];
-          found = true;
-          break;
-        }
-      }
-      if(!found)
-        Bangle.bleAdvert.push({ 0x180F: [E.getBattery()] });
-    }else{
-      // simple object
-      Bangle.bleAdvert[0x180F] = [E.getBattery()];
-    }
-
-    NRF.setAdvertising(Bangle.bleAdvert);
+    require("ble_advert").set(0x180F, [E.getBattery()]);
   }
 
-  if (!Bangle.bleAdvert) Bangle.bleAdvert = {};
   setInterval(advertiseBattery, 60 * 1000);
   advertiseBattery();
 })();
diff --git a/apps/bootgattbat/metadata.json b/apps/bootgattbat/metadata.json
index f67b4507d..b53708c2e 100644
--- a/apps/bootgattbat/metadata.json
+++ b/apps/bootgattbat/metadata.json
@@ -2,7 +2,7 @@
   "id": "bootgattbat",
   "name": "BLE GATT Battery Service",
   "shortName": "BLE Battery Service",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Adds the GATT Battery Service to advertise the percentage of battery currently remaining over Bluetooth.\n",
   "icon": "bluetooth.png",
   "type": "bootloader",
diff --git a/apps/bootgatthrm/ChangeLog b/apps/bootgatthrm/ChangeLog
index 1e772af29..205f036b5 100644
--- a/apps/bootgatthrm/ChangeLog
+++ b/apps/bootgatthrm/ChangeLog
@@ -1,2 +1,4 @@
 0.01: Initial release.
-0.02: Added compatibility to OpenTracks and added HRM Location
\ No newline at end of file
+0.02: Added compatibility to OpenTracks and added HRM Location
+0.03: Allow setting to keep BLE connected
+0.04: Use the bleAdvert module
diff --git a/apps/bootgatthrm/boot.js b/apps/bootgatthrm/boot.js
index aad210f6f..efba1f453 100644
--- a/apps/bootgatthrm/boot.js
+++ b/apps/bootgatthrm/boot.js
@@ -4,18 +4,13 @@
      * This function prepares BLE heart rate Advertisement.
      */
 
-    NRF.setAdvertising(
-      {
-        0x180d: undefined
-      },
-      {
-        // We need custom Advertisement settings for Apps like OpenTracks
-        connectable: true,
-        discoverable: true,
-        scannable: true,
-        whenConnected: true,
-      }
-    );
+    require("ble_advert").set(0x180d, undefined, {
+      // We need custom Advertisement settings for Apps like OpenTracks
+      connectable: true,
+      discoverable: true,
+      scannable: true,
+      whenConnected: true,
+    });
 
     NRF.setServices({
       0x180D: { // heart_rate
@@ -28,8 +23,10 @@
         }
       }
     });
-
   }
+
+  const keepConnected = (require("Storage").readJSON("gatthrm.settings.json", 1) || {}).keepConnected;
+
   function updateBLEHeartRate(hrm) {
     /*
      * Send updated heart rate measurement via BLE
@@ -50,13 +47,14 @@
     } catch (error) {
       if (error.message.includes("BLE restart")) {
         /*
-         * BLE has to restart after service setup.  
+         * BLE has to restart after service setup.
          */
-        NRF.disconnect();
+        if(!keepConnected)
+          NRF.disconnect();
       }
       else if (error.message.includes("UUID 0x2a37")) {
         /*
-         * Setup service if it wasn't setup correctly for some reason 
+         * Setup service if it wasn't setup correctly for some reason
          */
         setupHRMAdvertising();
       } else {
@@ -66,5 +64,5 @@
   }
 
   setupHRMAdvertising();
-  Bangle.on("HRM", function (hrm) { updateBLEHeartRate(hrm); });
+  Bangle.on("HRM", updateBLEHeartRate);
 })();
diff --git a/apps/bootgatthrm/metadata.json b/apps/bootgatthrm/metadata.json
index 450066622..d32b51601 100644
--- a/apps/bootgatthrm/metadata.json
+++ b/apps/bootgatthrm/metadata.json
@@ -2,7 +2,7 @@
   "id": "bootgatthrm",
   "name": "BLE GATT HRM Service",
   "shortName": "BLE HRM Service",
-  "version": "0.02",
+  "version": "0.04",
   "description": "Adds the GATT HRM Service to advertise the measured HRM over Bluetooth.\n",
   "icon": "bluetooth.png",
   "type": "bootloader",
diff --git a/apps/btadv/ChangeLog b/apps/btadv/ChangeLog
index 07e67157c..c019a97b9 100644
--- a/apps/btadv/ChangeLog
+++ b/apps/btadv/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New app!
 0.02: Advertise accelerometer data and sensor location
+0.03: Use the bleAdvert module
+0.04: Actually use the ble_advert module
diff --git a/apps/btadv/app.js b/apps/btadv/app.js
index b72a8127a..457973e47 100644
--- a/apps/btadv/app.js
+++ b/apps/btadv/app.js
@@ -1,4 +1,3 @@
-var _a;
 {
     var __assign = Object.assign;
     var Layout_1 = require("Layout");
@@ -441,8 +440,6 @@ var _a;
         NRF.setServices(ad, {
             uart: false,
         });
-        var bangle2 = Bangle;
-        var cycle = Array.isArray(bangle2.bleAdvert) ? bangle2.bleAdvert : [];
         for (var id in ad) {
             var serv = ad[id];
             var value = void 0;
@@ -450,11 +447,7 @@ var _a;
                 value = serv[ch].value;
                 break;
             }
-            cycle.push((_a = {}, _a[id] = value || [], _a));
+            require("ble_advert").set(id, value || []);
         }
-        bangle2.bleAdvert = cycle;
-        NRF.setAdvertising(cycle, {
-            interval: 100,
-        });
     }
 }
diff --git a/apps/btadv/app.ts b/apps/btadv/app.ts
index 1d9501175..4ae75fae3 100644
--- a/apps/btadv/app.ts
+++ b/apps/btadv/app.ts
@@ -1,5 +1,6 @@
 {
-// @ts-ignore helper
+// @ts-expect-error helper
+
 const __assign = Object.assign;
 
 const Layout = require("Layout");
@@ -666,6 +667,8 @@ const getBleAdvert = <T>(map: (s: BleServ) => T, all = false) => {
 
 // done via advertise in setServices()
 //const updateBleAdvert = () => {
+//  require("ble_advert").set(...)
+//
 //  let bleAdvert: ReturnType<typeof getBleAdvert<undefined>>;
 //
 //  if (!(bleAdvert = (Bangle as any).bleAdvert)) {
@@ -764,12 +767,6 @@ enableSensors();
     },
   );
 
-  type BleAdvert = { [key: string]: number[] };
-  const bangle2 = Bangle as {
-    bleAdvert?: BleAdvert | BleAdvert[];
-  };
-  const cycle = Array.isArray(bangle2.bleAdvert) ? bangle2.bleAdvert : [];
-
   for(const id in ad){
     const serv = ad[id as BleServ];
     let value;
@@ -780,16 +777,7 @@ enableSensors();
       break;
     }
 
-    cycle.push({ [id]: value || [] });
+    require("ble_advert").set(id, value || []);
   }
-
-  bangle2.bleAdvert = cycle;
-
-  NRF.setAdvertising(
-    cycle,
-    {
-      interval: 100,
-    }
-  );
 }
 }
diff --git a/apps/btadv/metadata.json b/apps/btadv/metadata.json
index efe024a2f..71a0fedaf 100644
--- a/apps/btadv/metadata.json
+++ b/apps/btadv/metadata.json
@@ -2,7 +2,7 @@
   "id": "btadv",
   "name": "btadv",
   "shortName": "btadv",
-  "version": "0.02",
+  "version": "0.04",
   "description": "Advertise & export live heart rate, accel, pressure, GPS & mag data over bluetooth",
   "icon": "icon.png",
   "tags": "health,tool,sensors,bluetooth",
diff --git a/apps/bthome/ChangeLog b/apps/bthome/ChangeLog
index 01d23607d..82c93ee1f 100644
--- a/apps/bthome/ChangeLog
+++ b/apps/bthome/ChangeLog
@@ -1,2 +1,6 @@
 0.01: New App!
-0.02: Fix double-button press if you press the next button within 30s (#3243)
\ No newline at end of file
+0.02: Fix double-button press if you press the next button within 30s (#3243)
+0.03: Cope with identical duplicate buttons (fix #3260)
+      Set 'n' for buttons in Bangle.btHomeData correctly (avoids adding extra buttons on end of advertising)
+0.04: Fix duplicate button on edit->save
+0.05: Use the bleAdvert module
diff --git a/apps/bthome/app.js b/apps/bthome/app.js
index 7e9a39531..6fce4ff0b 100644
--- a/apps/bthome/app.js
+++ b/apps/bthome/app.js
@@ -5,20 +5,26 @@ function showMenu() {
   var settings = require("Storage").readJSON("bthome.json",1)||{};
   if (!(settings.buttons instanceof Array))
     settings.buttons = [];
-  var menu = { "": {title:"BTHome", back:load} };
+  var menu = [];
+  menu[""] = {title:"BTHome", back:load };
   settings.buttons.forEach((button,idx) => {
     var img = require("icons").getIcon(button.icon);
-    menu[/*LANG*/"\0"+img+" "+button.name] = function() {
-      Bangle.btHome([{type:"button_event",v:button.v,n:button.n}],{event:true});
-      E.showMenu();
-      E.showMessage("Sending Event");
-      Bangle.buzz();
-      setTimeout(showMenu, 500);
-    };
+    menu.push({
+      title : /*LANG*/"\0"+img+" "+button.name,
+      onchange : function() {
+        Bangle.btHome([{type:"button_event",v:button.v,n:button.n}],{event:true});
+        E.showMenu();
+        E.showMessage("Sending Event");
+        Bangle.buzz();
+        setTimeout(showMenu, 500);
+      }
+    });
   });
-  menu[/*LANG*/"Settings"] = function() {
+  menu.push({
+    title : /*LANG*/"Settings",
+    onchange : function() {
     eval(require("Storage").read("bthome.settings.js"))(()=>showMenu());
-  };
+  }});
   E.showMenu(menu);
 }
 
diff --git a/apps/bthome/boot.js b/apps/bthome/boot.js
index a95d9b5fe..00e08df90 100644
--- a/apps/bthome/boot.js
+++ b/apps/bthome/boot.js
@@ -1,5 +1,3 @@
-// Ensure we have the bleAdvert global (to play well with other stuff)
-if (!Bangle.bleAdvert) Bangle.bleAdvert = {};
 Bangle.btHomeData = [];
 {
   require("BTHome").packetId = 0|(Math.random()*256); // random packet id so new packets show up
@@ -13,7 +11,7 @@ Bangle.btHomeData = [];
   if (settings.buttons instanceof Array) {
     let n = settings.buttons.reduce((n,b)=>b.n>n?b.n:n,-1);
     for (var i=0;i<=n;i++)
-      Bangle.btHomeData.push({type:"button_event",v:"none",n:n});
+      Bangle.btHomeData.push({type:"button_event",v:"none",n:i});
   }
 }
 
@@ -39,20 +37,6 @@ Bangle.btHome = function(extras, options) {
   if (bat) bat.v = E.getBattery();
   var advert = require("BTHome").getAdvertisement(Bangle.btHomeData)[0xFCD2];
   // Add to the list of available advertising
-  if(Array.isArray(Bangle.bleAdvert)){
-    var found = false;
-    for(var ad in Bangle.bleAdvert){
-      if(ad[0xFCD2]){
-        ad[0xFCD2] = advert;
-        found = true;
-        break;
-      }
-    }
-    if(!found)
-      Bangle.bleAdvert.push({ 0xFCD2: advert });
-  } else {
-    Bangle.bleAdvert[0xFCD2] = advert;
-  }
   var advOptions = {};
   var updateTimeout = 10*60*1000; // update every 10 minutes
   if (options.event) { // if it's an event...
@@ -60,7 +44,7 @@ Bangle.btHome = function(extras, options) {
     advOptions.whenConnected = true;
     updateTimeout = 30000; // slow down in 30 seconds
   }
-  NRF.setAdvertising(Bangle.bleAdvert, advOptions);
+  require("ble_advert").set(0xFCD2, advert, advOptions);
   if (Bangle.btHomeTimeout) clearTimeout(Bangle.btHomeTimeout);
   Bangle.btHomeTimeout = setTimeout(function() {
     delete Bangle.btHomeTimeout;
diff --git a/apps/bthome/metadata.json b/apps/bthome/metadata.json
index 6fc4a17c2..0156a5d32 100644
--- a/apps/bthome/metadata.json
+++ b/apps/bthome/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bthome",
   "name": "BTHome",
   "shortName":"BTHome",
-  "version":"0.02",
+  "version":"0.05",
   "description": "Allow your Bangle to advertise with BTHome and send events to Home Assistant via Bluetooth",
   "icon": "icon.png",
   "type": "app",
diff --git a/apps/bthome/settings.js b/apps/bthome/settings.js
index 70f50f2ac..1bdcb270d 100644
--- a/apps/bthome/settings.js
+++ b/apps/bthome/settings.js
@@ -1,7 +1,11 @@
 (function(back) {
-  var settings = require("Storage").readJSON("bthome.json",1)||{};
-  if (!(settings.buttons instanceof Array))
-    settings.buttons = [];
+  var settings;
+
+  function loadSettings() {
+    settings = require("Storage").readJSON("bthome.json",1)||{};
+    if (!(settings.buttons instanceof Array))
+      settings.buttons = [];
+  }
 
   function saveSettings() {
     require("Storage").writeJSON("bthome.json",settings)
@@ -15,7 +19,10 @@
     }
     var actions = ["press","double_press","triple_press","long_press","long_double_press","long_triple_press"];
     var menu = {
-      "":{title:isNew ? /*LANG*/"New Button" : /*LANG*/"Edit Button", back:showMenu},
+      "":{title:isNew ? /*LANG*/"New Button" : /*LANG*/"Edit Button", back: () => {
+        loadSettings(); // revert changes
+        showMenu();
+      }},
       /*LANG*/"Icon" : {
         value : "\0"+require("icons").getIcon(button.icon),
         onchange : () => {
@@ -49,7 +56,7 @@
         onchange : v => button.n=v
       },
       /*LANG*/"Save" : () => {
-        settings.buttons.push(button);
+        if (isNew) settings.buttons.push(button);
         saveSettings();
         showMenu();
       }
@@ -67,25 +74,34 @@
   }
 
   function showMenu() {
-    var menu = { "": {title:"BTHome", back:back},
-      /*LANG*/"Show Battery" : {
-        value : !!settings.showBattery,
-        onchange : v=>{
-          settings.showBattery = v;
-          saveSettings();
-        }
+    var menu = [];
+    menu[""] = {title:"BTHome", back:back};
+    menu.push({
+      title : /*LANG*/"Show Battery",
+      value : !!settings.showBattery,
+      onchange : v=>{
+        settings.showBattery = v;
+        saveSettings();
       }
-    };
+    });
     settings.buttons.forEach((button,idx) => {
       var img = require("icons").getIcon(button.icon);
-      menu[/*LANG*/"Button"+(img ? " \0"+img : (idx+1))] = function() {
-        showButtonMenu(button, false);
-      };
+      menu.push({
+        title : /*LANG*/"Button"+(img ? " \0"+img : (idx+1)),
+        onchange : function() {
+          showButtonMenu(button, false);
+        }
+      });
+    });
+    menu.push({
+      title : /*LANG*/"Add Button",
+      onchange : function() {
+        showButtonMenu(undefined, true);
+      }
     });
-    menu[/*LANG*/"Add Button"] = function() {
-      showButtonMenu(undefined, true);
-    };
     E.showMenu(menu);
   }
+
+  loadSettings();
   showMenu();
 })
\ No newline at end of file
diff --git a/apps/bthometemp/ChangeLog b/apps/bthometemp/ChangeLog
index 480780ec5..94a60aa3e 100644
--- a/apps/bthometemp/ChangeLog
+++ b/apps/bthometemp/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Handle the case where other apps have set bleAdvert to an array
+0.03: Use the ble_advert module
diff --git a/apps/bthometemp/app.js b/apps/bthometemp/app.js
index cf74c7937..f18e33c20 100644
--- a/apps/bthometemp/app.js
+++ b/apps/bthometemp/app.js
@@ -38,21 +38,7 @@ function onTemperature(p) {
               pressure100&255,(pressure100>>8)&255,pressure100>>16
   ];
 
-  if(Array.isArray(Bangle.bleAdvert)){
-    var found = false;
-    for(var ad in Bangle.bleAdvert){
-      if(ad[0xFCD2]){
-        ad[0xFCD2] = advert;
-        found = true;
-        break;
-      }
-    }
-    if(!found)
-      Bangle.bleAdvert.push({ 0xFCD2: advert });
-  }else{
-    Bangle.bleAdvert[0xFCD2] = advert;
-  }
-  NRF.setAdvertising(Bangle.bleAdvert);
+  require("ble_advert").set(0xFCD2, advert);
 }
 
 // Gets the temperature in the most accurate way with pressure sensor
@@ -60,7 +46,6 @@ function drawTemperature() {
   Bangle.getPressure().then(p =>{if (p) onTemperature(p);});
 }
 
-if (!Bangle.bleAdvert) Bangle.bleAdvert = {};
 setInterval(function() {
   drawTemperature();
 }, 10000); // update every 10s
diff --git a/apps/bthometemp/metadata.json b/apps/bthometemp/metadata.json
index fc6804f17..3e96d95f8 100644
--- a/apps/bthometemp/metadata.json
+++ b/apps/bthometemp/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bthometemp",
   "name": "BTHome Temperature and Pressure",
   "shortName":"BTHome T",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Displays temperature and pressure, and advertises them over bluetooth for Home Assistant using BTHome.io standard",
   "icon": "app.png",
   "tags": "bthome,bluetooth,temperature",
diff --git a/apps/bthrm/ChangeLog b/apps/bthrm/ChangeLog
index 85a7ca0b6..1480698a2 100644
--- a/apps/bthrm/ChangeLog
+++ b/apps/bthrm/ChangeLog
@@ -42,3 +42,8 @@
       Add debug option for disabling active scanning
 0.17: New GUI based on layout library
 0.18: Minor code improvements
+0.19: Move caching of characteristics into settings app
+      Changed default of active scanning to false
+      Fix setHRMPower method not returning new state
+      Only buzz for disconnect after switching on if there already was an actual connection
+      Fix recorder not switching BTHRM on and off
diff --git a/apps/bthrm/README.md b/apps/bthrm/README.md
index 6234f3b78..570072dbf 100644
--- a/apps/bthrm/README.md
+++ b/apps/bthrm/README.md
@@ -21,6 +21,10 @@ Once installed you will have to go into this app's settings while your heart rat
 
 **To disable this and return to normal HRM, uninstall the app or change the settings**
 
+The characteristics of your selected sensor are cached in the settings. That means if your sensor changes, e.g. by firmware updates or similar, you will need to re-scan in the settings to update the cache of characteristics. This is done to take some complexity (and time) out of the boot process.
+
+Scanning in the settings will do 10 retries and then give up on adding the sensor. Usually that works fine, if it does not for you just try multiple times. Currently saved sensor information is only replaced on a successful pairing. There are additional options in the Debug entry of the menu that can help with specific sensor oddities. Bonding and active scanning can help with connecting, but can also prevent some sensors from working. The "Grace Periods" just add some additional time at certain steps in the connection process which can help with stability or reconnect speed of some finicky sensors. Defaults should be fine for most.
+
 ### Modes
 
 * Off - Internal HRM is used, no attempt on connecting to BT HRM.
@@ -57,3 +61,7 @@ This replaces `Bangle.setHRMPower` with its own implementation.
 ## Creator
 
 Gordon Williams
+
+## Contributer
+
+[halemmerich](https://github.com/halemmerich)
diff --git a/apps/bthrm/bthrm.js b/apps/bthrm/bthrm.js
index 246b539d4..14ef531c8 100644
--- a/apps/bthrm/bthrm.js
+++ b/apps/bthrm/bthrm.js
@@ -57,7 +57,7 @@ var layout = new Layout( {
     { type:undefined, height:8 } //dummy to protect debug output
   ]
 }, {
-  lazy:true
+  lazy:false
 });
 
 var int,agg,bt;
@@ -106,8 +106,7 @@ function draw(){
     layout.btContact.label = "--";
     layout.btEnergy.label = "--";
   }
-
-  layout.update();
+  layout.clear();
   layout.render();
   let first = true;
   for (let c of layout.l.c){
@@ -122,26 +121,29 @@ function draw(){
 
 
 // This can get called for the boot code to show what's happening
-function showStatusInfo(txt) {
+global.showStatusInfo = function(txt) {
   var R = Bangle.appRect;
   g.reset().clearRect(R.x,R.y2-8,R.x2,R.y2).setFont("6x8");
   txt = g.wrapString(txt, R.w)[0];
   g.setFontAlign(0,1).drawString(txt, (R.x+R.x2)/2, R.y2);
-}
+};
 
 function onBtHrm(e) {
   bt = e;
   bt.time = Date.now();
+  draw();
 }
 
 function onInt(e) {
   int = e;
   int.time = Date.now();
+  draw();
 }
 
 function onAgg(e) {
   agg = e;
   agg.time = Date.now();
+  draw();
 }
 
 var settings = require('Storage').readJSON("bthrm.json", true) || {};
@@ -162,7 +164,6 @@ Bangle.drawWidgets();
 if (Bangle.setBTHRMPower){
   g.reset().setFont("6x8",2).setFontAlign(0,0);
   g.drawString("Please wait...",g.getWidth()/2,g.getHeight()/2);
-  setInterval(draw, 1000);
 } else {
   g.reset().setFont("6x8",2).setFontAlign(0,0);
   g.drawString("BTHRM disabled",g.getWidth()/2,g.getHeight()/2);
diff --git a/apps/bthrm/default.json b/apps/bthrm/default.json
index 79605b412..e1464a9d4 100644
--- a/apps/bthrm/default.json
+++ b/apps/bthrm/default.json
@@ -15,8 +15,7 @@
   "custom_fallbackTimeout": 10,
   "gracePeriodNotification": 0,
   "gracePeriodConnect": 0,
-  "gracePeriodService": 0,
   "gracePeriodRequest": 0,
   "bonding": false,
-  "active": true
+  "active": false
 }
diff --git a/apps/bthrm/lib.js b/apps/bthrm/lib.js
index 18af4f3ae..b81bd6118 100644
--- a/apps/bthrm/lib.js
+++ b/apps/bthrm/lib.js
@@ -1,14 +1,14 @@
 exports.enable = () => {
-  var settings = Object.assign(
+  let settings = Object.assign(
     require('Storage').readJSON("bthrm.default.json", true) || {},
     require('Storage').readJSON("bthrm.json", true) || {}
   );
 
-  var log = function(text, param){
+  let log = function(text, param){
     if (global.showStatusInfo)
       global.showStatusInfo(text);
     if (settings.debuglog){
-      var logline = new Date().toISOString() + " - " + text;
+      let logline = new Date().toISOString() + " - " + text;
       if (param) logline += ": " + JSON.stringify(param);
       print(logline);
     }
@@ -16,60 +16,33 @@ exports.enable = () => {
 
   log("Settings: ", settings);
 
-  if (settings.enabled){
+  //this is for compatibility with 0.18 and older
+  let oldCache = require('Storage').readJSON("bthrm.cache.json", true);
+  if(oldCache){
+    settings.cache = oldCache;
+    require('Storage').writeJSON("bthrm.json", settings);
+    require('Storage').erase("bthrm.cache.json");
+  }
 
-    var clearCache = function() {
-      return require('Storage').erase("bthrm.cache.json");
-    };
+  if (settings.enabled && settings.cache){
 
-    var getCache = function() {
-      var cache = require('Storage').readJSON("bthrm.cache.json", true) || {};
-      if (settings.btid && settings.btid === cache.id) return cache;
-      clearCache();
-      return {};
-    };
+    log("Start");
 
-    var addNotificationHandler = function(characteristic) {
+    let addNotificationHandler = function(characteristic) {
       log("Setting notification handler"/*supportedCharacteristics[characteristic.uuid].handler*/);
       characteristic.on('characteristicvaluechanged', (ev) => supportedCharacteristics[characteristic.uuid].handler(ev.target.value));
     };
 
-    var writeCache = function(cache) {
-      var oldCache = getCache();
-      if (oldCache !== cache) {
-        log("Writing cache");
-        require('Storage').writeJSON("bthrm.cache.json", cache);
-      } else {
-        log("No changes, don't write cache");
-      }
-    };
 
-    var characteristicsToCache = function(characteristics) {
-      log("Cache characteristics");
-      var cache = getCache();
-      if (!cache.characteristics) cache.characteristics = {};
-      for (var c of characteristics){
-        //"handle_value":16,"handle_decl":15
-        log("Saving handle " + c.handle_value + " for characteristic: ", c);
-        cache.characteristics[c.uuid] = {
-          "handle": c.handle_value,
-          "uuid": c.uuid,
-          "notify": c.properties.notify,
-          "read": c.properties.read
-        };
-      }
-      writeCache(cache);
-    };
-
-    var characteristicsFromCache = function(device) {
-      var service = { device : device }; // fake a BluetoothRemoteGATTService
+    let characteristicsFromCache = function(device) {
+      let service = { device : device }; // fake a BluetoothRemoteGATTService
       log("Read cached characteristics");
-      var cache = getCache();
+      let cache = settings.cache;
       if (!cache.characteristics) return [];
-      var restored = [];
-      for (var c in cache.characteristics){
-        var cached = cache.characteristics[c];
-        var r = new BluetoothRemoteGATTCharacteristic();
+      let restored = [];
+      for (let c in cache.characteristics){
+        let cached = cache.characteristics[c];
+        let r = new BluetoothRemoteGATTCharacteristic();
         log("Restoring characteristic ", cached);
         r.handle_value = cached.handle;
         r.uuid = cached.uuid;
@@ -84,26 +57,14 @@ exports.enable = () => {
       return restored;
     };
 
-    log("Start");
-
-    var lastReceivedData={
-    };
-
-    var supportedServices = [
-      "0x180d", // Heart Rate
-      "0x180f", // Battery
-    ];
-
-    var bpmTimeout;
-
-    var supportedCharacteristics = {
+    let supportedCharacteristics = {
       "0x2a37": {
         //Heart rate measurement
         active: false,
         handler: function (dv){
-          var flags = dv.getUint8(0);
+          let flags = dv.getUint8(0);
 
-          var bpm = (flags & 1) ? (dv.getUint16(1) / 100 /* ? */ ) : dv.getUint8(1); // 8 or 16 bit
+          let bpm = (flags & 1) ? (dv.getUint16(1) / 100 /* ? */ ) : dv.getUint8(1); // 8 or 16 bit
           supportedCharacteristics["0x2a37"].active = bpm > 0;
           log("BTHRM BPM " + supportedCharacteristics["0x2a37"].active);
           switchFallback();
@@ -114,42 +75,42 @@ exports.enable = () => {
             startFallback();
           }, 3000);
 
-          var sensorContact;
+          let sensorContact;
 
           if (flags & 2){
             sensorContact = !!(flags & 4);
           }
 
-          var idx = 2 + (flags&1);
+          let idx = 2 + (flags&1);
 
-          var energyExpended;
+          let energyExpended;
           if (flags & 8){
             energyExpended = dv.getUint16(idx,1);
             idx += 2;
           }
-          var interval;
+          let interval;
           if (flags & 16) {
             interval = [];
-            var maxIntervalBytes = (dv.byteLength - idx);
+            let maxIntervalBytes = (dv.byteLength - idx);
             log("Found " + (maxIntervalBytes / 2) + " rr data fields");
-            for(var i = 0 ; i < maxIntervalBytes / 2; i++){
+            for(let i = 0 ; i < maxIntervalBytes / 2; i++){
               interval[i] = dv.getUint16(idx,1); // in milliseconds
               idx += 2;
             }
           }
 
-          var location;
+          let location;
           if (lastReceivedData && lastReceivedData["0x180d"] && lastReceivedData["0x180d"]["0x2a38"]){
             location = lastReceivedData["0x180d"]["0x2a38"];
           }
 
-          var battery;
+          let battery;
           if (lastReceivedData && lastReceivedData["0x180f"] && lastReceivedData["0x180f"]["0x2a19"]){
             battery = lastReceivedData["0x180f"]["0x2a19"];
           }
 
           if (settings.replace && bpm > 0){
-            var repEvent = {
+            let repEvent = {
               bpm: bpm,
               confidence: (sensorContact || sensorContact === undefined)? 100 : 0,
               src: "bthrm"
@@ -159,7 +120,7 @@ exports.enable = () => {
             Bangle.emit("HRM_R", repEvent);
           }
 
-          var newEvent = {
+          let newEvent = {
             bpm: bpm
           };
 
@@ -177,6 +138,7 @@ exports.enable = () => {
         //Body sensor location
         handler: function(dv){
           if (!lastReceivedData["0x180d"]) lastReceivedData["0x180d"] = {};
+          log("Got location", dv);
           lastReceivedData["0x180d"]["0x2a38"] = parseInt(dv.buffer, 10);
         }
       },
@@ -184,26 +146,27 @@ exports.enable = () => {
         //Battery
         handler: function (dv){
           if (!lastReceivedData["0x180f"]) lastReceivedData["0x180f"] = {};
+          log("Got battery", dv);
           lastReceivedData["0x180f"]["0x2a19"] = dv.getUint8(0);
         }
       }
     };
 
-    var device;
-    var gatt;
-    var characteristics = [];
-    var blockInit = false;
-    var currentRetryTimeout;
-    var initialRetryTime = 40;
-    var maxRetryTime = 60000;
-    var retryTime = initialRetryTime;
-
-    var connectSettings = {
-      minInterval: 7.5,
-      maxInterval: 1500
+    let lastReceivedData={
     };
 
-    var waitingPromise = function(timeout) {
+    let bpmTimeout;
+
+    let device;
+    let gatt;
+    let characteristics = [];
+    let blockInit = false;
+    let currentRetryTimeout;
+    let initialRetryTime = 40;
+    let maxRetryTime = 60000;
+    let retryTime = initialRetryTime;
+
+    let waitingPromise = function(timeout) {
       return new Promise(function(resolve){
         log("Start waiting for " + timeout);
         setTimeout(()=>{
@@ -240,7 +203,7 @@ exports.enable = () => {
       };
     }
 
-    var clearRetryTimeout = function(resetTime) {
+    let clearRetryTimeout = function(resetTime) {
       if (currentRetryTimeout){
         log("Clearing timeout " + currentRetryTimeout);
         clearTimeout(currentRetryTimeout);
@@ -252,12 +215,12 @@ exports.enable = () => {
       }
     };
 
-    var retry = function() {
+    let retry = function() {
       log("Retry");
 
       if (!currentRetryTimeout && !powerdownRequested){
 
-        var clampedTime = retryTime < 100 ? 100 : retryTime;
+        let clampedTime = retryTime < 100 ? 100 : retryTime;
 
         log("Set timeout for retry as " + clampedTime);
         clearRetryTimeout();
@@ -276,20 +239,21 @@ exports.enable = () => {
       }
     };
 
-    var buzzing = false;
-    var onDisconnect = function(reason) {
+    let initialDisconnects = true;
+    let buzzing = false;
+    let onDisconnect = function(reason) {
       log("Disconnect: " + reason);
       log("GATT", gatt);
       log("Characteristics", characteristics);
 
-      var retryTimeResetNeeded = true;
+      let retryTimeResetNeeded = true;
       retryTimeResetNeeded &= reason != "Connection Timeout";
       retryTimeResetNeeded &= reason != "No device found matching filters";
       clearRetryTimeout(retryTimeResetNeeded);
       supportedCharacteristics["0x2a37"].active = false;
       if (!powerdownRequested) startFallback();
       blockInit = false;
-      if (settings.warnDisconnect && !buzzing){
+      if (settings.warnDisconnect && !buzzing && !initialDisconnects){
         buzzing = true;
         Bangle.buzz(500,0.3).then(()=>waitingPromise(4500)).then(()=>{buzzing = false;});
       }
@@ -298,9 +262,9 @@ exports.enable = () => {
       }
     };
 
-    var createCharacteristicPromise = function(newCharacteristic) {
+    let createCharacteristicPromise = function(newCharacteristic) {
       log("Create characteristic promise", newCharacteristic);
-      var result = Promise.resolve();
+      let result = Promise.resolve();
       // For values that can be read, go ahead and read them, even if we might be notified in the future
       // Allows for getting initial state of infrequently updating characteristics, like battery
       if (newCharacteristic.readValue){
@@ -316,58 +280,29 @@ exports.enable = () => {
       if (newCharacteristic.properties.notify){
         result = result.then(()=>{
           log("Starting notifications", newCharacteristic);
-          var startPromise = newCharacteristic.startNotifications().then(()=>log("Notifications started", newCharacteristic));
-          
-          log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
-          startPromise = startPromise.then(()=>{
-            log("Wait after connect");
-            return waitingPromise(settings.gracePeriodNotification);
-          });
-          
+          let startPromise = newCharacteristic.startNotifications().then(()=>log("Notifications started", newCharacteristic));
+
+          if (settings.gracePeriodNotification){
+            log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
+            startPromise = startPromise.then(()=>{
+              log("Wait after connect");
+              return waitingPromise(settings.gracePeriodNotification);
+            });
+          }
           return startPromise;
         });
       }
       return result.then(()=>log("Handled characteristic", newCharacteristic));
     };
 
-    var attachCharacteristicPromise = function(promise, characteristic) {
+    let attachCharacteristicPromise = function(promise, characteristic) {
       return promise.then(()=>{
         log("Handling characteristic:", characteristic);
         return createCharacteristicPromise(characteristic);
       });
     };
 
-    var createCharacteristicsPromise = function(newCharacteristics) {
-      log("Create characteristics promis ", newCharacteristics);
-      var result = Promise.resolve();
-      for (var c of newCharacteristics){
-        if (!supportedCharacteristics[c.uuid]) continue;
-        log("Supporting characteristic", c);
-        characteristics.push(c);
-        if (c.properties.notify){
-          addNotificationHandler(c);
-        }
-
-        result = attachCharacteristicPromise(result, c);
-      }
-      return result.then(()=>log("Handled characteristics"));
-    };
-
-    var createServicePromise = function(service) {
-      log("Create service promise", service);
-      var result = Promise.resolve();
-      result = result.then(()=>{
-        log("Handling service" + service.uuid);
-        return service.getCharacteristics().then((c)=>createCharacteristicsPromise(c));
-      });
-      return result.then(()=>log("Handled service" + service.uuid));
-    };
-
-    var attachServicePromise = function(promise, service) {
-      return promise.then(()=>createServicePromise(service));
-    };
-
-    var initBt = function () {
+    let initBt = function () {
       log("initBt with blockInit: " + blockInit);
       if (blockInit && !powerdownRequested){
         retry();
@@ -376,8 +311,8 @@ exports.enable = () => {
 
       blockInit = true;
 
-      var promise;
-      var filters;
+      let promise;
+      let filters;
 
       if (!device){
         if (settings.btid){
@@ -394,9 +329,13 @@ exports.enable = () => {
           onDisconnect(e);
           return;
         }
-        
+
         if (settings.gracePeriodRequest){
           log("Add " + settings.gracePeriodRequest + "ms grace period after request");
+          promise = promise.then((d)=>{
+            log("Wait after request");
+            return waitingPromise(settings.gracePeriodRequest).then(()=>Promise.resolve(d));
+          });
         }
 
         promise = promise.then((d)=>{
@@ -404,100 +343,42 @@ exports.enable = () => {
           d.on('gattserverdisconnected', onDisconnect);
           device = d;
         });
-
-        promise = promise.then(()=>{
-          log("Wait after request");
-          return waitingPromise(settings.gracePeriodRequest);
-        });
       } else {
         promise = Promise.resolve();
         log("Reuse device", device);
       }
 
       promise = promise.then(()=>{
-        if (gatt){
-          log("Reuse GATT", gatt);
-        } else {
-          log("GATT is new", gatt);
-          characteristics = [];
-          var cachedId = getCache().id;
-          if (device.id !== cachedId){
-            log("Device ID changed from " + cachedId + " to " + device.id + ", clearing cache");
-            clearCache();
-          }
-          var newCache = getCache();
-          newCache.id = device.id;
-          writeCache(newCache);
-          gatt = device.gatt;
-        }
-
+        gatt = device.gatt;
         return Promise.resolve(gatt);
       });
 
       promise = promise.then((gatt)=>{
         if (!gatt.connected){
           log("Connecting...");
-          var connectPromise = gatt.connect(connectSettings).then(function() {
+          let connectPromise = gatt.connect().then(function() {
             log("Connected.");
           });
-          log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
-          connectPromise = connectPromise.then(()=>{
-            log("Wait after connect");
-            return waitingPromise(settings.gracePeriodConnect);
-          });
+          if (settings.gracePeriodConnect){
+            log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
+            connectPromise = connectPromise.then(()=>{
+              log("Wait after connect");
+              return waitingPromise(settings.gracePeriodConnect);
+            });
+          }
           return connectPromise;
         } else {
           return Promise.resolve();
         }
       });
-      
-      if (settings.bonding){
-        promise = promise.then(() => {
-          log(JSON.stringify(gatt.getSecurityStatus()));
-          if (gatt.getSecurityStatus()['bonded']) {
-            log("Already bonded");
-            return Promise.resolve();
-          } else {
-            log("Start bonding");
-            return gatt.startBonding()
-              .then(() => log("Security status" + gatt.getSecurityStatus()));
-          }
-        });
-      }
 
       promise = promise.then(()=>{
-        if (!characteristics || characteristics.length === 0){
+        if (!characteristics || characteristics.length == 0){
           characteristics = characteristicsFromCache(device);
         }
-      });
-
-      promise = promise.then(()=>{
-        var characteristicsPromise = Promise.resolve();
-        if (characteristics.length === 0){
-          characteristicsPromise = characteristicsPromise.then(()=>{
-            log("Getting services");
-            return gatt.getPrimaryServices();
-          });
-
-          characteristicsPromise = characteristicsPromise.then((services)=>{
-            log("Got services", services);
-            var result = Promise.resolve();
-            for (var service of services){
-              if (!(supportedServices.includes(service.uuid))) continue;
-              log("Supporting service", service.uuid);
-              result = attachServicePromise(result, service);
-            }
-            log("Add " + settings.gracePeriodService + "ms grace period after services");
-            result = result.then(()=>{
-              log("Wait after services");
-              return waitingPromise(settings.gracePeriodService);
-            });
-            return result;
-          });
-        } else {
-          for (var characteristic of characteristics){
-            characteristicsPromise = attachCharacteristicPromise(characteristicsPromise, characteristic, true);
-          }
+        let characteristicsPromise = Promise.resolve();
+        for (let characteristic of characteristics){
+          characteristicsPromise = attachCharacteristicPromise(characteristicsPromise, characteristic, true);
         }
 
         return characteristicsPromise;
@@ -505,7 +386,7 @@ exports.enable = () => {
 
       return promise.then(()=>{
         log("Connection established, waiting for notifications");
-        characteristicsToCache(characteristics);
+        initialDisconnects = false;
         clearRetryTimeout(true);
       }).catch((e) => {
         characteristics = [];
@@ -514,7 +395,7 @@ exports.enable = () => {
       });
     };
 
-    var powerdownRequested = false;
+    let powerdownRequested = false;
 
     Bangle.setBTHRMPower = function(isOn, app) {
       // Do app power handling
@@ -526,6 +407,7 @@ exports.enable = () => {
       isOn = Bangle._PWR.BTHRM.length;
       // so now we know if we're really on
       if (isOn) {
+        initialDisconnects = true;
         powerdownRequested = false;
         switchFallback();
         if (!Bangle.isBTHRMConnected()) initBt();
@@ -598,17 +480,18 @@ exports.enable = () => {
             Bangle.setBTHRMPower(0);
             if (!isOn) stopFallback();
           }
+          return Bangle.isBTHRMOn() || Bangle.isHRMOn();
         }
         if ((settings.enabled && !settings.replace) || !settings.enabled){
-          Bangle.origSetHRMPower(isOn, app);
+          return Bangle.origSetHRMPower(isOn, app);
         }
       };
     }
 
-    var fallbackActive = false;
-    var inSwitch = false;
+    let fallbackActive = false;
+    let inSwitch = false;
 
-    var stopFallback = function(){
+    let stopFallback = function(){
       if (fallbackActive){
         Bangle.origSetHRMPower(0, "bthrm_fallback");
         fallbackActive = false;
@@ -616,7 +499,7 @@ exports.enable = () => {
       }
     };
 
-    var startFallback = function(){
+    let startFallback = function(){
       if (!fallbackActive && settings.allowFallback) {
         fallbackActive = true;
         Bangle.origSetHRMPower(1, "bthrm_fallback");
@@ -624,7 +507,7 @@ exports.enable = () => {
       }
     };
 
-    var switchFallback = function() {
+    let switchFallback = function() {
       log("Check falling back to HRM");
       if (!inSwitch){
         inSwitch = true;
@@ -640,8 +523,8 @@ exports.enable = () => {
     if (settings.replace){
       log("Replace HRM event");
       if (Bangle._PWR && Bangle._PWR.HRM){
-        for (var i = 0; i < Bangle._PWR.HRM.length; i++){
-          var app = Bangle._PWR.HRM[i];
+        for (let i = 0; i < Bangle._PWR.HRM.length; i++){
+          let app = Bangle._PWR.HRM[i];
           log("Moving app " + app);
           Bangle.origSetHRMPower(0, app);
           Bangle.setBTHRMPower(1, app);
diff --git a/apps/bthrm/metadata.json b/apps/bthrm/metadata.json
index 343df40a1..56e1beffd 100644
--- a/apps/bthrm/metadata.json
+++ b/apps/bthrm/metadata.json
@@ -2,7 +2,7 @@
   "id": "bthrm",
   "name": "Bluetooth Heart Rate Monitor",
   "shortName": "BT HRM",
-  "version": "0.18",
+  "version": "0.19",
   "description": "Overrides Bangle.js's build in heart rate monitor with an external Bluetooth one.",
   "icon": "app.png",
   "screenshots": [{"url":"screen.png"}],
diff --git a/apps/bthrm/recorder.js b/apps/bthrm/recorder.js
index c3019b465..ec880d553 100644
--- a/apps/bthrm/recorder.js
+++ b/apps/bthrm/recorder.js
@@ -26,11 +26,11 @@
       },
       start : () => {
         Bangle.on('BTHRM', onHRM);
-        if (Bangle.setBTRHMPower) Bangle.setBTHRMPower(1,"recorder");
+        if (Bangle.setBTHRMPower) Bangle.setBTHRMPower(1,"recorder");
       },
       stop : () => {
         Bangle.removeListener('BTHRM', onHRM);
-        if (Bangle.setBTRHMPower) Bangle.setBTHRMPower(0,"recorder");
+        if (Bangle.setBTHRMPower) Bangle.setBTHRMPower(0,"recorder");
       },
       draw : (x,y) => g.setColor((Bangle.isBTHRMActive && Bangle.isBTHRMActive())?"#00f":"#88f").drawImage(atob("DAwBAAAAMMeef+f+f+P8H4DwBgAA"),x,y)
     };
diff --git a/apps/bthrm/settings.js b/apps/bthrm/settings.js
index 459ed29fc..68e958db8 100644
--- a/apps/bthrm/settings.js
+++ b/apps/bthrm/settings.js
@@ -1,6 +1,6 @@
 (function(back) {
   function writeSettings(key, value) {
-    var s = require('Storage').readJSON(FILE, true) || {};
+    let s = require('Storage').readJSON(FILE, true) || {};
     s[key] = value;
     require('Storage').writeJSON(FILE, s);
     readSettings();
@@ -13,10 +13,14 @@
     );
   }
 
-  var FILE="bthrm.json";
-  var settings;
+  let FILE="bthrm.json";
+  let settings;
   readSettings();
 
+  let log = ()=>{};
+  if (settings.debuglog)
+    log = print;
+
   function applyCustomSettings(){
     writeSettings("enabled",true);
     writeSettings("replace",settings.custom_replace);
@@ -26,7 +30,7 @@
   }
 
   function buildMainMenu(){
-    var mainmenu = {
+    let mainmenu = {
       '': { 'title': 'Bluetooth HRM' },
       '< Back': back,
       'Mode': {
@@ -63,12 +67,13 @@
     };
 
     if (settings.btname || settings.btid){
-      var name = "Clear " + (settings.btname || settings.btid);
+      let name = "Clear " + (settings.btname || settings.btid);
       mainmenu[name] = function() {
       E.showPrompt("Clear current device?").then((r)=>{
           if (r) {
             writeSettings("btname",undefined);
             writeSettings("btid",undefined);
+            writeSettings("cache", undefined);
           }
           E.showMenu(buildMainMenu());
         });
@@ -81,7 +86,7 @@
     return mainmenu;
   }
 
-  var submenu_debug = {
+  let submenu_debug = {
     '' : { title: "Debug"},
     '< Back': function() { E.showMenu(buildMainMenu()); },
     'Alert on disconnect': {
@@ -111,11 +116,135 @@
     'Grace periods': function() { E.showMenu(submenu_grace); }
   };
 
+  let supportedServices = [
+    "0x180d", // Heart Rate
+    "0x180f", // Battery
+  ];
+
+  let supportedCharacteristics = [
+    "0x2a37", // Heart Rate
+    "0x2a38", // Body sensor location
+    "0x2a19", // Battery
+  ];
+
+  var characteristicsToCache = function(characteristics) {
+    log("Cache characteristics");
+    let cache = {};
+    if (!cache.characteristics) cache.characteristics = {};
+    for (var c of characteristics){
+      //"handle_value":16,"handle_decl":15
+      log("Saving handle " + c.handle_value + " for characteristic: ", c.uuid);
+      cache.characteristics[c.uuid] = {
+        "handle": c.handle_value,
+        "uuid": c.uuid,
+        "notify": c.properties.notify,
+        "read": c.properties.read
+      };
+    }
+    writeSettings("cache", cache);
+  };
+
+  let createCharacteristicPromise = function(newCharacteristic) {
+    log("Create characteristic promise", newCharacteristic.uuid);
+    return Promise.resolve().then(()=>log("Handled characteristic", newCharacteristic.uuid));
+  };
+
+  let attachCharacteristicPromise = function(promise, characteristic) {
+    return promise.then(()=>{
+      log("Handling characteristic:", characteristic.uuid);
+      return createCharacteristicPromise(characteristic);
+    });
+  };
+
+  let characteristics;
+
+  let createCharacteristicsPromise = function(newCharacteristics) {
+    log("Create characteristics promise ", newCharacteristics.length);
+    let result = Promise.resolve();
+    for (let c of newCharacteristics){
+      if (!supportedCharacteristics.includes(c.uuid)) continue;
+      log("Supporting characteristic", c.uuid);
+      characteristics.push(c);
+
+      result = attachCharacteristicPromise(result, c);
+    }
+    return result.then(()=>log("Handled characteristics"));
+  };
+
+  let createServicePromise = function(service) {
+    log("Create service promise", service.uuid);
+    let result = Promise.resolve();
+    result = result.then(()=>{
+      log("Handling service", service.uuid);
+      return service.getCharacteristics().then((c)=>createCharacteristicsPromise(c));
+    });
+    return result.then(()=>log("Handled service", service.uuid));
+  };
+
+  let attachServicePromise = function(promise, service) {
+    return promise.then(()=>createServicePromise(service));
+  };
+
+  function cacheDevice(deviceId){
+    let promise;
+    let filters;
+    let gatt;
+    characteristics = [];
+    filters = [{ id: deviceId }];
+
+    log("Requesting device with filters", filters);
+    promise = NRF.requestDevice({ filters: filters, active: settings.active });
+
+    promise = promise.then((d)=>{
+      log("Got device", d);
+      gatt = d.gatt;
+      log("Connecting...");
+      return gatt.connect().then(function() {
+        log("Connected.");
+      });
+    });
+
+    if (settings.bonding){
+      promise = promise.then(() => {
+        log(JSON.stringify(gatt.getSecurityStatus()));
+        if (gatt.getSecurityStatus().bonded) {
+          log("Already bonded");
+          return Promise.resolve();
+        } else {
+          log("Start bonding");
+          return gatt.startBonding()
+            .then(() => log("Security status after bonding" + gatt.getSecurityStatus()));
+        }
+      });
+    }
+
+    promise = promise.then(()=>{
+      log("Getting services");
+      return gatt.getPrimaryServices();
+    });
+
+    promise = promise.then((services)=>{
+      log("Got services", services.length);
+      let result = Promise.resolve();
+      for (let service of services){
+        if (!(supportedServices.includes(service.uuid))) continue;
+        log("Supporting service", service.uuid);
+        result = attachServicePromise(result, service);
+      }
+      return result;
+    });
+
+    return promise.then(()=>{
+      log("Connection established, saving cache");
+      characteristicsToCache(characteristics);
+    });
+  }
+
   function createMenuFromScan(){
     E.showMenu();
     E.showMessage("Scanning for 4 seconds");
 
-    var submenu_scan = {
+    let submenu_scan = {
       '< Back': function() { E.showMenu(buildMainMenu()); }
     };
     NRF.findDevices(function(devices) {
@@ -126,18 +255,41 @@
         return;
       } else {
         devices.forEach((d) => {
-          print("Found device", d);
-          var shown = (d.name || d.id.substr(0, 17));
+          log("Found device", d);
+          let shown = (d.name || d.id.substr(0, 17));
           submenu_scan[shown] = function () {
-            E.showPrompt("Set " + shown + "?").then((r) => {
+            E.showPrompt("Connect to\n" + shown + "?", {title: "Pairing"}).then((r) => {
               if (r) {
-                writeSettings("btid", d.id);
-                // Store the name for displaying later. Will connect by ID
-                if (d.name) {
-                  writeSettings("btname", d.name);
-                }
+                E.showMessage("Connecting...", {img:require("Storage").read("bthrm.img")});
+                let count = 0;
+                const successHandler = ()=>{
+                  E.showPrompt("Success!", {
+                    img:require("Storage").read("bthrm.img"),
+                    buttons: { "OK":true }
+                  }).then(()=>{
+                  writeSettings("btid", d.id);
+                  // Store the name for displaying later. Will connect by ID
+                  if (d.name) {
+                    writeSettings("btname", d.name);
+                  }
+                    E.showMenu(buildMainMenu());
+                  });
+                };
+                const errorHandler = (e)=>{
+                  count++;
+                  log("ERROR", e);
+                  if (count <= 10){
+                    E.showMessage("Error during caching\nRetry " + count + "/10", e);
+                    return cacheDevice(d.id).then(successHandler).catch(errorHandler);
+                  } else {
+                    E.showAlert("Error during caching", e).then(()=>{
+                      E.showMenu(buildMainMenu());
+                    });
+                  }
+                };
+
+                return cacheDevice(d.id).then(successHandler).catch(errorHandler);
               }
-              E.showMenu(buildMainMenu());
             });
           };
         });
@@ -146,7 +298,7 @@
     }, { timeout: 4000, active: true, filters: [{services: [ "180d" ]}]});
   }
 
-  var submenu_custom = {
+  let submenu_custom = {
     '' : { title: "Custom mode"},
     '< Back': function() { E.showMenu(buildMainMenu()); },
     'Replace HRM': {
@@ -183,7 +335,7 @@
     },
   };
 
-  var submenu_grace = {
+  let submenu_grace = {
     '' : { title: "Grace periods"},
     '< Back': function() { E.showMenu(submenu_debug); },
     'Request': {
@@ -215,16 +367,6 @@
       onchange: v => {
         writeSettings("gracePeriodNotification",v);
       }
-    },
-    'Service': {
-      value: settings.gracePeriodService,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodService",v);
-      }
     }
   };
 
diff --git a/apps/buffgym/.eslintrc.json b/apps/buffgym/.eslintrc.json
deleted file mode 100644
index aaae0a0cb..000000000
--- a/apps/buffgym/.eslintrc.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es6": true
-    },
-    "extends": "eslint:recommended",
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018
-    },
-    "rules": {
-        "indent": [
-            "error",
-            2,
-            { "SwitchCase": 1 }
-        ],
-        "linebreak-style": [
-            "error",
-            "windows"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ]
-        /*,
-        "semi": [
-            "error",
-            "always"
-        ]*/
-    }
-}
\ No newline at end of file
diff --git a/apps/cards/ChangeLog b/apps/cards/ChangeLog
index e7e13b8e7..b35947cda 100644
--- a/apps/cards/ChangeLog
+++ b/apps/cards/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Hiding widgets while showing the code
 0.03: Added option to use max brightness when showing code
 0.04: Minor code improvements
+0.05: Add EAN & UPC codes
diff --git a/apps/cards/app.js b/apps/cards/app.js
index c0bacc918..45e72831c 100644
--- a/apps/cards/app.js
+++ b/apps/cards/app.js
@@ -82,16 +82,17 @@ function printSquareCode(binary, size) {
   }
 }
 function printLinearCode(binary) {
+  var padding = 5;
   var yFrom = 15;
   var yTo = 28;
-  var width = g.getWidth()/binary.length;
+  var width = (g.getWidth()-(2*padding))/binary.length;
   for(var b = 0; b < binary.length; b++){
     var x = b * width;
     if(binary[b] === "1"){
-      g.setColor(BLACK).fillRect({x:x, y:yFrom, w:width, h:g.getHeight() - (yTo+yFrom)});
+      g.setColor(BLACK).fillRect({x:x+padding, y:yFrom, w:width, h:g.getHeight() - (yTo+yFrom)});
     }
     else if(binary[b]){
-      g.setColor(WHITE).fillRect({x:x, y:yFrom, w:width, h:g.getHeight() - (yTo+yFrom)});
+      g.setColor(WHITE).fillRect({x:x+padding, y:yFrom, w:width, h:g.getHeight() - (yTo+yFrom)});
     }
   }
 }
@@ -132,6 +133,42 @@ function showCode(card) {
       printLinearCode(code.encode().data);
       break;
     }
+    case "EAN_8": {
+      g.setFont("Vector:20");
+      g.setFontAlign(0,1).setColor(BLACK);
+      g.drawString(card.value, g.getWidth()/2, g.getHeight());
+      const EAN8 = require("cards.EAN8.js");
+      let code = new EAN8(card.value, {});
+      printLinearCode(code.encode().data);
+      break;
+    }
+    case "EAN_13": {
+      g.setFont("Vector:20");
+      g.setFontAlign(0,1).setColor(BLACK);
+      g.drawString(card.value, g.getWidth()/2, g.getHeight());
+      const EAN13 = require("cards.EAN13.js");
+      let code = new EAN13(card.value, {});
+      printLinearCode(code.encode().data);
+      break;
+    }
+    case "UPC_A": {
+      g.setFont("Vector:20");
+      g.setFontAlign(0,1).setColor(BLACK);
+      g.drawString(card.value, g.getWidth()/2, g.getHeight());
+      const UPC = require("cards.UPC.js");
+      let code = new UPC.UPC(card.value, {});
+      printLinearCode(code.encode().data);
+      break;
+    }
+    case "UPC_E": {
+      g.setFont("Vector:20");
+      g.setFontAlign(0,1).setColor(BLACK);
+      g.drawString(card.value, g.getWidth()/2, g.getHeight());
+      const UPCE = require("cards.UPCE.js");
+      let code = new UPCE(card.value, {});
+      printLinearCode(code.encode().data);
+      break;
+    }
     default:
       g.clear(true);
       g.setFont("Vector:30");
diff --git a/apps/cards/metadata.json b/apps/cards/metadata.json
index 4bc3c9ae1..c8d19a375 100644
--- a/apps/cards/metadata.json
+++ b/apps/cards/metadata.json
@@ -1,12 +1,13 @@
 {
   "id": "cards",
   "name": "Cards",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Display loyalty cards",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot_cards_overview.png"}, {"url":"screenshot_cards_card1.png"}, {"url":"screenshot_cards_card2.png"}, {"url":"screenshot_cards_barcode.png"}, {"url":"screenshot_cards_qrcode.png"}],
   "tags": "cards",
   "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
   "readme": "README.md",
   "storage": [
     {"name":"cards.app.js","url":"app.js"},
@@ -15,6 +16,12 @@
     {"name":"cards.qrcode.js","url":"qrcode.js"},
     {"name":"cards.codabar.js","url":"codabar.js"},
     {"name":"cards.code39.js","url":"code39.js"},
+    {"name":"cards.EAN.js","url":"EAN.js"},
+    {"name":"cards.EAN8.js","url":"EAN8.js"},
+    {"name":"cards.EAN13.js","url":"EAN13.js"},
+    {"name":"cards.UPC.js","url":"UPC.js"},
+    {"name":"cards.UPCE.js","url":"UPCE.js"},
+    {"name":"cards.encode.js","url":"encode.js"},
     {"name":"cards.img","url":"app-icon.js","evaluate":true}
   ],
   "data": [{"name":"cards.settings.json"}]
diff --git a/apps/chargent/ChangeLog b/apps/chargent/ChangeLog
index d7081ecfb..349618315 100644
--- a/apps/chargent/ChangeLog
+++ b/apps/chargent/ChangeLog
@@ -3,3 +3,5 @@
 0.03: Added threshold
 0.04: Added notification
 0.05: Fixed boot
+0.06: Allow tap to silence notification/buzzing
+0.07: Fix notification-tap silencing and notification length
diff --git a/apps/chargent/README.md b/apps/chargent/README.md
index db93615a6..5fd486217 100644
--- a/apps/chargent/README.md
+++ b/apps/chargent/README.md
@@ -6,10 +6,12 @@ The first stage of charging Li-ion ends at ~80% capacity when the charge voltage
 
 This app has no UI and no configuration. To disable the app, you have to uninstall it.
 
+Tap the charged notification to prevent buzzing for this charging session.
+
 New in v0.03: before the very first buzz, the average value after the peak is written to chargent.json and used as threshold for future charges. This reduces the time spent in the second charge stage.
 
 Side notes
 - Full capacity is reached after charge current drops to an insignificant level. This is quite some time after charge voltage reached its peak / `E.getBattery()` returns 100.
 - This app starts buzzing some time after `E.getBattery()` returns 100 (~15min on my watch), and at least 5min after the peak to account for noise.
 
-\* according to https://batteryuniversity.com/article/bu-409-charging-lithium-ion assuming similar characteristics and readouts from pin `D30` approximate charge voltage
\ No newline at end of file
+\* according to https://batteryuniversity.com/article/bu-409-charging-lithium-ion assuming similar characteristics and readouts from pin `D30` approximate charge voltage
diff --git a/apps/chargent/boot.js b/apps/chargent/boot.js
index c8fd4f930..42c384711 100644
--- a/apps/chargent/boot.js
+++ b/apps/chargent/boot.js
@@ -24,7 +24,8 @@
               lim = sum / cnt;
               require('Storage').writeJSON('chargent.json', {limit: lim});
             }
-            require('notify').show({id: 'chargent', title: 'Fully charged'});
+            const onHide = () => { if(id) id = clearInterval(id) };
+            require('notify').show({id: 'chargent', title: 'Charged', onHide });
             // TODO ? customizable
             Bangle.buzz(500);
             setTimeout(() => Bangle.buzz(500), 1000);
diff --git a/apps/chargent/metadata.json b/apps/chargent/metadata.json
index d43493ada..75366ff59 100644
--- a/apps/chargent/metadata.json
+++ b/apps/chargent/metadata.json
@@ -1,6 +1,6 @@
 { "id": "chargent",
   "name": "Charge Gently",
-  "version": "0.05",
+  "version": "0.07",
   "description": "When charging, reminds you to disconnect the watch to prolong battery life.",
   "icon": "icon.png",
   "type": "bootloader",
diff --git a/apps/clkinfocal/ChangeLog b/apps/clkinfocal/ChangeLog
index 815c197c4..ccb73b648 100644
--- a/apps/clkinfocal/ChangeLog
+++ b/apps/clkinfocal/ChangeLog
@@ -1,2 +1,5 @@
 0.01: New App!
 0.02: added settings options to change date format
+0.03: Remove un-needed font requirement, now outputs transparent image
+0.04: Fix image after 0.03 regression
+0.05: Remove duplicated day in calendar when format setting is 'dd MMM'
\ No newline at end of file
diff --git a/apps/clkinfocal/clkinfo.js b/apps/clkinfocal/clkinfo.js
index d4e7b0efc..dc93ddd0e 100644
--- a/apps/clkinfocal/clkinfo.js
+++ b/apps/clkinfocal/clkinfo.js
@@ -1,13 +1,11 @@
 (function() {
-  require("Font4x8Numeric").add(Graphics);
-
   var settings = require("Storage").readJSON("clkinfocal.json",1)||{};
   settings.fmt = settings.fmt||"DDD";
-  
+
   var getDateString = function(dt) {
     switch(settings.fmt) {
     case "dd MMM":
-      return '' + dt.getDate() + ' ' + require("locale").month(dt,1).toUpperCase();
+      return require("locale").month(dt,1).toUpperCase();
     case "DDD dd":
       return require("locale").dow(dt,1).toUpperCase() + ' ' + dt.getDate();
     default: // DDD
@@ -22,6 +20,7 @@
         get : () => {
           let d = new Date();
           let g = Graphics.createArrayBuffer(24,24,1,{msb:true});
+          g.transparent = 0;
           g.drawImage(atob("FhgBDADAMAMP/////////////////////8AADwAAPAAA8AADwAAPAAA8AADwAAPAAA8AADwAAPAAA8AADwAAP///////"),1,0);
           g.setFont("6x15").setFontAlign(0,0).drawString(d.getDate(),11,17);
           return {
diff --git a/apps/clkinfocal/metadata.json b/apps/clkinfocal/metadata.json
index a4fcc85ee..71dc811e9 100644
--- a/apps/clkinfocal/metadata.json
+++ b/apps/clkinfocal/metadata.json
@@ -1,6 +1,6 @@
 { "id": "clkinfocal",
   "name": "Calendar Clockinfo",
-  "version":"0.02",
+  "version":"0.05",
   "description": "For clocks that display 'clockinfo' (messages that can be cycled through using the clock_info module) this displays the day of the month in the icon, and the weekday. There is also a settings menu to select the format of the text",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/clkinfogps/clkinfo.js b/apps/clkinfogps/clkinfo.js
index ed2fc721a..7db9bbdae 100644
--- a/apps/clkinfogps/clkinfo.js
+++ b/apps/clkinfogps/clkinfo.js
@@ -91,7 +91,7 @@
   };
 
   var info = {
-    name: "Gps",
+    name: "GPS",
     items: [
       {
         name: "gridref",
diff --git a/apps/clkinfogps/geotools.js b/apps/clkinfogps/geotools.js
index d251c1f95..2f25c8453 100644
--- a/apps/clkinfogps/geotools.js
+++ b/apps/clkinfogps/geotools.js
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * A module of Geo functions for use with gps fixes
  *
  * let geo = require("geotools");
@@ -71,7 +71,7 @@ OsGridRef.latLongToOsGrid = function(point) {
  *
  */
 function to_map_ref(digits, easting, northing) {
-  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`); // eslint-disable-line comma-spacing
+  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`);
 
   let e = easting;
   let n = northing;
@@ -108,7 +108,7 @@ function to_map_ref(digits, easting, northing) {
 }
 
 /**
- * 
+ *
  * Module exports section, example code below
  *
  * let geo = require("geotools");
diff --git a/apps/clock_info/ChangeLog b/apps/clock_info/ChangeLog
index 97e62e238..8276321ac 100644
--- a/apps/clock_info/ChangeLog
+++ b/apps/clock_info/ChangeLog
@@ -7,3 +7,7 @@
 0.06: When >1 clockinfo, swiping one back tries to ensure they don't display the same thing
 0.07: Developer tweak: clkinfo load errors are emitted
 0.08: Pass options to show(), hide() and run(), and add focus() and blur() item methods
+0.09: Save clkinfo settings on kill and remove
+0.10: Fix focus bug when changing focus between two clock infos
+0.11: Prepend swipe listener if possible
+0.12: Add drawFilledImage to allow drawing icons with a separately coloured middle
\ No newline at end of file
diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js
index d35ac5cf0..a9ca7de31 100644
--- a/apps/clock_info/lib.js
+++ b/apps/clock_info/lib.js
@@ -224,6 +224,13 @@ exports.addInteractive = function(menu, options) {
       options.menuB = b;
     }
   }
+  const save = () => {
+    // save the currently showing clock_info
+    const settings = exports.loadSettings();
+    settings.apps[appName] = {a:options.menuA, b:options.menuB};
+    require("Storage").writeJSON("clock_info.json",settings);
+  };
+  E.on("kill", save);
 
   if (options.menuA===undefined) options.menuA = 0;
   if (options.menuB===undefined) options.menuB = Math.min(exports.loadCount, menu[options.menuA].items.length)-1;
@@ -276,17 +283,13 @@ exports.addInteractive = function(menu, options) {
       oldMenuItem.removeAllListeners("draw");
       menuShowItem(menu[options.menuA].items[options.menuB]);
     }
-    // save the currently showing clock_info
-    let settings = exports.loadSettings();
-    settings.apps[appName] = {a:options.menuA,b:options.menuB};
-    require("Storage").writeJSON("clock_info.json",settings);
     // On 2v18+ firmware we can stop other event handlers from being executed since we handled this
     E.stopEventPropagation&&E.stopEventPropagation();
   }
-  Bangle.on("swipe",swipeHandler);
+  if (Bangle.prependListener) {Bangle.prependListener("swipe",swipeHandler);} else {Bangle.on("swipe",swipeHandler);}
   const blur = () => {
     options.focus=false;
-    delete Bangle.CLKINFO_FOCUS;
+    Bangle.CLKINFO_FOCUS--;
     const itm = menu[options.menuA].items[options.menuB];
     let redraw = true;
     if (itm.blur && itm.blur(options) === false)
@@ -295,7 +298,7 @@ exports.addInteractive = function(menu, options) {
   };
   const focus = () => {
     let redraw = true;
-    Bangle.CLKINFO_FOCUS=true;
+    Bangle.CLKINFO_FOCUS = (0 | Bangle.CLKINFO_FOCUS) + 1;
     if (!options.focus) {
       options.focus=true;
       const itm = menu[options.menuA].items[options.menuB];
@@ -333,10 +336,12 @@ exports.addInteractive = function(menu, options) {
   menuShowItem(menu[options.menuA].items[options.menuB]);
   // return an object with info that can be used to remove the info
   options.remove = function() {
+    save();
+    E.removeListener("kill", save);
     Bangle.removeListener("swipe",swipeHandler);
     if (touchHandler) Bangle.removeListener("touch",touchHandler);
     if (lockHandler) Bangle.removeListener("lock", lockHandler);
-    delete Bangle.CLKINFO_FOCUS;
+    Bangle.CLKINFO_FOCUS--;
     menuHideItem(menu[options.menuA].items[options.menuB]);
     exports.loadCount--;
     delete exports.clockInfos[options.index];
@@ -366,6 +371,46 @@ exports.addInteractive = function(menu, options) {
   return options;
 };
 
+/* clockinfos usually return a 24x24 image. This draws that image but
+recolors it such that it is transparent, with the middle of the image as background
+and the image itself as foreground. options is passed to g.drawImage */
+exports.drawFilledImage = function(img,x,y,options) {
+  if (!img) return;
+  if (!g.floodFill/*2v18+*/) return g.drawImage(img,x,y,options);
+  let gfx = exports.imgGfx;
+  if (!gfx) {
+    gfx = exports.imgGfx = Graphics.createArrayBuffer(26, 26, 2, {msb:true});
+    gfx.transparent = 3;
+    gfx.palette = new Uint16Array([g.theme.bg, g.theme.fg, g.toColor("#888"), g.toColor("#888")]);
+  }
+  /* img is (usually) a black and white transparent image. But we really would like the bits in
+  the middle of it to be white. So what we do is we draw a slightly bigger rectangle in white,
+  draw the image, and then flood-fill the rectangle back to the background color. floodFill
+  was only added in 2v18 so we have to check for it and fallback if not. */
+  gfx.clear(1).setColor(1).drawImage(img, 1,1).floodFill(0,0,3);
+  var scale = (options && options.scale) || 1;
+  return g.drawImage(gfx, x-scale,y-scale,options);
+};
+
+/* clockinfos usually return a 24x24 image. This creates a 26x26 gfx of the image but
+recolors it such that it is transparent, with the middle and border of the image as background
+and the image itself as foreground. options is passed to g.drawImage */
+exports.drawBorderedImage = function(img,x,y,options) {
+  if (!img) return;
+  if (!g.floodFill/*2v18+*/) return g.drawImage(img,x,y,options);
+  let gfx = exports.imgGfxB;
+  if (!gfx) {
+    gfx = exports.imgGfxB = Graphics.createArrayBuffer(28, 28, 2, {msb:true});
+    gfx.transparent = 3;
+    gfx.palette = new Uint16Array([g.theme.bg, g.theme.fg, g.theme.bg/*border*/, g.toColor("#888")]);
+  }
+  gfx.clear(1).setColor(2).drawImage(img, 1,1).drawImage(img, 3,1).drawImage(img, 1,3).drawImage(img, 3,3); // border
+  gfx.setColor(1).drawImage(img, 2,2); // main image
+  gfx.floodFill(27,27,3); // flood fill edge to transparent
+  var o = ((options && options.scale) || 1)*2;
+  return g.drawImage(gfx, x-o,y-o,options);
+};
+
 // Code for testing (plots all elements from first list)
 /*
 g.clear();
diff --git a/apps/clock_info/metadata.json b/apps/clock_info/metadata.json
index 351425a8f..3d47c5062 100644
--- a/apps/clock_info/metadata.json
+++ b/apps/clock_info/metadata.json
@@ -1,11 +1,11 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.08",
+  "version":"0.12",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",
-  "tags": "clkinfo",
+  "tags": "clkinfo,clockinfo",
   "supports" : ["BANGLEJS2"],
   "provides_modules" : ["clock_info"],
   "readme": "README.md",
diff --git a/apps/clockcal/ChangeLog b/apps/clockcal/ChangeLog
index 5657bf26d..6780313ce 100644
--- a/apps/clockcal/ChangeLog
+++ b/apps/clockcal/ChangeLog
@@ -5,4 +5,6 @@
 0.05: Improved colors (connected vs disconnected)
 0.06: Tell clock widgets to hide.
 0.07: Convert Yes/No On/Off in settings to checkboxes
-0.08: Fixed typo in settings.js for DRAGDOWN to make option work
\ No newline at end of file
+0.08: Fixed typo in settings.js for DRAGDOWN to make option work
+0.09: You can now back out of the calendar using the button
+0.10: Fix linter warnings
diff --git a/apps/clockcal/README.md b/apps/clockcal/README.md
index d30205be0..bc05081ad 100644
--- a/apps/clockcal/README.md
+++ b/apps/clockcal/README.md
@@ -7,23 +7,24 @@ I know that it seems redundant because there already **is** a *time&cal*-app, bu
 |:--:|:-|
 |![locked screen](screenshot.png)|locked: triggers only one minimal update/min|
 |![unlocked screen](screenshot2.png)|unlocked: smaller clock, but with seconds|
-|![big calendar](screenshot3.png)|swipe up for big calendar, (up down to scroll, left/right to exit)|
+|![big calendar](screenshot3.png)|swipe up for big calendar<br>⬆️/⬇️ to scroll<br>  ⬅️/➡️ to exit|
 
 ## Configurable Features
 - Number of calendar rows (weeks)
-- Buzz on connect/disconnect (I know, this should be an extra widget, but for now, it is included)
+- Buzz on connect/disconnect (feel free to disable and use a widget)
 - Clock Mode (24h/12h). (No am/pm indicator)
 - First day of the week
 - Red Saturday/Sunday
 - Swipe/Drag gestures to launch features or apps.
 
-## Auto detects your message/music apps:
-- swiping down will search your files for an app with the string "message" in its filename and launch it. (configurable)
-- swiping right will search your files for an app with the string "music" in its filename and launch it. (configurable)
+## Integrated swipe launcher: (Configure in Settings)
+- ⬇️ (down) will search your files for an app with the string "**message**" 
+- ➡️ (right) will search your files for an app with the string "**music**" 
+- ⬅️ (left) will search your files for an app with the string "**agenda**"
+- ⬆️ (up) will show the **internal full calendar**
 
 ## Feedback
-The clock works for me in a 24h/MondayFirst/WeekendFree environment but is not well-tested with other settings.
-So if something isn't working, please tell me: https://github.com/foostuff/BangleApps/issues
+If something isn't working, please tell me: https://github.com/Stuff-etc/BangleApps/issues (I moved my github repo)
 
 ## Planned features:
  - Internal lightweight music control, because switching apps has a loading time.
diff --git a/apps/clockcal/app.js b/apps/clockcal/app.js
index 58ddd7ef5..185f2adea 100644
--- a/apps/clockcal/app.js
+++ b/apps/clockcal/app.js
@@ -24,15 +24,25 @@ const DEBUG = false;
 var state = "watch";
 var monthOffset = 0;
 
+// FIXME: These variables should maybe be defined inside relevant functions below. The linter complained they were not defined (i.e. they were added to global scope if I understand correctly).
+let dayInterval;
+let secondInterval;
+let minuteInterval;
+let newmonth;
+let bottomrightY;
+let bottomrightX;
+let rMonth;
+let dimSeconds;
+
 /*
  *   Calendar features
  */
 function drawFullCalendar(monthOffset) {
-    addMonths = function (_d, _am) {
-        var ay = 0, m = _d.getMonth(), y = _d.getFullYear();
+    const addMonths = function (_d, _am) {
+        let ay = 0, m = _d.getMonth(), y = _d.getFullYear();
         while ((m + _am) > 11) { ay++; _am -= 12; }
         while ((m + _am) < 0) { ay--; _am += 12; }
-        n = new Date(_d.getTime());
+        let n = new Date(_d.getTime());
         n.setMonth(m + _am);
         n.setFullYear(y + ay);
         return n;
@@ -45,10 +55,10 @@ function drawFullCalendar(monthOffset) {
     if (typeof dayInterval !== "undefined") clearTimeout(dayInterval);
     if (typeof secondInterval !== "undefined") clearTimeout(secondInterval);
     if (typeof minuteInterval !== "undefined") clearTimeout(minuteInterval);
-    d = addMonths(Date(), monthOffset);
-    tdy = Date().getDate() + "." + Date().getMonth();
+    var d = addMonths(Date(), monthOffset);
+    let tdy = Date().getDate() + "." + Date().getMonth();
     newmonth = false;
-    c_y = 0;
+    let c_y = 0;
     g.reset();
     g.setBgColor(0);
     g.clear();
@@ -60,8 +70,8 @@ function drawFullCalendar(monthOffset) {
     rD.setDate(rD.getDate() - dow);
     var rDate = rD.getDate();
     bottomrightY = c_y - 3;
-    clrsun = s.REDSUN ? '#f00' : '#fff';
-    clrsat = s.REDSUN ? '#f00' : '#fff';
+    let clrsun = s.REDSUN ? '#f00' : '#fff';
+    let clrsat = s.REDSUN ? '#f00' : '#fff';
     var fg = [clrsun, '#fff', '#fff', '#fff', '#fff', '#fff', clrsat];
     for (var y = 1; y <= 11; y++) {
         bottomrightY += CELL_H;
@@ -90,7 +100,7 @@ function caldrawMonth(rDate, c, m, rD) {
     g.setColor(c);
     g.setFont("Vector", 18);
     g.setFontAlign(-1, 1, 1);
-    drawyear = ((rMonth % 11) == 0) ? String(rD.getFullYear()).substr(-2) : "";
+    let drawyear = ((rMonth % 11) == 0) ? String(rD.getFullYear()).substr(-2) : "";
     g.drawString(m + drawyear, bottomrightX, bottomrightY - CELL_H, 1);
     newmonth = false;
 }
@@ -124,7 +134,7 @@ function drawMinutes() {
     var d = new Date();
     var hours = s.MODE24 ? d.getHours().toString().padStart(2, ' ') : ((d.getHours() + 24) % 12 || 12).toString().padStart(2, ' ');
     var minutes = d.getMinutes().toString().padStart(2, '0');
-    var textColor = NRF.getSecurityStatus().connected ? '#99f' : '#fff';
+    var textColor = NRF.getSecurityStatus().connected ? '#fff' : '#f00';
     var size = 50;
     var clock_x = (w - 20) / 2;
     if (dimSeconds) {
@@ -156,7 +166,7 @@ function drawSeconds() {
 }
 
 function drawWatch() {
-    if (DEBUG) console.log("CALENDAR");
+    if (DEBUG) console.log("DRAWWATCH");
     monthOffset = 0;
     state = "watch";
     var d = new Date();
@@ -197,6 +207,7 @@ function drawWatch() {
     if (DEBUG) console.log("Next Day:" + (nextday / 3600));
     if (typeof dayInterval !== "undefined") clearTimeout(dayInterval);
     dayInterval = setTimeout(drawWatch, nextday * 1000);
+    if (DEBUG) console.log("ended DRAWWATCH. next refresh in " + nextday + "s");
 }
 
 function BTevent() {
@@ -211,8 +222,12 @@ function action(a) {
     g.reset();
     if (typeof secondInterval !== "undefined") clearTimeout(secondInterval);
     if (DEBUG) console.log("action:" + a);
+    state = "unknown";
+    console.log("state -> unknown");
+    let l;
     switch (a) {
         case "[ignore]":
+            drawWatch();
             break;
         case "[calend.]":
             drawFullCalendar();
@@ -229,6 +244,12 @@ function action(a) {
                 load(l[0]);
             } else E.showAlert("Message app not found", "Not found").then(drawWatch);
             break;
+        case "[AI:agenda]":
+            l = require("Storage").list(RegExp("agenda.*app.js"));
+            if (l.length > 0) {
+                load(l[0]);
+            } else E.showAlert("Agenda app not found", "Not found").then(drawWatch);
+            break;            
         default:
             l = require("Storage").list(RegExp(a + ".app.js"));
             if (l.length > 0) {
@@ -276,7 +297,6 @@ function input(dir) {
                 drawWatch();
             }
             break;
-
     }
 }
 
@@ -309,3 +329,10 @@ NRF.on('disconnect', BTevent);
 dimSeconds = Bangle.isLocked();
 drawWatch();
 
+setWatch(function() {
+    if (state == "watch") {
+        Bangle.showLauncher()
+    } else if (state == "calendar") {
+        drawWatch();
+    }
+}, BTN1, {repeat:true, edge:"falling"});
diff --git a/apps/clockcal/metadata.json b/apps/clockcal/metadata.json
index 998115827..b84b08575 100644
--- a/apps/clockcal/metadata.json
+++ b/apps/clockcal/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "clockcal",
   "name": "Clock & Calendar",
-  "version": "0.08",
+  "version": "0.10",
   "description": "Clock with Calendar",
   "readme":"README.md",
   "icon": "app.png",
diff --git a/apps/clockcal/settings.js b/apps/clockcal/settings.js
index a406f3cf7..ea613f5c0 100644
--- a/apps/clockcal/settings.js
+++ b/apps/clockcal/settings.js
@@ -1,6 +1,6 @@
 (function (back) {
     var FILE = "clockcal.json";
-    defaults={
+    const defaults={
         CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
         BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually
         MODE24: true, //24h mode vs 12h mode
@@ -9,19 +9,19 @@
         REDSAT: true, // Use red color for saturday?
         DRAGDOWN: "[AI:messg]",
         DRAGRIGHT: "[AI:music]",
-        DRAGLEFT: "[ignore]",
+        DRAGLEFT: "[AI:agenda]",
         DRAGUP: "[calend.]"
     };
-    settings = Object.assign(defaults, require('Storage').readJSON(FILE, true) || {});
+    let settings = Object.assign(defaults, require('Storage').readJSON(FILE, true) || {});
 
-    actions = ["[ignore]","[calend.]","[AI:music]","[AI:messg]"];
+    let actions = ["[ignore]","[calend.]","[AI:music]","[AI:messg]","[AI:agenda]"];
     require("Storage").list(RegExp(".app.js")).forEach(element => actions.push(element.replace(".app.js","")));
 
     function writeSettings() {
         require('Storage').writeJSON(FILE, settings);
     }
 
-    menu = {
+    const menu = {
         "": { "title": "Clock & Calendar" },
         "< Back": () => back(),
         'Buzz(dis)conn.?': {
diff --git a/apps/color_catalog/ChangeLog b/apps/color_catalog/ChangeLog
index 1ae723feb..d1d409730 100644
--- a/apps/color_catalog/ChangeLog
+++ b/apps/color_catalog/ChangeLog
@@ -1,2 +1,3 @@
 0.01: 1st ver,RGB565 and RGB888 colors in a common UI/UX 
 0.02: Minor code improvements
+0.03: Minor code improvements
diff --git a/apps/color_catalog/app.js b/apps/color_catalog/app.js
index d5014bcaa..b2f39c7a7 100644
--- a/apps/color_catalog/app.js
+++ b/apps/color_catalog/app.js
@@ -35,22 +35,22 @@ var v_model=process.env.BOARD;
     var v_color_text='#FB0E01';
     var v_color_statictxt='#e56e06'; //orange RGB format rrggbb 
     //RGB565 requires only 16 (5+6+5) bits/2 bytes
-    var a_colors_str= Array('White RGB565 0x','Orange','DarkGreen','Yellow',
+    var a_colors_str= ['White RGB565 0x','Orange','DarkGreen','Yellow',
     'Maroon','Blue','green','Purple',
     'cyan','olive','DarkCyan','DarkGrey',
     'Navy','Red','Magenta','GreenYellow',
     'Blush RGB888','pure red','Orange','Grey green',
     'D. grey','Almond','Amber','Bone',
     'Canary','Aero blue','Camel','Baby pink',
-    'Y.Corn','Cultured','Eigengrau','Citrine');
-    var a_colors= Array(0xFFFF,0xFD20,0x03E0,0xFFE0,
+    'Y.Corn','Cultured','Eigengrau','Citrine'];
+    var a_colors= [0xFFFF,0xFD20,0x03E0,0xFFE0,
     0x7800,0x001F,0x07E0,0x780F,
     0x07FF,0x7BE0,0x03EF,0x7BEF,
     0x000F,0xF800,0xF81F,0xAFE5,
     '#DE5D83','#FB0E01','#E56E06','#7E795C',
     '#404040','#EFDECD','#FFBF00','#E3DAC9',
     '#FFFF99','#C0E8D5','#C19A6B','#F4C2C2',
-    '#FBEC5D','#F5F5F5','#16161D','#E4D00A');
+    '#FBEC5D','#F5F5F5','#16161D','#E4D00A'];
     var v_color_lines=0xFFFF; //White hex format
     
     
diff --git a/apps/color_catalog/metadata.json b/apps/color_catalog/metadata.json
index 0669e6b0b..4d49308ef 100644
--- a/apps/color_catalog/metadata.json
+++ b/apps/color_catalog/metadata.json
@@ -2,7 +2,7 @@
   "id": "color_catalog",
   "name": "Colors Catalog",
   "shortName": "Colors Catalog",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Displays RGB565 and RGB888 colors, its name and code in screen.",
   "icon": "app.png",
   "tags": "Color,input,buttons,touch,UI",
diff --git a/apps/contacts/ChangeLog b/apps/contacts/ChangeLog
index b09594212..a0be5eaf6 100644
--- a/apps/contacts/ChangeLog
+++ b/apps/contacts/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Minor code improvements
 0.03: Minor code improvements
+0.04: Allow calling contacts from the app, Refactoring
diff --git a/apps/contacts/contacts.app.js b/apps/contacts/contacts.app.js
index 8d20e8646..34e40927a 100644
--- a/apps/contacts/contacts.app.js
+++ b/apps/contacts/contacts.app.js
@@ -2,108 +2,102 @@
 
 var Layout = require("Layout");
 
-//const W = g.getWidth();
-//const H = g.getHeight();
-
 var wp = require('Storage').readJSON("contacts.json", true) || [];
-// Use this with corrupted contacts
-//var wp = [];
 
-var key; /* Shared between functions, typically wp name */
-
-function writeContact() {
+function writeContacts() {
   require('Storage').writeJSON("contacts.json", wp);
 }
 
+function callNumber (number) {
+  Bluetooth.println(JSON.stringify({
+    t:"intent",
+    target:"activity",
+    action:"android.intent.action.CALL",
+    flags:["FLAG_ACTIVITY_NEW_TASK"],
+    categories:["android.intent.category.DEFAULT"],
+    data: 'tel:' + number,
+  }))
+
+}
+
 function mainMenu() {
   var menu = {
     "< Back" : Bangle.load
   };
-  if (Object.keys(wp).length==0) Object.assign(menu, {"NO Contacts":""});
-  else for (let id in wp) {
-    let i = id;
-    menu[wp[id]["name"]]=()=>{ decode(i); };
+  if (!wp.length) {
+    menu['No Contacts'] = () => {};
+  } else {
+    for (const e of wp) {
+      const closureE = e;
+      menu[e.name] = () => showContact(closureE);
+    }
   }
-  menu["Add"]=addCard;
-  menu["Remove"]=removeCard;
+  menu["Add"] = addContact;
+  menu["Remove"] = removeContact;
   g.clear();
   E.showMenu(menu);
 }
 
-function decode(pin) {
-  var i = wp[pin];
-  var l = i["name"] + "\n" + i["number"];
-  var la = new Layout ({
-    type:"v", c: [
-      {type:"txt", font:"10%", pad:1, fillx:1, filly:1, label: l},
-      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label:"OK", cb:l=>{mainMenu();}}
-    ], lazy:true});
+function showContact(i) {
   g.clear();
-  la.render();
+  (new Layout ({
+    type:"v",
+    c: [
+      {type:"txt", font:"10%", pad:1, fillx:1, filly:1, label: i["name"] + "\n" + i["number"]},
+      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "Call", cb: l => callNumber(i['number'])},
+      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "Back to list", cb: mainMenu}
+    ],
+    lazy:true
+  })).render();
 }
 
-function showNumpad(text, key_, callback) {
-  key = key_;
-  E.showMenu();
-  function addDigit(digit) {
-    key+=digit;
-    if (1) {
-      l = text[key.length];
-      switch (l) {
-        case '.': case ' ': case "'":
-          key+=l;
-          break;
-        case 'd': case 'D': default:
-          break;
-      }
+function showNumpad() {
+  return new Promise((resolve, reject) => {
+    let number = ''
+    E.showMenu();
+    function addDigit(digit) {
+      number += digit;
+      Bangle.buzz(20);
+      update();
     }
-    Bangle.buzz(20);
-    update();
-  }
-  function update() {
-    g.reset();
-    g.clearRect(0,0,g.getWidth(),23);
-    s = key + text.substr(key.length, 999);
-    g.setFont("Vector:24").setFontAlign(1,0).drawString(s,g.getWidth(),12);
-  }
-  const ds="12%";
-  var numPad = new Layout ({
-    type:"v", c: [{
-      type:"v", c: [
-        {type:"", height:24},
-        {type:"h",filly:1, c: [
-          {type:"btn", font:ds, width:58, label:"7", cb:l=>{addDigit("7");}},
-          {type:"btn", font:ds, width:58, label:"8", cb:l=>{addDigit("8");}},
-          {type:"btn", font:ds, width:58, label:"9", cb:l=>{addDigit("9");}}
-        ]},
-        {type:"h",filly:1, c: [
-          {type:"btn", font:ds, width:58, label:"4", cb:l=>{addDigit("4");}},
-          {type:"btn", font:ds, width:58, label:"5", cb:l=>{addDigit("5");}},
-          {type:"btn", font:ds, width:58, label:"6", cb:l=>{addDigit("6");}}
-        ]},
-        {type:"h",filly:1, c: [
-          {type:"btn", font:ds, width:58, label:"1", cb:l=>{addDigit("1");}},
-          {type:"btn", font:ds, width:58, label:"2", cb:l=>{addDigit("2");}},
-          {type:"btn", font:ds, width:58, label:"3", cb:l=>{addDigit("3");}}
-        ]},
-        {type:"h",filly:1, c: [
-          {type:"btn", font:ds, width:58, label:"0", cb:l=>{addDigit("0");}},
-          {type:"btn", font:ds, width:58, label:"C", cb:l=>{key=key.slice(0,-1); update();}},
-          {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb:callback}
+    function removeDigit() {
+      number = number.slice(0, -1);
+      Bangle.buzz(20);
+      update();
+    }
+    function update() {
+      g.reset();
+      g.clearRect(0,0,g.getWidth(),23);
+      g.setFont("Vector:24").setFontAlign(1,0).drawString(number, g.getWidth(),12);
+    }
+    const ds="12%";
+    const digitBtn = (digit) => ({type:"btn", font:ds, width:58, label:digit, cb:l=>{addDigit(digit);}});
+    var numPad = new Layout ({
+      type:"v", c: [{
+        type:"v", c: [
+          {type:"", height:24},
+          {type:"h",filly:1, c: [digitBtn("1"), digitBtn("2"), digitBtn("3")]},
+          {type:"h",filly:1, c: [digitBtn("4"), digitBtn("5"), digitBtn("6")]},
+          {type:"h",filly:1, c: [digitBtn("7"), digitBtn("8"), digitBtn("9")]},
+          {type:"h",filly:1, c: [
+            {type:"btn", font:ds, width:58, label:"C", cb: removeDigit},
+            digitBtn('0'),
+            {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb: l => resolve(number)}
+          ]}
         ]}
-      ]}
-    ], lazy:true});
-  g.clear();
-  numPad.render();  
-  update();
+      ], lazy:true});
+    g.clear();
+    numPad.render();
+    update();
+  });
 }
 
-function removeCard() {
+function removeContact() {
   var menu = {
     "" : {title : "Select Contact"},
     "< Back" : mainMenu
   };
-  if (Object.keys(wp).length==0) Object.assign(menu, {"No Contacts":""});
+  if (wp.length===0) Object.assign(menu, {"No Contacts":""});
   else {
     wp.forEach((val, card) => {
       const name = wp[card].name;
@@ -116,7 +110,7 @@ function removeCard() {
             {type:"h", c: [
               {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
                 wp.splice(card, 1);
-                writeContact();
+                writeContacts();
                 mainMenu();
               }},
               {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
@@ -130,54 +124,42 @@ function removeCard() {
   E.showMenu(menu);
 }
 
-function askPosition(callback) {
-  showNumpad("dddDDDddd", "", function() {
-    callback(key, "");
-  });
-}
 
-function createContact(lat, name) {
-  let n = {};
-  n["name"] = name;
-  n["number"] = lat;
-  wp.push(n);
-  print("add -- contacts", wp);
-  writeContact();
-}
-
-function addCardName2(key) {
+function addNewContact(name) {
   g.clear();
-  askPosition(function(lat, lon) {
-      print("position -- ", lat, lon);
-      createContact(lat, result);
+  showNumpad().then((number) => {
+      wp.push({name: name, number: number});
+      writeContacts();
       mainMenu();
-  });
+  })
+
+
+
 }
 
-function addCardName(key) {
-  result = key;
-  if (wp[result]!=undefined) {
-  E.showMenu();
-  var alreadyExists = new Layout (
-    {type:"v", c: [
-      {type:"txt", font:Math.min(15,100/result.length)+"%", pad:1, fillx:1, filly:1, label:result},
-      {type:"txt", font:"12%", pad:1, fillx:1, filly:1, label:"already exists."},
-      {type:"h", c: [
-        {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "REPLACE", cb:l=>{ addCardName2(key); }},
-        {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "CANCEL", cb:l=>{mainMenu();}}
-      ]}
-    ], lazy:true});
-  g.clear();
-  alreadyExists.render();
+function tryAddContact(name) {
+  if (wp.filter((e) => e.name === name).length) {
+    E.showMenu();
+    var alreadyExists = new Layout (
+      {type:"v", c: [
+        {type:"txt", font:Math.min(15,100/name.length)+"%", pad:1, fillx:1, filly:1, label:name},
+        {type:"txt", font:"12%", pad:1, fillx:1, filly:1, label:"already exists."},
+        {type:"h", c: [
+          {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "REPLACE", cb:l=>{ addNewContact(name); }},
+          {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "CANCEL", cb:l=>{mainMenu();}}
+        ]}
+      ], lazy:true});
+    g.clear();
+    alreadyExists.render();
      return;
   }
-  addCardName2(key);  
+  addNewContact(name);
 }
 
-function addCard() {
-  require("textinput").input({text:""}).then(result => {
-    if (result != "") {
-      addCardName(result);
+function addContact() {
+  require("textinput").input({text:""}).then(name => {
+    if (name !== "") {
+      tryAddContact(name);
     } else
       mainMenu();
   });
diff --git a/apps/contacts/metadata.json b/apps/contacts/metadata.json
index 525c7ef6e..50354f74f 100644
--- a/apps/contacts/metadata.json
+++ b/apps/contacts/metadata.json
@@ -1,6 +1,6 @@
 { "id": "contacts",
   "name": "Contacts",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Provides means of storing user contacts, viewing/editing them on device and from the App loader",
   "icon": "app.png",
   "tags": "tool",
diff --git a/apps/cscsensor/ChangeLog b/apps/cscsensor/ChangeLog
index c01b35503..30bfdd560 100644
--- a/apps/cscsensor/ChangeLog
+++ b/apps/cscsensor/ChangeLog
@@ -8,3 +8,7 @@
 0.07: Make Bangle.js 2 compatible
 0.08: Convert Yes/No On/Off in settings to checkboxes
 0.09: Automatically reconnect on error
+0.10: Fix cscsensor when using coospoo sensor that supports crank *and* wheel
+0.11: Update to use blecsc library
+0.12: Fix regression reporting cadence (reported per second when should be per minute) (fix #3434)
+0.13: Fix total distance calculation
\ No newline at end of file
diff --git a/apps/cscsensor/cscsensor.app.js b/apps/cscsensor/cscsensor.app.js
index 1ad7a9e98..6a8ca8b0f 100644
--- a/apps/cscsensor/cscsensor.app.js
+++ b/apps/cscsensor/cscsensor.app.js
@@ -1,8 +1,3 @@
-var device;
-var gatt;
-var service;
-var characteristic;
-
 const SETTINGS_FILE = 'cscsensor.json';
 const storage = require('Storage');
 const W = g.getWidth();
@@ -17,12 +12,10 @@ class CSCSensor {
   constructor() {
     this.movingTime = 0;
     this.lastTime = 0;
-    this.lastBangleTime = Date.now();
     this.lastRevs = -1;
     this.settings = storage.readJSON(SETTINGS_FILE, 1) || {};
     this.settings.totaldist = this.settings.totaldist || 0;
     this.totaldist = this.settings.totaldist;
-    this.wheelCirc = (this.settings.wheelcirc || 2230)/25.4;
     this.speedFailed = 0;
     this.speed = 0;
     this.maxSpeed = 0;
@@ -34,8 +27,6 @@ class CSCSensor {
     this.distFactor = this.qMetric ? 1.609344 : 1;
     this.screenInit = true;
     this.batteryLevel = -1;
-    this.lastCrankTime = 0;
-    this.lastCrankRevs = 0;
     this.showCadence = false;
     this.cadence = 0;
   }
@@ -63,10 +54,6 @@ class CSCSensor {
     }
   }
 
-  updateBatteryLevel(event) {
-    if (event.target.uuid == "0x2a19") this.setBatteryLevel(event.target.value.getUint8(0));
-  }
-
   drawBatteryIcon() {
     g.setColor(1, 1, 1).drawRect(10*W/240, yStart+0.029167*H, 20*W/240, yStart+0.1125*H)
       .fillRect(14*W/240, yStart+0.020833*H, 16*W/240, yStart+0.029167*H)
@@ -81,7 +68,7 @@ class CSCSensor {
   }
 
   updateScreenRevs() {
-    var dist = this.distFactor*(this.lastRevs-this.lastRevsStart)*this.wheelCirc/63360.0;
+    var dist = this.distFactor*(this.lastRevs-this.lastRevsStart) * csc.settings.circum/*mm*/ / 1000000;
     var ddist = Math.round(100*dist)/100;
     var tdist = Math.round(this.distFactor*this.totaldist*10)/10;
     var dspeed = Math.round(10*this.distFactor*this.speed)/10;
@@ -157,114 +144,38 @@ class CSCSensor {
     }
   }
 
-  updateSensor(event) {
-    var qChanged = false;
-    if (event.target.uuid == "0x2a5b") {
-      if (event.target.value.getUint8(0, true) & 0x2) {
-        // crank revolution - if enabled
-        const crankRevs = event.target.value.getUint16(1, true);
-        const crankTime = event.target.value.getUint16(3, true);
-        if (crankTime > this.lastCrankTime) {
-          this.cadence = (crankRevs-this.lastCrankRevs)/(crankTime-this.lastCrankTime)*(60*1024);
-          qChanged = true;
-        }
-        this.lastCrankRevs = crankRevs;
-        this.lastCrankTime = crankTime;
-      } else {
-        // wheel revolution
-        var wheelRevs = event.target.value.getUint32(1, true);
-        var dRevs = (this.lastRevs>0 ? wheelRevs-this.lastRevs : 0);
-        if (dRevs>0) {
-          qChanged = true;
-          this.totaldist += dRevs*this.wheelCirc/63360.0;
-          if ((this.totaldist-this.settings.totaldist)>0.1) {
-            this.settings.totaldist = this.totaldist;
-            storage.writeJSON(SETTINGS_FILE, this.settings);
-          }
-        }
-        this.lastRevs = wheelRevs;
-        if (this.lastRevsStart<0) this.lastRevsStart = wheelRevs;
-        var wheelTime = event.target.value.getUint16(5, true);
-        var dT = (wheelTime-this.lastTime)/1024;
-        var dBT = (Date.now()-this.lastBangleTime)/1000;
-        this.lastBangleTime = Date.now();
-        if (dT<0) dT+=64;
-        if (Math.abs(dT-dBT)>3) dT = dBT;
-        this.lastTime = wheelTime;
-        this.speed = this.lastSpeed;
-        if (dRevs>0 && dT>0) {
-          this.speed = (dRevs*this.wheelCirc/63360.0)*3600/dT;
-          this.speedFailed = 0;
-          this.movingTime += dT;
-        } else if (!this.showCadence) {
-          this.speedFailed++;
-          qChanged = false;
-          if (this.speedFailed>3) {
-            this.speed = 0;
-            qChanged = (this.lastSpeed>0);
-          }
-        }
-        this.lastSpeed = this.speed;
-        if (this.speed>this.maxSpeed && (this.movingTime>3 || this.speed<20) && this.speed<50) this.maxSpeed = this.speed;
-      }
-    }
-    if (qChanged) this.updateScreen();
-  }
 }
 
 var mySensor = new CSCSensor();
 
-function getSensorBatteryLevel(gatt) {
-  gatt.getPrimaryService("180f").then(function(s) {
-    return s.getCharacteristic("2a19");
-  }).then(function(c) {
-    c.on('characteristicvaluechanged', (event)=>mySensor.updateBatteryLevel(event));
-    return c.startNotifications();
-  });
-}
+var csc = require("blecsc").getInstance();
+csc.on("data", e => {
+  mySensor.totaldist += e.wr * csc.settings.circum/*mm*/ / 1000000; // finally in km
+  mySensor.lastRevs = e.cwr;
+  if (mySensor.lastRevsStart<0) mySensor.lastRevsStart = e.cwr;
+  mySensor.speed = e.kph;
+  mySensor.movingTime += e.wdt;
+  if (mySensor.speed>mySensor.maxSpeed && (mySensor.movingTime>3 || mySensor.speed<20) && mySensor.speed<50)
+    mySensor.maxSpeed = mySensor.speed;
+  mySensor.cadence = e.crps*60;
+  mySensor.updateScreen();
+  mySensor.updateScreen();
+});
 
-function connection_setup() {
-  mySensor.screenInit = true;
-  E.showMessage("Scanning for CSC sensor...");
-  NRF.requestDevice({ filters: [{services:["1816"]}], maxInterval: 100}).then(function(d) {
-    device = d;
-    E.showMessage("Found device");
-    return device.gatt.connect();
-  }).then(function(ga) {
-    gatt = ga;
-    E.showMessage("Connected");
-    return gatt.getPrimaryService("1816");
-  }).then(function(s) {
-    service = s;
-    return service.getCharacteristic("2a5b");
-  }).then(function(c) {
-    characteristic = c;
-    characteristic.on('characteristicvaluechanged', (event)=>mySensor.updateSensor(event));
-    return characteristic.startNotifications();
-  }).then(function() {
-    console.log("Done!");
-    g.reset().clearRect(Bangle.appRect).flip();
-    getSensorBatteryLevel(gatt);
-    mySensor.updateScreen();
-  }).catch(function(e) {
-    E.showMessage(e.toString(), "ERROR");
-    console.log(e);
-    setTimeout(connection_setup, 1000);
-  });
-}
-
-connection_setup();
+csc.on("status", txt => {
+  //print("->", txt);
+  E.showMessage(txt);
+});
 E.on('kill',()=>{
-  if (gatt!=undefined) gatt.disconnect();
+  csc.stop();
   mySensor.settings.totaldist = mySensor.totaldist;
   storage.writeJSON(SETTINGS_FILE, mySensor.settings);
 });
-NRF.on('disconnect', connection_setup); // restart if disconnected
 Bangle.setUI("updown", d=>{
   if (d<0) { mySensor.reset(); g.clearRect(0, yStart, W, H); mySensor.updateScreen(); }
-  else if (d>0) { if (Date.now()-mySensor.lastBangleTime>10000) connection_setup(); }
-  else { mySensor.toggleDisplayCadence(); g.clearRect(0, yStart, W, H); mySensor.updateScreen(); }
+  else if (!d) { mySensor.toggleDisplayCadence(); g.clearRect(0, yStart, W, H); mySensor.updateScreen(); }
 });
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+csc.start(); // start a connection
\ No newline at end of file
diff --git a/apps/cscsensor/metadata.json b/apps/cscsensor/metadata.json
index 5d70251da..0029c4b82 100644
--- a/apps/cscsensor/metadata.json
+++ b/apps/cscsensor/metadata.json
@@ -2,10 +2,11 @@
   "id": "cscsensor",
   "name": "Cycling speed sensor",
   "shortName": "CSCSensor",
-  "version": "0.09",
+  "version": "0.13",
   "description": "Read BLE enabled cycling speed and cadence sensor and display readings on watch",
   "icon": "icons8-cycling-48.png",
   "tags": "outdoors,exercise,ble,bluetooth,bike,cycle,bicycle",
+  "dependencies" : { "blecsc":"module" },
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/cycling/ChangeLog b/apps/cycling/ChangeLog
index b7e50d38d..9fec754fc 100644
--- a/apps/cycling/ChangeLog
+++ b/apps/cycling/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial version
 0.02: Minor code improvements
+0.03: Move blecsc library into its own app so it can be shared (and fix some issues)
\ No newline at end of file
diff --git a/apps/cycling/README.md b/apps/cycling/README.md
index 7ba8ee224..485537293 100644
--- a/apps/cycling/README.md
+++ b/apps/cycling/README.md
@@ -1,4 +1,5 @@
 # Cycling
+
 > Displays data from a BLE Cycling Speed and Cadence sensor.
 
 *This is a fork of the CSCSensor app using the layout library and separate module for CSC functionality. It also drops persistence of total distance on the Bangle, as this information is also persisted on the sensor itself. Further, it allows configuration of display units (metric/imperial) independent of chosen locale. Finally, multiple sensors can be used and wheel circumference can be configured for each sensor individually.*
@@ -27,8 +28,5 @@ Inside the Cycling app, use button / tap screen to:
 ## TODO
 * Sensor battery status
 * Implement crank events / show cadence
-* Bangle.js 1 compatibility
 * Allow setting CWR on the sensor (this is a feature intended by the BLE CSC spec, in case the sensor is replaced or transferred to a different bike)
 
-## Development
-There is a "mock" version of the `blecsc` module, which can be used to test features in the emulator. Check `blecsc-emu.js` for usage.
diff --git a/apps/cycling/blecsc-emu.js b/apps/cycling/blecsc-emu.js
deleted file mode 100644
index 1a313e08a..000000000
--- a/apps/cycling/blecsc-emu.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// UUID of the Bluetooth CSC Service
-//const SERVICE_UUID = "1816";
-// UUID of the CSC measurement characteristic
-const MEASUREMENT_UUID = "2a5b";
-
-// Wheel revolution present bit mask
-const FLAGS_WREV_BM = 0x01;
-// Crank revolution present bit mask
-const FLAGS_CREV_BM = 0x02;
-
-/**
- * Fake BLECSC implementation for the emulator, where it's hard to test
- * with actual hardware. Generates "random" wheel events (no crank).
- *
- * To upload as a module, paste the entire file in the console using this
- * command: require("Storage").write("blecsc-emu",`<FILE CONTENT HERE>`);
- */
-class BLECSCEmulator {
-  constructor() {
-    this.timeout = undefined;
-    this.interval = 500;
-    this.ccr = 0;
-    this.lwt = 0;
-    this.handlers = {
-      // value
-      // disconnect
-      // wheelEvent
-      // crankEvent
-    };
-  }
-
-  getDeviceAddress() {
-    return 'fa:ke:00:de:vi:ce';
-  }
-
-  /**
-   * Callback for the GATT characteristicvaluechanged event.
-   * Consumers must not call this method!
-   */
-  onValue(event) {
-    // Not interested in non-CSC characteristics
-    if (event.target.uuid != "0x" + MEASUREMENT_UUID) return;
-
-    // Notify the generic 'value' handler
-    if (this.handlers.value) this.handlers.value(event);
-
-    const flags = event.target.value.getUint8(0, true);
-    // Notify the 'wheelEvent' handler
-    if ((flags & FLAGS_WREV_BM) && this.handlers.wheelEvent) this.handlers.wheelEvent({
-      cwr: event.target.value.getUint32(1, true),  // cumulative wheel revolutions
-      lwet: event.target.value.getUint16(5, true), // last wheel event time
-    });
-
-    // Notify the 'crankEvent' handler
-    if ((flags & FLAGS_CREV_BM) && this.handlers.crankEvent) this.handlers.crankEvent({
-      ccr: event.target.value.getUint16(7, true),  // cumulative crank revolutions
-      lcet: event.target.value.getUint16(9, true), // last crank event time
-    });
-  }
-
-  /**
-   * Register an event handler.
-   *
-   * @param  {string} event   value|disconnect
-   * @param  {function} handler handler function that receives the event as its first argument
-   */
-  on(event, handler) {
-    this.handlers[event] = handler;
-  }
-
-  fakeEvent() {
-    this.interval = Math.max(50, Math.min(1000, this.interval + Math.random()*40-20));
-    this.lwt = (this.lwt + this.interval) % 0x10000;
-    this.ccr++;
-
-    var buffer = new ArrayBuffer(8);
-    var view = new DataView(buffer);
-    view.setUint8(0, 0x01); // Wheel revolution data present bit
-    view.setUint32(1, this.ccr, true); // Cumulative crank revolutions
-    view.setUint16(5, this.lwt, true); // Last wheel event time
-
-    this.onValue({
-      target: {
-        uuid: "0x2a5b",
-        value: view,
-      },
-    });
-
-    this.timeout = setTimeout(this.fakeEvent.bind(this), this.interval);
-  }
-
-  /**
-   * Find and connect to a device which exposes the CSC service.
-   *
-   * @return {Promise}
-   */
-  connect() {
-    this.timeout = setTimeout(this.fakeEvent.bind(this), this.interval);
-    return Promise.resolve(true);
-  }
-
-  /**
-   * Disconnect the device.
-   */
-  disconnect() {
-    if (!this.timeout) return;
-    clearTimeout(this.timeout);
-  }
-}
-
-exports = BLECSCEmulator;
diff --git a/apps/cycling/blecsc.js b/apps/cycling/blecsc.js
deleted file mode 100644
index 7a47108e5..000000000
--- a/apps/cycling/blecsc.js
+++ /dev/null
@@ -1,150 +0,0 @@
-const SERVICE_UUID = "1816";
-// UUID of the CSC measurement characteristic
-const MEASUREMENT_UUID = "2a5b";
-
-// Wheel revolution present bit mask
-const FLAGS_WREV_BM = 0x01;
-// Crank revolution present bit mask
-const FLAGS_CREV_BM = 0x02;
-
-/**
- * This class communicates with a Bluetooth CSC peripherial using the Espruino NRF library.
- *
- * ## Usage:
- * 1. Register event handlers using the \`on(eventName, handlerFunction)\` method
- *    You can subscribe to the \`wheelEvent\` and \`crankEvent\` events or you can
- *    have raw characteristic values passed through using the \`value\` event.
- * 2. Search and connect to a BLE CSC peripherial by calling the \`connect()\` method
- * 3. To tear down the connection, call the \`disconnect()\` method
- *
- * ## Events
- * - \`wheelEvent\` - the peripharial sends a notification containing wheel event data
- * - \`crankEvent\` - the peripharial sends a notification containing crank event data
- * - \`value\` - the peripharial sends any CSC characteristic notification (including wheel & crank event)
- * - \`disconnect\` - the peripherial ends the connection or the connection is lost
- *
- * Each event can only have one handler. Any call to \`on()\` will
- * replace a previously registered handler for the same event.
- */
-class BLECSC {
-  constructor() {
-    this.device = undefined;
-    this.ccInterval = undefined;
-    this.gatt = undefined;
-    this.handlers = {
-      // wheelEvent
-      // crankEvent
-      // value
-      // disconnect
-    };
-  }
-
-  getDeviceAddress() {
-    if (!this.device || !this.device.id)
-      return '00:00:00:00:00:00';
-    return this.device.id.split(" ")[0];
-  }
-
-  checkConnection() {
-    if (!this.device)
-      console.log("no device");
-    // else
-      // console.log("rssi: " + this.device.rssi);
-  }
-
-  /**
-   * Callback for the GATT characteristicvaluechanged event.
-   * Consumers must not call this method!
-   */
-  onValue(event) {
-    // Not interested in non-CSC characteristics
-    if (event.target.uuid != "0x" + MEASUREMENT_UUID) return;
-
-    // Notify the generic 'value' handler
-    if (this.handlers.value) this.handlers.value(event);
-
-    const flags = event.target.value.getUint8(0, true);
-    // Notify the 'wheelEvent' handler
-    if ((flags & FLAGS_WREV_BM) && this.handlers.wheelEvent) this.handlers.wheelEvent({
-      cwr: event.target.value.getUint32(1, true),  // cumulative wheel revolutions
-      lwet: event.target.value.getUint16(5, true), // last wheel event time
-    });
-
-    // Notify the 'crankEvent' handler
-    if ((flags & FLAGS_CREV_BM) && this.handlers.crankEvent) this.handlers.crankEvent({
-      ccr: event.target.value.getUint16(7, true),  // cumulative crank revolutions
-      lcet: event.target.value.getUint16(9, true), // last crank event time
-    });
-  }
-
-  /**
-   * Callback for the NRF disconnect event.
-   * Consumers must not call this method!
-   */
-  onDisconnect(event) {
-    console.log("disconnected");
-    if (this.ccInterval)
-      clearInterval(this.ccInterval);
-
-    if (!this.handlers.disconnect) return;
-    this.handlers.disconnect(event);
-  }
-
-  /**
-   * Register an event handler.
-   *
-   * @param  {string} event     wheelEvent|crankEvent|value|disconnect
-   * @param  {function} handler function that will receive the event as its first argument
-   */
-  on(event, handler) {
-    this.handlers[event] = handler;
-  }
-
-  /**
-   * Find and connect to a device which exposes the CSC service.
-   *
-   * @return {Promise}
-   */
-  connect() {
-    // Register handler for the disconnect event to be passed throug
-    NRF.on('disconnect', this.onDisconnect.bind(this));
-
-    // Find a device, then get the CSC Service and subscribe to
-    // notifications on the CSC Measurement characteristic.
-    // NRF.setLowPowerConnection(true);
-    return NRF.requestDevice({
-      timeout: 5000,
-      filters: [{ services: [SERVICE_UUID] }],
-    }).then(device => {
-      this.device = device;
-      this.device.on('gattserverdisconnected', this.onDisconnect.bind(this));
-      this.ccInterval = setInterval(this.checkConnection.bind(this), 2000);
-      return device.gatt.connect();
-    }).then(gatt => {
-      this.gatt = gatt;
-      return gatt.getPrimaryService(SERVICE_UUID);
-    }).then(service => {
-      return service.getCharacteristic(MEASUREMENT_UUID);
-    }).then(characteristic => {
-      characteristic.on('characteristicvaluechanged', this.onValue.bind(this));
-      return characteristic.startNotifications();
-    });
-  }
-
-  /**
-   * Disconnect the device.
-   */
-  disconnect() {
-    if (this.ccInterval)
-      clearInterval(this.ccInterval);
-
-    if (!this.gatt) return;
-    try {
-      this.gatt.disconnect();
-    } catch {
-      //
-    }
-  }
-}
-
-exports = BLECSC;
diff --git a/apps/cycling/cycling.app.js b/apps/cycling/cycling.app.js
index 268284a29..7261d3519 100644
--- a/apps/cycling/cycling.app.js
+++ b/apps/cycling/cycling.app.js
@@ -23,7 +23,6 @@ class CSCSensor {
     // CSC runtime variables
     this.movingTime = 0;              // unit: s
     this.lastBangleTime = Date.now(); // unit: ms
-    this.lwet = 0;                    // last wheel event time (unit: s/1024)
     this.cwr = -1;                    // cumulative wheel revolutions
     this.cwrTrip = 0;                 // wheel revolutions since trip start
     this.speed = 0;                   // unit: m/s
@@ -84,7 +83,7 @@ class CSCSensor {
     console.log("Trying to connect to BLE CSC");
 
     // Hook up events
-    this.blecsc.on('wheelEvent', this.onWheelEvent.bind(this));
+    this.blecsc.on('data', this.onWheelEvent.bind(this));
     this.blecsc.on('disconnect', this.onDisconnect.bind(this));
 
     // Scan for BLE device and connect
@@ -171,20 +170,11 @@ class CSCSensor {
     // Increment the trip revolutions counter
     this.cwrTrip += dRevs;
 
-    // Calculate time delta since last wheel event
-    var dT = (event.lwet - this.lwet)/1024;
-    var now = Date.now();
-    var dBT = (now-this.lastBangleTime)/1000;
-    this.lastBangleTime = now;
-    if (dT<0) dT+=64;  // wheel event time wraps every 64s
-    if (Math.abs(dT-dBT)>3) dT = dBT;  // not sure about the reason for this
-    this.lwet = event.lwet;
-
     // Recalculate current speed
-    if (dRevs>0 && dT>0) {
-      this.speed = dRevs * this.wheelCirc / dT;
+    if (dRevs>0 ) {
+      this.speed = event.wrps * this.wheelCirc;
       this.speedFailed = 0;
-      this.movingTime += dT;
+      this.movingTime += event.wdt;
     } else {
       this.speedFailed++;
       if (this.speedFailed>3) {
@@ -429,15 +419,7 @@ class CSCDisplay {
   }
 }
 
-var BLECSC;
-if (process.env.BOARD === "EMSCRIPTEN" || process.env.BOARD === "EMSCRIPTEN2") {
-  // Emulator
-  BLECSC = require("blecsc-emu");
-} else {
-  // Actual hardware
-  BLECSC = require("blecsc");
-}
-var blecsc = new BLECSC();
+var blecsc = require("blecsc").getInstance();
 var display = new CSCDisplay();
 var sensor = new CSCSensor(blecsc, display);
 
diff --git a/apps/cycling/metadata.json b/apps/cycling/metadata.json
index 95c0ca068..51e51b409 100644
--- a/apps/cycling/metadata.json
+++ b/apps/cycling/metadata.json
@@ -2,16 +2,16 @@
   "id": "cycling",
   "name": "Bangle Cycling",
   "shortName": "Cycling",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Display live values from a BLE CSC sensor",
   "icon": "icons8-cycling-48.png",
   "tags": "outdoors,exercise,ble,bluetooth",
+  "dependencies" : { "blecsc":"module" },
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"cycling.app.js","url":"cycling.app.js"},
     {"name":"cycling.settings.js","url":"settings.js"},
-    {"name":"blecsc","url":"blecsc.js"},
     {"name":"cycling.img","url":"cycling.icon.js","evaluate": true}
   ],
   "data": [
diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog
index e9568acfc..af2e21ae8 100644
--- a/apps/daisy/ChangeLog
+++ b/apps/daisy/ChangeLog
@@ -9,3 +9,4 @@
 0.09: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps
 0.10: Use widget_utils.
 0.11: Minor code improvements
+0.12: Added setting to change Battery estimate to hours
diff --git a/apps/daisy/README.md b/apps/daisy/README.md
index 491ed697f..5599d313c 100644
--- a/apps/daisy/README.md
+++ b/apps/daisy/README.md
@@ -10,7 +10,7 @@ Forum](http://forum.espruino.com/microcosms/1424/)
 
 * Derived from [The Ring](https://banglejs.com/apps/?id=thering) proof of concept and the [Pastel clock](https://banglejs.com/apps/?q=pastel)
 * Includes the [Lazybones](https://banglejs.com/apps/?q=lazybones) Idle warning timer
-* Touch the top right/top left to cycle through the info display (Day, Date, Steps, Sunrise, Sunset, Heart Rate)
+* Touch the top right/top left to cycle through the info display (Day, Date, Steps, Sunrise, Sunset, Heart Rate, Battery Estimate)
 * The heart rate monitor is turned on only when Heart rate is selected and will take a few seconds to settle
 * The heart value is displayed in RED if the confidence value is less than 50%
 * NOTE: The heart rate monitor of Bangle JS 2 is not very accurate when moving about.
@@ -20,6 +20,7 @@ See [#1248](https://github.com/espruino/BangleApps/issues/1248)
 [MyLocation](https://banglejs.com/apps/?id=mylocation)
 * The screen is updated every minute to save battery power
 * Uses the [BloggerSansLight](https://www.1001fonts.com/rounded-fonts.html?page=3) font, which if free for commercial use
+* You need to run >2V22 to show the battery estimate in hours
 
 ## Future Development
 * Use mini icons in the information line rather that text
diff --git a/apps/daisy/app.js b/apps/daisy/app.js
index cba3e762d..7f6370044 100644
--- a/apps/daisy/app.js
+++ b/apps/daisy/app.js
@@ -83,6 +83,7 @@ function loadSettings() {
   settings.gy = settings.gy||'#020';
   settings.fg = settings.fg||'#0f0';
   settings.idle_check = (settings.idle_check === undefined ? true : settings.idle_check);
+  settings.batt_hours = (settings.batt_hours === undefined ? true : settings.batt_hours);
   assignPalettes();
 }
 
@@ -112,13 +113,39 @@ function updateSunRiseSunSet(now, lat, lon, line){
   sunSet = extractTime(times.sunset);
 }
 
+function batteryString(){
+  let stringToInsert;
+  if (settings.batt_hours) {
+    var batt_usage = 200000/E.getPowerUsage().total;
+    let rounded;
+    if (batt_usage > 24) {
+      var days = Math.floor(batt_usage/24);
+      var hours = Math.round((batt_usage/24 - days) * 24);
+      stringToInsert = '\n' + days + ((days < 2) ? 'd' : 'ds') + ' ' + hours + ((hours < 2) ? 'h' : 'hs');
+    }
+    else if (batt_usage > 9) {
+      rounded = Math.round(200000/E.getPowerUsage().total * 10) / 10;
+    }
+    else {
+      rounded = Math.round(200000/E.getPowerUsage().total * 100) / 100;
+    }
+    if (batt_usage < 24) {
+      stringToInsert = '\n' + rounded + ' ' + ((batt_usage < 2) ? 'h' : 'hs');
+    }
+  }
+  else{
+    stringToInsert = ' ' + E.getBattery() + '%';
+  }
+  return 'BATTERY' + stringToInsert;
+}
+
 const infoData = {
   ID_DATE:  { calc: () => {var d = (new Date()).toString().split(" "); return d[2] + ' ' + d[1] + ' ' + d[3];} },
   ID_DAY:   { calc: () => {var d = require("locale").dow(new Date()).toLowerCase(); return d[0].toUpperCase() + d.substring(1);} },
   ID_SR:    { calc: () => 'SUNRISE ' + sunRise },
   ID_SS:    { calc: () => 'SUNSET ' + sunSet },
   ID_STEP:  { calc: () => 'STEPS ' + getSteps() },
-  ID_BATT:  { calc: () => 'BATTERY ' + E.getBattery() + '%' },
+  ID_BATT:  { calc: batteryString},
   ID_HRM:   { calc: () => hrmCurrent }
 };
 
diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json
index a292ef777..81a1e593b 100644
--- a/apps/daisy/metadata.json
+++ b/apps/daisy/metadata.json
@@ -1,6 +1,6 @@
 { "id": "daisy",
   "name": "Daisy",
-  "version": "0.11",
+  "version": "0.12",
   "dependencies": {"mylocation":"app"},
   "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times",
   "icon": "app.png",
diff --git a/apps/daisy/settings.js b/apps/daisy/settings.js
index 6397a81f4..b1cb6b4b3 100644
--- a/apps/daisy/settings.js
+++ b/apps/daisy/settings.js
@@ -5,7 +5,8 @@
   let s = {'gy' : '#020',
            'fg' : '#0f0',
            'color': 'Green',
-           'check_idle' : true};
+           'check_idle' : true,
+           'batt_hours' : false};
 
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
@@ -45,6 +46,14 @@
         s.idle_check = v;
         save();
       },
+    },
+    'Expected Battery Life In Hours': {
+      value: !!s.batt_hours,
+      onchange: v => {
+        s.batt_hours = v;
+        save();
+      },
     }
   });
 })
+
diff --git a/apps/doztime/ChangeLog b/apps/doztime/ChangeLog
index 03c1877b4..dc73a3c23 100644
--- a/apps/doztime/ChangeLog
+++ b/apps/doztime/ChangeLog
@@ -5,4 +5,5 @@
 0.05: extraneous comments and code removed
       display improved
       now supports Adjust Clock widget, if installed
-0.06: Minor code improvements
\ No newline at end of file
+0.06: Minor code improvements
+0.07: Bangle2: Shift the position of one line on the screen
diff --git a/apps/doztime/app-bangle2.js b/apps/doztime/app-bangle2.js
index 603ac8904..9d1bb26c8 100644
--- a/apps/doztime/app-bangle2.js
+++ b/apps/doztime/app-bangle2.js
@@ -16,11 +16,12 @@ const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
 const timeColour = "#ffffff";
 const dateColours = ["#ff0000","#ff8000","#ffff00","#00ff00","#0080ff","#ff00ff","#ffffff"];
 const calen10 = {"size":26,"pt0":[18-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
-const calen7 = {"size":26,"pt0":[48-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
+const calen7 = {"size":26,"pt0":[42-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
 const time5 = {"size":42,"pt0":[39-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
 const time6 = {"size":42,"pt0":[26-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line ft w 48, 48-g, step 30
 const baseYear = 11584;
 const baseDate = Date(2020,11,21); // month values run from 0 to 11
+let calenDef = calen10;
 let accum = new Date(baseDate.getTime());
 let sequence = [];
 let timeActiveUntil;
@@ -139,7 +140,7 @@ function writeDozTime(text,def){
   }
 }
 function writeDozDate(text,def,colour){
-  
+
   dateColour = colour;
   //let pts = def.pts;
   let x=def.pt0[0];
@@ -169,20 +170,22 @@ function drawTime()
   let date = "";
   let timeDef;
   let x = 0;
+  let time;
+  let wait;
   dt.setDate(dt.getDate());
   if(addTimeDigit){
     x =
     10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds();
     let msg = "00000"+Math.floor(x).toString(12);
-    let time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block?
-    let wait = 347*(1-(x%1));
+    time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block?
+    wait = 347*(1-(x%1));
     timeDef = time6;
   } else {
     x =
     864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*dt.getMilliseconds();
     let msg = "0000"+Math.floor(x).toString(12);
-    let time = msg.substr(-4,3)+"."+msg.substr(-1);
-    let wait = 4167*(1-(x%1));
+    time = msg.substr(-4,3)+"."+msg.substr(-1);
+    wait = 4167*(1-(x%1));
     timeDef = time5;
   }
   if(lastX > x){ res = getDate(dt); } // calculate date once at start-up and once when turning over to a new day
diff --git a/apps/doztime/metadata.json b/apps/doztime/metadata.json
index 83be15724..407b474ca 100644
--- a/apps/doztime/metadata.json
+++ b/apps/doztime/metadata.json
@@ -2,7 +2,7 @@
   "id": "doztime",
   "name": "Dozenal Digital Time",
   "shortName": "Dozenal Digital",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A dozenal Holocene calendar and dozenal diurnal digital clock",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/drained/ChangeLog b/apps/drained/ChangeLog
index 8d196b10d..65c93e70f 100644
--- a/apps/drained/ChangeLog
+++ b/apps/drained/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Permit exceptions to load in low-power mode, e.g. daylight saving time.
       Also avoid polluting global scope.
 0.04: Enhance menu: enable bluetooth, visit settings & visit recovery
+0.05: Enhance menu: permit toggling bluetooth
diff --git a/apps/drained/app.js b/apps/drained/app.js
index 37cc8c71d..c74affea3 100644
--- a/apps/drained/app.js
+++ b/apps/drained/app.js
@@ -53,6 +53,21 @@ var draw = function () {
     }, 60000 - (date.getTime() % 60000));
 };
 var reload = function () {
+    var showMenu = function () {
+        var menu = {
+            "Restore to full power": drainedRestore,
+        };
+        if (NRF.getSecurityStatus().advertising)
+            menu["Disable BLE"] = function () { NRF.sleep(); showMenu(); };
+        else
+            menu["Enable BLE"] = function () { NRF.wake(); showMenu(); };
+        menu["Settings"] = function () { return load("setting.app.js"); };
+        menu["Recovery"] = function () { return Bangle.showRecoveryMenu(); };
+        menu["Exit menu"] = reload;
+        if (nextDraw)
+            clearTimeout(nextDraw);
+        E.showMenu(menu);
+    };
     Bangle.setUI({
         mode: "custom",
         remove: function () {
@@ -60,15 +75,7 @@ var reload = function () {
                 clearTimeout(nextDraw);
             nextDraw = undefined;
         },
-        btn: function () {
-            var menu = {
-                "Restore to full power": drainedRestore,
-                "Enable BLE": function () { return NRF.wake(); },
-                "Settings": function () { return load("setting.app.js"); },
-                "Recovery": function () { return Bangle.showRecoveryMenu(); },
-            };
-            E.showMenu(menu);
-        }
+        btn: showMenu
     });
     Bangle.CLOCK = 1;
     g.clear();
diff --git a/apps/drained/app.ts b/apps/drained/app.ts
index ed40262fa..de6114f99 100644
--- a/apps/drained/app.ts
+++ b/apps/drained/app.ts
@@ -1,7 +1,7 @@
 const app = "drained";
 
 // from boot.js
-declare var drainedInterval: IntervalId | undefined;
+declare let drainedInterval: IntervalId | undefined;
 if(typeof drainedInterval !== "undefined")
   drainedInterval = clearInterval(drainedInterval) as undefined;
 
@@ -72,21 +72,31 @@ const draw = () => {
 };
 
 const reload = () => {
+  const showMenu = () => {
+    const menu: { [k: string]: () => void } = {
+      "Restore to full power": drainedRestore,
+    };
+
+    if (NRF.getSecurityStatus().advertising)
+      menu["Disable BLE"] = () => { NRF.sleep(); showMenu(); };
+    else
+      menu["Enable BLE"] = () => { NRF.wake(); showMenu(); };
+
+    menu["Settings"] = () => load("setting.app.js");
+    menu["Recovery"] = () => Bangle.showRecoveryMenu();
+    menu["Exit menu"] = reload;
+
+    if(nextDraw) clearTimeout(nextDraw);
+    E.showMenu(menu);
+  };
+
   Bangle.setUI({
     mode: "custom",
     remove: () => {
       if (nextDraw) clearTimeout(nextDraw);
       nextDraw = undefined;
     },
-    btn: () => {
-      const menu = {
-          "Restore to full power": drainedRestore,
-          "Enable BLE": () => NRF.wake(),
-          "Settings": () => load("setting.app.js"),
-          "Recovery": () => Bangle.showRecoveryMenu(),
-      };
-      E.showMenu(menu);
-    }
+    btn: showMenu
   });
   Bangle.CLOCK=1;
 
diff --git a/apps/drained/metadata.json b/apps/drained/metadata.json
index ea18f6fcf..115289d09 100644
--- a/apps/drained/metadata.json
+++ b/apps/drained/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "drained",
   "name": "Drained",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Switches to displaying a simple clock when the battery percentage is low, and disables some peripherals",
   "readme": "README.md",
   "icon": "icon.png",
diff --git a/apps/fastload/README.md b/apps/fastload/README.md
index f2ff71e93..f7fab4933 100644
--- a/apps/fastload/README.md
+++ b/apps/fastload/README.md
@@ -1,11 +1,17 @@
+#### ⚠️EXPERIMENTAL⚠️
+
 # Fastload Utils
 
-*EXPERIMENTAL* Use this with caution. When you find something misbehaving please check if the problem actually persists when removing this app.
+Use this with caution. When you find something misbehaving please check if the problem actually persists when removing this app.
 
 This allows fast loading of all apps with two conditions:
 * Loaded app contains `Bangle.loadWidgets`. This is needed to prevent problems with apps not expecting widgets to be already loaded.
 * Current app can be removed completely from RAM.
 
+#### ⚠️ KNOWN ISSUES ⚠️
+
+* Fastload currently does not play nice with the automatic reload option of the apploader. App installs and upgrades are unreliable since the fastload causes code to run after reset and interfere with the upload process.
+
 ## Settings
 
 * Activate app history and navigate back through recent apps instead of immediately loading the clock face
diff --git a/apps/fastreset/README.md b/apps/fastreset/README.md
index 44b855454..b23023f4a 100644
--- a/apps/fastreset/README.md
+++ b/apps/fastreset/README.md
@@ -1,6 +1,6 @@
 # Fast Reset
 
-Reset the watch by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.
+Reset the watch to the clock face by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.
 
 Fast Reset was developed with the app history feature of 'Fastload Utils' in mind. If many apps are in the history stack, the user may want a fast way to exit directly to the clock face without using the firmwares reset function.
 
diff --git a/apps/fastreset/metadata.json b/apps/fastreset/metadata.json
index 455649b48..ccd5e1ce4 100644
--- a/apps/fastreset/metadata.json
+++ b/apps/fastreset/metadata.json
@@ -2,7 +2,7 @@
   "name": "Fast Reset",
   "shortName":"Fast Reset",
   "version":"0.03",
-  "description": "Reset the watch by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.",
+  "description": "Reset the watch to the clock face by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.",
   "icon": "app.png",
   "type": "bootloader",
   "tags": "system",
diff --git a/apps/fileman/ChangeLog b/apps/fileman/ChangeLog
index f5af86229..cc1456b31 100644
--- a/apps/fileman/ChangeLog
+++ b/apps/fileman/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Improve handling of large amounts of files (fix #579)
 0.03: Update RegExp use (Was using backreference instead of character code)
+
diff --git a/apps/fileman/metadata.json b/apps/fileman/metadata.json
index f5589e396..52f2fd06d 100644
--- a/apps/fileman/metadata.json
+++ b/apps/fileman/metadata.json
@@ -7,6 +7,7 @@
   "icon": "icons8-filing-cabinet-48.png",
   "tags": "tools",
   "supports": ["BANGLEJS","BANGLEJS2"],
+  "interface": "manage_files.html",
   "readme": "README.md",
   "storage": [
     {"name":"fileman.app.js","url":"fileman.app.js"},
diff --git a/apps/folderlaunch/ChangeLog b/apps/folderlaunch/ChangeLog
index 2670571d7..c92db0901 100644
--- a/apps/folderlaunch/ChangeLog
+++ b/apps/folderlaunch/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Handle files potentially not existing
-0.03: Add setting to disable vibration
\ No newline at end of file
+0.03: Add setting to disable vibration
+0.04: Minor code improvements
diff --git a/apps/folderlaunch/app.js b/apps/folderlaunch/app.js
index 438b9e06d..1a66dffac 100644
--- a/apps/folderlaunch/app.js
+++ b/apps/folderlaunch/app.js
@@ -78,19 +78,21 @@
                 var text = void 0;
                 var fontSize = void 0;
                 switch (entry.type) {
-                    case 'app':
+                    case 'app': {
                         var app_1 = storage_1.readJSON(entry.id + '.info', false);
                         icon = storage_1.read(app_1.icon);
                         text = app_1.name;
                         empty = false;
                         fontSize = config_1.display.font;
                         break;
-                    case 'folder':
+                    }
+                    case 'folder': {
                         icon = FOLDER_ICON_1;
                         text = entry.id;
                         empty = false;
                         fontSize = config_1.display.font ? config_1.display.font : 12;
                         break;
+                    }
                     default:
                         continue;
                 }
@@ -132,12 +134,13 @@
             y = config_1.display.rows - 1;
         var entry = grid_1[x][y];
         switch (entry.type) {
-            case "app":
+            case "app": {
                 buzz_1();
                 var infoFile = storage_1.readJSON(entry.id + '.info', false);
                 load(infoFile.src);
                 break;
-            case "folder":
+            }
+            case "folder": {
                 buzz_1();
                 resetTimeout_1();
                 page_1 = 0;
@@ -145,9 +148,11 @@
                 folder_1 = getFolder_1(folderPath_1);
                 render_1();
                 break;
-            default:
+            }
+            default: {
                 resetTimeout_1();
                 break;
+            }
         }
     };
     var page_1 = 0;
diff --git a/apps/folderlaunch/app.ts b/apps/folderlaunch/app.ts
index 993570e59..aff8e5c7e 100644
--- a/apps/folderlaunch/app.ts
+++ b/apps/folderlaunch/app.ts
@@ -114,19 +114,21 @@
 
         // Get the icon and text, skip if the space is empty. Always draw text for folders even if disabled
         switch (entry.type) {
-          case 'app':
+          case 'app': {
             let app = storage.readJSON(entry.id + '.info', false) as AppInfo;
             icon = storage.read(app.icon!)!;
             text = app.name;
             empty = false;
             fontSize = config.display.font;
             break;
-          case 'folder':
+          }
+          case 'folder': {
             icon = FOLDER_ICON;
             text = entry.id;
             empty = false;
             fontSize = config.display.font ? config.display.font : 12;
             break;
+          }
           default:
             continue;
         }
@@ -184,12 +186,13 @@
     // Handle the grid cell
     let entry: GridEntry = grid[x]![y]!;
     switch (entry.type) {
-      case "app":
+      case "app": {
         buzz();
         let infoFile = storage.readJSON(entry.id + '.info', false) as AppInfo;
         load(infoFile.src);
         break;
-      case "folder":
+      }
+      case "folder": {
         buzz();
         resetTimeout();
         page = 0;
@@ -197,9 +200,11 @@
         folder = getFolder(folderPath);
         render();
         break;
-      default:
+      }
+      default: {
         resetTimeout();
         break;
+      }
     }
   }
 
diff --git a/apps/folderlaunch/configLoad.ts b/apps/folderlaunch/configLoad.ts
index 37841cd36..56c398cdd 100644
--- a/apps/folderlaunch/configLoad.ts
+++ b/apps/folderlaunch/configLoad.ts
@@ -80,7 +80,7 @@ function cleanAndSave(config: Config): Config {
 let infoFileSorter = (a: string, b: string): number => {
     let aJson = storage.readJSON(a, false) as AppInfo;
     let bJson = storage.readJSON(b, false) as AppInfo;
-    var n = (0 | aJson.sortorder!) - (0 | bJson.sortorder!);
+    const n = (0 | aJson.sortorder!) - (0 | bJson.sortorder!);
     if (n) return n; // do sortorder first
     if (aJson.name < bJson.name) return -1;
     if (aJson.name > bJson.name) return 1;
diff --git a/apps/folderlaunch/metadata.json b/apps/folderlaunch/metadata.json
index 0194fcf66..9853c7daf 100644
--- a/apps/folderlaunch/metadata.json
+++ b/apps/folderlaunch/metadata.json
@@ -1,7 +1,7 @@
 {
     "id": "folderlaunch",
     "name": "Folder launcher",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Launcher that allows you to put your apps into folders",
     "icon": "icon.png",
     "type": "launch",
diff --git a/apps/folderlaunch/types.d.ts b/apps/folderlaunch/types.d.ts
index 86c0465e5..a6f927cd0 100644
--- a/apps/folderlaunch/types.d.ts
+++ b/apps/folderlaunch/types.d.ts
@@ -11,7 +11,7 @@ type Config = {
     showClocks: boolean,            // Whether clocks are shown
     showLaunchers: boolean,         // Whether launchers are shown
     disableVibration: boolean,      // Whether vibration is disabled
-    hidden: Array<String>,          // IDs of apps to explicitly hide
+    hidden: Array<string>,          // IDs of apps to explicitly hide
     display: {
         rows: number,               // Display an X by X grid of apps
         icon: boolean,              // Whether to show icons
diff --git a/apps/fontall/ChangeLog b/apps/fontall/ChangeLog
index 5560f00bc..1ba08319d 100644
--- a/apps/fontall/ChangeLog
+++ b/apps/fontall/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Corrected formatting of punctuation
\ No newline at end of file
diff --git a/apps/fontall/font.pbf b/apps/fontall/font.pbf
index 2f5374987..02345589e 100644
Binary files a/apps/fontall/font.pbf and b/apps/fontall/font.pbf differ
diff --git a/apps/fontall/metadata.json b/apps/fontall/metadata.json
index b0a9e4466..9f9683714 100644
--- a/apps/fontall/metadata.json
+++ b/apps/fontall/metadata.json
@@ -1,9 +1,9 @@
 { "id": "fontall",
   "name": "Fonts (all languages)",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Installs a font containing over 50,000 Unifont characters for Chinese, Japanese, Korean, Russian, and more. **Requires 2MB storage**",
   "icon": "app.png",
-  "tags": "font",
+  "tags": "font,fonts,language",
   "type": "module",
   "provides_modules" : ["font"],
   "supports" : ["BANGLEJS2"],
diff --git a/apps/fontext/ChangeLog b/apps/fontext/ChangeLog
index 5560f00bc..1ba08319d 100644
--- a/apps/fontext/ChangeLog
+++ b/apps/fontext/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Corrected formatting of punctuation
\ No newline at end of file
diff --git a/apps/fontext/font.pbf b/apps/fontext/font.pbf
index 1636df8e2..7abe4236d 100644
Binary files a/apps/fontext/font.pbf and b/apps/fontext/font.pbf differ
diff --git a/apps/fontext/metadata.json b/apps/fontext/metadata.json
index 9b0cef3f1..7088fa3cc 100644
--- a/apps/fontext/metadata.json
+++ b/apps/fontext/metadata.json
@@ -1,11 +1,12 @@
 { "id": "fontext",
   "name": "Fonts (150+ languages)",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Installs a font containing 1000 Unifont characters, which should handle the majority of non-Chinese/Japanese/Korean languages (only 20kb)",
   "icon": "app.png",
-  "tags": "font",
+  "tags": "font,fonts,language",
   "type": "module",
   "provides_modules" : ["font"],
+  "default" : true,
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/fuzzyw/ChangeLog b/apps/fuzzyw/ChangeLog
index dd73475f9..1a7525834 100644
--- a/apps/fuzzyw/ChangeLog
+++ b/apps/fuzzyw/ChangeLog
@@ -1,4 +1,5 @@
 0.01: First release
 0.02: Move translations to locale module (removed watch settings, now pick language in Bangle App Loader, More..., Settings)
 0.03: Change for fast loading, use widget_utils to hide widgets 
-0.04: Add animation when display changes
\ No newline at end of file
+0.04: Add animation when display changes
+0.05: Add toggle for animation + minor bug fixes
diff --git a/apps/fuzzyw/README.md b/apps/fuzzyw/README.md
index 062c9ac25..82c2a9a4b 100644
--- a/apps/fuzzyw/README.md
+++ b/apps/fuzzyw/README.md
@@ -11,6 +11,7 @@ Translations are supported to get the time in the language of your choice! To ch
 *  nn_NO - Norwegian Nynorsk (thank you zerodogg)
 *  sv_SE - Swedish
 *  de_DE - German
+*  da_DK - Danish
 
 Most translations are taken from the original Fuzzy Text International code.
 
diff --git a/apps/fuzzyw/fuzzyw.app.js b/apps/fuzzyw/fuzzyw.app.js
index 8bc51710f..ab09470fa 100644
--- a/apps/fuzzyw/fuzzyw.app.js
+++ b/apps/fuzzyw/fuzzyw.app.js
@@ -31,113 +31,129 @@
     /*LANG*/"ten to *$2",
     /*LANG*/"five to *$2"
   ]
-};
+  };
 
-let text_scale = 4;
-let timeout = 2.5*60;
-let drawTimeout;
-let animInterval;
-let time_string = "";
-let time_string_old = "";
-let time_string_old_wrapped = "";
+  let text_scale = 4;
+  let timeout = 2.5*60;
+  let drawTimeout;
+  let animInterval;
+  let time_string = "";
+  let time_string_old = "";
+  let time_string_old_wrapped = "";
+  let settings = {};
 
-let loadSettings = function() {
-  settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false};
-};
+  let loadSettings = function() {
+    settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false, 'animate': true};
+  };
 
-let queueDraw = function(seconds) {
-  let millisecs = seconds * 1000;
-  if (drawTimeout) clearTimeout(drawTimeout);
-  drawTimeout = setTimeout(function() {
-    drawTimeout = undefined;
-    draw();
-  }, millisecs - (Date.now() % millisecs));
-};
+  let queueDraw = function(seconds) {
+    let millisecs = seconds * 1000;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      draw();
+    }, millisecs - (Date.now() % millisecs));
+  };
 
-let getTimeString = function(date) {
-  let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
-  let hour = date.getHours() + Math.floor(segment/12);
-  f_string = fuzzy_string.minutes[segment % 12];
-  if (f_string.includes('$1')) {
-    f_string = f_string.replace('$1', fuzzy_string.hours[(hour) % 12]);
-  } else {
-    f_string = f_string.replace('$2', fuzzy_string.hours[(hour + 1) % 12]);
-  }
+  let getTimeString = function(date) {
+    let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
+    let hour = date.getHours() + Math.floor(segment/12);
+    // add "" to load into RAM due to 2v21 firmware .replace on flashstring issue
+    let f_string = ""+fuzzy_string.minutes[segment % 12]; 
+    if (f_string.includes('$1')) {
+      f_string = f_string.replace('$1', fuzzy_string.hours[(hour) % 12]);
+    } else {
+      f_string = f_string.replace('$2', fuzzy_string.hours[(hour + 1) % 12]);
+    }
     return f_string;
-};
+  };
 
-let draw = function() {
-  time_string = getTimeString(new Date()).replace('*', '');
-  //print(time_string);
-  if (time_string != time_string_old) {
-    g.setFont('Vector', R.h/text_scale).setFontAlign(0, 0);
-    animate(3);
-  }
-  queueDraw(timeout);
-};
-
-let animate = function(step) {
-  if (animInterval) clearInterval(animInterval);
-  let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
-  slideX = 0;
-  animInterval = setInterval(function() {
-    let time_start = getTime()
-    //blank old time
-    g.setColor(g.theme.bg);
-    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
-    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
-    g.setColor(g.theme.fg);
-    slideX += step;
-    let stop = false;
-    if (slideX>=R.w) {
-      slideX=R.w;
-      stop = true;
+  let draw = function() {
+    time_string = getTimeString(new Date()).replace('*', '');
+    //print(time_string);
+    if (time_string != time_string_old) {
+      g.setFont('Vector', R.h/text_scale).setFontAlign(0, 0);
+      if (settings.animate) {
+        animate(3);
+      } else {
+        quickDraw();
+      }
     }
-    //draw shifted new time
-    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
-    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
-    if (stop) {
-      time_string_old = time_string;
-      clearInterval(animInterval);
-      animInterval=undefined;
-      time_string_old_wrapped = time_string_new_wrapped;
-    }
-    print(Math.round((getTime() - time_start)*1000))
-  }, 30);
-};
+    queueDraw(timeout);
+  };
 
-g.clear();
-loadSettings();
-
-// Stop updates when LCD is off, restart when on
-Bangle.on('lcdPower',on=>{
-  if (on) {
-    draw(); // draw immediately, queue redraw
-  } else { // stop draw timer
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
-  }
-});
-
-Bangle.setUI({
-  mode : 'clock',
-  remove : function() {
-    // Called to unload all of the clock app
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
+  let animate = function(step) {
     if (animInterval) clearInterval(animInterval);
-    animInterval = undefined;
-    require('widget_utils').show(); // re-show widgets
+    let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
+    let slideX = 0;
+    //don't let pulling the drawer change y
+    let text_y = R.y + R.h/2;
+    animInterval = setInterval(function() {
+      //blank old time
+      g.setColor(g.theme.bg);
+      g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, text_y);
+      g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, text_y);
+      g.setColor(g.theme.fg);
+      slideX += step;
+      let stop = false;
+      if (slideX>=R.w) {
+        slideX=R.w;
+        stop = true;
+      }
+      //draw shifted new time
+      g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, text_y);
+      g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, text_y);
+      if (stop) {
+        time_string_old = time_string;
+        clearInterval(animInterval);
+        animInterval=undefined;
+        time_string_old_wrapped = time_string_new_wrapped;
+      }
+      //print(Math.round((getTime() - time_start)*1000));
+    }, 30);
+  };
+
+  let quickDraw = function() {
+    let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
+    g.setColor(g.theme.bg);
+    g.drawString(time_string_old_wrapped, R.x + R.w/2, R.y + R.h/2);
+    g.setColor(g.theme.fg);
+    g.drawString(time_string_new_wrapped, R.x + R.w/2, R.y + R.h/2);
+    time_string_old_wrapped = time_string_new_wrapped;
+  };
+
+  g.clear();
+  loadSettings();
+
+  // Stop updates when LCD is off, restart when on
+  Bangle.on('lcdPower',on=>{
+    if (on) {
+      draw(); // draw immediately, queue redraw
+    } else { // stop draw timer
+      if (drawTimeout) clearTimeout(drawTimeout);
+      drawTimeout = undefined;
+    }
+  });
+
+  Bangle.setUI({
+    mode : 'clock',
+    remove : function() {
+      // Called to unload all of the clock app
+      if (drawTimeout) clearTimeout(drawTimeout);
+      drawTimeout = undefined;
+      if (animInterval) clearInterval(animInterval);
+      animInterval = undefined;
+      require('widget_utils').show(); // re-show widgets
+    }
+  });
+
+  Bangle.loadWidgets();
+  if (settings.showWidgets) {
+    Bangle.drawWidgets();
+  } else {
+    require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
   }
-});
 
-Bangle.loadWidgets();
-if (settings.showWidgets) {
-  Bangle.drawWidgets();
-} else {
-  require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
+  let R = Bangle.appRect;
+  draw();
 }
-
-R = Bangle.appRect;
-draw();
-}
\ No newline at end of file
diff --git a/apps/fuzzyw/fuzzyw.settings.js b/apps/fuzzyw/fuzzyw.settings.js
index 535f91d67..2cb693a84 100644
--- a/apps/fuzzyw/fuzzyw.settings.js
+++ b/apps/fuzzyw/fuzzyw.settings.js
@@ -1,32 +1,39 @@
 (function(back) {
-  const SETTINGS_FILE = "fuzzy.settings.json";
+  const SETTINGS_FILE = "fuzzyw.settings.json";
 
   // initialize with default settings...
-  let s = {'showWidgets': false}
+  let s = {'showWidgets': false, 'animate': true};
 
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
-  const storage = require('Storage')
+  const storage = require('Storage');
   let settings = storage.readJSON(SETTINGS_FILE, 1) || s;
-  const saved = settings || {}
+  const saved = settings || {};
   for (const key in saved) {
-    s[key] = saved[key]
+    s[key] = saved[key];
   }
 
   function save() {
-    settings = s
-    storage.write(SETTINGS_FILE, settings)
+    settings = s;
+    storage.write(SETTINGS_FILE, settings);
   }
 
   E.showMenu({
     '': { 'title': 'Fuzzy Word Clock' },
     '< Back': back,
     'Show Widgets': {
-      value: settings.showWidgets,
+      value: s.showWidgets,
       onchange: () => {
-        settings.showWidgets = !settings.showWidgets;
+        s.showWidgets = !s.showWidgets;
         save();
       }
     },
+    'Animate': {
+      value: s.animate,
+      onchange: () => {
+        s.animate = !s.animate;
+        save();
+      }
+    }
   });
 })
diff --git a/apps/fuzzyw/metadata.json b/apps/fuzzyw/metadata.json
index 97f060866..110526712 100644
--- a/apps/fuzzyw/metadata.json
+++ b/apps/fuzzyw/metadata.json
@@ -2,7 +2,7 @@
   "id":"fuzzyw",
   "name":"Fuzzy Text Clock",
   "shortName": "Fuzzy Text",
-  "version": "0.04",
+  "version": "0.05",
   "description": "An imprecise clock for when you're not in a rush",
   "readme": "README.md",
   "icon":"fuzzyw.png",
diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index b2e5b37fe..6c47cf3f2 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -12,7 +12,7 @@
     <a href="https://www.espruino.com/Bangle.js#firmware-updates" target="_blank">see the Bangle.js 1 instructions</a></b></p>
   </div>
     <ul>
-    <p>Your current firmware version is <span id="fw-version" style="font-weight:bold">unknown</span> and DFU is <span id="boot-version" style="font-weight:bold">unknown</span>. 
+    <p>Your current firmware version is <span id="fw-version" style="font-weight:bold">unknown</span> and DFU is <span id="boot-version" style="font-weight:bold">unknown</span>.
     The DFU (bootloader) rarely changes, so it does not have to be the same version as your main firmware.</p>
   </ul>
     <div id="fw-ok" style="display:none">
@@ -104,8 +104,10 @@ function onInit(device) {
     var ok = true;
     if (crcs[0] == 1787004733) version = "2v20"; // check 6 page CRCs - the 7th page isn't used in 2v20+
     else if (crcs[0] == 3816337552) version = "2v21";
+    else if (crcs[0] == 3329616485) version = "2v22";
+    else if (crcs[0] == 1569433504) version = "2v23";
     else { // for other versions all 7 pages are used, check those
-      var crc = crcs[1]; 
+      var crc = crcs[1];
       if (crc==1339551013) { version = "2v10.219"; ok = false; }
       if (crc==1207580954) { version = "2v10.236"; ok = false; }
       if (crc==3435933210) version = "2v11.52";
@@ -117,7 +119,7 @@ function onInit(device) {
       if (crc==2886730689) version = "2v16";
       if (crc==156320890) version = "2v17";
       if (crc==4012421318) version = "2v18";
-      if (crc==1856454048) version = "2v19";      
+      if (crc==1856454048) version = "2v19";
     }
     if (!ok) {
       version += 	`(&#9888; update required)`;
@@ -227,8 +229,15 @@ function convertZipFile(binary) {
   Promise.resolve(binary).then(binary => {
     info.binary = binary;
     return JSZip.loadAsync(binary)
-  }).then(function(zipFile) {
-    info.zipFile = zipFile;
+  }).then(async function(zipFile) {
+    const fileArray = Object.values(zipFile.files);
+    // If the contents are zipped twice, extract the contents of the inner zip file
+    if(fileArray.length === 1 && fileArray[0].name?.endsWith(".zip")){
+      const zipBlob = await zipFile.file(fileArray[0].name).async("blob");
+      info.zipFile = await JSZip.loadAsync(zipBlob);
+    }else{
+      info.zipFile = zipFile;
+    }
     return info.zipFile.file("manifest.json").async("string");
   }).then(function(content) {
     info.manifest = JSON.parse(content).manifest;
diff --git a/apps/gipy/pkg/gps.d.ts b/apps/gipy/pkg/gps.d.ts
index 9ad646068..6e2c14f5a 100644
--- a/apps/gipy/pkg/gps.d.ts
+++ b/apps/gipy/pkg/gps.d.ts
@@ -1,5 +1,5 @@
 /* tslint:disable */
-/* eslint-disable */
+
 /**
 * @param {Gps} gps
 */
diff --git a/apps/gipy/pkg/gps_bg.wasm.d.ts b/apps/gipy/pkg/gps_bg.wasm.d.ts
index 251d9c3b1..5b84a9229 100644
--- a/apps/gipy/pkg/gps_bg.wasm.d.ts
+++ b/apps/gipy/pkg/gps_bg.wasm.d.ts
@@ -1,5 +1,5 @@
 /* tslint:disable */
-/* eslint-disable */
+
 export const memory: WebAssembly.Memory;
 export function __wbg_gps_free(a: number): void;
 export function disable_elevation(a: number): void;
diff --git a/apps/gpsinfo/ChangeLog b/apps/gpsinfo/ChangeLog
index d5abdf5d6..e5ecff33a 100644
--- a/apps/gpsinfo/ChangeLog
+++ b/apps/gpsinfo/ChangeLog
@@ -9,3 +9,4 @@
 0.10: Show satellites "in view" separated by GNS-system
 0.11: Show number of packets received
 0.12: Fix number of packets received
+0.13: Minor code improvements
diff --git a/apps/gpsinfo/gps-info.js b/apps/gpsinfo/gps-info.js
index bbe043913..e409f1505 100644
--- a/apps/gpsinfo/gps-info.js
+++ b/apps/gpsinfo/gps-info.js
@@ -42,21 +42,21 @@ function getMaidenHead(param1,param2){
 
   lon = lon + 180;
   var t = lon/20;
-  fLon = Math.floor(t);
+  const fLon = Math.floor(t);
   t = (t % fLon)*10;
-  sqLon = Math.floor(t);
+  const sqLon = Math.floor(t);
   t = (t-sqLon)*24;
-  subLon = Math.floor(t);
-  extLon = Math.floor((t-subLon)*10);
+  const subLon = Math.floor(t);
+  const extLon = Math.floor((t-subLon)*10);
 
   lat = lat + 90;
   t = lat/10;
-  fLat = Math.floor(t);
+  const fLat = Math.floor(t);
   t = (t % fLat)*10;
-  sqLat = Math.floor(t);
+  const sqLat = Math.floor(t);
   t=(t-sqLat)*24;
-  subLat = Math.floor(t);
-  extLat = Math.floor((t-subLat)*10);
+  const subLat = Math.floor(t);
+  const extLat = Math.floor((t-subLat)*10);
 
   return U[fLon]+U[fLat]+sqLon+sqLat+L[subLon]+L[subLat]+extLon+extLat;
 }
diff --git a/apps/gpsinfo/metadata.json b/apps/gpsinfo/metadata.json
index 815cdbf21..e12acdc70 100644
--- a/apps/gpsinfo/metadata.json
+++ b/apps/gpsinfo/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "gpsinfo",
   "name": "GPS Info",
-  "version": "0.12",
+  "version": "0.13",
   "description": "An application that displays information about latitude, longitude, altitude, speed, satellites and time",
   "icon": "gps-info.png",
   "type": "app",
diff --git a/apps/gpstouch/geotools.js b/apps/gpstouch/geotools.js
index 5adc57872..93fcc1fdc 100644
--- a/apps/gpstouch/geotools.js
+++ b/apps/gpstouch/geotools.js
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * A module of Geo functions for use with gps fixes
  *
  * let geo = require("geotools");
@@ -71,7 +71,7 @@ OsGridRef.latLongToOsGrid = function(point) {
  *
  */
 function to_map_ref(digits, easting, northing) {
-  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`); // eslint-disable-line comma-spacing
+  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`);
 
   let e = easting;
   let n = northing;
@@ -108,7 +108,7 @@ function to_map_ref(digits, easting, northing) {
 }
 
 /**
- * 
+ *
  * Module exports section, example code below
  *
  * let geo = require("geotools");
diff --git a/apps/ha/ChangeLog b/apps/ha/ChangeLog
index 1ae0d9dce..e87e70eab 100644
--- a/apps/ha/ChangeLog
+++ b/apps/ha/ChangeLog
@@ -9,3 +9,4 @@
 0.09: Improve web interface, arrows in UI
 0.10: Issue newline before GB commands (solves issue with console.log and ignored commands)
 0.11: Minor code improvements
+0.12: Add slider functionality
diff --git a/apps/ha/README.md b/apps/ha/README.md
index b0309b040..53bb64899 100644
--- a/apps/ha/README.md
+++ b/apps/ha/README.md
@@ -3,11 +3,13 @@ This app integrates your Bangle.js into the Home Assistant.
 
 
 # How to use
-Click on the left or right side of the screen to select the triggers that you configured. 
+Click on the left or right side of the screen to select the triggers that you configured.
 Swiping left or right works as well.
 
 Click in the middle of the screen to send the trigger to Home Assistant via Gadgetbridge.
 
+If the trigger is a value one (has `.value = true` in the config), a slider will be displayed for you to alter the value that's sent along with the trigger.
+
 ![](screenshot.png)
 
 
diff --git a/apps/ha/ha.app.js b/apps/ha/ha.app.js
index 14c6dc3be..84501678c 100644
--- a/apps/ha/ha.app.js
+++ b/apps/ha/ha.app.js
@@ -5,7 +5,7 @@ var ha = require("ha.lib.js");
 var W = g.getWidth(), H = g.getHeight();
 var position=0;
 var triggers = ha.getTriggers();
-
+var slider;
 
 function draw() {
   g.reset().clearRect(Bangle.appRect);
@@ -17,15 +17,60 @@ function draw() {
 
   g.setFontAlign(-1,-1);
   var icon = trigger.getIcon();
-  g.setColor(g.theme.fg).drawImage(icon, 12, H/5-2-5);
-  g.drawString("Home", icon.width + 20, H/5-5);
-  g.drawString("Assistant", icon.width + 18, H/5+24-5);
+  var iconY = H / 5 - 2 - 5;
+  g.setColor(g.theme.fg).drawImage(icon, 12, iconY);
 
-  g.setFontAlign(0,0);
-  var ypos = H/5*3+23;
-  g.drawRect(W/2-w/2-8, ypos-h/2-8, W/2+w/2+5, ypos+h/2+5);
-  g.fillRect(W/2-w/2-6, ypos-h/2-6, W/2+w/2+3, ypos+h/2+3);
-  g.setColor(g.theme.bg).drawString(trigger.display, W/2, ypos);
+  if (trigger.value) {
+    if (!slider) {
+      const R = Bangle.appRect;
+      console.log("R", R);
+      const w = 50;
+
+      slider = require("Slider").create(onSlide, {
+        initLevel: 0, // TODO: fetch this?
+
+        mode: "map",
+        steps: 100,
+        timeout: false,
+
+        width: w,
+        xStart: R.w / 2 - w / 2,
+        yStart: R.y,
+        height: R.h - 24,
+
+        dragRect: {
+          x: R.w * 0.3,
+          x2: R.w * 0.6,
+          y: R.y,
+          y2: R.h,
+        },
+      });
+      Bangle.prependListener('drag', slider.f.dragSlider);
+    }
+
+    const r = slider.c.borderRect;
+    g.setColor(g.theme.fg)
+      .setFontAlign(0, 0)
+      .drawString("HA", (r.x + r.w + W) / 2, iconY + g.imageMetrics(icon).height / 2)
+      .setFontAlign(0, 1)
+      .drawString(trigger.display, W / 2, H);
+
+    slider.f.draw(slider.v.level);
+  }else{
+    if (slider) {
+      slider.f.remove();
+      slider = undefined;
+    }
+
+    g.drawString("Home", icon.width + 20, H/5-5);
+    g.drawString("Assistant", icon.width + 18, H/5+24-5);
+
+    g.setFontAlign(0,0);
+    var ypos = H/5*3+23;
+    g.drawRect(W/2-w/2-8, ypos-h/2-8, W/2+w/2+5, ypos+h/2+5);
+    g.fillRect(W/2-w/2-6, ypos-h/2-6, W/2+w/2+3, ypos+h/2+3);
+    g.setColor(g.theme.bg).drawString(trigger.display, W/2, ypos);
+  }
 
   // draw arrows
   g.setColor(g.theme.fg);
@@ -39,6 +84,27 @@ function draw() {
   }
 }
 
+var lastLevel;
+var lastTouch;
+
+function onSlide(mode, level, e) {
+  lastTouch = Date.now();
+
+  if (!e) return;
+
+  if (e.b !== 0) {
+    if (lastLevel == null)
+      lastLevel = level;
+  } else {
+    if (lastLevel != null && lastLevel !== level) {
+      // we've had a drag and level has changed
+      ha.sendValue(triggers[position].trigger, level);
+      lastLevel = null;
+      Bangle.buzz(80, 0.6);
+    }
+  }
+}
+
 function toLeft() {
     Bangle.buzz(40, 0.6);
     position -= 1;
@@ -63,31 +129,36 @@ function sendTrigger() {
     });
 }
 
-Bangle.on('touch', function(btn, e){
-  var left = parseInt(g.getWidth() * 0.3);
+Bangle.on('touch', (btn, e) => {
+  if (Date.now() - lastTouch < 250) return;
+  lastTouch = Date.now();
+
+  var left = g.getWidth() * 0.3;
   var right = g.getWidth() - left;
   var isLeft = e.x < left;
   var isRight = e.x > right;
 
   if(isLeft){
     toLeft();
-  }
-  if(isRight){
+  }else if (isRight){
     toRight();
-  }
-  if(!isRight && !isLeft){
+  }else{
     sendTrigger();
   }
 });
 
 Bangle.on("swipe", (lr,ud) => {
-    if (lr == -1) {
-      toLeft();
-    }
-    if (lr == 1) {
-      toRight();
-    }
-  });
+  if (slider) return; // "disable" swiping on sliders
+  if (Date.now() - lastTouch < 250) return;
+  lastTouch = Date.now();
+
+  if (lr == -1) {
+    toLeft();
+  } else if (lr == 1) {
+    toRight();
+  }
+  E.stopEventPropagation && E.stopEventPropagation();
+});
 
 
 // Send intent that the we started the app.
diff --git a/apps/ha/ha.lib.js b/apps/ha/ha.lib.js
index 7b26b02b2..89802b28d 100644
--- a/apps/ha/ha.lib.js
+++ b/apps/ha/ha.lib.js
@@ -2,8 +2,8 @@
  * This library can be used to read all triggers that a user
  * configured and send a trigger to homeassistant.
  */
-function _getIcon(trigger){
-    const icon = trigger.icon;
+function _getIcon(){
+    const icon = this.icon;
     if(icon == "light"){
       return {
         width : 48, height : 48, bpp : 1,
@@ -33,28 +33,27 @@ function _getIcon(trigger){
 }
 
 exports.getTriggers = function(){
-    var triggers = [
-        {display: "Empty", trigger: "NOP", icon: "ha"},
-    ];
+    var triggers;
 
     try{
-        triggers = require("Storage").read("ha.trigger.json");
-        triggers = JSON.parse(triggers);
-
-        // We lazy load all icons, otherwise, we have to keep
-        // all the icons n times in memory which can be
-        // problematic for embedded devices. Therefore,
-        // we lazy load icons only if needed using the getIcon
-        // method of each trigger...
-        triggers.forEach(trigger => {
-            trigger.getIcon = function(){
-                return _getIcon(trigger);
-            }
-        })
+        triggers = require("Storage").readJSON("ha.trigger.json");
     } catch(e) {
         // In case there are no user triggers yet, we show the default...
+        console.log("ha: error loading triggers:", e);
+        triggers = [
+            {display: "Empty", trigger: "NOP", icon: "ha"},
+        ];
     }
 
+    // We lazy load all icons, otherwise, we have to keep
+    // all the icons n times in memory which can be
+    // problematic for embedded devices. Therefore,
+    // we lazy load icons only if needed using the getIcon
+    // method of each trigger...
+    triggers.forEach(trigger => {
+        trigger.getIcon = _getIcon.bind(trigger);
+    })
+
     return triggers;
 }
 
@@ -66,16 +65,26 @@ exports.sendTrigger = function(triggerName){
             // Now lets send the trigger that we sould send.
             Bluetooth.println("");
             Bluetooth.println(JSON.stringify({
-            t:"intent",
-            action:"com.espruino.gadgetbridge.banglejs.HA",
-            extra:{
-                trigger: triggerName
-            }})
+                t:"intent",
+                action:"com.espruino.gadgetbridge.banglejs.HA",
+                extra:{
+                    trigger: triggerName
+                }})
             );
-            retries = -1;
+            break;
 
         } catch(e){
             retries--;
         }
     }
-}
\ No newline at end of file
+}
+
+exports.sendValue = function(trigger, value){
+    Bluetooth.println(
+        JSON.stringify({
+            t: "intent",
+            action: "com.espruino.gadgetbridge.banglejs.HA",
+            extra: { trigger, value },
+        })
+    );
+};
diff --git a/apps/ha/metadata.json b/apps/ha/metadata.json
index 4983aed7c..3ddf9b858 100644
--- a/apps/ha/metadata.json
+++ b/apps/ha/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ha",
   "name": "Home Assistant",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Integrates your Bangle.js into Home Assistant using Android Integration/Gadgetbridge",
   "icon": "ha.png",
   "type": "app",
diff --git a/apps/hassio/ChangeLog b/apps/hassio/ChangeLog
index 2286a7f70..7c651699c 100644
--- a/apps/hassio/ChangeLog
+++ b/apps/hassio/ChangeLog
@@ -1 +1,2 @@
-0.01: New App!
\ No newline at end of file
+0.01: New App!
+0.02: Get health data for the day
diff --git a/apps/hassio/hassio.boot.js b/apps/hassio/hassio.boot.js
index 14aa34f6a..de8a87141 100644
--- a/apps/hassio/hassio.boot.js
+++ b/apps/hassio/hassio.boot.js
@@ -91,7 +91,7 @@ const runHassio = () => {
     });
 
     const updateSensor = () => {
-      hassioAttributes.health = Bangle.getHealthStatus();
+      hassioAttributes.health = Bangle.getHealthStatus("day");
       hassioAttributes.accel = Bangle.getAccel();
       hassioAttributes.battery = getBattery();
       hassioAttributes.compass = Bangle.getCompass();
@@ -125,4 +125,4 @@ const runHassio = () => {
       setInterval(runHassio, HASSIO.interval);
     }, 5000);
   }
-})();
\ No newline at end of file
+})();
diff --git a/apps/hassio/metadata.json b/apps/hassio/metadata.json
index 0e9c6a2d5..d2d7ea4f3 100644
--- a/apps/hassio/metadata.json
+++ b/apps/hassio/metadata.json
@@ -2,7 +2,7 @@
   "name": "Home Assistant API Interface",
   "shortName":"Hassio",
   "icon": "hassio.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "This app gives access to viewing Home Assistant data and sends health, compass, accelerometer, and battery information to Home Assistant as a sensor through the Home Assistant REST API.",
   "tags": "tool,sensors",
   "supports": ["BANGLEJS2"],
@@ -15,4 +15,4 @@
     {"name":"hassio.img","url":"hassio.img"}
   ],
   "data": [{"name":"hassio.json"}]
-}
\ No newline at end of file
+}
diff --git a/apps/health/ChangeLog b/apps/health/ChangeLog
index 82b57dd44..1d108ece4 100644
--- a/apps/health/ChangeLog
+++ b/apps/health/ChangeLog
@@ -31,3 +31,4 @@
       Fix daily summaries for 31st of the month
 0.28: Calculate distance from steps if myprofile is installed and stride length is set
 0.29: Minor code improvements
+0.30: Minor code improvements
diff --git a/apps/health/app.js b/apps/health/app.js
index 221673e45..17c5e1ceb 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -176,7 +176,6 @@ function barChart(label, dt) {
   chart_label = label;
   chart_data = dt;
   drawBarChart();
-  swipe_enabled = true;
 }
 
 function drawBarChart() {
diff --git a/apps/health/metadata.json b/apps/health/metadata.json
index 1d91a1e56..a1e2d4950 100644
--- a/apps/health/metadata.json
+++ b/apps/health/metadata.json
@@ -2,7 +2,7 @@
   "id": "health",
   "name": "Health Tracking",
   "shortName": "Health",
-  "version": "0.29",
+  "version": "0.30",
   "description": "Logs health data and provides an app to view it",
   "icon": "app.png",
   "tags": "tool,system,health",
diff --git a/apps/helloworld/ChangeLog b/apps/helloworld/ChangeLog
index 969aed43d..3444ec49a 100644
--- a/apps/helloworld/ChangeLog
+++ b/apps/helloworld/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Supports bottom widgets and UI based in UI4swatch!
 0.03: Added compatibility with BJS2, improvements
 0.04: Minor code improvements
+0.05: Minor code improvements
diff --git a/apps/helloworld/helloworld.app.js b/apps/helloworld/helloworld.app.js
index a59f29c78..3951052e5 100644
--- a/apps/helloworld/helloworld.app.js
+++ b/apps/helloworld/helloworld.app.js
@@ -8,7 +8,7 @@
     var v_color_statictxt='#b30000';
     //var v_color_b_area='#111111';   
     //orange RGB format rrggbb     //white,Orange,DarkGreen,Yellow,Maroon,Blue,green,Purple,cyan,olive,DarkCyan,pink
-    var a_colors= Array(0xFFFF,0xFD20,0x03E0,0xFFE0,0x7800,0x001F,0x07E0,0x780F,0x07FF,0x7BE0,0x03EF,0xF81F);
+    var a_colors= [0xFFFF,0xFD20,0x03E0,0xFFE0,0x7800,0x001F,0x07E0,0x780F,0x07FF,0x7BE0,0x03EF,0xF81F];
     
     var x_max_screen=g.getWidth();
     //var y_max_screen=g.getHeight(); 
@@ -47,8 +47,8 @@ if (v_model=='BANGLEJS'||v_model=='EMSCRIPTEN') {
     var v_arraypos=0;
     var v_acolorpos=0; //for fg
     var v_aBGcolorPos=5; //for bg
-    var a_string1 = Array('hola', 'hello', 'saluton', 'ola','ciao', 'salut','czesc','konnichiwa');
-    var a_string2 = Array('mundo!', 'world!', 'mondo!','mundo!','mondo!','monde!','swiat!','sekai!');
+    var a_string1 = ['hola', 'hello', 'saluton', 'ola','ciao', 'salut','czesc','konnichiwa'];
+    var a_string2 = ['mundo!', 'world!', 'mondo!','mundo!','mondo!','monde!','swiat!','sekai!'];
 
    
 }
diff --git a/apps/helloworld/metadata.json b/apps/helloworld/metadata.json
index 3ec5c2a83..ebdc6dcf6 100644
--- a/apps/helloworld/metadata.json
+++ b/apps/helloworld/metadata.json
@@ -2,7 +2,7 @@
   "id": "helloworld",
   "name": "hello, world!",
   "shortName": "hello world",
-  "version": "0.04",
+  "version": "0.05",
   "description": "A cross cultural hello world!/hola mundo! app with colors and languages",
   "icon": "app.png",
   "tags": "input,interface,buttons,touch",
diff --git a/apps/hrm/ChangeLog b/apps/hrm/ChangeLog
index 1f7528170..c682f13cd 100644
--- a/apps/hrm/ChangeLog
+++ b/apps/hrm/ChangeLog
@@ -10,3 +10,4 @@
 0.10: Autoscale raw graph to maximum value seen
 0.11: Automatic translation of strings.
 0.12: Minor code improvements
+0.13: Minor code improvements
diff --git a/apps/hrm/heartrate.js b/apps/hrm/heartrate.js
index 4ff21b0d1..c1bf8a0b9 100644
--- a/apps/hrm/heartrate.js
+++ b/apps/hrm/heartrate.js
@@ -61,7 +61,6 @@ var scale = 2000;
 /* On newer (2v10) firmwares we can subscribe to get
 HRM events as they happen */
 Bangle.on('HRM-raw', function(v) {
-  h=v;
   hrmOffset++;
   if (hrmOffset>g.getWidth()) {
     let thousands = Math.round(rawMax / 1000) * 1000;
@@ -76,7 +75,7 @@ Bangle.on('HRM-raw', function(v) {
   if (rawMax < v.raw) {
     rawMax = v.raw;
   }
-  y = E.clip(btm-(8+v.filt/3000),btm-24,btm);
+  let y = E.clip(btm-(8+v.filt/3000),btm-24,btm);
   g.setColor(1,0,0).fillRect(hrmOffset,btm, hrmOffset, y);
   y = E.clip(btm - (v.raw/scale*84),84,btm);
   g.setColor(g.theme.fg).drawLine(lastHrmPt[0],lastHrmPt[1],hrmOffset, y);
@@ -120,7 +119,7 @@ function readHRM() {
   for (var i=0;i<2;i++) {
     var a = hrmInfo.raw[hrmOffset];
     hrmOffset++;
-    y = E.clip(170 - (a*2),100,230);
+    let y = E.clip(170 - (a*2),100,230);
     g.setColor(g.theme.fg).drawLine(lastHrmPt[0],lastHrmPt[1],hrmOffset, y);
     lastHrmPt = [hrmOffset, y];
   }
diff --git a/apps/hrm/metadata.json b/apps/hrm/metadata.json
index 0c76e6277..2c82f92e5 100644
--- a/apps/hrm/metadata.json
+++ b/apps/hrm/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "hrm",
   "name": "Heart Rate Monitor",
-  "version": "0.12",
+  "version": "0.13",
   "description": "Measure your heart rate and see live sensor data",
   "icon": "heartrate.png",
   "tags": "health",
diff --git a/apps/imgclock/ChangeLog b/apps/imgclock/ChangeLog
index ddd50c176..78b3ee7f8 100644
--- a/apps/imgclock/ChangeLog
+++ b/apps/imgclock/ChangeLog
@@ -9,4 +9,5 @@
 0.08: Use Bangle.setUI for button/launcher handling
 0.09: Bangle.js 2 compatibility
 0.10: Tell clock widgets to hide.
-0.11: Allow fullscreen clock faces with hidden widgets
\ No newline at end of file
+0.11: Allow fullscreen clock faces with hidden widgets
+0.12: Fixed a bug where other app's graphics would not get cleared.
diff --git a/apps/imgclock/app.js b/apps/imgclock/app.js
index 15d9d2fd7..eedb4afe8 100644
--- a/apps/imgclock/app.js
+++ b/apps/imgclock/app.js
@@ -3,6 +3,7 @@ Draws a fullscreen image from flash memory
 Saves a small image to flash which is just the area where the clock is
 Keeps an offscreen buffer and draws the time to that
 */
+g.clear(); //clears other apps's graphics
 var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
 var inf = require("Storage").readJSON("imgclock.face.json");
 var img = require("Storage").read("imgclock.face.img");
diff --git a/apps/imgclock/metadata.json b/apps/imgclock/metadata.json
index 9582bdf16..6f9c8d6e4 100644
--- a/apps/imgclock/metadata.json
+++ b/apps/imgclock/metadata.json
@@ -2,8 +2,8 @@
   "id": "imgclock",
   "name": "Image background clock",
   "shortName": "Image Clock",
-  "version": "0.11",
-  "description": "A clock with an image as a background",
+  "version": "0.12",
+  "description": "A clock with an image as a background. **Note:** this clock shows seconds, so has higher than average power consumption.",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
diff --git a/apps/intclock/README.md b/apps/intclock/README.md
index 7d31cdae2..55f1dca74 100644
--- a/apps/intclock/README.md
+++ b/apps/intclock/README.md
@@ -1,4 +1,4 @@
-# Analogue Clock
+# Interlaced Clock
 
-![](screenshot_analog.png)
+![](screenshot.png)
 
diff --git a/apps/ios/ChangeLog b/apps/ios/ChangeLog
index 86ce9ff4e..904ad1f7d 100644
--- a/apps/ios/ChangeLog
+++ b/apps/ios/ChangeLog
@@ -15,4 +15,5 @@
       Allow negative/positive actions to pass through to message GUI
 0.15: Enable calendar and weather updates via custom notifications (via shortcuts app)
 0.16: Always request Current Time service from iOS
-0.17: Default to passing full UTF8 strings into messages app (which can now process them with an international font)
\ No newline at end of file
+0.17: Default to passing full UTF8 strings into messages app (which can now process them with an international font)
+0.18: Fix UTF8 conversion (check for `font` library, not `fonts`)
\ No newline at end of file
diff --git a/apps/ios/boot.js b/apps/ios/boot.js
index dd0cca511..fe9cde77d 100644
--- a/apps/ios/boot.js
+++ b/apps/ios/boot.js
@@ -298,7 +298,7 @@ E.emit("ANCS", {
       NRF.ctsGetTime().then(ctsUpdate, function(){ /* */ })
     E.on('CTS',ctsUpdate);
   }
-  if (settings.no_utf8 || !require("Storage").read("fonts")) {
+  if (settings.no_utf8 || !require("Storage").read("font")) {
     // if UTF8 disabled or there is no fonts lib, convert UTF8 to ISO8859-1
     let unicodeRemap = {
       '2019':"'",
diff --git a/apps/ios/metadata.json b/apps/ios/metadata.json
index c3427d3b8..6efcac15e 100644
--- a/apps/ios/metadata.json
+++ b/apps/ios/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ios",
   "name": "iOS Integration",
-  "version": "0.17",
+  "version": "0.18",
   "description": "Display notifications/music/etc from iOS devices",
   "icon": "app.png",
   "tags": "tool,system,ios,apple,messages,notifications",
diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog
index f60933fb8..1cd75a189 100644
--- a/apps/kbmulti/ChangeLog
+++ b/apps/kbmulti/ChangeLog
@@ -8,3 +8,5 @@
 	edge versions of 2v18. Falls back on `Bangle.on()` for backwards
 	compatability.
 0.08: Minor code improvements
+0.09: Recapitalise when returning to the start, and add setting to vibrate on
+	interaction
diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js
index 2f0a1a9ae..bdd43d7aa 100644
--- a/apps/kbmulti/lib.js
+++ b/apps/kbmulti/lib.js
@@ -5,11 +5,13 @@ exports.input = function(options) {
   var text = options.text;
   if ("string"!=typeof text) text="";
 
-  var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
-  if (settings.firstLaunch===undefined) { settings.firstLaunch = true; }
-  if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
-  if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
-  if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
+  var settings = Object.assign({
+    firstLaunch: true,
+    showHelpBtn: true,
+    charTimeout: 500,
+    autoLowercase: true,
+    vibrate: false,
+  }, require('Storage').readJSON("kbmulti.settings.json", true));
 
   var fontSize = "6x15";
   var Layout = require("Layout");
@@ -28,25 +30,25 @@ exports.input = function(options) {
   var caps = true;
   var layout;
   var btnWidth = g.getWidth()/3;
-  
+
   function getMoveChar(){
     return "\x00\x0B\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00@\x1F\xE1\x00\x10\x00\x10\x01\x0F\xF0\x04\x01\x00";
   }
-  
+
   function getMoreChar(){
     return "\x00\x0B\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xDB\x1B`\x00\x00\x00";
   }
 
-  
   function getCursorChar(){
-    return "\x00\x0B\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xAA\xAA\x80";  }
+    return "\x00\x0B\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xAA\xAA\x80";
+  }
 
   function displayText(hideMarker) {
     layout.clear(layout.text);
 
     //let charsBeforeCursor = textIndex;
     let charsAfterCursor = Math.min(text.length - textIndex, (textWidth)/2);
-    
+
 
     let start = textIndex - Math.ceil(textWidth - charsAfterCursor);
     let startMore = false;
@@ -76,7 +78,9 @@ exports.input = function(options) {
     deactivateTimeout(charTimeout);
     if (textIndex > -1){
       text = text.slice(0, textIndex) + text.slice(textIndex + 1);
-      if (textIndex > -1) textIndex --;
+      textIndex--;
+      if (textIndex == -1 && !caps)
+        setCaps()
       newCharacter();
     }
   }
@@ -96,7 +100,12 @@ exports.input = function(options) {
     charIndex = 0;
   }
 
+  function onInteract() {
+    if (settings.vibrate) Bangle.buzz(20);
+  }
+
   function onKeyPad(key) {
+    onInteract();
     var retire = 0;
     deactivateTimeout(charTimeout);
     // work out which char was pressed
@@ -110,12 +119,12 @@ exports.input = function(options) {
     var newLetter = letters[charCurrent][charIndex];
     let pre = text.slice(0, textIndex);
     let post = text.slice(textIndex, text.length);
-    
+
     text = pre + (caps ? newLetter.toUpperCase() : newLetter.toLowerCase()) + post;
 
     if(retire)
       retireCurrent();
-    
+
     // set a timeout
     charTimeout = setTimeout(function() {
       charTimeout = undefined;
@@ -125,7 +134,7 @@ exports.input = function(options) {
     displayText(true);
   }
 
-  function retireCurrent(why) {
+  function retireCurrent() {
     if (caps && settings.autoLowercase)
       setCaps();
   }
@@ -133,6 +142,7 @@ exports.input = function(options) {
   var moveMode = false;
 
   function onSwipe(dirLeftRight, dirUpDown) {
+    onInteract();
     if (dirUpDown == -1) {
       moveMode = !moveMode;
       displayText(false);
diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json
index b8fa74a45..28e2bbd38 100644
--- a/apps/kbmulti/metadata.json
+++ b/apps/kbmulti/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbmulti",
   "name": "Multitap keyboard",
-  "version": "0.08",
+  "version": "0.09",
   "description": "A library for text input via multitap/T9 style keypad",
   "icon": "app.png",
   "type":"textinput",
diff --git a/apps/kbmulti/settings.js b/apps/kbmulti/settings.js
index 08dbb1925..a39aa2e6c 100644
--- a/apps/kbmulti/settings.js
+++ b/apps/kbmulti/settings.js
@@ -1,21 +1,26 @@
 (function(back) {
     function settings() {
-      var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
-      if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
-      if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
-      if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
+      var settings = Object.assign({
+        showHelpBtn: true,
+        charTimeout: 500,
+        autoLowercase: true,
+        vibrate: false,
+      }, require('Storage').readJSON("kbmulti.settings.json", true));
+
       return settings;
     }
-      
+
     function updateSetting(setting, value) {
       var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
       settings[setting] = value;
       require('Storage').writeJSON("kbmulti.settings.json", settings);
     }
-    
+
     var mainmenu = {
-      "" : { "title" : /*LANG*/"Multitap keyboard" },
-      "< Back" : back,
+      "" : {
+        "title" : /*LANG*/"Multitap keyboard",
+        "back": back,
+      },
       /*LANG*/'Character selection timeout [ms]': {
         value: settings().charTimeout,
         min: 200, max: 1500, step : 50,
@@ -26,6 +31,10 @@
         value: !!settings().autoLowercase,
         onchange: v =>  updateSetting("autoLowercase", v)
       },
+      /*LANG*/'Vibrate on keypress': {
+        value: !!settings().vibrate,
+        onchange: v =>  updateSetting("vibrate", v)
+      },
       /*LANG*/'Show help button?': {
         value: !!settings().showHelpBtn,
         onchange: v =>  updateSetting("showHelpBtn", v)
diff --git a/apps/kineticscroll/ChangeLog b/apps/kineticscroll/ChangeLog
index 7727f3cc4..f85af87de 100644
--- a/apps/kineticscroll/ChangeLog
+++ b/apps/kineticscroll/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New App!
 0.02: Minor code improvements
+0.03: Better scrolling behaviour
+0.04: Fix incorrect appRect handling (missing back buttons and doubled menu titles)
diff --git a/apps/kineticscroll/boot.js b/apps/kineticscroll/boot.js
index 71234596e..4deb71cc7 100644
--- a/apps/kineticscroll/boot.js
+++ b/apps/kineticscroll/boot.js
@@ -9,29 +9,40 @@
       remove = function()
       select = function(idx, touch)
     }
-  
+
     returns {
       scroll: int                // current scroll amount
       draw: function()           // draw all
       drawItem : function(idx)   // draw specific item
       isActive : function()      // is this scroller still active?
     }
-  
+
     */
     if (!options) return Bangle.setUI(); // remove existing handlers
-    
-    const MAX_VELOCITY=100;
+
+    const SPEED=100;
+    const LAST_DRAG_WAIT=150;
+    const MIN_VELOCITY=0.1;
+
     let scheduledDraw;
+
     let velocity = 0;
     let accDy = 0;
-    let scheduledBrake = setInterval(()=>{velocity*=0.9;}, 50);
+    let direction = 0;
+
+    let lastTouchedDrag = 0;
     let lastDragStart = 0;
-    let R = Bangle.appRect;
+
     let menuScrollMin = 0|options.scrollMin;
-    let menuScrollMax = options.h*options.c - R.h;
-    if (menuScrollMax<menuScrollMin) menuScrollMax=menuScrollMin;
-    
+
+    const getMenuScrollMax = () => {
+      let menuScrollMax = options.h*options.c - Bangle.appRect.h;
+      if (menuScrollMax<menuScrollMin) menuScrollMax=menuScrollMin;
+      return menuScrollMax;
+    };
+
     const touchHandler = (_,e)=>{
+      let R = Bangle.appRect;
       if (e.y<R.y-4) return;
       velocity = 0;
       accDy = 0;
@@ -39,42 +50,46 @@
       if ((menuScrollMin<0 || i>=0) && i<options.c){
         let yAbs = (e.y + rScroll - R.y);
         let yInElement = yAbs - i*options.h;
-        print("selected");
         options.select(i, {x:e.x, y:yInElement});
       }
     };
 
     const uiDraw = () => {
+      let R = Bangle.appRect;
       g.reset().clearRect(R).setClipRect(R.x,R.y,R.x2,R.y2);
       var a = YtoIdx(R.y);
       var b = Math.min(YtoIdx(R.y2),options.c-1);
       for (var i=a;i<=b;i++)
         options.draw(i, {x:R.x,y:idxToY(i),w:R.w,h:options.h});
       g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
-    }
+    };
 
     const draw = () => {
-      let dy = velocity;
-      if (s.scroll - dy > menuScrollMax){
-        dy = s.scroll - menuScrollMax;
+      let R = Bangle.appRect;
+      if (velocity > MIN_VELOCITY){
+        if (!scheduledDraw)
+          scheduledDraw = setTimeout(draw, 0);
+        velocity *= 1-((Date.now() - lastTouchedDrag) / 8000);
+        if (velocity <= MIN_VELOCITY){
+          velocity = 0;
+        } else {
+          s.scroll -= velocity * direction;
+        }
+      }
+      let menuScrollMax = getMenuScrollMax();
+      if (s.scroll > menuScrollMax){
+        s.scroll = menuScrollMax;
         velocity = 0;
       }
-      if (s.scroll - dy < menuScrollMin){
-        dy = s.scroll - menuScrollMin;
+      if (s.scroll < menuScrollMin){
+        s.scroll = menuScrollMin;
         velocity = 0;
       }
-    
-      s.scroll -= dy;
-    
+
       let oldScroll = rScroll;
       rScroll = s.scroll &~1;
       let d = oldScroll-rScroll;
-    
-      if (Math.abs(velocity) > 0.01)
-        scheduledDraw = setTimeout(draw,0);
-      else
-        scheduledDraw = undefined;
-    
+
       if (!d) {
         return;
       }
@@ -83,7 +98,7 @@
         let y = Math.max(R.y2-(1-d), R.y);
         g.setClipRect(R.x,y,R.x2,R.y2);
         let i = YtoIdx(y);
-    
+
         for (y = idxToY(i);y < R.y2;y+=options.h) {
           options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
           i++;
@@ -93,86 +108,85 @@
         g.setClipRect(R.x,R.y,R.x2,y);
         let i = YtoIdx(y);
         y = idxToY(i);
-    
+
         for (y = idxToY(i);y > R.y-options.h;y-=options.h) {
           options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
           i--;
         }
       }
       g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+      scheduledDraw = undefined;
     };
-    
+
     const dragHandler = e=>{
-      if ((velocity <0 && e.dy>0) || (velocity > 0 && e.dy<0)){
-        velocity *= -1;
-        accDy = 5 * velocity;
-      }
-      //velocity += e.dy * (Date.now() - lastDrag);
+      let now=Date.now();
+      direction = Math.sign(e.dy);
+      s.scroll -= e.dy;
       if (e.b > 0){
-        if (!lastDragStart){
-          lastDragStart = Date.now();
+        // Finger touches the display or direction has been reversed
+        lastTouchedDrag = now;
+        if (!lastDragStart || (accDy * direction < 0 && e.dy * direction > 0)){
+          lastDragStart = lastTouchedDrag;
           velocity = 0;
           accDy = 0;
         }
+
         accDy += e.dy;
-      }
-      velocity = accDy / (Date.now() - lastDragStart) * MAX_VELOCITY;
-    
-      if (lastDragStart && e.b == 0){
-        accDy = 0;
+      } else {
+        // Finger has left the display, only start scrolling kinetically when the last drag event is close enough
+        if (now - lastTouchedDrag < LAST_DRAG_WAIT){
+          velocity = direction * accDy / (now - lastDragStart) * SPEED;
+        }
         lastDragStart = 0;
       }
-    
-      velocity = E.clip(velocity,-MAX_VELOCITY,MAX_VELOCITY);
-      //lastDrag=Date.now();
-      if (!scheduledDraw){
-        scheduledDraw = setTimeout(draw,0);
-      }
+      draw();
     };
-    
+
     let uiOpts = {
       mode : "custom",
       back : options.back,
       drag : dragHandler,
       touch : touchHandler,
       redraw : uiDraw
-    }
+    };
 
     if (options.remove) uiOpts.remove = () => {
       if (scheduledDraw)
         clearTimeout(scheduledDraw);
-      clearInterval(scheduledBrake);
       options.remove();
-    }
+    };
 
     Bangle.setUI(uiOpts);
 
-
-    
     function idxToY(i) {
-      return i*options.h + R.y - rScroll;
+      return i*options.h + Bangle.appRect.y - rScroll;
     }
+
     function YtoIdx(y) {
-      return Math.floor((y + rScroll - R.y)/options.h);
+      return Math.floor((y + rScroll - Bangle.appRect.y)/options.h);
     }
-    
+
     let s = {
-      scroll : E.clip(0|options.scroll,menuScrollMin,menuScrollMax),
+      scroll : E.clip(0|options.scroll,menuScrollMin,getMenuScrollMax()),
       draw : () => {
+        let R = Bangle.appRect;
         g.reset().clearRect(R).setClipRect(R.x,R.y,R.x2,R.y2);
         let a = YtoIdx(R.y);
         let b = Math.min(YtoIdx(R.y2),options.c-1);
         for (let i=a;i<=b;i++)
           options.draw(i, {x:R.x,y:idxToY(i),w:R.w,h:options.h});
         g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
-      }, drawItem : i => {
+      },
+      drawItem : i => {
+        let R = Bangle.appRect;
         let y = idxToY(i);
         g.reset().setClipRect(R.x,Math.max(y,R.y),R.x2,Math.min(y+options.h,R.y2));
         options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
         g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
-  }, isActive : () => Bangle.uiRedraw == uiDraw
+      },
+      isActive : () => Bangle.uiRedraw == uiDraw
     };
-    
+
     let rScroll = s.scroll&~1; // rendered menu scroll (we only shift by 2 because of dither)
     s.draw(); // draw the full scroller
     g.flip(); // force an update now to make this snappier
diff --git a/apps/kineticscroll/boot.min.js b/apps/kineticscroll/boot.min.js
index 60c6002ca..5243ddbc6 100644
--- a/apps/kineticscroll/boot.min.js
+++ b/apps/kineticscroll/boot.min.js
@@ -1,4 +1,5 @@
-(function(){E.showScroller=function(c){function k(a){return a*c.h+b.y-l}function h(a){return Math.floor((a+l-b.y)/c.h)}if(!c)return Bangle.setUI();let p,e=0,m=0,w=setInterval(()=>{e*=.9},50),q=0,b=Bangle.appRect,n=0|c.scrollMin,r=c.h*c.c-b.h;r<n&&(r=n);const t=()=>{g.reset().clearRect(b).setClipRect(b.x,b.y,b.x2,b.y2);for(var a=h(b.y),d=Math.min(h(b.y2),c.c-1);a<=d;a++)c.draw(a,{x:b.x,y:k(a),w:b.w,h:c.h});g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1)},u=()=>{var a=e;f.scroll-a>r&&
-(a=f.scroll-r,e=0);f.scroll-a<n&&(a=f.scroll-n,e=0);f.scroll-=a;a=l;l=f.scroll&-2;a-=l;p=.01<Math.abs(e)?setTimeout(u,0):void 0;if(a){g.reset().setClipRect(b.x,b.y,b.x2,b.y2).scroll(0,a);if(0>a){a=Math.max(b.y2-(1-a),b.y);g.setClipRect(b.x,a,b.x2,b.y2);var d=h(a);for(a=k(d);a<b.y2;a+=c.h)c.draw(d,{x:b.x,y:a,w:b.w,h:c.h}),d++}else for(a=Math.min(b.y+a,b.y2),g.setClipRect(b.x,b.y,b.x2,a),d=h(a),k(d),a=k(d);a>b.y-c.h;a-=c.h)c.draw(d,{x:b.x,y:a,w:b.w,h:c.h}),d--;g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-
-1)}};let v={mode:"custom",back:c.back,drag:a=>{if(0>e&&0<a.dy||0<e&&0>a.dy)e*=-1,m=5*e;0<a.b&&(q||(q=Date.now(),m=e=0),m+=a.dy);e=m/(Date.now()-q)*100;q&&0==a.b&&(q=m=0);e=E.clip(e,-100,100);p||(p=setTimeout(u,0))},touch:(a,d)=>{if(!(d.y<b.y-4)&&(m=e=0,a=h(d.y),(0>n||0<=a)&&a<c.c)){let x=d.y+l-b.y-a*c.h;print("selected");c.select(a,{x:d.x,y:x})}},redraw:t};c.remove&&(v.remove=()=>{p&&clearTimeout(p);clearInterval(w);c.remove()});Bangle.setUI(v);let f={scroll:E.clip(0|c.scroll,
-n,r),draw:()=>{g.reset().clearRect(b).setClipRect(b.x,b.y,b.x2,b.y2);var a=h(b.y);let d=Math.min(h(b.y2),c.c-1);for(;a<=d;a++)c.draw(a,{x:b.x,y:k(a),w:b.w,h:c.h});g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1)},drawItem:a=>{let d=k(a);g.reset().setClipRect(b.x,Math.max(d,b.y),b.x2,Math.min(d+c.h,b.y2));c.draw(a,{x:b.x,y:d,w:b.w,h:c.h});g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1)},isActive:()=>Bangle.uiRedraw==t},l=f.scroll&-2;f.draw();g.flip();return f}})()
\ No newline at end of file
+(function(){E.showScroller=function(c){function k(a){return a*c.h+Bangle.appRect.y-l}function h(a){return Math.floor((a+l-Bangle.appRect.y)/c.h)}if(!c)return Bangle.setUI();let n,f=0,p=0,q=0,r=0,t=0,m=0|c.scrollMin;const u=()=>{let a=c.h*c.c-Bangle.appRect.h;a<m&&(a=m);return a},v=()=>{let a=Bangle.appRect;g.reset().clearRect(a).setClipRect(a.x,a.y,a.x2,a.y2);for(var b=h(a.y),d=Math.min(h(a.y2),c.c-1);b<=d;b++)c.draw(b,{x:a.x,y:k(b),w:a.w,h:c.h});g.setClipRect(0,0,g.getWidth()-
+1,g.getHeight()-1)},w=()=>{let a=Bangle.appRect;.1<f&&(n||(n=setTimeout(w,0)),f*=1-(Date.now()-r)/8E3,.1>=f?f=0:e.scroll-=f*q);var b=u();e.scroll>b&&(e.scroll=b,f=0);e.scroll<m&&(e.scroll=m,f=0);b=l;l=e.scroll&-2;if(b-=l){g.reset().setClipRect(a.x,a.y,a.x2,a.y2).scroll(0,b);if(0>b){b=Math.max(a.y2-(1-b),a.y);g.setClipRect(a.x,b,a.x2,a.y2);var d=h(b);for(b=k(d);b<a.y2;b+=c.h)c.draw(d,{x:a.x,y:b,w:a.w,h:c.h}),d++}else for(b=Math.min(a.y+b,a.y2),g.setClipRect(a.x,a.y,a.x2,b),d=h(b),k(d),b=k(d);b>a.y-
+c.h;b-=c.h)c.draw(d,{x:a.x,y:b,w:a.w,h:c.h}),d--;g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);n=void 0}};let x={mode:"custom",back:c.back,drag:a=>{let b=Date.now();q=Math.sign(a.dy);e.scroll-=a.dy;if(0<a.b){r=b;if(!t||0>p*q&&0<a.dy*q)t=r,p=f=0;p+=a.dy}else 150>b-r&&(f=q*p/(b-t)*100),t=0;w()},touch:(a,b)=>{a=Bangle.appRect;if(!(b.y<a.y-4)){p=f=0;var d=h(b.y);(0>m||0<=d)&&d<c.c&&c.select(d,{x:b.x,y:b.y+l-a.y-d*c.h})}},redraw:v};c.remove&&(x.remove=()=>{n&&clearTimeout(n);c.remove()});Bangle.setUI(x);
+let e={scroll:E.clip(0|c.scroll,m,u()),draw:()=>{let a=Bangle.appRect;g.reset().clearRect(a).setClipRect(a.x,a.y,a.x2,a.y2);var b=h(a.y);let d=Math.min(h(a.y2),c.c-1);for(;b<=d;b++)c.draw(b,{x:a.x,y:k(b),w:a.w,h:c.h});g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1)},drawItem:a=>{let b=Bangle.appRect,d=k(a);g.reset().setClipRect(b.x,Math.max(d,b.y),b.x2,Math.min(d+c.h,b.y2));c.draw(a,{x:b.x,y:d,w:b.w,h:c.h});g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1)},isActive:()=>Bangle.uiRedraw==v},l=e.scroll&
+-2;e.draw();g.flip();return e}})()
\ No newline at end of file
diff --git a/apps/kineticscroll/metadata.json b/apps/kineticscroll/metadata.json
index 3d275e8c4..528c99792 100644
--- a/apps/kineticscroll/metadata.json
+++ b/apps/kineticscroll/metadata.json
@@ -1,7 +1,7 @@
 { "id": "kineticscroll",
   "name": "Kinetic Scroll",
   "shortName":"Kinetic Scroll",
-  "version": "0.02",
+  "version": "0.04",
   "description": "Replacement for the system scroller with kinetic scrolling.",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/kitchen/kitchen.app.js b/apps/kitchen/kitchen.app.js
index 2c2cebaef..1d3d70a1f 100644
--- a/apps/kitchen/kitchen.app.js
+++ b/apps/kitchen/kitchen.app.js
@@ -463,7 +463,7 @@ OsGridRef.latLongToOsGrid = function(point) {
  *
  */
 function to_map_ref(digits, easting, northing) {
-  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`); // eslint-disable-line comma-spacing
+  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`);
 
   let e = easting;
   let n = northing;
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index 0aff8c49f..608f32fd5 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -20,3 +20,4 @@
 0.18: Add 'back' icon in top-left to go back to clock
 0.19: Fix regression after back button added (returnToClock was called twice!)
 0.20: Use Bangle.showClock for changing to clock
+0.21: Make the "App source not found" warning less buggy
diff --git a/apps/launch/app.js b/apps/launch/app.js
index 36f3aaf4b..b34c4d2f6 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -42,47 +42,52 @@ let apps = launchCache.apps;
 if (!settings.fullscreen)
   Bangle.loadWidgets();
 
-E.showScroller({
-  h : 64*scaleval, c : apps.length,
-  draw : (i, r) => {
-    var app = apps[i];
-    if (!app) return;
-    g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
-    g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
-    if (app.icon) {
-      if (!app.img) app.img = s.read(app.icon); // load icon if it wasn't loaded
-      try {g.drawImage(app.img,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
+const drawMenu = () => {
+  E.showScroller({
+    h : 64*scaleval, c : apps.length,
+    draw : (i, r) => {
+      var app = apps[i];
+      if (!app) return;
+      g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
+      g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
+      if (app.icon) {
+        if (!app.img) app.img = s.read(app.icon); // load icon if it wasn't loaded
+        try {g.drawImage(app.img,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
+      }
+    },
+    select : i => {
+      var app = apps[i];
+      if (!app) return;
+      if (!app.src || require("Storage").read(app.src)===undefined) {
+        E.showScroller();
+        E.showMessage(/*LANG*/"App Source\nNot found");
+        setTimeout(drawMenu, 2000);
+      } else {
+        load(app.src);
+      }
+    },
+    back : Bangle.showClock, // button press or tap in top left shows clock now
+    remove : () => {
+      // cleanup the timeout to not leave anything behind after being removed from ram
+      if (lockTimeout) clearTimeout(lockTimeout);
+      Bangle.removeListener("lock", lockHandler);
     }
-  },
-  select : i => {
-    var app = apps[i];
-    if (!app) return;
-    if (!app.src || require("Storage").read(app.src)===undefined) {
-      E.showMessage(/*LANG*/"App Source\nNot found");
-      setTimeout(drawMenu, 2000);
-    } else {
-      load(app.src);
-    }
-  },
-  back : Bangle.showClock, // button press or tap in top left shows clock now
-  remove : () => {
-    // cleanup the timeout to not leave anything behind after being removed from ram
-    if (lockTimeout) clearTimeout(lockTimeout);
-    Bangle.removeListener("lock", lockHandler);
-  }
-});
-g.flip(); // force a render before widgets have finished drawing
+  });
+  g.flip(); // force a render before widgets have finished drawing
+
+  // 10s of inactivity goes back to clock
+  Bangle.setLocked(false); // unlock initially
+  let lockTimeout;
+  let lockHandler = function(locked) {
+    if (lockTimeout) clearTimeout(lockTimeout);
+    lockTimeout = undefined;
+    if (locked)
+      lockTimeout = setTimeout(Bangle.showClock, 10000);
+  }
+  Bangle.on("lock", lockHandler);
+};
+drawMenu();
 
-// 10s of inactivity goes back to clock
-Bangle.setLocked(false); // unlock initially
-let lockTimeout;
-let lockHandler = function(locked) {
-  if (lockTimeout) clearTimeout(lockTimeout);
-  lockTimeout = undefined;
-  if (locked)
-    lockTimeout = setTimeout(Bangle.showClock, 10000);
-}
-Bangle.on("lock", lockHandler);
 if (!settings.fullscreen) // finally draw widgets
   Bangle.drawWidgets();
 }
diff --git a/apps/launch/metadata.json b/apps/launch/metadata.json
index 85fcdd02f..86f52089f 100644
--- a/apps/launch/metadata.json
+++ b/apps/launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "launch",
   "name": "Launcher",
   "shortName": "Launcher",
-  "version": "0.20",
+  "version": "0.21",
   "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index e2c2b1faf..7670a0ff5 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -28,3 +28,4 @@
 0.28: Battery Vref implemented correctly.
 0.29: Support fastload.
 0.30: Add many new colors to the settings and allows random colors on startup if enabled.
+0.31: Replace degree symbol in temperature by '.
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 9923fb445..13b71ac80 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -678,7 +678,7 @@ let getWeather = function(){
     let weather = weatherJson.weather;
 
     // Temperature
-    weather.temp = locale.temp(weather.temp-273.15);
+    weather.temp = locale.temp(weather.temp-273.15).replace('°', '\'');
 
     // Humidity
     weather.hum = weather.hum + "%";
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 60ce9c3f7..6db85262e 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,7 +3,7 @@
   "name": "LCARS Clock",
   "shortName":"LCARS",
   "icon": "lcars.png",
-  "version":"0.30",
+  "version":"0.31",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js
index 5564b113a..e5a2170bd 100644
--- a/apps/lint_exemptions.js
+++ b/apps/lint_exemptions.js
@@ -1,1484 +1,1303 @@
 module.exports = {
-  "xxlmessage/app.js": {
+  "apps/xxlmessage/app.js": {
     "hash": "14a9ea1fbcf0e1053df1a77d7ee7acd543f1ed63e26ecf220468c3813f93de4f",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "waternet/app.js": {
+  "apps/waternet/app.js": {
     "hash": "a03fbfc731811f8cc9ea8c96781ff7fe46532c5f9e628b317892069e43b97012",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "tabata/tabata.js": {
+  "apps/tabata/tabata.js": {
     "hash": "bba68fd35b57afe00adb054d598d8bde74cf2c9cb1d1d7ae27c17e13899383ee",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "speedalt2/GPS Adv Sports II.js": {
+  "apps/speedalt2/GPS Adv Sports II.js": {
     "hash": "1b0dff5c4ebe0c8042dec9456f809ebaada379357188b8a18dc17a144ee8c071",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "timerclk/alarm.alert.js": {
+  "apps/timerclk/alarm.alert.js": {
     "hash": "2d422f738c044dcf0d6a43712c672dccc0ad4f2d0a877ee11f0a96ec3d939714",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "spacew/prep/split.js": {
+  "apps/spacew/prep/split.js": {
     "hash": "06f25475a3765417e42dc7638ee500b546d3ce75ac28b39b8b836c0aee2ea2cb",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "spacew/bench.js": {
+  "apps/spacew/bench.js": {
     "hash": "428a741d8dfba625cb1d2958dab3b6c7b0ca05f582b00e06ec9f7f495658beb6",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "spacew/app.js": {
+  "apps/spacew/app.js": {
     "hash": "6467f44962655f10a649226a2ea180a3662308146d2f19d15903a16ae081d282",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "smclock/app.js": {
+  "apps/smclock/app.js": {
     "hash": "8f338b03c24738793d62b7a2c4d0c2b41ab0538394adc6f3d977776b68ee3287",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "sleepphasealarm/app.js": {
-    "hash": "d234fea5d711ae5a149879e53b28bc9002860c6b6a75285e1fc04093fe400a88",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "sleeplog/settings.js": {
-    "hash": "bd5e3e1382321df6682ef1cb718b0e15ab355422bef77278eb086f213f643021",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "showimg/app.js": {
+  "apps/showimg/app.js": {
     "hash": "71cbbaa488e2d08c5bf28f7d56178d5e7694eb9761cd4752bbc9733e825d4bcf",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "sensible/sensible.js": {
+  "apps/sensible/sensible.js": {
     "hash": "4b8b4417c352d7a86f39653c812356c36e56770e44051d645c522f986e98abfe",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "rpnsci/app.js": {
+  "apps/rpnsci/app.js": {
     "hash": "e5bf536babe9b30e7f40b03826d7052aec98f806a7ab3b80b10438e9bf2cc61b",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "recorder/app.js": {
-    "hash": "64c838b63a756a712555ae54d0bae89f0373ce317c289f7b19a583d3f91d473b",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "podadrem/app.js": {
+  "apps/podadrem/app.js": {
     "hash": "f7392e74974f69553aade2dcc07527b5d3b71a9b84e6dc5e0dd995e78dff8007",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "openstmap/imagefilter.js": {
+  "apps/openstmap/imagefilter.js": {
     "hash": "8a71e9a0ecfa94150379c41a5a915cfdac39f8b2e485e5cc1ce4629e85293acd",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "mtnclock/app.js": {
+  "apps/mtnclock/app.js": {
     "hash": "c48e3ed1a605e6a131e5947718e26cc9481c6eeab36c5670bb74f0c58cb96cd8",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "mmonday/manic-monday.js": {
+  "apps/mmonday/manic-monday.js": {
     "hash": "2eff38d4d1cde2b9f17800a554da58300a6250de3e014995a6958a11bcb5b76a",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "mixdiganclock/mixdiganclock.app.js": {
+  "apps/mixdiganclock/mixdiganclock.app.js": {
     "hash": "97beda5daa3b6e60f27dcad1230dd49a9c3b3e81cf55d644496c797fbef1256f",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "legoremote/app.js": {
+  "apps/legoremote/app.js": {
     "hash": "af12068cd1b84369aa8416a82e9335298f6a4b69b56aa7bc70b9eb0d91e6d78e",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "lightswitch/settings.js": {
+  "apps/lightswitch/settings.js": {
     "hash": "340a664f7f82fbffcb108bfceded78dbbe162717d4e4dda0f08452ca79fa3881",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "kbtouch/lib.js": {
+  "apps/kbtouch/lib.js": {
     "hash": "725b41b792a0f9879257e61cc5c2ba30df777c21137bd2d2e324ab83be7b8012",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "jbm8b_IT/app.js": {
+  "apps/jbm8b_IT/app.js": {
     "hash": "52df7b9bcac876176d66cbb65f7015cb0b5933ba585a6e3f6b93766bbe19fb11",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "jbm8b/app.js": {
+  "apps/jbm8b/app.js": {
     "hash": "7ec45c7d21590f8fa9167f4953fa6da40190d0f287f436dac7a2c4b62d82d429",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "wristlight/app.js": {
+  "apps/wristlight/app.js": {
     "hash": "7400a20766b3f3cd837c29ce09c8dbb5bca19a854392fd2b907d7ac058888e2f",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "widhrm/widget.js": {
+  "apps/widhrm/widget.js": {
     "hash": "9c5fd63130c579a015f5600862ec1a5032387a41e058950c739c9875bc81c6bf",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "waypoints/waypoints.app.js": {
+  "apps/waypoints/waypoints.app.js": {
     "hash": "ff02639eb8f81784c942093d57d254295e2c78918adb4bcffdf0d0284ebfac55",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "timerclk/timer.js": {
-    "hash": "f44702e61ad833b53fb28d222ff0fbd77d0307c6eb69c5ecebb8626a1cb20ed4",
+  "apps/timerclk/timer.js": {
+    "hash": "3b70606f1742b34bf4769f6e8703144ff0c3ba401a3a21f97ddcab5432c94db5",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "timerclk/stopwatch.js": {
+  "apps/timerclk/stopwatch.js": {
     "hash": "92838c03923e162c0e9ab4f37ca0220a1fee61ed16cba1d38c79d7bdd0e18765",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "timerclk/alarm.js": {
-    "hash": "6f521742cc6a6d6f215e499084a596ffc3494d1e1f950b204368c051a18773de",
+  "apps/timerclk/alarm.js": {
+    "hash": "3c280b0858d43f10b12947e5ae939c6825a620e6cb3687c6a7549c1a000b6241",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "speedalt2/app.js": {
+  "apps/speedalt2/app.js": {
     "hash": "0340a957d78e772467e50874f52817e27be9c52a1257ca38dab5892df15a8e3c",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "skyspy/skyspy.app.js": {
+  "apps/skyspy/skyspy.app.js": {
     "hash": "49a727a4c052e8c6322a502750ca036b0d58896f476b1cffebe9c53e426c8bcc",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "sixths/sixths.app.js": {
-    "hash": "b4572a529b31a5edcbd6ca5843b91c54abcbf75b2a28e90bd33751f7d6a3ebcd",
+  "apps/sixths/sixths.app.js": {
+    "hash": "2a4676828bdf78df052df402de34e6f1abd1c847ebe0d193fc789cd6e9dd0e5c",
     "rules": [
-      "no-unused-vars",
       "no-undef"
     ]
   },
-  "scribble/app.js": {
+  "apps/scribble/app.js": {
     "hash": "6d13abd27bab8009a6bdabe1df2df394bc14aac20c68f67e8f8b085fa6b427cd",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "promenu/boot.js": {
+  "apps/promenu/boot.js": {
     "hash": "21ee195418a13c0ed584381542a6132928cdd2d007ec7078ce6fe4650c6fdd19",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "promenu/bootb2.js": {
-    "hash": "4f7a0cb285c35a61e22325dafdd548845393df8d952d8934b04576efb4b19561",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "poweroff/settings.js": {
+  "apps/poweroff/settings.js": {
     "hash": "c197afe72c612a4b3825a3a12a628d0f4ed83823da3f28885bbf473037a02506",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "oxofocus/app.js": {
+  "apps/oxofocus/app.js": {
     "hash": "cd29309373974ef038725e26d8a2ff2634a437c89cdffc3b12defd65a948db75",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "orloj/app.js": {
+  "apps/orloj/app.js": {
     "hash": "fa43f035d759ba94f564392f410c0c6c485bb41a33c062f03d666738d517ccf3",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "nixie/m_vatch.js": {
+  "apps/nixie/m_vatch.js": {
     "hash": "36a7fa956f99d5815cd6bac570d2b86833d1d37474d7eef0bb21892bdf6723a8",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "moonphase/app.js": {
+  "apps/moonphase/app.js": {
     "hash": "0e78c9ec9e7ab04f22f1838fcf033691024c8734de23f8d8dd51d6f11c30a2f2",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "lcars/lcars.app.js": {
-    "hash": "a305f73ee4e77b6534746ea79e699f700fd3db305f2b0289ef081d8869e1faf1",
+  "apps/lcars/lcars.app.js": {
+    "hash": "297b92373c9e8db3ba31cb3aa42909d18a1951eef9bd7e8e0847957aa411765d",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "widagps/widget.js": {
+  "apps/widagps/widget.js": {
     "hash": "a58cdc481962575ef0aa0bfaedcc1f9de3ce966218c5b16168d8ed8b4b9672b8",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "sleeplog/app.js": {
-    "hash": "336da552e4b04677447cf76a253b40bc259a597ea11d455121933f93afe99794",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "recorder/widget.js": {
-    "hash": "b48698bab90fc4f38f880b6663eda108b8d31ce929ba1d32d815aa4ec8c74bca",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "qmsched/app.js": {
+  "apps/qmsched/app.js": {
     "hash": "4b7dbabed6c252021531d6b0449c16a3adc2e405f2ddda33ca0a65f5fa42c663",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "runplus/app.js": {
-    "hash": "fabec449552d17ceb5d510aa058e420757f3caba11999efbe6ebf2ac1a81eb32",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "powermanager/boot.js": {
+  "apps/powermanager/boot.js": {
     "hash": "662d9d29a80a4f2c2855097b4073a099604f4f6d444c13a33304346c788cc5cb",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "ohmcalc/app.js": {
+  "apps/ohmcalc/app.js": {
     "hash": "c7bdea47cb54ec00335d44968f1a4bb1869786584e247739828930b97e60b963",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "nightwatch/nightwatch.app.js": {
+  "apps/nightwatch/nightwatch.app.js": {
     "hash": "9366528bc5bb229cd08e68000a4deebaa27036a18ac5215dce7c38ffa9d69b31",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "messagelist/app.js": {
+  "apps/messagelist/app.js": {
     "hash": "a76b5cc3ddcdbd60a9979972f274a717a901ea65e108545b13d415740a71b4e0",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "imageclock/app.js": {
+  "apps/imageclock/app.js": {
     "hash": "198ad2d18b41ba30e3ee2545372c84ba443cec7d6f9ce4e9ca494defc9476a8e",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "hworldclock/app.js": {
+  "apps/hworldclock/app.js": {
     "hash": "fcdf876d291ec8ad4a2a98871c948bcc055e05ab60b6ef475fffb4e41e9560bc",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "hidmsicswipe/hidmsicswipe.js": {
+  "apps/hidmsicswipe/hidmsicswipe.js": {
     "hash": "8c8c2058315c6debaec71b65b1409ebf5725233c72dbcc2ac921bec0d238fd4f",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "hidcam/app.js": {
+  "apps/hidcam/app.js": {
     "hash": "29a9e8add8daa19ec5c12bf6b372fe4e59c2b07be30e305e9d75dac55995dffd",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "gpstrek/app.js": {
+  "apps/gpstrek/app.js": {
     "hash": "9c941a29790dd642579478bf4b19a2afd5473a782d07fafd2c8113b2d7392bec",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "gpstouch/gpstouch.app.js": {
+  "apps/gpstouch/gpstouch.app.js": {
     "hash": "3492b202c866d6d619298456a48dd8501c4b34f5cce84698e92c62acaf3b8ce4",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "gpspoilog/app.js": {
+  "apps/gpspoilog/app.js": {
     "hash": "38c72e56a4929102f5748ed5e5415a63a31bfd3bf6d853527a10d71a268bc294",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "gpsrec/app.js": {
+  "apps/gpsrec/app.js": {
     "hash": "4d842608edea63975c7da9db6be2746af8849ea2dcc9135fc7d77e5806701f60",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "golfview/maptools.js": {
+  "apps/golfview/maptools.js": {
     "hash": "d206f529eda5aae66d23e51f33c253ae78fb764786520c3d36e6c516449a72e4",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "golfview/golfview.js": {
+  "apps/golfview/golfview.js": {
     "hash": "e4f8d95394eca46fa7e50bff02c321149497e4726ae76936b08a32cf7062bba9",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "golfscore/app.js": {
+  "apps/golfscore/app.js": {
     "hash": "2df86a3f159b72229011f6276ef023c764837b39552b852f1caa431450a06f3a",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "geissclk/clock.js": {
+  "apps/geissclk/clock.js": {
     "hash": "2e547f904f17995668e351a9031bc4701ddaff71cba4f88ca28d51a4dd4f6154",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "gbmusic/app.js": {
+  "apps/gbmusic/app.js": {
     "hash": "c36e9ccf6813264000732cf8aae5b16bb63afafb3bdc81f6f98d670c008b3416",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "gbdebug/app.js": {
+  "apps/gbdebug/app.js": {
     "hash": "5372409dd09a1b165b009afc7dc9af24d4be223ffc6507a3f6e1cbb694a3eeec",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "gallery/app.js": {
+  "apps/gallery/app.js": {
     "hash": "81b119cc61c9d1ae76071f7ef05580f4f93ac60bf97fbdfe418463817e045402",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "football/app.js": {
+  "apps/football/app.js": {
     "hash": "a24c293073557c259cffbf4f1340b6c9111832b7230b3e36072f32335ce4047b",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "fd6fdetect/app.js": {
+  "apps/fd6fdetect/app.js": {
     "hash": "5fb67c4e3699ed30815b6e316ce669f1b8479aa312bf4d8348e30cdf0a29409f",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "dotmatrixclock/app.js": {
+  "apps/dotmatrixclock/app.js": {
     "hash": "ad51c66072f5dd799826e1b3b69c6febb6ab93c93b2eb2245b4035c36b496063",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "dragboard/lib.js": {
+  "apps/dragboard/lib.js": {
     "hash": "e3cbf03054134e9b8e570f02ea5cf0d3e784c8f47d68c85eaa2c5b005291b668",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "doztime/app-bangle2.js": {
-    "hash": "81592fe1bc6537f80d7dbe7b2e8145924d2400f98ea780c68dd5bd9694376c8a",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "devstopwatch/app.js": {
+  "apps/devstopwatch/app.js": {
     "hash": "28ca59e605f280a2d8fd4a74f553783205d51f8bb7042d6f51cf8ec11d44c264",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "coretemp/settings.js": {
+  "apps/coretemp/settings.js": {
     "hash": "b5aa84ecab587b444028b4491b2c2e8f3b2303aa33745265ab629c6ff5141cfb",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "coretemp/boot.js": {
+  "apps/coretemp/boot.js": {
     "hash": "02ee3a04d7dc485367394a91e570affd712ab919bbb155bdafc00e534d3bcd4a",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "configurable_clock/app.js": {
+  "apps/configurable_clock/app.js": {
     "hash": "09d1d02b63abc4ecea5e00a7372de7150ccfe67c2502ff5d298ec7b8e29c353b",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "chronowid/widget.js": {
+  "apps/chronowid/widget.js": {
     "hash": "1056a77f508708a6667e7ae3d201add1d747a1ea4eeab2b3b8afce24a97f1e65",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "cliclockJS2Enhanced/app.js": {
+  "apps/cliclockJS2Enhanced/app.js": {
     "hash": "056b4eeddbabbcf0f94db83d188e55dc0008bccb3913af76e31236e74a780aa1",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "chrono/chrono.js": {
+  "apps/chrono/chrono.js": {
     "hash": "62a4fe13d32528af5107e8008197510115134d749851f8ecfe062c7190b4fc5e",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "chess/engine.js": {
+  "apps/chess/engine.js": {
     "hash": "7a3e08b2d76fea014eef50485871c56348335681109cf2d57b0dd272434d706b",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "animclk/create_images.js": {
+  "apps/animclk/create_images.js": {
     "hash": "05a222b265effe46b2c7a9cc0822c6c4cd86335d5d3a0cecce5fdd15d5e09b9f",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "calculator/app.js": {
+  "apps/calculator/app.js": {
     "hash": "fcb7c7b6c4ec5ce0f425d2a690baab8da235a12e685fe2680cbd4cf2cfdef0b0",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "bthrm/bthrm.js": {
-    "hash": "0ad6b3150200efa959096d239a136865fc0ee1df0c50ebaae76693c07df7a02e",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "bowserWF/app.js": {
+  "apps/bowserWF/app.js": {
     "hash": "83feae92eda4c25028892b5b8b7d1b04f7ec3bb45f51eeba517a80b3ab2053cf",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "blackjack/blackjack.app.js": {
+  "apps/blackjack/blackjack.app.js": {
     "hash": "392382463c90b11b31818e974c3198ed4ec4ed681c9668b4a39865ab055d68ad",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "blackjack/appb2.js": {
+  "apps/blackjack/appb2.js": {
     "hash": "d2e866a297811dfec4cba834c996e1e085421820673a038a9a9e9d438e4fabf9",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "astral/app.js": {
+  "apps/astral/app.js": {
     "hash": "a210269f0d57eb496a3b75cfc4550676f9d7e85a697c77e18f41bf02549179e3",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "ballmaze/app.js": {
+  "apps/ballmaze/app.js": {
     "hash": "cd493a329063e879f44ead211cbecb4ca25da2d5c40b65ba05d6e9b2b91ff8a5",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "astrocalc/astrocalc-app.js": {
-    "hash": "29f978064e42f947b36c94ab3f212512fb5d0a41fa265354c6039e2cf042b92c",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "HRV/app.js": {
+  "apps/HRV/app.js": {
     "hash": "265b4b0272c43126670b5026079711354cee0a211096bcd2c18139b7a3ee774a",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "locale/locales.js": {
-    "hash": "bf2fd659e673b34a1ffa98c7ae7ca89de86a4ff9f823244d028e85bc465ed3c7",
-    "rules": [
-      "no-unused-vars"
-    ]
-  },
-  "sleeplog/lib.js": {
-    "hash": "755e0d4c02b92181281fd6990df39c9446c73ff896b50b64d7e14cb1c0188556",
-    "rules": [
-      "no-unused-vars",
-      "no-undef"
-    ]
-  },
-  "doztime/app-bangle1.js": {
+  "apps/doztime/app-bangle1.js": {
     "hash": "1e9598c201175180ae77d1c3bc47e8138b339b72eb58782b5057fb7aefdc88a1",
     "rules": [
       "no-unused-vars",
       "no-undef"
     ]
   },
-  "carcrazy/app.js": {
+  "apps/carcrazy/app.js": {
     "hash": "fd9f98f4f9e24c63a8fa02918dceab4503edf88e06537922caf86e85884408f3",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "a_dndtoggle/a_dndtoggle.app.js": {
+  "apps/a_dndtoggle/a_dndtoggle.app.js": {
     "hash": "190b2416e57db0886ffbbe94d86fc05779b69802d9b94561588baeb756cc3d90",
     "rules": [
       "no-unused-vars"
     ]
   },
-  "widsleepstatus/widget.js": {
+  "apps/widsleepstatus/widget.js": {
     "hash": "ba6383eb250baae93b8ee2509f3d841fc735f0e87ba06bfc855ec16f11ba91b1",
     "rules": [
       "no-undef"
     ]
   },
-  "widbt_notify/widget.js": {
+  "apps/widbt_notify/widget.js": {
     "hash": "16372ffcbc6bd1419ca326c7da40c2195f82a4bfceb6f123c15872624c4f0adf",
     "rules": [
       "no-undef"
     ]
   },
-  "widbgjs/widget.js": {
+  "apps/widbgjs/widget.js": {
     "hash": "9852ce9aafb0a1ca3029d497282c8cdf07438ea36a3323313bad5b7569b1081b",
     "rules": [
       "no-undef"
     ]
   },
-  "warpdrive/app.js": {
+  "apps/warpdrive/app.js": {
     "hash": "c2f9113c4d298a3021ec4bc0bc5f5d1bcd88267b4fa2acc03ae17d6447ed7d00",
     "rules": [
       "no-undef"
     ]
   },
-  "usgs/settings.js": {
+  "apps/usgs/settings.js": {
     "hash": "af1b7bc7e041c1e6988b407b6c8ee66dbd6a0e181a20caf102d2abdb6dbd5ac0",
     "rules": [
       "no-undef"
     ]
   },
-  "usgs/app.js": {
+  "apps/usgs/app.js": {
     "hash": "d02d04181bb0b6a49ff85e59255b09d4bf63a674db9312912bf39f344af5cabe",
     "rules": [
       "no-undef"
     ]
   },
-  "timerclk/timer.alert.js": {
+  "apps/timerclk/timer.alert.js": {
     "hash": "319b1e8779325199fa17136da5dc486786d9e05255ab917e8d65255405cb619f",
     "rules": [
       "no-undef"
     ]
   },
-  "timecal/timecal.app.js": {
+  "apps/timecal/timecal.app.js": {
     "hash": "9ad04daff299db71901a07d2d1d5116e273287041e9c342c3cd7a4b67db12936",
     "rules": [
       "no-undef"
     ]
   },
-  "tictactoe/app.js": {
+  "apps/tictactoe/app.js": {
     "hash": "ab459d8ceff1cbcf8fb10360dcfd3cef8130b59500adf404cf443f81e145099e",
     "rules": [
       "no-undef"
     ]
   },
-  "thering/calc_precentages.js": {
+  "apps/thering/calc_precentages.js": {
     "hash": "90a1e2e6c3fe94c7929352fc2079f176a143c5aae681ae2c634324b4a782419c",
     "rules": [
       "no-undef"
     ]
   },
-  "tetris/tetris.app.js": {
+  "apps/tetris/tetris.app.js": {
     "hash": "28299187d19e3646ea071a970b9bb9308027d1d31f61957d4a27c9b5670bd381",
     "rules": [
       "no-undef"
     ]
   },
-  "terminal/app.js": {
+  "apps/terminal/app.js": {
     "hash": "19d4913fed5a8817e3e60caf04aa6b45413ed683cf5b2c5b6859bd9080d37a34",
     "rules": [
       "no-undef"
     ]
   },
-  "tempgraph/app.js": {
+  "apps/tempgraph/app.js": {
     "hash": "594ee481fb06bcee226ff2e9adff49543a4fb94985a434a99066c5898f205a43",
     "rules": [
       "no-undef"
     ]
   },
-  "taglaunch/app.js": {
-    "hash": "944689f0600e59bbe4d9e5e2684baeefabe4457a6edd938aae451dc4cd659ad3",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "tabanchi/app.js": {
+  "apps/tabanchi/app.js": {
     "hash": "6ad6dc1d6b0f539f9f659d5773b5a26d19eb6dacafe7b4682469e6f3c412647e",
     "rules": [
       "no-undef"
     ]
   },
-  "swp2clk/settings.js": {
+  "apps/swp2clk/settings.js": {
     "hash": "2d9de7ffdf171f6e7b058741046c8a326cf9d5dba651f52fcdb523214b08d626",
     "rules": [
       "no-undef"
     ]
   },
-  "sunclock/app.js": {
+  "apps/sunclock/app.js": {
     "hash": "54f49294816e06907003a71289a8b79641b1cd082044fb22bb4c4b80f6845459",
     "rules": [
       "no-undef"
     ]
   },
-  "stressless/app.js": {
+  "apps/stressless/app.js": {
     "hash": "5eb7361a7b92d9c6c3eb3aba418161c680873f12a48a4b52b08dd1c6abc71b96",
     "rules": [
       "no-undef"
     ]
   },
-  "stetho/stetho.js": {
+  "apps/stetho/stetho.js": {
     "hash": "2fa9afb115cecdeba584195b1eba2ff2a85ff1f6fc012f1e6af50887c5db0fcd",
     "rules": [
       "no-undef"
     ]
   },
-  "stepo/app.js": {
+  "apps/stepo/app.js": {
     "hash": "67f620970949011b962fb2a2a1bc9fe44cf2dee2e3342d9c6b3399318d6dbc17",
     "rules": [
       "no-undef"
     ]
   },
-  "spotrem/app.js": {
+  "apps/spotrem/app.js": {
     "hash": "35f3ee5371acde28427fd01e191ff58108d3d9e4db1a221dca081b7a7b9c3c77",
     "rules": [
       "no-undef"
     ]
   },
-  "speedalt/app.js": {
+  "apps/speedalt/app.js": {
     "hash": "2c8a2c0d7f60a8c25ee86e943f59df8fb5816ceac00e9e077220227d8885b133",
     "rules": [
       "no-undef"
     ]
   },
-  "spacew/prep/minitar.js": {
+  "apps/spacew/prep/minitar.js": {
     "hash": "573da8daeb53099d7122525e1e424f8d6fcdf928d0cec4fd8955a4e185a1cfe9",
     "rules": [
       "no-undef"
     ]
   },
-  "sokoban/app.js": {
+  "apps/sokoban/app.js": {
     "hash": "57f0b0fc0be15e6b4934467dbe3b786b564de9f05d21ab8419dc044f42ca2f9c",
     "rules": [
       "no-undef"
     ]
   },
-  "snek/snek.js": {
+  "apps/snek/snek.js": {
     "hash": "b278a2b65b84d30c556abc5110bf7b3217d1f2fd5df3fccdb98dbc5a0e31eb38",
     "rules": [
       "no-undef"
     ]
   },
-  "slopeclockpp/app.js": {
+  "apps/slopeclockpp/app.js": {
     "hash": "f6e3f6723ed4fc71a3cacb3d24ec4fb47447a65d495adccb9d86333c19d4d0bd",
     "rules": [
       "no-undef"
     ]
   },
-  "slopeclock/app.js": {
+  "apps/slopeclock/app.js": {
     "hash": "fe29b4674b3e3a791898fd2067acc7c0fcb433dc8d4a8e8e3338c6d42a6c468f",
     "rules": [
       "no-undef"
     ]
   },
-  "sleeplogalarm/settings.js": {
+  "apps/sleeplogalarm/settings.js": {
     "hash": "453935949ffcceddfc640a02263e4aff440751566555bd27bf6c22774ebf4703",
     "rules": [
       "no-undef"
     ]
   },
-  "sleeplogalarm/lib.js": {
+  "apps/sleeplogalarm/lib.js": {
     "hash": "9f865aaf07755f52b4cdc52fb884784bfec0404b271a48868d489403290bbbd7",
     "rules": [
       "no-undef"
     ]
   },
-  "sleeplog/boot.js": {
-    "hash": "b4c9d8e3c3e7cdf44ea10e29a9e3b53f958b86c21ca91d88e4efb85901c3bde9",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "scicalc/app.js": {
+  "apps/scicalc/app.js": {
     "hash": "416c7b2eb12a5d10bcc3a99d89d8f6f54ecd2b47cce2d1f4d55c3e3bc602b31a",
     "rules": [
       "no-undef"
     ]
   },
-  "schoolCalendar/fullcalendar/locales-all.js": {
+  "apps/schoolCalendar/fullcalendar/locales-all.js": {
     "hash": "475805ad0fda6abafcaf2101619d6328ab2ef0bd758e2354983310c969a8e222",
     "rules": [
       "no-undef"
     ]
   },
-  "runplus/karvonen.js": {
-    "hash": "3011bbc5afc3e17bb873f4544d680acc8765105dd825417eadb01047ecadbcb7",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "rescalc/app.js": {
+  "apps/rescalc/app.js": {
     "hash": "925f00a439817fadf92f4e7a7fcd509eb9d9c7e1e4309e315ea92a6881e18b4b",
     "rules": [
       "no-undef"
     ]
   },
-  "regattatimer/app.js": {
+  "apps/regattatimer/app.js": {
     "hash": "8d579cc62d82599f776e5e230651f03481f18c3934f35f4fedfb6382a46db861",
     "rules": [
       "no-undef"
     ]
   },
-  "ratchet_launch/app.js": {
-    "hash": "592d432301d7836aa54e288d465ae8952ecb891d628f824ea9f62479a2a01631",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "rclock/rclock.app.js": {
+  "apps/rclock/rclock.app.js": {
     "hash": "8e698787730601a1bba71aff03204c2adfaf7eeb77b35dc706534755f63f613b",
     "rules": [
       "no-undef"
     ]
   },
-  "qrcode/qr-scanner-worker.min.js": {
+  "apps/qrcode/qr-scanner-worker.min.js": {
     "hash": "c1dae679244ade99e144b74a9b2d18d27e1066c69b772f34fd77ec30876b6599",
     "rules": [
       "no-undef"
     ]
   },
-  "qmsched/lib.js": {
+  "apps/qmsched/lib.js": {
     "hash": "02b6c99f1c31b58552bbab67ff655a902bb37fd54497ba1dbbd9b9bb81912423",
     "rules": [
       "no-undef"
     ]
   },
-  "qalarm/app.js": {
+  "apps/qalarm/app.js": {
     "hash": "f8b2d296af5e034f1e596ac30716192b2ecdf39acac2d10e347cdbfc8040f3c8",
     "rules": [
       "no-undef"
     ]
   },
-  "puzzle15/puzzle15.app.js": {
+  "apps/puzzle15/puzzle15.app.js": {
     "hash": "fc1e5c8f888aa5635ac2c55670f42f3aa1f8abb712379aa0a563f421c4d5d662",
     "rules": [
       "no-undef"
     ]
   },
-  "presentation_timer/presentation_timer.app.js": {
+  "apps/presentation_timer/presentation_timer.app.js": {
     "hash": "edb5e46a495bbe65843ec29c079eb401458439b2c5642a713e5d4a7fa80a0bcb",
     "rules": [
       "no-undef"
     ]
   },
-  "pomoplus/common.js": {
+  "apps/pomoplus/common.js": {
     "hash": "52d7d91b6e5107158b78e5707d6a078490a9a09569669ea8f7c2eb88461b1004",
     "rules": [
       "no-undef"
     ]
   },
-  "pomodo/pomodoro.js": {
+  "apps/pomodo/pomodoro.js": {
     "hash": "7321de537188d707844da5150e36c6d83db53d95226cc4ec275a6f62988df38e",
     "rules": [
       "no-undef"
     ]
   },
-  "planetarium/planetarium.app.js": {
+  "apps/planetarium/planetarium.app.js": {
     "hash": "0fef48b9b56c9706136a4c1cd0aae1be42821bf061ef33a77491f1275199c622",
     "rules": [
       "no-undef"
     ]
   },
-  "pinsafe/app.js": {
+  "apps/pinsafe/app.js": {
     "hash": "624b3e70159e0d7eff05fd444d77b9f4fadb0796b878473b61c5b79912303fbe",
     "rules": [
       "no-undef"
     ]
   },
-  "pie/app.js": {
+  "apps/pie/app.js": {
     "hash": "ff72f99338eaa2004a0b912de1997859353b9e6347c82c570079d562bd749ada",
     "rules": [
       "no-undef"
     ]
   },
-  "pastel/pastel.app.js": {
+  "apps/pastel/pastel.app.js": {
     "hash": "c5d2f1e179a7c0dec451e590659ff3080249d59d069b3b738c20dd6068ac98ce",
     "rules": [
       "no-undef"
     ]
   },
-  "owmweather/boot.js": {
+  "apps/owmweather/boot.js": {
     "hash": "10fe98e871a7df3338fc764d62ac4db65c20c44774aad112f5faf26c7497f78e",
     "rules": [
       "no-undef"
     ]
   },
-  "openwind/app.js": {
+  "apps/openwind/app.js": {
     "hash": "91bfda771bd5cc3127ede3b52f5f088b733ac9e7fc2d8dff4f1d732e66a8af47",
     "rules": [
       "no-undef"
     ]
   },
-  "openloc/app.js": {
+  "apps/openloc/app.js": {
     "hash": "d312cc117410f72407ad1e1ffcb0f76d5e2601c5e9f82a318bc4b979eb1d887d",
     "rules": [
       "no-undef"
     ]
   },
-  "omnitrix/omnitrix.app.js": {
+  "apps/omnitrix/omnitrix.app.js": {
     "hash": "5de9fb74c9a33d0c35d1cd6260c954cd5e2c9352da3b53406acd6eea9e7e1971",
     "rules": [
       "no-undef"
     ]
   },
-  "numerals/numerals.settings.js": {
+  "apps/numerals/numerals.settings.js": {
     "hash": "5a35ba644c88f778633e123b9c0e7c931914ae4cf2f260a8d1a322666b07f826",
     "rules": [
       "no-undef"
     ]
   },
-  "numberchaser/app.js": {
+  "apps/numberchaser/app.js": {
     "hash": "5d152fc1d62e171fa09d3312f05ec1dc397b71ab187b1dcff3e88334dc77c66b",
     "rules": [
       "no-undef"
     ]
   },
-  "noteify/app.js": {
+  "apps/noteify/app.js": {
     "hash": "f0a403bcae6d1d4b9c019dc4ab335f9936c782115010a5e5f9e0cf7db2e9cb50",
     "rules": [
       "no-undef"
     ]
   },
-  "neonx/neonx.settings.js": {
+  "apps/neonx/neonx.settings.js": {
     "hash": "39df1566e1e4fb139076c34f1db098304b973f1c1df0d60ba655942b21b948af",
     "rules": [
       "no-undef"
     ]
   },
-  "mywelcome/app-bangle1.js": {
+  "apps/mywelcome/app-bangle1.js": {
     "hash": "d569916d2a07f067c96ab45f23b12bf68579c9861927613e228c4536485c1454",
     "rules": [
       "no-undef"
     ]
   },
-  "multidice/app.js": {
+  "apps/multidice/app.js": {
     "hash": "4657e0c1a72c555426561f4395febea280d4140cfeba19429c4f0c4737caf7f5",
     "rules": [
       "no-undef"
     ]
   },
-  "mtgwatchface/app.js": {
+  "apps/mtgwatchface/app.js": {
     "hash": "7f5ffbd611368003fced26cab9e42dee2bb66b615176ca075198aaf6417b21c9",
     "rules": [
       "no-undef"
     ]
   },
-  "mmind/mmind.app.js": {
+  "apps/mmind/mmind.app.js": {
     "hash": "fc9506070d08611f0f2b589b851d93da828bd64f6ad169047ff69691f6575867",
     "rules": [
       "no-undef"
     ]
   },
-  "mitherm/app.js": {
+  "apps/mitherm/app.js": {
     "hash": "6e207eced2154ef2a8e510233b9132d338104606c97337f3c7d18db4107bc0a5",
     "rules": [
       "no-undef"
     ]
   },
-  "miclock/clock-mixed.js": {
+  "apps/miclock/clock-mixed.js": {
     "hash": "712bf8d58dc9f3c7c7b5e063eb78ad243da2ae8bdbdacb19c4f15204c8b5d1e7",
     "rules": [
       "no-undef"
     ]
   },
-  "metronome/metronome.js": {
+  "apps/metronome/metronome.js": {
     "hash": "78fd7e9466300aeae10ec66c078e2f23c52af6f5d18558efa3d406763059072a",
     "rules": [
       "no-undef"
     ]
   },
-  "messagesoverlay/lib.js": {
-    "hash": "16b61778a78b52043d32adaeca25591aa695d171b91dcef2313ce26ccf5f4495",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "messages_light/messages_light.listener.js": {
+  "apps/messages_light/messages_light.listener.js": {
     "hash": "8226cf170d50a30257f3dfdc1dc7cc0e54539aaad263e21340f6d7aa91db8f65",
     "rules": [
       "no-undef"
     ]
   },
-  "messages_light/messages_light.app.js": {
+  "apps/messages_light/messages_light.app.js": {
     "hash": "517584cd07b401a1d43a54ae88cc3870f099de7e8ae2aa1cacef3bf5cc1649f2",
     "rules": [
       "no-undef"
     ]
   },
-  "marioclock/marioclock-app.js": {
+  "apps/marioclock/marioclock-app.js": {
     "hash": "d46990c757fd217593c6966c82f421bcd51a4d073109dea2cbc398a0f6064602",
     "rules": [
       "no-undef"
     ]
   },
-  "limelight/limelight.app.js": {
+  "apps/limelight/limelight.app.js": {
     "hash": "4415ede30b8414a2373a1037168a371470b385c05040a2f2556d3d2fcf52e400",
     "rules": [
       "no-undef"
     ]
   },
-  "launch/app.js": {
-    "hash": "7d5b7d7f2adbe4c8c137f76b6560a06437ab142cfeffb3f0ff261f1250a6b687",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "kitchen/stepo2.kit.js": {
+  "apps/kitchen/stepo2.kit.js": {
     "hash": "b7660bef1a2560f23ff696b03d297cdd39936ca61c01b3d0a316d49f9cf72590",
     "rules": [
       "no-undef"
     ]
   },
-  "kitchen/stepo.kit.js": {
+  "apps/kitchen/stepo.kit.js": {
     "hash": "4160dcd4b95295f44de3bc9b8fb4ce1ad8f12592001f5dcb3771f22741b145f9",
     "rules": [
       "no-undef"
     ]
   },
-  "kitchen/kitchen.app.js": {
-    "hash": "1ef7b31e52110e34fb952d7ba0426c8bd9574e5f18be9fbc3b8ad1cc762dda21",
+  "apps/kitchen/kitchen.app.js": {
+    "hash": "cea726937a7179851091b0728d3ad1e773eac703a5bfdc28be6e2f247fdd44c9",
     "rules": [
       "no-undef"
     ]
   },
-  "kitchen/digi.kit.js": {
+  "apps/kitchen/digi.kit.js": {
     "hash": "e1acdef5e41103793c397aa8fdda73e9b10d2432a84d95da48d4730ad55edb4e",
     "rules": [
       "no-undef"
     ]
   },
-  "keytimer/keypad.js": {
+  "apps/keytimer/keypad.js": {
     "hash": "26df9a67b28d3767c7bfe6bb597c6bbb0c70f77fe29f4b21e99c24de62c84586",
     "rules": [
       "no-undef"
     ]
   },
-  "keytimer/common.js": {
+  "apps/keytimer/common.js": {
     "hash": "5cd0e0e924eefa951240330eaf483338003fcb0cc106d140210a8605172e4bb8",
     "rules": [
       "no-undef"
     ]
   },
-  "kanawatch/app.js": {
+  "apps/kanawatch/app.js": {
     "hash": "01c3fede367b7cbdbaf6b532ebfd4e6ffff61b2e20ce44b25dd04117853a44f2",
     "rules": [
       "no-undef"
     ]
   },
-  "infoclk/settings.js": {
+  "apps/infoclk/settings.js": {
     "hash": "56adc3eff3cbc04dd08238ed7e559416ebbc7736c872070c757d70bf5f31b440",
     "rules": [
       "no-undef"
     ]
   },
-  "infoclk/app.js": {
+  "apps/infoclk/app.js": {
     "hash": "27cc368eb1be14658db7fd482e78c4bc7673e2a1c68bc3a1a5f7c7e29915ca88",
     "rules": [
       "no-undef"
     ]
   },
-  "imageclock/demomode.js": {
+  "apps/imageclock/demomode.js": {
     "hash": "8abf4190406be6b5c9699cbf77aa7fc3a351f16212fc8809b8ed02e4fca691eb",
     "rules": [
       "no-undef"
     ]
   },
-  "hrrawexp/app.js": {
+  "apps/hrrawexp/app.js": {
     "hash": "12d88a46a0006792b92735c6850866d09bf6a7dcae7f2cc457a49b27f618c32f",
     "rules": [
       "no-undef"
     ]
   },
-  "hrmmar/fftelim.js": {
+  "apps/hrmmar/fftelim.js": {
     "hash": "96fa4fd14ff0f6dc5eeda903c6a7b27e71a8e845ed3f0c2b1cafb8e1e53bb405",
     "rules": [
       "no-undef"
     ]
   },
-  "hrm/heartrate.js": {
-    "hash": "beb8e433f10d3639b343b060f0d5583ea665445f92b2171daff7612eaf135596",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "hebrew_calendar/app.js": {
+  "apps/hebrew_calendar/app.js": {
     "hash": "3077d581b9fcf73816e265e61105a0692356b89e8ed41a82be51960ae26fc8de",
     "rules": [
       "no-undef"
     ]
   },
-  "heartzone/app.js": {
+  "apps/heartzone/app.js": {
     "hash": "0eab7e375ba25992b335a2589f80ce341b830cf0ae206c21eec664883f4e7de0",
     "rules": [
       "no-undef"
     ]
   },
-  "health/app.js": {
-    "hash": "6d612eed04ee5a844be6ad47c326624cd3e204fecf1c28c99a57ca963b3d7a7b",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "hassio/hassio.app.js": {
+  "apps/hassio/hassio.app.js": {
     "hash": "b8fbb03cf4a7595299e65a46c4f850394bf57cd4cba879d5524eafbf40ccc32e",
     "rules": [
       "no-undef"
     ]
   },
-  "gpstouch/geotools.js": {
-    "hash": "5816fbb2dd630f574e5ee505e1b9ec6f80c3c53778b7a5520e5db28b91cdffc5",
+  "apps/gpstouch/geotools.js": {
+    "hash": "7e67733286f9d7708a54814f6f27d73ddffed2f433febc9604138f2f7a832cbf",
     "rules": [
       "no-undef"
     ]
   },
-  "gpssetup/gpssetup.js": {
+  "apps/gpssetup/gpssetup.js": {
     "hash": "a63f670f4adf04895e6837270fcf19bd56f0a6d049cfb8e3ad8928c283d1bfd3",
     "rules": [
       "no-undef"
     ]
   },
-  "gpsinfo/gps-info.js": {
-    "hash": "1eb77f45d4182613879b8214dc174f84c7333b4a541c2b43cba6014a16f470ee",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "glbasic/glbasic.app.js": {
+  "apps/glbasic/glbasic.app.js": {
     "hash": "7d12a030d6f0ef69a0e5a9783229fd49c0a6a06bf751e3ac562145d2ce8350e9",
     "rules": [
       "no-undef"
     ]
   },
-  "gipy/app.js": {
+  "apps/gipy/app.js": {
     "hash": "41f342e8ef6f2a87b3aea19b75ee45cfdfeff723b94281049e3ae0ec89cddba5",
     "rules": [
       "no-undef"
     ]
   },
-  "geissclk/precompute.js": {
+  "apps/geissclk/precompute.js": {
     "hash": "2317812a9e348e7883e93a4be9e294ad7accd4dc3f0e31ee00343e2412030f98",
     "rules": [
       "no-undef"
     ]
   },
-  "gbridge/sample_messages.js": {
+  "apps/gbridge/sample_messages.js": {
     "hash": "4d0139c7575cdd817338beff88cdb299caba555c5e3666535f92abc76643e466",
     "rules": [
       "no-undef"
     ]
   },
-  "gbmusic/boot.js": {
+  "apps/gbmusic/boot.js": {
     "hash": "1bf553c4c3452eae3930b4a08cd3e01efc2686fcb19fd2c4f9aa949b7768ff4c",
     "rules": [
       "no-undef"
     ]
   },
-  "gallifr/app.js": {
+  "apps/gallifr/app.js": {
     "hash": "710063b833ce75cae54a6d0b3309653c59ae5d0e4c2cccd930921621a74f316c",
     "rules": [
       "no-undef"
     ]
   },
-  "fuzzyw/fuzzyw.app.js": {
-    "hash": "dbef30fe5639a240ada0968491c73242092bd2db7f3b060ef9c2f66a6cbbb19d",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "fontclock/fontclock.js": {
+  "apps/fontclock/fontclock.js": {
     "hash": "478c96b1319d548a79727c5af3191b77ac9753c6314789570e900e512a99a152",
     "rules": [
       "no-undef"
     ]
   },
-  "fontclock/fontclock.hourscriber.js": {
+  "apps/fontclock/fontclock.hourscriber.js": {
     "hash": "eed20b508d336d24b827a8fb7954f7f4bc67bc85a6f3fc7c08aba9ef886c7f03",
     "rules": [
       "no-undef"
     ]
   },
-  "flightdash/jquery-csv.min.js": {
+  "apps/flightdash/jquery-csv.min.js": {
     "hash": "cc6a3425b6794a7eb053be8cc952f44eb51952ae462d76859cc4027bf852c152",
     "rules": [
       "no-undef"
     ]
   },
-  "flightdash/flightdash.settings.js": {
+  "apps/flightdash/flightdash.settings.js": {
     "hash": "bff26577f949c2b92405b0c2f073c69c4901f855b7d5d4deffb756f5a7fef424",
     "rules": [
       "no-undef"
     ]
   },
-  "flightdash/flightdash.app.js": {
+  "apps/flightdash/flightdash.app.js": {
     "hash": "a140a630986fbaaf3845c3623e645a99d035a31c2cc8500948ad33b7e4e23a8a",
     "rules": [
       "no-undef"
     ]
   },
-  "fileman/fileman.app.js": {
+  "apps/fileman/fileman.app.js": {
     "hash": "f378179e7dd3655ba7e9ce03e1f7fd5a2d1768ad7d9083b22e7d740405be842a",
     "rules": [
       "no-undef"
     ]
   },
-  "flappy/app.js": {
+  "apps/flappy/app.js": {
     "hash": "e24b0c5e0469070e02dae00887bf50569c2c141a80c7c356b36987ddf68ce9cc",
     "rules": [
       "no-undef"
     ]
   },
-  "drinkcounter/app.js": {
+  "apps/drinkcounter/app.js": {
     "hash": "6652cbf7d08583a5b6a07b90a89004f419adbc378673cd1f134c74976f5c421f",
     "rules": [
       "no-undef"
     ]
   },
-  "drained/boot.js": {
-    "hash": "914ea2c47aa6b9502b9dd354d490b2a8b838d4c6fafaa20e206f1f2396d4db40",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "drained/app.js": {
-    "hash": "2b609ca5bf414b0e400e25512bf396a01f8cb0365b4edd02ea1697b51907d36c",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "dinoClock/app.js": {
+  "apps/dinoClock/app.js": {
     "hash": "e97566aa4f586ef654e3fc1ec286376352762ed8e0ea2e685a7b3ae687f51552",
     "rules": [
       "no-undef"
     ]
   },
-  "diceroll/app.js": {
+  "apps/diceroll/app.js": {
     "hash": "5c603cc10b6c8344aa5e73beacfd4f11f1ef26404b7f813b6742f7cdd3f5e94d",
     "rules": [
       "no-undef"
     ]
   },
-  "demoapp/app.js": {
+  "apps/demoapp/app.js": {
     "hash": "6d2f11bea7fc451cc6cb4e60bb45f5264193e0a008578efbf09d4af4837927a9",
     "rules": [
       "no-undef"
     ]
   },
-  "cubescramble/cube-scramble.js": {
+  "apps/cubescramble/cube-scramble.js": {
     "hash": "d89eeb6b5851929a3272fd83fce18335dd61b966691d2f3694d50686b10e4f27",
     "rules": [
       "no-undef"
     ]
   },
-  "cprassist/cprassist.js": {
+  "apps/cprassist/cprassist.js": {
     "hash": "647f0a1b3dc52466079049a68c27448c18693df8deb1eb8e04ff84fcb93c323e",
     "rules": [
       "no-undef"
     ]
   },
-  "coretemp/coretemp.js": {
+  "apps/coretemp/coretemp.js": {
     "hash": "7230802388f9cbb7026ce0e94ced6656dc79a411ef7740279ec82eb4fc892d48",
     "rules": [
       "no-undef"
     ]
   },
-  "contourclock/lib.js": {
+  "apps/contourclock/lib.js": {
     "hash": "1f2c43f7eb0cdcf3ab09f242022820f6af2962ca48226b9cde15623e61f80458",
     "rules": [
       "no-undef"
     ]
   },
-  "contourclock/contourclock.settings.js": {
+  "apps/contourclock/contourclock.settings.js": {
     "hash": "dfbd3057e8dba227b7f83e28c1efea44ac8b3a1312a61c1b4896b8786b96c342",
     "rules": [
       "no-undef"
     ]
   },
-  "contacts/contacts.app.js": {
-    "hash": "f105adae91ef5bb79266bd20b8f1f5aaebe9863853c714d1f2b22c97d9ff7773",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "clockcal/settings.js": {
-    "hash": "2065b3e1e978cd0b04dabd51e2dec7475ec72784312f9598039c048f0fa2b387",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "clockcal/app.js": {
-    "hash": "645b7186be93cfe80c288dac7834e10d1f653eea6bea8522e2f916ea97db246d",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "calendar/settings.js": {
+  "apps/calendar/settings.js": {
     "hash": "9f05366b91d0293ed965d8de019bfd044f96683542b86ebabaa3c8d3cc3ad3a7",
     "rules": [
       "no-undef"
     ]
   },
-  "calendar/calendar.js": {
+  "apps/calendar/calendar.js": {
     "hash": "d4f0375fea397a1b93d39667e9f8eaf1a75ebd0462c216015352131360d30099",
     "rules": [
       "no-undef"
     ]
   },
-  "btmultimeter/app.js": {
+  "apps/btmultimeter/app.js": {
     "hash": "6c403764899fece882b7d900780257f7cf661bc948547d6c6f0ca2c0966d67dc",
     "rules": [
       "no-undef"
     ]
   },
-  "bordle/bordle.app.js": {
+  "apps/bordle/bordle.app.js": {
     "hash": "a7725c08cb16d79c44dc9ce8a26bf0c878437ba4f48f5633d15546c15f49c4bc",
     "rules": [
       "no-undef"
     ]
   },
-  "bluetoothdock/app.js": {
+  "apps/bluetoothdock/app.js": {
     "hash": "af48c70a33190ecf6aec42a8286166f750bd66bd96dfa8dd97691aba4e6bca63",
     "rules": [
       "no-undef"
     ]
   },
-  "beebclock/beebclock.js": {
+  "apps/beebclock/beebclock.js": {
     "hash": "f2860eb523d6394de737d249303a87a96c619ce925943026238d2aedc2441133",
     "rules": [
       "no-undef"
     ]
   },
-  "berlinc/berlin-clock.js": {
+  "apps/berlinc/berlin-clock.js": {
     "hash": "1b69f19c94b35e70283872ec8423e5195d16fbee538f7af5169259100b640fad",
     "rules": [
       "no-undef"
     ]
   },
-  "bee/bee.app.js": {
+  "apps/bee/bee.app.js": {
     "hash": "684ed07883a14d7f277e8fa16bf739e0a0edb564339a74210ae5ca60707fe780",
     "rules": [
       "no-undef"
     ]
   },
-  "banglebridge/widget.js": {
+  "apps/banglebridge/widget.js": {
     "hash": "4ee8d6749e1d0e28c58ad871fd9f6ccbca2d716bb4fbd3511ba4c34a6a5897e1",
     "rules": [
       "no-undef"
     ]
   },
-  "bad/bad.app.js": {
+  "apps/bad/bad.app.js": {
     "hash": "d1354613102818190dd4e6e28fd715db7dc4d51b8e618cae61a3135529cc97eb",
     "rules": [
       "no-undef"
     ]
   },
-  "aviatorclk/aviatorclk.app.js": {
+  "apps/aviatorclk/aviatorclk.app.js": {
     "hash": "5bc629c86eada72533fc664e01a47e05f207baeeae2092323ae4d04bd1c9fe9a",
     "rules": [
       "no-undef"
     ]
   },
-  "authentiwatch/app.js": {
+  "apps/authentiwatch/app.js": {
     "hash": "02aafe5b6f3f3dce979d5b04f4660f90261e0c893cb39e9eeb2cf0bdb2c256b8",
     "rules": [
       "no-undef"
     ]
   },
-  "aptsciclk/app.js": {
+  "apps/aptsciclk/app.js": {
     "hash": "0b33e7508e461a7e946ecfc5784b48e1d18df18f4d7dcad7c17cb2ff763df932",
     "rules": [
       "no-undef"
     ]
   },
-  "approxclock/app.js": {
+  "apps/approxclock/app.js": {
     "hash": "675ce5f16bb26649a39c86561e9fa46bb31e369a465fac9b35e5debfe18672ec",
     "rules": [
       "no-undef"
     ]
   },
-  "android/test.js": {
-    "hash": "703dad907d9b17d281faca2ecd9099d9f127e7241b48c7617f9147978ddb7c43",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "android/boot.js": {
-    "hash": "a537b3f7772e11f44615d80d6c6bacfa69c1854c6da3c01666863bcae8a18059",
-    "rules": [
-      "no-undef"
-    ]
-  },
-  "altimeter/app.js": {
+  "apps/altimeter/app.js": {
     "hash": "054ac328db51034aa339f1d10b4d264badd49438b95f08bc6fbfb90bd88c6ae0",
     "rules": [
       "no-undef"
     ]
   },
-  "alpinenav/app.js": {
+  "apps/alpinenav/app.js": {
     "hash": "f8e59724d282f7c5c989adf64974a3728dc521aa8fbe047b7c37dae09213095a",
     "rules": [
       "no-undef"
     ]
   },
-  "activepedom/app.js": {
+  "apps/activepedom/app.js": {
     "hash": "c57c787ac33834dce2291562af8106b7a9de1f7116cdeab2a4236004e723273a",
     "rules": [
       "no-undef"
     ]
   },
-  "accelrec/app.js": {
+  "apps/accelrec/app.js": {
     "hash": "b5369a60afc8f360f0b33f71080eb3f5d09a1bf3703acfcf07cd80dd19f1997d",
     "rules": [
       "no-undef"
     ]
   },
-  "BLEcontroller/app-joy.js": {
+  "apps/BLEcontroller/app-joy.js": {
     "hash": "e4f34bb1bc11b52c3d7a1c537a140b0e23ccef82694dcd602cb517a8ba342898",
     "rules": [
       "no-undef"
     ]
   },
-  "BLEcontroller/app.js": {
+  "apps/BLEcontroller/app.js": {
     "hash": "d560cb6d847be8d5c724b1f2af9a68f113a6dca91f3a74897f79bbde9be9922c",
     "rules": [
       "no-undef"
     ]
   },
-  "BLEcontroller/app-ex2.js": {
+  "apps/BLEcontroller/app-ex2.js": {
     "hash": "a72fccb6079c80c1c17e208e343c65f0980c94397816a1ac2423ba47bba75776",
     "rules": [
       "no-undef"
     ]
   },
-  "7x7dotsclock/7x7dotsclock.settings.js": {
+  "apps/7x7dotsclock/7x7dotsclock.settings.js": {
     "hash": "83f7222a1db7ef7a2e25fed580417eb8a77146ed3431355d3472edc62f6ae242",
     "rules": [
       "no-undef"
     ]
   },
-  "7x7dotsclock/7x7dotsclock.app.js": {
+  "apps/7x7dotsclock/7x7dotsclock.app.js": {
     "hash": "dd6a87c62dc79039754338ee9f578dbf13f05d8af511009f8cafee97643df6cb",
     "rules": [
       "no-undef"
     ]
   },
-  "2047pp/2047pp.app.js": {
+  "apps/2047pp/2047pp.app.js": {
     "hash": "37283d6c44810b82586b191dd50fe2e6ceab68685653ac520cfde723f56f2605",
     "rules": [
       "no-undef"
     ]
   },
-  "animclk/V29.LBM.js": {
+  "apps/animclk/V29.LBM.js": {
     "hash": "fe32a40d1c2df6080ffefb2f1b38125eb8f81b903267a08a2865ca7b21d33a27",
     "rules": [
       "no-undef"
     ]
   },
-  "authentiwatch/qr_packed.js": {
+  "apps/authentiwatch/qr_packed.js": {
     "hash": "0a7c15fc47973ceb47c1bae99471ef9f208569bfd46b361c7d130cf0ec35dcce",
     "rules": [
       "no-undef",
@@ -1487,19 +1306,25 @@ module.exports = {
       "no-useless-catch"
     ]
   },
-  "qrcode/qr-scanner.umd.min.js": {
+  "apps/qrcode/qr-scanner.umd.min.js": {
     "hash": "f4c10bc0c41322e7b588619e03a736ff85fad851ac4f104449c743a0f36735a4",
     "rules": [
       "no-undef",
       "no-cond-assign"
     ]
   },
-  "schoolCalendar/fullcalendar/main.js": {
-    "hash": "04dcd3cb3025c7aa67631d287b025a897b1cd984b8ea306abae2d722976fb7c5",
+  "apps/schoolCalendar/fullcalendar/main.js": {
+    "hash": "8c417deb073328655117a93f045e77e9b808e84d584e648c6d7e360271ae8d07",
     "rules": [
       "no-undef",
       "no-unused-vars",
       "no-cond-assign"
     ]
+  },
+  "apps/kineticscroll/boot.min.js": {
+    "hash": "1345b3c556f1a268a81c3a57825d096d9bbce9740217339aa6d79223d9daad4d",
+    "rules": [
+      "no-cond-assign"
+    ]
   }
 };
diff --git a/apps/locale/ChangeLog b/apps/locale/ChangeLog
index d21cb1a56..982103cd1 100644
--- a/apps/locale/ChangeLog
+++ b/apps/locale/ChangeLog
@@ -19,3 +19,5 @@
 0.16: Remove global variables that used RAM
       Add second 'dp' argument for decimal places in distance/speed/temp (fix #1523)
 0.17: Fix regression where long month names were 'undefined' (fix #1641)
+0.18: Fix lint warnings, change anv->janv for fr_BE and fr_CH
+0.19: Deprecate currency information
diff --git a/apps/locale/README.md b/apps/locale/README.md
index 99fba7945..a675136bb 100644
--- a/apps/locale/README.md
+++ b/apps/locale/README.md
@@ -10,7 +10,6 @@ other applications or widgets to provide locale-friendly
 - Time (12h/24h)
 - Days of the Week
 - Months
-- Currency values
 - Distances/Lengths/Speed (metric/imperial)
 - Temperature (°C/°F)
 
diff --git a/apps/locale/locale.html b/apps/locale/locale.html
index 7e958fcf8..8ec818aae 100644
--- a/apps/locale/locale.html
+++ b/apps/locale/locale.html
@@ -30,16 +30,24 @@
 
     <script>
 /*
-eg. the built-in en_GB is:
+eg. the built-in en_GB at https://github.com/espruino/Espruino/blob/master/libs/js/banglejs/locale.js is:
 
-exports = { name : "en_GB", currencySym:"£",
+function round(n, dp) {
+  if (dp===undefined) dp=1;
+  var p = Math.min(dp,dp - Math.floor(Math.log(n)/Math.log(10)));
+  return n.toFixed(p);
+}
+exports = { name : "system", currencySym:"£",
   translate : str=>str, // as-is
   date : (d,short) => short?("0"+d.getDate()).substr(-2)+"/"+("0"+(d.getMonth()+1)).substr(-2)+"/"+d.getFullYear():d.toString().substr(4,11), // Date to "Feb 28 2020" or "28/02/2020"(short)
   time : (d,short) => { // Date to  "4:15.28 pm" or "15:42"(short)
+	  var h = d.getHours(), m = d.getMinutes()
+    if ((require('Storage').readJSON('setting.json',1)||{})["12hour"])
+      h = (h%12==0) ? 12 : h%12; // 12 hour
     if (short)
-      return d.toString().substr(16,5);
+      return (" "+h).substr(-2)+":"+("0"+m).substr(-2);
     else {
-      var h = d.getHours(), m = d.getMinutes(), r = "am";
+      var r = "am";
       if (h==0) { h=12; }
       else if (h>=12) {
         if (h>12) h-=12;
@@ -48,16 +56,30 @@ exports = { name : "en_GB", currencySym:"£",
       return (" "+h).substr(-2)+":"+("0"+m).substr(-2)+"."+("0"+d.getSeconds()).substr(-2)+" "+r;
     }
   },
-  dow : (d,short) => short?d.toString().substr(0,3):"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(",")[d.getDay()], // Date to "Monday" or "Mon"(short)
-  month : (d,short) => short?d.toString().substr(4,3):"January,February,March,April,May,June,July,August,September,October,November,December".split(",")[d.getMonth()], // Date to "February" or "Feb"(short)
-  number : n => n.toString(), // more fancy?
-  currency : n => "£"+n.toFixed(2), // number to "£1.00"
-  distance : m => (m<1000)?Math.round(m)+"m":Math.round(m/160.934)/10+"mi", // meters to "123m" or "1.2mi" depending on size
-  speed : s => Math.round(s*0.621371)+"mph",// kph to "123mph"
-  temp : t => Math.round(t)+"'C" // degrees C to degrees C
-  meridian: d => (d.getHours() <= 12) ? "am":"pm",
+  dow : (d,short) => "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(",")[d.getDay()].substr(0, short ? 3 : 10), // Date to "Monday" or "Mon"(short)
+  month : (d,short) => "January,February,March,April,May,June,July,August,September,October,November,December".split(",")[d.getMonth()].substr(0, short ? 3 : 10), // Date to "February" or "Feb"(short)
+  number: (n, dec) => {
+    if (dec == null) dec = 2;
+    var w = n.toFixed(dec),
+        k = w|0,
+        b = n < 0 ? 1 : 0,
+        u = Math.abs(w-k),
+        d = (''+u.toFixed(dec)).substr(2, dec),
+        s = ''+k,
+        i = s.length,
+        r = '';
+    while ((i-=3) > b)
+      r = ',' + s.substr(i, 3) + r;
+    return s.substr(0, i + 3) + r + (d ? '.' + d: '');
+  },
+  currency : n => {console.log("Warning: Currency information is deprecated");return "£"+n.toFixed(2)}, // number to "£1.00"
+  distance : (m,dp) => (m<1000)?round(m,dp)+"m":round(m/1000,dp)+"km", // meters to "123m" or "1.2km" depending on size
+  speed : (s,dp) => round(s/1.60934,dp)+"mph",// kph to "123mph"
+  temp : (t,dp) => round(t,dp)+"'C", // degrees C to degrees C
+  meridian: d => (d.getHours() <= 12) ? "am":"pm" // Date to am/pm
 };
 
+
 */
       function codePageLookup(lang, codePage, ch) {
         var chCode = ch.charCodeAt();
@@ -173,9 +195,6 @@ exports = { name : "en_GB", currencySym:"£",
           dateN = dateN.replace(e,"${"+replaceList[e]+"}");
           dateS = dateS.replace(e,"${"+replaceList[e]+"}");
         });
-        var currency = locale.currency_first ?
-          `${js(locale.currency_symbol)} + exports.number(n)`:
-          `exports.number(n) + ${js(locale.currency_symbol)}`;
         var temperature = locale.temperature=='°F' ? '(t*9/5)+32' : 't';
 
         function getLocaleModule(isLocal) {
@@ -194,7 +213,7 @@ function getHours(d) {
 }
 exports = {
   name: ${js(locale.lang)},
-  currencySym: ${js(locale.currency_symbol)},
+  currencySym: ${js("£")},
   dow: (d,short) => ${js(locale.day + ',' + locale.abday)}.split(',')[d.getDay() + (short ? 7 : 0)],
   month: (d,short) => ${js(locale.month + ',' + locale.abmonth)}.split(',')[d.getMonth() + (short ? 12 : 0)],
   number: (n, dec) => {
@@ -207,12 +226,11 @@ exports = {
         s = ''+k,
         i = s.length,
         r = '';
-    while ((i-=3) > b) {
+    while ((i-=3) > b)
       r = '${locale.thousands_sep}' + s.substr(i, 3) + r;
-    }
     return s.substr(0, i + 3) + r + (d ? '${locale.decimal_point}' + d: '');
   },
-  currency: n => ${currency},
+  currency: n => {console.log("Warning: Currency information is deprecated, see https://github.com/espruino/BangleApps/issues/3269");return ${js("£")}+exports.number(n)},
   distance: (n,dp) => n < ${distanceUnits[locale.distance[1]]} ? round(${unitConv(distanceUnits[locale.distance[0]])},dp) + ${js(locale.distance[0])} : round(${unitConv(distanceUnits[locale.distance[1]])},dp) + ${js(locale.distance[1])},
   speed: (n,dp) => round(${unitConv(speedUnits[locale.speed])},dp) + ${js(locale.speed)},
   temp: (t,dp) => round(${temperature},dp) + ${js(locale.temperature)},
@@ -236,7 +254,6 @@ exports = {
 <tr><td class="table_t">Date</td><td>${exports.date(date,1)}</td><td>${exports.date(date,0)}</td></tr>
 <tr><td class="table_t">Time</td><td>${exports.time(date,1)}</td><td>${exports.time(date,0)}</td></tr>
 <tr><td class="table_t">Number</td><td>${exports.number(12.3456789)}</td><td>${exports.number(12.3456789,4)}</td></tr>
-<tr><td class="table_t">Currency</td><td></td><td>${exports.currency(12.34)}</td></tr>
 <tr><td class="table_t">Distance</td><td>${exports.distance(12.34,0)}</td><td>${exports.distance(12345.6,1)}</td></tr>
 <tr><td class="table_t">Speed</td><td></td><td>${exports.speed(123)}</td></tr>
 <tr><td class="table_t">Temperature</td><td></td><td>${exports.temp(12,0)}</td></tr>
diff --git a/apps/locale/locales.js b/apps/locale/locales.js
index a0d5ea031..11af6c1d8 100644
--- a/apps/locale/locales.js
+++ b/apps/locale/locales.js
@@ -1,4 +1,8 @@
 /* jshint esversion: 6 */
+/* exported distanceUnits */
+/* exported speedUnits */
+/* exported codePages */
+/* exported locales */
 const distanceUnits = { // how many meters per X?
   "m": 1,
   "ft": 0.3048,
@@ -59,6 +63,14 @@ timePattern / datePattern:
     %S	second (00..60)
     %p	locale's equivalent of either AM or PM; blank if not known
     %P  like %p, but lower case
+    
+    
+in locales:
+
+  abmonth: short months (must be <5 chars, ideally 3)
+  month: normal month names
+  abday: short days (must be <5 chars, ideally 3)  
+  day: normal day names  
 */
 
 var locales = {
@@ -66,8 +78,6 @@ var locales = {
     lang: "en_GB",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "£", currency_first: true,
-    int_curr_symbol: "GBP",
     speed: 'mph',
     distance: { "0": "yd", "1": "mi" },
     temperature: '°C',
@@ -85,8 +95,6 @@ var locales = {
     notes: "USA with MM/DD/YY date",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "$", currency_first: true,
-    int_curr_symbol: "USD",
     speed: "mph",
     distance: { 0: "ft", 1: "mi" },
     temperature: "°F",
@@ -104,8 +112,6 @@ var locales = {
     notes: "USA with YYYY-MM-DD date",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "$", currency_first: true,
-    int_curr_symbol: "USD",
     speed: "mph",
     distance: { 0: "ft", 1: "mi" },
     temperature: "°F",
@@ -122,9 +128,6 @@ var locales = {
     lang: "en_IN",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "Rs.",
-    currency_first: true,
-    int_curr_symbol: "INR",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -141,9 +144,6 @@ var locales = {
     lang: "en_IE",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
-    currency_first: true,
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -160,8 +160,6 @@ var locales = {
     lang: "en_NAV", icon: "&#9973;&#9992;&#65039;",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "£", currency_first: true,
-    int_curr_symbol: "GBP",
     speed: 'kts',
     distance: { "0": "m", "1": "nm" },
     temperature: '°C',
@@ -178,8 +176,6 @@ var locales = {
     lang: "de_DE",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -197,8 +193,6 @@ var locales = {
     lang: "en_JP",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "¥",
-    int_curr_symbol: "JPY",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -215,8 +209,6 @@ var locales = {
     lang: "nl_NL",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -230,12 +222,10 @@ var locales = {
     trans: { yes: "ja", Yes: "Ja", no: "nee", No: "Nee", ok: "ok", on: "aan", off: "uit",
              "< Back": "< Terug", "Delete": "Verwijderen", "Mark Unread": "Markeer als ongelezen" }
   },
-  "en_NL": { // English date units with Dutch number, currency and navigation units.
+  "en_NL": { // English date units with Dutch number and navigation units.
     lang: "en_NL",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -251,8 +241,6 @@ var locales = {
     lang: "en_CA",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "$",
-    int_curr_symbol: "CAD",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -269,8 +257,6 @@ var locales = {
     lang: "fr_FR",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -287,8 +273,6 @@ var locales = {
     lang: "sv_SE",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "kr",
-    int_curr_symbol: "SKR",
     speed: "km/tim",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -305,8 +289,6 @@ var locales = {
     lang: "en_SE",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "kr",
-    int_curr_symbol: "SKR",
     speed: 'km/h',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -323,8 +305,6 @@ var locales = {
     lang: "da_DK",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "kr",
-    int_curr_symbol: "DKK",
     speed: "km/t",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -341,8 +321,6 @@ var locales = {
     lang: "en_DK",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "kr",
-    int_curr_symbol: "DKK",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -359,8 +337,6 @@ var locales = {
     lang: "en_NZ",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "$",
-    int_curr_symbol: "NZD",
     speed: "kph",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -377,8 +353,6 @@ var locales = {
     lang: "en_AU",
     decimal_point: ".",
     thousands_sep: ",",
-    currency_symbol: "$",
-    int_curr_symbol: "AUD",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -395,8 +369,6 @@ var locales = {
     lang: "de_AT",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -414,8 +386,6 @@ var locales = {
     lang: "en_IL",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "ILS"/*"₪"*/,
-    int_curr_symbol: "ILS",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -432,8 +402,6 @@ var locales = {
     lang: "es_ES",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -451,15 +419,13 @@ var locales = {
     lang: "fr_BE",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
     ampm: { 0: "", 1: "" },
     timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" },
     datePattern: { 0: "%A %B %d %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 // 01/03/20
-    abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.",
+    abmonth: "janv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.",
     month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre",
     abday: "dim,lun,mar,mer,jeu,ven,sam",
     day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi",
@@ -469,8 +435,6 @@ var locales = {
     lang: "fi_FI",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -487,8 +451,6 @@ var locales = {
     lang: "de_CH",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "CHF",
-    int_curr_symbol: "CHF",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -505,15 +467,13 @@ var locales = {
     lang: "fr_CH",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "CHF",
-    int_curr_symbol: "CHF",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
     ampm: { 0: "AM", 1: "PM" },
     timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" },
     datePattern: { 0: "%A %d %B %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 //  01/03/20
-    abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.",
+    abmonth: "janv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.",
     month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre",
     abday: "dim,lun,mar,mer,jeu,ven,sam",
     day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi",
@@ -523,8 +483,6 @@ var locales = {
     lang: "it_CH",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "CHF",
-    int_curr_symbol: "CHF",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -541,8 +499,6 @@ var locales = {
     lang: "it_IT",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -559,8 +515,6 @@ var locales = {
     lang: "wae_CH",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "CHF",
-    int_curr_symbol: "CHF",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -577,8 +531,6 @@ var locales = {
     lang: "tr_TR",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "TL",
-    int_curr_symbol: "TRY",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -595,8 +547,6 @@ var locales = {
     lang: "hu_HU",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "Ft",
-    int_curr_symbol: "HUF",
     speed: 'kph',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -613,8 +563,6 @@ var locales = {
     lang: "oc_FR",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -631,8 +579,6 @@ var locales = {
     lang: "pt_BR",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "R$", currency_first: true,
-    int_curr_symbol: "BRL",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -649,8 +595,6 @@ var locales = {
     lang: "cs_CZ",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "Kč",
-    int_curr_symbol: " CZK",
     speed: 'kmh',
     distance: { "0": "m", "1": "km" },
     temperature: '°C',
@@ -667,8 +611,6 @@ var locales = {
     lang: "hr_HR",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -685,8 +627,6 @@ var locales = {
     lang: "sl_SI",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "km/h",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -703,8 +643,6 @@ var locales = {
     lang: "pt_PT",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -721,8 +659,6 @@ var locales = {
     lang: "pl_PL",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "zł",
-    int_curr_symbol: "PLN",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -739,8 +675,6 @@ var locales = {
     lang: "lv_LV",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -757,8 +691,6 @@ var locales = {
     lang: "nn_NO",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "kr",
-    int_curr_symbol: "NOK",
     speed: "kmt",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -775,8 +707,6 @@ var locales = {
     lang: "nb_NO",
     decimal_point: ",",
     thousands_sep: " ",
-    currency_symbol: "kr",
-    int_curr_symbol: "NOK",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -794,8 +724,6 @@ var locales = {
     icon: "🇪🇺",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "€",
-    int_curr_symbol: "EUR",
     speed: "kmh",
     distance: { 0: "m", 1: "km" },
     temperature: "°C",
@@ -803,7 +731,7 @@ var locales = {
     timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" },
     datePattern: { 0: "%d %B %Y", "1": "%d/%m/%y" },
     abmonth: "gen.,febr.,març,abr.,maig,juny,jul.,ag.,set.,oct.,nov.,des.",
-    month: "gener,febrer,març,abril,maig,juny,juliol,agost,setembre,octobre,novembre,desembre",
+    month: "gener,febrer,març,abril,maig,juny,juliol,agost,setembre,octubre,novembre,desembre",
     abday: "dg.,dl.,dt.,dc.,dj.,dv.,ds.",
     day: "diumenge,dilluns,dimarts,dimecres,dijous,divendres,dissabte",
     trans: { yes: "sí", Yes: "Sí", no: "no", No: "No", ok: "d'acord", on: "on", off: "off",
@@ -815,8 +743,6 @@ var locales = {
     lang: "he_IL",
     decimal_point: ",",
     thousands_sep: ".",
-    currency_symbol: "₪",
-    int_curr_symbol: "ILS",
     speed: "קמ״ש",
     distance: { 0: "מ׳", 1: "ק״מ" },
     temperature: "°C",
diff --git a/apps/locale/metadata.json b/apps/locale/metadata.json
index 54ad64e80..36cb2eae7 100644
--- a/apps/locale/metadata.json
+++ b/apps/locale/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "locale",
   "name": "Languages",
-  "version": "0.17",
+  "version": "0.19",
   "description": "Translations for different countries",
   "icon": "locale.png",
   "type": "locale",
diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index a2d8dbc35..7320d8ec6 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -104,3 +104,5 @@
 0.75: Handle text with images in messages list by just displaying the first line
 0.76: Swipe up/down on a shown message to show the next newer/older message.
 0.77: Messages can now use international fonts if they are installed
+0.78: Fix: When user taps on a new message, clear the unread timeout
+0.79: Fix: Reset the unread timeout each time a new message is shown. When the message is read from user input, do not set an unread timeout.
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index 1d1a144c7..9172bcad7 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -87,7 +87,7 @@ var onMessagesModified = function(type,msg) {
   }
   if (msg && msg.id=="nav" && msg.t=="modify" && active!="map")
     return; // don't show an updated nav message if we're just in the menu
-  showMessage(msg&&msg.id);
+  showMessage(msg&&msg.id, false);
 };
 Bangle.on("message", onMessagesModified);
 
@@ -233,6 +233,7 @@ function showMusicMessage(msg) {
 }
 
 function showMessageScroller(msg) {
+  cancelReloadTimeout();
   active = "scroller";
   var bodyFont = fontBig;
   g.setFont(bodyFont);
@@ -253,16 +254,16 @@ function showMessageScroller(msg) {
       g.setFont(bodyFont).setFontAlign(0,-1).drawString(lines[idx], r.x+r.w/2, r.y);
     }, select : function(idx) {
       if (idx>=lines.length-2)
-        showMessage(msg.id);
+        showMessage(msg.id, true);
     },
-    back : () => showMessage(msg.id)
+    back : () => showMessage(msg.id, true)
   });
 }
 
 function showMessageSettings(msg) {
   active = "settings";
   var menu = {"":{"title":/*LANG*/"Message"},
-    "< Back" : () => showMessage(msg.id),
+    "< Back" : () => showMessage(msg.id, true),
     /*LANG*/"View Message" : () => {
       showMessageScroller(msg);
     },
@@ -303,7 +304,8 @@ function showMessageSettings(msg) {
   E.showMenu(menu);
 }
 
-function showMessage(msgid) {
+function showMessage(msgid, persist) {
+  if(!persist) resetReloadTimeout();
   let idx = MESSAGES.findIndex(m=>m.id==msgid);
   var msg = MESSAGES[idx];
   if (updateLabelsInterval) {
@@ -408,8 +410,8 @@ function showMessage(msgid) {
   Bangle.swipeHandler = (lr,ud) => {
     if (lr>0 && posHandler) posHandler();
     if (lr<0 && negHandler) negHandler();
-    if (ud>0 && idx<MESSAGES.length-1) showMessage(MESSAGES[idx+1].id);
-    if (ud<0 && idx>0) showMessage(MESSAGES[idx-1].id);
+    if (ud>0 && idx<MESSAGES.length-1) showMessage(MESSAGES[idx+1].id, true);
+    if (ud<0 && idx>0) showMessage(MESSAGES[idx-1].id, true);
   };
   Bangle.on("swipe", Bangle.swipeHandler);
   g.reset().clearRect(Bangle.appRect);
@@ -446,7 +448,7 @@ function checkMessages(options) {
   // If we have a new message, show it
   if (options.showMsgIfUnread && newMessages.length) {
     delete newMessages[0].show; // stop us getting stuck here if we're called a second time
-    showMessage(newMessages[0].id);
+    showMessage(newMessages[0].id, false);
     // buzz after showMessage, so being busy during layout doesn't affect the buzz pattern
     if (global.BUZZ_ON_NEW_MESSAGE) {
       // this is set if we entered the messages app by loading `messagegui.new.js`
@@ -459,7 +461,7 @@ function checkMessages(options) {
   }
   // no new messages: show playing music? Only if we have playing music, or state=="show" (set by messagesmusic)
   if (options.openMusic && MESSAGES.some(m=>m.id=="music" && ((m.track && m.state=="play") || m.state=="show")))
-    return showMessage('music');
+    return showMessage('music', true);
   // no new messages - go to clock?
   if (options.clockIfAllRead && newMessages.length==0)
     return load();
@@ -508,7 +510,7 @@ function checkMessages(options) {
     },
     select : idx => {
       if (idx < MESSAGES.length)
-        showMessage(MESSAGES[idx].id);
+        showMessage(MESSAGES[idx].id, true);
     },
     back : () => load()
   });
@@ -521,6 +523,13 @@ function cancelReloadTimeout() {
   unreadTimeout = undefined;
 }
 
+function resetReloadTimeout(){
+  cancelReloadTimeout();
+  if (!isFinite(settings.unreadTimeout)) settings.unreadTimeout=60;
+  if (settings.unreadTimeout)
+    unreadTimeout = setTimeout(load, settings.unreadTimeout*1000);
+}
+
 g.clear();
 
 Bangle.loadWidgets();
@@ -528,9 +537,6 @@ require("messages").toggleWidget(false);
 Bangle.drawWidgets();
 
 setTimeout(() => {
-  if (!isFinite(settings.unreadTimeout)) settings.unreadTimeout=60;
-  if (settings.unreadTimeout)
-    unreadTimeout = setTimeout(load, settings.unreadTimeout*1000);
   // only openMusic on launch if music is new, or state=="show" (set by messagesmusic)
   var musicMsg = MESSAGES.find(m => m.id === "music");
   checkMessages({
diff --git a/apps/messagegui/metadata.json b/apps/messagegui/metadata.json
index 53836a9c4..83056fc0c 100644
--- a/apps/messagegui/metadata.json
+++ b/apps/messagegui/metadata.json
@@ -2,7 +2,7 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.77",
+  "version": "0.79",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messagesoverlay/ChangeLog b/apps/messagesoverlay/ChangeLog
index 47aa51107..094694c0d 100644
--- a/apps/messagesoverlay/ChangeLog
+++ b/apps/messagesoverlay/ChangeLog
@@ -5,3 +5,13 @@
 0.05: Fix the overlay keeping the LCD on
 0.06: Better low memory handling
       Fix first message beeing displayed again on unlock
+0.07: Adds settings
+      Automatic discard of oldest messages
+      Indicator for multiple messages in queue
+      Some optimization in the rendering code
+      Track handler changes done by background code
+0.08: Fix linter warnings
+0.09: Fix scrolling to last line for long text
+0.10: Track Listeners added with prependListener
+      Handle changed internal callback variable name for watches introduced in 2v21.104
+0.11: Update for new setLCDOverlay remove handler
\ No newline at end of file
diff --git a/apps/messagesoverlay/README.md b/apps/messagesoverlay/README.md
index 8ce1cc64d..6e9192423 100644
--- a/apps/messagesoverlay/README.md
+++ b/apps/messagesoverlay/README.md
@@ -2,23 +2,26 @@
 
 This app handles the display of messages and message notifications as an overlay pop up. 
 
-It is a GUI replacement for the `messages` apps.
+It is a GUI replacement for the `messagesgui` app.
 
 Messages are ephemeral and not stored on the Bangle.
 
 ## Usage
 
-Close app by tapping the X and scroll by swiping. The border of the pop up changes color if the Bangle is locked. The color depends on your currently active theme.
+Close app by tapping the X and scroll by swiping. The title background of the pop up changes color if the Bangle is locked. The color depends on your currently active theme.
 
-## Firmware hint
-Current stable firmware draws incorrect colors for emojis. Nightly firmware builds correct this.
+## Theme support
+
+Using the system theme needs more RAM since it uses a 16 bit color buffer for normal message display. Selecting the "low RAM" theme reduces that to a 4 bit buffer.
+16 bit buffer with a small message takes ~4K RAM blocks while 4 bit buffer only needs about 1.5K.
 
 ## Low memory mode
 
-If free memory is below 2000 blocks, the overlay automatically only uses 1 bit depth. Default uses roundabout 1300 blocks, while low memory mode uses about 600.
+If the overlay estimates that showing the next message would get under the configured minimum free memory limit it automatically only tries to use 1 bit depth. Low memory mode uses about 0.8K blocks plus memory needed for messages. If dropping to 1 bit depth is not enough the oldest messages are discarded to keep the overlay working.
 
 ## Creator
 
 [halemmerich](https://github.com/halemmerich)
+
 Forked from messages_light by Rarder44
 
diff --git a/apps/messagesoverlay/lib.js b/apps/messagesoverlay/lib.js
index feb9ff379..9119999bd 100644
--- a/apps/messagesoverlay/lib.js
+++ b/apps/messagesoverlay/lib.js
@@ -1,49 +1,69 @@
-const MIN_FREE_MEM = 1000;
-const LOW_MEM = 2000;
-const ovrx = 10;
-const ovry = 10;
+let lockListener;
+let ovr;
+let clearingTimeout;
+
+// Converts a espruino version to a semantiv versioning object
+const toSemantic = function (v){
+  return {
+    major: v.substring(0,v.indexOf("v")),
+    minor: v.substring(v.indexOf("v") + 1, v.includes(".") ? v.indexOf(".") : v.length),
+    patch: v.includes(".") ? v.substring(v.indexOf(".") + 1, v.length) : 0
+  };
+};
+
+const isNewer = function(espruinoVersion, baseVersion){
+  const s = toSemantic(espruinoVersion);
+  const b = toSemantic(baseVersion);
+
+  return s.major >= b.major &&
+    s.minor >= b.major &&
+    s.patch > b.patch;
+};
+
+let needsWorkaround;
+
+let settings = Object.assign(
+  require('Storage').readJSON("messagesoverlay.default.json", true) || {},
+  require('Storage').readJSON("messagesoverlay.json", true) || {}
+);
+
+settings = Object.assign({
+  fontSmall:"6x8",
+  fontMedium:"6x15",
+  fontBig: "12x20"
+}, settings);
+
+const ovrx = settings.border;
+const ovry = ovrx;
 const ovrw = g.getWidth()-2*ovrx;
 const ovrh = g.getHeight()-2*ovry;
-let _g = g;
 
-let lockListener;
-let quiet;
+let LOG=()=>{};
+//LOG = function() { print.apply(null, arguments);};
 
-let LOG = function() {
-  //print.apply(null, arguments);
-};
-
-let isQuiet = function(){
-  if (quiet == undefined) quiet = (require('Storage').readJSON('setting.json', 1) || {}).quiet;
-  return quiet;
-};
-
-let settings = {
-  fontSmall:"6x8",
-  fontMedium:"Vector:14",
-  fontBig:"Vector:20",
-  fontLarge:"Vector:30",
+const isQuiet = function(){
+  return (require('Storage').readJSON('setting.json', 1) || {}).quiet;
 };
 
 let eventQueue = [];
 let callInProgress = false;
+let buzzing = false;
 
-let show = function(ovr){
-  let img = ovr;
-  LOG("show", img.getBPP());
+const show = function(){
+  let img = ovr.asImage();
+  LOG("show", img.bpp);
   if (ovr.getBPP() == 1) {
-    img = ovr.asImage();
-    img.palette = new Uint16Array([_g.theme.fg,_g.theme.bg]);
+    img.palette = new Uint16Array([g.theme.fg,g.theme.bg]);
   }
-  Bangle.setLCDOverlay(img, ovrx, ovry);
+  Bangle.setLCDOverlay(img, ovrx, ovry, {id:"messagesoverlay", remove:cleanup});
 };
 
-let manageEvent = function(ovr, event) {
+const manageEvent = function(event) {
   event.new = true;
 
   LOG("manageEvent");
   if (event.id == "call") {
-    showCall(ovr, event);
+    showCall(event);
     return;
   }
   switch (event.t) {
@@ -51,7 +71,7 @@ let manageEvent = function(ovr, event) {
       eventQueue.unshift(event);
 
       if (!callInProgress)
-        showMessage(ovr, event);
+        showMessage(event);
       break;
 
     case "modify": {
@@ -66,23 +86,23 @@ let manageEvent = function(ovr, event) {
         eventQueue.unshift(event);
 
       if (!callInProgress)
-        showMessage(ovr, event);
+        showMessage(event);
       break;
     }
     case "remove":
       if (eventQueue.length == 0 && !callInProgress)
-        next(ovr);
+        next();
 
       if (!callInProgress && eventQueue[0] !== undefined && eventQueue[0].id == event.id)
-        next(ovr);
-      else 
+        next();
+      else
         eventQueue = [];
 
       break;
   }
 };
 
-let roundedRect = function(ovr, x,y,w,h,filled){
+const roundedRect = function(x,y,w,h,filled){
   var poly = [
     x,y+4,
     x+4,y,
@@ -94,115 +114,153 @@ let roundedRect = function(ovr, x,y,w,h,filled){
     x,y+h-5,
     x,y+4
   ];
+  if (filled){
+    let c = ovr.getColor();
+    ovr.setColor(ovr.getBgColor());
+    ovr.fillPoly(poly,true);
+    ovr.setColor(c);
+  }
   ovr.drawPoly(poly,true);
-  if (filled) ovr.fillPoly(poly,true);
 };
 
-let drawScreen = function(ovr, title, titleFont, src, iconcolor, icon){
-  ovr.setBgColor(ovr.theme.bg2);
-  ovr.clearRect(2,2,ovr.getWidth()-3,37);
+const DIVIDER = 38;
+
+const drawScreen = function(title, src, iconcolor, icon){
+  setColors(false);
+
+  drawBorder();
+
+  setColors(true);
+  ovr.clearRect(2,2,ovr.getWidth()-3, DIVIDER - 1);
 
-  ovr.setColor(ovr.theme.fg2);
   ovr.setFont(settings.fontSmall);
   ovr.setFontAlign(0,-1);
 
-  let textCenter = (ovr.getWidth()+35-26)/2;
+  const textCenter = (ovr.getWidth()+34-24)/2-1;
 
-  if (src) {
-    let shortened = src;
-    while (ovr.stringWidth(shortened) > ovr.getWidth()-80) shortened = shortened.substring(0,shortened.length-2);
-    if (shortened.length != src.length) shortened += "...";
-    ovr.drawString(shortened, textCenter, 2);
+  const w = ovr.getWidth() - 35 - 26;
+
+  if (title)
+    drawTitle(title, textCenter, w, 8, DIVIDER - 8, 0);
+
+  if (src)
+    drawSource(src, textCenter, w, 2, -1);
+
+  if (ovr.getBPP() > 1) {
+    let old = ovr.getBgColor();
+    ovr.setBgColor("#888");
+    roundedRect(4, 5, 30, 30,true);
+    ovr.setBgColor(old);
+    old = ovr.getColor();
+    ovr.setColor(iconcolor);
+    ovr.drawImage(icon,7,8);
+    ovr.setColor(old);
+  } else {
+    roundedRect(4, 5, 30, 30,true);
+    ovr.drawImage(icon,7,8);
   }
 
+  roundedRect(ovr.getWidth()-26,5,22,30,true);
   ovr.setFontAlign(0,0);
-  ovr.setFont(titleFont);
-  if (title) ovr.drawString(title, textCenter, 38/2 + 5);
-
-  ovr.setColor(ovr.theme.fg2);
-
-  ovr.setFont(settings.fontMedium);
-  roundedRect(ovr, ovr.getWidth()-26,5,22,30,false);
   ovr.setFont("Vector:16");
-  ovr.drawString("X",ovr.getWidth()-14,21);
-
-  ovr.setColor("#888");
-  roundedRect(ovr, 5,5,30,30,true);
-  ovr.setColor(ovr.getBPP() != 1 ? iconcolor : ovr.theme.bg2);
-  ovr.drawImage(icon,8,8);
+  ovr.drawString("X",ovr.getWidth()-14,20);
 };
 
-let showMessage = function(ovr, msg) {
-  LOG("showMessage");
-  ovr.setBgColor(ovr.theme.bg);
+const drawSource = function(src, center, w, y, align) {
+  ovr.setFont(settings.fontSmall);
+  while (ovr.stringWidth(src) > w) src = src.substring(0,src.length-2);
+  if (src.length != src.length) src += "...";
+  ovr.setFontAlign(0,align);
+  ovr.drawString(src, center, y);
+};
 
-  if (typeof msg.CanscrollDown === "undefined")
-    msg.CanscrollDown = false;
-  if (typeof msg.CanscrollUp === "undefined")
-    msg.CanscrollUp = false;
+const drawTitle = function(title, center, w, y, h) {
+  let size = 30;
 
-  // Normal text message display
-  let title = msg.title,
-    titleFont = settings.fontLarge,
-    lines;
-  if (title) {
-    let w = ovr.getWidth() - 35 - 26;
-    if (ovr.setFont(titleFont).stringWidth(title) > w)
-      titleFont = settings.fontMedium;
-    if (ovr.setFont(titleFont).stringWidth(title) > w) {
-      lines = ovr.wrapString(title, w);
-      title = (lines.length > 2) ? lines.slice(0, 2).join("\n") + "..." : lines.join("\n");
+  while (ovr.setFont("Vector:" + size).stringWidth(title) > w){
+    size -= 2;
+    if (size < 14){
+      ovr.setFont(settings.fontMedium);
+      break;
     }
   }
 
-  drawScreen(ovr, title, titleFont, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
+  let dh;
+  let a;
+  if (ovr.stringWidth(title) > w) {
+    let ws = ovr.wrapString(title, w);
+    if (ws.length >= 2 && ovr.stringWidth(ws[1]) > w - 8){
+      ws[1] = ws[1].substring(0, ws[1].length - 2);
+      ws[1] += "...";
+    }
+    title = ws.slice(0, 2).join("\n");
+
+    a = -1;
+    dh = y + 2;
+  } else {
+    a = 0;
+    dh = y + h/2;
+  }
+  ovr.setFontAlign(0, a);
+  ovr.drawString(title, center, dh);
+};
+
+const setColors = function(lockRelevant) {
+  if (lockRelevant && !Bangle.isLocked()){
+    ovr.setColor(ovr.theme.fg2);
+    ovr.setBgColor(ovr.theme.bg2);
+  } else {
+    ovr.setColor(ovr.theme.fg);
+    ovr.setBgColor(ovr.theme.bg);
+  }
+};
+
+const showMessage = function(msg) {
+  LOG("showMessage");
+
+  ovr.setClipRect(0,0,ovr.getWidth(),ovr.getHeight());
+
+  drawScreen(msg.title, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
+
+
+  if (!Bangle.isLocked()){
+    ovr.setColor(ovr.theme.fg);
+    ovr.setBgColor(ovr.theme.bg);
+  }
+
+  drawMessage(msg);
 
   if (!isQuiet() && msg.new) {
     msg.new = false;
-    Bangle.buzz();
+    if (!buzzing){
+      buzzing = true;
+      Bangle.buzz().then(()=>{setTimeout(()=>{buzzing = false;},2000);});
+    }
+    Bangle.setLCDPower(1);
   }
-
-  drawMessage(ovr, msg);
 };
 
-let drawBorder = function(img) {
+const drawBorder = function() {
   LOG("drawBorder", isQuiet());
-  if (img) ovr=img;
-  if (Bangle.isLocked())
-    ovr.setColor(ovr.theme.fgH);
-  else
-    ovr.setColor(ovr.theme.fg);
   ovr.drawRect(0,0,ovr.getWidth()-1,ovr.getHeight()-1);
   ovr.drawRect(1,1,ovr.getWidth()-2,ovr.getHeight()-2);
-  show(ovr);
+  ovr.drawRect(2,DIVIDER,ovr.getWidth()-2,DIVIDER+1);
+  show();
 };
 
-let showCall = function(ovr, msg) {
+const showCall = function(msg) {
   LOG("showCall");
   LOG(msg);
 
   if (msg.t == "remove") {
     LOG("hide call screen");
-    next(ovr); //dont shift
+    next(); //dont shift
     return;
   }
 
   callInProgress = true;
 
-  let title = msg.title,
-    titleFont = settings.fontLarge,
-    lines;
-  if (title) {
-    let w = ovr.getWidth() - 35 -26;
-    if (ovr.setFont(titleFont).stringWidth(title) > w)
-      titleFont = settings.fontMedium;
-    if (ovr.setFont(titleFont).stringWidth(title) > w) {
-      lines = ovr.wrapString(title, w);
-      title = (lines.length > 2) ? lines.slice(0, 2).join("\n") + "..." : lines.join("\n");
-    }
-  }
-
-  drawScreen(ovr, title, titleFont, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
+  drawScreen(msg.title, msg.src || /*LANG*/ "Message", require("messageicons").getColor(msg), require("messageicons").getImage(msg));
 
   stopCallBuzz();
   if (!isQuiet()) {
@@ -216,10 +274,10 @@ let showCall = function(ovr, msg) {
       Bangle.buzz(500);
     }
   }
-  drawMessage(ovr, msg);
+  drawMessage(msg);
 };
 
-let next = function(ovr) {
+const next = function() {
   LOG("next");
   stopCallBuzz();
 
@@ -230,203 +288,393 @@ let next = function(ovr) {
   if (eventQueue.length == 0) {
     LOG("no element in queue - closing");
     cleanup();
-    return;
+    return false;
   }
 
-  showMessage(ovr, eventQueue[0]);
+  showMessage(eventQueue[0]);
+  return true;
 };
 
 let callBuzzTimer = null;
-let stopCallBuzz = function() {
+const stopCallBuzz = function() {
   if (callBuzzTimer) {
     clearInterval(callBuzzTimer);
     callBuzzTimer = undefined;
   }
 };
 
-let drawTriangleUp = function(ovr) {
-  ovr.reset();
-  ovr.fillPoly([ovr.getWidth()-9, 46,ovr.getWidth()-14, 56,ovr.getWidth()-4, 56]);
+const drawTriangleUp = function() {
+  ovr.fillPoly([ovr.getWidth()-10, 46,ovr.getWidth()-15, 56,ovr.getWidth()-5, 56]);
 };
 
-let drawTriangleDown = function(ovr) {
-  ovr.reset();
-  ovr.fillPoly([ovr.getWidth()-9, ovr.getHeight()-6, ovr.getWidth()-14, ovr.getHeight()-16, ovr.getWidth()-4, ovr.getHeight()-16]);
+const drawTriangleDown = function() {
+  ovr.fillPoly([ovr.getWidth()-10, ovr.getHeight()-6, ovr.getWidth()-15, ovr.getHeight()-16, ovr.getWidth()-5, ovr.getHeight()-16]);
 };
 
-let linesScroll = 6;
 
-let scrollUp = function(ovr) {
-  msg = eventQueue[0];
+const scrollUp = function() {
+  const msg = eventQueue[0];
   LOG("up", msg);
-  if (typeof msg.FirstLine === "undefined")
-    msg.FirstLine = 0;
-  if (typeof msg.CanscrollUp === "undefined")
-    msg.CanscrollUp = false;
 
   if (!msg.CanscrollUp) return;
 
-  msg.FirstLine = msg.FirstLine > 0 ? msg.FirstLine - linesScroll : 0;
-
-  drawMessage(ovr, msg);
+  msg.FirstLine = msg.FirstLine > 0 ? msg.FirstLine - 1 : 0;
+  drawMessage(msg);
 };
 
-let scrollDown = function(ovr) {
-  msg = eventQueue[0];
+const scrollDown = function() {
+  const msg = eventQueue[0];
   LOG("down", msg);
-  if (typeof msg.FirstLine === "undefined")
-    msg.FirstLine = 0;
-  if (typeof msg.CanscrollDown === "undefined")
-    msg.CanscrollDown = false;
 
   if (!msg.CanscrollDown) return;
 
-  msg.FirstLine = msg.FirstLine + linesScroll;
-  drawMessage(ovr, msg);
+  msg.FirstLine = msg.FirstLine + 1;
+  drawMessage(msg);
 };
 
-let drawMessage = function(ovr, msg) {
-  let MyWrapString = function(str, maxWidth) {
+const drawMessage = function(msg) {
+  setColors(false);
+  const getStringHeight = function(str){
+    "jit";
+    const metrics = ovr.stringMetrics(str);
+    if (needsWorkaround === undefined)
+      needsWorkaround = isNewer("2v21.13", process.version);
+    if (needsWorkaround && metrics.maxImageHeight > 16)
+      metrics.maxImageHeight = metrics.height;
+    return Math.max(metrics.height, metrics.maxImageHeight);
+  };
+
+  const wrapString = function(str, maxWidth) {
     str = str.replace("\r\n", "\n").replace("\r", "\n");
     return ovr.wrapString(str, maxWidth);
   };
+  const wrappedStringHeight = function(strArray){
+    let r = 0;
+    strArray.forEach((line, i) => {
+      r += getStringHeight(line);
+    });
+    return r;
+  };
 
-  if (typeof msg.FirstLine === "undefined") msg.FirstLine = 0;
+  if (msg.FirstLine === undefined) msg.FirstLine = 0;
 
-  let bodyFont = typeof msg.bodyFont === "undefined" ? settings.fontMedium : msg.bodyFont;
-  let Padding = 3;
-  if (typeof msg.lines === "undefined") {
+  const padding = eventQueue.length > 1 ? (eventQueue.length > 3 ? 7 : 5) : 3;
+
+  const yText = DIVIDER+2;
+  let yLine = yText + 4;
+
+  ovr.setClipRect(2, yText, ovr.getWidth() - 3, ovr.getHeight() - 3);
+
+  const maxTextHeight = ovr.getHeight() - yLine - padding + 2;
+
+  if (!msg.lines) {
+    let bodyFont = settings.fontBig;
     ovr.setFont(bodyFont);
-    msg.lines = MyWrapString(msg.body, ovr.getWidth() - (Padding * 2));
-    if (msg.lines.length <= 2) {
-      bodyFont = ovr.getFonts().includes("Vector") ? "Vector:20" : "6x8:3";
+    msg.lines = wrapString(msg.body, ovr.getWidth() - 4 - padding);
+
+    if (wrappedStringHeight(msg.lines) > maxTextHeight) {
+      bodyFont = settings.fontMedium;
       ovr.setFont(bodyFont);
-      msg.lines = MyWrapString(msg.body, ovr.getWidth() - (Padding * 2));
-      msg.bodyFont = bodyFont;
+      msg.lines = wrapString(msg.body, ovr.getWidth() - 4 - padding);
     }
+    msg.bodyFont = bodyFont;
+    msg.lineHeights = [];
+    msg.lines.forEach((line, i) => {
+      msg.lineHeights[i] = getStringHeight(line);
+    });
   }
 
-  let NumLines = 7;
+  LOG("Prepared message", msg);
 
-  let linesToPrint = (msg.lines.length > NumLines) ? msg.lines.slice(msg.FirstLine, msg.FirstLine + NumLines) : msg.lines;
+  ovr.setFont(msg.bodyFont);
+  ovr.clearRect(2, yText, ovr.getWidth()-3, ovr.getHeight()-3);
 
-  let yText = 40;
+  let xText = 4;
 
-  ovr.setBgColor(ovr.theme.bg);
-  ovr.setColor(ovr.theme.fg);
-  ovr.clearRect(2, yText, ovrw-3, ovrh-3);
-  let xText = Padding;
-  yText += Padding;
-  ovr.setFont(bodyFont);
-  let HText = ovr.getFontHeight();
-
-  yText = ((ovrh - yText) / 2) - (linesToPrint.length * HText / 2) + yText;
-
-  if (linesToPrint.length <= 3) {
+  if (msg.bodyFont == settings.fontBig) {
     ovr.setFontAlign(0, -1);
-    xText = ovr.getWidth() / 2;
-  } else
+    xText = Math.round(ovr.getWidth() / 2 - (padding - 3) / 2) + 1;
+    yLine = (ovr.getHeight() + yLine) / 2 - (wrappedStringHeight(msg.lines) / 2);
+    ovr.drawString(msg.lines.join("\n"), xText, yLine);
+  } else {
     ovr.setFontAlign(-1, -1);
+  }
 
+  let currentLine = msg.FirstLine;
 
-  linesToPrint.forEach((line, i) => {
-    ovr.drawString(line, xText, yText + HText * i);
-  });
+  let drawnHeight = 0;
+
+  while(drawnHeight < maxTextHeight && msg.lines.length > currentLine) {
+    const lineHeight = msg.lineHeights[currentLine];
+    ovr.drawString(msg.lines[currentLine], xText, yLine + drawnHeight);
+    drawnHeight += lineHeight;
+    currentLine++;
+  }
+
+  if (eventQueue.length > 1){
+    ovr.drawLine(ovr.getWidth()-4,ovr.getHeight()/2,ovr.getWidth()-4,ovr.getHeight()-4);
+    ovr.drawLine(ovr.getWidth()/2,ovr.getHeight()-4,ovr.getWidth()-4,ovr.getHeight()-4);
+  }
+  if (eventQueue.length > 3){
+    ovr.drawLine(ovr.getWidth()-6,ovr.getHeight()*0.6,ovr.getWidth()-6,ovr.getHeight()-6);
+    ovr.drawLine(ovr.getWidth()*0.6,ovr.getHeight()-6,ovr.getWidth()-6,ovr.getHeight()-6);
+  }
 
   if (msg.FirstLine != 0) {
     msg.CanscrollUp = true;
-    drawTriangleUp(ovr);
+    drawTriangleUp();
   } else
     msg.CanscrollUp = false;
 
-  if (msg.FirstLine + linesToPrint.length < msg.lines.length) {
+  if (drawnHeight >= maxTextHeight) {
     msg.CanscrollDown = true;
-    drawTriangleDown(ovr);
+    drawTriangleDown();
   } else
     msg.CanscrollDown = false;
-  show(ovr);
-  if (!isQuiet()) Bangle.setLCDPower(1);
+
+  show();
 };
 
-let getSwipeHandler = function(ovr){
-  return (lr, ud) => {
-    if (ud == 1) {
-      scrollUp(ovr);
-    } else if (ud == -1){
-      scrollDown(ovr);
+const getDragHandler = function(){
+  return (e) => {
+    if (e.dy > 0) {
+      scrollUp();
+    } else if (e.dy < 0){
+      scrollDown();
     }
   };
 };
 
-let getTouchHandler = function(ovr){
+const getTouchHandler = function(){
   return (_, xy) => {
-    if (xy.y < ovry + 40){
-      next(ovr);
+    if (xy.y < ovry + DIVIDER){
+      next();
     }
   };
 };
 
-let restoreHandler = function(event){
-  LOG("Restore", event, backup[event]);
-  Bangle.removeAllListeners(event);
-  Bangle["#on" + event]=backup[event];
-  backup[event] = undefined;
+const EVENTS=["touch", "drag", "swipe"];
+
+let hasBackup = false;
+
+const origOn = Bangle.on;
+const backupOn = function(event, handler){
+  if (EVENTS.includes(event)){
+    if (!backup[event])
+      backup[event] = [];
+    backup[event].push(handler);
+  }
+  else origOn.call(Bangle, event, handler);
 };
 
-let backupHandler = function(event){
-  if (backupDone) return; // do not backup, overlay is already up
-  backup[event] = Bangle["#on" + event];
-  LOG("Backed up", backup[event]);
-  Bangle.removeAllListeners(event);
+const origPrependListener = Bangle.prependListener;
+const backupPrependListener = function(event, handler){
+  if (EVENTS.includes(event)){
+    if (!backup[event])
+      backup[event] = [];
+    backup[event].unshift(handler);
+  }
+  else origPrependListener.call(Bangle, event, handler);
 };
 
-let cleanup = function(){
+const origClearWatch = clearWatch;
+const backupClearWatch = function(w) {
+  if (w)
+    backup.watches[w] = null;
+  else
+    backup.watches = [];
+};
+
+const origSetWatch = setWatch;
+const backupSetWatch = function(){
+  if (!backup.watches)
+    backup.watches = [];
+  LOG("current watches", backup.watches);
+  let i = backup.watches.length + 1;
+  LOG("backup for watch", arguments, "at index", i);
+  backup.watches.push(arguments);
+  return i;
+};
+
+const origRemove = Bangle.removeListener;
+const backupRemove = function(event, handler){
+  if (EVENTS.includes(event) && backup[event]){
+    LOG("backup for " + event + ": " + backup[event]);
+    backup[event] = backup[event].filter(e=>e!==handler);
+  }
+  else origRemove.call(Bangle, event, handler);
+};
+
+const origRemoveAll = Bangle.removeAllListeners;
+const backupRemoveAll = function(event){
+  if (backup[event])
+    backup[event] = undefined;
+  origRemoveAll.call(Bangle);
+};
+
+const restoreHandlers = function(){
+  if (!hasBackup){
+    LOG("No backup available");
+    return;
+  }
+
+  for (const event of EVENTS){
+    LOG("Restore", backup[event]);
+    origRemoveAll.call(Bangle, event);
+    if (backup[event] && backup[event].length == 1)
+      backup[event] = backup[event][0];
+    Bangle["#on" + event]=backup[event];
+    backup[event] = undefined;
+  }
+
+  if (backup.watches){
+    let toRemove = [];
+
+    origClearWatch.call(global);
+
+    LOG("Restoring", backup.watches.length, "watches");
+    for(let i = 0; i < backup.watches.length; i++){
+      let w = backup.watches[i];
+      LOG("Restoring watch", w);
+      if (w) {
+        origSetWatch.apply(global, w);
+      } else {
+        toRemove.push(i+1);
+        origSetWatch.call(global, ()=>{}, BTN);
+      }
+    }
+
+    LOG("Remove watches", toRemove, global["\xff"].watches);
+    for(let c of toRemove){
+      origClearWatch.call(global, c);
+    }
+  }
+
+  global.setWatch = origSetWatch;
+  global.clearWatch = origClearWatch;
+  Bangle.on = origOn;
+  Bangle.prependListener = origPrependListener;
+  Bangle.removeListener = origRemove;
+  Bangle.removeAllListeners = origRemoveAll;
+
+  hasBackup = false;
+};
+
+const backupHandlers = function(){
+  if (hasBackup){
+    LOG("Backup already exists");
+    return false; // do not backup, overlay is already up
+  }
+
+  for (const event of EVENTS){
+    backup[event] = Bangle["#on" + event];
+    if (typeof backup[event] == "function")
+      backup[event] = [ backup[event] ];
+    LOG("Backed up", backup[event], event);
+    Bangle.removeAllListeners(event);
+  }
+
+  backup.watches = [];
+
+  for (let i = 1; i < global["\xff"].watches.length; i++){
+    let w = global["\xff"].watches[i];
+    LOG("Transform watch", w);
+    if (w) {
+      w = [
+        w.callback ? w.callback : w.cb, // Handle change in name of callback variable to cb in 2v21.104
+        w.pin,
+        w
+      ];
+      delete w[2].callback;
+      delete w[2].cb;
+      delete w[2].pin;
+      w[2].debounce = Math.round(w[2].debounce / 1048.576);
+    } else {
+      w = null;
+    }
+    LOG("Transformed to", w);
+    backup.watches.push(w);
+  }
+
+  LOG("Backed up watches", backup.watches);
+  clearWatch();
+
+  global.setWatch = backupSetWatch;
+  global.clearWatch = backupClearWatch;
+  Bangle.on = backupOn;
+  Bangle.prependListener = backupPrependListener;
+  Bangle.removeListener = backupRemove;
+  Bangle.removeAllListeners = backupRemoveAll;
+
+  hasBackup = true;
+
+  return true;
+};
+
+const cleanup = function(){
   if (lockListener) {
     Bangle.removeListener("lock", lockListener);
     lockListener = undefined;
   }
-  restoreHandler("touch");
-  restoreHandler("swipe");
-  restoreHandler("drag");
+  restoreHandlers();
 
-  Bangle.setLCDOverlay();
-  backupDone = false;
+  Bangle.setLCDOverlay(undefined, {id: "messagesoverlay"});
   ovr = undefined;
-  quiet = undefined;
 };
 
-let backup = {};
+const backup = {};
 
-let backupDone = false;
-
-let main = function(ovr, event) {
-  LOG("Main", event, settings);
+const main = function(event) {
+  LOG("Main", event.t);
+  const didBackup = backupHandlers();
 
   if (!lockListener) {
-    lockListener = function (){
-      drawBorder();
+    lockListener = function (e){
+      updateClearingTimeout();
+      showMessage(eventQueue[0]);
     };
-    Bangle.on('lock', lockListener);
+    LOG("Add overlay lock handlers");
+    origOn.call(Bangle, 'lock', lockListener);
   }
-  backupHandler("touch");
-  backupHandler("swipe");
-  backupHandler("drag");
-  if (!backupDone){
-    Bangle.on('touch', getTouchHandler(ovr));
-    Bangle.on('swipe', getSwipeHandler(ovr));
+
+  if (didBackup){
+    LOG("Add overlay UI handlers");
+    origOn.call(Bangle, 'touch', getTouchHandler(ovr));
+    origOn.call(Bangle, 'drag', getDragHandler(ovr));
   }
-  backupDone=true;
 
   if (event !== undefined){
-    drawBorder(ovr);
-    manageEvent(ovr, event);
+    manageEvent(event);
   } else {
     LOG("No event given");
     cleanup();
   }
 };
 
-let ovr;
+const updateClearingTimeout = ()=>{
+  LOG("updateClearingTimeout");
+  if (settings.autoclear <= 0)
+    return;
+  LOG("Remove clearing timeout", clearingTimeout);
+  if (clearingTimeout) clearTimeout(clearingTimeout);
+  if (Bangle.isLocked()){
+    LOG("Set new clearing timeout");
+    clearingTimeout = setTimeout(()=>{
+      LOG("setNewTimeout");
+      const event = eventQueue.pop();
+      if (event)
+        showMessage(event);
+      if (eventQueue.length > 0){
+        LOG("still got elements");
+        updateClearingTimeout();
+      } else {
+        cleanup();
+      }
+    }, settings.autoclear * 1000);
+  } else {
+    clearingTimeout = undefined;
+  }
+};
 
 exports.message = function(type, event) {
   LOG("Got message", type, event);
@@ -434,13 +682,40 @@ exports.message = function(type, event) {
   if(!(type=="text" || type == "call")) return;
   if(type=="text" && event.id == "nav") return;
   if(event.handled) return;
+  if(event.messagesoverlayignore) return;
 
-  bpp = 4;
-  if (process.memory().free < LOW_MEM)
+  let free = process.memory().free;
+  let bpp = settings.systemTheme ? 16 : 4;
+
+  let estimatedMemUse = bpp == 16 ? 4096 : (bpp == 4 ? 1536 : 768);
+  // reduce estimation if ovr already exists and uses memory;
+  if (ovr)
+    estimatedMemUse -= ovr.getBPP() == 16 ? 4096 : (ovr.getBPP() == 4 ? 1536 : 768);
+
+  if (process.memory().free - estimatedMemUse < settings.minfreemem * 1024) {
+    // we are going to be under our minfreemem setting if we proceed
     bpp = 1;
+    if (ovr && ovr.getBPP() > 1){
+      // can reduce memory by going 1 bit
+      let saves = ovr.getBPP() == 16 ? 4096 - 768 : 768;
+      estimatedMemUse -= saves;
+      LOG("Go to 1 bit, saving", saves);
+    } else {
+      estimatedMemUse = 768;
+    }
+  }
 
-  while (process.memory().free < MIN_FREE_MEM && eventQueue.length > 0){
-    let dropped = eventQueue.pop();
+
+  if (E.getSizeOf){
+    let e = E.getSizeOf(eventQueue);
+    estimatedMemUse += e;
+    LOG("EventQueue has", e, "blocks");
+  }
+
+  LOG("Free ", free, "estimated use", estimatedMemUse, "for", bpp, "BPP");
+
+  while (process.memory().free - estimatedMemUse < settings.minfreemem * 1024 && eventQueue.length > 0){
+    const dropped = eventQueue.pop();
     print("Dropped message because of memory constraints", dropped);
   }
 
@@ -448,19 +723,37 @@ exports.message = function(type, event) {
     ovr = Graphics.createArrayBuffer(ovrw, ovrh, bpp, {
       msb: true
     });
-  } else {
-    ovr.clear();
+    if(E.getSizeOf)
+       LOG("New overlay uses", E.getSizeOf(ovr), "blocks");
   }
 
-  g = ovr;
+  ovr.reset();
 
-  if (bpp == 4)
-    ovr.theme = g.theme;
-  else
-    ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
+  if (bpp > 1){
+    if (settings.systemTheme){
+      ovr.theme = g.theme;
+    } else {
+      ovr.theme = {
+        fg: g.theme.dark ? 15: 0,
+        bg: g.theme.dark ? 0: 15,
+        fg2: g.theme.dark ? 15: 0,
+        bg2: g.theme.dark ? 9 : 8,
+        fgH: g.theme.dark ? 15 : 0,
+        bgH: g.theme.dark ? 9: 8,
+      };
+    }
+  }
+  else {
+    if (g.theme.dark)
+      ovr.theme = { fg:1, bg:0, fg2:0, bg2:1, fgH:0, bgH:1 };
+    else
+      ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
+  }
+
+  main(event);
+
+  updateClearingTimeout();
 
-  main(ovr, event);
-  if (!isQuiet()) Bangle.setLCDPower(1);
   event.handled = true;
-  g = _g;
+  g.flip();
 };
diff --git a/apps/messagesoverlay/metadata.json b/apps/messagesoverlay/metadata.json
index c16a41f5c..26095eb33 100644
--- a/apps/messagesoverlay/metadata.json
+++ b/apps/messagesoverlay/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messagesoverlay",
   "name": "Messages Overlay",
-  "version": "0.06",
+  "version": "0.11",
   "description": "An overlay based implementation of a messages UI (display notifications from iOS and Gadgetbridge/Android)",
   "icon": "app.png",
   "type": "bootloader",
@@ -11,7 +11,10 @@
   "readme": "README.md",
   "storage": [
     {"name":"messagesoverlay","url":"lib.js"},
-    {"name":"messagesoverlay.0.boot.js","url":"boot.js"}
+    {"name":"messagesoverlay.0.boot.js","url":"boot.js"},
+    {"name":"messagesoverlay.settings.js","url":"settings.js"},
+    {"name":"messagesoverlay.default.json","url":"default.json"}
   ],
+  "data": [{"name":"bthrm.json"}],
   "screenshots": [{"url":"screen_call.png"} ,{"url":"screen_message.png"} ]
 }
diff --git a/apps/multitimer/ChangeLog b/apps/multitimer/ChangeLog
index 8bf06a0d3..a37b12a60 100644
--- a/apps/multitimer/ChangeLog
+++ b/apps/multitimer/ChangeLog
@@ -8,3 +8,6 @@
       menu display/fastload removes it
 0.08: Add setting for initial page to display
 0.09: Minor code improvements
+0.10: Handle missing alarm data, e.g. when our reset is fired from
+      non-multitimer alarms
+0.11: Preserve setUI removal callbacks, e.g. those of showMenu
diff --git a/apps/multitimer/app.js b/apps/multitimer/app.js
index 31da18796..91745310f 100644
--- a/apps/multitimer/app.js
+++ b/apps/multitimer/app.js
@@ -691,10 +691,12 @@ function setUI() {
   // E.showMenu/E.showScroller/E.showAlert call setUI, so we register onDrag() separately
   // and tack on uiRemove after the fact to avoid interfering
   Bangle.on("drag", onDrag);
+  const origRemove = Bangle.uiRemove;
   Bangle.uiRemove = () => {
     Bangle.removeListener("drag", onDrag);
     Object.values(timerInt1).forEach(clearTimeout);
     Object.values(timerInt2).forEach(clearTimeout);
+    if (origRemove) origRemove();
   };
 }
 
diff --git a/apps/multitimer/boot.js b/apps/multitimer/boot.js
index 70b9032f6..bfd8c6ac9 100644
--- a/apps/multitimer/boot.js
+++ b/apps/multitimer/boot.js
@@ -1,6 +1,6 @@
 {
   const resetTimer = alarm => {
-    if (alarm.timer) alarm.timer = alarm.data.ot;
+    if (alarm.timer && "ot" in alarm.data) alarm.timer = alarm.data.ot;
   };
 
   Bangle.on("alarmSnooze", resetTimer);
diff --git a/apps/multitimer/metadata.json b/apps/multitimer/metadata.json
index a5c236f67..7f44698a9 100644
--- a/apps/multitimer/metadata.json
+++ b/apps/multitimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "multitimer",
   "name": "Multi Timer",
-  "version": "0.09",
+  "version": "0.11",
   "description": "Set timers and chronographs (stopwatches) and watch them count down in real time. Pause, create, edit, and delete timers and chronos, and add custom labels/messages. Also sets alarms.",
   "icon": "app.png",
   "screenshots": [
diff --git a/apps/notify/ChangeLog b/apps/notify/ChangeLog
index f40490488..9b99504da 100644
--- a/apps/notify/ChangeLog
+++ b/apps/notify/ChangeLog
@@ -10,3 +10,4 @@
 0.11: Fix regression that caused no notifications and corrupted background
 0.12: Add Bangle.js 2 support with Bangle.setLCDOverlay
 0.13: Add a default title background for the dark theme
+0.14: Stop event propagation on notification tap
diff --git a/apps/notify/metadata.json b/apps/notify/metadata.json
index bab68127c..7b05079e0 100644
--- a/apps/notify/metadata.json
+++ b/apps/notify/metadata.json
@@ -2,7 +2,7 @@
   "id": "notify",
   "name": "Notifications (default)",
   "shortName": "Notifications",
-  "version": "0.13",
+  "version": "0.14",
   "description": "Provides the default `notify` module used by applications to display notifications on the screen. This module is installed by default by client applications such as the Gadgetbridge app.  Installing `Fullscreen Notifications` replaces this module with a version that displays the notifications using the full screen",
   "icon": "notify.png",
   "type": "notify",
diff --git a/apps/notify/notify_bjs2.js b/apps/notify/notify_bjs2.js
index 456c4e929..40de7a271 100644
--- a/apps/notify/notify_bjs2.js
+++ b/apps/notify/notify_bjs2.js
@@ -157,6 +157,7 @@ exports.hide = function(options) {
   hideCallback = undefined;
   id = null;
   Bangle.removeListener("touch", exports.hide);
+  E.stopEventPropagation && E.stopEventPropagation();
   function anim() {
     pos += 4;
     if (pos > 0) {
diff --git a/apps/openhaystack/ChangeLog b/apps/openhaystack/ChangeLog
index 067366a77..67d7bbabf 100644
--- a/apps/openhaystack/ChangeLog
+++ b/apps/openhaystack/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Keep advertising when connected
+0.03: Use ble_advert module to work with other BLE advert apps
diff --git a/apps/openhaystack/custom.html b/apps/openhaystack/custom.html
index 1b57884bc..774b5e6cb 100644
--- a/apps/openhaystack/custom.html
+++ b/apps/openhaystack/custom.html
@@ -40,7 +40,7 @@ const key = E.toUint8Array(atob(${JSON.stringify(keyValue)})); // public key
 const mac = [ key[0] | 0b11000000, key[1], key[2], key[3], key[4], key[5] ].map(x => x.toString(16).padStart(2, '0')).join(':'); // mac address
 const adv = [ 0x1e, 0xff, 0x4c, 0x00, 0x12, 0x19, 0x00, key[6], key[7], key[8], key[9], key[10], key[11], key[12], key[13], key[14], key[15], key[16], key[17], key[18], key[19], key[20], key[21], key[22], key[23], key[24], key[25], key[26], key[27], key[0] >> 6, 0x00 ]; // advertising packet
 NRF.setAddress(mac);
-NRF.setAdvertising([adv,{}],{whenConnected: true, interval: 1000}); // advertise AirTag *and* normal device name (to remain connectable)
+require("ble_advert").push(adv, {whenConnected: true, interval: 1000}); // advertise AirTag *and* normal device name (to remain connectable)
 }
 `;
         // send finished app
diff --git a/apps/openhaystack/metadata.json b/apps/openhaystack/metadata.json
index 28d3423f9..712e7ebaf 100644
--- a/apps/openhaystack/metadata.json
+++ b/apps/openhaystack/metadata.json
@@ -1,7 +1,7 @@
 { "id": "openhaystack",
   "name": "OpenHaystack (AirTag)",
   "icon": "icon.png",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Copy a base64 key from https://github.com/seemoo-lab/openhaystack and make your Bangle.js trackable as if it's an AirTag",
   "tags": "openhaystack,bluetooth,ble,tracking,airtag",
   "type": "bootloader",
diff --git a/apps/owmweather/ChangeLog b/apps/owmweather/ChangeLog
index 106948e6c..ac8270fe9 100644
--- a/apps/owmweather/ChangeLog
+++ b/apps/owmweather/ChangeLog
@@ -2,3 +2,5 @@
 0.02: Do first update request 5s after boot to boot up faster
 0.03: Fix updating weather too often
 0.04: Minor code improvements
+0.05: Upgrade OWM to One Call API 3.0. Add pressure to weather.json
+0.06: Fix One Call API 3.0 not returning city names, which are required by the weather app
diff --git a/apps/owmweather/lib.js b/apps/owmweather/lib.js
index 67cdc115b..3c01b79d4 100644
--- a/apps/owmweather/lib.js
+++ b/apps/owmweather/lib.js
@@ -1,19 +1,23 @@
 function parseWeather(response) {
   let owmData = JSON.parse(response);
 
-  let isOwmData = owmData.coord && owmData.weather && owmData.main;
+  let isOwmData = false;
+  try {
+    isOwmData = (owmData.lat && owmData.lon) && owmData.current.weather && owmData.current;
+  } catch (_e) {}
 
   if (isOwmData) {
     let json = require("Storage").readJSON('weather.json') || {};
     let weather = {};
     weather.time = Date.now();
-    weather.hum = owmData.main.humidity;
-    weather.temp = owmData.main.temp;
-    weather.code = owmData.weather[0].id;
-    weather.wdir = owmData.wind.deg;
-    weather.wind = owmData.wind.speed;
-    weather.loc = owmData.name;
-    weather.txt = owmData.weather[0].main;
+    weather.hum = owmData.current.humidity;
+    weather.temp = owmData.current.temp;
+    weather.code = owmData.current.weather[0].id;
+    weather.wdir = owmData.current.wind_deg;
+    weather.wind = owmData.current.wind_speed;
+    weather.loc = owmData.name || "";
+    weather.txt = owmData.current.weather[0].main;
+    weather.hpa = owmData.current.pressure || 0;
 
     if (weather.wdir != null) {
       let deg = weather.wdir;
@@ -39,7 +43,7 @@ exports.pull = function(completionCallback) {
     "location": "London"
   };
   let settings = require("Storage").readJSON("owmweather.json", 1);
-  let uri = "https://api.openweathermap.org/data/2.5/weather?lat=" + location.lat.toFixed(2) + "&lon=" + location.lon.toFixed(2) + "&exclude=hourly,daily&appid=" + settings.apikey;
+  let uri = "https://api.openweathermap.org/data/3.0/onecall?lat=" + location.lat.toFixed(2) + "&lon=" + location.lon.toFixed(2) + "&exclude=minutely,hourly,daily,alerts&appid=" + settings.apikey;
   if (Bangle.http){
     Bangle.http(uri, {timeout:10000}).then(event => {
       let result = parseWeather(event.resp);
diff --git a/apps/owmweather/metadata.json b/apps/owmweather/metadata.json
index 658ea953e..f20c5baca 100644
--- a/apps/owmweather/metadata.json
+++ b/apps/owmweather/metadata.json
@@ -1,7 +1,7 @@
 { "id": "owmweather",
   "name": "OpenWeatherMap weather provider",
   "shortName":"OWM Weather",
-  "version": "0.04",
+  "version": "0.06",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/patriotclk/app.js b/apps/patriotclk/app.js
index d7468ad9d..e07392b66 100644
--- a/apps/patriotclk/app.js
+++ b/apps/patriotclk/app.js
@@ -56,7 +56,7 @@ Graphics.prototype.setFontAudiowide = function() {
   };
 
   // Show launcher when middle button pressed
-  Bangle.setUI({mode:"clock", remove:function() { //f ree memory
+  Bangle.setUI({mode:"clock", remove:function() { // free memory
     if (drawTimeout) clearTimeout(drawTimeout);
     if (widgetTimeout) clearTimeout(widgetTimeout);
     require("widget_utils").show();
@@ -64,7 +64,7 @@ Graphics.prototype.setFontAudiowide = function() {
     g.reset().clearRect(e.x,e.y,e.x+63,e.y+23);
     delete WIDGETS["patriot"];
     delete Graphics.prototype.setFontAudiowide;
-  }});  
+  }});
   // Load widgets (make them swipeable)
   Bangle.loadWidgets();
   WIDGETS["patriot"] = {
@@ -85,5 +85,5 @@ Graphics.prototype.setFontAudiowide = function() {
   // Clear the screen once, at startup
   g.clear();
   // draw immediately at first, queue update
-  draw();  
+  draw();
 }
\ No newline at end of file
diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog
index a250646d5..552258649 100644
--- a/apps/pebblepp/ChangeLog
+++ b/apps/pebblepp/ChangeLog
@@ -4,3 +4,6 @@
 0.03: Use smaller font if clock_info test doesn't fit in area
 0.04: Ensure we only scale down clockinfo text if it really won't fit
 0.05: Minor code improvements
+0.06: Use the clockbg library to allow custom image backgrounds
+0.07: Fix automatic coloring of middle of clockinfo images if clockinfo image goes right to the top or left
+0.08: Use new clockinfo lib with function to render images wirh borders
\ No newline at end of file
diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js
index 0330b9832..2c8e24192 100644
--- a/apps/pebblepp/app.js
+++ b/apps/pebblepp/app.js
@@ -20,7 +20,8 @@ Graphics.prototype.setFontLECO1976Regular14 = function() {
 
 {
 const SETTINGS_FILE = "pebblepp.json";
-let settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green', 'theme':'System', 'showlock':false};
+let settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'theme':'System', 'showlock':false};
+let background = require("clockbg");
 let theme;
 let drawTimeout;
 
@@ -50,7 +51,7 @@ let draw = function() {
 };
 
 let loadThemeColors = function() {
-  theme = {fg: g.theme.fg, bg: g.theme.bg, day: g.toColor(0,0,0)};
+  theme = {fg: g.theme.fg, bg: g.theme.bg };
   if (settings.theme === "Dark") {
     theme.fg = g.toColor(1,1,1);
     theme.bg = g.toColor(0,0,0);
@@ -58,13 +59,15 @@ let loadThemeColors = function() {
     theme.fg = g.toColor(0,0,0);
     theme.bg = g.toColor(1,1,1);
   }
-  // day and steps
-  if (settings.color == 'Blue' || settings.color == 'Red')
-    theme.day = g.toColor(1,1,1); // white on blue or red best contrast
 };
 loadThemeColors();
 
 // Load the clock infos
+let clockInfoW = 0|(w/2);
+let clockInfoH = 0|(h/2);
+let clockInfoG = Graphics.createArrayBuffer(26, 26, 2, {msb:true});
+clockInfoG.transparent = 3;
+clockInfoG.palette = new Uint16Array([g.theme.bg, g.theme.fg, g.toColor("#888"), g.toColor("#888")]);
 let clockInfoItems = require("clock_info").load();
 let clockInfoDraw = (itm, info, options) => {
   // itm: the item containing name/hasRange/etc
@@ -72,28 +75,18 @@ let clockInfoDraw = (itm, info, options) => {
   // options: options passed into addInteractive
   // Clear the background - if focussed, add a border
   g.reset().setBgColor(theme.bg).setColor(theme.fg);
-  var b = 0; // border
+  var y,b = 0; // border
   if (options.focus) { // white border
     b = 4;
     g.clearRect(options.x, options.y, options.x+options.w-1, options.y+options.h-1);
   }
-  g.setBgColor(settings.bg).clearRect(options.x+b, options.y+b, options.x+options.w-1-b, options.y+options.h-1-b);
+  background.fillRect(options.x+b, options.y+b, options.x+options.w-1-b, options.y+options.h-1-b);
   // we're drawing center-aligned here
   var midx = options.x+options.w/2;
   if (info.img) { // draw the image
     // TODO: we could replace certain images with our own ones here...
-    var y = options.y+8;
-    if (g.floodFill) {
-      /* img is (usually) a black and white transparent image. But we really would like the bits in
-      the middle of it to be white. So what we do is we draw a slightly bigger rectangle in white,
-      draw the image, and then flood-fill the rectangle back to the background color. floodFill
-      was only added in 2v18 so we have to check for it and fallback if not. */
-      g.setBgColor(theme.bg).clearRect(midx-25,y-1,midx+24,y+48);
-      g.drawImage(info.img, midx-24,y,{scale:2});
-      g.floodFill(midx-25,y,settings.bg);
-    } else { // fallback
-      g.drawImage(info.img, midx-24,y,{scale:2});
-    }
+    y = options.y+8;
+    require("clock_info").drawFilledImage(info.img,midx-24,y,{scale:2});
   }
   g.setFontLECO1976Regular22().setFontAlign(0, 0);
   var txt = info.text.toString().toUpperCase();
@@ -103,23 +96,25 @@ let clockInfoDraw = (itm, info, options) => {
     var l = g.wrapString(txt, options.w);
     txt = l.slice(0,2).join("\n") + (l.length>2)?"...":"";
   }
-  g.drawString(txt, midx,options.y+options.h-12); // draw the text
+  y = options.y+options.h-12;
+  g.drawString(txt, midx, y); // draw the text
 };
 
 let clockInfoMenuA = require("clock_info").addInteractive(clockInfoItems, {
   app:"pebblepp",
-  x : 0, y: 0, w: w/2, h:h/2,
+  x : 0, y: 0, w: clockInfoW, h:clockInfoH,
   draw : clockInfoDraw
 });
 let clockInfoMenuB = require("clock_info").addInteractive(clockInfoItems, {
   app:"pebblepp",
-  x : w/2, y: 0, w: w/2, h:h/2,
+  x : w/2, y: 0, w: clockInfoW, h:clockInfoH,
   draw : clockInfoDraw
 });
 
 // Show launcher when middle button pressed
 Bangle.setUI({
   mode : "clock",
+  redraw : draw,
   remove : function() {
     // Called to unload all of the clock app
     if (drawTimeout) clearTimeout(drawTimeout);
@@ -134,7 +129,7 @@ Bangle.setUI({
 
 Bangle.loadWidgets();
 require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
-g.setBgColor(settings.bg).clear(); // start off with completely clear background
+background.fillRect(Bangle.appRect); // start off with completely clear background
 // contrast bar (top)
 g.setColor(theme.fg).fillRect(0, h2 - 6, w, h2);
 // contrast bar (bottom)
diff --git a/apps/pebblepp/metadata.json b/apps/pebblepp/metadata.json
index d6598b709..66ce91ee1 100644
--- a/apps/pebblepp/metadata.json
+++ b/apps/pebblepp/metadata.json
@@ -2,15 +2,14 @@
   "id": "pebblepp",
   "name": "Pebble++ Clock",
   "shortName": "Pebble++",
-  "version": "0.05",
+  "version": "0.08",
   "description": "A pebble style clock (based on the 'Pebble Clock' app) but with two configurable ClockInfo items at the top",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
-  "tags": "clock,clkinfo",
+  "tags": "clock,clkinfo,clockbg",
   "supports": ["BANGLEJS2"],
-  "dependencies" : { "clock_info":"module" },
-  "allow_emulator": true,
+  "dependencies" : { "clock_info":"module", "clockbg":"module" },
   "storage": [
     {"name":"pebblepp.app.js","url":"app.js"},
     {"name":"pebblepp.settings.js","url":"settings.js"},
diff --git a/apps/pebblepp/settings.js b/apps/pebblepp/settings.js
index b84a477e1..f477b9ab8 100644
--- a/apps/pebblepp/settings.js
+++ b/apps/pebblepp/settings.js
@@ -1,10 +1,8 @@
 (function(back) {
   const SETTINGS_FILE = "pebblepp.json";
 
-  // TODO Only the color/theme indices should be written in the settings file so the labels can be translated
-
   // Initialize with default settings...
-  let s = {'bg': '#0f0', 'color': 'Green', 'theme':'System', 'showlock':false}
+  let s = {'theme':'System', 'showlock':false}
 
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
@@ -20,23 +18,11 @@
     storage.write(SETTINGS_FILE, settings);
   }
 
-  var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
-  var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];
   var theme_options = ['System', 'Light', 'Dark'];
 
   E.showMenu({
     '': { 'title': 'Pebble++ Clock' },
     /*LANG*/'< Back': back,
-    /*LANG*/'Colour': {
-      value: 0 | color_options.indexOf(s.color),
-      min: 0, max: 5,
-      format: v => color_options[v],
-      onchange: v => {
-        s.color = color_options[v];
-        s.bg = bg_code[v];
-        save();
-      }
-    },
     /*LANG*/'Theme': {
       value: 0 | theme_options.indexOf(s.theme),
       min: 0, max: theme_options.length - 1,
diff --git a/apps/promenu/ChangeLog b/apps/promenu/ChangeLog
index e9ab57880..e0a5bfc2e 100644
--- a/apps/promenu/ChangeLog
+++ b/apps/promenu/ChangeLog
@@ -1,3 +1,10 @@
 0.01: New App!
 0.02: Add Bangle.js 2 Support
 0.03: Minor code improvements
+0.04: Fix display/overwriting of boolean menu items. Handle back
+      functionality, both via `.back` and `"< Back"` items, displaying an
+      entry and the `setUI` back widget. Fix `setUI`'s back overwrite. Add
+      support for scroll.
+0.05: Fix display of final menu item when no options are given and
+      handling of E.showMenu() with no arguments
+0.06: Fix lower bounding of numeric values
diff --git a/apps/promenu/README.md b/apps/promenu/README.md
index 8b1378917..585e72cce 100644
--- a/apps/promenu/README.md
+++ b/apps/promenu/README.md
@@ -1 +1,3 @@
+# Description
 
+A menu replacement controlled by dragging on the screen to change the focused menu entry. Single tap to activate the selected entry. Promenu can display inline boolean and number adjustments - scrolling with a number entry selected will increase/decrese the number. Swipe left on the menu to go back.
diff --git a/apps/promenu/bootb2.js b/apps/promenu/bootb2.js
index b02803a7a..9909d2af3 100644
--- a/apps/promenu/bootb2.js
+++ b/apps/promenu/bootb2.js
@@ -1,142 +1,176 @@
-E.showMenu = function(items) {
-  function RectRnd(x1,y1,x2,y2,r) {
-    let pp = [];
-    pp.push.apply(pp,g.quadraticBezier([x2-r,y1, x2,y1,x2,y1+r]));
-    pp.push.apply(pp,g.quadraticBezier([x2,y2-r,x2,y2,x2-r,y2]));
-    pp.push.apply(pp,g.quadraticBezier([x1+r,y2,x1,y2,x1,y2-r]));
-    pp.push.apply(pp,g.quadraticBezier([x1,y1+r,x1,y1,x1+r,y1]));
-    return pp;
-  }
-  function fillRectRnd(x1,y1,x2,y2,r,c) {
-    g.setColor(c);
-    g.fillPoly(RectRnd(x1,y1,x2,y2,r),1);
-    g.setColor(255,255,255);
-  }
-  function drawRectRnd(x1,y1,x2,y2,r,c) {
-    g.setColor(c);
-    g.drawPoly(RectRnd(x1,y1,x2,y2,r),1);
-    g.setColor(255,255,255);
-  }
-  g.reset().clearRect(Bangle.appRect); // clear if no menu supplied
-  Bangle.setLCDPower(1); // ensure screen is on
-  if (!items) {
-    Bangle.setUI();
-    return;
-  }
-  var menuItems = Object.keys(items);
-  var options = items[""];
-  if (options) menuItems.splice(menuItems.indexOf(""),1);
-  if (!(options instanceof Object)) options = {};
-  options.fontHeight = options.fontHeight||25;
-  if (options.selected === undefined)
-    options.selected = 0;
-  var ar = Bangle.appRect;
-  var x = ar.x;
-  var x2 = ar.x2;
-  var y = ar.y;
-  var y2 = ar.y2 - 12; // padding at end for arrow
-  if (options.title)
-    y += 22;
-  var loc = require("locale");
-  var l = {
-    lastIdx : 0,
-    draw : function(rowmin,rowmax) {
-      var rows = 0|Math.min((y2-y) / options.fontHeight,menuItems.length);
-      var idx = E.clip(options.selected-(    rows>>1),0,menuItems.length-rows);
-      if (idx!=l.lastIdx) rowmin=undefined; // redraw all if we scrolled
-      l.lastIdx = idx;
-      var iy = y;
-      g.reset().setFontAlign(0,-1,0).setFont('12x20');
-      if (options.predraw) options.predraw(g);
-      if (rowmin===undefined && options.title)
-        g.drawString(options.title,(x+x2)/2,y-21).drawLine(x,y-2,x2,y-2).
-          setColor(g.theme.fg).setBgColor(g.theme.bg);
-      iy += 4;
-      if (rowmin!==undefined) {
-        if (idx<rowmin) {
-          iy += options.fontHeight*(rowmin-idx);
-          idx=rowmin;
-        }
-        if (idx+rows>rowmax) {
-          rows = 1+rowmax-rowmin;
-        }
-      }
-      while (rows--) {
-        var name = menuItems[idx];
-        var item = items[name];
-        var hl = (idx==options.selected && !l.selectEdit);
-        if(g.theme.dark){
-          fillRectRnd(x,iy,x2,iy+options.fontHeight-3,7,hl ? g.theme.bgH : g.theme.bg+40);
-        }else{
-          fillRectRnd(x,iy,x2,iy+options.fontHeight-3,7,hl ? g.theme.bgH : g.theme.bg-20);
-        }
-        g.setColor(hl ? g.theme.fgH : g.theme.fg);
-        g.setFontAlign(-1,-1);
-        var v = item.value;
-        v = loc.translate(""+v);
-        if(loc.translate(name).length >= 17-v.length && "object" == typeof item){
-          if (item.format) v=item.format(v);
-          g.drawString(loc.translate(name).substring(0, 12-v.length)+"...",x+3.7,iy+2.7);
-        }else{
-          if(loc.translate(name).length >= 15){
-            g.drawString(loc.translate(name).substring(0, 15)+"...",x+3.7,iy+2.7);
-          }else{
-            g.drawString(loc.translate(name),x+3.7,iy+2.7);
-          }
-        }
-        if ("object" == typeof item) {
-          var xo = x2;
-          var v = item.value;
-          if (item.format) v=item.format(v);
-          v = loc.translate(""+v);
-          if (l.selectEdit && idx==options.selected) {
-            xo -= 24 + 1;
-            g.setColor(g.theme.fgH).drawImage("\x0c\x05\x81\x00 \x07\x00\xF9\xF0\x0E\x00@",xo,iy+(options.fontHeight-10)/2,{scale:2});
-          }
-          g.setFontAlign(1,-1);
-          g.drawString(v,xo-2,iy+1);
-        }
-        g.setColor(g.theme.fg);
-        iy += options.fontHeight;
-        idx++;
-      }
-      g.setFontAlign(-1,-1);
-      g.setColor((idx<menuItems.length)?g.theme.fg:g.theme.bg).fillPoly([72,166,104,166,88,174]);
-      g.flip();
-    },
-    select : function() {
-      var item = items[menuItems[options.selected]];
-      if ("function" == typeof item) item(l);
-      else if ("object" == typeof item) {
-        // if a number, go into 'edit mode'
-        if ("number" == typeof item.value)
-          l.selectEdit = l.selectEdit?undefined:item;
-        else { // else just toggle bools
-          if ("boolean" == typeof item.value) item.value=!item.value;
-          if (item.onchange) item.onchange(item.value);
-        }
-        l.draw();
-      }
-    },
-    move : function(dir) {
-      var item = l.selectEdit;
-      if (item) {
-        item.value -= (dir||1)*(item.step||1);
-        if (item.min!==undefined && item.value<item.min) item.value = item.wrap ? item.max : item.min;
-        if (item.max!==undefined && item.value>item.max) item.value = item.wrap ? item.min : item.max;
-        if (item.onchange) item.onchange(item.value);
-        l.draw(options.selected,options.selected);
-      } else {
-        var lastSelected=options.selected;
-        options.selected = (dir+options.selected+menuItems.length)%menuItems.length;
-        l.draw(Math.min(lastSelected,options.selected), Math.max(lastSelected,options.selected));
-      }
+E.showMenu = function (items) {
+    var RectRnd = function (x1, y1, x2, y2, r) {
+        var pp = [];
+        pp.push.apply(pp, g.quadraticBezier([x2 - r, y1, x2, y1, x2, y1 + r]));
+        pp.push.apply(pp, g.quadraticBezier([x2, y2 - r, x2, y2, x2 - r, y2]));
+        pp.push.apply(pp, g.quadraticBezier([x1 + r, y2, x1, y2, x1, y2 - r]));
+        pp.push.apply(pp, g.quadraticBezier([x1, y1 + r, x1, y1, x1 + r, y1]));
+        return pp;
+    };
+    var fillRectRnd = function (x1, y1, x2, y2, r, c) {
+        g.setColor(c);
+        g.fillPoly(RectRnd(x1, y1, x2, y2, r));
+        g.setColor(255, 255, 255);
+    };
+    var options = items && items[""] || {};
+    if (items)
+        delete items[""];
+    var menuItems = Object.keys(items);
+    var fontHeight = options.fontHeight || 25;
+    var selected = options.scroll || options.selected || 0;
+    var ar = Bangle.appRect;
+    g.reset().clearRect(ar);
+    var x = ar.x;
+    var x2 = ar.x2;
+    var y = ar.y;
+    var y2 = ar.y2 - 12;
+    if (options.title)
+        y += 22;
+    var lastIdx = 0;
+    var selectEdit = undefined;
+    var l = {
+        draw: function (rowmin, rowmax) {
+            var rows = 0 | Math.min((y2 - y) / fontHeight, menuItems.length);
+            var idx = E.clip(selected - (rows >> 1), 0, menuItems.length - rows);
+            if (idx != lastIdx)
+                rowmin = undefined;
+            lastIdx = idx;
+            var iy = y;
+            g.reset().setFontAlign(0, -1, 0).setFont12x20();
+            if (options.predraw)
+                options.predraw(g);
+            if (rowmin === undefined && options.title)
+                g.drawString(options.title, (x + x2) / 2, y - 21).drawLine(x, y - 2, x2, y - 2).
+                    setColor(g.theme.fg).setBgColor(g.theme.bg);
+            iy += 4;
+            if (rowmin !== undefined) {
+                if (idx < rowmin) {
+                    iy += fontHeight * (rowmin - idx);
+                    idx = rowmin;
+                }
+                if (rowmax && idx + rows > rowmax) {
+                    rows = 1 + rowmax - rowmin;
+                }
+            }
+            while (rows--) {
+                var name = menuItems[idx];
+                var item = items[name];
+                var hl = (idx === selected && !selectEdit);
+                if (g.theme.dark) {
+                    fillRectRnd(x, iy, x2, iy + fontHeight - 3, 7, hl ? g.theme.bgH : g.theme.bg + 40);
+                }
+                else {
+                    fillRectRnd(x, iy, x2, iy + fontHeight - 3, 7, hl ? g.theme.bgH : g.theme.bg - 20);
+                }
+                g.setColor(hl ? g.theme.fgH : g.theme.fg);
+                g.setFontAlign(-1, -1);
+                var v = void 0;
+                if (typeof item === "object") {
+                    v = "format" in item
+                        ? item.format(item.value)
+                        : item.value;
+                    if (typeof v !== "string")
+                        v = "".concat(v);
+                }
+                else {
+                    v = "";
+                }
+                {
+                    if (name.length >= 17 - v.length && typeof item === "object") {
+                        g.drawString(name.substring(0, 12 - v.length) + "...", x + 3.7, iy + 2.7);
+                    }
+                    else if (name.length >= 15) {
+                        g.drawString(name.substring(0, 15) + "...", x + 3.7, iy + 2.7);
+                    }
+                    else {
+                        g.drawString(name, x + 3.7, iy + 2.7);
+                    }
+                    var xo = x2;
+                    if (selectEdit && idx === selected) {
+                        xo -= 24 + 1;
+                        g.setColor(g.theme.fgH)
+                            .drawImage("\x0c\x05\x81\x00 \x07\x00\xF9\xF0\x0E\x00@", xo, iy + (fontHeight - 10) / 2, { scale: 2 });
+                    }
+                    g.setFontAlign(1, -1);
+                    g.drawString(v, xo - 2, iy + 1);
+                }
+                g.setColor(g.theme.fg);
+                iy += fontHeight;
+                idx++;
+            }
+            g.setFontAlign(-1, -1);
+            g.setColor((idx < menuItems.length) ? g.theme.fg : g.theme.bg).fillPoly([72, 166, 104, 166, 88, 174]);
+            g.flip();
+        },
+        select: function () {
+            var item = items[menuItems[selected]];
+            if (typeof item === "function") {
+                item();
+            }
+            else if (typeof item === "object") {
+                if (typeof item.value === "number") {
+                    selectEdit = selectEdit ? undefined : item;
+                }
+                else {
+                    if (typeof item.value === "boolean")
+                        item.value = !item.value;
+                    if (item.onchange)
+                        item.onchange(item.value);
+                }
+                l.draw();
+            }
+        },
+        move: function (dir) {
+            var item = selectEdit;
+            if (typeof item === "object" && typeof item.value === "number") {
+                var orig = item.value;
+                item.value += (-dir || 1) * (item.step || 1);
+                if ("min" in item && item.value < item.min)
+                    item.value = item.wrap ? item.max : item.min;
+                if ("max" in item && item.value > item.max)
+                    item.value = item.wrap ? item.min : item.max;
+                if (item.value !== orig) {
+                    if (item.onchange)
+                        item.onchange(item.value);
+                    l.draw(selected, selected);
+                }
+            }
+            else {
+                var lastSelected = selected;
+                selected = (selected + dir + menuItems.length) % menuItems.length;
+                l.draw(Math.min(lastSelected, selected), Math.max(lastSelected, selected));
+            }
+        },
+    };
+    l.draw();
+    var back = options.back;
+    if (!back) {
+        var backItem = items && items["< Back"];
+        if (typeof backItem === "function")
+            back = backItem;
+        else if (backItem && "back" in backItem)
+            back = backItem.back;
     }
-  };
-  l.draw();
-  Bangle.setUI("updown",dir => {
-    if (dir) l.move(dir);
-    else l.select();
-  });
-  return l; 
+    var onSwipe;
+    if (typeof back === "function") {
+        var back_1 = back;
+        onSwipe = function (lr) {
+            if (lr < 0)
+                back_1();
+        };
+        Bangle.on('swipe', onSwipe);
+    }
+    Bangle.setUI({
+        mode: "updown",
+        back: back,
+        remove: function () {
+            Bangle.removeListener("swipe", onSwipe);
+        },
+    }, function (dir) {
+        if (dir)
+            l.move(dir);
+        else
+            l.select();
+    });
+    return l;
 };
diff --git a/apps/promenu/metadata.json b/apps/promenu/metadata.json
index 5e7508207..ba7a0475d 100644
--- a/apps/promenu/metadata.json
+++ b/apps/promenu/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "promenu",
   "name": "Pro Menu",
-  "version": "0.03",
+  "version": "0.06",
   "description": "Replace the built in menu function. Supports Bangle.js 1 and Bangle.js 2.",
   "icon": "icon.png",
   "type": "bootloader",
diff --git a/apps/ratchet_launch/ChangeLog b/apps/ratchet_launch/ChangeLog
index e60ca42d2..2731ec2ec 100644
--- a/apps/ratchet_launch/ChangeLog
+++ b/apps/ratchet_launch/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial release
 0.02: Cache the app-launch info
+0.03: Fix bugs that would make the launcher unusable on most watches
diff --git a/apps/ratchet_launch/app.js b/apps/ratchet_launch/app.js
index 156106894..748cf0a82 100644
--- a/apps/ratchet_launch/app.js
+++ b/apps/ratchet_launch/app.js
@@ -5,13 +5,13 @@ var font = g.getFonts().includes("6x15") ? "6x15" : "6x8:2";
 var largeFont = g.getFonts().includes("12x20") ? "12x20" : "6x8:3";
 var currentApp = 0;
 var overscroll = 0;
-var blankImage = Graphics.createImage(` `);
+var blankImage = Graphics.createImage(`\n \n`);
 var rowHeight = g.getHeight()/3;
 
 // Load apps list
 var apps;
 
-var launchCache = s.readJSON("launch.cache.json", true)||{};
+var launchCache = Storage.readJSON("launch.cache.json", true)||{};
 var launchHash = require("Storage").hash(/\.info/);
 if (launchCache.hash==launchHash) {
   apps = launchCache.apps;
@@ -39,7 +39,7 @@ if (launchCache.hash==launchHash) {
   });
 
   launchCache = { apps, hash: launchHash };
-  s.writeJSON("launch.cache.json", launchCache);
+  Storage.writeJSON("launch.cache.json", launchCache);
 }
 
 // Uncomment for testing in the emulator without apps:
diff --git a/apps/ratchet_launch/metadata.json b/apps/ratchet_launch/metadata.json
index 7ebe0c4cd..2e6db9741 100644
--- a/apps/ratchet_launch/metadata.json
+++ b/apps/ratchet_launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "ratchet_launch",
   "name": "Ratchet Launcher",
   "shortName": "Ratchet",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Launcher with discrete scrolling for quicker app selection",
   "icon": "app.png",
   "type": "launch",
diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog
index 4757a0373..c10a82fa4 100644
--- a/apps/recorder/ChangeLog
+++ b/apps/recorder/ChangeLog
@@ -47,3 +47,9 @@
 	setInterval.
 0.38: Tweaks to speed up track rendering
 0.39: Minor code improvements
+0.40: Fix reference error from missing `settings` object in widget on 1 sec	recordings with gps.
+      Fix HRM source never being set in output data
+0.41: Fix exit from plots and graphs would easily react twice, going back two
+	levels instead of one.
+0.42: Minor code improvements
+0.43: Fix interaction on clocks without widgets
diff --git a/apps/recorder/app.js b/apps/recorder/app.js
index 7b71e9f3d..752948976 100644
--- a/apps/recorder/app.js
+++ b/apps/recorder/app.js
@@ -311,7 +311,7 @@ function plotTrack(info) { "ram"
   g.drawString(/*LANG*/"Back",g.getWidth() - 10, isBTN3 ? (g.getHeight() - 40) : (g.getHeight()/2));
   setWatch(function() {
     viewTrack(info.fn, info);
-  }, isBTN3?BTN3:BTN1);
+  }, isBTN3?BTN3:BTN1, {edge:"falling"});
   Bangle.drawWidgets();
   g.flip();
 }
@@ -330,7 +330,7 @@ function plotGraph(info, style) { "ram"
   if (f===undefined) return;
   var l = f.readLine(f);
   l = f.readLine(f); // skip headers
-  var nl = 0, c, i;
+  var c, i;
   var factor = 1; // multiplier used for values when graphing
   var timeIdx = info.fields.indexOf("Time");
   if (l!==undefined) {
@@ -341,7 +341,7 @@ function plotGraph(info, style) { "ram"
     title = /*LANG*/"Heartrate (bpm)";
     var hrmIdx = info.fields.indexOf("Heartrate");
     while(l!==undefined) {
-      ++nl;c=l.split(",");l = f.readLine(f);
+      c=l.split(",");l = f.readLine(f);
       if (c[hrmIdx]=="") continue;
       i = Math.round(80*(c[timeIdx] - strt)/dur);
       infn[i]+=+c[hrmIdx];
@@ -352,7 +352,7 @@ function plotGraph(info, style) { "ram"
     var altIdx = info.fields.indexOf("Barometer Altitude");
     if (altIdx<0) altIdx = info.fields.indexOf("Altitude");
     while(l!==undefined) {
-      ++nl;c=l.split(",");l = f.readLine(f);
+      c=l.split(",");l = f.readLine(f);
       if (c[altIdx]=="") continue;
       i = Math.round(80*(c[timeIdx] - strt)/dur);
       infn[i]+=+c[altIdx];
@@ -376,7 +376,7 @@ function plotGraph(info, style) { "ram"
     var p,lp = Bangle.project({lat:c[1],lon:c[2]});
     var t,dx,dy,d,lt = c[timeIdx];
     while(l!==undefined) {
-      ++nl;c=l.split(",");
+      c=l.split(",");
       l = f.readLine(f);
       if (c[latIdx] == "") {
         continue;
@@ -432,9 +432,9 @@ function plotGraph(info, style) { "ram"
   g.drawString(/*LANG*/"Back",g.getWidth() - 10, isBTN3 ? (g.getHeight() - 40) : (g.getHeight()/2));
   setWatch(function() {
     viewTrack(info.filename, info);
-  }, isBTN3?BTN3:BTN1);
+  }, isBTN3?BTN3:BTN1, {edge:"falling"});
   g.flip();
 }
 
 
-showMainMenu();
\ No newline at end of file
+showMainMenu();
diff --git a/apps/recorder/clkinfo.js b/apps/recorder/clkinfo.js
index b4a9a45b8..6ca4f59d5 100644
--- a/apps/recorder/clkinfo.js
+++ b/apps/recorder/clkinfo.js
@@ -11,7 +11,7 @@
 			{
 				name: "Toggle",
 				get: () => {
-					const w = WIDGETS && WIDGETS["recorder"];
+					const w = typeof WIDGETS !== "undefined" && WIDGETS["recorder"];
 
 					return w && w.isRecording() ? {
 						text: "Recording",
@@ -24,7 +24,7 @@
 					};
 				},
 				run: () => {
-					const w = WIDGETS && WIDGETS["recorder"];
+					const w = typeof WIDGETS !== "undefined" && WIDGETS["recorder"];
 					if(w){
 						Bangle.buzz();
 						w.setRecording(!w.isRecording(), { force: "append" });
diff --git a/apps/recorder/interface.html b/apps/recorder/interface.html
index 7f1e3bbc6..e874b9318 100644
--- a/apps/recorder/interface.html
+++ b/apps/recorder/interface.html
@@ -127,6 +127,10 @@ function saveGPX(track, title) {
 }
 
 function saveCSV(track, title) {
+  if(!track[0]){
+    showToast(`Can't save empty csv "${title}" (no headers)`, "error");
+    return;
+  }
   var headers = Object.keys(track[0]);
   var csv = headers.join(",")+"\n";
   track.forEach(t=>{
@@ -149,7 +153,7 @@ function trackLineToObject(headers, l) {
 }
 
 function downloadTrack(filename, callback) {
-  Util.showModal("Downloading Track...");
+  Util.showModal(`Downloading ${filename}...`);
   Util.readStorageFile(filename,data=>{
     Util.hideModal();
     var lines = data.trim().split("\n");
@@ -159,6 +163,28 @@ function downloadTrack(filename, callback) {
   });
 }
 
+function downloadAll(trackList, cb) {
+  const tracks = trackList.slice();
+
+  const downloadOne = () => {
+    const track = tracks.pop();
+    if(!track) {
+      showToast("Finished downloading all.", "success");
+      return;
+    }
+
+    downloadTrack(
+      track.filename,
+      lines => {
+        cb(lines, `Bangle.js Track ${track.number}`);
+        downloadOne();
+      }
+    );
+  };
+
+  downloadOne();
+}
+
 function getTrackList() {
   Util.showModal("Loading Track List...");
   domTracks.innerHTML = "";
@@ -235,8 +261,8 @@ ${trackData.Latitude ? `
            </div>
          </div>
         `;
-        });
-        if (trackList.length==0) {
+      });
+      if (trackList.length==0) {
         html += `
          <div class="column col-12">
            <div class="card-header">
@@ -245,9 +271,15 @@ ${trackData.Latitude ? `
            </div>
          </div>
          `;
-        }
-        html += `
+      }
+      html += `
         </div><!-- columns -->
+        <h2>Batch</h2>
+        <div class="form-group">
+          <button class="btn btn-primary" task="downloadkml_all">Download all KML</button>
+          <button class="btn btn-primary" task="downloadgpx_all">Download all GPX</button>
+          <button class="btn btn-primary" task="downloadcsv_all">Download all CSV</button>
+        </div>
         <h2>Settings</h2>
         <div class="form-group">
           <label class="form-switch">
@@ -256,39 +288,54 @@ ${trackData.Latitude ? `
           </label>
         </div>
         </div>`;
-        domTracks.innerHTML = html;
-        document.getElementById("settings-allow-no-gps").addEventListener("change",event=>{
-          var allowNoGPS = event.target.checked;
-          localStorage.setItem("recorder-allow-no-gps", allowNoGPS);
-        });
-        Util.hideModal();
-        var buttons = domTracks.querySelectorAll("button");
+      domTracks.innerHTML = html;
+      document.getElementById("settings-allow-no-gps").addEventListener("change",event=>{
+        var allowNoGPS = event.target.checked;
+        localStorage.setItem("recorder-allow-no-gps", allowNoGPS);
+      });
+      Util.hideModal();
+      var buttons = domTracks.querySelectorAll("button");
         for (var i=0;i<buttons.length;i++) {
-        buttons[i].addEventListener("click",event => {
-         var button = event.currentTarget;
-         var filename = button.getAttribute("filename");
-         var trackid = parseInt(button.getAttribute("trackid"));
-         if (!filename || trackid===undefined) return;
-         var task = button.getAttribute("task");
-         if (task=="delete") {
-           Util.showModal("Deleting Track...");
-           Util.eraseStorageFile(filename,()=>{
-             Util.hideModal();
-             getTrackList();
-           });
-         }
-         if (task=="downloadkml") {
-           downloadTrack(filename, track => saveKML(track, `Bangle.js Track ${trackid}`));
-         }
-         if (task=="downloadgpx") {
-           downloadTrack(filename, track => saveGPX(track, `Bangle.js Track ${trackid}`));
-         }
-         if (task=="downloadcsv") {
-           downloadTrack(filename, track => saveCSV(track, `Bangle.js Track ${trackid}`));
-         }
-        });
-      }
-    });
+          buttons[i].addEventListener("click",event => {
+            var button = event.currentTarget;
+            var filename = button.getAttribute("filename");
+            var trackid = parseInt(button.getAttribute("trackid"));
+            var task = button.getAttribute("task");
+
+            if (!/_all$/.test(task) && (!filename || trackid===undefined)) return;
+
+            switch(task) {
+              case "delete":
+                Util.showModal(`Deleting ${filename}...`);
+                Util.eraseStorageFile(filename,()=>{
+                  Util.hideModal();
+                  getTrackList();
+                });
+                break;
+
+              case "downloadkml":
+                downloadTrack(filename, track => saveKML(track, `Bangle.js Track ${trackid}`));
+                break;
+              case "downloadgpx":
+                downloadTrack(filename, track => saveGPX(track, `Bangle.js Track ${trackid}`));
+                break;
+              case "downloadcsv":
+                downloadTrack(filename, track => saveCSV(track, `Bangle.js Track ${trackid}`));
+                break;
+
+              case "downloadkml_all":
+                downloadAll(trackList, saveKML);
+                break;
+              case "downloadgpx_all":
+                downloadAll(trackList, saveGPX);
+                break;
+              case "downloadcsv_all":
+                downloadAll(trackList, saveCSV);
+                break;
+            }
+          });
+        }
+      });
   });
 }
 
diff --git a/apps/recorder/metadata.json b/apps/recorder/metadata.json
index d8852b46d..364bb7bf6 100644
--- a/apps/recorder/metadata.json
+++ b/apps/recorder/metadata.json
@@ -2,7 +2,7 @@
   "id": "recorder",
   "name": "Recorder",
   "shortName": "Recorder",
-  "version": "0.39",
+  "version": "0.43",
   "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
   "icon": "app.png",
   "tags": "tool,outdoors,gps,widget,clkinfo",
diff --git a/apps/recorder/widget.js b/apps/recorder/widget.js
index 057130ff0..74cffb068 100644
--- a/apps/recorder/widget.js
+++ b/apps/recorder/widget.js
@@ -1,8 +1,8 @@
 {
   let storageFile; // file for GPS track
-  let entriesWritten = 0;
   let activeRecorders = [];
-  let writeSetup;
+  let writeSetup; // the interval for writing, or 'true' if using GPS
+  let writeSubSecs; // true if we should write .1s for time, otherwise round to nearest second
 
   let loadSettings = function() {
     var settings = require("Storage").readJSON("recorder.json",1)||{};
@@ -63,7 +63,7 @@
         function onHRM(h) {
           bpmConfidence = h.confidence;
           bpm = h.bpm;
-          srv = h.src;
+          src = h.src;
         }
         return {
           name : "HR",
@@ -176,11 +176,10 @@
   };
   let getCSVHeaders = activeRecorders => ["Time"].concat(activeRecorders.map(r=>r.fields));
 
-  let writeLog = function(period) {
-    entriesWritten++;
+  let writeLog = function() {
     WIDGETS["recorder"].draw();
     try {
-      var fields = [period===1?getTime().toFixed(1):Math.round(getTime())];
+      var fields = [writeSubSecs?getTime().toFixed(1):Math.round(getTime())];
       activeRecorders.forEach(recorder => fields.push.apply(fields,recorder.getValues()));
       if (storageFile) storageFile.write(fields.join(",")+"\n");
     } catch(e) {
@@ -194,18 +193,15 @@
     }
   }
 
-  let writeOnGPS = function() {writeLog(settings.period);};
-
   // Called by the GPS app to reload settings and decide what to do
   let reload = function() {
     var settings = loadSettings();
     if (typeof writeSetup === "number") clearInterval(writeSetup);
     writeSetup = undefined;
-    Bangle.removeListener('GPS', writeOnGPS);
+    Bangle.removeListener('GPS', writeLog);
 
     activeRecorders.forEach(rec => rec.stop());
     activeRecorders = [];
-    entriesWritten = 0;
 
     if (settings.recording) {
       // set up recorders
@@ -225,8 +221,9 @@
       }
       // start recording...
       WIDGETS["recorder"].draw();
+      writeSubSecs = settings.period===1;
       if (settings.period===1 && settings.record.includes("gps")) {
-        Bangle.on('GPS', writeOnGPS);
+        Bangle.on('GPS', writeLog);
         writeSetup = true;
       } else {
         writeSetup = setInterval(writeLog, settings.period*1000, settings.period);
diff --git a/apps/rellotge/ChangeLog b/apps/rellotge/ChangeLog
index e909623dc..fc907fa45 100644
--- a/apps/rellotge/ChangeLog
+++ b/apps/rellotge/ChangeLog
@@ -5,3 +5,6 @@
 0.50: Fixing lint warnings for unused vars
 0.60: Fixes typos, BTN1 to show launcher and show app icon
 0.61: Minor code improvements
+0.70: Better wrapping of the text base (dynamic instead of hardcoded)
+0.80: Add analog watch, steps and date
+0.85: remapping of the minute intervals, to add accuracy.
\ No newline at end of file
diff --git a/apps/rellotge/README.md b/apps/rellotge/README.md
index 2cc015f9a..b01943444 100644
--- a/apps/rellotge/README.md
+++ b/apps/rellotge/README.md
@@ -1,5 +1,13 @@
 # Rellotge, una aplicació per llegir l'hora en català
 
+### Info in english
+
+This is a simple app, used to show you the time using the traditiona catalan way, which follows the system used by bell towers that usually ring the bells at every quarter of hour. So, you have quarters, half quarters and saying like "tocats" (just rung) or "ben tocats" (well rung).
+
+### Informació en català
+
 Ara ja pots llegir l'hora en català com un professional amb aquesta aplicació. Domina els quarts, els mitjos quarts, tocats i ben tocats en cada moment del dia!
 
+### Informacio en esperanto 
+
 Tiu ĉi apo permesas vin indiki kioma horo estas laŭ la kataluna tradicia sistemo.
diff --git a/apps/rellotge/metadata.json b/apps/rellotge/metadata.json
index b13ab4789..955fb4d87 100644
--- a/apps/rellotge/metadata.json
+++ b/apps/rellotge/metadata.json
@@ -1,7 +1,7 @@
 { "id": "rellotge",
   "name": "Rellotge en catala",
   "shortName":"Rellotge",
-  "version": "0.61",
+  "version": "0.85",
   "description": "A clock with traditional naming of hours in Catalan",
   "icon": "icona.png",
   "readme": "README.md",
diff --git a/apps/rellotge/rellotge.js b/apps/rellotge/rellotge.js
index 7ae48b745..2e36059ef 100644
--- a/apps/rellotge/rellotge.js
+++ b/apps/rellotge/rellotge.js
@@ -6,81 +6,206 @@
   const dateFontSize = 2;
   const font = "12x20";
 
-  const xyCenter = g.getWidth() /9;
-  const yposTime = 55;
-  const yposDate = 130;
+  const Panel = {
+    STEPS: 0,
+    DATE: 1
+  };
+
+  let panel = Panel.STEPS;
+
+  const timeTextMagin = 15;
+  const xyCenter = timeTextMagin;
+  const yposTime = 45;
   const leshores = ["Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze"];
-  const leshores2 = ["d\'una\r\nel mati","de dues\r\ndel mati","de tres\r\ndel mati","de quatre\r\ndel mati","de cinc\r\ndel mati","de sis\r\ndel mati","de set\r\ndel mati","de vuit\r\ndel mati","de nou\r\ndel mati","de deu\r\ndel mati","d'onze\r\ndel mati","de dotze\r\ndel mati","d'una\r\nde la tarda","de dues\r\nde la tarda","de tres\r\nde la tarda","de quatre\r\nde la tarda","de cinc\r\nde la tarda","de sis\r\nde la tarda","de set\r\nde la tarda","de vuit\r\nde la tarda","de nou\r\ndel vespre","de deu\r\ndel vespre","d'onze\r\ndel vespre","de dotze"];
+  const leshores2 = ["d'una","de dues","de tres","de quatre","de cinc","de sis","de set","de vuit","de nou","de deu","d'onze","de dotze"];
+  const RED = '#f00';
+  const BLACK = "#000"
+
+  function getHora(hour) {
+    if (hour >= 12) {
+      hour -= 12;
+    }
+    return leshores2[hour];
+  }
+
+  function addLineFeeds(inputString, g, posX) {
+      const margin = timeTextMagin;
+      const words = inputString.split(' ');
+      let lines = "";
+      let line = "";
+      const totalWidth = g.getWidth();
+
+      for (const word of words) {
+          const nextLine = line + word;
+          const width = posX + g.stringWidth(nextLine) + margin;
+
+          if (width > totalWidth) {
+              lines += line.trim() + "\r\n";
+              line = "";
+          }
+          line += word + " ";
+      }
+      lines += line.trim();
+      return lines;
+  }
+
+  // Define the center coordinates of the watch face
+  const margin = 10;
+  const centerX = 40 + margin;
+  const centerY = g.getHeight() - 40 - margin;
+
+  // Function to draw the watch face
+  function drawWatchFace() {
+
+    const diameter = 40;
+    g.setColor(BLACK);
+    g.drawCircle(centerX, centerY, diameter);
+
+    // Draw hour markers
+    for (let i = 0; i < 12; i++) {
+      const angle = (i / 12) * Math.PI * 2;
+      const x1 = centerX + Math.sin(angle) * 70 / 2;
+      const y1 = centerY - Math.cos(angle) * 70 / 2;
+      const x2 = centerX + Math.sin(angle) * 60 / 2;
+      const y2 = centerY - Math.cos(angle) * 60 / 2;
+      g.drawLine(x1, y1, x2, y2);
+    }
+  }
+
+  function drawHand(centerX, centerY, hourAngle, handLength) {
+    const hourHandX = centerX + Math.sin(hourAngle) * handLength;
+    const hourHandY = centerY - Math.cos(hourAngle) * handLength;
+    g.drawLine(centerX, centerY, hourHandX, hourHandY);
+  }
+
+  // Function to update the watch display
+  function updateWatch() {
+    const now = new Date();
+    const hours = now.getHours() % 12;
+    const minutes = now.getMinutes();
+
+    // Calculate angles for hour, minute, and second hands
+    const hourAngle = ((hours + minutes / 60) / 12) * Math.PI * 2;
+    const minuteAngle = (minutes / 60) * Math.PI * 2;
+    g.setColor(BLACK);
+
+    drawHand(centerX, centerY, hourAngle, 10);
+    drawHand(centerX, centerY, minuteAngle, 15);
+  }
+
+  function getSteps() {
+    var steps = Bangle.getHealthStatus("day").steps;
+    steps = Math.round(steps/1000);
+    return steps + "k";
+  }
+
+  function drawDate() {
+    g.setFont(font, dateFontSize);
+
+    const date = new Date();
+    const dow = require("locale").dow(date, 2).toUpperCase(); //dj.
+    g.drawString(dow, g.getWidth() - 60, g.getHeight() - 60, true);
+
+    const mon = date.getDate() + " " + require("locale").month(date, 1);
+    g.setFont(font, "4x6");
+    g.drawString(mon, g.getWidth() - 70, g.getHeight() - 25, true);
+  }
+
+  function drawSteps() {
+  
+    g.setFont(font, dateFontSize);
+    const steps = getSteps()
+    g.drawString(steps, g.getWidth() - 60, g.getHeight() - 60, true);
+
+    g.setFont(font, "4x6");
+    const text = "Passos"
+    g.drawString(text, g.getWidth() - 70, g.getHeight() - 25, true);
+  }
 
   function drawSimpleClock() {
-    g.clearRect(Bangle.appRect);
+
     // get date
     var d = new Date();
     var m = d.getMinutes();
 
-    // drawSting centered
+    let t;
+    if (m == 0) {
+      t = leshores[d.getHours()] + " en punt";
+    } else if (m >= 1 && m < 4) {
+      t = leshores[d.getHours()] + " tocades";
+    } else if (m >= 4 && m < 7) {
+      t = leshores[d.getHours()] + " ben tocades";
+    } else if (m == 7) {
+      t = "Mig quart " + getHora(d.getHours());
+    } else if (m >= 8 && m < 12) {
+      t = "Mig quart tocat " + getHora(d.getHours());
+    } else if (m >= 12 && m < 15) {
+      t = "Mig quart ben tocat " + getHora(d.getHours());
+    } else if (m == 15) {
+      t = "Un quart " + getHora(d.getHours());
+    } else if (m >= 16 && m < 19) {
+      t = "Un quart tocat " + getHora(d.getHours());
+    } else if (m >= 19 && m < 22) {
+      t = "Un quart ben tocat " + getHora(d.getHours());
+    } else if (m == 22) {
+      t = "Un quart i mig " + getHora(d.getHours());
+    } else if (m >= 23 && m < 26) {
+      t = "Un quart i mig tocat " + getHora(d.getHours());
+    } else if (m >= 26 && m < 30) {
+      t = "Un quart i mig ben tocat " + getHora(d.getHours());
+    } else if (m == 30) {
+      t = "Dos quarts " + getHora(d.getHours());
+    } else if (m >= 31 && m < 34) {
+      t = "Dos quarts tocats " + getHora(d.getHours());
+    } else if (m >= 34 && m < 37) {
+      t = "Dos quarts ben tocats " + getHora(d.getHours());
+    } else if (m == 37) {
+      t = "Dos quarts i mig " + getHora(d.getHours());
+    } else if (m >= 38 && m < 42) {
+      t = "Dos quarts i mig tocats " + getHora(d.getHours());
+    } else if (m >= 42 && m < 45) {
+      t = "Dos quarts i mig ben tocats " + getHora(d.getHours());
+    } else if (m == 45) {
+      t = "Tres quarts " + getHora(d.getHours());
+    } else if (m >= 46 && m < 49) {
+      t = "Tres quarts tocats " + getHora(d.getHours());
+    } else if (m >= 49 && m < 52) {
+      t = "Tres quarts ben tocats " + getHora(d.getHours());
+    } else if (m == 52) {
+      t = "Tres quarts i mig " + getHora(d.getHours());
+    } else if (m >= 53 && m < 56) {
+      t = "Tres quarts i mig tocats " + getHora(d.getHours());
+    } else if (m >= 57) {
+      t = "Tres quarts i mig ben tocats " + getHora(d.getHours());
+    }
+    g.clearRect(Bangle.appRect);
+    // drawString centered
     g.setFontAlign(-1, 0);
 
-    // draw time
-    let t;
-    if (m >= 0 && m < 2) {
-      t = leshores[d.getHours()] + "\r\nen punt";
-    } else if (m >= 2 && m < 5) {
-      t = leshores[d.getHours()] + "\r\ntocades";
-    } else if (m >= 5 && m < 7) {
-      t = leshores[d.getHours()] + "\r\nben tocades";
-    } else if (m >= 7 && m < 10) {
-      t = "Mig quart\r\n" + leshores2[d.getHours()];
-    } else if (m >= 10 && m < 12) {
-      t = "Mig quart\r\ntocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 12 && m < 15) {
-      t = "Mig quart\r\nben tocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 15 && m < 17) {
-      t = "Un quart\r\n" + leshores2[d.getHours()];
-    } else if (m >= 17 && m < 20) {
-      t = "Un quart\r\ntocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 20 && m < 22) {
-      t = "Un quart\r\nben tocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 22 && m < 25) {
-      t = "Un quart i mig\r\n" + leshores2[d.getHours()];
-    } else if (m >= 25 && m < 27) {
-      t = "Un quart i mig\r\ntocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 27 && m < 30) {
-      t = "Un quart i mig\r\nben tocat\r\n" + leshores2[d.getHours()];
-    } else if (m >= 30 && m < 32) {
-      t = "Dos quarts\r\n" + leshores2[d.getHours()];
-    } else if (m >= 32 && m < 35) {
-      t = "Dos quarts\r\ntocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 35 && m < 37) {
-      t = "Dos quarts\r\nben tocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 37 && m < 40) {
-      t = "Dos quarts i mig\r\n" + leshores2[d.getHours()];
-    } else if (m >= 40 && m < 42) {
-      t = "Dos quarts i mig\r\ntocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 42 && m < 45) {
-      t = "Dos quarts i mig\r\nben tocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 45 && m < 47) {
-      t = "Tres quarts\r\n" + leshores2[d.getHours()];
-    } else if (m >= 47 && m < 50) {
-      t = "Tres quarts\r\ntocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 50 && m < 52) {
-      t = "Tres quarts\r\nben tocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 52 && m < 55) {
-      t = "Tres quarts i mig\r\n" + leshores2[d.getHours()];
-    } else if (m >= 55 && m < 57) {
-      t = "Tres quarts i mig\r\ntocats\r\n" + leshores2[d.getHours()];
-    } else if (m >= 57) {
-      t = "Tres quarts i mig\r\nben tocats\r\n" + leshores2[d.getHours()];
-    }
     g.setFont(font, timeFontSize);
+    t = addLineFeeds(t, g, xyCenter);
+
+    let color;
+    if (E.getBattery() < 15) {
+      color = RED;
+    }
+    else {
+      color = BLACK;
+    }
+
+    g.setColor(color);
     g.drawString(t, xyCenter, yposTime, true);
-
-    // draw Hours
-    g.setFont(font, dateFontSize);    
-    var mu = "";
-    if (m < 10) {mu = "0"+m;} else {mu = m;}
-
-    g.drawString(d.getHours()+":"+mu, xyCenter, yposDate, true);
+    g.setColor(BLACK);
+    if (panel == Panel.STEPS) {
+       drawSteps();
+       panel = Panel.DATE;
+    } else {
+       drawDate();
+       panel = Panel.STEPS;
+    }
+   
+    drawWatchFace();
+    updateWatch();
   }
 
   // handle switch display on by pressing BTN1
@@ -91,8 +216,15 @@
       Bangle.removeListener('lcdPower', onLcd);
     }
   }
-  Bangle.on('lcdPower', onLcd);
-  Bangle.setUI("clock");
+ Bangle.on('lcdPower', onLcd);
+ Bangle.setUI({
+         mode: "clockupdown"
+     },
+     btn => {
+         // up & down even which forces panel switch
+         drawSimpleClock();
+     });
+
   Bangle.loadWidgets();
   require("widget_utils").swipeOn();
 
diff --git a/apps/rep/app.ts b/apps/rep/app.ts
index d1dd67179..14fb45482 100644
--- a/apps/rep/app.ts
+++ b/apps/rep/app.ts
@@ -196,7 +196,7 @@ const layout = new L({
 			]
 		}
 	]
-}, {lazy: true});
+} as const, {lazy: true});
 
 class State {
 	paused: boolean = true;
@@ -248,7 +248,7 @@ class State {
 	}
 }
 
-const repToLabel = (i: number, id: string) => {
+const repToLabel = (i: number, id: "cur" | "next") => {
 	const rep = reps[i];
 	if(rep)
 		layout[`${id}_name`]!.label = `${rep.label} / ${msToMinSec(rep.dur)}`;
@@ -256,7 +256,7 @@ const repToLabel = (i: number, id: string) => {
 		emptyLabel(id);
 };
 
-const emptyLabel = (id: string) => {
+const emptyLabel = (id: "cur" | "next") => {
 	layout[`${id}_name`]!.label = "<none> / 0m";
 };
 
diff --git a/apps/run/ChangeLog b/apps/run/ChangeLog
index ba46d9d06..af75a9aee 100644
--- a/apps/run/ChangeLog
+++ b/apps/run/ChangeLog
@@ -17,3 +17,4 @@
 0.16: Added ability to resume a run that was stopped previously (fix #1907)
 0.17: Ensure screen redraws after "Resume run?" menu (#3044)
 0.18: Minor code improvements
+0.19: Fix step count bug when runs are resumed after a long time
diff --git a/apps/run/README.md b/apps/run/README.md
index 7f645b518..452549856 100644
--- a/apps/run/README.md
+++ b/apps/run/README.md
@@ -6,6 +6,8 @@ shows distance, time, steps, cadence, pace and more.
 To use it, start the app and press the middle button so that
 the red `STOP` in the bottom right turns to a green `RUN`.
 
+The separate **Run+** app for Bangle.js 2 provides additional features.
+
 ## Display
 
 * `DIST` - the distance travelled based on the GPS (if you have a GPS lock).
diff --git a/apps/run/metadata.json b/apps/run/metadata.json
index 3b1c42e0c..126d8fcf0 100644
--- a/apps/run/metadata.json
+++ b/apps/run/metadata.json
@@ -1,7 +1,7 @@
 { "id": "run",
   "name": "Run",
-  "version": "0.18",
-  "description": "Displays distance, time, steps, cadence, pace and more for runners.",
+  "version": "0.19",
+  "description": "Displays distance, time, steps, cadence, pace and more for runners. The **Run+** app for Bangle.js 2 provides additional features.",
   "icon": "app.png",
   "tags": "run,running,fitness,outdoors,gps",
   "supports" : ["BANGLEJS","BANGLEJS2"],
diff --git a/apps/runplus/ChangeLog b/apps/runplus/ChangeLog
index 093c0cf9a..645f6cf76 100644
--- a/apps/runplus/ChangeLog
+++ b/apps/runplus/ChangeLog
@@ -24,3 +24,7 @@ Write to correct settings file, fixing settings not working.
 0.21: Rebase on "Run" app ver. 0.16.
 0.22: Ensure screen redraws after "Resume run?" menu (#3044)
 0.23: Minor code improvements
+0.24: Add indicators for lock,gps and pulse to karvonen screen
+0.25: Fix step count bug when runs are resumed after a long time
+0.26: Add ability to zoom in on a single stat by tapping it
+0.27: Allow setting to alway resume an activity
diff --git a/apps/runplus/README.md b/apps/runplus/README.md
index 1776e1186..d930b55e5 100644
--- a/apps/runplus/README.md
+++ b/apps/runplus/README.md
@@ -4,6 +4,8 @@ Displays distance, time, steps, cadence, pace and heart rate for runners. Based
 It requires the input of your minimum and maximum heart rate in the settings for the app to work. You can come back back to the initial run screen anytime by swimping left.
 To use it, start the app and press the middle button so that the red STOP in the bottom right turns to a green `RUN`.
 
+To focus on a single stat, tap on the stat and it will take up the full screen. Tap again to return to the main screen.
+
 ## Display 1st screen
 
 * `DIST` - the distance travelled based on the GPS (if you have a GPS lock).
@@ -25,6 +27,7 @@ so if you have no GPS lock you just need to wait.
 
 Unlock the screen and navigate between displays by swiping left or right.
 The upper number is the limit before next heart rate zone. The lower number is the limit before previous heart rate zone. The number in the middle is the heart rate. The Z1 to Z5 number indicates the heart rate zone where you are. The circle provides a quick visualisation of the hr zone in which you are.
+Indicator icons for lock, heartrate and location are updated on arrival off internal system events. The heart icon shows if the exstats module decided that the heart rate value is usable. The location icon shows if there was an GPS event with a position fix in it.
 
 ## Recording Tracks
 
diff --git a/apps/runplus/app.js b/apps/runplus/app.js
index 92428d2dc..e83112219 100644
--- a/apps/runplus/app.js
+++ b/apps/runplus/app.js
@@ -1,23 +1,20 @@
-// Use widget utils to show/hide widgets
-let wu = require("widget_utils");
-
 let runInterval;
-let karvonenActive = false;
+let screen = "main"; // main | karvonen | menu | zoom
 // Run interface wrapped in a function
-let ExStats = require("exstats");
+const ExStats = require("exstats");
 let B2 = process.env.HWVERSION===2;
 let Layout = require("Layout");
 let locale = require("locale");
 let fontHeading = "6x8:2";
 let fontValue = B2 ? "6x15:2" : "6x8:3";
+let zoomFont = "12x20:3";
+let zoomFontSmall = "12x20:2";
 let headingCol = "#888";
 let fixCount = 0;
-let isMenuDisplayed = false;
+const wu = require("widget_utils");
 
 g.reset().clear();
 Bangle.loadWidgets();
-Bangle.drawWidgets();
-wu.show();
 
 // ---------------------------
 let settings = Object.assign({
@@ -29,6 +26,7 @@ let settings = Object.assign({
   B5: "step",
   B6: "caden",
   paceLength: 1000,
+  alwaysResume: false,
   notify: {
     dist: {
       value: 0,
@@ -56,22 +54,27 @@ function setStatus(running) {
   layout.button.label = running ? "STOP" : "START";
   layout.status.label = running ? "RUN" : "STOP";
   layout.status.bgCol = running ? "#0f0" : "#f00";
-  layout.render();
+  if (screen === "main") layout.render();
 }
 
 // Called to start/stop running
 function onStartStop() {
+  if (screen === "karvonen") {
+    // start/stop on the karvonen screen reverts us to the main screen
+    setScreen("main");
+  }
+
   var running = !exs.state.active;
-  var shouldResume = false;
+  var shouldResume = settings.alwaysResume;
   var promise = Promise.resolve();
 
-  if (running && exs.state.duration > 10000) { // if more than 10 seconds of duration, ask if we should resume?
+  if (!shouldResume && running && exs.state.duration > 10000) { // if more than 10 seconds of duration, ask if we should resume?
     promise = promise.
       then(() => {
-        isMenuDisplayed = true;
+        screen = "menu";
         return E.showPrompt("Resume run?",{title:"Run"});
       }).then(r => {
-        isMenuDisplayed=false;
+        screen = "main";
         layout.setUI(); // grab our input handling again
         layout.forgetLazyState();
         layout.render();
@@ -84,11 +87,11 @@ function onStartStop() {
   // an overwrite before we start tracking exstats
   if (settings.record && WIDGETS["recorder"]) {
     if (running) {
-      isMenuDisplayed = true;
+      screen = "menu";
       promise = promise.
         then(() => WIDGETS["recorder"].setRecording(true, { force : shouldResume?"append":undefined })).
         then(() => {
-          isMenuDisplayed = false;
+          screen = "main";
           layout.setUI(); // grab our input handling again
           layout.forgetLazyState();
           layout.render();
@@ -100,10 +103,10 @@ function onStartStop() {
     }
   }
 
-  promise = promise.then(() => {
+  promise.then(() => {
     if (running) {
       if (shouldResume)
-        exs.resume()
+        exs.resume();
       else
         exs.start();
     } else {
@@ -115,23 +118,68 @@ function onStartStop() {
   });
 }
 
+function zoom(statID) {
+  if (screen !== "main") return;
+
+  setScreen("zoom");
+
+  const onTouch = () => {
+    Bangle.removeListener("touch", onTouch);
+    Bangle.removeListener("twist", onTwist);
+    stat.removeListener("changed", draw);
+    setScreen("main");
+  };
+  Bangle.on("touch", onTouch); // queued after layout's touchHandler (otherwise we'd be removed then instantly re-zoomed)
+
+  const onTwist = () => {
+    Bangle.setLCDPower(1);
+  };
+  Bangle.on("twist", onTwist);
+
+  const draw = stat => {
+    const R = Bangle.appRect;
+
+    g.reset()
+      .clearRect(R)
+      .setFontAlign(0, 0);
+
+    layout.render(layout.bottom);
+
+    const value = exs.state.active ? stat.getString() : "____";
+
+    g
+      .setFont(stat.title.length > 5 ? zoomFontSmall : zoomFont)
+      .setColor(headingCol)
+      .drawString(stat.title.toUpperCase(), R.x+R.w/2, R.y+R.h/3)
+      .setColor(g.theme.fg)
+      .drawString(value, R.x+R.w/2, R.y+R.h*2/3);
+  };
+  layout.lazy = false; // restored when we go back to "main"
+
+  const stat = exs.stats[statID];
+  stat.on("changed", draw);
+  draw(stat);
+}
+
 let lc = [];
 // Load stats in pair by pair
 for (let i=0;i<statIDs.length;i+=2) {
   let sa = exs.stats[statIDs[i+0]];
   let sb = exs.stats[statIDs[i+1]];
+  let cba = zoom.bind(null, statIDs[i]);
+  let cbb = zoom.bind(null, statIDs[i+1]);
   lc.push({ type:"h", filly:1, c:[
-    sa?{type:"txt", font:fontHeading, label:sa.title.toUpperCase(), fillx:1, col:headingCol }:{},
-    sb?{type:"txt", font:fontHeading, label:sb.title.toUpperCase(), fillx:1, col:headingCol }:{}
+    sa?{type:"txt", font:fontHeading, label:sa.title.toUpperCase(), fillx:1, col:headingCol, cb: cba }:{},
+    sb?{type:"txt", font:fontHeading, label:sb.title.toUpperCase(), fillx:1, col:headingCol, cb: cbb }:{}
   ]}, { type:"h", filly:1, c:[
-    sa?{type:"txt", font:fontValue, label:sa.getString(), id:sa.id, fillx:1 }:{},
-    sb?{type:"txt", font:fontValue, label:sb.getString(), id:sb.id, fillx:1 }:{}
+    sa?{type:"txt", font:fontValue, label:sa.getString(), id:sa.id, fillx:1, cb: cba }:{},
+    sb?{type:"txt", font:fontValue, label:sb.getString(), id:sb.id, fillx:1, cb: cbb }:{}
   ]});
   if (sa) sa.on('changed', e=>layout[e.id].label = e.getString());
   if (sb) sb.on('changed', e=>layout[e.id].label = e.getString());
 }
 // At the bottom put time/GPS state/etc
-lc.push({ type:"h", filly:1, c:[
+lc.push({ type:"h", id:"bottom", filly:1, c:[
   {type:"txt", font:fontHeading, label:"GPS", id:"gps", fillx:1, bgCol:"#f00" },
   {type:"txt", font:fontHeading, label:"00:00", id:"clock", fillx:1, bgCol:g.theme.fg, col:g.theme.bg },
   {type:"txt", font:fontHeading, label:"---", id:"status", fillx:1 }
@@ -139,7 +187,7 @@ lc.push({ type:"h", filly:1, c:[
 // Now calculate the layout
 let layout = new Layout( {
   type:"v", c: lc
-},{lazy:true, btns:[{ label:"---", cb: (()=>{if (karvonenActive) {stopKarvonenUI();run();} onStartStop();}), id:"button"}]});
+},{lazy:true, btns:[{ label:"---", cb: onStartStop, id:"button"}]});
 delete lc;
 setStatus(exs.state.active);
 layout.render();
@@ -169,45 +217,49 @@ Bangle.on("GPS", function(fix) {
   }
 });
 
-// run() function used to switch between traditional run UI and karvonen UI
-function run() {
-  wu.show();
-  layout.lazy = false;
-  layout.render();
-  layout.lazy = true;
-  // We always call ourselves once a second to update
-  if (!runInterval){
-    runInterval = setInterval(function() {
-      layout.clock.label = locale.time(new Date(),1);
-      if (!isMenuDisplayed && !karvonenActive) layout.render();
-    }, 1000);
+function setScreen(to) {
+  if (screen === "karvonen") {
+    require("runplus_karvonen").stop();
+    wu.show();
+    Bangle.drawWidgets();
+  }
+
+  if (runInterval) clearInterval(runInterval);
+  runInterval = undefined;
+  g.reset().clearRect(Bangle.appRect);
+
+  screen = to;
+  switch (screen) {
+    case "main":
+      layout.lazy = false;
+      layout.render();
+      layout.lazy = true;
+      // We always call ourselves once a second to update
+      if (!runInterval){
+        runInterval = setInterval(function() {
+          layout.clock.label = locale.time(new Date(),1);
+          if (screen !== "menu") layout.render();
+        }, 1000);
+      }
+      break;
+
+    case "karvonen":
+      require("runplus_karvonen").start(settings.HRM, exs.stats.bpm);
+      break;
   }
 }
-run();
 
-///////////////////////////////////////////////
-//                Karvonen
-///////////////////////////////////////////////
-
-function stopRunUI() {
-  // stop updating and drawing the traditional run app UI
-  clearInterval(runInterval);
-  runInterval = undefined;
-  karvonenActive = true;
-}
-
-function stopKarvonenUI() {
-  g.reset().clear();
-  clearInterval(karvonenInterval);
-  karvonenInterval = undefined;
-  karvonenActive = false;
-}
-
-let karvonenInterval;
 // Define the function to go back and forth between the different UI's
 function swipeHandler(LR,_) {
-  if (LR==-1 && karvonenActive && !isMenuDisplayed) {stopKarvonenUI(); run();}
-  if (LR==1 && !karvonenActive && !isMenuDisplayed) {stopRunUI(); karvonenInterval = eval(require("Storage").read("runplus_karvonen"))(settings.HRM, exs.stats.bpm);}
+  if (screen !== "menu"){
+    if (LR < 0 && screen == "karvonen")
+      setScreen("main");
+    if (LR > 0 && screen !== "karvonen")
+      setScreen("karvonen"); // stop updating and drawing the traditional run app UI
+  }
 }
+
+setScreen("main");
+
 // Listen for swipes with the swipeHandler
 Bangle.on("swipe", swipeHandler);
diff --git a/apps/runplus/karvonen.js b/apps/runplus/karvonen.js
index 42c4734a8..afdbdb1cf 100644
--- a/apps/runplus/karvonen.js
+++ b/apps/runplus/karvonen.js
@@ -1,19 +1,19 @@
-(function karvonen(hrmSettings, exsHrmStats) {
-  //This app is an extra feature implementation for the Run.app of the bangle.js. It's called run+
-  //The calculation of the Heart Rate Zones is based on the Karvonen method. It requires to know maximum and minimum heart rates. More precise calculation methods require a lab.
-  //Other methods are even more approximative.
-  let wu = require("widget_utils");
-  wu.hide();
-  let R = Bangle.appRect;
+//This app is an extra feature implementation for the Run.app of the bangle.js. It's called run+
+//The calculation of the Heart Rate Zones is based on the Karvonen method. It requires to know maximum and minimum heart rates. More precise calculation methods require a lab.
+//Other methods are even more approximative.
+let wu = require("widget_utils");
+let R;
 
-  
-  g.reset().clearRect(R).setFontAlign(0,0,0);
-    
-  const x = "x"; const y = "y";
-  function Rdiv(axis, divisor) { // Used when placing things on the screen
-    return axis=="x" ? (R.x + (R.w-1)/divisor):(R.y + (R.h-1)/divisor);
-  }
-  let linePoints = { //Not lists of points, but used to update points in the drawArrows function.
+const ICON_LOCK = atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g==");
+const ICON_HEART = atob("Dw4BODj4+fv3///////f/z/+P/g/4D+APgA4ACAA");
+const ICON_LOCATION = atob("CxABP4/7x/B+D8H8e/5/x/D+D4HwHAEAIA==");
+
+const x = "x"; const y = "y";
+function Rdiv(axis, divisor) { // Used when placing things on the screen
+  return axis=="x" ? (R.x + (R.w-1)/divisor):(R.y + (R.h-1)/divisor);
+}
+
+let linePoints = { //Not lists of points, but used to update points in the drawArrows function.
     x: [
   175/40,
   2,
@@ -24,190 +24,324 @@
   175/52,
   175/110,
   175/122,
-    ],
-  
-  };
-  
-  function drawArrows() {
-    g.setColor(g.theme.fg);
-    // Upper
-    g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[0]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]));
-    g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[0]));
-    // Lower
-    g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[2]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]));
-    g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[2]));
-  }
-  
-  //To calculate Heart rate zones, we need to know the heart rate reserve (HRR)
-  // HRR = maximum HR - Minimum HR. minhr is minimum hr, maxhr is maximum hr.
-  //get the hrr (heart rate reserve).
-  // I put random data here, but this has to come as a menu in the settings section so that users can change it.
-  let minhr = hrmSettings.min;
-  let maxhr = hrmSettings.max;
-  
-  function calculatehrr(minhr, maxhr) {
-    return maxhr - minhr;}
-  
-  //test input for hrr (it works).
-  let hrr = calculatehrr(minhr, maxhr);
-  console.log(hrr);
-  
-  //Test input to verify the zones work. The following value for "hr" has to be deleted and replaced with the Heart Rate Monitor input.
-  let hr = exsHrmStats.getValue();
-  // These letiables display next and previous HR zone.
-  //get the hrzones right. The calculation of the Heart rate zones here is based on the Karvonen method
-  //60-70% of HRR+minHR = zone2. //70-80% of HRR+minHR = zone3. //80-90% of HRR+minHR = zone4. //90-99% of HRR+minHR = zone5. //=>99% of HRR+minHR = serious risk of heart attack
-  let minzone2 = hrr * 0.6 + minhr;
-  let maxzone2 = hrr * 0.7 + minhr;
-  let maxzone3 = hrr * 0.8 + minhr;
-  let maxzone4 = hrr * 0.9 + minhr;
-  let maxzone5 = hrr * 0.99 + minhr;
+    ]
+};
 
-  // HR data: large, readable, in the middle of the screen
-  function drawHR() {
-    g.setFontAlign(-1,0,0);
-    g.clearRect(Rdiv(x,11/4),Rdiv(y,2)-25,Rdiv(x,11/4)+50*2-14,Rdiv(y,2)+25);
-    g.setColor(g.theme.fg);
-    g.setFont("Vector",50);
-    g.drawString(hr, Rdiv(x,11/4), Rdiv(y,2)+4);
+
+function drawArrows() {
+  g.setColor(g.theme.fg);
+  // Upper
+  g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[0]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]));
+  g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[1]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[0]));
+  // Lower
+  g.drawLine(Rdiv(x,linePoints.x[0]), Rdiv(y,linePoints.y[2]), Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]));
+  g.drawLine(Rdiv(x,linePoints.x[1]), Rdiv(y,linePoints.y[3]), Rdiv(x,linePoints.x[2]), Rdiv(y,linePoints.y[2]));
+}
+
+//To calculate Heart rate zones, we need to know the heart rate reserve (HRR)
+// HRR = maximum HR - Minimum HR. minhr is minimum hr, maxhr is maximum hr.
+//get the hrr (heart rate reserve).
+// I put random data here, but this has to come as a menu in the settings section so that users can change it.
+let minhr;
+let maxhr;
+let hrr;
+
+//Test input to verify the zones work. The following value for "hr" has to be deleted and replaced with the Heart Rate Monitor input.
+let hr;
+// These letiables display next and previous HR zone.
+//get the hrzones right. The calculation of the Heart rate zones here is based on the Karvonen method
+//60-70% of HRR+minHR = zone2. //70-80% of HRR+minHR = zone3. //80-90% of HRR+minHR = zone4. //90-99% of HRR+minHR = zone5. //=>99% of HRR+minHR = serious risk of heart attack
+let minzone2;
+let maxzone2;
+let maxzone3;
+let maxzone4;
+let maxzone5;
+
+function calculatehrr(minhr, maxhr) {
+  hrr = maxhr - minhr;
+  minzone2 = hrr * 0.6 + minhr;
+  maxzone2 = hrr * 0.7 + minhr;
+  maxzone3 = hrr * 0.8 + minhr;
+  maxzone4 = hrr * 0.9 + minhr;
+  maxzone5 = hrr * 0.99 + minhr;
+}
+// HR data: large, readable, in the middle of the screen
+function drawHR() {
+  g.setFontAlign(-1,0,0);
+  g.clearRect(Rdiv(x,11/4),Rdiv(y,2)-25,Rdiv(x,11/4)+50*2-14,Rdiv(y,2)+25);
+  g.setColor(g.theme.fg);
+  g.setFont("Vector",50);
+  g.drawString(hr, Rdiv(x,11/4), Rdiv(y,2)+4);
+  drawArrows();
+}
+
+function drawWaitHR() {
+  g.setColor(g.theme.fg);
+  // Waiting for HRM
+  g.setFontAlign(0,0,0);
+  g.setFont("Vector",50);
+  g.drawString("--", Rdiv(x,2)+4, Rdiv(y,2)+4);
+
+  // Waiting for current Zone
+  g.setFont("Vector",24);
+  g.drawString("Z-", Rdiv(x,4.3)-3, Rdiv(y,2)+2);
+
+  // waiting for upper and lower limit of current zone
+  g.setFont("Vector",20);
+  g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/2));
+  g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/7));
+
+  drawArrows();
+}
+
+//These functions call arcs to show different HR zones.
+
+//To shorten the code, I'll reference some letiables and reuse them.
+let centreX;
+let centreY;
+let minRadius;
+let maxRadius;
+
+//draw background image (dithered green zones)(I should draw different zones in different dithered colors)
+const HRzones= require("graphics_utils");
+let minRadiusz;
+let startAngle;
+let endAngle;
+
+function drawBgArc() {
+  g.setColor(g.theme.dark==false?0xC618:"#002200");
+  HRzones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
+}
+
+const zones = require("graphics_utils");
+//####### A function to simplify a bit the code ######
+function simplify (sA, eA, Z, currentZone, lastZone) {
+  let startAngle = zones.degreesToRadians(sA);
+  let endAngle = zones.degreesToRadians(eA);
+  if (currentZone == lastZone) zones.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle, endAngle);
+  else zones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
+  g.setFont("Vector",24);
+  g.clearRect(Rdiv(x,4.3)-12, Rdiv(y,2)+2-12,Rdiv(x,4.3)+12, Rdiv(y,2)+2+12);
+  g.setFontAlign(0,0,0);
+  g.drawString(Z, Rdiv(x,4.3), Rdiv(y,2)+2);
+}
+
+function zoning (max, min) { // draw values of upper and lower limit of current zone
+  g.setFont("Vector",20);
+  g.setColor(g.theme.fg);
+  g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/2)-10,Rdiv(x,2)+20*2, Rdiv(y,9/2)+10);
+  g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/7)-10,Rdiv(x,2)+20*2, Rdiv(y,9/7)+10);
+  g.setFontAlign(0,0,0);
+  g.drawString(max, Rdiv(x,2), Rdiv(y,9/2));
+  g.drawString(min, Rdiv(x,2), Rdiv(y,9/7));
+}
+
+function clearCurrentZone() { // Clears the extension of the current zone by painting the extension area in background color
+  g.setColor(g.theme.bg);
+  HRzones.fillArc(g, centreX, centreY, minRadius-1, minRadiusz, startAngle, endAngle);
+}
+
+function drawZone(zone) {
+  clearCurrentZone();
+  if (zone >= 0)  {zoning(minzone2, minhr);g.setColor("#00ffff");simplify(-88.5, -45, "Z1", 0, zone);}
+  if (zone >= 1)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-43.5, -21.5, "Z2", 1, zone);}
+  if (zone >= 2)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-20, 1.5, "Z2", 2, zone);}
+  if (zone >= 3)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(3, 24, "Z2", 3, zone);}
+  if (zone >= 4)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(25.5, 46.5, "Z3", 4, zone);}
+  if (zone >= 5)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(48, 69, "Z3", 5, zone);}
+  if (zone >= 6)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(70.5, 91.5, "Z3", 6, zone);}
+  if (zone >= 7)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(93, 114.5, "Z4", 7, zone);}
+  if (zone >= 8)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(116, 137.5, "Z4", 8, zone);}
+  if (zone >= 9)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(139, 160, "Z4", 9, zone);}
+  if (zone >= 10) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(161.5, 182.5, "Z5", 10, zone);}
+  if (zone >= 11) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(184, 205, "Z5", 11, zone);}
+  if (zone == 12) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(206.5, 227.5, "Z5", 12, zone);}
   }
 
-  function drawWaitHR() {
-    g.setColor(g.theme.fg);
-    // Waiting for HRM
-    g.setFontAlign(0,0,0);
-    g.setFont("Vector",50);
-    g.drawString("--", Rdiv(x,2)+4, Rdiv(y,2)+4);
+function drawIndicators(){
+  drawLockIndicator();
+  drawPulseIndicator();
+  drawGpsIndicator();
+}
 
-    // Waiting for current Zone
-    g.setFont("Vector",24);
-    g.drawString("Z-", Rdiv(x,4.3)-3, Rdiv(y,2)+2);
+function drawZoneAlert() {
+  const HRzonemax = require("graphics_utils");
+  drawIndicators();
+  g.clearRect(R);
+  drawIndicators();
+  let minRadius = 0.40 * R.h;
+  let startAngle1 = HRzonemax.degreesToRadians(-90);
+  let endAngle1 = HRzonemax.degreesToRadians(270);
+  g.setFont("Vector",38);g.setColor("#ff0000");
+  HRzonemax.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle1, endAngle1);
+  g.setFontAlign(0,0).drawString("ALERT", centreX, centreY);
+}
 
-    // waiting for upper and lower limit of current zone
-    g.setFont("Vector",20);
-    g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/2));
-    g.drawString("--", Rdiv(x,2)+2, Rdiv(y,9/7));
+function drawWaitUI(){
+  g.clearRect(R);
+  drawIndicators();
+  drawBgArc();
+  drawWaitHR();
+  drawArrows();
+}
+
+function drawBase() {
+  g.clearRect(R);
+  drawIndicators();
+  drawBgArc();
+}
+
+function drawZoneUI(full){
+  if (full) {
+    drawBase();
   }
-  
-  //These functions call arcs to show different HR zones.
-  
-  //To shorten the code, I'll reference some letiables and reuse them.
-  let centreX = R.x + 0.5 * R.w;
-  let centreY = R.y + 0.5 * R.h;
-  let minRadius = 0.38 * R.h;
-  let maxRadius = 0.50 * R.h;
-  
-  //draw background image (dithered green zones)(I should draw different zones in different dithered colors)
-  const HRzones= require("graphics_utils");
-  let minRadiusz = 0.44 * R.h;
-  let startAngle = HRzones.degreesToRadians(-88.5);
-  let endAngle = HRzones.degreesToRadians(268.5);
+  drawHR();
+  drawZones();
+}
 
-  function drawBgArc() {
-    g.setColor(g.theme.dark==false?0xC618:"#002200");
-    HRzones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
+//Subdivided zones for better readability of zones when calling the images. //Changing HR zones will trigger the function with the image and previous&next HR zones.
+let subZoneLast;
+function drawZones() {
+  if ((hr < maxhr - 2) && subZoneLast==13) { drawZoneUI(true); } // Reset UI when coming down from zone alert.
+  if (hr <= hrr * 0.6 + minhr) {if (subZoneLast!=0) {subZoneLast=0; drawZone(subZoneLast);}} // Z1
+  else if (hr <= hrr * 0.64 + minhr) {if (subZoneLast!=1) {subZoneLast=1; drawZone(subZoneLast);}} // Z2a
+  else if (hr <= hrr * 0.67 + minhr) {if (subZoneLast!=2) {subZoneLast=2; drawZone(subZoneLast);}} // Z2b
+  else if (hr <= hrr * 0.70 + minhr) {if (subZoneLast!=3) {subZoneLast=3; drawZone(subZoneLast);}} // Z2c
+  else if (hr <= hrr * 0.74 + minhr) {if (subZoneLast!=4) {subZoneLast=4; drawZone(subZoneLast);}} // Z3a
+  else if (hr <= hrr * 0.77 + minhr) {if (subZoneLast!=5) {subZoneLast=5; drawZone(subZoneLast);}} // Z3b
+  else if (hr <= hrr * 0.80 + minhr) {if (subZoneLast!=6) {subZoneLast=6; drawZone(subZoneLast);}} // Z3c
+  else if (hr <= hrr * 0.84 + minhr) {if (subZoneLast!=7) {subZoneLast=7; drawZone(subZoneLast);}} // Z4a
+  else if (hr <= hrr * 0.87 + minhr) {if (subZoneLast!=8) {subZoneLast=8; drawZone(subZoneLast);}} // Z4b
+  else if (hr <= hrr * 0.90 + minhr) {if (subZoneLast!=9) {subZoneLast=9; drawZone(subZoneLast);}} // Z4c
+  else if (hr <= hrr * 0.94 + minhr) {if (subZoneLast!=10) {subZoneLast=10; drawZone(subZoneLast);}} // Z5a
+  else if (hr <= hrr * 0.96 + minhr) {if (subZoneLast!=11) {subZoneLast=11; drawZone(subZoneLast);}} // Z5b
+  else if (hr <= hrr * 0.98 + minhr) {if (subZoneLast!=12) {subZoneLast=12; drawZone(subZoneLast);}} // Z5c
+  else if (hr >= maxhr - 2) {subZoneLast=13; drawZoneAlert();} // Alert
+}
+
+let karvonenInterval;
+let hrmstat;
+
+function drawLockIndicator() {
+  if (Bangle.isLocked())
+    g.setColor(g.theme.fg).drawImage(ICON_LOCK, 6, 8);
+  else
+    g.setColor(g.theme.bg).drawImage(ICON_LOCK, 6, 8);
+}
+
+let gpsTimeout;
+let lastGps;
+function drawGpsIndicator(e) {
+  if (e && e.fix){
+    if (gpsTimeout)
+      clearTimeout(gpsTimeout);
+    g.setColor(g.theme.fg).drawImage(ICON_LOCATION, 8, R.y2 - 23);
+    lastGps = 0;
+    gpsTimeout = setTimeout(()=>{
+      g.setColor(g.theme.dark?"#ccc":"#444").drawImage(ICON_LOCATION, 8, R.y2 - 23);
+      lastGps = 1;
+      gpsTimeout = setTimeout(()=>{
+        g.setColor(g.theme.bg).drawImage(ICON_LOCATION, 8, R.y2 - 23);
+        lastGps = 2;
+      }, 3900);
+    }, 1100);
+  } else if (lastGps !== undefined){
+    switch (lastGps) {
+      case 0: g.setColor(g.theme.fg).drawImage(ICON_LOCATION, 8, R.y2 - 23); break;
+      case 1: g.setColor(g.theme.dark?"#ccc":"#444").drawImage(ICON_LOCATION, 8, R.y2 - 23); break;
+      case 2: g.setColor(g.theme.bg).drawImage(ICON_LOCATION, 8, R.y2 - 23); break;
+    }
   }
-  
-  const zones = require("graphics_utils");
-  //####### A function to simplify a bit the code ######
-  function simplify (sA, eA, Z, currentZone, lastZone) {
-    let startAngle = zones.degreesToRadians(sA);
-    let endAngle = zones.degreesToRadians(eA);
-    if (currentZone == lastZone) zones.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle, endAngle);
-    else zones.fillArc(g, centreX, centreY, minRadiusz, maxRadius, startAngle, endAngle);
-    g.setFont("Vector",24);
-    g.clearRect(Rdiv(x,4.3)-12, Rdiv(y,2)+2-12,Rdiv(x,4.3)+12, Rdiv(y,2)+2+12);
-    g.setFontAlign(0,0,0);
-    g.drawString(Z, Rdiv(x,4.3), Rdiv(y,2)+2);
+}
+
+let pulseTimeout;
+function drawPulseIndicator() {
+  if (hr){
+    if (pulseTimeout)
+      clearTimeout(pulseTimeout);
+    g.setColor(g.theme.fg).drawImage(ICON_HEART, R.x2 - 21, R.y2 - 21);
+    pulseTimeout = setTimeout(()=>{
+      g.setColor(g.theme.dark?"#ccc":"#444").drawImage(ICON_HEART, R.x2 - 21, R.y2 - 21);
+      pulseTimeout = setTimeout(()=>{
+        g.setColor(g.theme.bg).drawImage(ICON_HEART, R.x2 - 21, R.y2 - 21);
+      }, 3900);
+    }, 1100);
+  }
+}
+
+function init(hrmSettings, exsHrmStats) {
+  R = Bangle.appRect;
+  hrmstat = exsHrmStats;
+  hr = hrmstat.getValue();
+  minhr = hrmSettings.min;
+  maxhr = hrmSettings.max;
+  calculatehrr(minhr, maxhr);
+
+  centreX = R.x + 0.5 * R.w;
+  centreY = R.y + 0.5 * R.h;
+  minRadius = 0.38 * R.h;
+  maxRadius = 0.50 * R.h;
+
+  minRadiusz = 0.44 * R.h;
+  startAngle = HRzones.degreesToRadians(-88.5);
+  endAngle = HRzones.degreesToRadians(268.5);
+}
+
+function start(hrmSettings, exsHrmStats) {
+  wu.hide();
+  init(hrmSettings, exsHrmStats);
+
+  g.reset().clearRect(R).setFontAlign(0,0,0);
+
+  Bangle.on("lock", drawLockIndicator);
+  Bangle.on("HRM", drawPulseIndicator);
+  Bangle.on("HRM", updateUI);
+  Bangle.on("GPS", drawGpsIndicator);
+
+  setTimeout(updateUI,0,true);
+}
+let waitTimeout;
+let hrLast;
+//h = 0; // Used to force hr update via web ui console field to trigger draws, together with `if (h!=0) hr = h;` below.
+function updateUI(resetHrLast) { // Update UI, only draw if warranted by change in HR.
+  if (resetHrLast){
+    hrLast = 0; // Handles correct updating on init depending on if we've got HRM readings yet or not.
+    subZoneLast = undefined;
   }
 
-  function zoning (max, min) { // draw values of upper and lower limit of current zone
-    g.setFont("Vector",20);
-    g.setColor(g.theme.fg);
-    g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/2)-10,Rdiv(x,2)+20*2, Rdiv(y,9/2)+10);
-    g.clearRect(Rdiv(x,2)-20*2, Rdiv(y,9/7)-10,Rdiv(x,2)+20*2, Rdiv(y,9/7)+10);
-    g.setFontAlign(0,0,0);
-    g.drawString(max, Rdiv(x,2), Rdiv(y,9/2));
-    g.drawString(min, Rdiv(x,2), Rdiv(y,9/7));
+  if (waitTimeout) clearTimeout(waitTimeout);
+  waitTimeout = setTimeout(() => {drawWaitUI(); waitTimeout = undefined;}, 2000);
+
+  hr = hrmstat.getValue();
+  //if (h!=0) hr = h;
+
+  if (hrLast != hr || resetHrLast){
+    if (hr && hrLast != hr){
+      drawZoneUI(true);
+    } else if (!hr)
+      drawWaitUI();
   }
 
-  function clearCurrentZone() { // Clears the extension of the current zone by painting the extension area in background color
-    g.setColor(g.theme.bg);
-    HRzones.fillArc(g, centreX, centreY, minRadius-1, minRadiusz, startAngle, endAngle);
-  }
-  
-  function getZone(zone) {
-    drawBgArc();
-    clearCurrentZone();
-    if (zone >= 0)  {zoning(minzone2, minhr);g.setColor("#00ffff");simplify(-88.5, -45, "Z1", 0, zone);}
-    if (zone >= 1)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-43.5, -21.5, "Z2", 1, zone);}
-    if (zone >= 2)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(-20, 1.5, "Z2", 2, zone);}
-    if (zone >= 3)  {zoning(maxzone2, minzone2);g.setColor("#00ff00");simplify(3, 24, "Z2", 3, zone);}
-    if (zone >= 4)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(25.5, 46.5, "Z3", 4, zone);}
-    if (zone >= 5)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(48, 69, "Z3", 5, zone);}
-    if (zone >= 6)  {zoning(maxzone3, maxzone2);g.setColor("#ffff00");simplify(70.5, 91.5, "Z3", 6, zone);}
-    if (zone >= 7)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(93, 114.5, "Z4", 7, zone);}
-    if (zone >= 8)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(116, 137.5, "Z4", 8, zone);}
-    if (zone >= 9)  {zoning(maxzone4, maxzone3);g.setColor("#ff8000");simplify(139, 160, "Z4", 9, zone);}
-    if (zone >= 10) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(161.5, 182.5, "Z5", 10, zone);}
-    if (zone >= 11) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(184, 205, "Z5", 11, zone);}
-    if (zone == 12) {zoning(maxzone5, maxzone4);g.setColor("#ff0000");simplify(206.5, 227.5, "Z5", 12, zone);}
-   }
+  hrLast = hr;
+  //g.setColor(g.theme.fg).drawLine(175/2,0,175/2,175).drawLine(0,175/2,175,175/2); // Used to align UI elements.
+}
 
-  function getZoneAlert() {
-   const HRzonemax = require("graphics_utils");
-   let minRadius = 0.40 * R.h;
-   let startAngle1 = HRzonemax.degreesToRadians(-90);
-   let endAngle1 = HRzonemax.degreesToRadians(270);
-   g.setFont("Vector",38);g.setColor("#ff0000");
-   HRzonemax.fillArc(g, centreX, centreY, minRadius, maxRadius, startAngle1, endAngle1);
-   g.drawString("ALERT", 26,66);
-  }
-  
-  //Subdivided zones for better readability of zones when calling the images. //Changing HR zones will trigger the function with the image and previous&next HR zones.
-  let subZoneLast;
-  function drawZones() {
-    if ((hr < maxhr - 2) && subZoneLast==13) {g.clear(); drawArrows(); drawHR();} // Reset UI when coming down from zone alert.
-    if (hr <= hrr * 0.6 + minhr) {if (subZoneLast!=0) {subZoneLast=0; getZone(subZoneLast);}} // Z1
-    else if (hr <= hrr * 0.64 + minhr) {if (subZoneLast!=1) {subZoneLast=1; getZone(subZoneLast);}} // Z2a
-    else if (hr <= hrr * 0.67 + minhr) {if (subZoneLast!=2) {subZoneLast=2; getZone(subZoneLast);}} // Z2b
-    else if (hr <= hrr * 0.70 + minhr) {if (subZoneLast!=3) {subZoneLast=3; getZone(subZoneLast);}} // Z2c
-    else if (hr <= hrr * 0.74 + minhr) {if (subZoneLast!=4) {subZoneLast=4; getZone(subZoneLast);}} // Z3a
-    else if (hr <= hrr * 0.77 + minhr) {if (subZoneLast!=5) {subZoneLast=5; getZone(subZoneLast);}} // Z3b
-    else if (hr <= hrr * 0.80 + minhr) {if (subZoneLast!=6) {subZoneLast=6; getZone(subZoneLast);}} // Z3c
-    else if (hr <= hrr * 0.84 + minhr) {if (subZoneLast!=7) {subZoneLast=7; getZone(subZoneLast);}} // Z4a
-    else if (hr <= hrr * 0.87 + minhr) {if (subZoneLast!=8) {subZoneLast=8; getZone(subZoneLast);}} // Z4b
-    else if (hr <= hrr * 0.90 + minhr) {if (subZoneLast!=9) {subZoneLast=9; getZone(subZoneLast);}} // Z4c
-    else if (hr <= hrr * 0.94 + minhr) {if (subZoneLast!=10) {subZoneLast=10; getZone(subZoneLast);}} // Z5a
-    else if (hr <= hrr * 0.96 + minhr) {if (subZoneLast!=11) {subZoneLast=11; getZone(subZoneLast);}} // Z5b
-    else if (hr <= hrr * 0.98 + minhr) {if (subZoneLast!=12) {subZoneLast=12; getZone(subZoneLast);}} // Z5c
-    else if (hr >= maxhr - 2) {subZoneLast=13; g.clear();getZoneAlert();} // Alert
-  }
-  
-  function initDraw() {
-    drawArrows();
-    if (hr!=0) updateUI(true); else {drawWaitHR(); drawBgArc();}
-    //drawZones();
-  }
+function stop(){
+  if (karvonenInterval) clearInterval(karvonenInterval);
+  karvonenInterval = undefined;
+  if (pulseTimeout) clearTimeout(pulseTimeout);
+  pulseTimeout = undefined;
+  if (gpsTimeout) clearTimeout(gpsTimeout);
+  gpsTimeout = undefined;
+  if (waitTimeout) clearTimeout(waitTimeout);
+  waitTimeout = undefined;
+  Bangle.removeListener("lock", drawLockIndicator);
+  Bangle.removeListener("GPS", drawGpsIndicator);
+  Bangle.removeListener("HRM", drawPulseIndicator);
+  Bangle.removeListener("HRM", updateUI);
+  lastGps = undefined;
+  wu.show();
+}
 
-  let hrLast;
-  //h = 0; // Used to force hr update via web ui console field to trigger draws, together with `if (h!=0) hr = h;` below.
-  function updateUI(resetHrLast) { // Update UI, only draw if warranted by change in HR.
-    hrLast = resetHrLast?0:hr; // Handles correct updating on init depending on if we've got HRM readings yet or not.
-    hr = exsHrmStats.getValue();
-    //if (h!=0) hr = h;
-    if (hr!=hrLast) {
-      drawHR();
-      drawZones();
-    } //g.setColor(g.theme.fg).drawLine(175/2,0,175/2,175).drawLine(0,175/2,175,175/2); // Used to align UI elements.
-  }
-  
-  initDraw();
-
-  // check for updates every second.
-  karvonenInterval = setInterval(function() {
-    if (!isMenuDisplayed && karvonenActive) updateUI();
-  }, 1000);
-
-  return karvonenInterval;
-})
+exports.start = start;
+exports.stop = stop;
\ No newline at end of file
diff --git a/apps/runplus/metadata.json b/apps/runplus/metadata.json
index 109cfbf99..fe59050db 100644
--- a/apps/runplus/metadata.json
+++ b/apps/runplus/metadata.json
@@ -1,12 +1,15 @@
 {
   "id": "runplus",
   "name": "Run+",
-  "version": "0.23",
-  "description": "Displays distance, time, steps, cadence, pace and more for runners. Based on the Run app, but extended with additional screen for heart rate interval training.",
+  "version": "0.27",
+  "description": "Displays distance, time, steps, cadence, pace and more for runners. Based on the Run app, but extended with additional screens for heart rate interval training and individual stat focus.",
   "icon": "app.png",
   "tags": "run,running,fitness,outdoors,gps,karvonen,karvonnen",
   "supports": ["BANGLEJS2"],
-  "screenshots": [{"url": "screenshot.png"}],
+  "screenshots": [
+    {"url": "screenshot.png"},
+    {"url": "karvonen.png"}
+  ],
   "readme": "README.md",
   "storage": [
     {"name": "runplus.app.js", "url": "app.js"},
diff --git a/apps/runplus/settings.js b/apps/runplus/settings.js
index 539391a27..77343d6b3 100644
--- a/apps/runplus/settings.js
+++ b/apps/runplus/settings.js
@@ -17,6 +17,7 @@
     B5: "step",
     B6: "caden",
     paceLength: 1000, // TODO: Default to either 1km or 1mi based on locale
+    alwaysResume: false,
     notify: {
       dist: {
         increment: 0,
@@ -72,6 +73,13 @@
         saveSettings();
       }
     };
+  menu[/*LANG*/"Always resume run"] = {
+    value : settings.alwaysResume,
+    onchange : v => {
+      settings.alwaysResume = v;
+      saveSettings();
+    },
+  };
   var notificationsMenu = {
     '< Back': function() { E.showMenu(menu) },
   }
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index 98cedd5ad..1b385c8ea 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -25,3 +25,5 @@
 0.22: Dated event repeat option
 0.23: Allow buzzing forever when an alarm fires
 0.24: Emit alarmReload when alarms change (used by widalarm)
+0.25: Fix wrap around when snoozed through midnight
+0.26: Fix hitting snooze on an alarm after when the snooze would've fired
diff --git a/apps/sched/lib.js b/apps/sched/lib.js
index 02b27e1f8..13cce1ef2 100644
--- a/apps/sched/lib.js
+++ b/apps/sched/lib.js
@@ -4,6 +4,7 @@ exports.getAlarms = function() {
 };
 // Write a list of alarms back to storage
 exports.setAlarms = function(alarms) {
+  alarms.forEach(e => e.t %= 86400000); // Also fix #3281 from other apps, e.g. multitimer
   return require("Storage").writeJSON("sched.json",alarms);
 };
 // Return an alarm object based on ID
@@ -35,7 +36,7 @@ exports.setAlarm = function(id, alarm) {
     if (alarm.timer) { // if it's a timer, set the start time as a time from *now*
       var time = new Date();
       var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
-      alarm.t = currentTime + alarm.timer;
+      alarm.t = (currentTime + alarm.timer) % 86400000;
     }
     alarms.push(alarm);
   }
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index dba3bc160..be4dcdf33 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.24",
+  "version": "0.26",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",
diff --git a/apps/sched/sched.js b/apps/sched/sched.js
index 88d3b90cd..04cd38718 100644
--- a/apps/sched/sched.js
+++ b/apps/sched/sched.js
@@ -35,7 +35,10 @@ function showAlarm(alarm) {
       if (alarm.ot === undefined) {
         alarm.ot = alarm.t;
       }
-      alarm.t += settings.defaultSnoozeMillis;
+      let time = new Date();
+      let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
+      alarm.t = currentTime + settings.defaultSnoozeMillis;
+      alarm.t %= 86400000;
       Bangle.emit("alarmSnooze", alarm);
     } else {
       let del = alarm.del === undefined ? settings.defaultDeleteExpiredTimers : alarm.del;
diff --git a/apps/schoolCalendar/fullcalendar/main.js b/apps/schoolCalendar/fullcalendar/main.js
index 95650f472..a41e45c67 100644
--- a/apps/schoolCalendar/fullcalendar/main.js
+++ b/apps/schoolCalendar/fullcalendar/main.js
@@ -111,7 +111,7 @@ var FullCalendar = (function (exports) {
         ContextType.Provider = function () {
             var _this = this;
             var isNew = !this.getChildContext;
-            var children = origProvider.apply(this, arguments); // eslint-disable-line prefer-rest-params
+            var children = origProvider.apply(this, arguments);
             if (isNew) {
                 var subs_1 = [];
                 this.shouldComponentUpdate = function (_props) {
@@ -4688,14 +4688,14 @@ var FullCalendar = (function (exports) {
         var wrappedSuccess = function () {
             if (!isResolved) {
                 isResolved = true;
-                success.apply(this, arguments); // eslint-disable-line prefer-rest-params
+                success.apply(this, arguments);
             }
         };
         var wrappedFailure = function () {
             if (!isResolved) {
                 isResolved = true;
                 if (failure) {
-                    failure.apply(this, arguments); // eslint-disable-line prefer-rest-params
+                    failure.apply(this, arguments);
                 }
             }
         };
@@ -5008,7 +5008,7 @@ var FullCalendar = (function (exports) {
     var createPortal = FullCalendarVDom.createPortal;
     var flushToDom = FullCalendarVDom.flushToDom;
     var unmountComponentAtNode = FullCalendarVDom.unmountComponentAtNode;
-    /* eslint-enable */
+
 
     var ScrollResponder = /** @class */ (function () {
         function ScrollResponder(execFunc, emitter, scrollTime, scrollTimeReset) {
@@ -5085,7 +5085,7 @@ var FullCalendar = (function (exports) {
         }
         PureComponent.prototype.shouldComponentUpdate = function (nextProps, nextState) {
             if (this.debug) {
-                // eslint-disable-next-line no-console
+
                 console.log(getUnequalProps(nextProps, this.props), getUnequalProps(nextState, this.state));
             }
             return !compareObjs(this.props, nextProps, this.propEquality) ||
@@ -6613,7 +6613,7 @@ var FullCalendar = (function (exports) {
         var endMarker = framingRange.end;
         var instanceStarts = [];
         while (dayMarker < endMarker) {
-            var instanceStart 
+            var instanceStart
             // if everyday, or this particular day-of-week
             = void 0;
             // if everyday, or this particular day-of-week
@@ -11731,7 +11731,7 @@ var FullCalendar = (function (exports) {
             }
             dragging.emitter.on('pointerdown', this.handlePointerDown);
             dragging.emitter.on('dragstart', this.handleDragStart);
-            new ExternalElementDragging(dragging, settings.eventData); // eslint-disable-line no-new
+            new ExternalElementDragging(dragging, settings.eventData);
         }
         ExternalDraggable.prototype.destroy = function () {
             this.dragging.destroy();
@@ -11833,7 +11833,7 @@ var FullCalendar = (function (exports) {
             if (typeof settings.mirrorSelector === 'string') {
                 dragging.mirrorSelector = settings.mirrorSelector;
             }
-            new ExternalElementDragging(dragging, settings.eventData); // eslint-disable-line no-new
+            new ExternalElementDragging(dragging, settings.eventData);
         }
         ThirdPartyDraggable.prototype.destroy = function () {
             this.dragging.destroy();
@@ -13605,7 +13605,7 @@ var FullCalendar = (function (exports) {
             if (!slatCoords) {
                 return null;
             }
-            return segs.map(function (seg, i) { return (createElement(NowIndicatorRoot, { isAxis: false, date: date, 
+            return segs.map(function (seg, i) { return (createElement(NowIndicatorRoot, { isAxis: false, date: date,
                 // key doesn't matter. will only ever be one
                 key: i }, function (rootElRef, classNames, innerElRef, innerContent) { return (createElement("div", { ref: rootElRef, className: ['fc-timegrid-now-indicator-line'].concat(classNames).join(' '), style: { top: slatCoords.computeDateTop(seg.start, date) } }, innerContent)); })); });
         };
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 7b9513595..5993656b0 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -80,3 +80,4 @@ of 'Select Clock'
 0.69: Add option to wake on double tap
 0.70: Fix load() typo
 0.71: Minor code improvements
+0.72: Add setting for configuring BLE privacy
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 43c7797a7..a50aba27e 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.71",
+  "version": "0.72",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 99a8971fb..3a3f53469 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -159,6 +159,8 @@ function showAlertsMenu() {
 function showBLEMenu() {
   var hidV = [false, "kbmedia", "kb", "com", "joy"];
   var hidN = [/*LANG*/"Off", /*LANG*/"Kbrd & Media", /*LANG*/"Kbrd", /*LANG*/"Kbrd & Mouse", /*LANG*/"Joystick"];
+  var privacy = [/*LANG*/"Off", /*LANG*/"Show name", /*LANG*/"Hide name"];
+
   E.showMenu({
     '': { 'title': /*LANG*/'Bluetooth' },
     '< Back': ()=>showMainMenu(),
@@ -177,6 +179,32 @@ function showBLEMenu() {
         updateSettings();
       }
     },
+    /*LANG*/'Privacy': {
+      min: 0, max: privacy.length-1,
+      format: v => privacy[v],
+      value: (() => {
+        // settings.bleprivacy may be some custom object, but we ignore that for now
+        if (settings.bleprivacy && settings.blename === false) return 2;
+        if (settings.bleprivacy) return 1;
+        return 0;
+      })(),
+      onchange: v => {
+        settings.bleprivacy = 0;
+        delete settings.blename;
+        switch (v) {
+          case 0:
+            break;
+          case 1:
+            settings.bleprivacy = 1;
+            break;
+          case 2:
+            settings.bleprivacy = 1;
+            settings.blename = false;
+            break;
+        }
+        updateSettings();
+      }
+    },
     /*LANG*/'HID': {
       value: Math.max(0,0 | hidV.indexOf(settings.HID)),
       min: 0, max: hidN.length-1,
diff --git a/apps/sixths/ChangeLog b/apps/sixths/ChangeLog
index c70e1531a..08c4b83b0 100644
--- a/apps/sixths/ChangeLog
+++ b/apps/sixths/ChangeLog
@@ -1,3 +1,4 @@
 0.01: attempt to import
 0.02: better GPS support, adding altitude and temperature support
-0.03: Minor code improvements
+0.03: minor code improvements
+0.04: make height auto-calibration useful and slow ticks to save power
diff --git a/apps/sixths/metadata.json b/apps/sixths/metadata.json
index ee80be84d..91492fe1c 100644
--- a/apps/sixths/metadata.json
+++ b/apps/sixths/metadata.json
@@ -1,6 +1,6 @@
 { "id": "sixths",
   "name": "Sixth sense",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Clock for outdoor use with GPS support",
   "icon": "app.png",
   "readme": "README.md",
diff --git a/apps/sixths/sixths.app.js b/apps/sixths/sixths.app.js
index 098600072..00c83153f 100644
--- a/apps/sixths/sixths.app.js
+++ b/apps/sixths/sixths.app.js
@@ -1,4 +1,5 @@
 // Sixth sense
+/* eslint-disable no-unused-vars */
 
 // Options you'll want to edit
 const rest_altitude = 354;
@@ -7,13 +8,13 @@ const geoid_to_sea_level = 0; // Maybe BangleJS2 already compensates?
 const W = g.getWidth();
 const H = g.getHeight();
 
-var cx = 100; cy = 105; sc = 70;
-temp = 0; alt = 0; bpm = 0;
+var cx = 100, cy = 105, sc = 70,
+temp = 0, alt = 0, bpm = 0;
 var buzz = "",      /* Set this to transmit morse via vibrations */
     inm = "", l = "", /* For incoming morse handling */
     in_str = "",
     note = "(NOTEHERE)",
-    debug = "v930", debug2 = "(otherdb)", debug3 = "(short)";
+    debug = "v1119", debug2 = "(otherdb)", debug3 = "(short)";
 var mode = 0, mode_time = 0; // 0 .. normal, 1 .. note, 2.. mark name
 var disp_mode = 0;  // 0 .. normal, 1 .. small time
 
@@ -30,29 +31,29 @@ var gps_dist = 0;
 var mark_heading = -1;
 
 // Is the human present?
-var is_active = false, last_active = getTime();
+var is_active = false, last_active = getTime() - 14*60, last_unlocked = getTime();
+var draw_dot = false;
 var is_level = false;
 
 // For altitude handling.
 var cur_altitude = 0;
-var cur_temperature = 0, alt_adjust = 0;
-var alt_adjust_mode = "";
+var cur_temperature = 0;
 
 // Marks
 var cur_mark = null;
 
 // Icons
 
-icon_alt = "\0\x08\x1a\1\x00\x00\x00\x20\x30\x78\x7C\xFE\xFF\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
-icon_m = "\0\x08\x1a\1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
-icon_km = "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
-icon_kph = "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\xFF\x00\xC3\xC3\xFF\xC3\xC3";
-icon_c = "\0\x08\x1a\1\x00\x00\x60\x90\x90\x60\x00\x7F\xFF\xC0\xC0\xC0\xC0\xC0\xFF\x7F\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+var icon_alt = "\0\x08\x1a\1\x00\x00\x00\x20\x30\x78\x7C\xFE\xFF\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
+var icon_m = "\0\x08\x1a\1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
+var icon_km = "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00";
+var icon_kph = "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\xFF\x00\xC3\xC3\xFF\xC3\xC3";
+var icon_c = "\0\x08\x1a\1\x00\x00\x60\x90\x90\x60\x00\x7F\xFF\xC0\xC0\xC0\xC0\xC0\xFF\x7F\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
 
 function toMorse(x) {
-  r = "";
+  var r = "";
   for (var i = 0; i < x.length; i++) {
-    c = x[i];
+    var c = x[i];
     if (c == " ") {
       r += " ";
       continue;
@@ -61,8 +62,15 @@ function toMorse(x) {
   }
   return r;
 }
+function doBuzz(s) {
+  if (buzz == "") {
+    buzz = s;
+    buzzTask();
+  } else
+    buzz += s;
+}
 function aload(s) {
-  buzz += toMorse(' E');
+  doBuzz(toMorse(' E'));
   load(s);
 }
 function gpsRestart() {
@@ -102,7 +110,7 @@ function fmtTimeDiff(d) {
 function gpsHandleFix(fix) {
   if (!prev_fix) {
     show("GPS acquired", 10);
-    buzz += " .";
+    doBuzz(" .");
     prev_fix = fix;
   }
   if (0) {
@@ -110,18 +118,15 @@ function gpsHandleFix(fix) {
     alt_adjust = cur_altitude - (fix.alt + geoid_to_sea_level);
     alt_adjust_mode = "g";
   }
-  if (1) {
-    debug = ""+fix.alt+"m "+alt_adjust;
-  }
   if (1) {
     let now1 = Date();
     let now2 = fix.time;
-    n1 = now1.getMinutes() * 60 + now1.getSeconds();
-    n2 = now2.getMinutes() * 60 + now2.getSeconds();
+    var n1 = now1.getMinutes() * 60 + now1.getSeconds();
+    var n2 = now2.getMinutes() * 60 + now2.getSeconds();
     debug2 = "te "+(n2-n1)+"s";
   }
   loggps(fix);
-  d = calcDistance(fix, prev_fix);
+  var d = calcDistance(fix, prev_fix);
   if (d > 30) {
     prev_fix = fix;
     gps_dist += d/1000;
@@ -130,7 +135,7 @@ function gpsHandleFix(fix) {
 function gpsHandle() {
   let msg = "";
   if (!last_restart) {
-      d = (getTime()-last_pause);
+      var d = (getTime()-last_pause);
       if (last_fix)
           msg = "PL"+ fmtTimeDiff(getTime()-last_fix);
       else
@@ -141,12 +146,12 @@ function gpsHandle() {
         gpsRestart();
       }
     } else {
-      fix = Bangle.getGPSFix();
+      var fix = Bangle.getGPSFix();
       if (fix && fix.fix && fix.lat) {
         gpsHandleFix(fix);
         msg = fix.speed.toFixed(1) + icon_kph;
         print("GPS FIX", msg);
-        
+
         if (!last_fstart)
           last_fstart = getTime();
         last_fix = getTime();
@@ -162,10 +167,10 @@ function gpsHandle() {
         }
       }
 
-      d = (getTime()-last_restart);
-      d2 = (getTime()-last_fstart);
+      var d = (getTime()-last_restart);
+      var d2 = (getTime()-last_fstart);
       print("gps on, restarted ", d, gps_needed, d2, fix.lat);
-      if (getTime() > gps_speed_limit && 
+      if (getTime() > gps_speed_limit &&
           (d > gps_needed || (last_fstart && d2 > 10))) {
         gpsPause();
         gps_needed = gps_needed * 1.5;
@@ -187,7 +192,7 @@ function markNew() {
 }
 function markHandle() {
   let m = cur_mark;
-  msg = m.name + ">" + fmtTimeDiff(getTime()- m.time);
+  var msg = m.name + ">" + fmtTimeDiff(getTime()- m.time);
   if (m.fix && m.fix.fix) {
     let s = fmtDist(calcDistance(m.fix, prev_fix)/1000) + icon_km;
     msg += " " + s;
@@ -201,7 +206,7 @@ function markHandle() {
 }
 function entryDone() {
   show(":" + in_str);
-  buzz += " .";
+  doBuzz(" .");
   switch (mode) {
   case 1: logstamp(">" + in_str); break;
   case 2: cur_mark.name = in_str; break;
@@ -227,18 +232,18 @@ function inputHandler(s) {
   switch(s) {
     case 'B':
       s = ' B';
-      bat = E.getBattery();
+      var bat = E.getBattery();
       if (bat > 45)
         s += 'E';
       else
         s = s+(bat/5);
-      buzz += toMorse(s);
+      doBuzz(toMorse(s));
       show("Bat "+bat+"%", 60);
       break;
     case 'F': gpsOff(); show("GPS off", 3); break;
     case 'G': gpsOn(); gps_limit = getTime() + 60*60*4; show("GPS on", 3); break;
     case 'I':
-      disp_mode += 1; 
+      disp_mode += 1;
       if (disp_mode == 2) {
         disp_mode = 0;
       }
@@ -250,13 +255,13 @@ function inputHandler(s) {
     case 'S': gpsOn(); gps_limit = getTime() + 60*30; gps_speed_limit = gps_limit; show("GPS on", 3); break;
     case 'T':
       s = ' T';
-      d = new Date();
+      var d = new Date();
       s += d.getHours() % 10;
       s += add0(d.getMinutes());
-      buzz += toMorse(s);
+      doBuzz(toMorse(s));
       break;
     case 'R': aload("run.app.js"); break;
-    case 'Y': buzz += " ."; Bangle.resetCompass(); break;
+    case 'Y': doBuzz(buzz); Bangle.resetCompass(); break;
   }
 }
 const morseDict = {
@@ -352,7 +357,7 @@ function touchHandler(d) {
   if (x > W/2 && y > H/2 && l != "-d") {
     inm = inm + "-";
     l = "-d";
-  } 
+  }
 
   //print(inm, "drag:", d);
 }
@@ -373,9 +378,9 @@ function loggps(fix) {
 }
 function hourly() {
   print("hourly");
-  s = ' T';
+  var s = ' T';
   if (is_active)
-    buzz += toMorse(s);
+    doBuzz(toMorse(s));
   logstamp("");
 }
 function show(msg, timeout) {
@@ -383,11 +388,11 @@ function show(msg, timeout) {
 }
 function fivemin() {
   print("fivemin");
-  s = ' B';
-  bat = E.getBattery();
+  var s = ' B';
+  var bat = E.getBattery();
   if (bat < 25) {
       if (is_active)
-        buzz += toMorse(s);
+        doBuzz(toMorse(s));
       show("Bat "+bat+"%", 60);
   }
   try {
@@ -397,7 +402,7 @@ function fivemin() {
   } catch (e) {
     print("Altimeter error", e);
   }
-   
+
 }
 function every(now) {
   if ((mode > 0) && (getTime() - mode_time > 10)) {
@@ -465,7 +470,7 @@ function drawDot(h, d, s) {
   g.fillCircle(x,y, 10);
 }
 function drawBackground() {
-  acc = Bangle.getAccel();
+  var acc = Bangle.getAccel();
   is_level = (acc.z < -0.95);
   if (is_level) {
     let obj = Bangle.getCompass();
@@ -486,12 +491,23 @@ function drawBackground() {
   }
 }
 function drawTime(now) {
-  if (disp_mode == 0) 
+  if (disp_mode == 0)
     g.setFont('Vector', 60);
   else
-    g.setFont('Vector', 26);  
+    g.setFont('Vector', 26);
   g.setFontAlign(1, 1);
-  g.drawString(now.getHours() + ":" + add0(now.getMinutes()), W, 90);
+  draw_dot = !draw_dot;
+  let dot = ":";
+  if (!draw_dot)
+    dot = ".";
+  g.drawString(now.getHours() + dot + add0(now.getMinutes()), W, 90);
+}
+function adjPressure(a) {
+  var o = Bangle.getOptions();
+  print(o);
+  o.seaLevelPressure = o.seaLevelPressure * m + a;
+  Bangle.setOptions(o);
+  var avr = [];
 }
 function draw() {
   if (disp_mode == 2) {
@@ -530,26 +546,36 @@ function draw() {
                + fmtSteps(Bangle.getHealthStatus("day").steps), 10, 115);
 
   g.drawString(msg, 10, 145);
-  
+
   if (getTime() - last_active > 15*60) {
-    alt_adjust = cur_altitude - rest_altitude;
-    alt_adjust_mode = "h";
-    msg = "H)" + fmtAlt(alt_adjust);
+    let alt_adjust = cur_altitude - rest_altitude;
+    let abs = Math.abs(alt_adjust);
+    print("adj", alt_adjust);
+    var o = Bangle.getOptions();
+    if (abs > 10 && abs < 150) {
+      let a = 0.01;
+      // FIXME: draw is called often compared to alt reading
+      if (cur_altitude > rest_altitude)
+        a = -a;
+      o.seaLevelPressure = o.seaLevelPressure + a;
+      Bangle.setOptions(o);
+    }
+    msg = o.seaLevelPressure.toFixed(1) + "hPa";
   } else {
-    msg = alt_adjust_mode+")"+fmtAlt(cur_altitude - alt_adjust);
+    msg = fmtAlt(cur_altitude);
   }
   msg = msg + " " + cur_temperature.toFixed(1)+icon_c;
   if (cur_mark) {
     msg = markHandle();
   }
   g.drawString(msg, 10, 175);
-  
+
   if (disp_mode == 1) {
     g.drawString(debug, 10, 45);
     g.drawString(debug2, 10, 65);
     g.drawString(debug3, 10, 85);
   }
-    
+
   queueDraw();
 }
 function draw_all() {
@@ -562,16 +588,16 @@ function draw_all() {
   let now = new Date();
   g.drawString(now.getHours() + ":" + add0(now.getMinutes()) + ":" + add0(now.getSeconds()), 10, 40);
 
-  acc = Bangle.getAccel();
+  var acc = Bangle.getAccel();
   let ax = 0 + acc.x, ay = 0.75 + acc.y, az = 0.75 + acc.y;
   let diff = ax * ax + ay * ay + az * az;
   diff = diff * 3;
   if (diff > 1)
     diff = 1;
 
-  co = Bangle.getCompass();
-  step = Bangle.getStepCount();
-  bat = E.getBattery();
+  var co = Bangle.getCompass();
+  var step = Bangle.getStepCount();
+  var bat = E.getBattery();
   Bangle.getPressure().then((x) => { alt = x.altitude; temp = x.temperature; },
                                  print);
 
@@ -609,22 +635,23 @@ function draw_all() {
   queueDraw();
 }
 function accelTask() {
-  tm = 100;
-  acc = Bangle.getAccel();
-  en = !Bangle.isLocked();
+  var tm = 100;
+  var acc = Bangle.getAccel();
+  var en = !Bangle.isLocked();
+  var msg;
   if (en && acc.z < -0.95) {
     msg = "Level";
-    buzz = ".-..";
+    doBuzz(".-..");
     tm = 3000;
   }
   if (en && acc.x < -0.80) {
     msg = "Down";
-    buzz = "-..";
+    doBuzz("-..");
     tm = 3000;
   }
   if (en && acc.x > 0.95) {
     msg = "Up";
-    buzz = "..-";
+    doBuzz("..-");
     tm = 3000;
   }
 
@@ -632,9 +659,9 @@ function accelTask() {
 }
 function buzzTask() {
   if (buzz != "") {
-    now = buzz[0];
+    var now = buzz[0];
     buzz = buzz.substring(1);
-    dot = 100;
+    var dot = 100;
     if (now == " ") {
       setTimeout(buzzTask, 300);
     } else if (now == ".") {
@@ -646,8 +673,7 @@ function buzzTask() {
     } else if (now == "/") {
       setTimeout(buzzTask, 6*dot);
     } else print("Unknown character -- ", now, buzz);
-  } else
-  setTimeout(buzzTask, 1000);
+  }
 }
 function aliveTask() {
   function cmp(s) {
@@ -666,26 +692,33 @@ function aliveTask() {
 
   setTimeout(aliveTask, 60000);
 }
-
-var drawTimeout;
+function lockHandler(locked) {
+  if (!locked) {
+    last_unlocked = getTime();
+    draw();
+  }
+}
 
 function queueDraw() {
-  if (drawTimeout) clearTimeout(drawTimeout);
-  if (0) // FIXME
+  if (getTime() - last_unlocked > 5*60)
     next = 60000;
   else
     next =  1000;
-  drawTimeout = setTimeout(function() {
-    drawTimeout = undefined;
-    draw();
-  }, next - (Date.now() % next));
-
+  setTimeout(draw, next - (Date.now() % next));
 }
 function start() {
+  g.reset();
+  Bangle.setUI({
+    mode : "clock"
+  });
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+
   Bangle.on("drag", touchHandler);
+  Bangle.on("lock", lockHandler);
   if (0)
     Bangle.on("accel", accelHandler);
-  if (1) {
+  if (0) {
     Bangle.setCompassPower(1, "sixths");
     Bangle.setBarometerPower(1, "sixths");
   }
@@ -705,12 +738,6 @@ function start() {
   }
 }
 
-g.reset();
-Bangle.setUI({
-    mode : "clock"
-});
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 let logfile = require("Storage").open("sixths.egt", "a");
 
 if (0) {
diff --git a/apps/sleeplog/ChangeLog b/apps/sleeplog/ChangeLog
index 7d2f147db..de0ce30cd 100644
--- a/apps/sleeplog/ChangeLog
+++ b/apps/sleeplog/ChangeLog
@@ -12,3 +12,5 @@
 0.14: Add "Delete all logfiles before" to interface.html, display all logfiles in the interface
 0.15: Issue newline before GB commands (solves issue with console.log and ignored commands)
 0.16: Only write logs if we have a non-empty log to write
+0.17: Minor code improvements
+0.18: Add back as a function to prevent translation making it a menu entry
diff --git a/apps/sleeplog/README.md b/apps/sleeplog/README.md
index 10468200e..824f6902f 100644
--- a/apps/sleeplog/README.md
+++ b/apps/sleeplog/README.md
@@ -65,6 +65,8 @@ Logfiles are not removed on un-/reinstall to prevent data loss.
       _30_ / _31_ / ... / __100__ / ... / _200_
     - __Light Sleep__ | light sleep threshold
       _100_ / _110_ / ... / __200__ / ... / _400_
+    - __Wear Temperature__ | Set the minimum measured temperature of the wearable to consider it being worn. Can be disabled to use the HRM instead to detect if it's being worn.
+      __Disabled__ / _20.0°C_ / _20.5°C_ / ... / _40.0°C_
     - __Reset to Default__ | reset to bold values above
   - __BreakToD__ | time of day to break view
     _0:00_ / _1:00_ / ... / __12:00__ / ... / _23:00_
diff --git a/apps/sleeplog/app.js b/apps/sleeplog/app.js
index c75bf1e4c..9055f1e0c 100644
--- a/apps/sleeplog/app.js
+++ b/apps/sleeplog/app.js
@@ -245,13 +245,13 @@ function draw() {
   g.reset();
   var imgStr = "";
   // check which icon to set
-  if (!global.sleeplog || sleeplog.conf.enabled !== true) {
+  if (!global.sleeplog || global.sleeplog.conf.enabled !== true) {
     // set color and disabled service icon
     g.setColor(1, 0, 0);
     imgStr = "FBSBAOAAfwAP+AH3wD4+B8Hw+A+fAH/gA/wAH4AB+AA/wAf+APnwHw+D4Hx8A++AH/AA/gAH";
-  } else if (sleeplog.debug) {
+  } else if (global.sleeplog.debug) {
     // set debugging icon
-    imgStr = typeof sleeplog.debug === "object" ?
+    imgStr = typeof global.sleeplog.debug === "object" ?
       "FBSBAB/4AQDAF+4BfvAX74F+CBf+gX/oFJKBf+gUkoF/6BSSgX/oFJ6Bf+gX/oF/6BAAgf/4" : // file
       "FBSBAP//+f/V///4AAGAABkAAZgAGcABjgAYcAGDgBhwAY4AGcABmH+ZB/mAABgAAYAAH///"; // console
   }
@@ -297,7 +297,7 @@ var ATID; //          analysis timeout ID
 var drawingID = 0; // drawing ID for ongoing process
 // get screen width and center (zero based)
 var width = g.getWidth() - 1;
-var center = width / 2 - 1;
+//var center = width / 2 - 1;
 
 // set areas and actions array
 var aaa = [
diff --git a/apps/sleeplog/boot.js b/apps/sleeplog/boot.js
index 53873ab29..d74db7357 100644
--- a/apps/sleeplog/boot.js
+++ b/apps/sleeplog/boot.js
@@ -13,18 +13,19 @@ global.sleeplog = {
     minConsec: 18E5, // [ms] minimal time to count for consecutive sleep
     deepTh: 100, //     threshold for deep sleep
     lightTh: 200, //    threshold for light sleep
+    wearTemp: 19.5, //    temperature threshold to count as worn
   }, require("Storage").readJSON("sleeplog.json", true) || {})
 };
 
 // check if service is enabled
-if (sleeplog.conf.enabled) {
+if (global.sleeplog.conf.enabled) {
   // assign functions to global object
   global.sleeplog = Object.assign({
     // define function to initialy start or restart the service
     start: function() {
       // add kill and health listener
-      E.on('kill', sleeplog.saveStatus);
-      Bangle.on('health', sleeplog.health);
+      E.on('kill', global.sleeplog.saveStatus);
+      Bangle.on('health', global.sleeplog.health);
 
       // restore saved status
       this.restoreStatus();
@@ -33,8 +34,8 @@ if (sleeplog.conf.enabled) {
     // define function to stop the service, it will be restarted on reload if enabled
     stop: function() {
       // remove all listeners
-      Bangle.removeListener('health', sleeplog.health);
-      E.removeListener('kill', sleeplog.saveStatus);
+      Bangle.removeListener('health', global.sleeplog.health);
+      E.removeListener('kill', global.sleeplog.saveStatus);
 
       // save active values
       this.saveStatus();
@@ -121,11 +122,11 @@ if (sleeplog.conf.enabled) {
       if (!global.sleeplog) return new Error("sleeplog: Can't save status, global object missing!");
 
       // check saveUpToDate is not set or forced
-      if (!sleeplog.info.saveUpToDate || force) {
+      if (!global.sleeplog.info.saveUpToDate || force) {
         // save status, consecutive status and info timestamps to restore on reload
-        var save = [sleeplog.info.lastCheck, sleeplog.info.awakeSince, sleeplog.info.asleepSince];
+        var save = [global.sleeplog.info.lastCheck, global.sleeplog.info.awakeSince, global.sleeplog.info.asleepSince];
         // add debuging status if active
-        if (sleeplog.debug) save.push(sleeplog.debug.writeUntil, sleeplog.debug.fileid);
+        if (global.sleeplog.debug) save.push(global.sleeplog.debug.writeUntil, global.sleeplog.debug.fileid);
 
         // stringify entries
         save = "," + save.map((entry, index) => {
@@ -134,8 +135,8 @@ if (sleeplog.conf.enabled) {
         }).join(",") + "\n";
 
         // add present status if forced
-        if (force) save = (sleeplog.info.lastChange / 6E5) + "," +
-          sleeplog.status + "," + sleeplog.consecutive + "\n" + save;
+        if (force) save = (global.sleeplog.info.lastChange / 6E5) + "," +
+          global.sleeplog.status + "," + global.sleeplog.consecutive + "\n" + save;
 
         // append saved data to StorageFile
         require("Storage").open("sleeplog.log", "a").write(save);
@@ -158,29 +159,33 @@ if (sleeplog.conf.enabled) {
       data.timestamp = data.timestamp || ((Date.now() / 6E5 | 0) - 1) * 6E5;
 
       // add preliminary status depending on charging and movement thresholds
+      // 1 = not worn, 2 = awake, 3 = light sleep, 4 = deep sleep
       data.status = Bangle.isCharging() ? 1 :
-        data.movement <= sleeplog.conf.deepTh ? 4 :
-        data.movement <= sleeplog.conf.lightTh ? 3 : 2;
+        data.movement <= global.sleeplog.conf.deepTh ? 4 :
+        data.movement <= global.sleeplog.conf.lightTh ? 3 : 2;
 
-      // check if changing to deep sleep from non sleepling
-      if (data.status === 4 && sleeplog.status <= 2) {
-        // check wearing status
-        sleeplog.checkIsWearing((isWearing, data) => {
+      // check if changing to deep sleep from non sleeping
+      if (data.status === 4 && global.sleeplog.status <= 2) {
+        global.sleeplog.checkIsWearing((isWearing, data) => {
           // correct status
           if (!isWearing) data.status = 1;
           // set status
-          sleeplog.setStatus(data);
+          global.sleeplog.setStatus(data);
         }, data);
       } else {
         // set status
-        sleeplog.setStatus(data);
+        global.sleeplog.setStatus(data);
       }
     },
 
-    // define function to check if the bangle is worn by using the hrm
+    // check wearing status either based on HRM or temperature as set in settings
     checkIsWearing: function(returnFn, data) {
+      if (this.conf.wearTemp !== 19.5) {
+        return returnFn(!Bangle.isCharging() && E.getTemperature() >= this.conf.wearTemp, data);
+      }
+
       // create a temporary object to store data and functions
-      global.tmpWearingCheck = {
+      const tmpWearingCheck = {
         // define temporary hrm listener function to read the wearing status
         hrmListener: hrm => tmpWearingCheck.isWearing = hrm.isWearing,
         // set default wearing status
@@ -190,22 +195,18 @@ if (sleeplog.conf.enabled) {
       // enable HRM
       Bangle.setHRMPower(true, "wearingCheck");
       // wait until HRM is initialised
-      setTimeout((returnFn, data) => {
+      setTimeout((returnFn, data, tmpWearingCheck) => {
         // add HRM listener
         Bangle.on('HRM-raw', tmpWearingCheck.hrmListener);
         // wait for two cycles (HRM working on 60Hz)
-        setTimeout((returnFn, data) => {
+        setTimeout((returnFn, data, tmpWearingCheck) => {
           // remove listener and disable HRM
           Bangle.removeListener('HRM-raw', tmpWearingCheck.hrmListener);
           Bangle.setHRMPower(false, "wearingCheck");
-          // cache wearing status
-          var isWearing = tmpWearingCheck.isWearing;
-          // clear temporary object
-          delete global.tmpWearingCheck;
           // call return function with status
-          returnFn(isWearing, data);
-        }, 34, returnFn, data);
-      }, 2500, returnFn, data);
+          returnFn(tmpWearingCheck.isWearing, data);
+        }, 34, returnFn, data, tmpWearingCheck);
+      }, 2500, returnFn, data, tmpWearingCheck);
     },
 
     // define function to set the status
@@ -356,7 +357,7 @@ if (sleeplog.conf.enabled) {
 
     // define trigger object
     trigger: {}
-  }, sleeplog);
+  }, global.sleeplog);
 
   // initial starting
   global.sleeplog.start();
diff --git a/apps/sleeplog/lib.js b/apps/sleeplog/lib.js
index 79d7db0d5..d3f3dddbe 100644
--- a/apps/sleeplog/lib.js
+++ b/apps/sleeplog/lib.js
@@ -3,7 +3,7 @@ exports = {
   // define en-/disable function, restarts the service to make changes take effect
   setEnabled: function(enable) {
     // stop if enabled
-    if (global.sleeplog && sleeplog.enabled) sleeplog.stop();
+    if (global.sleeplog && global.sleeplog.enabled) global.sleeplog.stop();
 
     // define settings filename
     var settings = "sleeplog.json";
@@ -138,7 +138,7 @@ exports = {
     }
 
     // define last index
-    var lastIndex = log.length - 1;
+    //var lastIndex = log.length - 1;
     // set timestamp of first entry to since if first entry before since
     if (log[0] && log[0][0] < since) log[0][0] = since;
     // add timestamp at now with unknown status if until after now
@@ -251,7 +251,7 @@ exports = {
     // set default date or correct date type if needed
     if (!date || !date.getDay) date = date ? new Date(date) : new Date();
     // set default ToD as set in sleeplog.conf or settings if available
-    if (ToD === undefined) ToD = (global.sleeplog && sleeplog.conf ? sleeplog.conf.breakToD :
+    if (ToD === undefined) ToD = (global.sleeplog && global.sleeplog.conf ? global.sleeplog.conf.breakToD :
       (require("Storage").readJSON("sleeplog.json", true) || {}).breakToD) || 12;
     // calculate last break time and return
     return new Date(date.getFullYear(), date.getMonth(), date.getDate(), ToD);
@@ -274,24 +274,24 @@ exports = {
 
     // check if nothing has to be changed
     if (!duration &&
-      (enable && sleeplog.debug === true) ||
-      (!enable && !sleeplog.debug)) return;
+      (enable && global.sleeplog.debug === true) ||
+      (!enable && !global.sleeplog.debug)) return;
 
     // check if en- or disable debugging
     if (enable) {
       // define debug object
-      sleeplog.debug = {};
+      global.sleeplog.debug = {};
 
       // check if a file should be generated
       if (typeof duration === "number") {
         // check duration boundaries, 0 => 8
         duration = duration > 96 ? 96 : duration || 12;
         // calculate and set writeUntil in 10min steps
-        sleeplog.debug.writeUntil = ((Date.now() / 6E5 | 0) + duration * 6) * 6E5;
+        global.sleeplog.debug.writeUntil = ((Date.now() / 6E5 | 0) + duration * 6) * 6E5;
         // set fileid to "{hours since 1970}"
-        sleeplog.debug.fileid = Date.now() / 36E5 | 0;
+        global.sleeplog.debug.fileid = Date.now() / 36E5 | 0;
         // write csv header on empty file
-        var file = require("Storage").open("sleeplog_" + sleeplog.debug.fileid + ".csv", "a");
+        var file = require("Storage").open("sleeplog_" + global.sleeplog.debug.fileid + ".csv", "a");
         if (!file.getLength()) file.write(
           "timestamp,movement,status,consecutive,asleepSince,awakeSince,bpm,bpmConfidence\n"
         );
@@ -299,21 +299,21 @@ exports = {
         file = undefined;
       } else {
         // set debug as active
-        sleeplog.debug = true;
+        global.sleeplog.debug = true;
       }
     } else {
       // disable debugging
-      delete sleeplog.debug;
+      delete global.sleeplog.debug;
     }
 
     // save status forced
-    sleeplog.saveStatus(true);
+    global.sleeplog.saveStatus(true);
   },
 
   // define debugging function, called after logging if debug is set
   debug: function(data) {
     // check if global variable accessable and debug active
-    if (!global.sleeplog || !sleeplog.debug) return;
+    if (!global.sleeplog || !global.sleeplog.debug) return;
 
     // set functions to convert timestamps
     function localTime(timestamp) {
@@ -328,10 +328,10 @@ exports = {
     var console = "sleeplog: " +
       localTime(data.timestamp) + " > " +
       "movement: " + ("" + data.movement).padStart(4) + ", " +
-      "unknown    ,non consec.,consecutive".split(",")[sleeplog.consecutive] + " " +
+      "unknown    ,non consec.,consecutive".split(",")[global.sleeplog.consecutive] + " " +
       "unknown,not worn,awake,light sleep,deep sleep".split(",")[data.status].padEnd(12) + ", " +
-      "asleep since: " + localTime(sleeplog.info.asleepSince) + ", " +
-      "awake since: " + localTime(sleeplog.info.awakeSince);
+      "asleep since: " + localTime(global.sleeplog.info.asleepSince) + ", " +
+      "awake since: " + localTime(global.sleeplog.info.awakeSince);
     // add bpm if set
     if (data.bpm) console += ", " +
       "bpm: " + ("" + data.bpm).padStart(3) + ", " +
@@ -340,24 +340,24 @@ exports = {
     print(console);
 
     // check if debug is set as object with a file id and it is not past writeUntil
-    if (typeof sleeplog.debug === "object" && sleeplog.debug.fileid &&
-      Date.now() < sleeplog.debug.writeUntil) {
+    if (typeof global.sleeplog.debug === "object" && global.sleeplog.debug.fileid &&
+      Date.now() < global.sleeplog.debug.writeUntil) {
       // generate next csv line
       var csv = [
         officeTime(data.timestamp),
         data.movement,
         data.status,
-        sleeplog.consecutive,
-        sleeplog.info.asleepSince ? officeTime(sleeplog.info.asleepSince) : "",
-        sleeplog.info.awakeSince ? officeTime(sleeplog.info.awakeSince) : "",
+        global.sleeplog.consecutive,
+        global.sleeplog.info.asleepSince ? officeTime(global.sleeplog.info.asleepSince) : "",
+        global.sleeplog.info.awakeSince ? officeTime(global.sleeplog.info.awakeSince) : "",
         data.bpm || "",
         data.bpmConfidence || ""
       ].join(",");
       // write next line to log if set
-      require("Storage").open("sleeplog_" + sleeplog.debug.fileid + ".csv", "a").write(csv + "\n");
+      require("Storage").open("sleeplog_" + global.sleeplog.debug.fileid + ".csv", "a").write(csv + "\n");
     } else {
       // clear file setting in debug
-      sleeplog.debug = true;
+      global.sleeplog.debug = true;
     }
 
   },
diff --git a/apps/sleeplog/metadata.json b/apps/sleeplog/metadata.json
index 212c47ff3..455900694 100644
--- a/apps/sleeplog/metadata.json
+++ b/apps/sleeplog/metadata.json
@@ -2,7 +2,7 @@
   "id":"sleeplog",
   "name":"Sleep Log",
   "shortName": "SleepLog",
-  "version": "0.16",
+  "version": "0.18",
   "description": "Log and view your sleeping habits. This app is using the built in movement calculation.",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/sleeplog/settings.js b/apps/sleeplog/settings.js
index 9bf37ed69..2d9da361f 100644
--- a/apps/sleeplog/settings.js
+++ b/apps/sleeplog/settings.js
@@ -13,6 +13,7 @@
     minConsec: 18E5, // [ms] minimal time to count for consecutive sleep
     deepTh: 100, //     threshold for deep sleep
     lightTh: 200, //    threshold for light sleep
+    wearTemp: 19.5, //    temperature threshold to count as worn
     // app settings
     breakToD: 12, //    [h] time of day when to start/end graphs
     appTimeout: 0 //   lock and backlight timeouts for the app
@@ -173,8 +174,8 @@
     }
 
     // get thresholds
-    var deepTh = global.sleeplog ? sleeplog.conf.deepTh : defaults.deepTh;
-    var lightTh = global.sleeplog ? sleeplog.conf.lightTh : defaults.lightTh;
+    var deepTh = global.sleeplog ? global.sleeplog.conf.deepTh : defaults.deepTh;
+    var lightTh = global.sleeplog ? global.sleeplog.conf.lightTh : defaults.lightTh;
     // set lowest movement displayed
     var minMove = deepTh - 20;
     // set start point
@@ -239,20 +240,20 @@
     // check if sleeplog is available
     if (global.sleeplog) {
       // get debug status, file and duration
-      var enabled = !!sleeplog.debug;
-      var file = typeof sleeplog.debug === "object";
+      var enabled = !!global.sleeplog.debug;
+      var file = typeof global.sleeplog.debug === "object";
       var duration = 0;
       // setup debugging menu
       var debugMenu = {
         "": {
-          title: /*LANG*/"Debugging"
-        },
-        /*LANG*/"< Back": () => {
-          // check if some value has changed
-          if (enabled !== !!sleeplog.debug || file !== (typeof sleeplog.debug === "object") || duration)
-            require("sleeplog").setDebug(enabled, file ? duration || 12 : undefined);
-          // redraw main menu
-          showMain(7);
+          title: /*LANG*/"Debugging",
+          back: () => {
+            // check if some value has changed
+            if (enabled !== !!global.sleeplog.debug || file !== (typeof global.sleeplog.debug === "object") || duration)
+              require("sleeplog").setDebug(enabled, file ? duration || 12 : undefined);
+            // redraw main menu
+            showMain(7);
+          }
         },
         /*LANG*/"View log": () => selectDebug(),
         /*LANG*/"Enable": {
@@ -264,7 +265,7 @@
           onchange: v => file = v
         },
         /*LANG*/"Duration": {
-          value: file ? (sleeplog.debug.writeUntil - Date.now()) / 36E5 | 0 : 12,
+          value: file ? (global.sleeplog.debug.writeUntil - Date.now()) / 36E5 | 0 : 12,
           min: 1,
           max: 96,
           wrap: true,
@@ -274,7 +275,7 @@
         /*LANG*/"Cancel": () => showMain(7),
       };
       // show menu
-      var menu = E.showMenu(debugMenu);
+      /*var menu =*/ E.showMenu(debugMenu);
     } else {
       // show error prompt
       E.showPrompt("Sleeplog" + /*LANG*/"not enabled!", {
@@ -289,12 +290,12 @@
   // show menu to change thresholds
   function showThresholds() {
     // setup logging menu
-    var menu;
+    //var menu;
     var thresholdsMenu = {
       "": {
-        title: /*LANG*/"Thresholds"
+        title: /*LANG*/"Thresholds",
+        back: () => showMain(2)
       },
-      /*LANG*/"< Back": () => showMain(2),
       /*LANG*/"Max Awake": {
         value: settings.maxAwake / 6E4,
         step: 10,
@@ -345,6 +346,19 @@
           writeSetting();
         }
       },
+      /*LANG*/"Wear Temperature": {
+        value: settings.wearTemp,
+        step: 0.5,
+        min: 19.5,
+        max: 40,
+        wrap: true,
+        noList: true,
+        format: v => v === 19.5 ? "Disabled" : v + "°C",
+        onchange: v => {
+          settings.wearTemp = v;
+          writeSetting();
+        }
+      },
       /*LANG*/"Reset to Default": () => {
         settings.maxAwake = defaults.maxAwake;
         settings.minConsec = defaults.minConsec;
@@ -363,9 +377,9 @@
         buttons: {
           /*LANG*/"Ok": 0
         }
-      }).then(() => menu = E.showMenu(thresholdsMenu));
+      }).then(() => /*menu =*/ E.showMenu(thresholdsMenu));
     } else {
-      menu = E.showMenu(thresholdsMenu);
+      /*menu =*/ E.showMenu(thresholdsMenu);
     }
   }
 
@@ -374,9 +388,9 @@
     // set debug image
     var debugImg = !global.sleeplog ?
       "FBSBAOAAfwAP+AH3wD4+B8Hw+A+fAH/gA/wAH4AB+AA/wAf+APnwHw+D4Hx8A++AH/AA/gAH" : // X
-      typeof sleeplog.debug === "object" ?
+      typeof global.sleeplog.debug === "object" ?
       "FBSBAB/4AQDAF+4BfvAX74F+CBf+gX/oFJKBf+gUkoF/6BSSgX/oFJ6Bf+gX/oF/6BAAgf/4" : // file
-      sleeplog.debug ?
+      global.sleeplog.debug ?
       "FBSBAP//+f/V///4AAGAABkAAZgAGcABjgAYcAGDgBhwAY4AGcABmH+ZB/mAABgAAYAAH///" : // console
       0; // off
     debugImg = debugImg ? "\0" + atob(debugImg) : false;
@@ -384,9 +398,9 @@
     var mainMenu = {
       "": {
         title: "Sleep Log",
+        back: back,
         selected: selected
       },
-      /*LANG*/"< Back": () => back(),
       /*LANG*/"Thresholds": () => showThresholds(),
       /*LANG*/"Break ToD": {
         value: settings.breakToD,
@@ -426,7 +440,7 @@
         onchange: () => setTimeout(showDebug, 10)
       }
     };
-    var menu = E.showMenu(mainMenu);
+    /*var menu =*/ E.showMenu(mainMenu);
   }
 
   // draw main menu
diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index d6e3cb30b..7dfd96bdd 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -19,3 +19,5 @@
       Add plot logged data to settings
 0.15: Convert Yes/No On/Off in settings to checkboxes
 0.16: Fix Keep alarm enabled inverted settings
+0.17: Fix handle dates saved as object with milliseconds
+0.18: Fix lint warnings
diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index 25ca7e781..a9580fd47 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -105,8 +105,8 @@ function drawApp() {
     }
 
     const period = drawSeconds ? 1000 : 60000;
-    if (this.drawTimeTimeout !== undefined) {
-      clearTimeout(this.drawTimeTimeout);
+    if (drawTimeTimeout !== undefined) {
+      clearTimeout(drawTimeTimeout);
     }
     drawTimeTimeout = setTimeout(()=>{
       drawTimeTimeout = undefined;
@@ -136,7 +136,7 @@ function buzz() {
 }
 
 function addLog(time, type) {
-  logs.push({time: time, type: type});
+  logs.push({time: time.toISOString(), type: type});
   if (logs.length > 1) { // Do not write if there is only one state
     require("Storage").writeJSON(CONFIGFILE, config);
   }
@@ -156,7 +156,7 @@ if (nextAlarmDate !== undefined) {
 
   // minimum alert 30 minutes early
   minAlarm.setTime(nextAlarmDate.getTime() - (30*60*1000));
-  run = () => {
+  let run = () => {
     layout.state.label = /*LANG*/"Start";
     layout.render();
     Bangle.setOptions({powerSave: false}); // do not dynamically change accelerometer poll interval
diff --git a/apps/sleepphasealarm/interface.html b/apps/sleepphasealarm/interface.html
index 9b2004904..da73ed9c4 100644
--- a/apps/sleepphasealarm/interface.html
+++ b/apps/sleepphasealarm/interface.html
@@ -35,7 +35,7 @@ function getData() {
     logs.forEach((log, i) => {
       const timeStr = log.filter(entry => entry.type === "alarm")[0]?.time;
       if (timeStr) {
-        const date = new Date(timeStr);
+        const date = new Date(typeof timeStr === 'string' ? timeStr : timeStr.ms);
         let option = document.createElement("option");
         option.text = date.toLocaleDateString();
         option.value = i;
@@ -89,10 +89,10 @@ function getData() {
 
     select.onchange = () => {
       const log = logs[select.value];
-      chart.data.labels = log.map(entry => new Date(entry.time));
+      chart.data.labels = log.map(entry => new Date(typeof entry.time === 'string' ? entry.time : entry.time.ms));
       chart.data.datasets[0].data = log.map(entry => yTicks.indexOf(entry.type));
       const timeStr = log.filter(entry => entry.type === "alarm")[0]?.time;
-      chart.data.datasets[0].label = new Date(timeStr).toLocaleDateString();
+      chart.data.datasets[0].label = new Date(typeof timeStr === 'string' ? timeStr : timeStr.ms).toLocaleDateString();
       chart.update();
     }
   });
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index aa69694ab..2ba003cf7 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.16",
+  "version": "0.18",
   "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.",
   "icon": "app.png",
   "tags": "tool,alarm",
diff --git a/apps/sleepphasealarm/settings.js b/apps/sleepphasealarm/settings.js
index e72d95e7f..f0661fc78 100644
--- a/apps/sleepphasealarm/settings.js
+++ b/apps/sleepphasealarm/settings.js
@@ -16,8 +16,8 @@
   function draw(log) {
     const step = 10*60*1000; // resolution 10min
     const yTicks = ["sleep", "awake", "alarm"];
-    const starttime = new Date(log[0].time);
-    const endtime = new Date(log[log.length-1].time);
+    const starttime = dateFromJson(log[0].time);
+    const endtime = dateFromJson(log[log.length-1].time);
 
     let logidx = 0;
     let curtime = starttime;
@@ -29,7 +29,7 @@
       if (logtime === undefined || curtime > logtime) {
         curval = yTicks.indexOf(log[logidx].type);
         logidx++;
-        logtime = new Date(log[logidx].time);
+        logtime = dateFromJson(log[logidx].time);
       }
 
       data[i++] = curval;
@@ -70,8 +70,8 @@
 
     const logs = config.logs.filter(log => log != null && log.filter(entry => entry.type === "alarm").length > 0);
     logs.sort(function(a, b) { // sort by alarm date desc
-      const adate = new Date(a.filter(entry => entry.type === "alarm")[0].time);
-      const bdate = new Date(b.filter(entry => entry.type === "alarm")[0].time);
+      const adate = dateFromJson(a.filter(entry => entry.type === "alarm")[0].time);
+      const bdate = dateFromJson(b.filter(entry => entry.type === "alarm")[0].time);
       return bdate - adate;
     });
 
@@ -79,12 +79,16 @@
     menu[""] = { title: /*LANG*/"Select day" };
     menu["< Back"] = () => settingsmenu();
     logs.forEach((log, i) => {
-      const date = new Date(log.filter(entry => entry.type === "alarm")[0].time);
+      const date = dateFromJson(log.filter(entry => entry.type === "alarm")[0].time);
       menu[require("locale").date(date, 1)] = () => { E.showMenu(); draw(log); };
     });
     E.showMenu(menu);
   }
 
+  function dateFromJson(o) {
+    return new Date(typeof o === 'string' ? o : o.ms);
+  }
+
   function settingsmenu() {
     // Show the menu
     E.showMenu({
diff --git a/apps/slpquiet/.eslintrc.json b/apps/slpquiet/.eslintrc.json
deleted file mode 100644
index 47db25057..000000000
--- a/apps/slpquiet/.eslintrc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "globals": {
-        "sleeplog": "readonly"
-    }
-}
diff --git a/apps/slpquiet/ChangeLog b/apps/slpquiet/ChangeLog
index 5560f00bc..3a4fdc392 100644
--- a/apps/slpquiet/ChangeLog
+++ b/apps/slpquiet/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: added check if settings file exists and create if missing
diff --git a/apps/slpquiet/README.md b/apps/slpquiet/README.md
index a1f2e94e1..673deef5d 100644
--- a/apps/slpquiet/README.md
+++ b/apps/slpquiet/README.md
@@ -25,3 +25,9 @@ It reuses the widget from [Quiet Mode Schedule and Widget](https://github.com/es
 -optimization of code (and check if needed)
 
 -feedback is always welcome
+
+#### Attributions
+The app icon is downloaded from [https://icons8.com](https://icons8.com).
+
+#### License
+[MIT License](LICENSE)
\ No newline at end of file
diff --git a/apps/slpquiet/app.js b/apps/slpquiet/app.js
index 1de61498b..0b03ba4fd 100644
--- a/apps/slpquiet/app.js
+++ b/apps/slpquiet/app.js
@@ -1,5 +1,16 @@
 const SETTINGS_FILE = "quietSwitch.json";
 const storage = require("Storage");
+
+//check if settings file exists and create if missing
+if (storage.read(SETTINGS_FILE)=== undefined) {
+  print("data file not existing, using defaults");
+  let saved = {
+    quietWhenSleep: 0, //off
+    quietMode: 1, //alerts
+  };
+  storage.writeJSON(SETTINGS_FILE,saved);
+}
+
 let saved = storage.readJSON(SETTINGS_FILE, 1) || {};
 
 // Main menu
diff --git a/apps/slpquiet/boot.js b/apps/slpquiet/boot.js
index 65d9340c0..0fae1d78c 100644
--- a/apps/slpquiet/boot.js
+++ b/apps/slpquiet/boot.js
@@ -2,7 +2,7 @@
 if (typeof (global.sleeplog || {}).trigger === "object") {
   // then add your parameters with the function to call as object into the trigger object
 
-  sleeplog.trigger["quietMode"] = {
+  global.sleeplog.trigger["quietMode"] = {
     onChange: true,   // false as default, if true call fn only on a status change
     from: 0,           // 0 as default, in ms, first time fn will be called
     //  to: 24*60*60*1000, // 24h as default, in ms, last time fn will be called
diff --git a/apps/slpquiet/metadata.json b/apps/slpquiet/metadata.json
index 342dbc5d5..79fe857b1 100644
--- a/apps/slpquiet/metadata.json
+++ b/apps/slpquiet/metadata.json
@@ -1,7 +1,7 @@
 { "id": "slpquiet",
   "name": "Sleep Quiet (activate quiet mode when asleep)",
   "shortName":"Sleep Quiet",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Set Quiet mode (or alarms only mode), when the sleep tracking app detects sleep (each 10 min evaluated)",
   "icon": "app.png",
   "tags": "tool,widget",
diff --git a/apps/taglaunch/ChangeLog b/apps/taglaunch/ChangeLog
index 6c36d39d5..ed415e847 100644
--- a/apps/taglaunch/ChangeLog
+++ b/apps/taglaunch/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Remove app from 'tool' when it has at least one other known tag
       Add tag 'health' for apps like Heart Rate Monitor
 0.04: Fix remove handler
+0.05: Make the "App source not found" warning less buggy
diff --git a/apps/taglaunch/app.js b/apps/taglaunch/app.js
index 9569cc7bd..a3481e159 100644
--- a/apps/taglaunch/app.js
+++ b/apps/taglaunch/app.js
@@ -106,8 +106,9 @@ let showTagMenu = (tag) => {
       let app = appsByTag[tag][i];
       if (!app) return;
       if (!app.src || require("Storage").read(app.src)===undefined) {
+        Bangle.setUI();
         E.showMessage(/*LANG*/"App Source\nNot found");
-        setTimeout(drawMenu, 2000);
+        setTimeout(showMainMenu, 2000);
       } else {
         load(app.src);
       }
diff --git a/apps/taglaunch/metadata.json b/apps/taglaunch/metadata.json
index a4fb4ef6c..1eb56e0a8 100644
--- a/apps/taglaunch/metadata.json
+++ b/apps/taglaunch/metadata.json
@@ -2,7 +2,7 @@
   "id": "taglaunch",
   "name": "Tag Launcher",
   "shortName": "Taglauncher",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Launcher that puts all applications into submenus based on their tag. With many applications installed this can result in a faster application selection than the linear access of the default launcher.",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/teatimer/ChangeLog b/apps/teatimer/ChangeLog
index cd2b03136..fcdcda875 100644
--- a/apps/teatimer/ChangeLog
+++ b/apps/teatimer/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Fix BG/FG Color if e.g. theme background is black
 0.04: Get time zone from settings for showing the clock
 0.05: Minor code improvements
+0.06: Adjust format of title, save counter before leaving help screen
diff --git a/apps/teatimer/README.md b/apps/teatimer/README.md
index 71bec3ea8..b7ece6022 100644
--- a/apps/teatimer/README.md
+++ b/apps/teatimer/README.md
@@ -1,6 +1,6 @@
 # Tea Timer app
 
-A simple timer. You can easyly set up the time. The initial time is 2:30
+A simple timer. You can easily set up the time. The initial time is 2:30
 
 On the first screen, you can
 - tap to get help
diff --git a/apps/teatimer/app.js b/apps/teatimer/app.js
index d9d2eb2b1..a22000342 100644
--- a/apps/teatimer/app.js
+++ b/apps/teatimer/app.js
@@ -18,7 +18,7 @@ E.setTimeZone(setting.timezone);
 
 // Title showing current time
 function appTitle() {
-  return "Tea Timer " + currentTime();
+  return "Tea Timer\n" + currentTime();
 }
 
 function currentTime() {
@@ -28,7 +28,7 @@ function currentTime() {
 }
 
 function timeFormated(sec) {
-  var min = Math.floor(sec / 60);
+  let min = Math.floor(sec / 60);
   sec = sec % 60;
   if (sec < 10) sec = "0" + sec;
   return min + ":" + sec;
@@ -223,6 +223,7 @@ function showHelp() {
   }
   // return to start
   else if (state == states.help) {
+    counterStart = counter;
     initTimer();
   }
 }
@@ -233,4 +234,4 @@ initDragEvents();
 Bangle.on('touch', function(button, xy) { showHelp(); });
 // event handling for button1
 setWatch(buttonPressed, BTN1, {repeat: true});
-initTimer();
+initTimer();
\ No newline at end of file
diff --git a/apps/teatimer/metadata.json b/apps/teatimer/metadata.json
index 4bc7452ee..4d4ddd9e4 100644
--- a/apps/teatimer/metadata.json
+++ b/apps/teatimer/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "teatimer",
   "name": "Tea Timer",
-  "version": "0.05",
-  "description": "A simple timer. You can easyly set up the time.",
+  "version": "0.06",
+  "description": "A simple timer. You can easily set up the time.",
   "icon": "teatimer.png",
   "type": "app",
   "tags": "tool",
diff --git a/apps/thmswtch/README.md b/apps/thmswtch/README.md
index 31e6aabe9..b30686e8f 100644
--- a/apps/thmswtch/README.md
+++ b/apps/thmswtch/README.md
@@ -33,3 +33,9 @@ The app functionality is inspired by the [Quiet Mode Schedule and Widget](https:
 -transfer of configuration into settings, so app can be used as a shortcut to switch theme.
 
 -feedback is always welcome
+
+#### Attributions
+The app icon is downloaded from [https://icons8.com](https://icons8.com).
+
+#### License
+[MIT License](LICENSE)
diff --git a/apps/timerclk/ChangeLog b/apps/timerclk/ChangeLog
index 4712a061d..509eaa639 100644
--- a/apps/timerclk/ChangeLog
+++ b/apps/timerclk/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps
 0.05: Improve responsiveness and detection of swipes on main clock screen
 0.06: Minor code improvements
+0.07: Fix regression in 0.06
diff --git a/apps/timerclk/alarm.js b/apps/timerclk/alarm.js
index 764e8ce1b..4acaa6cf0 100644
--- a/apps/timerclk/alarm.js
+++ b/apps/timerclk/alarm.js
@@ -18,7 +18,7 @@ var editIndex = 0;
 var drawInterval;
 var drawIntervalTimeout;
 var buttons;
-//var dragBorderHrsMins=0, dragBorderMinsSecs=0;
+var dragBorderHrsMins=0, dragBorderMinsSecs=0;
 
 function update() {
   if (drawInterval) clearInterval(drawInterval);
@@ -103,8 +103,8 @@ function draw() {
   else if (editIndex == 1) x = start + g.stringMetrics(timeStr[0]+":"+timeStr[1]+":"+timeStr[2]).width - markerPosChange;
   else x = 0;
   if (x) g.drawString("__", x, y);
-  //dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
-  //dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
+  dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
+  dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
 }
 
 if (all.length == 0) {
diff --git a/apps/timerclk/metadata.json b/apps/timerclk/metadata.json
index aef45f3fc..ae6968aca 100644
--- a/apps/timerclk/metadata.json
+++ b/apps/timerclk/metadata.json
@@ -2,7 +2,7 @@
 	"id": "timerclk",
 	"name": "Timer Clock",
 	"shortName":"Timer Clock",
-	"version": "0.06",
+	"version": "0.07",
 	"description": "A clock with stopwatches, timers and alarms build in.",
 	"icon": "app-icon.png",
 	"type": "clock",
diff --git a/apps/timerclk/timer.js b/apps/timerclk/timer.js
index 5ca2fba3e..25052e6ae 100644
--- a/apps/timerclk/timer.js
+++ b/apps/timerclk/timer.js
@@ -18,7 +18,7 @@ var editIndex = 0;
 var drawInterval;
 var drawIntervalTimeout;
 var buttons;
-//var dragBorderHrsMins=0, dragBorderMinsSecs=0;
+var dragBorderHrsMins=0, dragBorderMinsSecs=0;
 
 function update() {
   if (drawInterval) clearInterval(drawInterval);
@@ -128,8 +128,8 @@ function draw() {
   else if (editIndex == 1) x = start + g.stringMetrics(timeStr[0]+":"+timeStr[1]+":"+timeStr[2]).width - markerPosChange;
   else x = 0;
   if (x) g.drawString("__", x, y);
-  //dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
-  //dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
+  dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
+  dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
 }
 
 if (all.length == 0) {
diff --git a/apps/twenties/metadata.json b/apps/twenties/metadata.json
index b1dfe2134..dcbe0b565 100644
--- a/apps/twenties/metadata.json
+++ b/apps/twenties/metadata.json
@@ -6,7 +6,7 @@
   "description": "Buzzes every 20m to stand / sit and look 20ft away for 20s.",
   "icon": "app.png",
   "type": "bootloader",
-  "tags": "alarm,tool",
+  "tags": "alarm,tool,health",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [{ "name": "twenties.boot.js", "url": "boot.js" }]
diff --git a/apps/walkersclock/app.js b/apps/walkersclock/app.js
index 5b83bf583..f78be61ca 100644
--- a/apps/walkersclock/app.js
+++ b/apps/walkersclock/app.js
@@ -8,7 +8,7 @@
  *    - two function menus at present
  *      GPS Power   = On/Off
  *      GPS Display = Grid | Speed Alt
- *      when the modeline in CYAN use button BTN1 to switch between options 
+ *      when the modeline in CYAN use button BTN1 to switch between options
  *  - display the current steps if one of the steps widgets is installed
  *  - ensures that BTN2 requires a 1.5 second press in order to switch to the launcher
  *    this is so you dont accidently switch out of the GPS/watch display with you coat sleeve
@@ -65,14 +65,14 @@ let last_fix = {
   satellites: 0
 };
 
-function drawTime() {  
+function drawTime() {
   var d = new Date();
   var da = d.toString().split(" ");
   var time = da[4].substr(0,5);
 
   g.reset();
   g.clearRect(0,Y_TIME, 239, Y_ACTIVITY - 1);
-  
+
   g.setColor(1,1,1);  // white
   g.setFontAlign(0, -1);
 
@@ -83,7 +83,7 @@ function drawTime() {
   } else {
     g.setFont("Vector", 80);
   }
-  
+
   g.drawString(time, g.getWidth()/2, Y_TIME);
 }
 
@@ -93,19 +93,19 @@ function drawActivity() {
     clearActivityArea = true;
 
   prevSteps = steps;
-  
+
   if (clearActivityArea) {
     g.clearRect(0, Y_ACTIVITY, 239, Y_MODELINE - 1);
     clearActivityArea = false;
   }
-  
+
   if (!gpsPowerState) {
     g.setColor(0,255,0);  // green
     g.setFont("Vector", 60);
     g.drawString(getSteps(), g.getWidth()/2, Y_ACTIVITY);
     return;
   }
-  
+
   g.setFont("6x8", 3);
   g.setColor(1,1,1);
   g.setFontAlign(0, -1);
@@ -130,10 +130,10 @@ function drawActivity() {
     let ref = to_map_ref(6, os.easting, os.northing);
     let speed;
     let activityStr = "";
-    
+
     if (age < 0) age = 0;
     g.setFontVector(40);
-    g.setColor(0xFFC0); 
+    g.setColor(0xFFC0);
 
     switch(gpsDisplay) {
     case GDISP_OS:
@@ -146,7 +146,7 @@ function drawActivity() {
     case GDISP_SPEED:
       speed = last_fix.speed;
       speed = speed.toFixed(1);
-      activityStr = speed + "kph"; 
+      activityStr = speed + "kph";
       break;
     case GDISP_ALT:
       activityStr = last_fix.alt + "m";
@@ -159,7 +159,7 @@ function drawActivity() {
     g.clearRect(0, Y_ACTIVITY, 239, Y_MODELINE - 1);
     g.drawString(activityStr, 120, Y_ACTIVITY);
     g.setFont("6x8",2);
-    g.setColor(1,1,1); 
+    g.setColor(1,1,1);
     g.drawString(age, 120, Y_ACTIVITY + 46);
   }
 }
@@ -167,7 +167,7 @@ function drawActivity() {
 function onTick() {
   if (!Bangle.isLCDOn())
     return;
-  
+
   if (gpsPowerState) {
     drawAll();
     return;
@@ -226,7 +226,7 @@ function drawInfo() {
     drawModeLine(str,col);
     return;
   }
-  
+
   switch(infoMode) {
   case INFO_NONE:
     col = 0x0000;
@@ -239,7 +239,7 @@ function drawInfo() {
   default:
     str = "Battery: " + E.getBattery() + "%";
   }
-  
+
   drawModeLine(str,col);
 }
 
@@ -283,7 +283,7 @@ function changeInfoMode() {
     infoMode = INFO_NONE;
     clearActivityArea = true;
     return;
-    
+
   case FN_MODE_GDISP:
     switch (gpsDisplay) {
     case GDISP_OS:
@@ -304,7 +304,7 @@ function changeInfoMode() {
       break;
     }
   }
-  
+
   switch(infoMode) {
   case INFO_NONE:
     if (stepsWidget() !== undefined)
@@ -319,7 +319,7 @@ function changeInfoMode() {
   default:
     infoMode = INFO_NONE;
   }
-  
+
   clearActivityArea = true;
 }
 
@@ -351,7 +351,7 @@ function changeFunctionMode() {
       break;
     }
   }
-  
+
   infoMode = INFO_NONE; // function mode overrides info mode
 }
 
@@ -374,7 +374,7 @@ function processFix(fix) {
     gpsState = GPS_SATS;
     clearActivityArea = true;
   }
-  
+
   if (fix.fix) {
     if (!last_fix.fix) {
       if (!(require('Storage').readJSON('setting.json',1)||{}).quiet) {
@@ -401,7 +401,7 @@ function stepsWidget() {
   }
   return undefined;
 }
-  
+
 
 /*************     GPS  / OSREF Code **************************/
 
@@ -413,10 +413,10 @@ function formatTime(now) {
 function timeSince(t) {
   var hms = t.split(":");
   var now = new Date();
-  
+
   var sn = 3600*(now.getHours()) + 60*(now.getMinutes()) + 1*(now.getSeconds());
   var st = 3600*(hms[0]) + 60*(hms[1]) + 1*(hms[2]);
-  
+
   return (sn - st);
 }
 
@@ -483,7 +483,7 @@ OsGridRef.latLongToOsGrid = function(point) {
  *
  */
 function to_map_ref(digits, easting, northing) {
-  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`); // eslint-disable-line comma-spacing
+  if (![ 0,2,4,6,8,10,12,14,16 ].includes(Number(digits))) throw new RangeError(`invalid precision '${digits}'`);
 
   let e = easting;
   let n = northing;
diff --git a/apps/widChargingStatus/ChangeLog b/apps/widChargingStatus/ChangeLog
index 5a6db5cb7..8f13618aa 100644
--- a/apps/widChargingStatus/ChangeLog
+++ b/apps/widChargingStatus/ChangeLog
@@ -1,2 +1,4 @@
 0.01: First release.
 0.02: No functional changes, just moved codebase to Typescript.
+0.03: Also buzz on disconnect from charging
+0.04: Minor code improvements
diff --git a/apps/widChargingStatus/metadata.json b/apps/widChargingStatus/metadata.json
index 63a59fe41..0feca7b44 100644
--- a/apps/widChargingStatus/metadata.json
+++ b/apps/widChargingStatus/metadata.json
@@ -2,7 +2,7 @@
   "name": "Charging Status",
   "shortName":"ChargingStatus",
   "icon": "widget.png",
-  "version":"0.02",
+  "version": "0.04",
   "type": "widget",
   "description": "A simple widget that shows a yellow lightning icon to indicate whenever the watch is charging. This way one can see the charging status at a glance, no matter which battery widget is being used.",
   "tags": "widget",
diff --git a/apps/widChargingStatus/widget.js b/apps/widChargingStatus/widget.js
index 628fac043..873383cf8 100644
--- a/apps/widChargingStatus/widget.js
+++ b/apps/widChargingStatus/widget.js
@@ -10,19 +10,20 @@
             });
         }
     }
-    WIDGETS.chargingStatus = {
+    WIDGETS["chargingStatus"] = {
         area: 'tr',
         width: Bangle.isCharging() ? iconWidth : 0,
         draw: draw,
     };
     Bangle.on('charging', function (charging) {
-        var widget = WIDGETS.chargingStatus;
+        var widget = WIDGETS["chargingStatus"];
         if (widget) {
             if (charging) {
                 Bangle.buzz();
                 widget.width = iconWidth;
             }
             else {
+                Promise.resolve().then(function () { return require("buzz").pattern("..;"); });
                 widget.width = 0;
             }
             Bangle.drawWidgets();
diff --git a/apps/widChargingStatus/widget.ts b/apps/widChargingStatus/widget.ts
index a161d5408..db8f9a490 100644
--- a/apps/widChargingStatus/widget.ts
+++ b/apps/widChargingStatus/widget.ts
@@ -16,21 +16,20 @@
     }
   }
 
-  // @ts-ignore
-  WIDGETS.chargingStatus = {
+  WIDGETS["chargingStatus"] = {
     area: 'tr',
     width: Bangle.isCharging() ? iconWidth : 0,
     draw: draw,
   };
 
   Bangle.on('charging', (charging) => {
-    // @ts-ignore
-    const widget = WIDGETS.chargingStatus;
+    const widget = WIDGETS["chargingStatus"];
     if (widget) {
       if (charging) {
         Bangle.buzz();
         widget.width = iconWidth;
       } else {
+        Promise.resolve().then(() => require("buzz").pattern("..;"));
         widget.width = 0;
       }
       Bangle.drawWidgets(); // re-layout widgets
diff --git a/apps/widbata/widbata.wid.js b/apps/widbata/widbata.wid.js
index 16554057f..4ab6d76f1 100644
--- a/apps/widbata/widbata.wid.js
+++ b/apps/widbata/widbata.wid.js
@@ -5,7 +5,7 @@ Bangle.on('lcdPower', function(on) {
 WIDGETS["bata"]={area:"tr",sortorder:-10,width:27,draw:function() {
   var s = 26;
   var t = 13; // thickness
-  var x = this.x, y = this.y + 5;
+  var x = this.x, y = this.y + 3;
   g.reset();
   g.setColor(g.theme.fg);
   g.fillRect(x,y+2,x+s-4,y+2+t); // outer
diff --git a/apps/widbtstates/widget.js b/apps/widbtstates/widget.js
index e80da4082..105e4111d 100644
--- a/apps/widbtstates/widget.js
+++ b/apps/widbtstates/widget.js
@@ -17,12 +17,12 @@
     };
     var colours = (_a = {},
         _a[1] = {
-            false: "#fff",
+            false: "#000",
             true: "#fff",
         },
         _a[2] = {
-            false: "#0ff",
-            true: "#00f",
+            false: "#00f",
+            true: "#0ff",
         },
         _a);
     WIDGETS["bluetooth"] = {
diff --git a/apps/widbtstates/widget.ts b/apps/widbtstates/widget.ts
index 8f02c1b8c..40f50f627 100644
--- a/apps/widbtstates/widget.ts
+++ b/apps/widbtstates/widget.ts
@@ -30,12 +30,12 @@
 		}
 	} = {
 		[State.Active]: {
-			false: "#fff",
+			false: "#000",
 			true: "#fff",
 		},
 		[State.Connected]: {
-			false: "#0ff",
-			true: "#00f",
+			false: "#00f",
+			true: "#0ff",
 		},
 	};
 
diff --git a/apps/widdevst/ChangeLog b/apps/widdevst/ChangeLog
index cee46ac6a..e5caadb84 100644
--- a/apps/widdevst/ChangeLog
+++ b/apps/widdevst/ChangeLog
@@ -1,3 +1,5 @@
 0.01: First version
 0.02: Support for Bangle.js 2
 0.03: Update storage usage and perform GC every minute
+0.04: Add ability to only redraw when a peripheral state changes
+0.05: Adjust default (of previous change) to preserve original behaviour
diff --git a/apps/widdevst/README.md b/apps/widdevst/README.md
index 49affc78d..2ac3c8388 100644
--- a/apps/widdevst/README.md
+++ b/apps/widdevst/README.md
@@ -13,3 +13,7 @@ at fixed positions, and two bars
 - bottom to top: usage of RAM
 
 in green if below 50%, orange if between 50% and 80%, and red if above 80%.
+
+The widget will redraw more frequently when unlocked.
+
+It can be configured to avoid redrawing if all monitored peripherals are off, waiting until it hears from them (meaning you won't see regular RAM/Storage updates, but save battery by avoiding drawing). This can be configured by writing `{"redrawBars":0}` to `widdevst.settings.json`.
diff --git a/apps/widdevst/metadata.json b/apps/widdevst/metadata.json
index f2be2bec8..d9d39d005 100644
--- a/apps/widdevst/metadata.json
+++ b/apps/widdevst/metadata.json
@@ -1,6 +1,6 @@
 { "id": "widdevst",
   "name": "Device Status Widget",
-  "version": "0.03",
+  "version": "0.05",
   "description": "Shows power status of Bluetooth, Compass, GPS and Heart Rate Monitor as well as storage and memory usage.",
   "icon": "icon.png",
   "type": "widget",
@@ -9,5 +9,8 @@
   "readme": "README.md",
   "storage": [
     {"name": "widdevst.wid.js", "url": "wid.js"}
+  ],
+  "data":[
+    {"name": "widdevst.settings.json"}
   ]
 }
diff --git a/apps/widdevst/wid.js b/apps/widdevst/wid.js
index 3cd5758ab..1d1e8e2fc 100644
--- a/apps/widdevst/wid.js
+++ b/apps/widdevst/wid.js
@@ -1,9 +1,13 @@
 (() => {
   var stat = {date: 0};
+  var d = Date.now();
+  var settings = require("Storage").readJSON("widdevst.settings.json", 1)||{};
+  var redrawBars = "redrawBars" in settings ? settings.redrawBars : true;
+  delete settings;
 
   WIDGETS.devst = {area: "tr", width: 22, draw: function() {
+    d = Date.now();
     if (WIDGETS.devst._draw) return;
-    var d = new Date();
     var t;
     if ((d - stat.date) < 6e4) {
       t = process.memory(false);
@@ -20,12 +24,15 @@
     g.clearRect(x, y, x + 21, y + 23);
     g.drawRect(x + 2, y + 1, x + 20, y + 21);
     g.setFont('6x8', 1);
-    if (NRF.getSecurityStatus().connected) g.drawString('B', x + 5, y + 3);
-    if (Bangle.isCompassOn()) g.drawString('C', x + 13, y + 3);
-    if (Bangle.isGPSOn()) g.drawString('G', x + 5, y + 12);
-    if (Bangle.isHRMOn()) g.drawString('H', x + 13, y + 12);
+    var again = false;
+    if (NRF.getSecurityStatus().connected) g.drawString('B', x + 5, y + 3), again = true;
+    if (Bangle.isCompassOn()) g.drawString('C', x + 13, y + 3), again = true;
+    if (Bangle.isGPSOn()) g.drawString('G', x + 5, y + 12), again = true;
+    if (Bangle.isHRMOn()) g.drawString('H', x + 13, y + 12), again = true;
     g.setColor(col(stat.sto)); g.drawRect(x + 2, y + 21, x + 2 + stat.sto * 18, y + 22);
     g.setColor(col(t)); g.drawRect(x + 1, y + 21 - t * 20, x + 2, y + 21);
+    // if there's nothing active, don't queue a redraw (rely on Bangle.on(...) below)
+    if (redrawBars || again) setTimeout(draw, drawTime());
   }};
 
   function col(p) {
@@ -33,18 +40,13 @@
   }
 
   var draw = WIDGETS.devst.draw.bind(WIDGETS.devst);
-  var iid = setInterval(draw, Bangle.isLocked() ? 6e4 : 2e3);
 
-  Bangle.on('lcdPower', (on) => {
-    if (on) {
-      draw();
-      if (!iid) iid = setInterval(draw, Bangle.isLocked() ? 6e4 : 2e3);
-    } else if (iid) iid = clearInterval(iid);
-  });
-  Bangle.on('lock', (on) => {
-    if (iid) {
-      clearInterval(iid);
-      iid = setInterval(draw, on ? 6e4 : 2e3);
-    }
-  });
+  var drawTime = () => Bangle.isLocked() ? 6e4 : 2e3;
+  var throttledDraw = () => Date.now() - d > drawTime() && draw();
+
+  Bangle.on("HRM", throttledDraw);
+  Bangle.on("GPS", throttledDraw);
+  Bangle.on("mag", throttledDraw);
+  NRF.on("connect", throttledDraw);
+  draw();
 })();
diff --git a/apps/widdst/ChangeLog b/apps/widdst/ChangeLog
index d1ad50fe2..cedeaa5b4 100644
--- a/apps/widdst/ChangeLog
+++ b/apps/widdst/ChangeLog
@@ -2,4 +2,5 @@
 0.02: Checks for correct firmware; E.setDST(...) moved to boot.js
 0.03: Convert Yes/No On/Off in settings to checkboxes
 0.04: Give the boot file the highest priority to ensure it runs before sched (fix #2663)
-0.05: Tweaks to ensure Gadgetbridge can't overwrite timezone on 2v19.106 and later
\ No newline at end of file
+0.05: Tweaks to ensure Gadgetbridge can't overwrite timezone on 2v19.106 and later
+0.06: If fastload is present, ensure DST changes are still applied when leaving settings
diff --git a/apps/widdst/metadata.json b/apps/widdst/metadata.json
index 006e03416..495f06086 100644
--- a/apps/widdst/metadata.json
+++ b/apps/widdst/metadata.json
@@ -1,6 +1,6 @@
 { "id": "widdst",
   "name": "Daylight Saving",
-  "version":"0.05",
+  "version":"0.06",
   "description": "Widget to set daylight saving rules. Requires Espruino 2v15 or later - see the instructions below for more information.",
   "icon": "icon.png",
   "type": "widget",
diff --git a/apps/widdst/settings.js b/apps/widdst/settings.js
index 7363aa6bf..0017cc499 100644
--- a/apps/widdst/settings.js
+++ b/apps/widdst/settings.js
@@ -33,8 +33,11 @@
     at: 0
   };
 
+  var writtenSettings = false;
+
   function writeSettings() {
     require('Storage').writeJSON("widdst.json", settings);
+    writtenSettings = true;
   }
 
   function writeSubMenuSettings() {
@@ -136,7 +139,15 @@
     "": {
       "Title": /*LANG*/"Daylight Saving"
     },
-    "< Back": () => back(),
+    "< Back": () => {
+      if(writtenSettings && global._load){
+        // disable fastload to ensure settings are applied
+        // when we exit the settings app
+        global.load = global._load;
+        delete global._load;
+      }
+      back();
+    },
     /*LANG*/"Enabled": {
       value: !!settings.has_dst,
       onchange: v => {
diff --git a/apps/widhid/wid.ts b/apps/widhid/wid.ts
index 1de293b36..c92512959 100644
--- a/apps/widhid/wid.ts
+++ b/apps/widhid/wid.ts
@@ -4,7 +4,7 @@
 		console.log("widhid: can't enable, HID setting isn't \"kbmedia\"");
 		return;
 	}
-	// @ts-ignore
+	// @ts-expect-error espruino-specific delete
 	delete settings;
 
 	let anchor = {x:0,y:0};
@@ -128,7 +128,7 @@
 
 	if(connected)
 		Bangle.on("swipe", onSwipe);
-	// @ts-ignore
+	// @ts-expect-error espruino-specific delete
 	delete connected;
 
 	NRF.on("connect", () => {
diff --git a/apps/widmsggrid/ChangeLog b/apps/widmsggrid/ChangeLog
index 544b4ff4f..0573b9677 100644
--- a/apps/widmsggrid/ChangeLog
+++ b/apps/widmsggrid/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Use new message library
 0.04: Remove library stub
 0.05: Don't turn on LCD
+0.06: Don't draw outside of widget field
diff --git a/apps/widmsggrid/metadata.json b/apps/widmsggrid/metadata.json
index 015da533c..75b859c3b 100644
--- a/apps/widmsggrid/metadata.json
+++ b/apps/widmsggrid/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widmsggrid",
   "name": "Messages Grid Widget",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Widget that displays notification icons in a grid",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widmsggrid/widget.js b/apps/widmsggrid/widget.js
index c2f36a87d..dc444f782 100644
--- a/apps/widmsggrid/widget.js
+++ b/apps/widmsggrid/widget.js
@@ -52,7 +52,7 @@
       if (w.total > 1) {
         // show total number of messages in bottom-right corner
         g.reset();
-        if (w.total < 10) g.fillCircle(w.x + w.width - 5, w.y + 20, 4); // single digits get a round background, double digits fill their rectangle
+        if (w.total < 10) g.fillCircle(w.x + w.width - 5, w.y + 19, 4); // single digits get a round background, double digits fill their rectangle
         g.setColor(g.theme.bg).setBgColor(g.theme.fg)
           .setFont('6x8').setFontAlign(1, 1)
           .drawString(w.total, w.x + w.width - 1, w.y + 24, w.total > 9);
diff --git a/apps/wohrm/app.js b/apps/wohrm/app.js
index e32ab36ba..728c934ea 100644
--- a/apps/wohrm/app.js
+++ b/apps/wohrm/app.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+
 const Setter = {
   NONE: "none",
   UPPER: 'upper',
@@ -31,7 +31,7 @@ const upperLshape = isB1 ? {
   left: 210,
   bottom: 40,
   top: 210,
-  rectWidth: 30, 
+  rectWidth: 30,
   cornerRoundness: 5,
   orientation: -1,
   color: '#f00'
@@ -62,7 +62,7 @@ const centerBar = {
   minY: (upperLshape.bottom + upperLshape.top - (upperLshape.rectWidth*1.5))/2,
   maxY: (upperLshape.bottom + upperLshape.top + (upperLshape.rectWidth*1.5))/2,
   confidenceWidth: isB1 ? 10 : 8,
-  minX: isB1 ? 55 : upperLshape.rectWidth + 14, 
+  minX: isB1 ? 55 : upperLshape.rectWidth + 14,
   maxX: isB1 ? 165 : Bangle.appRect.x2 - upperLshape.rectWidth - 14
 };
 
diff --git a/apps/worldclock/ChangeLog b/apps/worldclock/ChangeLog
index 216ae40de..137d53151 100644
--- a/apps/worldclock/ChangeLog
+++ b/apps/worldclock/ChangeLog
@@ -6,3 +6,4 @@
       Fix rendering of single extra timezone on Bangle.js 2
 0.06: Minor code improvements
 0.07: Minor code improvements
+0.08: Add internationalisation of dates
\ No newline at end of file
diff --git a/apps/worldclock/app.js b/apps/worldclock/app.js
index 81ca7c37d..4207566ec 100644
--- a/apps/worldclock/app.js
+++ b/apps/worldclock/app.js
@@ -79,10 +79,6 @@ function queueDraw() {
   }, 60000 - (Date.now() % 60000));
 }
 
-function doublenum(x) {
-  return x < 10 ? "0" + x : "" + x;
-}
-
 function getCurrentTimeFromOffset(dt, offset) {
   return new Date(dt.getTime() + offset * 60 * 60 * 1000);
 }
@@ -90,7 +86,6 @@ function getCurrentTimeFromOffset(dt, offset) {
 function draw() {
   // get date
   var d = new Date();
-  var da = d.toString().split(" ");
 
   // default draw styles
   g.reset();
@@ -99,17 +94,17 @@ function draw() {
   g.setFontAlign(0, 0);
 
   // draw time
-  var time = da[4].substr(0, 5).split(":");
-  var hours = time[0],
-    minutes = time[1];
-
+  var time = require("locale").time(d, 1);
   g.setFont(font, primaryTimeFontSize);
-  g.drawString(`${hours}:${minutes}`, xyCenter, yposTime, true);
 
-  // draw Day, name of month, Date
-  var date = [da[0], da[1], da[2]].join(" ");
+  const fontHeight = g.getFontHeight();
+  g.clearRect(0, yposTime - fontHeight / 2, g.getWidth(), yposTime + fontHeight / 2);
+  g.drawString(`${time}`, xyCenter, yposTime, true);
+  var month = require("locale").month(d, 1);
+  var dayweek = require("locale").dow(d, 1)
+  var day = d.getDate();
+  var date = [dayweek, month, day].join(" ");
   g.setFont(font, primaryDateFontSize);
-
   g.drawString(date, xyCenter, yposDate, true);
 
   // set gmt to UTC+0
@@ -118,13 +113,12 @@ function draw() {
   // Loop through offset(s) and render
   offsets.forEach((offset, index) => {
     const dx = getCurrentTimeFromOffset(gmt, offset[OFFSET_HOURS]);
-    hours = doublenum(dx.getHours());
-    minutes = doublenum(dx.getMinutes());
+    var time = require("locale").time(dx, 1);
 
     if (offsets.length === 1) {
       // For a single secondary timezone, draw it bigger and drop time zone to second line
       g.setFont(font, secondaryTimeFontSize);
-      g.drawString(`${hours}:${minutes}`, xyCenter, yposTime2, true);
+      g.drawString(time, xyCenter, yposTime2, true);
       g.setFont(font, secondaryTimeZoneFontSize);
       g.drawString(offset[OFFSET_TIME_ZONE], xyCenter, yposTime2 + 30, true);
 
@@ -142,7 +136,7 @@ function draw() {
         true
       );
       g.setFontAlign(1, 0);
-      g.drawString(`${hours}:${minutes}`, xcol2, yposWorld + index * 15, true);
+      g.drawString(time, xcol2, yposWorld + index * 15, true);
     }
   });
 
diff --git a/apps/worldclock/metadata.json b/apps/worldclock/metadata.json
index 5b9605447..587c105af 100644
--- a/apps/worldclock/metadata.json
+++ b/apps/worldclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "worldclock",
   "name": "World Clock - 4 time zones",
   "shortName": "World Clock",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Current time zone plus up to four others",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot_world.png"}],
diff --git a/bin/bulk-update-apps.mjs b/bin/bulk-update-apps.mjs
index 92e084d8b..fda2fa283 100644
--- a/bin/bulk-update-apps.mjs
+++ b/bin/bulk-update-apps.mjs
@@ -12,7 +12,7 @@
  * node bin/bulk-update-apps.mjs GITHASH CHANGELOGMESSAGE
  *
  * Example command:
- * node bin/exempt-lint.mjs 29ced17i7 'Minor code improvements'
+ * node bin/bulk-update-apps.mjs 29ced17i7 'Minor code improvements'
  *
  * You can also run it in output mode like this:
  * node bin/bulk-update-apps.mjs GITHASH --output
diff --git a/bin/exempt-lint.mjs b/bin/exempt-lint.mjs
index 64d564e71..eb590a533 100755
--- a/bin/exempt-lint.mjs
+++ b/bin/exempt-lint.mjs
@@ -28,7 +28,7 @@ if (!lintRule) {
 
 const filePathInput = process.argv[3];
 const filePathMatch = filePathInput?.match(
-  /^(?:.*?\/apps\/|apps\/|\/)?(?<path>.*\.js)$/iu,
+  /^(?:.*?\/apps\/|apps\/|\/)?(?<path>.*\.[jt]s)$/iu,
 );
 const filePath = filePathMatch?.groups?.path;
 if (!filePath) {
diff --git a/bin/font_creator.js b/bin/font_creator.js
index c6781aa49..352c7ea24 100755
--- a/bin/font_creator.js
+++ b/bin/font_creator.js
@@ -41,10 +41,35 @@ let font = fontconverter.load({
   height : 16, // actual used height of font map
   range : charCodeRanges[charCodeRange].range
 });
+/*let font = fontconverter.load({
+  fn : "fontname.bdf",
+});*/
 font.removeUnifontPlaceholders();
 // quick hack as space looks too long
-font.glyphs[32].width -= 3;
-font.glyphs[32].xEnd -= 3;
-font.glyphs[32].advance -= 3;
-//font.debugChars();
-require("fs").writeFileSync(outputFile, Buffer.from(font.getPBF()));
\ No newline at end of file
+font.glyphs[32].width -= 4;
+font.glyphs[32].xEnd -= 4;
+font.glyphs[32].advance -= 4;
+
+/* Another hack - because these are centered in the image
+they often don't start at the beginning of the char space.
+Move them all back and add 1px at the end */
+font.glyphs.forEach(g => {
+  if (g.xStart>0) {
+    var shift = g.xStart;
+    g.xStart -= shift;
+    g.xEnd -= shift;
+    g.advance = g.xEnd+2;
+    g.oldGetPixel = g.getPixel;
+    g.getPixel = (x,y) => g.oldGetPixel(x+shift,y);
+    //g.debug();
+    //console.log(g);
+    console.log();
+  }
+});
+
+/*var g = font.glyphs[":".charCodeAt()];
+g.debug();
+console.log(g);*/
+font.debugChars();
+require("fs").writeFileSync(outputFile, Buffer.from(font.getPBF()));
+//console.log(font.getJS());
diff --git a/bin/runapptests.js b/bin/runapptests.js
index 40a898fa6..dcbf13c58 100755
--- a/bin/runapptests.js
+++ b/bin/runapptests.js
@@ -8,6 +8,8 @@ IT IS UNFINISHED
 It searches for `test.json` in each app's directory and will
 run them in sequence.
 
+The return code is the number of failed tests.
+
 TODO:
 
 * more code to test with
@@ -20,32 +22,54 @@ TODO:
 
 */
 
-// A simpletest
-/*var TEST = {
-  app : "android",
-  tests : [ {
-    steps : [
-      {t:"load", fn:"messagesgui.app.js"},
-      {t:"gb", "obj":{"t":"notify","id":1234,"src":"Twitter","title":"A Name","body":"message contents"}},
-      {t:"cmd", "js":"X='hello';"},
-      {t:"eval", "js":"X", eq:"hello"}
-    ]
-  }]
-};*/
-var TEST = {
-  app : "antonclk",
-  tests : [ {
-    steps : [
-      {t:"cmd", "js": "Bangle.loadWidgets()"},
-      {t:"cmd", "js": "eval(require('Storage').read('antonclk.app.js'))"},
-      {t:"cmd", "js":"Bangle.setUI()"}, // load and free
-      {t:"saveMemoryUsage"},
-      {t:"cmd", "js": "eval(require('Storage').read('antonclk.app.js'))"},
-      {t:"cmd", "js":"Bangle.setUI()"}, // load and free
-      {t:"checkMemoryUsage"}, // check memory usage is the same
-    ]
-  }]
+const DEMOAPP = {
+  "id":"demoappfortestformat",
+  "name":"demo",
+  "version":"0.01",
+  "type":"app",
+  "supports":["BANGLEJS2"],
+  "storage":[],
 };
+const DEMOTEST = {
+  "app" : "demoappfortestformat",
+  "setup" : [{
+    "id": "arbitraryid",
+    "steps" : [
+      {"t":"cmd", "js": "global.testfunction = ()=>{}", "text": "Runs some code on the device"},
+      {"t":"wrap", "fn": "global.testfunction", "id": "testfunc", text:"Wraps a function to count calls and store the last set of arguments on the device"}
+    ]
+  }],
+  "tests" : [{
+    "description": "Optional description of the test, will be shown in results table",
+    "steps" : [
+      {"t":"setup", "id": "arbitraryid", "text": "Calls a set of predefined steps"},
+      {"t":"eval", "js": "'test' + 'value'", "eq": "testvalue", "text": "Evals code on the device and compares the resulting string to the value in 'eq'"},
+//      {"t":"console", "text": "Starts an interactive console for debugging"},
+      {"t":"saveMemoryUsage", "text": "Gets and stores the current memory usage"},
+      {"t":"checkMemoryUsage", "text": "Checks the current memory to be equal to the stored value"},
+      {"t":"assert", "js": "0", "is":"falsy", "text": "Evaluates the content of 'js' on the device and asserts if the result is falsy"},
+      {"t":"assert", "js": "1", "is":"truthy", "text": "Evaluates the content of 'js' on the device and asserts if the result is truthy"},
+      {"t":"assert", "js": "false", "is":"false", "text": "Evaluates the content of 'js' on the device and asserts if the result is false"},
+      {"t":"assert", "js": "true", "is":"true", "text": "Evaluates the content of 'js' on the device and asserts if the result is true"},
+      {"t":"assert", "js": "()=>{}", "is":"function", "text": "Evaluates the content of 'js' and on the device and asserts if the result is a function"},
+      {"t":"assert", "js": "123", "is":"equal", "to": "123", "text": "Evaluates the content of 'js' and 'to' on the device and asserts if the result is equal"},
+      {"t":"assertArray", "js": "[]", "is":"undefinedOrEmpty", "text": "Evaluates the content of 'js' on the device and asserts if the result is undefined or an empty array"},
+      {"t":"assertArray", "js": "[1,2,3]", "is":"notEmpty", "text": "Evaluates the content of 'js' on the device and asserts if the result is an array with more than 0 entries"},
+      {"t":"cmd", "js": "global.testfunction(1)", "text": "Call function for the following asserts"},
+      {"t":"assertCall", "id": "testfunc", "argAsserts": [ { "t": "assert", "arg": "0", "is": "equal", "to": 1 } ] , "text": "Asserts if a wrapped function has been called with the expected arguments"},
+      {"t":"resetCall", "id": "testfunc", "text": "Reset the recorded calls"},
+      {"t":"assertCall", "id": "testfunc", "count": 0 , "text": "Asserts if a wrapped function has been called the expected number of times"}
+    ]
+  }, {
+    "description": "Emulator timers and intervals can advanced by a given time",
+    "steps": [
+      {"t":"cmd", "js":"setTimeout(()=>{global.waited = true},60000)", "text": "Set a timeout for 60 seconds"},
+      {"t":"assert", "js":"global.waited", "is": "falsy", "text": "Timeout has not yet fired"},
+      {"t":"advanceTimers", "ms":60000, "text": "Advance timers by 60000 ms to get the timer to fire in the next idle period"},
+      {"t":"assert", "js":"global.waited", "is": "true", "text": "Timeout has fired"}
+    ]
+  }]
+}
 
 var EMULATOR = "banglejs2";
 var DEVICEID = "BANGLEJS2";
@@ -62,6 +86,9 @@ if (!require("fs").existsSync(DIR_IDE)) {
   process.exit(1);
 }
 
+const verbose = process.argv.includes("--verbose") || process.argv.includes("-v");
+
+var AppInfo = require(BASE_DIR+"/core/js/appinfo.js");
 var apploader = require(BASE_DIR+"/core/lib/apploader.js");
 apploader.init({
   DEVICEID : DEVICEID
@@ -71,97 +98,412 @@ var emu = require(BASE_DIR+"/core/lib/emulator.js");
 // Last set of text received
 var lastTxt;
 
+function getSanitizedLastLine(){
+  return emu.getLastLine().replaceAll("\r", "");
+}
+
 function ERROR(s) {
   console.error(s);
   process.exit(1);
 }
 
-function runTest(test) {
+function getValue(js){
+  if(verbose)
+    console.log(`> GETTING VALUE FOR \`${js}\``);
+  emu.tx(`\x10print(JSON.stringify(${js}))\n`);
+  var result = getSanitizedLastLine();
+  
+  if (verbose)
+    console.log(`  GOT \`${result}\``);
+  return JSON.parse(result);
+}
+
+function assertArray(step){
+  console.log(`> ASSERT ARRAY ${step.js} IS`,step.is.toUpperCase(), step.text ? "- " + step.text : "");
+  let isOK;
+  switch (step.is.toLowerCase()){
+    case "notempty": isOK = getValue(`${step.js} && ${step.js}.length > 0`); break;
+    case "undefinedorempty": isOK = getValue(`!${step.js} || (${step.js} && ${step.js}.length === 0)`); break;
+  }
+
+  if (isOK) {
+    if (verbose)
+      console.log("> OK -", `\`${step.js}\``);
+  } else
+    console.log("> FAIL -", `\`${step.js}\``);
+  return isOK;
+}
+
+function assertValue(step){
+  console.log("> ASSERT " + `\`${step.js}\``, "IS", step.is.toUpperCase() + (step.to !== undefined ? " TO " + `\`${step.to}\`` : ""), step.text ? "- " + step.text : "");
+  let isOK;
+  switch (step.is.toLowerCase()){
+    case "truthy": isOK = getValue(`!!${step.js}`); break;
+    case "falsy": isOK = getValue(`!${step.js}`); break;
+    case "true": isOK = getValue(`${step.js} === true`); break;
+    case "false": isOK = getValue(`${step.js} === false`); break;
+    case "equal": isOK = getValue(`${step.js} == ${step.to}`); break;
+    case "function": isOK = getValue(`typeof ${step.js} === "function"`); break;
+  }
+
+  if (isOK){
+    if (verbose)
+      console.log("> OK - " + `\`${step.js}\``, "IS", step.is.toUpperCase(), step.to ? "TO " + `\`${step.js}\`` : "");
+  } else
+    console.log("> FAIL - " + `\`${step.js}\``, "IS", step.is.toUpperCase(), step.to ? "TO " + `\`${step.js}\`` : "");
+  return isOK;
+}
+
+function wrap(func, id){
+  console.log(`> WRAPPING \`${func}\` AS ${id}`);
+
+  let wrappingCode = `
+  if(!global.APPTESTS) global.APPTESTS={};
+  if(!global.APPTESTS.funcCalls) global.APPTESTS.funcCalls={};
+  if(!global.APPTESTS.funcArgs) global.APPTESTS.funcArgs={};
+  global.APPTESTS.funcCalls.${id}=0;
+  (function(o) {
+    ${func} = function() {
+      global.APPTESTS.funcCalls.${id}++;
+      global.APPTESTS.funcArgs.${id}=arguments;
+      return o.apply(this, arguments);
+    };
+  }(${func}));\n`;
+
+  emu.tx(wrappingCode);
+}
+
+function assertCall(step){
+  console.log("> ASSERT CALL", step.id, step.text ? "- " + step.text : "");
+  let isOK = true;
+  let id = step.id;
+  let args = step.argAsserts;
+  if (step.count !== undefined){
+    let calls = getValue(`global.APPTESTS.funcCalls.${id}`);
+    isOK = step.count == calls
+  }
+  if (args && args.length > 0){
+    let callArgs = getValue(`global.APPTESTS.funcArgs.${id}`);
+    for (let a of args){
+      let current = {
+        js: callArgs[a.arg],
+        is: a.is,
+        to: a.to,
+        text: step.text
+      };
+      switch(a.t){
+        case "assertArray":
+          isOK = isOK && assertArray(current);
+          break;
+        case "assert":
+          isOK = isOK && assertValue(current);
+          break;
+      }
+    }
+  }
+  if (isOK){
+    if (verbose)
+      console.log("OK - ASSERT CALL", step.text ? "- " + step.text : "");
+  } else
+    console.log("FAIL - ASSERT CALL", step.text ? "- " + step.text : "");
+  return isOK;
+}
+
+function runStep(step, subtest, test, state){
+  let p = Promise.resolve();
+  if (state.ok) switch(step.t) {
+    case "setup" :
+      test.setup.filter(e=>e.id==step.id)[0].steps.forEach(setupStep=>{
+        p = p.then(()=>{
+          let np = runStep(setupStep, subtest, test, state);
+          emu.idle();
+          return np;
+        });
+      });
+      break;
+    case "load" :
+      p = p.then(() => {
+        console.log(`> LOADING FILE "${step.fn}"`);
+        emu.tx(`load(${JSON.stringify(step.fn)})\n`);
+      });
+      break;
+    case "cmd" :
+      p = p.then(() => {
+        console.log(`> SENDING JS \`${step.js}\``, step.text ? "- " + step.text : "");
+        emu.tx(`${step.js}\n`);
+      });
+      break;
+    case "wrap" :
+      p = p.then(() => {
+        wrap(step.fn, step.id);
+      });
+      break;
+    case "gb" : 
+      p = p.then(() => {
+        let obj = Object.assign({
+          src:'Messenger',
+          t: 'notify',
+          type: 'text',
+          id: Date.now().toFixed(0),
+          title:'title',
+          body:'body'
+        }, step.obj || {});
+        console.log(`> GB with`, verbose ? "event " + JSON.stringify(obj, null, null) : "type " + obj.t);
+        emu.tx(`GB(${JSON.stringify(obj)})\n`);
+      });
+      break;
+    case "emit" :
+      p = p.then(() => {
+        let parent = step.parent ? step.parent : "Bangle";
+        if (!step.paramsArray) step.paramsArray = [];
+        let args = JSON.stringify([step.event].concat(step.paramsArray));
+        console.log(`> EMIT "${step.event}" on ${parent} with parameters ${JSON.stringify(step.paramsArray, null, null)}`);
+        
+        emu.tx(`${parent}.emit.apply(${parent}, ${args})\n`);
+      });
+      break;
+    case "eval" :
+      p = p.then(() => {
+        console.log(`> EVAL \`${step.js}\``);
+        emu.tx(`\x10print(JSON.stringify(${step.js}))\n`);
+        var result = getSanitizedLastLine();
+        var expected = JSON.stringify(step.eq);
+        if (verbose)
+          console.log("> GOT `"+result+"`");
+        if (result!=expected) {
+          console.log("> FAIL: EXPECTED "+expected);
+          state.ok = false;
+        } else if (verbose) {
+          console.log("> OK: EXPECTED "+expected);
+        }
+      });
+      break;
+      // tap/touch/drag/button press
+      // delay X milliseconds?
+    case "assertArray":
+      p = p.then(() => {
+        state.ok &= assertArray(step);
+      });
+      break;
+    case "resetCall":
+      console.log(`> RESET CALL ${step.id}`, step.text ? "- " + step.text : "");
+      emu.tx(`global.APPTESTS.funcCalls.${step.id} = 0;\n`);
+      emu.tx(`global.APPTESTS.funcArgs.${step.id} = undefined;\n`);
+      break;
+    case "assertCall":
+      p = p.then(() => {
+        state.ok &= assertCall(step);
+      });
+      break;
+    case "assert":
+      p = p.then(() => {
+        state.ok &= assertValue(step);
+      });
+      break;
+    case "screenshot" :
+      p = p.then(() => {
+        console.log(`> Compare screenshots - UNIMPLEMENTED`);
+      });
+      break;
+    case "saveMemoryUsage" :
+      p = p.then(() => {
+        emu.tx(`\x10print(process.memory().usage)\n`);
+        subtest.memUsage = parseInt(getSanitizedLastLine());
+        console.log("> SAVED MEMORY USAGE", subtest.memUsage);
+      });
+      break;
+    case "checkMemoryUsage" :
+      p = p.then(() => {
+        emu.tx(`\x10print(process.memory().usage)\n`);
+        var memUsage =  parseInt(getSanitizedLastLine());
+        console.log("> COMPARE MEMORY USAGE", memUsage);
+        if (subtest.memUsage != memUsage ) {
+          console.log("> FAIL: EXPECTED MEMORY USAGE OF "+subtest.memUsage);
+          state.ok = false;
+        }
+      });
+      break;
+    case "advanceTimers" :
+      p = p.then(()=>{
+        console.log("> ADVANCE TIMERS BY", step.ms + "ms");
+        emu.tx(`for(let c of global["\xff"].timers){
+          if(c) c.time -= ${step.ms * 1000};
+        }\n`);
+      });
+      break;
+    case "upload" :
+      p = p.then(()=>{
+        console.log("> UPLOADING" + (step.load ? " AND LOADING" : ""), step.file);
+        emu.tx(AppInfo.getFileUploadCommands(step.as, require("fs").readFileSync(BASE_DIR + "/" + step.file).toString()));
+        if (step.load){
+          emu.tx(`\x10load("${step.as}")\n`);
+        }
+      });
+      break;
+    case "console" :
+      p = p.then(()=>{
+        return new Promise(resolve => {
+          if (process.stdin.isTTY){
+            console.log("> STARTING INTERACTIVE CONSOLE");
+
+            let shutdownHandler = function (code) {
+              console.log(" STOPPING INTERACTIVE CONSOLE");
+              process.stdin.removeListener("readable", stdinlistener)
+              process.stdin.setRawMode(false);
+              handleRx = ()=>{};
+              handleConsoleOutput = handleConsoleOutputCurrent;
+              resolve();
+            }
+
+            let stdinlistener = () => {
+              while ((chunk = process.stdin.read()) !== null) {
+                if (chunk === '\x03') {
+                  shutdownHandler();
+                }
+                emu.tx(chunk.toString());
+              }
+            };
+
+            handleRx = (c) => {
+              process.stdout.write(String.fromCharCode(c));
+            }
+
+            let handleConsoleOutputCurrent = handleConsoleOutput;
+            handleConsoleOutput = () => {};
+
+            process.stdin.setRawMode(true);
+            process.stdin.setEncoding('ASCII');
+            process.stdin.on("readable", stdinlistener);
+
+            process.stdout.write(">");
+          } else {
+            console.log("> TERMINAL NEEDS TO BE A TTY FOR INTERACTIVE CONSOLE");
+            resolve();
+          }
+        })
+      });
+      break;
+    default: ERROR("Unknown step type "+step.t);
+  }
+  p = p.then(()=> {
+    emu.idle();
+  });
+  return p;
+}
+
+function runTest(test, testState) {
+  apploader.reset();
   var app = apploader.apps.find(a=>a.id==test.app);
   if (!app) ERROR(`App ${JSON.stringify(test.app)} not found`);
   if (app.custom) ERROR(`App ${JSON.stringify(appId)} requires HTML customisation`);
+  
   return apploader.getAppFilesString(app).then(command => {
-    // What about dependencies??
+    let p = Promise.resolve();
     test.tests.forEach((subtest,subtestIdx) => {
-      console.log(`==============================`);
-      console.log(`"${test.app}" Test ${subtestIdx}`);
-      console.log(`==============================`);
-      emu.factoryReset();
-      console.log("> Sending app "+test.app);
-      emu.tx(command);
-      console.log("> Sent app");
-      emu.tx("reset()\n");
-      console.log("> Reset.");
-      var ok = true;
+      let state = { ok: true};
+      p = p.then(()=>{
+        console.log(`==============================`);
+        console.log(`"${test.app}" Test ${subtestIdx}`);
+        if (test.description)
+          console.log(`"${test.description}`);
+        console.log(`==============================`);
+        emu.factoryReset();
+        console.log("> SENDING APP "+test.app);
+        emu.tx(command);
+        if (verbose)
+          console.log("> SENT APP");
+        emu.tx("reset()\n");
+        console.log("> RESET");
+
+      });
+
       subtest.steps.forEach(step => {
-        if (ok) switch(step.t) {
-          case "load" :
-            console.log(`> Loading file "${step.fn}"`);
-            emu.tx(`load(${JSON.stringify(step.fn)})\n`);
-            break;
-          case "cmd" :
-            console.log(`> Sending JS "${step.js}"`);
-            emu.tx(`${step.js}\n`);
-            break;
-          case "gb" : emu.tx(`GB(${JSON.stringify(step.obj)})\n`); break;
-          case "tap" : emu.tx(`Bangle.emit(...)\n`); break;
-          case "eval" :
-            console.log(`> Evaluate "${step.js}"`);
-            emu.tx(`\x10print(JSON.stringify(${step.js}))\n`);
-            var result = emu.getLastLine();
-            var expected = JSON.stringify(step.eq);
-            console.log("> GOT "+result);
-            if (result!=expected) {
-              console.log("> FAIL: EXPECTED "+expected);
-              ok = false;
-            }
-            break;
-            // tap/touch/drag/button press
-            // delay X milliseconds?
-          case "screenshot" :
-            console.log(`> Compare screenshots - UNIMPLEMENTED`);
-            break;
-          case "saveMemoryUsage" :
-            emu.tx(`\x10print(process.memory().usage)\n`);
-            subtest.memUsage = parseInt( emu.getLastLine());
-            console.log("> CURRENT MEMORY USAGE", subtest.memUsage);
-            break;
-          case "checkMemoryUsage" :
-            emu.tx(`\x10print(process.memory().usage)\n`);
-            var memUsage =  emu.getLastLine();
-            console.log("> CURRENT MEMORY USAGE", memUsage);
-            if (subtest.memUsage != memUsage ) {
-              console.log("> FAIL: EXPECTED MEMORY USAGE OF "+subtest.memUsage);
-              ok = false;
-            }
-            break;
-          default: ERROR("Unknown step type "+step.t);
-        }
-        emu.idle();
+        p = p.then(()=>{
+          return runStep(step, subtest, test, state).catch((e)=>{
+            console.log("> STEP FAILED:", e, step);
+            state.ok = false;
+          })
+        });
+      });
+
+      p = p.finally(()=>{
+        console.log("> RESULT -",  (state.ok ? "OK": "FAIL") , "- " + test.app + (subtest.description ? (" - " + subtest.description) : ""));
+        testState.push({
+          app: test.app,
+          number: subtestIdx,
+          result: state.ok ? "SUCCESS": "FAILURE",
+          description: subtest.description
+        });
       });
     });
-    emu.stopIdle();
+    p = p.then(()=>{
+      emu.stopIdle();
+    });
+    return p;
   });
 }
 
 
+let handleRx = ()=>{};
+let handleConsoleOutput = () => {};
+if (verbose){
+  handleConsoleOutput = (d) => {
+    console.log("<", d);
+  }
+}
+
+let testState = [];
+
 emu.init({
   EMULATOR : EMULATOR,
-  DEVICEID : DEVICEID
+  DEVICEID : DEVICEID,
+  rxCallback : (ch)=>{
+    handleRx(ch);
+  },
+  consoleOutputCallback: (d)=>{
+    handleConsoleOutput(d);
+  }
 }).then(function() {
   // Emulator is now loaded
   console.log("Loading tests");
-  var tests = [];
-  apploader.apps.forEach(app => {
-    var testFile = APP_DIR+"/"+app.id+"/test.json";
-    if (!require("fs").existsSync(testFile)) return;
-    var test = JSON.parse(require("fs").readFileSync(testFile).toString());
-    test.app = app.id;
-    tests.push(test);
+  let p = Promise.resolve();
+  let apps = apploader.apps;
+
+  apps.push(DEMOAPP);
+
+  if (process.argv.includes("--id")) {
+    let f = process.argv[process.argv.indexOf("--id") + 1];
+    apps = apps.filter(e=>e.id==f);
+    if (apps.length == 0){
+      console.log("No apps left after filtering for " + f);
+      process.exitCode(255);
+    }
+  }
+
+  apps.forEach(app => {
+    let test = DEMOTEST;
+    if (app.id != DEMOAPP.id){
+      let testFile = APP_DIR+"/"+app.id+"/test.json";
+      if (!require("fs").existsSync(testFile)) return;
+      test = JSON.parse(require("fs").readFileSync(testFile).toString());
+      test.app = app.id;
+    }
+    p = p.then(()=>{
+      return runTest(test, testState);
+    });
   });
-  // Running tests
-  runTest(TEST);
+  p.finally(()=>{
+    console.log("\n\n");
+    console.log("Overall results:");
+    console.table(testState);
+
+    process.exit(testState.reduce((a,c)=>{
+      return a || ((c.result == "SUCCESS") ? 0 : 1);
+    }, 0))
+  });
+  return p;
 });
+
 /*
   if (erroredApps.length) {
     erroredApps.forEach(app => {
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 3bb9a822a..041540606 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -19,6 +19,7 @@ try {
 var BASEDIR = __dirname+"/../";
 var APPSDIR_RELATIVE = "apps/";
 var APPSDIR = BASEDIR + APPSDIR_RELATIVE;
+var knownWarningCount = 0;
 var warningCount = 0;
 var errorCount = 0;
 function ERROR(msg, opt) {
@@ -32,10 +33,11 @@ function WARN(msg, opt) {
   opt = opt||{};
   if (KNOWN_WARNINGS.includes(msg)) {
     console.log(`Known warning : ${msg}`);
+    knownWarningCount++;
   } else {
     console.log(`::warning${Object.keys(opt).length?" ":""}${Object.keys(opt).map(k=>k+"="+opt[k]).join(",")}::${msg}`);
+    warningCount++;
   }
-  warningCount++;
 }
 
 var apps = [];
@@ -396,8 +398,11 @@ while(fileA=allFiles.pop()) {
 }
 
 console.log("==================================");
-console.log(`${errorCount} errors, ${warningCount} warnings`);
+console.log(`${errorCount} errors, ${warningCount} warnings (and ${knownWarningCount} known warnings)`);
 console.log("==================================");
 if (errorCount)  {
   process.exit(1);
+} else if ("CI" in process.env && warningCount) {
+  console.log("Running in CI, raising an error from warnings");
+  process.exit(1);
 }
diff --git a/bin/sync-lint-exemptions.mjs b/bin/sync-lint-exemptions.mjs
index ea7614b68..84e295da6 100755
--- a/bin/sync-lint-exemptions.mjs
+++ b/bin/sync-lint-exemptions.mjs
@@ -19,7 +19,7 @@ const exemptionsFilePath = "../apps/lint_exemptions.js";
 const exemptions = (await import(exemptionsFilePath)).default;
 
 for (const filePath of Object.keys(exemptions)) {
-  const fileContents = await fs.readFile(`apps/${filePath}`, "utf8");
+  const fileContents = await fs.readFile(filePath, "utf8");
   const currentHash = await hashContents(fileContents);
   if (exemptions[filePath].hash !== currentHash) {
     delete exemptions[filePath];
diff --git a/core b/core
index 0222d3c5a..1cdcb3405 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 0222d3c5ac608a1b842ffc1f1f79e19276d648fe
+Subproject commit 1cdcb3405f78ef35f231b9c3df501721bda75525
diff --git a/css/main.css b/css/main.css
index e8330b868..810b9a032 100644
--- a/css/main.css
+++ b/css/main.css
@@ -113,7 +113,7 @@ a.btn.btn-link.dropdown-toggle {
   font-size: 50%;
   color : #F66;
   position:relative;
-  top:-0.7em;
+  top:-0.8em;
 }
 .icon.icon-favourite-active span {
   color : white;
diff --git a/lang/da_DK.json b/lang/da_DK.json
index 59aea3068..16c3db065 100644
--- a/lang/da_DK.json
+++ b/lang/da_DK.json
@@ -155,9 +155,36 @@
         "Yes": "Ja",
         "Ok": "Ok",
         "Off": "Off",
-        "Back": "Tilbage"
+        "Back": "Tilbage",
+        "one": "et",
+        "two": "to",
+        "three": "tre",
+        "four": "fire",
+        "five": "fem",
+        "six": "seks",
+        "seven": "syv",
+        "eight": "otte",
+        "nine": "ni",
+        "ten": "ti",
+        "eleven": "elleve",
+        "twelve": "tolv"
     },
     "alarm": {
         "//": "App-specific overrides"
+    },
+    "fuzzyw": {
+        "//": "App-specific overrides",
+        "*$1 o'clock": "klokken *$1",
+        "five past *$1": "fem over *$1",
+        "ten past *$1": "ti over *$1",
+        "quarter past *$1": "kvart over *$1",
+        "twenty past *$1": "tyve over *$1",
+        "twenty five past *$1": "fem i halv *$2",
+        "half past *$1": "halv *$2",
+        "twenty five to *$2": "fem over halv *$2",
+        "twenty to *$2": "tyve i *$2",
+        "quarter to *$2": "kvart i *$2",
+        "ten to *$2": "ti i *$2",
+        "five to *$2": "fem i *$2"
     }
-}
\ No newline at end of file
+}
diff --git a/loader.js b/loader.js
index 81e3433d4..d63610ade 100644
--- a/loader.js
+++ b/loader.js
@@ -16,7 +16,7 @@ if (window.location.host=="banglejs.com") {
     'This is not the official Bangle.js App Loader - you can try the <a href="https://banglejs.com/apps/">Official Version</a> here.';
 }
 
-var RECOMMENDED_VERSION = "2v21";
+var RECOMMENDED_VERSION = "2v23";
 // could check http://www.espruino.com/json/BANGLEJS.json for this
 
 // We're only interested in Bangles
diff --git a/modules/.eslintrc.json b/modules/.eslintrc.json
deleted file mode 100644
index d656c2555..000000000
--- a/modules/.eslintrc.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-    "env": {
-        // TODO: "espruino": false
-        // TODO: "banglejs": false
-    },
-    "extends": "eslint:recommended",
-    "globals": {
-        // Methods and Fields at https://banglejs.com/reference
-        "Array": "readonly",
-        "ArrayBuffer": "readonly",
-        "ArrayBufferView": "readonly",
-        "Bangle": "readonly",
-        "BluetoothDevice": "readonly",
-        "BluetoothRemoteGATTCharacteristic": "readonly",
-        "BluetoothRemoteGATTServer": "readonly",
-        "BluetoothRemoteGATTService": "readonly",
-        "Boolean": "readonly",
-        "console": "readonly",
-        "DataView": "readonly",
-        "Date": "readonly",
-        "E": "readonly",
-        "Error": "readonly",
-        "Flash": "readonly",
-        "Float32Array": "readonly",
-        "Float64Array": "readonly",
-        "fs": "readonly",
-        "Function": "readonly",
-        "Graphics": "readonly",
-        "heatshrink": "readonly",
-        "I2C": "readonly",
-        "Int16Array": "readonly",
-        "Int32Array": "readonly",
-        "Int8Array": "readonly",
-        "InternalError": "readonly",
-        "JSON": "readonly",
-        "Math": "readonly",
-        "Modules": "readonly",
-        "NRF": "readonly",
-        "Number": "readonly",
-        "Object": "readonly",
-        "OneWire": "readonly",
-        "Pin": "readonly",
-        "process": "readonly",
-        "Promise": "readonly",
-        "ReferenceError": "readonly",
-        "RegExp": "readonly",
-        "Serial": "readonly",
-        "SPI": "readonly",
-        "Storage": "readonly",
-        "StorageFile": "readonly",
-        "String": "readonly",
-        "SyntaxError": "readonly",
-        "tensorflow": "readonly",
-        "TFMicroInterpreter": "readonly",
-        "TypeError": "readonly",
-        "Uint16Array": "readonly",
-        "Uint24Array": "readonly",
-        "Uint32Array": "readonly",
-        "Uint8Array": "readonly",
-        "Uint8ClampedArray": "readonly",
-        "Waveform": "readonly",
-        // Methods and Fields at https://banglejs.com/reference
-        "analogRead": "readonly",
-        "analogWrite": "readonly",
-        "arguments": "readonly",
-        "atob": "readonly",
-        "Bluetooth": "readonly",
-        "BTN": "readonly",
-        "BTN1": "readonly",
-        "BTN2": "readonly",
-        "BTN3": "readonly",
-        "BTN4": "readonly",
-        "BTN5": "readonly",
-        "btoa": "readonly",
-        "changeInterval": "readonly",
-        "clearInterval": "readonly",
-        "clearTimeout": "readonly",
-        "clearWatch": "readonly",
-        "decodeURIComponent": "readonly",
-        "digitalPulse": "readonly",
-        "digitalRead": "readonly",
-        "digitalWrite": "readonly",
-        "dump": "readonly",
-        "echo": "readonly",
-        "edit": "readonly",
-        "encodeURIComponent": "readonly",
-        "eval": "readonly",
-        "getPinMode": "readonly",
-        "getSerial": "readonly",
-        "getTime": "readonly",
-        "global": "readonly",
-        "HIGH": "readonly",
-        "I2C1": "readonly",
-        "Infinity": "readonly",
-        "isFinite": "readonly",
-        "isNaN": "readonly",
-        "LED": "readonly",
-        "LED1": "readonly",
-        "LED2": "readonly",
-        "load": "readonly",
-        "LoopbackA": "readonly",
-        "LoopbackB": "readonly",
-        "LOW": "readonly",
-        "NaN": "readonly",
-        "parseFloat": "readonly",
-        "parseInt": "readonly",
-        "peek16": "readonly",
-        "peek32": "readonly",
-        "peek8": "readonly",
-        "pinMode": "readonly",
-        "poke16": "readonly",
-        "poke32": "readonly",
-        "poke8": "readonly",
-        "print": "readonly",
-        "require": "readonly",
-        "reset": "readonly",
-        "save": "readonly",
-        "Serial1": "readonly",
-        "setBusyIndicator": "readonly",
-        "setInterval": "readonly",
-        "setSleepIndicator": "readonly",
-        "setTime": "readonly",
-        "setTimeout": "readonly",
-        "setWatch": "readonly",
-        "shiftOut": "readonly",
-        "SPI1": "readonly",
-        "Terminal": "readonly",
-        "trace": "readonly",
-        "VIBRATE": "readonly",
-        // Aliases and not defined at https://banglejs.com/reference
-        "g": "readonly",
-        "WIDGETS": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 11
-    },
-    "rules": {
-        "indent": [
-            "off",
-            2,
-            {
-                "SwitchCase": 1
-            }
-        ],
-        "no-case-declarations": "off",
-        "no-constant-condition": "off",
-        "no-delete-var": "off",
-        "no-empty": "off",
-        "no-global-assign": "off",
-        "no-inner-declarations": "off",
-        "no-octal": "off",
-        "no-prototype-builtins": "off",
-        "no-redeclare": "off",
-        "no-unreachable": "warn",
-        "no-cond-assign": "warn",
-        "no-useless-catch": "warn",
-        // TODO: "no-undef": "warn",
-        "no-undef": "off",
-        "no-unused-vars": "off",
-        "no-useless-escape": "off",
-        "no-control-regex" : "off"
-    }
-}
diff --git a/modules/ClockFace_menu.js b/modules/ClockFace_menu.js
index e78246f43..3a743b02a 100644
--- a/modules/ClockFace_menu.js
+++ b/modules/ClockFace_menu.js
@@ -26,7 +26,7 @@ exports.addItems = function(menu, callback, items) {
         };
         break;
 
-      case "hideWidgets":
+      case "hideWidgets": {
         let options = [/*LANG*/"Show",/*LANG*/"Hide"];
         if (process.env.HWVERSION===2) options.push(/*LANG*/"Swipe");
         menu[label] = {
@@ -35,6 +35,7 @@ exports.addItems = function(menu, callback, items) {
           format: v => options[v|0],
           onchange: v => callback(key, v),
         };
+      }
     }
   });
 };
diff --git a/modules/Layout.js b/modules/Layout.js
index 35b396c0e..0697b778b 100644
--- a/modules/Layout.js
+++ b/modules/Layout.js
@@ -186,7 +186,7 @@ Layout.prototype.render = function (l) {
         x+4,y+h-1,
         x,y+h-5,
         x,y+4
-      ], bg = l.bgCol!==undefined?l.bgCol:gfx.theme.bg,
+      ],
       btnborder = l.btnBorderCol!==undefined?l.btnBorderCol:gfx.theme.fg2,
       btnface = l.btnFaceCol!==undefined?l.btnFaceCol:gfx.theme.bg2;
     if(l.selected){
diff --git a/modules/Layout.md b/modules/Layout.md
index f9a858633..9a5eb6b81 100644
--- a/modules/Layout.md
+++ b/modules/Layout.md
@@ -82,6 +82,23 @@ Other functions:
 - `layout.debug(obj)` - draw outlines for objects on screen
 - `layout.clear(obj)` - clear the given object (you can also just specify `bgCol` to clear before each render)
 - `layout.forgetLazyState()` - if lazy rendering is enabled, makes the next call to `render()` perform a full re-render
+- `layout.setUI()` - Re-add any UI input handlers
+
+
+Using with `E.showMenu`/`E.showPrompt`/etc
+--------------------------------------
+
+When calling `E.showMenu` or anything that internally calls `Bangle.setUI` to set
+handlers for user input, any input handlers set by `layout` will get removed.
+
+To re-add them (and re-render the screen) you must call the following afterwards:
+
+```
+layout.setUI(); // re-add input handlers
+layout.forgetLazyState(); // if using lazy rendering, ensure we re-render everything
+layout.render(); // render screen
+```
+
 
 Links
 -----
diff --git a/modules/Slider.js b/modules/Slider.js
index 33bda1245..49ba56c26 100644
--- a/modules/Slider.js
+++ b/modules/Slider.js
@@ -125,6 +125,7 @@ exports.create = function(cb, conf) {
         if (o.v.timeoutID) {clearTimeout(o.v.timeoutID); o.v.timeoutID = undefined;}
         if (e.b==0 && !o.v.timeoutID && (o.c.timeout || o.c.timeout===0)) o.v.timeoutID = setTimeout(o.f.remove, 1000*o.c.timeout);
 
+        let cbObj;
         if (useMap && o.f.wasOnIndicator(o.v.exFirst)) { // If draging starts on the indicator, adjust one-to-one.
 
           let input = !o.c.horizontal?
@@ -134,7 +135,7 @@ exports.create = function(cb, conf) {
 
           o.v.level = Math.min(Math.max(input,0),o.c.steps);
 
-          o.v.cbObj = {mode:"map", value:o.v.level};
+          cbObj = {mode:"map", value:o.v.level};
 
         } else if (useIncr) { // Heavily inspired by "updown" mode of setUI.
 
@@ -149,16 +150,16 @@ exports.create = function(cb, conf) {
 
             o.v.level = Math.min(Math.max(o.v.level-incr,0),o.c.steps);
 
-            o.v.cbObj = {mode:"incr", value:incr};
+            cbObj = {mode:"incr", value:incr};
           }
         }
-        if (o.v.cbObj && (o.v.level!==o.v.prevLevel||o.v.level===0||o.v.level===o.c.steps)) {
-          cb(o.v.cbObj.mode, o.v.cbObj.value);
+        if (cbObj && (o.v.level!==o.v.prevLevel||o.v.level===0||o.v.level===o.c.steps||e.b===0)) {
+          cb(cbObj.mode, cbObj.value, e);
           o.f.draw&&o.f.draw(o.v.level);
         }
-        o.v.cbObj = null;
         o.v.prevLevel = o.v.level;
         o.v.ebLast = e.b;
+        if (e.b==0) o.v.dragActive = false;
       }
     };
 
diff --git a/modules/Slider.md b/modules/Slider.md
index eb2291d25..8e3571b5e 100644
--- a/modules/Slider.md
+++ b/modules/Slider.md
@@ -18,12 +18,16 @@ Bangle.on("drag", slider.f.dragSlider);
 // Bangle.prependListener("drag", slider.f.dragSlider);
 ```
 
-`callbackFunction` (`cb`) (first argument) determines what `slider` is used for. `slider` will pass two arguments, `mode` and `feedback` (`fb`), into `callbackFunction` (if `slider` is interactive or auto progressing). The different `mode`/`feedback` combinations to expect are:
+`callbackFunction` (`cb`) (first argument) determines what `slider` is used for. `slider` will pass three arguments, `mode`, `feedback` (`fb`) and (if fired from an input event) `event` (`e`), into `callbackFunction` (if `slider` is interactive or auto progressing). The different `mode`/`feedback` combinations to expect are:
 - `"map", o.v.level` | current level when interacting by mapping interface.
 - `"incr", incr` | where `incr` == +/-1, when interacting by incrementing interface.
 - `"remove", o.v.level` | last level when the slider times out.
 - `"auto", o.v.level` | when auto progressing.
 
+The event will be a drag, from the `Bangle.on('drag', ...)` event.
+
+The callback function will always be called for the "final" event, which is when the user lifts their finger from the screen. This can be detected by looking for `e.b == 0`.
+
 `configObject` (`conf`) (second argument, optional) has the following defaults:
 
 ```js
@@ -91,7 +95,7 @@ slider = require("Slider").create(()=>{}, {autoProgress:true})
       r: 22 }
    }
  }
-> 
+>
 ```
 Tips
 ----
diff --git a/modules/date_utils.js b/modules/date_utils.js
index 76ff0a393..a522a5cc1 100644
--- a/modules/date_utils.js
+++ b/modules/date_utils.js
@@ -34,7 +34,6 @@ exports.dow = (i, abbreviated) => {
  */
 exports.dows = (firstDayOfWeek, abbreviated) => {
   var dows = [];
-  var locale = require("locale");
   for (var i = 0; i < 7; i++) {
     dows.push(exports.dow(i + (firstDayOfWeek || 0), abbreviated))
   }
diff --git a/modules/exstats.js b/modules/exstats.js
index 403314ddf..5cd0374a7 100644
--- a/modules/exstats.js
+++ b/modules/exstats.js
@@ -49,8 +49,26 @@ var menu = { ... };
 ExStats.appendMenuItems(menu, settings, saveSettingsFunction);
 E.showMenu(menu);
 
+'options' can also include:
+
+ options = {
+   paceLength : meters to measure pace over
+   notify: {
+    dist: {
+      increment: 0 to not notify on distance milestones, otherwise the number of meters to notify after, repeating
+    },
+    step: {
+      increment: 0 to not notify on step milestones, otherwise the number of steps to notify after, repeating
+    },
+    time: {
+      increment: 0 to not notify on time milestones, otherwise the number of milliseconds to notify after, repeating
+    }
+   }
+ }
+
+
 // Additionally, if your app makes use of the stat notifications, you can display additional menu
-// settings for configuring when to notify (note the added line in the example below)W
+// settings for configuring when to notify (note the added line in the example below)
 
 var menu = { ... };
 ExStats.appendMenuItems(menu, settings, saveSettingsFunction);
@@ -76,21 +94,7 @@ var state = {
   // BPM // beats per minute
   // BPMage // how many seconds was BPM set?
   // maxBPM // The highest BPM reached while active
-  // Notifies: 0 for disabled, otherwise how often to notify in meters, seconds, or steps
-  notify: {
-      dist: {
-        increment: 0,
-        next: 0,
-      },
-      steps: {
-        increment: 0,
-        next: 0,
-      },
-      time: {
-        increment: 0,
-        next: 0,
-      },
-    },
+  // notify: { }, // Notifies: 0 for disabled, otherwise how often to notify in meters, seconds, or steps
 };
 // list of active stats (indexed by ID)
 var stats = {};
@@ -98,6 +102,7 @@ var stats = {};
 const DATA_FILE = "exstats.json";
 // Load the state from a saved file if there was one
 state = Object.assign(state, require("Storage").readJSON(DATA_FILE,1)||{});
+state.startSteps = Bangle.getStepCount()  - (state.lastSteps - state.startSteps);
 // force step history to a uint8array
 state.stepHistory = new Uint8Array(state.stepHistory);
 // when we exit, write the current state
@@ -209,27 +214,16 @@ exports.getList = function() {
   return l;
 };
 /** Instantiate the given list of statistic IDs (see comments at top)
- options = {
-   paceLength : meters to measure pace over
-   notify: {
-    dist: {
-      increment: 0 to not notify on distance milestones, otherwise the number of meters to notify after, repeating
-    },
-    step: {
-      increment: 0 to not notify on step milestones, otherwise the number of steps to notify after, repeating
-    },
-    time: {
-      increment: 0 to not notify on time milestones, otherwise the number of milliseconds to notify after, repeating
-    }
-   }
- }
 */
 exports.getStats = function(statIDs, options) {
   options = options||{};
   options.paceLength = options.paceLength||1000;
-  options.notify.dist.increment = (options.notify && options.notify.dist && options.notify.dist.increment)||0;
-  options.notify.step.increment = (options.notify && options.notify.step && options.notify.step.increment)||0;
-  options.notify.time.increment = (options.notify && options.notify.time && options.notify.time.increment)||0;
+  if (!options.notify) options.notify = {};
+  ["dist","step","time"].forEach(stat => {
+    if (!options.notify[stat]) options.notify[stat] = {};
+    options.notify[stat].increment = options.notify[stat].increment||0;
+  });
+  state.notify = options.notify;
   var needGPS,needHRM,needBaro;
   // ======================
   if (statIDs.includes("time")) {
@@ -361,15 +355,12 @@ exports.getStats = function(statIDs, options) {
     state.alt = undefined; // barometer altitude (meters)
     state.alti = 0; // integer ver of state.alt (to avoid repeated 'changed' notifications)
     state.notify = options.notify;
-    if (options.notify.dist.increment > 0) {
-      state.notify.dist.next = state.distance + options.notify.dist.increment;
-    }
-    if (options.notify.step.increment > 0) {
-      state.notify.step.next = state.startSteps + options.notify.step.increment;
-    }
-    if (options.notify.time.increment > 0) {
-      state.notify.time.next = state.startTime + options.notify.time.increment;
-    }
+    if (state.notify.dist.increment > 0)
+      state.notify.dist.next = state.distance + state.notify.dist.increment;
+    if (state.notify.step.increment > 0)
+      state.notify.step.next = state.startSteps + state.notify.step.increment;
+    if (state.notify.time.increment > 0)
+      state.notify.time.next = state.startTime + state.notify.time.increment;
   }
   if (!state.active) reset(); // we might already be active
   return {
diff --git a/modules/suncalc.js b/modules/suncalc.js
index fe17148e1..52f837fab 100644
--- a/modules/suncalc.js
+++ b/modules/suncalc.js
@@ -335,7 +335,7 @@ SunCalc.getMoonTimes = function (date, lat, lng, inUTC) {
 
 // export as Node module / AMD module / browser variable
 if (typeof exports === 'object' && typeof module !== 'undefined') module.exports = SunCalc;
-else if (typeof define === 'function' && define.amd) define(SunCalc);
-else window.SunCalc = SunCalc;
+//else if (typeof define === 'function' && define.amd) define(SunCalc);
+else globalThis.SunCalc = SunCalc;
 
 }());
diff --git a/modules/widget_utils.js b/modules/widget_utils.js
index 9d20e6803..4e2acd296 100644
--- a/modules/widget_utils.js
+++ b/modules/widget_utils.js
@@ -1,4 +1,4 @@
-/// hide any visible widgets
+exports.offset = 0;
 exports.hide = function() {
   exports.cleanup();
   if (!global.WIDGETS) return;
@@ -27,14 +27,12 @@ exports.show = function() {
   }
 };
 
-/// Remove any intervals/handlers/etc that we might have added. Does NOT re-show widgets that were hidden
-exports.cleanup = function() {
+/// Remove anything not needed if the overlay was removed
+exports.cleanupOverlay = function() {
+  exports.offset = -24;
+  Bangle.setLCDOverlay(undefined, {id: "widget_utils"});
   delete exports.autohide;
   delete Bangle.appRect;
-  if (exports.swipeHandler) {
-    Bangle.removeListener("swipe", exports.swipeHandler);
-    delete exports.swipeHandler;
-  }
   if (exports.animInterval) {
     clearInterval(exports.animInterval);
     delete exports.animInterval;
@@ -43,6 +41,16 @@ exports.cleanup = function() {
     clearTimeout(exports.hideTimeout);
     delete exports.hideTimeout;
   }
+};
+
+/// Remove any intervals/handlers/etc that we might have added. Does NOT re-show widgets that were hidden
+exports.cleanup = function() {
+  exports.cleanupOverlay();
+  delete exports.offset;
+  if (exports.swipeHandler) {
+    Bangle.removeListener("swipe", exports.swipeHandler);
+    delete exports.swipeHandler;
+  }
   if (exports.origDraw) {
     Bangle.drawWidgets = exports.origDraw;
     delete exports.origDraw;
@@ -78,13 +86,24 @@ exports.swipeOn = function(autohide) {
   };
   og.reset().clearRect(0,0,og.getWidth(),23).fillRect(0,24,og.getWidth(),25);
   let _g = g;
-  let offset = -24; // where on the screen are we? -24=hidden, 0=full visible
+  exports.offset = -24; // where on the screen are we? -24=hidden, 0=full visible
 
   function queueDraw() {
-    Bangle.appRect.y = offset+24;
-    Bangle.appRect.h = 1 + Bangle.appRect.y2 - Bangle.appRect.y;
-    if (offset>-24) Bangle.setLCDOverlay(og, 0, offset);
-    else Bangle.setLCDOverlay();
+    const o = exports.offset;
+    if (o>-24) {
+      Bangle.appRect.y = o+24;
+      Bangle.appRect.h = 1 + Bangle.appRect.y2 - Bangle.appRect.y;
+      if (o>-24) {
+        Bangle.setLCDOverlay(og, 0, o, {
+          id:"widget_utils",
+          remove:()=>{
+            require("widget_utils").cleanupOverlay();
+          }
+        });
+      } else {
+        Bangle.setLCDOverlay(undefined, {id: "widget_utils"});
+      }
+    }
   }
 
   for (var w of global.WIDGETS) if (!w._draw) { // already hidden
@@ -93,7 +112,7 @@ exports.swipeOn = function(autohide) {
       g=og;
       this._draw(this);
       g=_g;
-      if (offset>-24) queueDraw();
+      if (exports.offset>-24) queueDraw();
     };
     w._area = w.area;
     if (w.area.startsWith("b"))
@@ -110,14 +129,14 @@ exports.swipeOn = function(autohide) {
   function anim(dir, callback) {
     if (exports.animInterval) clearInterval(exports.animInterval);
     exports.animInterval = setInterval(function() {
-      offset += dir;
+      exports.offset += dir;
       let stop = false;
-      if (dir>0 && offset>=0) { // fully down
+      if (dir>0 && exports.offset>=0) { // fully down
         stop = true;
-        offset = 0;
-      } else if (dir<0 && offset<-23) { // fully up
+        exports.offset = 0;
+      } else if (dir<0 && exports.offset<-23) { // fully up
         stop = true;
-        offset = -24;
+        exports.offset = -24;
       }
       if (stop) {
         clearInterval(exports.animInterval);
@@ -139,9 +158,9 @@ exports.swipeOn = function(autohide) {
         anim(-4);
       }, exports.autohide);
     };
-    if (ud>0 && offset<0) anim(4, cb);
-    if (ud<0 && offset>-24) anim(-4);
+    if (ud>0 && exports.offset<0) anim(4, cb);
+    if (ud<0 && exports.offset>-24) anim(-4);
   };
   Bangle.on("swipe", exports.swipeHandler);
   Bangle.drawWidgets();
-};
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 839a96182..36589d9eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,8 @@
         "acorn": "^7.2.0"
       },
       "devDependencies": {
+        "@typescript-eslint/eslint-plugin": "^7.8.0",
+        "@typescript-eslint/parser": "^7.8.0",
         "eslint": "^8.57.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.1",
@@ -152,12 +154,283 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz",
+      "integrity": "sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/type-utils": "7.8.0",
+        "@typescript-eslint/utils": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.8.0.tgz",
+      "integrity": "sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz",
+      "integrity": "sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz",
+      "integrity": "sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "@typescript-eslint/utils": "7.8.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.8.0.tgz",
+      "integrity": "sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz",
+      "integrity": "sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.8.0.tgz",
+      "integrity": "sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.15",
+        "@types/semver": "^7.5.8",
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "semver": "^7.6.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz",
+      "integrity": "sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.8.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -284,6 +557,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/array.prototype.filter": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
@@ -448,12 +730,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -652,6 +934,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1081,6 +1375,34 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -1115,9 +1437,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -1162,9 +1484,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -1344,6 +1666,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -1924,6 +2266,40 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -2289,6 +2665,15 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -2680,6 +3065,15 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -2830,6 +3224,18 @@
         "nodetouch": "bin/nodetouch.js"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -2939,6 +3345,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -3061,6 +3481,12 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -3168,12 +3594,176 @@
         "fastq": "^1.6.0"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz",
+      "integrity": "sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/type-utils": "7.8.0",
+        "@typescript-eslint/utils": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+          "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.8.0.tgz",
+      "integrity": "sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz",
+      "integrity": "sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0"
+      }
+    },
+    "@typescript-eslint/type-utils": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz",
+      "integrity": "sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "@typescript-eslint/utils": "7.8.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.8.0.tgz",
+      "integrity": "sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz",
+      "integrity": "sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/visitor-keys": "7.8.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+          "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "semver": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+          "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.8.0.tgz",
+      "integrity": "sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.15",
+        "@types/semver": "^7.5.8",
+        "@typescript-eslint/scope-manager": "7.8.0",
+        "@typescript-eslint/types": "7.8.0",
+        "@typescript-eslint/typescript-estree": "7.8.0",
+        "semver": "^7.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+          "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz",
+      "integrity": "sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.8.0",
+        "eslint-visitor-keys": "^3.4.3"
+      }
+    },
     "@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -3264,6 +3854,12 @@
         "is-string": "^1.0.7"
       }
     },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
     "array.prototype.filter": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
@@ -3388,12 +3984,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "call-bind": {
@@ -3533,6 +4129,15 @@
         "object-keys": "^1.1.1"
       }
     },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -3871,6 +4476,30 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
+      }
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3902,9 +4531,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -3937,9 +4566,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
     "for-each": {
@@ -4053,6 +4682,20 @@
         "define-properties": "^1.1.3"
       }
     },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
     "gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -4462,6 +5105,31 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -4729,6 +5397,12 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
     "picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -4991,6 +5665,12 @@
         }
       }
     },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -5102,6 +5782,13 @@
         "nopt": "~1.0.10"
       }
     },
+    "ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "requires": {}
+    },
     "tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -5181,6 +5868,13 @@
         "possible-typed-array-names": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "dev": true,
+      "peer": true
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -5279,6 +5973,12 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index 3689750a6..57ecf5201 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "license": "MIT",
   "repository": "https://github.com/espruino/BangleApps",
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.1",
@@ -13,8 +15,10 @@
     "npm-watch": "^0.11.0"
   },
   "scripts": {
-    "lint-apps": "node bin/sync-lint-exemptions.mjs && eslint ./apps --ext .js",
-    "test": "node bin/sanitycheck.js && npm run lint-apps && eslint ./modules --ext .js",
+    "lint-apps": "node bin/sync-lint-exemptions.mjs && eslint --max-warnings 0 ./apps",
+    "lint-modules": "eslint --max-warnings 0 ./modules",
+    "test": "node bin/sanitycheck.js && npm run lint-apps && npm run lint-modules",
+    "fix": "eslint --fix ./apps ./modules",
     "update-local-apps": "./bin/create_apps_json.sh apps.local.json",
     "local": "npm-watch & npx http-server -a localhost -c-1",
     "start": "npx http-server -c-1"
diff --git a/tsconfig.json b/tsconfig.json
index 1158f887e..5d46f672c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,6 +11,8 @@
     // "checkJs": true,
     // "noEmit": true,
 
+    "ignoreDeprecations": "5.0",
+
     // code-gen
     "declaration": false,
     "emitDeclarationOnly": false,
@@ -59,7 +61,7 @@
     "*/*/*.ts",
     "apps/*/*.js", // with checkJs: true
     "*/*/*.d.ts",
-    "modules/*.d.ts",
+    "modules/*.ts",
     "typescript/types/*.d.ts"
   ]
 }
diff --git a/typescript/package-lock.json b/typescript/package-lock.json
index ea04825a9..d2e7d62bd 100644
--- a/typescript/package-lock.json
+++ b/typescript/package-lock.json
@@ -11,7 +11,7 @@
         "node-fetch": "^3.2.10"
       },
       "devDependencies": {
-        "typescript": "4.9.4"
+        "typescript": "^5.4.5"
       }
     },
     "node_modules/data-uri-to-buffer": {
@@ -91,16 +91,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/web-streams-polyfill": {
@@ -151,9 +151,9 @@
       }
     },
     "typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true
     },
     "web-streams-polyfill": {
diff --git a/typescript/package.json b/typescript/package.json
index f98aae1e3..e3531d6c8 100644
--- a/typescript/package.json
+++ b/typescript/package.json
@@ -4,7 +4,7 @@
   "author": "Sebastian Di Luzio <sebastian@diluz.io> (https://diluz.io), qucchia <qucchia0@gmail.com> (https://github.com/qucchia) and Rob Pilling (https://github.com/bobrippling)",
   "version": "0.0.1",
   "devDependencies": {
-    "typescript": "4.9.4"
+    "typescript": "^5.4.5"
   },
   "scripts": {
     "build": "tsc"
diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts
index 7f48cbf0a..d4082184a 100644
--- a/typescript/types/clock_info.d.ts
+++ b/typescript/types/clock_info.d.ts
@@ -30,7 +30,7 @@ declare module ClockInfo {
   type Item = {
     text: string,
     short?: string,
-    img?: string,
+    img?: Image,
   };
 
   type RangeItem =
@@ -61,5 +61,5 @@ declare module ClockInfo {
 }
 
 interface BangleExt {
-  CLKINFO_FOCUS?: true;
+  CLKINFO_FOCUS?: number;
 }
diff --git a/typescript/types/layout.d.ts b/typescript/types/layout.d.ts
index 167ede29d..55ddd7135 100644
--- a/typescript/types/layout.d.ts
+++ b/typescript/types/layout.d.ts
@@ -1,10 +1,13 @@
 type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
+type UnionToIntersection<U> =
+  (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never
+
 type ExtractIds<T extends Layout.Hierarchy, Depth extends Prev[number] = 9> =
   [Depth] extends [never]
   ? never
-  : (T extends { id: infer Id extends string }
-    ? { [k in Id]: T }
+  : (T extends { id?: infer Id extends string }
+    ? { [k in Id]: { -readonly [P in keyof T]: T[P] extends string ? string : T[P] }  }
     : never)
   |
   (
@@ -15,7 +18,7 @@ type ExtractIds<T extends Layout.Hierarchy, Depth extends Prev[number] = 9> =
 
 declare module Layout {
   type Layouter<T extends Hierarchy> =
-    ExtractIds<T>
+    UnionToIntersection<ExtractIds<T>>
     &
     {
       // these actually change T
@@ -31,6 +34,7 @@ declare module Layout {
       setUI(): void;
     };
 
+  // Note: you must use new Layout({...} as const) to have ids inferred
   var Layout: {
     new <T extends Hierarchy>(
       hier: T,
diff --git a/typescript/types/locale.d.ts b/typescript/types/locale.d.ts
index 3fc914e10..62d37d9dd 100644
--- a/typescript/types/locale.d.ts
+++ b/typescript/types/locale.d.ts
@@ -3,10 +3,20 @@ declare module Locale {
 
   type Locale = {
     name: string,
+    /**
+     * @deprecated
+     * There was no use case for this variable.
+     * For more details, see https://github.com/espruino/BangleApps/issues/3269
+     */
     currencySym: string,
     dow(date: Date, short?: ShortBoolean): string,
     month(date: Date, short?: ShortBoolean): string,
     number(n: number): string,
+    /**
+     * @deprecated
+     * There was no use case for this method.
+     * For more details, see https://github.com/espruino/BangleApps/issues/3269
+     */
     currency(c: number): string,
     distance(d: number): string,
     speed(s: number): string,
diff --git a/typescript/types/main.d.ts b/typescript/types/main.d.ts
index eda8a9a81..6921c7d12 100644
--- a/typescript/types/main.d.ts
+++ b/typescript/types/main.d.ts
@@ -161,6 +161,7 @@ type BangleOptions<Boolean = boolean> = {
   wakeOnBTN3: Boolean;
   wakeOnFaceUp: Boolean;
   wakeOnTouch: Boolean;
+  wakeOnDoubleTap: Boolean;
   wakeOnTwist: Boolean;
   twistThreshold: number;
   twistMaxY: number;
@@ -194,6 +195,13 @@ type NRFFilters = {
 
 type NRFSecurityStatus = {
   advertising: boolean,
+  privacy?: ShortBoolean | {
+    mode: "off"
+  } | {
+    mode: "device_privacy" | "network_privacy",
+    addr_type: "random_private_resolvable" | "random_private_non_resolvable",
+    addr_cycle_s: number,
+  },
 } & (
   {
     connected: true,
@@ -852,6 +860,25 @@ declare class NRF {
    */
   static on(event: "error", callback: (msg: any) => void): void;
 
+  /**
+   * (Added in 2v19) Called when a central device connects to Espruino, pairs, and sends a passkey that Espruino should display.
+   * For this to be used, you'll have to specify that your device has a display using `NRF.setSecurity({mitm:1, display:1});`
+   * For instance:
+   * ```
+   * NRF.setSecurity({mitm:1, display:1});
+   * NRF.on("passkey", key => print("Enter PIN: ",passkey));
+   * ```
+   * It is also possible to specify a static passkey with `NRF.setSecurity({passkey:"123456", mitm:1, display:1});`
+   * in which case no `passkey` event handler is needed (this method works on Espruino 2v02 and later)
+   * **Note:** A similar event, [`BluetoothDevice.on("passkey", ...)`](http://www.espruino.com/Reference#l_BluetoothDevice_passkey) is available
+   * for when Espruino is connecting *to* another device (central mode).
+   * @param {string} event - The event to listen to.
+   * @param {(passkey: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `passkey` A 6 character numeric String to be displayed
+   * @url http://www.espruino.com/Reference#l_NRF_passkey
+   */
+  static on(event: "passkey", callback: (passkey: any) => void): void;
+
   /**
    * Contains updates on the security of the current Bluetooth link.
    * See Nordic's `ble_gap_evt_auth_status_t` structure for more information.
@@ -1014,6 +1041,36 @@ declare class NRF {
    */
   static setAddress(addr: any): void;
 
+  /**
+   * Try to resolve a **bonded** peer's address from a random private resolvable address. If the peer
+   * is not bonded, there will be no IRK and `undefined` will be returned.
+   * A bunch of devices, especially smartphones, implement address randomisation and periodically change
+   * their bluetooth address to prevent being tracked.
+   * If such a device uses a "random private resolvable address", that address is generated
+   * with the help of an identity resolving key (IRK) that is exchanged during bonding.
+   * If we know the IRK of a device, we can check if an address was potentially generated by that device.
+   * The following will check an address against the IRKs of all bonded devices,
+   * and return the actual address of a bonded device if the given address was likely generated using that device's IRK:
+   * ```
+   * NRF.on('connect',addr=> {
+   *   // addr could be "aa:bb:cc:dd:ee:ff private-resolvable"
+   *   if (addr.endsWith("private-resolvable")) {
+   *     let resolved = NRF.resolveAddress(addr);
+   *     // resolved is "aa:bb:cc:dd:ee:ff public"
+   *     if (resolved) addr = resolved;
+   *   }
+   *   console.log("Device connected: ", addr);
+   * })
+   * ```
+   * You can get the current connection's address using `NRF.getSecurityStatus().connected_addr`,
+   * so can for instance do `NRF.resolveAddress(NRF.getSecurityStatus().connected_addr)`.
+   *
+   * @param {any} options - The address that should be resolved.
+   * @returns {any} The resolved address, or `undefined` if it couldn't be resolved.
+   * @url http://www.espruino.com/Reference#l_NRF_resolveAddress
+   */
+  static resolveAddress(options: any): any;
+
   /**
    * Get the battery level in volts (the voltage that the NRF chip is running off
    * of).
@@ -1079,7 +1136,7 @@ declare class NRF {
    * advertise battery level and its name as well as both Eddystone and iBeacon :
    * ```
    * NRF.setAdvertising([
-   *   {0x180F : [Puck.getBatteryPercentage()]}, // normal advertising, with battery %
+   *   {0x180F : [E.getBattery()]}, // normal advertising, with battery %
    *   require("ble_ibeacon").get(...), // iBeacon
    *   require("ble_eddystone").get(...), // eddystone
    * ], {interval:300});
@@ -1097,7 +1154,7 @@ declare class NRF {
    *   interval: 600              // Advertising interval in msec, between 20 and 10000 (default is 375ms)
    *   manufacturer: 0x0590       // IF sending manufacturer data, this is the manufacturer ID
    *   manufacturerData: [...]    // IF sending manufacturer data, this is an array of data
-   *   phy: "1mbps/2mbps/coded"   // (NRF52840 only) use the long-range coded phy for transmission (1mbps default)
+   *   phy: "1mbps/2mbps/coded"   // (NRF52833/NRF52840 only) use the long-range coded phy for transmission (1mbps default)
    * }
    * ```
    * Setting `connectable` and `scannable` to false gives the lowest power
@@ -1830,10 +1887,19 @@ declare class NRF {
    * * `active` - whether to perform active scanning (requesting 'scan response'
    * packets from any devices that are found). e.g. `NRF.requestDevice({ active:true,
    * filters: [ ... ] })`
-   * * `phy` - (NRF52840 only) use the long-range coded phy (`"1mbps"` default, can
-   *   be `"1mbps/2mbps/both/coded"`)
-   * * `extended` - (NRF52840 only) support receiving extended-length advertising
+   * * `phy` - (NRF52833/NRF52840 only) the type of Bluetooth signals to scan for (can
+   *   be `"1mbps/coded/both/2mbps"`)
+   *   * `1mbps` (default) - standard Bluetooth LE advertising
+   *   * `coded` - long range
+   *   * `both` - standard and long range
+   *   * `2mbps` - high speed 2mbps (not working)
+   * * `extended` - (NRF52833/NRF52840 only) support receiving extended-length advertising
    *   packets (default=true if phy isn't `"1mbps"`)
+   * * `extended` - (NRF52833/NRF52840 only) support receiving extended-length advertising
+   *   packets (default=true if phy isn't `"1mbps"`)
+   * * `window` - (2v22+) how long we scan for in milliseconds (default 100ms)
+   * * `interval` - (2v22+) how often we scan in milliseconds (default 100ms) - `window=interval=100`(default) is all the time. When
+   * scanning on both `1mbps` and `coded`, `interval` needs to be twice `window`.
    * **NOTE:** `timeout` and `active` are not part of the Web Bluetooth standard.
    * The following filter types are implemented:
    * * `services` - list of services as strings (all of which must match). 128 bit
@@ -1983,19 +2049,24 @@ declare class NRF {
    * central *and* peripheral mode.
    * ```
    * NRF.setSecurity({
-   *   display : bool  // default false, can this device display a passkey
+   *   display : bool  // default false, can this device display a passkey on a screen/etc?
    *                   // - sent via the `BluetoothDevice.passkey` event
    *   keyboard : bool // default false, can this device enter a passkey
    *                   // - request sent via the `BluetoothDevice.passkeyRequest` event
+   *   pair : bool // default true, allow other devices to pair with this device
    *   bond : bool // default true, Perform bonding
+   *               // This stores info from pairing in flash and allows reconnecting without having to pair each time
    *   mitm : bool // default false, Man In The Middle protection
    *   lesc : bool // default false, LE Secure Connections
-   *   passkey : // default "", or a 6 digit passkey to use
+   *   passkey : // default "", or a 6 digit passkey to use (display must be true for this)
    *   oob : [0..15] // if specified, Out Of Band pairing is enabled and
    *                 // the 16 byte pairing code supplied here is used
    *   encryptUart : bool // default false (unless oob or passkey specified)
    *                      // This sets the BLE UART service such that it
-   *                      // is encrypted and can only be used from a bonded connection
+   *                      // is encrypted and can only be used from a paired connection
+   *   privacy : // default false, true to enable with (ideally sensible) defaults,
+   *             // or an object defining BLE privacy / random address options - see below for more info
+   *             // only available if Espruino was compiled with private address support (like for example on Bangle.js 2)
    * });
    * ```
    * **NOTE:** Some combinations of arguments will cause an error. For example
@@ -2006,6 +2077,12 @@ declare class NRF {
    * ```
    * NRF.setSecurity({passkey:"123456", mitm:1, display:1});
    * ```
+   * Or to require pairing and to display a PIN that the connecting device
+   * provides, use:
+   * ```
+   * NRF.setSecurity({mitm:1, display:1});
+   * NRF.on("passkey", key => print("Enter PIN: ", key));
+   * ```
    * However, while most devices will request a passkey for pairing at this point it
    * is still possible for a device to connect without requiring one (e.g. using the
    * 'NRF Connect' app).
@@ -2054,6 +2131,42 @@ declare class NRF {
    * **Note:** If `passkey` or `oob` is specified, the Nordic UART service (if
    * enabled) will automatically be set to require encryption, but otherwise it is
    * open.
+   * On Bangle.js 2, the `privacy` parameter can be used to set this device's BLE privacy / random address settings.
+   * The privacy feature provides a way to avoid being tracked over a period of time.
+   * This works by replacing the real BLE address with a random private address,
+   * that automatically changes at a specified interval.
+   * If a `"random_private_resolvable"` address is used, that address is generated with the help
+   * of an identity resolving key (IRK), that is exchanged during bonding.
+   * This allows a bonded device to still identify another device that is using a random private resolvable address.
+   * Note that, while this can help against being tracked, there are other ways a Bluetooth device can reveal its identity.
+   * For example, the name or services it advertises may be unique enough.
+   * ```
+   * NRF.setSecurity({
+   *   privacy: {
+   *     mode : "off"/"device_privacy"/"network_privacy" // The privacy mode that should be used.
+   *     addr_type : "random_private_resolvable"/"random_private_non_resolvable" // The type of address to use.
+   *     addr_cycle_s : int // How often the address should change, in seconds.
+   *   }
+   * });
+   * // enabled with (ideally sensible) defaults of:
+   * // mode: device_privacy
+   * // addr_type: random_private_resolvable
+   * // addr_cycle_s: 0 (use default address change interval)
+   * NRF.setSecurity({
+   *   privacy: 1
+   * });
+   * ```
+   * `mode` can be one of:
+   * * `"off"` - Use the real address.
+   * * `"device_privacy"` - Use a private address.
+   * * `"network_privacy"` - Use a private address,
+   *                         and reject a peer that uses its real address if we know that peer's IRK.
+   * If `mode` is `"off"`, all other fields are ignored and become optional.
+   * `addr_type` can be one of:
+   * * `"random_private_resolvable"` - Address that can be resolved by a bonded peer that knows our IRK.
+   * * `"random_private_non_resolvable"` - Address that cannot be resolved.
+   * `addr_cycle_s` must be an integer. Pass `0` to use the default address change interval.
+   * The default is usually to change the address every 15 minutes (or 900 seconds).
    *
    * @param {any} options - An object containing security-related options (see below)
    * @url http://www.espruino.com/Reference#l_NRF_setSecurity
@@ -2071,6 +2184,8 @@ declare class NRF {
    *   bonded          // The peer is bonded with us
    *   advertising     // Are we currently advertising?
    *   connected_addr  // If connected=true, the MAC address of the currently connected device
+   *   privacy         // Current BLE privacy / random address settings.
+   *                   // Only present if Espruino was compiled with private address support (like for example on Bangle.js 2).
    * }
    * ```
    * If there is no active connection, `{connected:false}` will be returned.
@@ -2167,7 +2282,7 @@ declare class AES {
  */
 declare class Pixl {
   /**
-   * DEPRECATED - Please use `E.getBattery()` instead.
+   * **DEPRECATED** - Please use `E.getBattery()` instead.
    * Return an approximate battery percentage remaining based on a normal CR2032
    * battery (2.8 - 2.2v)
    * @returns {number} A percentage between 0 and 100
@@ -2293,6 +2408,15 @@ declare class Trig {
   static getErrorArray(): any;
 
 
+}
+
+/**
+ * @url http://www.espruino.com/Reference#Dickens
+ */
+declare class Dickens {
+
+
+
 }
 
 /**
@@ -3182,25 +3306,44 @@ declare class Puck {
    * Check out [the Puck.js page on the
    * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
    * information.
+   * ```JS
+   * Puck.magOn(10); // 10 Hz
+   * Puck.on('mag', function(e) {
+   *   print(e);
+   * });
+   * // { "x": -874, "y": -332, "z": -1938 }
+   * ```
    * @param {string} event - The event to listen to.
-   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @param {(xyz: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `xyz` an object of the form `{x,y,z}`
    * @url http://www.espruino.com/Reference#l_Puck_mag
    */
-  static on(event: "mag", callback: () => void): void;
+  static on(event: "mag", callback: (xyz: any) => void): void;
 
   /**
    * Only on Puck.js v2.0
    * Called after `Puck.accelOn()` every time accelerometer data is sampled. There is
    * one argument which is an object of the form `{acc:{x,y,z}, gyro:{x,y,z}}`
    * containing the data.
+   * ```JS
+   * Puck.accelOn(12.5); // default 12.5Hz
+   * Puck.on('accel', function(e) {
+   *   print(e);
+   * });
+   * //{
+   * //  "acc": { "x": -525, "y": -112, "z": 8160 },
+   * //  "gyro": { "x": 154, "y": -152, "z": -34 }
+   * //}
+   * ```
    * The data is as it comes off the accelerometer and is not scaled to 1g. For more
    * information see `Puck.accel()` or [the Puck.js page on the
    * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals).
    * @param {string} event - The event to listen to.
-   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @param {(e: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `e` an object of the form `{acc:{x,y,z}, gyro:{x,y,z}}`
    * @url http://www.espruino.com/Reference#l_Puck_accel
    */
-  static on(event: "accel", callback: () => void): void;
+  static on(event: "accel", callback: (e: any) => void): void;
 
   /**
    * Turn the magnetometer on and start periodic sampling. Samples will then cause a
@@ -3405,7 +3548,7 @@ declare class Puck {
   static light(): number;
 
   /**
-   * DEPRECATED - Please use `E.getBattery()` instead.
+   * **DEPRECATED** - Please use `E.getBattery()` instead.
    * Return an approximate battery percentage remaining based on a normal CR2032
    * battery (2.8 - 2.2v).
    * @returns {number} A percentage between 0 and 100
@@ -3430,12 +3573,152 @@ declare class Puck {
 
 }
 
+/**
+ * Class containing utility functions for the [Jolt.js Smart Bluetooth driver](http://www.espruino.com/Jolt.js)
+ * @url http://www.espruino.com/Reference#Jolt
+ */
+declare class Jolt {
+  /**
+   * `Q0` and `Q1` Qwiic connectors can have their power controlled by a 500mA FET (`Jolt.Q0.fet`) which switches GND.
+   * The `sda` and `scl` pins on this port are also analog inputs - use `analogRead(Jolt.Q0.sda)`/etc
+   * To turn this connector on run `Jolt.Q0.setPower(1)`
+   * @returns {any} An object containing the pins for the Q0 connector on Jolt.js `{sda,scl,fet}`
+   * @url http://www.espruino.com/Reference#l_Jolt_Q0
+   */
+  static Q0: Qwiic;
+
+  /**
+   * `Q0` and `Q1` Qwiic connectors can have their power controlled by a 500mA FET  (`Jolt.Q1.fet`) which switches GND.
+   * The `sda` and `scl` pins on this port are also analog inputs - use `analogRead(Jolt.Q1.sda)`/etc
+   * To turn this connector on run `Jolt.Q1.setPower(1)`
+   * @returns {any} An object containing the pins for the Q1 connector on Jolt.js `{sda,scl,fet}`
+   * @url http://www.espruino.com/Reference#l_Jolt_Q1
+   */
+  static Q1: Qwiic;
+
+  /**
+   * `Q2` and `Q3` have all 4 pins connected to Jolt.js's GPIO (including those usually used for power).
+   * As such only around 8mA of power can be supplied to any connected device.
+   * To use this as a normal Qwiic connector, run `Jolt.Q2.setPower(1)`
+   * @returns {any} An object containing the pins for the Q2 connector on Jolt.js `{sda,scl,gnd,vcc}`
+   * @url http://www.espruino.com/Reference#l_Jolt_Q2
+   */
+  static Q2: Qwiic;
+
+  /**
+   * `Q2` and `Q3` have all 4 pins connected to Jolt.js's GPIO (including those usually used for power).
+   * As such only around 8mA of power can be supplied to any connected device.
+   * To use this as a normal Qwiic connector, run `Jolt.Q3.setPower(1)`
+   * @returns {any} An object containing the pins for the Q3 connector on Jolt.js `{sda,scl,gnd,vcc}`
+   * @url http://www.espruino.com/Reference#l_Jolt_Q3
+   */
+  static Q3: Qwiic;
+
+  /**
+   * Sets the mode of the motor drivers. Jolt.js has two motor drivers,
+   * one (`0`) for outputs H0..H3, and one (`1`) for outputs H4..H7. They
+   * can be controlled independently.
+   * Mode can be:
+   * * `undefined` / `false` / `"off"` - the motor driver is off, all motor driver pins are open circuit (the motor driver still has a ~2.5k pulldown to GND)
+   * * `"auto"` - (default) - if any pin in the set of 4 pins (H0..H3, H4..H7) is set as an output, the driver is turned on. Eg `H0.set()` will
+   * turn the driver on with a high output, `H0.reset()` will pull the output to GND and `H0.read()` (or `H0.mode("input")` to set the state explicitly) is needed to
+   * turn the motor driver off.
+   * * `true` / `"output"` - **[recommended]** driver is set to "Independent bridge" mode. All 4 outputs in the bank are enabled
+   * * `"motor"` - driver is set to "4 pin interface" mode where pins are paired up (H0+H1, H2+H3, etc). If both
+   * in a pair are 0 the output is open circuit (motor coast), if both are 1 both otputs are 0 (motor brake), and
+   * if both are different, those values are on the output:
+   * `output`/`auto` mode:
+   * | H0 | H1 | Out 0 | Out 1 |
+   * |----|----|-------|-------|
+   * | 0  | 0  | Low   | Low   |
+   * | 0  | 1  | Low   | High  |
+   * | 1  | 0  | High  | Low   |
+   * | 1  | 1  | High  | High  |
+   * `motor` mode
+   * | H0 | H1 | Out 0 | Out 1 |
+   * |----|----|-------|-------|
+   * | 0  | 0  | Open  | Open  |
+   * | 0  | 1  | Low   | High  |
+   * | 1  | 0  | High  | Low   |
+   * | 1  | 1  | Low   | Low   |
+   *
+   * @param {number} driver - The number of the motor driver (0 or 1)
+   * @param {any} mode - The mode of the motor driver (see below)
+   * @url http://www.espruino.com/Reference#l_Jolt_setDriverMode
+   */
+  static setDriverMode(driver: number, mode: any): void;
+
+  /**
+   * Run a self-test, and return true for a pass. This checks for shorts between
+   * pins, so your Jolt shouldn't have anything connected to it.
+   * **Note:** This self-test auto starts if you hold the button on your Jolt down
+   * while inserting the battery, leave it pressed for 3 seconds (while the green LED
+   * is lit) and release it soon after all LEDs turn on. 5 red blinks is a fail, 5
+   * green is a pass.
+   * If the self test fails, it'll set the Jolt.js Bluetooth advertising name to
+   * `Jolt.js !ERR` where ERR is a 3 letter error code.
+   * @returns {boolean} True if the self-test passed
+   * @url http://www.espruino.com/Reference#l_Jolt_selfTest
+   */
+  static selfTest(): boolean;
+
+
+}
+
+/**
+ * Class containing utility functions for the Qwiic connectors
+ * on the [Jolt.js Smart Bluetooth driver](http://www.espruino.com/Jolt.js).
+ * Each class (available from `Jolt.Q0`/`Jolt.Q1`/`Jolt.Q2`/`Jolt.Q3`)
+ * has `sda` and `scl` fields with the pins for SDA and SCL on them.
+ * On Jolt.js, the four Qwiic connectors can be individually powered:
+ * * Q0/Q1 - GND is switched with a 500mA FET. The `fet` field contains the pin that controls the FET
+ * * Q2/Q3 - all 4 pins are connected to GPIO. `gnd` and `vcc` fields contain the pins for GND and VCC
+ * To control the power, use `Qwiic.setPower`, for example: `Jolt.Q0.setPower(true)`
+ * @url http://www.espruino.com/Reference#Qwiic
+ */
+declare class Qwiic {
+
+
+  /**
+   * This turns power for the given Qwiic connector on or off. See `Qwiic` for more information.
+   *
+   * @param {boolean} isOn - Whether the Qwiic connector is to be on or not
+   * @returns {any} The same Qwiic object (for call chaining)
+   * @url http://www.espruino.com/Reference#l_Qwiic_setPower
+   */
+  setPower(isOn: boolean): any;
+
+  /**
+   * @returns {any} An I2C object using this Qwiic connector, already set up
+   * @url http://www.espruino.com/Reference#l_Qwiic_i2c
+   */
+  i2c: any;
+}
+
 /**
  * Class containing utility functions for the [Bangle.js Smart
  * Watch](http://www.espruino.com/Bangle.js)
  * @url http://www.espruino.com/Reference#Bangle
  */
 declare class Bangle {
+  /**
+   * @url http://www.espruino.com/Reference#l_Bangle_drawWidgets
+   */
+  static drawWidgets(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_Bangle_setUI
+   */
+  static setUI(): void;
+
+  /**
+   * Sets the rotation of the LCD display (relative to its nominal orientation)
+   *
+   * @param {number} d - The number of degrees to the LCD display (0, 90, 180 or 270)
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDRotation
+   */
+  static setLCDRotation(d: number): void;
+
   /**
    * Accelerometer data available with `{x,y,z,diff,mag}` object as a parameter.
    * * `x` is X axis (left-right) in `g`
@@ -3589,6 +3872,17 @@ declare class Bangle {
    */
   static on(event: "HRM-raw", callback: (hrm: { raw: number, filt: number, bpm: number, confidence: number }) => void): void;
 
+  /**
+   * Called when an environment sample heart rate sensor data is available (this is the amount of light received by the HRM sensor from the environment when its LED is off). On the newest VC31B based watches this is only 4 bit (0..15).
+   * To get it you need to turn the HRM on with `Bangle.setHRMPower(1)` and also set `Bangle.setOptions({hrmPushEnv:true})`.
+   * It is also possible to poke registers with `Bangle.hrmWr` to increase the poll rate if needed. See https://banglejs.com/apps/?id=flashcount for an example of this.
+   * @param {string} event - The event to listen to.
+   * @param {(env: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `env` An integer containing current environment reading (light level)
+   * @url http://www.espruino.com/Reference#l_Bangle_HRM-env
+   */
+  static on(event: "HRM-env", callback: (env: any) => void): void;
+
   /**
    * When `Bangle.setBarometerPower(true)` is called, this event is fired containing
    * barometer readings.
@@ -3623,11 +3917,12 @@ declare class Bangle {
   /**
    * Has the screen been locked? Also see `Bangle.isLocked()`
    * @param {string} event - The event to listen to.
-   * @param {(on: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * @param {(on: boolean, reason: string) => void} callback - A function that is executed when the event occurs. Its arguments are:
    * * `on` `true` if screen is locked, `false` if it is unlocked and touchscreen/buttons will work
+   * * `reason` (2v20 onwards) If known, the reason for locking/unlocking - 'button','js','tap','doubleTap','faceUp','twist','timeout'
    * @url http://www.espruino.com/Reference#l_Bangle_lock
    */
-  static on(event: "lock", callback: (on: boolean) => void): void;
+  static on(event: "lock", callback: (on: boolean, reason: string) => void): void;
 
   /**
    * If the watch is tapped, this event contains information on the way it was
@@ -3788,7 +4083,7 @@ declare class Bangle {
   /**
    * This function can be used to adjust the brightness of Bangle.js's display, and
    * hence prolong its battery life.
-   * Due to hardware design constraints, software PWM has to be used which means that
+   * Due to hardware design constraints on Bangle.js 1, software PWM has to be used which means that
    * the display may flicker slightly when Bluetooth is active and the display is not
    * at full power.
    * **Power consumption**
@@ -3798,6 +4093,8 @@ declare class Bangle {
    * * 0.5 = 28mA
    * * 0.9 = 40mA (switching overhead)
    * * 1 = 40mA
+   * In 2v21 and earlier, this function would erroneously turn the LCD backlight on. 2v22 and later
+   * fix this, and if you want the backlight on your should use `Bangle.setLCDPowerBacklight()`
    *
    * @param {number} brightness - The brightness of Bangle.js's display - from 0(off) to 1(on full)
    * @url http://www.espruino.com/Reference#l_Bangle_setLCDBrightness
@@ -3857,38 +4154,38 @@ declare class Bangle {
    * GwIKCngWC14sB7QKCh4CBCwN/64KDgfACwWn6vWGwYsBCwOputWJgYsCgGqytVBQYsCLYOlqtqwAsFEINVrR4BFgghBBQosDEINWIQ
    * YsDEIQ3DFgYhCG4msSYeVFgnrFhMvOAgsEkE/FhEggYWCFgIhDkEACwQKBEIYKBCwSGFBQJxCQwYhBBQTKDqohCBQhCCEIJlDXwrKE
    * BQoWHBQdaCwuqJoI4CCwgKECwJ9CJgIKDq+qBYUq1WtBQf+BYIAC3/VBQX/tQKDz/9BQY5BAAVV/4WCBQJcBKwVf+oHBv4wCAAYhB`));
-   * Bangle.setLCDOverlay(img,66,66);
+   * Bangle.setLCDOverlay(img,66,66, {id: "myOverlay", remove: () => print("Removed")});
    * ```
    * Or use a `Graphics` instance:
    * ```
-   * var ovr = Graphics.createArrayBuffer(100,100,1,{msb:true}); // 1bpp
-   * ovr.drawLine(0,0,100,100);
-   * ovr.drawRect(0,0,99,99);
-   * Bangle.setLCDOverlay(ovr,38,38);
-   * ```
-   * Although `Graphics` can be specified directly, it can often make more sense to
-   * create an Image from the `Graphics` instance, as this gives you access
-   * to color palettes and transparent colors. For instance this will draw a colored
-   * overlay with rounded corners:
-   * ```
    * var ovr = Graphics.createArrayBuffer(100,100,2,{msb:true});
+   * ovr.transparent = 0; // (optional) set a transparent color
+   * ovr.palette = new Uint16Array([0,0,g.toColor("#F00"),g.toColor("#FFF")]); // (optional) set a color palette
    * ovr.setColor(1).fillRect({x:0,y:0,w:99,h:99,r:8});
    * ovr.setColor(3).fillRect({x:2,y:2,w:95,h:95,r:7});
    * ovr.setColor(2).setFont("Vector:30").setFontAlign(0,0).drawString("Hi",50,50);
-   * Bangle.setLCDOverlay({
-   *   width:ovr.getWidth(), height:ovr.getHeight(),
-   *   bpp:2, transparent:0,
-   *   palette:new Uint16Array([0,0,g.toColor("#F00"),g.toColor("#FFF")]),
-   *   buffer:ovr.buffer
-   * },38,38);
+   * Bangle.setLCDOverlay(ovr,38,38, {id: "myOverlay", remove: () => print("Removed")});
    * ```
+   * To remove an overlay, simply call:
+   * ```
+   * Bangle.setLCDOverlay(undefined, {id: "myOverlay"});
+   * ```
+   * Before 2v22 the `options` object isn't parsed, and as a result
+   * the remove callback won't be called, and `Bangle.setLCDOverlay(undefined)` will
+   * remove *any* active overlay.
+   * The `remove` callback is called when the current overlay is removed or replaced with
+   * another, but *not* if setLCDOverlay is called again with an image and the same ID.
    *
-   * @param {any} img - An image
-   * @param {number} x - The X offset the graphics instance should be overlaid on the screen with
+   * @param {any} img - An image, or undefined to clear
+   * @param {any} x - The X offset the graphics instance should be overlaid on the screen with
    * @param {number} y - The Y offset the graphics instance should be overlaid on the screen with
+   * @param {any} options - [Optional] object `{remove:fn, id:"str"}`
    * @url http://www.espruino.com/Reference#l_Bangle_setLCDOverlay
    */
   static setLCDOverlay(img: any, x: number, y: number): void;
+  static setLCDOverlay(): void;
+  static setLCDOverlay(img: any, x: number, y: number, options: { id : string, remove: () => void }): void;
+  static setLCDOverlay(img: any, options: { id : string }): void;
 
   /**
    * This function can be used to turn Bangle.js's LCD power saving on or off.
@@ -3928,8 +4225,11 @@ declare class Bangle {
    *   default = `true`
    * * `wakeOnFaceUp` should the LCD turn on when the watch is turned face up?
    *   default = `false`
-   * * `wakeOnTouch` should the LCD turn on when the touchscreen is pressed? default
-   *   = `false`
+   * * `wakeOnTouch` should the LCD turn on when the touchscreen is pressed? On Bangle.js 1 this
+   * is a physical press on the touchscreen, on Bangle.js 2 we have to use the accelerometer as
+   * the touchscreen cannot be left powered without running the battery down. default = `false`
+   * * `wakeOnDoubleTap` (2v20 onwards) should the LCD turn on when the watch is double-tapped on the screen?
+   * This uses the accelerometer, not the touchscreen itself. default = `false`
    * * `wakeOnTwist` should the LCD turn on when the watch is twisted? default =
    *   `true`
    * * `twistThreshold` How much acceleration to register a twist of the watch strap?
@@ -3955,6 +4255,10 @@ declare class Bangle {
    *    current value. If you desire a specific interval (e.g. the default 80ms) you
    *    must set it manually with `Bangle.setPollInterval(80)` after setting
    *    `powerSave:false`.
+   * * `lowResistanceFix` (Bangle.js 2, 2v22+) In the very rare case that your watch button
+   * gets damaged such that it has a low resistance and always stays on, putting the watch
+   * into a boot loop, setting this flag may improve matters (by forcing the input low
+   * before reading and disabling the hardware watch on BTN1).
    * * `lockTimeout` how many milliseconds before the screen locks
    * * `lcdPowerTimeout` how many milliseconds before the screen turns off
    * * `backlightTimeout` how many milliseconds before the screen's backlight turns
@@ -3965,12 +4269,18 @@ declare class Bangle {
    *   heart rate monitor. On Bangle.js 2 only 10,20,40,80,160,200 ms are supported,
    *   and polling rate may not be exact. The algorithm's filtering is tuned for
    *   20-40ms poll intervals, so higher/lower intervals may effect the reliability
-   *   of the BPM reading.
+   *   of the BPM reading. You must call this *before* `Bangle.setHRMPower` - calling
+   *   when the HRM is already on will not affect the poll rate.
    * * `hrmSportMode` - on the newest Bangle.js 2 builds with with the proprietary
    *   heart rate algorithm, this is the sport mode passed to the algorithm. See `libs/misc/vc31_binary/algo.h`
    *   for more info. -1 = auto, 0 = normal (default), 1 = running, 2 = ...
+   * * `hrmGreenAdjust` - (Bangle.js 2, 2v19+) if false (default is true) the green LED intensity won't be adjusted to get the HRM sensor 'exposure' correct. This is reset when the HRM is initialised with `Bangle.setHRMPower`.
+   * * `hrmWearDetect` - (Bangle.js 2, 2v19+) if false (default is true) HRM readings won't be turned off if the watch isn't on your arm (based on HRM proximity sensor). This is reset when the HRM is initialised with `Bangle.setHRMPower`.
+   * * `hrmPushEnv` - (Bangle.js 2, 2v19+) if true (default is false) HRM environment readings will be produced as `Bangle.on(`HRM-env`, ...)` events. This is reset when the HRM is initialised with `Bangle.setHRMPower`.
    * * `seaLevelPressure` (Bangle.js 2) Normally 1013.25 millibars - this is used for
    *   calculating altitude with the pressure sensor
+   * * `lcdBufferPtr` (Bangle.js 2 2v21+) Return a pointer to the first pixel of the 3 bit graphics buffer used by Bangle.js for the screen (stride = 178 bytes)
+   * * `lcdDoubleRefresh` (Bangle.js 2 2v22+) If enabled, pulses EXTCOMIN twice per poll interval (avoids off-axis flicker)
    * Where accelerations are used they are in internal units, where `8192 = 1g`
    *
    * @param {any} options
@@ -3987,6 +4297,7 @@ declare class Bangle {
 
   /**
    * Also see the `Bangle.lcdPower` event
+   * You can use `Bangle.setLCDPower` to turn on the LCD (on Bangle.js 2 the LCD is normally on, and draws very little power so can be left on).
    * @returns {boolean} Is the display on or not?
    * @url http://www.espruino.com/Reference#l_Bangle_isLCDOn
    */
@@ -3994,6 +4305,7 @@ declare class Bangle {
 
   /**
    * Also see the `Bangle.backlight` event
+   * You can use `Bangle.setLCDPowerBacklight` to turn on the LCD backlight.
    * @returns {boolean} Is the backlight on or not?
    * @url http://www.espruino.com/Reference#l_Bangle_isBacklightOn
    */
@@ -4306,9 +4618,11 @@ declare class Bangle {
    * Read temperature, pressure and altitude data. A promise is returned which will
    * be resolved with `{temperature, pressure, altitude}`.
    * If the Barometer has been turned on with `Bangle.setBarometerPower` then this
-   * will return almost immediately with the reading. If the Barometer is off,
+   * will return with the *next* reading as of 2v21 (or the existing reading on 2v20 or earlier). If the Barometer is off,
    * conversions take between 500-750ms.
    * Altitude assumes a sea-level pressure of 1013.25 hPa
+   * If there's no pressure device (for example, the emulator),
+   * this returns `undefined`, rather than a Promise.
    * ```
    * Bangle.getPressure().then(d=>{
    *   console.log(d);
@@ -4318,7 +4632,7 @@ declare class Bangle {
    * @returns {any} A promise that will be resolved with `{temperature, pressure, altitude}`
    * @url http://www.espruino.com/Reference#l_Bangle_getPressure
    */
-  static getPressure(): PressureData;
+  static getPressure(): Promise<PressureData> | undefined;
 
   /**
    * Perform a Spherical [Web Mercator
@@ -4412,11 +4726,27 @@ declare class Bangle {
 
   /**
    * Show a 'recovery' menu that allows you to perform certain tasks on your Bangle.
-   * You can also enter this menu by restarting while holding down the `BTN1`
+   * You can also enter this menu by restarting your Bangle while holding down the button.
    * @url http://www.espruino.com/Reference#l_Bangle_showRecoveryMenu
    */
   static showRecoveryMenu(): void;
 
+  /**
+   * @url http://www.espruino.com/Reference#l_Bangle_showRecoveryMenu
+   */
+  static showRecoveryMenu(): void;
+
+  /**
+   * (2v20 and later) Show a test screen that lights green when each sensor on the Bangle
+   * works and reports within range.
+   * Swipe on the screen when all items are green and the Bangle will turn bluetooth off
+   * and display a `TEST PASS` screen for 60 minutes, after which it will turn off.
+   * You can enter this menu by restarting your Bangle while holding down the button,
+   * then choosing `Test` from the recovery menu.
+   * @url http://www.espruino.com/Reference#l_Bangle_showTestScreen
+   */
+  static showTestScreen(): void;
+
   /**
    * This behaves the same as the global `load()` function, but if fast
    * loading is possible (`Bangle.setUI` was called with a `remove` handler)
@@ -4463,24 +4793,14 @@ declare class Bangle {
    * While you could use setWatch/etc manually, the benefit here is that you don't
    * end up with multiple `setWatch` instances, and the actual input method (touch,
    * or buttons) is implemented dependent on the watch (Bangle.js 1 or 2)
-   * **Note:** You can override this function in boot code to change the interaction
-   * mode with the watch. For instance you could make all clocks start the launcher
-   * with a swipe by using:
    * ```
-   * (function() {
-   *   var sui = Bangle.setUI;
-   *   Bangle.setUI = function(mode, cb) {
-   *     var m = ("object"==typeof mode) ? mode.mode : mode;
-   *     if (m!="clock") return sui(mode,cb);
-   *     sui(); // clear
-   *     Bangle.CLOCK=1;
-   *     Bangle.swipeHandler = Bangle.showLauncher;
-   *     Bangle.on("swipe", Bangle.swipeHandler);
-   *   };
-   * })();
+   * Bangle.setUI("updown", function (dir) {
+   *   // dir is +/- 1 for swipes up/down
+   *   // dir is 0 when button pressed
+   * });
    * ```
    * The first argument can also be an object, in which case more options can be
-   * specified:
+   * specified with `mode:"custom"`:
    * ```
    * Bangle.setUI({
    *   mode : "custom",
@@ -4498,7 +4818,23 @@ declare class Bangle {
    * may choose to just call the `remove` function and then load a new app without resetting Bangle.js.
    * As a result, **if you specify 'remove' you should make sure you test that after calling `Bangle.setUI()`
    * without arguments your app is completely unloaded**, otherwise you may end up with memory leaks or
-   * other issues when switching apps. Please see http://www.espruino.com/Bangle.js+Fast+Load for more details on this.
+   * other issues when switching apps. Please see the [Bangle.js Fast Load Tutorial](https://www.espruino.com/Bangle.js+Fast+Load) for more details on this.
+   * **Note:** You can override this function in boot code to change the interaction
+   * mode with the watch. For instance you could make all clocks start the launcher
+   * with a swipe by using:
+   * ```
+   * (function() {
+   *   var sui = Bangle.setUI;
+   *   Bangle.setUI = function(mode, cb) {
+   *     var m = ("object"==typeof mode) ? mode.mode : mode;
+   *     if (m!="clock") return sui(mode,cb);
+   *     sui(); // clear
+   *     Bangle.CLOCK=1;
+   *     Bangle.swipeHandler = Bangle.showLauncher;
+   *     Bangle.on("swipe", Bangle.swipeHandler);
+   *   };
+   * })();
+   * ```
    *
    * @param {any} type - The type of UI input: 'updown', 'leftright', 'clock', 'clockupdown' or undefined to cancel. Can also be an object (see below)
    * @param {any} callback - A function with one argument which is the direction
@@ -4519,9 +4855,11 @@ declare class Bangle {
    * Erase all storage and reload it with the default contents.
    * This is only available on Bangle.js 2.0. On Bangle.js 1.0 you need to use
    * `Install Default Apps` under the `More...` tab of http://banglejs.com/apps
+   *
+   * @param {boolean} noReboot - Do not reboot the watch when done (default false, so will reboot)
    * @url http://www.espruino.com/Reference#l_Bangle_factoryReset
    */
-  static factoryReset(): void;
+  static factoryReset(noReboot: boolean): void;
 
   /**
    * Returns the rectangle on the screen that is currently reserved for the app.
@@ -4551,6 +4889,7 @@ declare class Badge {
   static capSense(corner: number): number;
 
   /**
+   * **DEPRECATED** - Please use `E.getBattery()` instead.
    * Return an approximate battery percentage remaining based on a normal CR2032
    * battery (2.8 - 2.2v)
    * @returns {number} A percentage between 0 and 100
@@ -4636,7 +4975,7 @@ declare class BluetoothDevice {
   /**
    * Called when the device pairs, displays a passkey, and wants Espruino to tell it
    * what the passkey was.
-   * Respond with `BluetoothDevice.sendPasskey()` with a 6 character string
+   * Respond with `BluetoothDevice.sendPasskey("123456")` with a 6 character string
    * containing only `0..9`.
    * For this to be used, you'll have to specify that there's a keyboard using
    * `NRF.setSecurity`
@@ -5111,6 +5450,40 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   static createImage(str: string): ImageObject;
 
+  /**
+   * Draw a filled arc between two angles
+   *
+   * @param {number} a1 - Angle 1 (radians)
+   * @param {number} a2 - Angle 2 (radians)
+   * @param {number} r - Radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillArc
+   */
+  fillArc(a1: number, a2: number, r: number): Graphics;
+
+  /**
+   * Draw rectangle between angles a-ar and a+ar, and radius r1/r2
+   *
+   * @param {number} a - Angle (radians)
+   * @param {number} ar - Angle either side (radians)
+   * @param {number} r1 - Radius
+   * @param {number} r2 - Radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillSeg
+   */
+  fillSeg(a: number, ar: number, r1: number, r2: number): Graphics;
+
+  /**
+   * Draw A line between angles a-ar and a+ar at radius r
+   *
+   * @param {number} a - Angle (radians)
+   * @param {number} ar - Angle either side (radians)
+   * @param {number} r - Radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawSeg
+   */
+  drawSeg(a: number, ar: number, r: number): Graphics;
+
   /**
    * Set the current font
    *
@@ -5123,11 +5496,11 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
   /**
    * Set the current font
    *
-   * @param {number} [scale] - [optional] If >1 the font will be scaled up by that amount
+   * @param {number} scale - (optional) If >1 the font will be scaled up by that amount
    * @returns {any} The instance of Graphics this was called on, to allow call chaining
    * @url http://www.espruino.com/Reference#l_Graphics_setFont6x15
    */
-  setFont6x15(scale?: number): Graphics;
+  setFont6x15(scale: number): Graphics;
 
   /**
    * On instances of graphics that drive a display with an offscreen buffer, calling
@@ -5267,6 +5640,18 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   fillCircle(x: number, y: number, rad: number): Graphics;
 
+  /**
+   * Draw a filled annulus in the Foreground Color
+   *
+   * @param {number} x - The X axis
+   * @param {number} y - The Y axis
+   * @param {number} r1 - The annulus inner radius
+   * @param {number} r2 - The annulus outer radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillAnnulus
+   */
+  fillAnnulus(x: number, y: number, r1: number, r2: number): Graphics;
+
   /**
    * Draw an unfilled circle 1px wide in the Foreground Color
    *
@@ -5485,10 +5870,11 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
   /**
    *
    * @param {any} file - The font as a PBF file
+   * @param {number} scale - The scale factor, default=1 (2=2x size)
    * @returns {any} The instance of Graphics this was called on, to allow call chaining
    * @url http://www.espruino.com/Reference#l_Graphics_setFontPBF
    */
-  setFontPBF(file: any): Graphics;
+  setFontPBF(file: any, scale: number): Graphics;
 
   /**
    * Set the alignment for subsequent calls to `drawString`
@@ -5558,13 +5944,22 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
   stringWidth(str: string): number;
 
   /**
-   * Return the width and height in pixels of a string of text in the current font
+   * Return the width and height in pixels of a string of text in the current font. The object returned contains:
+   * ```JS
+   * {
+   *   width,              // Width of the string in pixels
+   *   height,             // Height of the string in pixels
+   *   unrenderableChars,  // If true, the string contains characters that the current font isn't able to render.
+   *   imageCount,         // How many inline images are in this string?
+   *   maxImageHeight,     // If there are images, what is the maximum height of all images?
+   * }
+   * ```
    *
    * @param {any} str - The string
-   * @returns {any} An object containing `{width,height}` of the string
+   * @returns {any} An object containing `{width,height,etc}` for the string - see below
    * @url http://www.espruino.com/Reference#l_Graphics_stringMetrics
    */
-  stringMetrics(str: string): { width: number, height: number };
+  stringMetrics(str: string): { width: number, height: number, unrenderableChars: boolean, imageCount : number, maxImageHeight : number };
 
   /**
    * Wrap a string to the given pixel width using the current font, and return the
@@ -5625,6 +6020,22 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   getVectorFontPolys(str: any, options?: any): any[];
 
+  /**
+   * Draw a string of text as a fixed-width line font
+   * `options` contains:
+   * * `size`: font size in pixels (char width is half font size) - default 16
+   * * `rotate`: Initial rotation in radians - default 0
+   * * `twist`: Subsequent rotation per character in radians - default 0
+   *
+   * @param {any} str - The string
+   * @param {number} x - The X position of the start of the text string
+   * @param {number} y - The Y position of the middle of the text string
+   * @param {any} options - Options for drawing this font (see below)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawLineString
+   */
+  drawLineString(str: any, x: number, y: number, options: any): Graphics;
+
   /**
    * Draw a line between x1,y1 and x2,y2 in the current foreground color
    *
@@ -5778,6 +6189,8 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    *   disabled on devices without much flash memory available. If a Graphics object
    *   is supplied, it can also contain transparent/palette fields as if it were
    *   an image.
+   * See https://www.espruino.com/Graphics#images-bitmaps for more information about
+   * image formats.
    * Draw an image at the specified position.
    * * If the image is 1 bit, the graphics foreground/background colours will be
    *   used.
@@ -5796,6 +6209,7 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    *   scale : float, // the amount to scale the image up (default 1)
    *   frame : int    // if specified and the image has frames of data
    *                  //  after the initial frame, draw one of those frames from the image
+   *   filter : bool  // (2v19+) when set, if scale<0.75 perform 2x2 supersampling to smoothly downscale the image
    * }
    * ```
    * For example:
@@ -5823,19 +6237,21 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * like Bangle.js. Maximum layer count right now is 4.
    * ```
    * layers = [ {
-   *   {x : int, // x start position
-   *    y : int, // y start position
-   *    image : string/object,
+   *   {x : float, // x start position
+   *    y : float, // y start position
+   *    image : string/object/Graphics,
    *    scale : float, // scale factor, default 1
    *    rotate : float, // angle in radians
    *    center : bool // center on x,y? default is top left
    *    repeat : should this image be repeated (tiled?)
    *    nobounds : bool // if true, the bounds of the image are not used to work out the default area to draw
+   *    palette : new Uint16Array(2/4/8/16/256) // (2v22+) a color palette to use with the image (overrides the image's palette)
+   *    compose : ""/"add"/"or"/"xor" // (2v22+) if set, the operation used when combining with the previous layer
    *   }
    * ]
-   * options = { // the area to render. Defaults to rendering just enough to cover what's requested
-   *  x,y,
-   *  width,height
+   * options = {
+   *  x,y, : int // the area to render. Defaults to rendering just enough to cover what's requested
+   *  width,height : int
    * }
    * ```
    *
@@ -5858,9 +6274,15 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * * Is 8 bpp *OR* the `{msb:true}` option was given
    * * No other format options (zigzag/etc) were given
    * Otherwise data will be copied, which takes up more space and may be quite slow.
-   * If the `Graphics` object contains `transparent` or `pelette` fields,
+   * If the `Graphics` object contains `transparent` or `palette` fields,
    * [as you might find in an image](http://www.espruino.com/Graphics#images-bitmaps),
    * those will be included in the generated image too.
+   * ```
+   * var gfx = Graphics.createArrayBuffer(8,8,1);
+   * gfx.transparent = 0;
+   * gfx.drawString("X",0,0);
+   * var im = gfx.asImage("string");
+   * ```
    *
    * @param {any} type - The type of image to return. Either `object`/undefined to return an image object, or `string` to return an image string
    * @returns {any} An Image that can be used with `Graphics.drawImage`
@@ -5945,6 +6367,13 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   dump(): void;
 
+  /**
+   *
+   * @param {any} filename - If supplied, a file to save, otherwise 'screenshot.img'
+   * @url http://www.espruino.com/Reference#l_Graphics_saveScreenshot
+   */
+  saveScreenshot(filename: any): void;
+
   /**
    * Calculate the square area under a Bezier curve.
    *  x0,y0: start point x1,y1: control point y2,y2: end point
@@ -6035,6 +6464,36 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * @url http://www.espruino.com/Reference#l_Graphics_setTheme
    */
   setTheme(theme: { [key in keyof Theme]?: Theme[key] extends number ? ColorResolvable : Theme[key] }): Graphics;
+
+  /**
+   * Perform a filter on the current Graphics instance. Requires the Graphics
+   * instance to support readback (eg `getPixel` should work), and only uses
+   * 8 bit values for buffer and filter.
+   * ```
+   * g.filter([ // a gaussian filter
+   *     1, 4, 7, 4, 1,
+   *     4,16,26,16, 4,
+   *     7,26,41,26, 7,
+   *     4,16,26,16, 4,
+   *     1, 4, 7, 4, 1
+   * ], { w:5, h:5, div:273 });
+   * ```
+   * ```
+   * {
+   *   w,h,    // filter width+height
+   *   div,    // divisor applied after filter
+   *   offset, // DC offset applied to filter before division (default 0)
+   *   max,    // maximum output value (default=max allowed by bpp)
+   *   filter, // undefined (replace), or "max" (use max(original,filtered))
+   * }
+   * ```
+   *
+   * @param {any} filter - An array of filter params between -128 and 127 (2D arrays should be unwrapped)
+   * @param {any} options - An object of options, see below
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_filter
+   */
+  filter(filter: any, options: any): Graphics;
 }
 
 /**
@@ -6349,6 +6808,38 @@ interface consoleConstructor {
    * @url http://www.espruino.com/Reference#l_console_log
    */
   log(...text: any[]): void;
+
+  /**
+   * Implemented in Espruino as an alias of `console.log`
+   *
+   * @param {any} text - One or more arguments to print
+   * @url http://www.espruino.com/Reference#l_console_debug
+   */
+  debug(...text: any[]): void;
+
+  /**
+   * Implemented in Espruino as an alias of `console.log`
+   *
+   * @param {any} text - One or more arguments to print
+   * @url http://www.espruino.com/Reference#l_console_info
+   */
+  info(...text: any[]): void;
+
+  /**
+   * Implemented in Espruino as an alias of `console.log`
+   *
+   * @param {any} text - One or more arguments to print
+   * @url http://www.espruino.com/Reference#l_console_warn
+   */
+  warn(...text: any[]): void;
+
+  /**
+   * Implemented in Espruino as an alias of `console.log`
+   *
+   * @param {any} text - One or more arguments to print
+   * @url http://www.espruino.com/Reference#l_console_error
+   */
+  error(...text: any[]): void;
 }
 
 interface console {
@@ -6939,7 +7430,7 @@ interface Float64ArrayConstructor {
    * @constructor
    *
    * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
-   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer). Maximum 65535.
    * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
    * @returns {any} A typed array
    * @url http://www.espruino.com/Reference#l_Float64Array_Float64Array
@@ -6956,7 +7447,9 @@ declare const Float64Array: Float64ArrayConstructor
 interface DateConstructor {
   /**
    * Get the number of milliseconds elapsed since 1970 (or on embedded platforms,
-   * since startup)
+   * since startup).
+   * **Note:** Desktop JS engines return an integer value for `Date.now()`, however Espruino
+   * returns a floating point value, accurate to fractions of a millisecond.
    * @returns {number}
    * @url http://www.espruino.com/Reference#l_Date_now
    */
@@ -7133,12 +7626,12 @@ interface Date {
   /**
    * Month of the year 0..11
    *
-   * @param {number} yearValue - The month, between 0 and 11
+   * @param {number} monthValue - The month, between 0 and 11
    * @param {any} [dayValue] - [optional] the day, between 0 and 31
    * @returns {number} The number of milliseconds since 1970
    * @url http://www.espruino.com/Reference#l_Date_setMonth
    */
-  setMonth(yearValue: number, dayValue?: number): number;
+  setMonth(monthValue: number, dayValue?: number): number;
 
   /**
    *
@@ -7504,6 +7997,7 @@ declare class E {
    *   "A Number" : {
    *     value : number,
    *     min:0,max:100,step:10,
+   *     // noList : true, // On Bangle.js devices this forces use of the number-chooser (and not a scrolling list)
    *     onchange : v => { number=v; }
    *   },
    *   "Exit" : function() { E.showMenu(); }, // remove the menu
@@ -7598,6 +8092,21 @@ declare class E {
    */
   static showAlert(message?: string, options?: string): Promise<void>;
 
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showMenu
+   */
+  static showMenu(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showPrompt
+   */
+  static showPrompt(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showMessage
+   */
+  static showMessage(): void;
+
   /**
    * Setup the filesystem so that subsequent calls to `E.openFile` and
    * `require('fs').*` will use an SD card on the supplied SPI device and pin.
@@ -8041,19 +8550,27 @@ declare class E {
   static getAnalogVRef(): number;
 
   /**
-   * ADVANCED: This is a great way to crash Espruino if you're not sure what you are
-   * doing
+   * ADVANCED: It's very easy to crash Espruino using this function if
+   * you get the code/arguments you supply wrong!
    * Create a native function that executes the code at the given address, e.g.
    * `E.nativeCall(0x08012345,'double (double,double)')(1.1, 2.2)`
    * If you're executing a thumb function, you'll almost certainly need to set the
    * bottom bit of the address to 1.
    * Note it's not guaranteed that the call signature you provide can be used - there
-   * are limits on the number of arguments allowed.
+   * are limits on the number of arguments allowed (5).
    * When supplying `data`, if it is a 'flat string' then it will be used directly,
    * otherwise it'll be converted to a flat string and used.
+   * The argument types in `sig` are:
+   * * `void` - returns nothing
+   * * `bool` -  boolean value
+   * * `int` - 32 bit integer
+   * * `double` - 64 bit floating point
+   * * `float` - 32 bit floating point (2v21 and later)
+   * * `Pin` - Espruino 'pin' value (8 bit integer)
+   * * `JsVar` - Pointer to an Espruino JsVar structure
    *
    * @param {number} addr - The address in memory of the function (or offset in `data` if it was supplied
-   * @param {any} sig - The signature of the call, `returnType (arg1,arg2,...)`. Allowed types are `void`,`bool`,`int`,`double`,`Pin`,`JsVar`
+   * @param {any} sig - The signature of the call, `returnType (arg1,arg2,...)`. Allowed types are `void`,`bool`,`int`,`double`,`float`,`Pin`,`JsVar`
    * @param {any} data - (Optional) A string containing the function itself. If not supplied then 'addr' is used as an absolute address.
    * @returns {any} The native function
    * @url http://www.espruino.com/Reference#l_E_nativeCall
@@ -8211,8 +8728,31 @@ declare class E {
   static setFlags(flags: { [key in Flag]?: boolean }): void
 
   /**
+   * Pipe one stream to another.
+   * This can be given any object with a `read` method as a source, and any object with a `.write(data)` method as a destination.
+   * Data will be piped from `source` to `destination` in the idle loop until `source.read(...)` returns `undefined`.
+   * For instance:
+   * ```
+   * // Print a really big string to the console, 1 character at a time and write 'Finished!' at the end
+   * E.pipe("This is a really big String",
+   *        {write: print},
+   *        {chunkSize:1, complete:()=>print("Finished!")});
+   * // Pipe the numbers 1 to 100 to a StorageFile in Storage
+   * E.pipe({ n:0, read : function() { if (this.n<100) return (this.n++)+"\n"; }},
+   *        require("Storage").open("testfile","w"));
+   * // Pipe a StorageFile straight to the Bluetooth UART
+   * E.pipe(require("Storage").open("testfile","r"), Bluetooth);
+   * // Pipe a normal file in Storage (not StorageFile) straight to the Bluetooth UART
+   * E.pipe(require("Storage").read("blob.txt"), Bluetooth);
+   * // Pipe a normal file in Storage as a response to an HTTP request
+   * function onPageRequest(req, res) {
+   *   res.writeHead(200, {'Content-Type': 'text/plain'});
+   *   E.pipe(require("Storage").read("webpage.txt"), res);
+   * }
+   * require("http").createServer(onPageRequest).listen(80);
+   * ```
    *
-   * @param {any} source - The source file/stream that will send content.
+   * @param {any} source - The source file/stream that will send content. As of 2v19 this can also be a `String`
    * @param {any} destination - The destination file/stream that will receive content from the source.
    * @param {any} [options]
    * [optional] An object `{ chunkSize : int=64, end : bool=true, complete : function }`
@@ -8380,12 +8920,11 @@ declare class E {
   static toJS(arg: any): string;
 
   /**
-   * This creates and returns a special type of string, which actually references a
-   * specific memory address. It can be used in order to use sections of Flash memory
-   * directly in Espruino (for example to execute code straight from flash memory
-   * with `eval(E.memoryArea( ... ))`)
-   * **Note:** This is only tested on STM32-based platforms (Espruino Original and
-   * Espruino Pico) at the moment.
+   * This creates and returns a special type of string, which references a
+   * specific address in memory. It can be used in order to use sections of
+   * Flash memory directly in Espruino (for example `Storage` uses it
+   * to allow files to be read directly from Flash).
+   * **Note:** As of 2v21, Calling `E.memoryArea` with an address of 0 will return `undefined`
    *
    * @param {number} addr - The address of the memory area
    * @param {number} len - The length (in bytes) of the memory area
@@ -8719,10 +9258,10 @@ declare class E {
   /**
    * Set the time zone to be used with `Date` objects.
    * For example `E.setTimeZone(1)` will be GMT+0100
-   * Note that `E.setTimeZone()` will have no effect when daylight savings time rules
-   * have been set with `E.setDST()`. The timezone value will be stored, but never
-   * used so long as DST settings are in effect.
    * Time can be set with `setTime`.
+   * **Note:** If daylight savings time rules have been set with `E.setDST()`,
+   * calling `E.setTimeZone()` will remove them and move back to using a static
+   * timezone that doesn't change based on the time of year.
    *
    * @param {number} zone - The time zone in hours
    * @url http://www.espruino.com/Reference#l_E_setTimeZone
@@ -8767,10 +9306,20 @@ declare class E {
    * winter (EET) and 3 hours in summer (EEST). DST starts at 03:00 EET on the last
    * Sunday in March, and ends at 04:00 EEST on the last Sunday in October. So
    * someone in Ukraine might call `E.setDST(60,120,4,0,2,0,180,4,0,9,0,240);`
-   * Note that when DST parameters are set (i.e. when `dstOffset` is not zero),
-   * `E.setTimeZone()` has no effect.
+   * Examples:
+   * ```
+   * // United Kingdom
+   * E.setDST(60,0,4,0,2,0,60,4,0,9,0,120);
+   * // California, USA
+   * E.setDST(60,-480,1,0,2,0,120,0,0,10,0,120);
+   * // Or adjust -480 (-8 hours) for other US states
+   * // Ukraine
+   * E.setDST(60,120,4,0,2,0,180,4,0,9,0,240);
+   * ```
+   * **Note:** This is not compatible with `E.setTimeZone()`. Calling `E.setTimeZone()`
+   * after this will disable DST.
    *
-   * @param {any} params - An array containing the settings for DST
+   * @param {any} params - An array containing the settings for DST, or `undefined` to disable
    * @url http://www.espruino.com/Reference#l_E_setDST
    */
   static setDST(dstOffset: number, timezone: number, startDowNumber: number, startDow: number, startMonth: number, startDayOffset: number, startTimeOfDay: number, endDowNumber: number, endDow: number, endMonth: number, endDayOffset: number, endTimeOfDay: number): void
@@ -8906,6 +9455,35 @@ declare class E {
    */
   static getRTCPrescaler(calibrate: boolean): number;
 
+  /**
+   * This function returns an object detailing the current **estimated** power usage
+   * of the Espruino device in microamps (uA). It is not intended to be a replacement
+   * for measuring actual power consumption, but can be useful for finding obvious power
+   * draws.
+   * Where an Espruino device has outputs that are connected to other things, those
+   * are not included in the power usage figures.
+   * Results look like:
+   * ```
+   * {
+   *   device: {
+   *     CPU : 2000, // microcontroller
+   *     LCD : 100, // LCD
+   *     // ...
+   *   },
+   *   total : 5500 // estimated usage in microamps
+   * }
+   * ```
+   * **Note:** Currently only nRF52-based devices have variable CPU power usage
+   * figures. These are based on the time passed for each SysTick event, so under heavy
+   * usage the figure will update within 0.3s, but under low CPU usage it could take
+   * minutes for the CPU usage figure to update.
+   * **Note:** On Jolt.js we take account of internal resistance on H0/H2/H4/H6 where
+   * we can measure voltage. H1/H3/H5/H7 cannot be measured.
+   * @returns {any} An object detailing power usage in microamps
+   * @url http://www.espruino.com/Reference#l_E_getPowerUsage
+   */
+  static getPowerUsage(): any;
+
   /**
    * Decode a UTF8 string.
    * * Any decoded character less than 256 gets passed straight through
@@ -9203,7 +9781,13 @@ interface Object {
   toString(radix?: any): string;
 
   /**
-   * Copy this object completely
+   * Copy this object to a new object, but as a shallow copy. This has a similar effect to calling `Object.assign({}, obj)`.
+   * ```
+   * orig = { a : 1, b : [ 2, 3 ] }
+   * copy = orig.clone();
+   * // copy = { a : 1, b : [ 2, 3 ] }
+   * ```
+   * **Note:** This is not a standard JavaScript function, but is unique to Espruino
    * @returns {any} A copy of this Object
    * @url http://www.espruino.com/Reference#l_Object_clone
    */
@@ -9680,12 +10264,12 @@ interface JSONConstructor {
    *   not as if they were objects (since it is more compact)
    *
    * @param {any} data - The data to be converted to a JSON string
-   * @param {any} replacer - This value is ignored
-   * @param {any} space - The number of spaces to use for padding, a string, or null/undefined for no whitespace
+   * @param {any} [replacer] - [optional] This value is ignored
+   * @param {any} [space] - [optional] The number of spaces to use for padding, a string, or null/undefined for no whitespace
    * @returns {any} A JSON string
    * @url http://www.espruino.com/Reference#l_JSON_stringify
    */
-  stringify(data: any, replacer: any, space: any): any;
+  stringify(data: any, replacer?: any, space?: any): any;
 
   /**
    * Parse the given JSON string into a JavaScript object
@@ -9881,7 +10465,7 @@ declare class I2C {
   /**
    * Request bytes from the given slave device, and return them as a Uint8Array
    * (packed array of bytes). This is like using Arduino Wire's requestFrom,
-   * available and read functions. Sends a STOP
+   * available and read functions. Sends a STOP unless `{address:X, stop:false}` is used.
    *
    * @param {any} address - The 7 bit address of the device to request bytes from, or an object of the form `{address:12, stop:false}` to send this data without a STOP signal.
    * @param {number} quantity - The number of bytes to request
@@ -9889,6 +10473,25 @@ declare class I2C {
    * @url http://www.espruino.com/Reference#l_I2C_readFrom
    */
   readFrom(address: any, quantity: number): Uint8Array;
+
+  /**
+   * Request bytes from a register on the given I2C slave device, and return them as a Uint8Array
+   * (packed array of bytes).
+   * This is the same as calling `I2C.writeTo` and `I2C.readFrom`:
+   * ```
+   * I2C.readReg = function(address, reg, quantity) {
+   *   this.writeTo({address:address, stop:false}, reg);
+   *   return this.readFrom(address, quantity);
+   * };
+   * ```
+   *
+   * @param {number} address - The 7 bit address of the device to request bytes from
+   * @param {number} reg - The register on the device to read bytes from
+   * @param {number} quantity - The number of bytes to request
+   * @returns {any} The data that was returned - as a Uint8Array
+   * @url http://www.espruino.com/Reference#l_I2C_readReg
+   */
+  readReg(address: number, reg: number, quantity: number): Uint8Array;
 }
 
 interface PromiseConstructor {
@@ -9909,7 +10512,7 @@ interface PromiseConstructor {
    * @returns {any} A new Promise
    * @url http://www.espruino.com/Reference#l_Promise_resolve
    */
-  resolve<T extends any>(promises: T): Promise<T>;
+  resolve<T extends any>(promises?: T): Promise<T>;
 
   /**
    * Return a new promise that is already rejected (at idle it'll call `.catch`)
@@ -10040,7 +10643,9 @@ declare class StorageFile {
   write(data: string): void;
 
   /**
-   * Erase this file
+   * Erase this `StorageFile` - after being called this file can no longer be written to.
+   * **Note:** You shouldn't call `require("Storage").erase(...)` on a `StorageFile`, but should
+   * instead open the StorageFile and call `.erase` on the returned file: `require("Storage").open(..., "r").erase()`
    * @url http://www.espruino.com/Reference#l_StorageFile_erase
    */
   erase(): void;
@@ -10400,6 +11005,85 @@ declare class Serial {
   flush(): void;
 }
 
+/**
+ * (2v21+ only) This class allows Espruino to control stepper motors.
+ * ```
+ * // initialise
+ * var s = new Stepper({
+ *   pins : [D1,D0,D2,D3],
+ *   freq : 200
+ * });
+ * // step 1000 steps...
+ * s.moveTo(1000, {turnOff:true}).then(() => {
+ *   print("Done!");
+ * });
+ * ```
+ * On Espruino before 2v20 you can still use the Stepper Motor module at https://www.espruino.com/StepperMotor - it just isn't quite as fast.
+ * @url http://www.espruino.com/Reference#Stepper
+ */
+declare class Stepper {
+  /**
+   * Create a `Stepper` class. `options` can contain:
+   * ```
+   * ... = new Stepper({
+   *   pins : [...], // required - 4 element array of pins
+   *   pattern : [...], // optional - a 4/8 element array of step patterns
+   *   offpattern : 0, // optional (default 0) - the pattern to output to stop driving the stepper motor
+   *   freq : 500,   // optional (default 100) steps per second
+   * })
+   * ```
+   * `pins` must be supplied as a 4 element array of pins. When created,
+   * if pin state has not been set manually on each pin, the pins will
+   * be set to outputs.
+   * If `pattern` isn't specified, a default pattern of `[0b0001,0b0010,0b0100,0b1000]` will be used. You
+   * can specify different patterns, for example `[0b1100,0b1000,0b1001,0b0001,0b0011,0b0010,0b0110,0b0100]`.
+   * @constructor
+   *
+   * @param {any} options - options struct `{pins:[1,2,3,4]}`
+   * @returns {any} An Stepper object
+   * @url http://www.espruino.com/Reference#l_Stepper_Stepper
+   */
+  static new(options: any): any;
+
+  /**
+   * Move a a certain number of steps in either direction. `position` is remembered, so
+   * `s.moveTo(1000)` will move 1000 steps forward the first time it is called, but
+   * `s.moveTo(1500)` called afterwards will only move 500 steps.
+   * , `options` can be:
+   * ```
+   * s.moveTo(steps, {
+   *   freq : 100, // optional (frequency in Hz) step frequency
+   *   turnOff : true, // optional (default false) turn off stepper after this movement?
+   *   relative : true, // optional (default false) the step number is relative (not absolute)
+   * }).then(() => {
+   *   // movement finished...
+   * });
+   * ```
+   *
+   * @param {number} position - The position in steps to move to (can be either positive or negative)
+   * @param {any} options - Optional options struct
+   * @returns {any} A Promise that resolves when the stepper has finished moving
+   * @url http://www.espruino.com/Reference#l_Stepper_moveTo
+   */
+  moveTo(position: number, options: any): Promise<void>;
+
+  /**
+   * Stop a stepper motor that is currently running.
+   * You can specify `.stop({turnOff:true})` to force the stepper motor to turn off.
+   *
+   * @param {any} options - Optional options struct
+   * @url http://www.espruino.com/Reference#l_Stepper_stop
+   */
+  stop(options: any): void;
+
+  /**
+   * Get the current position of the stepper motor in steps
+   * @returns {number} The current position of the stepper motor in steps
+   * @url http://www.espruino.com/Reference#l_Stepper_getPosition
+   */
+  getPosition(): number;
+}
+
 interface StringConstructor {
   /**
    * Return the character(s) represented by the given character code(s).
@@ -10442,13 +11126,12 @@ interface String {
   /**
    * Return the integer value of a single character at the given position in the
    * String.
-   * Note that this returns 0 not 'NaN' for out of bounds characters
    *
    * @param {number} pos - The character number in the string. Negative values return characters from end of string (-1 = last char)
-   * @returns {number} The integer value of a character in the string
+   * @returns {any} The integer value of a character in the string, or `NaN` if out of bounds
    * @url http://www.espruino.com/Reference#l_String_charCodeAt
    */
-  charCodeAt(pos: number): number;
+  charCodeAt(pos: number): any;
 
   /**
    * Return the index of substring in this string, or -1 if not found
@@ -10500,16 +11183,26 @@ interface String {
 
   /**
    * Search and replace ONE occurrence of `subStr` with `newSubStr` and return the
-   * result. This doesn't alter the original string. Regular expressions not
-   * supported.
+   * result. This doesn't alter the original string.
    *
-   * @param {any} subStr - The string to search for
-   * @param {any} newSubStr - The string to replace it with
+   * @param {any} subStr - The string (or Regular Expression) to search for
+   * @param {any} newSubStr - The string to replace it with. Replacer functions are supported, but only when subStr is a `RegExp`
    * @returns {any} This string with `subStr` replaced
    * @url http://www.espruino.com/Reference#l_String_replace
    */
   replace(subStr: any, newSubStr: any): any;
 
+  /**
+   * Search and replace ALL occurrences of `subStr` with `newSubStr` and return the
+   * result. This doesn't alter the original string.
+   *
+   * @param {any} subStr - The string (or Regular Expression) to search for
+   * @param {any} newSubStr - The string to replace it with. Replacer functions are supported, but only when subStr is a `RegExp`
+   * @returns {any} This string with `subStr` replaced
+   * @url http://www.espruino.com/Reference#l_String_replaceAll
+   */
+  replaceAll(subStr: any, newSubStr: any): any;
+
   /**
    *
    * @param {number} start - The start character index (inclusive)
@@ -10563,6 +11256,15 @@ interface String {
    */
   toUpperCase(): any;
 
+  /**
+   * This is not a standard JavaScript function, but is provided to allow use of fonts
+   * that only support ASCII (char codes 0..127, like the 4x6 font) with character input
+   * that might be in the ISO8859-1 range.
+   * @returns {any} This string with the accents/diacritics (such as é, ü) removed from characters in the ISO 8859-1 set
+   * @url http://www.espruino.com/Reference#l_String_removeAccents
+   */
+  removeAccents(): any;
+
   /**
    * Return a new string with any whitespace (tabs, space, form feed, newline,
    * carriage return, etc) removed from the beginning and end.
@@ -10864,6 +11566,44 @@ declare class Pin {
    */
   toggle(): boolean;
 
+  /**
+   * (Added in 2v20) Pulse the pin with the value for the given time in milliseconds.
+   * ```
+   * LED.pulse(1, 100); // pulse LED on for 100ms
+   * LED.pulse(1, [100,1000,100]); // pulse LED on for 100ms, off for 1s, on for 100ms
+   * ```
+   * This is identical to `digitalPulse`.
+   *
+   * @param {boolean} value - Whether to pulse high (true) or low (false)
+   * @param {any} time - A time in milliseconds, or an array of times (in which case a square wave will be output starting with a pulse of 'value')
+   * @url http://www.espruino.com/Reference#l_Pin_pulse
+   */
+  pulse(value: boolean, time: any): void;
+
+  /**
+   * (Added in 2v20) Get the analogue value of the given pin. See `analogRead` for more information.
+   * @returns {number} The analog Value of the Pin between 0 and 1
+   * @url http://www.espruino.com/Reference#l_Pin_analog
+   */
+  analog(): number;
+
+  /**
+   * (Added in 2v20) Set the analog Value of a pin. It will be output using PWM.
+   * See `analogWrite` for more information.
+   * Objects can contain:
+   * * `freq` - pulse frequency in Hz, e.g. ```analogWrite(A0,0.5,{ freq : 10 });``` -
+   *   specifying a frequency will force PWM output, even if the pin has a DAC
+   * * `soft` - boolean, If true software PWM is used if hardware is not available.
+   * * `forceSoft` - boolean, If true software PWM is used even if hardware PWM or a
+   *   DAC is available
+   *
+   * @param {number} value - A value between 0 and 1
+   * @param {any} options
+   * An object containing options for analog output - see below
+   * @url http://www.espruino.com/Reference#l_Pin_pwm
+   */
+  pwm(value: number, options: any): void;
+
   /**
    * Get information about this pin and its capabilities. Of the form:
    * ```
@@ -10983,6 +11723,42 @@ declare function compass(): any;
  */
 declare const FET: Pin;
 
+/**
+ * `Q0` and `Q1` Qwiic connectors can have their power controlled by a 500mA FET (`Q0.fet`) which switches GND.
+ * The `sda` and `scl` pins on this port are also analog inputs - use `analogRead(Q0.sda)`/etc
+ * To turn this connector on run `Q0.setPower(1)`
+ * @returns {any} An object containing the pins for the Q0 connector on Jolt.js `{sda,scl,fet}`
+ * @url http://www.espruino.com/Reference#l__global_Q0
+ */
+declare const Q0: Qwiic;
+
+/**
+ * `Q0` and `Q1` Qwiic connectors can have their power controlled by a 500mA FET (`Q1.fet`) which switches GND.
+ * The `sda` and `scl` pins on this port are also analog inputs - use `analogRead(Q1.sda)`/etc
+ * To turn this connector on run `Q1.setPower(1)`
+ * @returns {any} An object containing the pins for the Q1 connector on Jolt.js `{sda,scl,fet}`
+ * @url http://www.espruino.com/Reference#l__global_Q1
+ */
+declare const Q1: Qwiic;
+
+/**
+ * `Q2` and `Q3` have all 4 pins connected to Jolt.js's GPIO (including those usually used for power).
+ * As such only around 8mA of power can be supplied to any connected device.
+ * To use this as a normal Qwiic connector, run `Q2.setPower(1)`
+ * @returns {any} An object containing the pins for the Q2 connector on Jolt.js `{sda,scl,gnd,vcc}`
+ * @url http://www.espruino.com/Reference#l__global_Q2
+ */
+declare const Q2: Qwiic;
+
+/**
+ * `Q2` and `Q3` have all 4 pins connected to Jolt.js's GPIO (including those usually used for power).
+ * As such only around 8mA of power can be supplied to any connected device.
+ * To use this as a normal Qwiic connector, run `Q3.setPower(1)`
+ * @returns {any} An object containing the pins for the Q3 connector on Jolt.js `{sda,scl,gnd,vcc}`
+ * @url http://www.espruino.com/Reference#l__global_Q3
+ */
+declare const Q3: Qwiic;
+
 /**
  * The Bangle.js's vibration motor.
  * @returns {Pin}
@@ -11170,110 +11946,6 @@ declare const IOEXT3: Pin;
  */
 declare const Terminal: Serial;
 
-declare const global: {
-  SDA: typeof SDA;
-  SCL: typeof SCL;
-  show: typeof show;
-  acceleration: typeof acceleration;
-  compass: typeof compass;
-  FET: typeof FET;
-  VIBRATE: typeof VIBRATE;
-  LED: typeof LED;
-  LED1: typeof LED1;
-  LED2: typeof LED2;
-  BTNA: typeof BTNA;
-  BTNB: typeof BTNB;
-  BTNU: typeof BTNU;
-  BTND: typeof BTND;
-  BTNL: typeof BTNL;
-  BTNR: typeof BTNR;
-  CORNER1: typeof CORNER1;
-  CORNER2: typeof CORNER2;
-  CORNER3: typeof CORNER3;
-  CORNER4: typeof CORNER4;
-  CORNER5: typeof CORNER5;
-  CORNER6: typeof CORNER6;
-  Bluetooth: typeof Bluetooth;
-  MOS1: typeof MOS1;
-  MOS2: typeof MOS2;
-  MOS3: typeof MOS3;
-  MOS4: typeof MOS4;
-  IOEXT0: typeof IOEXT0;
-  IOEXT1: typeof IOEXT1;
-  IOEXT2: typeof IOEXT2;
-  IOEXT3: typeof IOEXT3;
-  Terminal: typeof Terminal;
-  global: typeof global;
-  setBusyIndicator: typeof setBusyIndicator;
-  setSleepIndicator: typeof setSleepIndicator;
-  setDeepSleep: typeof setDeepSleep;
-  dump: typeof dump;
-  load: typeof load;
-  save: typeof save;
-  reset: typeof reset;
-  edit: typeof edit;
-  echo: typeof echo;
-  getTime: typeof getTime;
-  setTime: typeof setTime;
-  getSerial: typeof getSerial;
-  setInterval: typeof setInterval;
-  setTimeout: typeof setTimeout;
-  clearInterval: typeof clearInterval;
-  clearTimeout: typeof clearTimeout;
-  changeInterval: typeof changeInterval;
-  peek8: typeof peek8;
-  poke8: typeof poke8;
-  peek16: typeof peek16;
-  poke16: typeof poke16;
-  peek32: typeof peek32;
-  poke32: typeof poke32;
-  analogRead: typeof analogRead;
-  analogWrite: typeof analogWrite;
-  digitalPulse: typeof digitalPulse;
-  digitalWrite: typeof digitalWrite;
-  digitalRead: typeof digitalRead;
-  pinMode: typeof pinMode;
-  getPinMode: typeof getPinMode;
-  shiftOut: typeof shiftOut;
-  setWatch: typeof setWatch;
-  clearWatch: typeof clearWatch;
-  arguments: typeof arguments;
-  eval: typeof eval;
-  parseInt: typeof parseInt;
-  parseFloat: typeof parseFloat;
-  isFinite: typeof isFinite;
-  isNaN: typeof isNaN;
-  btoa: typeof btoa;
-  atob: typeof atob;
-  encodeURIComponent: typeof encodeURIComponent;
-  decodeURIComponent: typeof decodeURIComponent;
-  trace: typeof trace;
-  print: typeof print;
-  require: typeof require;
-  __FILE__: typeof __FILE__;
-  SPI1: typeof SPI1;
-  SPI2: typeof SPI2;
-  SPI3: typeof SPI3;
-  I2C1: typeof I2C1;
-  I2C2: typeof I2C2;
-  I2C3: typeof I2C3;
-  USB: typeof USB;
-  Serial1: typeof Serial1;
-  Serial2: typeof Serial2;
-  Serial3: typeof Serial3;
-  Serial4: typeof Serial4;
-  Serial5: typeof Serial5;
-  Serial6: typeof Serial6;
-  LoopbackA: typeof LoopbackA;
-  LoopbackB: typeof LoopbackB;
-  Telnet: typeof Telnet;
-  NaN: typeof NaN;
-  Infinity: typeof Infinity;
-  HIGH: typeof HIGH;
-  LOW: typeof LOW;
-  [key: string]: any;
-}
-
 /**
  * When Espruino is busy, set the pin specified here high. Set this to undefined to
  * disable the feature.
@@ -11601,16 +12273,19 @@ declare function peek32(addr: number, count: number): Uint8Array;
 declare function poke32(addr: number, value: number | number[]): void;
 
 /**
- * Get the analogue value of the given pin
+ * Get the analogue value of the given pin.
  * This is different to Arduino which only returns an integer between 0 and 1023
  * However only pins connected to an ADC will work (see the datasheet)
- *  **Note:** if you didn't call `pinMode` beforehand then this function will also
- *  reset pin's state to `"analog"`
+ * **Note:** if you didn't call `pinMode` beforehand then this function will also
+ * reset pin's state to `"analog"`
+ * **Note:** [Jolt.js](https://www.espruino.com/Jolt.js) motor driver pins with
+ * analog inputs are scaled with a potential divider, and so those pins return a
+ * number which is the actual voltage.
  *
  * @param {Pin} pin
  * The pin to use
  * You can find out which pins to use by looking at [your board's reference page](#boards) and searching for pins with the `ADC` markers.
- * @returns {number} The analog Value of the Pin between 0 and 1
+ * @returns {number} The Analog Value of the Pin between 0(GND) and 1(VCC). See below.
  * @url http://www.espruino.com/Reference#l__global_analogRead
  */
 declare function analogRead(pin: Pin): number;
@@ -11623,6 +12298,9 @@ declare function analogRead(pin: Pin): number;
  * * `soft` - boolean, If true software PWM is used if hardware is not available.
  * * `forceSoft` - boolean, If true software PWM is used even if hardware PWM or a
  *   DAC is available
+ * On nRF52-based devices (Puck.js, Pixl.js, MDBT42Q, etc) hardware PWM runs at
+ * 16MHz, with a maximum output frequency of 4MHz (but with only 2 bit (0..3) accuracy).
+ * At 1Mhz, you have 4 bits (0..15), 1kHz = 14 bits and so on.
  *  **Note:** if you didn't call `pinMode` beforehand then this function will also
  *  reset pin's state to `"output"`
  *
@@ -11658,8 +12336,12 @@ declare function digitalPulse(pin: Pin, value: boolean, time: number | number[])
 
 /**
  * Set the digital value of the given pin.
- *  **Note:** if you didn't call `pinMode` beforehand then this function will also
- *  reset pin's state to `"output"`
+ * ```
+ * digitalWrite(LED1, 1); // light LED1
+ * digitalWrite([LED1,LED2,LED3], 0b101); // lights LED1 and LED3
+ * ```
+ *  **Note:** if you didn't call `pinMode(pin, ...)` or `Pin.mode(...)` beforehand then this function will also
+ * reset pin's state to `"output"`
  * If pin argument is an array of pins (e.g. `[A2,A1,A0]`) the value argument will
  * be treated as an array of bits where the last array element is the least
  * significant bit.
@@ -11667,11 +12349,15 @@ declare function digitalPulse(pin: Pin, value: boolean, time: number | number[])
  * right-hand side of the array of pins). This means you can use the same pin
  * multiple times, for example `digitalWrite([A1,A1,A0,A0],0b0101)` would pulse A0
  * followed by A1.
+ * In 2v22 and later firmwares, using a boolean for the value will set *all* pins in
+ * the array to the same value, eg `digitalWrite(pins, value?0xFFFFFFFF:0)`. Previously
+ * digitalWrite with a boolean behaved like `digitalWrite(pins, value?1:0)` and would
+ * only set the first pin.
  * If the pin argument is an object with a `write` method, the `write` method will
  * be called with the value passed through.
  *
  * @param {any} pin - The pin to use
- * @param {number} value - Whether to pulse high (true) or low (false)
+ * @param {any} value - Whether to write a high (true) or low (false) value
  * @url http://www.espruino.com/Reference#l__global_digitalWrite
  */
 declare function digitalWrite(pin: Pin, value: boolean): void;
@@ -11826,7 +12512,7 @@ declare function shiftOut(pins: Pin | Pin[], options: { clk?: Pin, clkPol?: bool
  *
  * @param {any} function - A Function or String to be executed
  * @param {Pin} pin - The pin to watch
- * @param {any} options - If a boolean or integer, it determines whether to call this once (false = default) or every time a change occurs (true). Can be an object of the form `{ repeat: true/false(default), edge:'rising'/'falling'/'both'(default), debounce:10}` - see below for more information.
+ * @param {any} options - If a boolean or integer, it determines whether to call this once (false = default) or every time a change occurs (true). Can be an object of the form `{ repeat: true/false(default), edge:'rising'/'falling'/'both', debounce:10}` - see below for more information.
  * @returns {any} An ID that can be passed to clearWatch
  * @url http://www.espruino.com/Reference#l__global_setWatch
  */
@@ -11842,6 +12528,123 @@ declare function setWatch(func: ((arg: { state: boolean, time: number, lastTime:
 declare function clearWatch(id: number): void;
 declare function clearWatch(): void;
 
+declare const global: {
+  SDA: typeof SDA;
+  SCL: typeof SCL;
+  show: typeof show;
+  acceleration: typeof acceleration;
+  compass: typeof compass;
+  FET: typeof FET;
+  Q0: typeof Q0;
+  Q1: typeof Q1;
+  Q2: typeof Q2;
+  Q3: typeof Q3;
+  VIBRATE: typeof VIBRATE;
+  LED: typeof LED;
+  LED1: typeof LED1;
+  LED2: typeof LED2;
+  BTNA: typeof BTNA;
+  BTNB: typeof BTNB;
+  BTNU: typeof BTNU;
+  BTND: typeof BTND;
+  BTNL: typeof BTNL;
+  BTNR: typeof BTNR;
+  CORNER1: typeof CORNER1;
+  CORNER2: typeof CORNER2;
+  CORNER3: typeof CORNER3;
+  CORNER4: typeof CORNER4;
+  CORNER5: typeof CORNER5;
+  CORNER6: typeof CORNER6;
+  Bluetooth: typeof Bluetooth;
+  MOS1: typeof MOS1;
+  MOS2: typeof MOS2;
+  MOS3: typeof MOS3;
+  MOS4: typeof MOS4;
+  IOEXT0: typeof IOEXT0;
+  IOEXT1: typeof IOEXT1;
+  IOEXT2: typeof IOEXT2;
+  IOEXT3: typeof IOEXT3;
+  Terminal: typeof Terminal;
+  setBusyIndicator: typeof setBusyIndicator;
+  setSleepIndicator: typeof setSleepIndicator;
+  setDeepSleep: typeof setDeepSleep;
+  dump: typeof dump;
+  load: typeof load;
+  save: typeof save;
+  reset: typeof reset;
+  edit: typeof edit;
+  echo: typeof echo;
+  getTime: typeof getTime;
+  setTime: typeof setTime;
+  getSerial: typeof getSerial;
+  setInterval: typeof setInterval;
+  setTimeout: typeof setTimeout;
+  clearInterval: typeof clearInterval;
+  clearTimeout: typeof clearTimeout;
+  changeInterval: typeof changeInterval;
+  peek8: typeof peek8;
+  poke8: typeof poke8;
+  peek16: typeof peek16;
+  poke16: typeof poke16;
+  peek32: typeof peek32;
+  poke32: typeof poke32;
+  analogRead: typeof analogRead;
+  analogWrite: typeof analogWrite;
+  digitalPulse: typeof digitalPulse;
+  digitalWrite: typeof digitalWrite;
+  digitalRead: typeof digitalRead;
+  pinMode: typeof pinMode;
+  getPinMode: typeof getPinMode;
+  shiftOut: typeof shiftOut;
+  setWatch: typeof setWatch;
+  clearWatch: typeof clearWatch;
+  global: typeof global;
+  globalThis: typeof globalThis;
+  arguments: typeof arguments;
+  eval: typeof eval;
+  parseInt: typeof parseInt;
+  parseFloat: typeof parseFloat;
+  isFinite: typeof isFinite;
+  isNaN: typeof isNaN;
+  btoa: typeof btoa;
+  atob: typeof atob;
+  encodeURIComponent: typeof encodeURIComponent;
+  decodeURIComponent: typeof decodeURIComponent;
+  trace: typeof trace;
+  print: typeof print;
+  require: typeof require;
+  __FILE__: typeof __FILE__;
+  SPI1: typeof SPI1;
+  SPI2: typeof SPI2;
+  SPI3: typeof SPI3;
+  I2C1: typeof I2C1;
+  I2C2: typeof I2C2;
+  I2C3: typeof I2C3;
+  USB: typeof USB;
+  Serial1: typeof Serial1;
+  Serial2: typeof Serial2;
+  Serial3: typeof Serial3;
+  Serial4: typeof Serial4;
+  Serial5: typeof Serial5;
+  Serial6: typeof Serial6;
+  LoopbackA: typeof LoopbackA;
+  LoopbackB: typeof LoopbackB;
+  Telnet: typeof Telnet;
+  NaN: typeof NaN;
+  Infinity: typeof Infinity;
+  HIGH: typeof HIGH;
+  LOW: typeof LOW;
+  [key: string]: any;
+}
+
+/**
+ * A reference to the global scope, where everything is defined.
+ * This is identical to `global` but was introduced in the ECMAScript spec.
+ * @returns {any} The global scope
+ * @url http://www.espruino.com/Reference#l__global_globalThis
+ */
+// globalThis - builtin
+
 /**
  * A variable containing the arguments given to the function:
  * ```
@@ -13309,6 +14112,7 @@ declare module "fs" {
   function mkdirSync(path: any): boolean;
 
   /**
+   * Pipe this file to a destination stream (object which has a `.write(data)` method).
    *
    * @param {any} source - The source file/stream that will send content.
    * @param {any} destination - The destination file/stream that will receive content from the source.
@@ -13394,12 +14198,23 @@ declare module "tensorflow" {
  * Functions here take and return buffers of data. There is no support for
  * streaming, so both the compressed and decompressed data must be able to fit in
  * memory at the same time.
+ * ```
+ * var c = require("heatshrink").compress("Hello World");
+ * // =new Uint8Array([....]).buffer
+ * var d = require("heatshrink").decompress(c);
+ * // =new Uint8Array([72, 101, ...]).buffer
+ * E.toString(d)
+ * // ="Hello World"
+ * ```
  * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
  * @url http://www.espruino.com/Reference#heatshrink
  */
 declare module "heatshrink" {
   /**
-   * Compress the heatshrink-encoded data supplied as input.
+   * Compress the data supplied as input, and return heatshrink encoded data as an ArrayBuffer.
+   * No type information is stored, and the `data` argument is treated as an array of bytes
+   * (whether it is a `String`/`Uint8Array` or even `Uint16Array`), so the result of
+   * decompressing any compressed data will always be an ArrayBuffer.
    * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
    *
    * @param {any} data - The data to compress
@@ -13409,11 +14224,12 @@ declare module "heatshrink" {
   function compress(data: any): ArrayBuffer;
 
   /**
-   * Decompress the heatshrink-encoded data supplied as input.
+   * Decompress the heatshrink-encoded data supplied as input, and return it as an `ArrayBuffer`.
+   * To get the result as a String, wrap `require("heatshrink").decompress` in `E.toString`: `E.toString(require("heatshrink").decompress(...))`
    * If you'd like a way to perform compression/decompression on desktop, check out https://github.com/espruino/EspruinoWebTools#heatshrinkjs
    *
    * @param {any} data - The data to decompress
-   * @returns {any} Returns the result as an ArrayBuffer
+   * @returns {any} Returns the result as an `ArrayBuffer`
    * @url http://www.espruino.com/Reference#l_heatshrink_decompress
    */
   function decompress(data: any): ArrayBuffer;
@@ -13520,7 +14336,8 @@ declare module "Storage" {
   /**
    * Erase a single file from the flash storage area.
    * **Note:** This function should be used with normal files, and not `StorageFile`s
-   * created with `require("Storage").open(filename, ...)`
+   * created with `require("Storage").open(filename, ...)`. To erase those, use
+   * `require("Storage").open(..., "r").erase()`.
    *
    * @param {any} name - The filename - max 28 characters (case sensitive)
    * @url http://www.espruino.com/Reference#l_Storage_erase
@@ -13596,9 +14413,12 @@ declare module "Storage" {
    * try and overwrite data that already exists**. For instance:
    * ```
    * var f = require("Storage");
-   * f.write("a","Hello",0,14);
-   * f.write("a"," ",5);
-   * f.write("a","World!!!",6);
+   * f.write("a","Hello",0,14); // Creates a new file, 14 chars long
+   * print(JSON.stringify(f.read("a"))); // read the file
+   * // any nonwritten chars will be char code 255:
+   * "Hello\u00FF\u00FF\u00FF\u00FF\u00FF\u00FF\u00FF\u00FF\u00FF"
+   * f.write("a"," ",5); // write within the file
+   * f.write("a","World!!!",6); // write again within the file
    * print(f.read("a")); // "Hello World!!!"
    * f.write("a"," ",0); // Writing to location 0 again will cause the file to be re-written
    * print(f.read("a")); // " "
@@ -13611,7 +14431,7 @@ declare module "Storage" {
    *
    * @param {any} name - The filename - max 28 characters (case sensitive)
    * @param {any} data - The data to write
-   * @param {number} [offset] - [optional] The offset within the file to write
+   * @param {number} [offset] - [optional] The offset within the file to write (if `0`/`undefined` a new file is created, otherwise Espruino attempts to write within an existing file if one exists)
    * @param {number} [size] - [optional] The size of the file (if a file is to be created that is bigger than the data)
    * @returns {boolean} True on success, false on failure
    * @url http://www.espruino.com/Reference#l_Storage_write
@@ -13623,9 +14443,15 @@ declare module "Storage" {
    * disappear when the device resets or power is lost.
    * Simply write `require("Storage").writeJSON("MyFile", [1,2,3])` to write a new
    * file, and `require("Storage").readJSON("MyFile")` to read it.
-   * This is equivalent to: `require("Storage").write(name, JSON.stringify(data))`
+   * This is (almost) equivalent to `require("Storage").write(name, JSON.stringify(data))` (see the notes below)
    * **Note:** This function should be used with normal files, and not `StorageFile`s
    * created with `require("Storage").open(filename, ...)`
+   * **Note:** Normally `JSON.stringify` converts any non-standard character to an escape code with `\uXXXX`, but
+   * as of Espruino 2v20, when writing to a file we use the most compact form, like `\xXX` or `\X`, as well as
+   * skipping quotes on fields. This saves space and is faster, but also means that if a String wasn't a UTF8
+   * string but contained characters in the UTF8 codepoint range, when saved it won't end up getting reloaded as a UTF8 string.
+   * It does mean that you cannot parse the file with just `JSON.parse` as it's no longer standard JSON but is JS,
+   * so you must use `Storage.readJSON`
    *
    * @param {any} name - The filename - max 28 characters (case sensitive)
    * @param {any} data - The JSON data to write
@@ -13692,9 +14518,11 @@ declare module "Storage" {
    * become garbled when compaction happens. To avoid this, call `eraseFiles` before
    * uploading data that you intend to reference to ensure that uploaded files are
    * right at the start of flash and cannot be compacted further.
+   *
+   * @param {boolean} [showMessage] - [optional] If true, an overlay message will be displayed on the screen while compaction is happening. Default is false.
    * @url http://www.espruino.com/Reference#l_Storage_compact
    */
-  function compact(): void;
+  function compact(showMessage?: boolean): void;
 
   /**
    * This writes information about all blocks in flash memory to the console - and is
@@ -13707,10 +14535,13 @@ declare module "Storage" {
    * Return the amount of free bytes available in Storage. Due to fragmentation there
    * may be more bytes available, but this represents the maximum size of file that
    * can be written.
+   * **NOTE:** `checkInternalFlash` is only useful on DICKENS devices - other devices don't use two different flash banks
+   *
+   * @param {boolean} checkInternalFlash - Check the internal flash (rather than external SPI flash).  Default false, so will check external storage
    * @returns {number} The amount of free bytes
    * @url http://www.espruino.com/Reference#l_Storage_getFree
    */
-  function getFree(): number;
+  function getFree(checkInternalFlash: boolean): number;
 
   /**
    * Returns:
@@ -13724,10 +14555,13 @@ declare module "Storage" {
    *   trashCount // How many trash files do we have? (can be cleared with .compact)
    * }
    * ```
+   * **NOTE:** `checkInternalFlash` is only useful on DICKENS devices - other devices don't use two different flash banks
+   *
+   * @param {boolean} checkInternalFlash - Check the internal flash (rather than external SPI flash).  Default false, so will check external storage
    * @returns {any} An object containing info about the current Storage system
    * @url http://www.espruino.com/Reference#l_Storage_getStats
    */
-  function getStats(): any;
+  function getStats(checkInternalFlash: boolean): any;
 
   /**
    * Writes a lookup table for files into Bangle.js's storage. This allows any file
diff --git a/typescript/types/settings.d.ts b/typescript/types/settings.d.ts
index a46b6ace7..fd0968b59 100644
--- a/typescript/types/settings.d.ts
+++ b/typescript/types/settings.d.ts
@@ -5,6 +5,8 @@ type Settings = {
 
 	ble: boolean,
 	blerepl: boolean,
+	bleprivacy?: NRFSecurityStatus["privacy"],
+	blename?: boolean,
 	HID?: false | "kbmedia" | "kb" | "com" | "joy",
 
 	passkey?: string,
diff --git a/webtools b/webtools
index 7e4283948..71f271a1c 160000
--- a/webtools
+++ b/webtools
@@ -1 +1 @@
-Subproject commit 7e4283948f68b1dd14a59a73e544c537a26c800a
+Subproject commit 71f271a1c7be37efe4e472b7482b08ded1d0ab6f
