diff --git a/apps/ac_ac/ChangeLog.txt b/apps/ac_ac/ChangeLog
similarity index 100%
rename from apps/ac_ac/ChangeLog.txt
rename to apps/ac_ac/ChangeLog
diff --git a/apps/arrow/README.md b/apps/arrow/README.md
index 4b77dbc42..2833eab24 100644
--- a/apps/arrow/README.md
+++ b/apps/arrow/README.md
@@ -43,3 +43,7 @@ charge.
 
 This app is based in the work done by [jeffmer](https://github.com/jeffmer/JeffsBangleAppsDev)
 
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/barometer/ChangeLog b/apps/barometer/ChangeLog
index 031a86cdc..de3a5cb96 100644
--- a/apps/barometer/ChangeLog
+++ b/apps/barometer/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Display pressure as number and hand
 0.02: Use theme color
+0.03: workaround for some firmwares that return 'undefined' for first call to barometer
diff --git a/apps/barometer/app.js b/apps/barometer/app.js
index 2ce95864b..77d4c974f 100644
--- a/apps/barometer/app.js
+++ b/apps/barometer/app.js
@@ -110,9 +110,13 @@ drawScaleLabels();
 drawIcons();
 
 try {
-  Bangle.getPressure().then(data => {
-    drawHand(Math.round(data.pressure));
-  });
+  function baroHandler(data) {
+    if (data===undefined) // workaround for https://github.com/espruino/BangleApps/issues/1429
+      setTimeout(() => Bangle.getPressure().then(baroHandler), 500);
+    else
+      drawHand(Math.round(data.pressure));
+  }
+  Bangle.getPressure().then(baroHandler);
 } catch(e) {
   print(e.message);
   print("barometer not supporter, show a demo value");
diff --git a/apps/barometer/metadata.json b/apps/barometer/metadata.json
index 68af55c68..a385f2be2 100644
--- a/apps/barometer/metadata.json
+++ b/apps/barometer/metadata.json
@@ -1,7 +1,7 @@
 { "id": "barometer",
   "name": "Barometer",
   "shortName":"Barometer",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A simple barometer that displays the current air pressure",
   "icon": "barometer.png",
   "tags": "tool,outdoors",
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index 702a8091e..4c3d3b930 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -45,3 +45,4 @@
 0.39: Fix passkey support (fix https://github.com/espruino/Espruino/issues/2035)
 0.40: Bootloader now rebuilds for new firmware versions
 0.41: Add Keyboard and Mouse Bluetooth HID option
+0.42: Sort *.boot.js files lexically and by optional numeric priority, e.g. appname.<priority>.boot.js
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 1b826de5a..63424bfbf 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -195,7 +195,19 @@ if (!Bangle.appRect) { // added in 2v11 - polyfill for older firmwares
 
 // Append *.boot.js files
 // These could change bleServices/bleServiceOptions if needed
-require('Storage').list(/\.boot\.js/).forEach(bootFile=>{
+var getPriority = /.*\.(\d+)\.boot\.js$/;
+require('Storage').list(/\.boot\.js/).sort((a,b)=>{
+  var aPriority = a.match(getPriority);
+  var bPriority = b.match(getPriority);
+  if (aPriority && bPriority){
+    return parseInt(aPriority[1]) - parseInt(bPriority[1]);
+  } else if (aPriority && !bPriority){
+    return -1;
+  } else if (!aPriority && bPriority){
+    return 1;
+  }
+  return a > b;
+}).forEach(bootFile=>{
   // we add a semicolon so if the file is wrapped in (function(){ ... }()
   // with no semicolon we don't end up with (function(){ ... }()(function(){ ... }()
   // which would cause an error!
diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json
index ebbf762c0..4cbfd9c59 100644
--- a/apps/boot/metadata.json
+++ b/apps/boot/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.41",
+  "version": "0.42",
   "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/bowserWF/README.md b/apps/bowserWF/README.md
new file mode 100644
index 000000000..19dc84c83
--- /dev/null
+++ b/apps/bowserWF/README.md
@@ -0,0 +1,6 @@
+# Bowser Watchface
+
+Show your evil character.
+With style!
+
+Bowser jumps once every minute to advance the clock. hehe
diff --git a/apps/bowserWF/app-icon.js b/apps/bowserWF/app-icon.js
new file mode 100644
index 000000000..7d040b0ad
--- /dev/null
+++ b/apps/bowserWF/app-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("Ly+EARERERERERERERERER//8RERERERERERERERERERERERERERERzP//d3EREREREREREREREREREREREREcz//3dxERERERERERERERERERERERERHMz/93dxERERERERERERERERERERERERd8zHd3f/8REREREREREREREREREREREXfMx3d3//ERERERERERERERERERERERF3d3d3d//3cRHBEREREREREREREREREXd3d3d3f/93fMDMERERERERERERERERF3d3d3d3//d3zAzBERERERERERERERERd3d3fMd3f//8zMwREREREREREREREREXd3d8zMd3f/zMzMERERERERERERERERF3d3fMzHd3/8zMzBERERERERER93d3//d3d3x3/Mx3fMzP8REREREREXzP/3d//3d3d8d3fMzMz/8RERERERERF8z/93f/93d3fHd3zMzM//ERERER//93zM//93//d3d3z/d/9////xEREREcz/d3zM/3d///d3d8zHERH/ERERERERHM/3d8zP93f//3d3fMxxER/xERERER/3zMd3d3d3d3f///d3zM8REREREREREf93d3d3d3d3d3d///d3zMERERERERERH/d3d3d3d3d3d3f//3d8zBERERERERERd3d3f///d3d3d3//93fMzP8RERERERH//3d3zP/3d//////3d3d8wRERERERER//93d8z/93f/////93d3fMEREREREREc//d3fMx3f//MzMd3d3d3dxERERERERHMx3d3d3d//8zMAPd3zMzHERERERERH/d3d3d3d3f3fMzwDMzAD8zBERERERER/3d3d3d3d393zM8AzMwA/MwRERERERH913d///d3d/d3AAzMzMAAzMERERERERREd3fM/3d//3d//MzMzMwP/BEREREREURHd3zP93f/93f/zMzMzMD/wRERERERFP/3d8zHd3//d3d3zMzMzAAMERERERER//93d3d3d//3d3d8zMzMwP8BEREREREf//d3d3d3f/93d3fMzMzMD/ARERERERFMzHf/93d3/3d3d3EczM/wABERERERERR3x3fMd3f/93d3dxEREREREREREREREUd8d3zHd3//d3d3cRERERERERERERERFHd3d3d///d3d3dxERERERERERERERERR3d3f///93d3dxEREREREREREREREREUd3d3////d3d3cRERERERERERERERERH//////3d3d3d8ERERERERERERERERER/////MzMx3fMz/8REREREREREREREREf////zMzMd3zM//EREREREREREREREREf/8zMzMzMzMzP//ERERERERERERERERERzMzM/8zP/xEREREREREREREREREREREczMzP/Mz/8REREREREREREREREREREczMzMz//8///xERERERERERERERERERA="))
diff --git a/apps/bowserWF/app.js b/apps/bowserWF/app.js
new file mode 100644
index 000000000..e53d945cc
--- /dev/null
+++ b/apps/bowserWF/app.js
@@ -0,0 +1,102 @@
+var sprite = {
+  width : 47, height : 47, bpp : 3,
+  transparent : 1,
+  buffer : require("heatshrink").decompress(atob("kmSpICFn/+BAwCImV//VICJuT//SogRMpmT/2SCJtSyQDB/4RMymRkmX/gRLygDC3/piVhCJElAYf/pNIkgRIlIDCl/6pVBkIRIGwWJEYPypMJCI9KGwQRBLANIPRI2CGoPkyVCBwmeyVLTYNJom8yImBz4gEqV/6Vf+g2BPwf/IIq8C/+kyVRkgDBp/5CIX/+mkz/+y/9BIOf0v6///5LdCz+kCIOk34RBYQMSp5XBGQVk/pNBAQP/9IyBxGSv4yCk/1OIK8EC4QgEpM/JgJ+EGoIRBTApQCEYvplLOFXIIdBO4SqBeQJABGoeTDQMlk5WCAAPSYQLgEz4aBlM/9IgB/7CCcAvP/QsBiVfUwOJBgUiCIcmpAVCy/+pMAKwMkRgIRCp6VBAwW6qVOgmSgPkwgRDv53E6WSuEkyEPRgmf2VJv5HBl2SgAKBwEJRgnJiVKp/Sr/0y/yBQOQv56DKwVSv2STwO/DgWD/BADmaDByRoBYoQRCgFCCIf/+jgDNwOUAwMg/kSPQbODX4IJBAwUH8B6DsmRl5oBl7OBklMyV+gBoDycSxMpiVLZwS8EAQeYyjaByR6BBIJBDAQnEIgbFCogOFRgQDBr//I4L0EAQsxAYP//5WCGQ6MCAAKbCpKYEAQiMB//kIQOUyf+CJF/CIIEBTYOfcgQRHBQv/CJKnBpP8GRTCDJIPkGRQCB5I3C/n/EZUgA"))
+};
+
+const boxes = {
+  width : 122, height : 56, bpp : 3,
+  transparent : 1,
+  buffer : require("heatshrink").decompress(atob("kmZkmSpICPwgDBmQUQAQMJAYNkFiOSiQDB5JESAYQsSpADByYsSyBZBydt23bAR+wgFJkwUQAQNggGSposR23AgMkzZESwECpM2IiUAgmSFiW2gDlBFiVsgDlBFiXYgDNBL4MDWZy2FgEGWZy2FgENWZy2EL4MbWZpTBWwZfBXJpTCWwZiCWZpTBWwZiCWZsbWwhiCWZpWCWwTORWwgXRWwgXRWwZESWwZESWwZESWwYXRWwgXRW362/W362/W362/W362/W362/W362/W362/W362/W362/W362/WwuAgazOWwsAgyzOWwsAhqzOWwhfBjazNKYK2DL4K5NKYS2DMQSzNKYK2DMQSzNja2EMQSzNKwS2CZyK2EC6K2EC6K2DIiS2DIiS2DIiUAFoMAAFTkBFtckyAtrLgWSpICnLIIsqyVAgAsqpIA="))
+};
+
+const background = {
+  width : 176, height : 176, bpp : 3,
+  transparent : 5,
+  buffer : require("heatshrink").decompress(atob("kmSpIC/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/ATWAgEAIP1///8iRB8gf/AAOCIPdIIARBBoJB/+E4IP4ABghB9v4CB8BB5g/92//9pB7wP/97FEIO9IgDACAAn8iVBIOlHH4xBDnA+wyY9IAAmB/BB//5B/IOQ/OAARBup5B/yV/IP5B/IP5BRt5B7/wDC7aD8/w+B+3bBgP7IP5B7HYNt23/AQPfIPX/9oCC24IDINwCBIRAAHIOACBHI3+g4EC/l/4BByAQkA//wpED//4gGAhJB3pMAgQFBgEBH3AC/AX4C/AX4C/AX4C/AX4C/AUOAgBB/v//ghB9gf///gH3UgiVIIAJBBwRB5j+CIIf8uBB5//wIIXb//+hJB6o/92/7v5B7/0/97GCIPYAG4MgIP/BjkSIP34/hB//5B/AAQ+0IP5B/IP5BN7ZB97///wCBIPX93yAB2wCB+5B5tv//dt24CB35B5v/+n/t+P/I4PH8ESIO38gFA/+CgH/+EIgiD3gACCPoMAgQ+2AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/AX4C/ASVIgAACgRB/IPY8GkAHBiRB/IPBLKgJB/IP5B/AQUAkmQghB/IP2AgEAyVAiRB/IP5BBpMAIP5B/IIUkgBB/IP5BpoAsBgJBOgEEIIoIBIP5BlyE27dt2EEIJ4CBBAlIgRBgpEAhu2IIO24ESQwxB/IJQhGkEJIL8GHwQCDgOweQpB/IKMkwAKJILVgAofYeQhBzsEAIKICLoESILmBQARBBtuwgZB3kA4B4ENIgJBcpMAIMYCDIOcAgEbHYgCGsEJkhEBE6cBIP5BZfYQ+JIIkDsEBIP5BVyEAIKtAHxgCDwBEBINk2IKCGCIKmSpECIP5BUkEBHyACD2BBUFoMJIP5BSpEbHyQCDIP5BXkmAIP5B/AQcAbKJB/ILH/AAP8hM/AgWSv4KCAAP+gmfAoXJk4ME//gpIEC8mTBgvwkgEC+QRDAAX4gVPAgP5kgsCLwWQh/kMIUf5LuFg4jBAoMBKAJ5EwF/AoUA/yFFoE/CI6RDgY+BCIQsDIP5B/IP5B/IP5B/IJ/AIJfghJBKv0EIJcAIJfwIP5BMhMAAAMEz5BGgmABoVJII9IBgUkII8kBgUSII8CoAMBhJB/IIsQoMAYoP/AAP4YpAMC/+BII9/BgXAYpAMC8DFIBgXwIIcCIP6DCgkQh/kCIRBIbQcBIJAFCgBBICI5BE/IRDFgQA="))
+};
+
+numbersDims = {
+  width: 20,
+  height: 44
+};
+const numbers = [ 
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/ARGQKYQIDAwUEBxMAAQNAgECpMgAQMkB4IOIAQQLCgEQBwQaBgEBB1oCBBwYCCiRWDCIRWEO5wOHAX4CnA=")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/ARNIKYIIEwEAggOKNIQODyAHCBxQsWB3TUFgMgA4sSBwzU/AVA=")), 
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ8gKggIBAwkCBw+QCIQLCgIRCDQcQBwwyDDwUSCgVAAwIOBEwI7EpI7FBw4FDghZGHwgOEF4Y+CEYQ+DBxQADNAIAFNAIOFa/4CoA=")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ8gKosSAwsBBw4aCoEAgQjEBoIpEBwtIBoIUEwEAggUDBwwyDDoWQA4ZWHhIIEJQoOCgI+EBwMQEAYOJO4oLBO4oRDJQrX/AU4")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/ARNIKgQIDwAGBgQOJNQYOCyAHDBxEggB6BBwYDBiVABxIjBCIIODF4YOEAAkBV40QBwxiDNAosEB0IC/AUg")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ5UFkmQAwkCBxIdGCIIIDBxAsTgAaEkEASooOBiQOVJQgOBiBKDBxMSJQwRBLIgRCBwjX/AVA=")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/ARGQKgYICAwcCBxADBiQdDkEANYoOGEAYyEHYoOIHYqfFBxIdDBAMQFgZHCBysSFgwRBO46GFa/4CnA")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ5VGiAGFgIOIDQUgBwUCEYQOJGQYNBHAlADQgOHwEAggUDpANBCgYpBBwmQAwJiGhIjDB1gC/AU4A=")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ8gKYYICAwcEBxGQgAaDgVJgACBDQQOJgB6CBwcAiQODHa4AEhIRBpAHDiARBwAGCgIgCFIYOCFIYOHiQrEJQxlCBwzX/AVAA=")),
+  require("heatshrink").decompress(atob("ikswcBkmSpIC/AQ8gKggIBAwkCBw+QCIQLCgIRCDQcQBzkSTAsBHYoOIL4gOCMooOENAYOCoA4EBwoqDgiGGF4gOEa/4CoA=")),
+];
+digitPositions = [ // relative to the box
+  {x:13, y:6}, {x:32, y:6},
+  {x:74, y:6}, {x:93, y:6},
+];
+
+var drawTimeout;
+const animation_duration = 1; // seconds
+const animation_steps = 20; 
+const jump_height = 45; // top coordinate of the jump
+const seconds_per_minute = 60;
+
+function draw() {
+  const now = new Date();
+  g.drawImage(background, 0, 0);
+  var boxTL_x = 27; var boxTL_y = 29;
+  var sprite_TL_x = 72; var sprite_TL_y = 161 - sprite.height;
+  const seconds = now.getSeconds()%seconds_per_minute + now.getMilliseconds()/1000;
+  const hours = now.getHours();
+  const minutes = now.getMinutes();
+  
+  var time_advance = seconds / animation_duration;
+  
+  if (time_advance < 0.5) {
+    sprite_TL_y += (jump_height - sprite_TL_y) * time_advance * 2;
+  } else if (time_advance < 1) {  
+    sprite_TL_y = jump_height + (sprite_TL_y-jump_height) * (time_advance-0.5) * 2;
+  }
+  const box_penetration = boxTL_y + boxes.height - sprite_TL_y;
+  if (box_penetration > 0) {
+    boxTL_y -= box_penetration;
+  }
+  g.drawImage(boxes, boxTL_x, boxTL_y);
+  g.drawImage(numbers[(hours / 10) >> 0], boxTL_x+digitPositions[0].x, boxTL_y+digitPositions[0].y);
+  g.drawImage(numbers[(hours % 10) >> 0], boxTL_x+digitPositions[1].x, boxTL_y+digitPositions[1].y);
+  g.drawImage(numbers[(minutes / 10) >> 0], boxTL_x+digitPositions[2].x, boxTL_y+digitPositions[2].y);
+  g.drawImage(numbers[(minutes % 10) >> 0], boxTL_x+digitPositions[3].x, boxTL_y+digitPositions[3].y);
+  g.drawImage(sprite, sprite_TL_x, sprite_TL_y);
+  Bangle.drawWidgets();
+  
+  const timeout = time_advance <= 1?
+    animation_duration / animation_steps
+    : (seconds_per_minute - seconds);
+  setTimeout( _=>{
+    drawTimeout = undefined;
+    draw();
+  }, timeout * 1000);
+}
+
+// Clear the screen once, at startup
+g.setTheme({bg:"#00f",fg:"#fff",dark:true}).clear();
+
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) {
+      clearTimeout(drawTimeout);
+    }
+    drawTimeout = undefined;
+  }
+});
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+// Load widgets
+Bangle.loadWidgets();
+
+draw();
diff --git a/apps/bowserWF/app.png b/apps/bowserWF/app.png
new file mode 100644
index 000000000..724d63078
Binary files /dev/null and b/apps/bowserWF/app.png differ
diff --git a/apps/bowserWF/metadata.json b/apps/bowserWF/metadata.json
new file mode 100644
index 000000000..22df2dea4
--- /dev/null
+++ b/apps/bowserWF/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "bowserWF",
+  "name": "Bowser Watchface",
+  "shortName":"Bowser Watchface",
+  "version":"0.01",
+  "description": "Let bowser show you the time",
+  "icon": "app.png",
+  "tags": "",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"bowserWF.app.js","url":"app.js"},
+    {"name":"bowserWF.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/bthrm/ChangeLog b/apps/bthrm/ChangeLog
index 3354a19e8..58d002f22 100644
--- a/apps/bthrm/ChangeLog
+++ b/apps/bthrm/ChangeLog
@@ -17,3 +17,6 @@
 0.06: Fix bug if no request waiting time is set
       Fix bug if no connection data was cached
       Fix error during disconnect
+0.07: Recorder icon only blue if values actually arive
+      Adds some preset modes and a custom one
+      Restructure the settings menu
diff --git a/apps/bthrm/README.md b/apps/bthrm/README.md
index f0c7775c2..42ad619bd 100644
--- a/apps/bthrm/README.md
+++ b/apps/bthrm/README.md
@@ -29,6 +29,7 @@ Heart Rate Service (`180D`) and characteristic (`2A37`).
 So far it has been tested on:
 
 * CooSpo Bluetooth Heart Rate Monitor
+* Wahoo TICKR X 2
 
 ## Internals
 
@@ -36,7 +37,6 @@ This replaces `Bangle.setHRMPower` with its own implementation.
 
 ## TODO
 
-* Maybe a `bthrm.settings.js` and app (that calls it) to enable it to be turned on and off
 * A widget to show connection state?
 * Specify a specific device by address?
 
diff --git a/apps/bthrm/boot.js b/apps/bthrm/boot.js
index 6ac6382d6..339f6f8c6 100644
--- a/apps/bthrm/boot.js
+++ b/apps/bthrm/boot.js
@@ -548,9 +548,7 @@
     E.on("kill", ()=>{
       if (gatt && gatt.connected){
         log("Got killed, trying to disconnect");
-        var promise = gatt.disconnect();
-        promise.then(()=>log("Disconnected on kill"));
-        promise.catch((e)=>log("Error during disconnnect on kill", e));
+        var promise = gatt.disconnect().then(()=>log("Disconnected on kill")).catch((e)=>log("Error during disconnnect on kill", e));
       }
     });
   }
diff --git a/apps/bthrm/default.json b/apps/bthrm/default.json
index c973eef25..64e638b8a 100644
--- a/apps/bthrm/default.json
+++ b/apps/bthrm/default.json
@@ -1,4 +1,5 @@
 {
+  "mode": 1,
   "enabled": true,
   "replace": true,
   "debuglog": false,
@@ -6,6 +7,12 @@
   "allowFallback": true,
   "warnDisconnect": false,
   "fallbackTimeout": 10,
+  "custom_replace": false,
+  "custom_debuglog": false,
+  "custom_startWithHrm": false,
+  "custom_allowFallback": false,
+  "custom_warnDisconnect": false,
+  "custom_fallbackTimeout": 10,
   "gracePeriodNotification": 0,
   "gracePeriodConnect": 0,
   "gracePeriodService": 0,
diff --git a/apps/bthrm/metadata.json b/apps/bthrm/metadata.json
index 9aea5f3aa..1c21269e2 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.06",
+  "version": "0.07",
   "description": "Overrides Bangle.js's build in heart rate monitor with an external Bluetooth one.",
   "icon": "app.png",
   "type": "app",
@@ -12,7 +12,7 @@
   "storage": [
     {"name":"bthrm.app.js","url":"bthrm.js"},
     {"name":"bthrm.recorder.js","url":"recorder.js"},
-    {"name":"bthrm.boot.js","url":"boot.js"},
+    {"name":"bthrm.0.boot.js","url":"boot.js"},
     {"name":"bthrm.img","url":"app-icon.js","evaluate":true},
     {"name":"bthrm.settings.js","url":"settings.js"},
     {"name":"bthrm.default.json","url":"default.json"}
diff --git a/apps/bthrm/recorder.js b/apps/bthrm/recorder.js
index 938990362..21345a907 100644
--- a/apps/bthrm/recorder.js
+++ b/apps/bthrm/recorder.js
@@ -32,7 +32,7 @@
         Bangle.removeListener('BTHRM', onHRM);
         if (Bangle.setBTRHMPower) Bangle.setBTHRMPower(0,"recorder");
       },
-      draw : (x,y) => g.setColor((Bangle.isBTHRMConnected && Bangle.isBTHRMConnected())?"#00f":"#88f").drawImage(atob("DAwBAAAAMMeef+f+f+P8H4DwBgAA"),x,y)
+      draw : (x,y) => g.setColor((bpm != "")?"#00f":"#88f").drawImage(atob("DAwBAAAAMMeef+f+f+P8H4DwBgAA"),x,y)
     };
   }
 })
diff --git a/apps/bthrm/settings.js b/apps/bthrm/settings.js
index 62d2e7ea3..beefb00e9 100644
--- a/apps/bthrm/settings.js
+++ b/apps/bthrm/settings.js
@@ -20,182 +20,147 @@
   var mainmenu = {
     '': { 'title': 'Bluetooth HRM' },
     '< Back': back,
-    'Use BT HRM': {
-      value: !!settings.enabled,
-      format: v => settings.enabled ? "On" : "Off",
+    'Mode': {
+      value: 0 | settings.mode,
+      min: 0,
+      max: 3,
+      format: v => ["Off", "Default", "Both", "Custom"][v],
       onchange: v => {
-        writeSettings("enabled",v);
+        settings.mode = v;
+        switch (v){
+          case 0:
+            writeSettings("enabled",false);
+            break;
+          case 1:
+            writeSettings("enabled",true);
+            writeSettings("replace",true);
+            writeSettings("debuglog",false);
+            writeSettings("startWithHrm",true);
+            writeSettings("allowFallback",true);
+            writeSettings("fallbackTimeout",10);
+            break;
+          case 2:
+            writeSettings("enabled",true);
+            writeSettings("replace",false);
+            writeSettings("debuglog",false);
+            writeSettings("startWithHrm",false);
+            writeSettings("allowFallback",false);
+            break;
+          case 3:
+            writeSettings("enabled",true);
+            writeSettings("replace",settings.custom_replace);
+            writeSettings("debuglog",settings.custom_debuglog);
+            writeSettings("startWithHrm",settings.custom_startWithHrm);
+            writeSettings("allowFallback",settings.custom_allowFallback);
+            writeSettings("fallbackTimeout",settings.custom_fallbackTimeout);
+            break;
+        }
+        writeSettings("mode",v);
       }
     },
-    'Replace HRM': {
-      value: !!settings.replace,
-      format: v => settings.replace ? "On" : "Off",
-      onchange: v => {
-        writeSettings("replace",v);
-      }
-    },
-    'Start with HRM': {
-      value: !!settings.startWithHrm,
-      format: v => settings.startWithHrm ? "On" : "Off",
-      onchange: v => {(function(back) {
-  function writeSettings(key, value) {
-    var s = require('Storage').readJSON(FILE, true) || {};
-    s[key] = value;
-    require('Storage').writeJSON(FILE, s);
-    readSettings();
-  }
+    'Custom Mode': function() { E.showMenu(submenu_custom); },
+    'Debug': function() { E.showMenu(submenu_debug); }
+  };
   
-  function readSettings(){
-    settings = Object.assign(
-      require('Storage').readJSON("bthrm.default.json", true) || {},
-      require('Storage').readJSON(FILE, true) || {}
-    );
-  }
-  
-  var FILE="bthrm.json";
-  var settings;
-  readSettings();
-
-  var mainmenu = {
-    '': { 'title': 'Bluetooth HRM' },
-    '< Back': back,
-    'Use BT HRM': {
-      value: !!settings.enabled,
-      format: v => settings.enabled ? "On" : "Off",
+  var submenu_debug = {
+    '' : { title: "Debug"},
+    '< Back': function() { E.showMenu(mainmenu); },
+    'Alert on disconnect': {
+      value: !!settings.warnDisconnect,
+      format: v => settings.warnDisconnect ? "On" : "Off",
       onchange: v => {
-        writeSettings("enabled",v);
+        writeSettings("warnDisconnect",v);
       }
     },
-    'Replace HRM': {
-      value: !!settings.replace,
-      format: v => settings.replace ? "On" : "Off",
+    'Debug log': {
+      value: !!settings.debuglog,
+      format: v => settings.debuglog ? "On" : "Off",
       onchange: v => {
-        writeSettings("replace",v);
+        writeSettings("debuglog",v);
+      }
+    },
+    'Grace periods': function() { E.showMenu(submenu_grace); }
+  };
+  
+  var submenu_custom = {
+    '' : { title: "Custom mode"},
+    '< Back': function() { E.showMenu(mainmenu); },
+    'Replace HRM': {
+      value: !!settings.custom_replace,
+      format: v => settings.custom_replace ? "On" : "Off",
+      onchange: v => {
+        writeSettings("custom_replace",v);
       }
     },
     'Start w. HRM': {
-      value: !!settings.startWithHrm,
-      format: v => settings.startWithHrm ? "On" : "Off",
+      value: !!settings.custom_startWithHrm,
+      format: v => settings.custom_startWithHrm ? "On" : "Off",
       onchange: v => {
-        writeSettings("startWithHrm",v);
+        writeSettings("custom_startWithHrm",v);
       }
     },
     'HRM Fallback': {
-      value: !!settings.allowFallback,
-      format: v => settings.allowFallback ? "On" : "Off",
+      value: !!settings.custom_allowFallback,
+      format: v => settings.custom_allowFallback ? "On" : "Off",
       onchange: v => {
-        writeSettings("allowFallback",v);
+        writeSettings("custom_allowFallback",v);
       }
     },
     'Fallback Timeout': {
-      value: settings.fallbackTimeout,
+      value: settings.custom_fallbackTimeout,
       min: 5,
       max: 60,
       step: 5,
       format: v=>v+"s",
       onchange: v => {
-        writeSettings("fallbackTimout",v*1000);
+        writeSettings("custom_fallbackTimout",v*1000);
       }
     },
-    'Conn. Alert': {
-      value: !!settings.warnDisconnect,
-      format: v => settings.warnDisconnect ? "On" : "Off",
+  };
+  
+  var submenu_grace = {
+    '' : { title: "Grace periods"},
+    '< Back': function() { E.showMenu(submenu_debug); },
+    'Request': {
+      value: settings.gracePeriodRequest,
+      min: 0,
+      max: 3000,
+      step: 100,
+      format: v=>v+"ms",
       onchange: v => {
-        writeSettings("warnDisconnect",v);
+        writeSettings("gracePeriodRequest",v);
       }
     },
-    'Debug log': {
-      value: !!settings.debuglog,
-      format: v => settings.debuglog ? "On" : "Off",
+    'Connect': {
+      value: settings.gracePeriodConnect,
+      min: 0,
+      max: 3000,
+      step: 100,
+      format: v=>v+"ms",
       onchange: v => {
-        writeSettings("debuglog",v);
+        writeSettings("gracePeriodConnect",v);
       }
     },
-    'Grace periods >': function() { E.showMenu(submenu); }
-  };
-  
-  var submenu = {
-    '' : { title: "Grace periods"},
-    '< Back': function() { E.showMenu(mainmenu); },
-    'Request': {
-      value: settings.gracePeriodRequest,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodRequest",v);
-      }
-    },
-    'Connect': {
-      value: settings.gracePeriodConnect,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodConnect",v);
-      }
-    },
-    'Notification': {
-      value: settings.gracePeriodNotification,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodNotification",v);
-      }
-    },
-    'Service': {
-      value: settings.gracePeriodService,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodService",v);
-      }
-    }
-  };
-  
-  E.showMenu(mainmenu);
-})
-        writeSettings("startWithHrm",v);
-      }
-    },
-    'Fallback to HRM': {
-      value: !!settings.allowFallback,
-      format: v => settings.allowFallback ? "On" : "Off",
-      onchange: v => {
-        writeSettings("allowFallback",v);
-      }
-    },
-    'Fallback Timeout': {
-      value: settings.fallbackTimeout,
-      min: 5,
-      max: 60,
-      step: 5,
-      format: v=>v+"s",
-      onchange: v => {
-        writeSettings("fallbackTimout",v*1000);
-      }
-    },
-    'Conn. Alert': {
-      value: !!settings.warnDisconnect,
-      format: v => settings.warnDisconnect ? "On" : "Off",
-      onchange: v => {
-        writeSettings("warnDisconnect",v);
-      }
-    },
-    'Debug log': {
-      value: !!settings.debuglog,
-      format: v => settings.debuglog ? "On" : "Off",
-      onchange: v => {
-        writeSettings("debuglog",v);
-      }
-    },
-    'Grace periods': function() { E.showMenu(submenu); }
+    'Notification': {
+      value: settings.gracePeriodNotification,
+      min: 0,
+      max: 3000,
+      step: 100,
+      format: v=>v+"ms",
+      onchange: v => {
+        writeSettings("gracePeriodNotification",v);
+      }
+    },
+    'Service': {
+      value: settings.gracePeriodService,
+      min: 0,
+      max: 3000,
+      step: 100,
+      format: v=>v+"ms",
+      onchange: v => {
+        writeSettings("gracePeriodService",v);
+      }
+    }
   };
   
   var submenu = {
diff --git a/apps/bthrv/ChangeLog b/apps/bthrv/ChangeLog
index 0e51186a4..e144fd8f9 100644
--- a/apps/bthrv/ChangeLog
+++ b/apps/bthrv/ChangeLog
@@ -1,11 +1,2 @@
 0.01: New App!
-0.02: Make overriding the HRM event optional
-      Emit BTHRM event for external sensor
-      Add recorder app plugin
-0.03: Prevent readings from internal sensor mixing into BT values
-      Mark events with src property
-      Show actual source of event in app
-0.04: Allow reading additional data if available: HRM battery and position
-      Better caching of scanned BT device properties
-      New setting for not starting the BTHRM together with HRM
-      Save some RAM by not definining functions if disabled in settings
+0.02: Write available data on reset or kill
diff --git a/apps/bthrv/app.js b/apps/bthrv/app.js
index 7f6ec2d35..067c84f56 100644
--- a/apps/bthrv/app.js
+++ b/apps/bthrv/app.js
@@ -11,34 +11,30 @@ var currentSlot = 0;
 var hrvSlots = [10,20,30,60,120,300];
 var hrvValues = {};
 var rrRmsProgress;
-var saved = false;
 
 var rrNumberOfValues = 0;
 var rrSquared = 0;
-var rrLastValue
+var rrLastValue;
 var rrMax;
 var rrMin;
 
 function calcHrv(rr){
   //Calculate HRV with RMSSD method: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC5624990/
-  for (currentRr of rr){
+  for (var currentRr of rr){
     if (!rrMax) rrMax = currentRr;
     if (!rrMin) rrMin = currentRr;
     rrMax = Math.max(rrMax, currentRr);
     rrMin = Math.min(rrMin, currentRr);
-    //print("Calc for: " + currentRr);
     rrNumberOfValues++;
     if (!rrLastValue){
       rrLastValue = currentRr;
       continue;
     }
     rrSquared += (rrLastValue - currentRr)*(rrLastValue - currentRr);
-    
-    //print("rr²: " + rrSquared);
+
     rrLastValue = currentRr;
   }
   var rms = Math.sqrt(rrSquared / rrNumberOfValues);
-  //print("rms: " + rms);
   return rms;
 }
 
@@ -56,17 +52,36 @@ function draw(y, hrv) {
     if (hrvValues[hrvSlots[i]]) str += hrvValues[hrvSlots[i]].toFixed(1) + "ms";
     g.setFontVector(16).drawString(str,px,y+44+(i*17));
   }
-  
+
   g.setRotation(3);
   g.setFontVector(12).drawString("Reset",g.getHeight()/2, g.getWidth()-10);
   g.setRotation(0);
 }
 
+function write(){
+    if (!hrvValues[hrvSlots[0]]){
+      return;
+    }
+
+    var file = require('Storage').open("bthrv.csv", "a");
+    var data = new Date(startingTime).toISOString();
+    for (var i = 0; i < hrvSlots.length; i++ ){
+      data += ",";
+      if (hrvValues[hrvSlots[i]]){
+        data += hrvValues[hrvSlots[i]];
+      }
+    }
+
+    data += "," + rrMax + "," + rrMin + ","+rrNumberOfValues;
+    data += "\n";
+    file.write(data);
+    Bangle.buzz(500);
+}
+
 function onBtHrm(e) {
   if (e.rr && !startingTime) Bangle.buzz(500);
   if (e.rr && !startingTime) startingTime=Date.now();
-  //print("Event:" + e.rr);
-  
+
   var hrv = calcHrv(e.rr);
   if (hrv){
     if (currentSlot <= hrvSlots.length && (Date.now() - startingTime) > (hrvSlots[currentSlot] * 1000) && !hrvValues[hrvSlots[currentSlot]]){
@@ -74,35 +89,25 @@ function onBtHrm(e) {
       currentSlot++;
     }
   }
-  if (!saved && currentSlot == hrvSlots.length){
-    var file = require('Storage').open("bthrv.csv", "a");
-    var data = new Date(startingTime).toISOString();
-    for (var c of hrvSlots){
-      data+=","+hrvValues[c];
-    }
-    data+="," + rrMax + "," + rrMin + ","+rrNumberOfValues;
-    data+="\n";
-    file.write(data);
-    saved = true;
-    Bangle.buzz(500);
-  }
+
   if (hrv){
-    if (!ui){      
+    if (!ui){
       Bangle.setUI("leftright", ()=>{
         resetHrv();
         clear(30);
       });
       ui = true;
     }
+
     draw(30, hrv);
   }
 }
 
 function resetHrv(){
+  write();
   hrvValues={};
   startingTime=undefined;
   currentSlot=0;
-  saved=false;
   rrNumberOfValues = 0;
   rrSquared = 0;
   rrLastValue = undefined;
@@ -117,7 +122,6 @@ g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
-
 if (Bangle.setBTHRMPower){
   Bangle.on('BTHRM', onBtHrm);
   Bangle.setBTHRMPower(1,'bthrv');
@@ -133,6 +137,11 @@ if (Bangle.setBTHRMPower){
     file.write(data);
   }
 
+  E.on('kill', ()=>{
+    write();
+    Bangle.setBTHRMPower(0,'bthrv');
+  });
+
   g.reset().setFont("6x8",2).setFontAlign(0,0);
   g.drawString("Please wait...",g.getWidth()/2,g.getHeight()/2 - 16);
 } else {
@@ -140,4 +149,3 @@ if (Bangle.setBTHRMPower){
   g.drawString("Missing BT HRM",g.getWidth()/2,g.getHeight()/2 - 16);
 }
 
-E.on('kill', ()=>Bangle.setBTHRMPower(0,'bthrv'));
diff --git a/apps/bthrv/metadata.json b/apps/bthrv/metadata.json
index 6a8e7e940..183008034 100644
--- a/apps/bthrv/metadata.json
+++ b/apps/bthrv/metadata.json
@@ -2,7 +2,7 @@
   "id": "bthrv",
   "name": "Bluetooth Heart Rate variance calculator",
   "shortName": "BT HRV",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Calculates HRV from a a BT HRM with interval data",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog
index 58ab4cd48..7165f8521 100644
--- a/apps/circlesclock/ChangeLog
+++ b/apps/circlesclock/ChangeLog
@@ -19,3 +19,4 @@
       Colors of circles can be configured
       Color depending on value (green -> red, red -> green) option
       Good HRM value will not be overwritten so fast anymore
+0.10: Use roboto font for time, date and day of week and center align them
diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index 49af2a057..903c7bdb2 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -20,25 +20,26 @@ const weatherStormy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA");
 const sunSetDown = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAAGYAPAAYAAAAAA");
 const sunSetUp = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAABgAPABmAAAAAA");
 
-let settings = storage.readJSON("circlesclock.json", 1) || {
-  'minHR': 40,
-  'maxHR': 200,
-  'confidence': 0,
-  'stepGoal': 10000,
-  'stepDistanceGoal': 8000,
-  'stepLength': 0.8,
-  'batteryWarn': 30,
-  'showWidgets': false,
-  'weatherCircleData': 'humidity',
-  'circleCount': 3,
-  'circle1': 'hr',
-  'circle2': 'steps',
-  'circle3': 'battery',
-  'circle4': 'weather'
+Graphics.prototype.setFontRobotoRegular50NumericOnly = function(scale) {
+  // Actual height 39 (40 - 2)
+  this.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAB8AAAAAAAfAAAAAAAPwAAAAAAB8AAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA4AAAAAAB+AAAAAAD/gAAAAAD/4AAAAAH/4AAAAAP/wAAAAAP/gAAAAAf/gAAAAAf/AAAAAA/+AAAAAB/+AAAAAB/8AAAAAD/4AAAAAH/4AAAAAD/wAAAAAA/wAAAAAAPgAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///wAAAB////gAAA////8AAA/////gAAP////8AAH8AAA/gAB8AAAD4AA+AAAAfAAPAAAADwADwAAAA8AA8AAAAPAAPAAAADwADwAAAA8AA8AAAAPAAPgAAAHwAB8AAAD4AAfwAAD+AAD/////AAA/////wAAH////4AAAf///4AAAB///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAPgAAAAAADwAAAAAAB8AAAAAAAfAAAAAAAHgAAAAAAD4AAAAAAA+AAAAAAAPAAAAAAAH/////wAB/////8AA//////AAP/////wAD/////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAfgAADwAAP4AAB8AAH+AAA/AAD/gAAfwAB/AAAf8AAfAAAP/AAPgAAH7wAD4AAD88AA8AAB+PAAPAAA/DwADwAAfg8AA8AAPwPAAPAAH4DwADwAH8A8AA+AD+APAAPwB/ADwAB/D/gA8AAf//gAPAAD//wADwAAf/wAA8AAD/4AAPAAAHwAADwAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAADgAAAHwAA+AAAD8AAP4AAB/AAD/AAA/wAA/wAAf4AAD+AAHwAAAPgAD4APAB8AA+ADwAPAAPAA8ADwADwAPAA8AA8ADwAPAAPAA8ADwADwAfAA8AA8AH4APAAPgD+AHwAB8B/wD4AAf7/+B+AAD//v//AAA//x//wAAD/4P/4AAAf8B/4AAAAYAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAHwAAAAAAH8AAAAAAD/AAAAAAD/wAAAAAD/8AAAAAB/vAAAAAB/jwAAAAA/g8AAAAA/wPAAAAAfwDwAAAAf4A8AAAAf4APAAAAP8ADwAAAP8AA8AAAH8AAPAAAD/////8AA//////AAP/////wAD/////8AA//////AAAAAAPAAAAAAADwAAAAAAA8AAAAAAAPAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAB/APwAAH//wD+AAD//8A/wAA///AH+AAP//wAPgAD/B4AB8AA8A+AAfAAPAPAADwADwDwAA8AA8A8AAPAAPAPAADwADwD4AA8AA8A+AAPAAPAPwAHwADwD8AD4AA8AfwD+AAPAH///AADwA///wAA8AH//4AAPAAf/4AAAAAB/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//AAAAAD//+AAAAD///4AAAD////AAAB////4AAA/78D/AAAfw8AH4AAPweAA+AAD4PgAHwAB8DwAA8AAfA8AAPAAHgPAADwAD4DwAA8AA+A8AAPAAPAPgAHwADwD4AB8AA8AfgA+AAPAH+B/gAAAA///wAAAAH//4AAAAA//8AAAAAH/8AAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAA8AAAAAAAPAAAAAAADwAAAAAAA8AAAABAAPAAAABwADwAAAB8AA8AAAB/AAPAAAB/wADwAAD/8AA8AAD/8AAPAAD/4AADwAD/4AAA8AD/4AAAPAH/wAAADwH/wAAAA8H/wAAAAPH/wAAAAD3/gAAAAA//gAAAAAP/gAAAAAD/gAAAAAA/AAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwA/4AAAH/Af/AAAH/8P/4AAD//n//AAA//7//4AAfx/+A+AAHwD+AHwAD4AfgB8AA8AHwAPAAPAA8ADwADwAPAA8AA8ADwAPAAPAA8ADwADwAfAA8AA+AH4AfAAHwD+AHwAB/D/4D4AAP/+/n+AAD//n//AAAf/w//gAAB/wH/wAAAHwA/4AAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAD/8AAAAAD//wAAAAB//+AAAAA///wAAAAf4H+APAAH4AfgDwAD8AB8A8AA+AAfAPAAPAADwDwADwAA8B8AA8AAPAfAAPAADwHgADwAA8D4AA+AAeB+AAHwAHg/AAB+ADwfgAAP8D4/4AAD////8AAAf///8AAAB///+AAAAP//+AAAAAP/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAOAAAB8AAHwAAAfgAD8AAAH4AA/AAAB8AAHwAAAOAAA4AAAAAAAAAAAAAAAAAAAAAAAAAA"), 46, atob("DRUcHBwcHBwcHBwcDA=="), 50+(scale<<8)+(1<<16));
+  return this;
 };
+
+Graphics.prototype.setFontRobotoRegular21 = function(scale) {
+  // Actual height 22 (21 - 0)
+  this.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAB/+YH/5gAAAAAAAAAAA+AAD4AAAAAA+AAD4AAAAAAAAAAAMAAYwABj+AH/4D/wAfjABGM4AZ/gD/4B/sAHYwABiAAEAAAAAAAAOAPw8A/h4HGBh4cHvgweGDhgcHOA8fwBw/AAAAAAAAPgAB/AAGMAAYwMBjDgD48AHHAABwAAOfADjuAcMYAAxgAD+AAHwAAAAAAAAAHgBx/AP3eB/wYGHBgY+GBjeYH4/gPA8AAHwAB/gAHGAAAAAAAA+AAD4AAAAAAAAAAA/gAf/wH//w8AHnAAHwAAEAAAMAAB4AAN4ABz8B+D//gD/4AAAAAAAAMAAAxAADMAAHwAH8AAf4AAPwAAzAADAAAAAAABgAAGAAAYAABgAD/8AP/wABgAAGAAAYAABgAAGAAAADAAB8AAPgAAYAAwAADAAAMAAAwAADAAAMAAAAAAAEAAA4AABgAAAAAAAAAAQAAPAAH4AB8AA/AAPgAH4AAcAAAAAAAAAAD/wA//wH4fgYAOBgAYGABgYAGB4B4D//AH/4AAAAAAAAAAAAYAADAAAMAABwAAH//gf/+AAAAAAAAAAAAAAAAAAAHAGA8A4HAHgYA+BgHYGB5gYPGB7wYD+BgHgGAAAYAAAAHA4A8DwHgDgYMGBgwYGDBgYcGB/44D9/AHj4AAAAAAMAABwAAfAAHsAA8wAPDADwMAf/+B//4H//gAAwAADAAAAAAAAAfjgH+HAf4OBjAYGMBgYwGBjg4GH/AYP4AAOAAAAAAfgAP/gB//AO4OBzAYGMBgYwGBjg4AH/AAP4AAEAAAAAYAABgAAGABgYAeBgHwGD8AY/ABvgAH4AAeAABAAAAAAADB4A/fwH/3gccGBgwYGDBgYcGB744D9/AHj4AAAAAAAAD8AA/4AHjxgYDGBgMYGAzgcDMA87wD/+AD/gAAAAAAAABgGAHA4AYBgAAAAAAAAYB8BwPgGAYAAAAAAAAAYAADwAAPAAB+AAGYAA5wADDAAcOABgYAAAAAAAAAZgABmAAGYAAZgABmAAGYAAZgABmAAGYAAZgAAAAAAAABgYAHDgAMMAA5wABmAAGYAAPAAA8AADwAAGAAAAAAAAAOAAA4AAHAAAYHmBg+YGHgAf4AA/AAAwAAAAAAAfwAH/4B4DwOADhwAGGD8Mw/4zHBjMYGMxgYzGPDMf+Mw8YhgBgHAGAOA4Af/AAPwAAAAAAAgAAeAAP4AD+AB/gA/mAHwYAeBgB/GAA/4AAfwAAfwAAPgAAGAAAAAAAAf/+B//4GDBgYMGBgwYGDBgYcGBz44D//AHz8AAHAAAAAAAAAH+AB/+AP/8A4A4HABgYAGBgAYGABgYAGB4A4DwPAHA4AAAAAAAAAAAB//4H//gYAGBgAYGABgYAGBgAYDADAPA8Af/gAf4AAAAAAAAAAAAf/+B//4GDBgYMGBgwYGDBgYMGBgwYGDBgYAGAAAAAAAAAAAB//4H//gYMABgwAGDAAYMABgwAGDAAYMABgAAAAAAB/AAf/AD//AeAcBgA4GABgYEGBgYYGBhgcGGA8fwBx/AAH4AAAAAAAAAAAB//4H//gAMAAAwAADAAAMAAAwAADAAAMAAAwAH//gf/+AAAAAAAAAAAAAAAH//gf/+AAAAAAAAAAQAADwAAPgAAOAAAYAABgAAGAAA4H//Af/8B//AAAAAAAAAAAAH//gf/+AA4AAHAAA+AAP8AB48APB4B4DwGADgQAGAAAIAAAAAAAB//4H//gAAGAAAYAABgAAGAAAYAABgAAGAAAIAAAAAAAB//4H//gfgAAfgAAPwAAPwAAH4AAHgAB+AAfgAPwAH8AB+AAH//gf/+B//4AAAAAAAAAAAH//gf/+A8AAB8AAB4AAD4AADwAAHwAAHgAAPgf/+B//4AAAAAAAAAAAAf4AH/4A//wDgHAcAOBgAYGABgYAGBwAYDADgPz8Af/gAf4AAAAAAAAAAAAf/+B//4GBgAYGABgYAGBgAYGABg4AHnAAP8AAfgAAAAAAAAAH+AB/+APz8AwAwHADgYAGBgAYGABgcAOA4B8D//4H/5gH+CAAAAAAAAAAAH//gf/+BgYAGBgAYGABgYAGD4AcP4A/z4D+HgDgGAAAAAAAADg4A/DwD+DAcYGBhwYGDBgYMGBg4YHBzgPH8AcPgAAAAYAABgAAGAAAYAABgAAH//gf/+B//4GAAAYAABgAAGAAAYAAAAAAH/4Af/4B//wAADgAAGAAAYAABgAAGAAA4AAfAf/8B//AAAAAQAAB4AAH8AAH+AAD+AAB/AAA+AAD4AB/AA/gAf4AH8AAeAABAAAAAAAfAAB/wAB/8AAP+AAD4AB/gA/wA/wAH4AAfgAAf4AAH+AAD+AAH4AH/gP/gB/gAHAAAAAAAAAAGABgcAOB8D4B4+AD/gAD8AAPwAD/wAeHgHwPgcAOBAAYAAAAQAABwAAHwAAPwAAPwAAP/gAP+AB/4AfAAHwAB8AAHAAAQAAAAAAGADgYAeBgH4GA9gYPmBh4YGfBgbwGB+AYHgBgcAGAAAIAAAA///7///v//+wAAbAABkAAAcAAB+AAB/AAA/AAAfgAAfgAAPAAAMMAAGwAAb///v//+AAAAAAAAAAAA4AAPgAH4AAeAAB+AAB+AAA4AAAgAAAAYAABgAAGAAAYAABgAAGAAAYAABgAAGAAAYAAABAAAGAAAcAAAwAAAAAAAAAAAAAAGOAA58AHu4AYxgBjGAGMYAYzgB/+AD/4AD/gAAAAAAAP//g//+D//4AcDgBgGAGAYAYBgBwOAD/wAH+AADAAAAAAD8AA/8AHh4AYBgBgGAGAYAYBgB4OADhwAGGAAAAAAAAAD8AA/8AHh4AYBgBgGAGAYAYBgAwMD//4P//gAAAAAAAAD8AA/8ADtwAYxgBjGAGMYAYxgB7OAD8wADyAAAAAEAAAYAAP/+B//4P//gxgADGAAMAAAAAAAA/AAP/MB4e4GAZgYBmBgGYGAZgMDeB//wH/+AAAAAAAD//4P//g//+AHAAAYAABgAAGAAAf/gA/+AB/4AAAAAAABn/4Gf/gZ/+AAAAAAAGZ//5n//mf/4AAAAAAAP//g//+D//4ABwAAPgAB/AAePABweAGA4AAAgAAAD//4P//g//+AAAAAAAAB/+AH/4Af/gBgAAGAAAYAABgAAH/4AP/gA/+AHAAAYAABgAAGAAAeAAA/+AB/4AAAAAAAAH/4Af/gB/+AHAAAYAABgAAGAAAf/gA/+AB/4AAAAAAAAA/AAP/AA4cAGAYAYBgBgGAGAYAcDgA/8AB/gAB4AAAAAAAAAf/+B//4H//gYBgBgGAGAYAYBgBwOAD/wAH+AADAAAAAAH8AA/8AHh4AYBgBgGAGAYAYBgAwOAH//gf/+AAAAAAAAAAAB/+AH/4Af/gBwAAGAAAYAAAAAABxgAPnAB+OAGcYAYxgBjGAHOYAefgA58AAAAAYAABgAA//wD//gBgOAGAYAQBgAAAAH/gAf/AB/+AAAYAABgAAGAAAYAf/gB/+AH/4AAAABAAAHgAAfwAAP4AAH4AAHgAD8AB/AAfgABwAAAAAAQAAB8AAH+AAD/gAA+AAH4AH8AB+AAHwAAP4AAH8AAD4AA/gA/4AH4AAcAAAAAAAAAAYBgBweADzwAH8AAHgAB/gAfPABwOAGAYAAAABAAAHgBgfwGAf44AP/AAP4AH8AD+AAfAABgAAAAAAYDgBgeAGD4AY9gBnmAH4YAfBgB4GAGAYAAAAACAAAMAAB4AP//h/z/OAAOwAAYAAAAAAAf//x///AAAAwAAbAABn+H8P9/wP/8ABwAADAAAAAAAQAAHgAA4AADAAAMAAA4AABwAADgAAGAAAYAAHgAA8AADAAAAAAAHAAA+AAHcAA44ADBgAMGAAwYADjgAHcAAPgAAcAAAAAABwAAPgAP2AA/YADNgAP+AA/4AD/gAM2AAz4AAPgAAMAAAAAH/AAf94AA3gADXAANcAA9wADzAAPMA/0wH/TAf98DgDwH/HAf8cNgBz+AGP/85x/zn2YcfZDxtm+H2PwPAcAAAAAAAAAHjwA/fgHvnAf8MB/xwHTPAP94A//AHD2AYPcBh4wHHzAP/8AfPgAAAAAAAAHgAA/AAHeAA74ADNgAM2AAz4ADnAAPGAAf4AA/gAAGAAOYAB9gAP+AAx4ADHgAM/8A//wB9gAA+AAH4AAAAAAAAAHAAB/AAP+AA/4ADZgAN+AA/4ADmAAH+AA/4ADAAAP4AA/4AADgAAGAAw4AD/gAH4AAAAAAAAAB8AAf5wBv/AM/8A2PADd8AM/wAx7ABzsAH+wAH7AABsAH+wA/7ADAMAP+wA/7AD/sAMBwAwOADx4AH/AAHwAAAAAAAAADwAAPgAPyAA/IADMgAP+AA/wADOAAM+AA3IADfgAB8AAGYAAfgAA+AAfYAD/gAM+AAx4ADP/AP/8AfYAANgAB+AAH4AAAAAHjwA/fgHvnAf8MB/xxnTPPP948//BnD2AYPcBh4wHHzAP/8AfPgAAAAAAAAHgAA/AAHeAA74ADNgAM2AAz4ADnAAPGAAf4Bw/gHgGAeMYAh5gAP2AAxYADHgAM/8A//wB9gAA+AAH4AAAAAAAAAHAAB/AAP+AA/4ADZgAN+AA/4AzmAHn+Ae/4B7AAAP4AA/4AADgAAGABw4AD/AAH4AAAAAAAAAD8AAf5wDv/AM/8B2PAHd8Ac/wAx7ADzsAH+wMP7B4BsHn+we/7AHAMAP+wA/7AD/sAMBwAwOADj4AH/AAPwAAAAAAAAADwAAPgAPyAA/IADMgAP+AA/wADOAAM+AA3IADfgHh8AeGYB4fgAA+AAeYAD9gAM2AAxYADP/AP/8AfYAANgAB+AAH4AAAAAH+AA/4ADvgAP+AA/4ADHgAO+AAfYAA5gAAGAAAYAABgAAGAAAYAABgAAGAAAAAAAAAP+AA/4ADAAAP+AA/4AD/gANmAA2YADfgAA+AAAYAABgAAGAAAYAAAAAAAAADwAAPgAP2AA/YADNgAP+AA/wADMAAMwAAzAAD8AAPwAAAAAAEAAH/AB/+AeAcDgA4MABhgAHEf8cx/wzGADIYAMB/wwH/HAbgcBsDgG4cAB/gAD8AAAAAAAAADwAAPgAP+AA/YAD9gAP+AA/4AD/AAP+AAz4ADPgAA+AAD4AAPgAAwAADAAAAAAAAAAPgAB/AAP+AA/4AD/gAN+AA34ADPgAMYAA/4AD/gAP+AAwAADAAAMAAAAAAAAAAAPAAA8AAD4AAPgAA3AADcAAMwAAzAB7MAP8wA/zADPcAP9wA/3AD74AOPgAf8AA/gAB8AA//gD/+AP/4AAAAAAAAA8AAD4AD/gAP2AA/YAD/gAP+AA/wADPAAN+AA/4AA/gAD+AAO4AA/gAB+AADgAAAAAAAAA/4AD/gAMAAA/4AD/gAP+AA2YADZgAN+AAD4AABgAP/8A//wD//AAAAAGCAB+cAP54B33wHffAZNsBn2wGObAYBsBgGwH/bAf98BsHgG4cAZ/gAD+AAAYAf/gB/+AAAAAAAAB/wAH/eAYD4B/9wH/zAf/MBk/wGTfAZ8MADwwADDAf/8B//gH/+AAB4ACCAB+cAP94A3/wH77AbHsBn+wGPZAYBkBgGQH/7Af9sBkHgGYcAZ/gAD+AAAYAf/gB/+AGAAAAAAB/wAD/gAAGAAA4AD/gAf+AYAYBgBgDAGAMAYAYBgBwOAD/4AD+AAAAAAAAAB/wAP/AA4AADAAAMAAA4AAD/gAP+AAwAADAAAP+AA/4ADAAAMAAAwAAAAAAA+AAD8AD8wAPzAAzMAD/wAP/IAzPgDMsAM/wAD/AAA8AAAAAAAAAAAAAAAAAAAAAABgD4Gf/gZ/+AAAAAAAAD8AA/8AHx4AYBgPgHw+AfAYBgBwOADhwAGGAAAAAAAAABhgB+OAf/4D//gcGGBgYYGBhgYAGB4AYDgBgGAGAAAAAAAADHEAP/4A//ABwcAOA4AwBgDAGAMAYAwBgDgOAHBwA//gD/+AEIQAAAAQAABwSAHxsAH2wAH/4AH/gA/+AP7AD5sAeGwBgAAAAAAAAAB/n/H+f8f5/wAAAAAAADHhw//Hn/OHY4YNhhg2HHDYcMNgw43Dn/PH/4cfPAAAAAAAAAAAGAAAYAABAAAAAAAAAABgAAGAAAAAAAAAAAPwAD/wAYBgDADAZ/mBv/YGwNgbA2BsDYG89gZzmAwAwBgGADhwAH+AAAAAAAAABAADfAAd8ABmwAGTAAf8AA/wAABAAAAAAAAAAAwAAHgAA/AAGGAATIAA/AAHOAAYYAAAAAAAAAMAAAwAADAAAMAAAwAADAAAMAAA+AAD4AAPgAAAAAAAAA/AAP/ABgGAMAMBv+YG/5gbMGBswYGzBgb/mBneYDADAGAYAOHAAf4AAAAAAAAEAAAYAABgAAGAAAYAABgAAGAAAYAAAAAAAAAAOAAB8AAGYAAZgAB8AADgAAAAAAAAAADBgAMGAAwYADBgH/2Af/YADBgAMGAAwYADBgAAAAAAADDAAccABjwAGfAAfsAA8wAABAAAAAAxgAGDAAZMABmwAH/AAO4AAAAAAAAAEAAAwAAHAAAYAABAAAAAAAAAAAH//gf/+B//4AA4AABgAAGAAAYAADAB/+AH/4AAAAAAAAfgAD/AAf+AB/4AH/gAf/AB//4H//gAAAAAAAAAAAAEAAA4AADAAAAAAAAAAAAAAABoAAHgAAeAAAwAAACAAAYAAB/wAH/AAf8AAAAAAAAAAAAAfAAD+AAccABgwAGDAAccAA/gAB8AAAAAAAAAAECAAYYAA/AAB4AATIABzgAD8AAHgAAAAAAAAIAABgAAH/AAf8MAADgAA8AAHAABwgAePADh8AccwAD/gAP+AAAwAACAAAAAgAAGAAAf8MB/xwAAcAADgAA4AAPAAB2CAc4YBjDgAMeAA3YAD5gAHGAAAAAAAAIYABhwAGjAAbMAB8wwH/PAN5wAAeAADiAA48APHwBxzAGP+AA/4AADAAAIAAAAAAD8AAf4ADjgZ8GBngYCABgAAeAABwAAEAAAEAADwAB/AAfwgP8DH8wO+DAbwMAP4wAH/AAD+AAD+AAB8AAAwAABAAA8AAfwAH8AD/AB/MAvgwG8DAz+MCB/wAA/gAA/gAAfAAAMAAAQAAPAAH8AB/Ag/wGfzAz4MDPAwO/jAYf8AAP4AAP4AAHwAADAAAEAADwAB/CAfwYP8DH8wM+DAbwMBv4wOH/AwD+AAD+AAB8AAAwAABAAA8AAfwAH8GD/AZ/MAPgwA8DAb+MBh/wGA/gAA/gAAfAAAMAAAIAAHgAD+AA/gAf4PP5gl8GCXgYPfxgYP+AAH8AAH8AAD4AABgABgAAOAAD4AA+AAHgAB+AAfYADxgA8GAHgYAf/+B//4GH/gYMGBgwYGDBgYMGBgwYGDBgYAGAAAAAAAAB/gAf/gD//AOAOBwAYGAB6YAH5gAfmABseAOA8DwBwOAAAAAAAAAAAAD//yP//MwYM7BgxsGDCwYMDBgwMGDAwYMDAAwAAAAAAAAAAAP//A//8DBgwMGDGwYM7BgzMGDIwYMDBgwMADAAAAAAAAAAAA//8L//xsGDOwYMzBgzMGDGwYMLBgwMGDAwAMAAAAAAAAAAAD//xv//GwYMbBgwMGDAwYMbBgxsGDAwYMDAAwAAAIAAAwAADv//G//8AAAAAAAAAAAAAABv//O//8wAACAAAGAAAYAADP//M//8YAABgAAGAAAYAAAP//A//8YAABgAAADAAAMAB//4H//gYMGBgwYGDBgYAGBgAYHADgOAcAf/gA/8AAeAAAAAAAAAAAAAP//A//8Z4ADj4AMDwAYHwBgHgGAPg4APDAAfA//8D//wAAAAAAAAAAAA/wAP/wB//iHAOM4Ac7AAxsADCwAMDgAwGAHAfn4A//AA/wAAAAAAAAA/wAP/wB//gHAOA4AcDAAxsADOwAMzgAyGAHAfn4A//AA/wAAAAAAAAA/wAP/wB//gnAOG4Ac7AAzMADOwAMbgAwmAHAfn4A//AA/wAAAAAAAAA/wAP/wB//hnAOO4AczAAxsADGwAMbgAzmAHAfn4A//AA/wAAAAAAAAA/wAP/wB//hnAOG4AcbAAwMADAwAMbgAxmAHAfn4A//AA/wAAAAAAAAGBgAcOAA5wAB+AADwAAPAAB+AAOcABw4ACBAAAAAAAAAH+AB/+wP//A4B4HAfgYDmBg4YGHBgdwGB+A4D8/Af/4DH+AAAAAAAAAP/wA//wD//iAAHMAAM4AAxgADAAAMAABwAA+A//4D/+AAAAAAAAD/8AP/8A//4AABwAADCAAM4AAzAADIAAcAAPgP/+A//gAAAAAAAA//AD//AP/+CAAcYAAzAADMAAM4AAxgAHAAD4D//gP/4AAAAAAAAP/wA//wD//hgAHGAAMAAAwAADGAAMYABxgA+A//4D/+AAAAAgAADgAAPgAAfgAAfgAAf/GAf84D/zA+AIPgAD4AAOAAAgAAAAAAAAAH//gf/+AMDAAwMADAwAMDAAwcADzgAH+AAPgAAAAAAAAB//gf/+D//4MAAAwAGDBgYOfhgf+GA8cYAA/gAB8AAAAAAAAAY4ADnwIe7gxjGDmMYGYxgBjOAH/4AP/gAP+AAAAAAAAAY4ADnwAe7gBjGAmMYGYxg5jOCH/4AP/gAP+AAAAAAAAAY4ADnwCe7gZjGDGMYMYxg5jOBn/4AP/gAP+AAAAAAAAAY4AjnwGe7gxjGDGMYGYxgZjODn/4MP/gAP+AAAAAAAAAY4ADnwGe7gZjGAGMYAYxgZjOBn/4GP/gAP+AAAAAAAAAY4ADnwAe7g9jGCWMYJYxg9jOBn/4AP/gAP+AAAAAAAAAZ8ADv4Ac5gBjGAGMYAYxgBzOAD/wAP/AA7cAGM4AYxgBjGAGMYAexgA/OAB8QAAAAAAAAA/AAP/AB4eAGAYgYB6BgH4GAbAeDgA4cABhgAAAAAAAAA/AAP/Ag7cDGMYOYxgZjGAGMYAezgA/MAA8gAAAAAAAAA/AAP/AA7cAGMYCYxg5jGDGMYIezgA/MAA8gAAAAAAAAA/AAP/AI7cBmMYMYxgxjGDmMYGezgA/MAA8gAAAAAAAAA/AEP/AY7cBmMYAYxgBjGBmMYGezgY/MAA8gAAAAwAADn/4Gf/gJ/+AAAAAAAAB/+Bn/4Of/gwAABgAAOf/gx/+DH/4GAAAYAABn/4Af/gB/+BgAAAAAAAHwAA/gMH/A64OD7AYHsBgOwGB/A4G//AR/4AA+AAAAAAAAAH/4Cf/gZ/+DHAAMYAAZgABmAAOf/gw/+AB/4AAAAAAAAA/AAP/Ag4cDGAYOYBgZgGAGAYAcDgA/8AB/gAB4AAAAAAAAAD8AA/8ADhwAYBgJgGDmAYMYBghwOAD/wAH+AAHgAAAAAAAAAPwAD/wCOHAZgGDGAYMYBg5gGBnA4AP/AAf4AAeAAAAAAAAAA/ACP/AY4cDGAYMYBgZgGBmAYOcDgw/8AB/gAB4AAAAAAAAAD8AA/8BjhwGYBgBgGAGAYGYBgZwOBj/wAH+AAHgAAAAAAAAAGAAAYAABgAAGAAOZwA5nABGIAAYAABgAAGAAAYAAAAAAAAAA/AAP/QA4fAGB4AYfgBnmAH4YAeDgD/8AB/gAB4AAAAAH/gAf/Ah/+DAAYOABgYAGAAAYAf/gB/+AH/4AAAAAAAAH/gAf/AB/+AAAYCABg4AGDAAYIf/gB/+AH/4AAAAAAAAH/gAf/AJ/+BgAYMABgwAGDgAYGf/gB/+AH/4AAAAAAAAH/gEf/AZ/+BgAYAABgAAGBgAYGf/gZ/+AH/4AAAABAAAHgBgfwGAf44gP/GAP44H8DD+AIfAABgAAAAAP//+///7///gcBgBgGAGAYAYBgBwOAD/wAH+AAHgAAAAAQAAB4AZn8BmH+OAD/wAD+EB/AY/gBnwAAYAA=="), 32, atob("BQYHDgwQDgQICAkMBAYGCQwMDAwMDAwMDAwFBQsMDAoUDg4ODg0MDxAGDA4MExAPDg8ODQ0ODhQODQ0GCQYJCgcMDAwMDAgMDAUFCwUTDA0MDQcLBwwLEQsKCwcFBw8ACw0ZEBgUGRoQGBQZGhIQDhMAAAAAEhEYExAUEBQQEA0FBQwNEAwFDgkRCgoMABEKCAwICAcMCwYFCAoKEBERCg4ODg4ODhUODQ0NDQYGBgYPEA8PDw8PDA8ODg4ODQ0NDAwMDAwMEwwMDAwMBQUFBQ0MDQ0NDQ0NDAwMDAwKDQo="), 22+(scale<<8)+(1<<16));
+  return this;
+};
+
+const SETTINGS_FILE = "circlesclock.json";
+let settings = Object.assign(
+  storage.readJSON("circlesclock.default.json", true) || {},
+  storage.readJSON(SETTINGS_FILE, true) || {}
+);
 // Load step goal from pedometer widget as fallback
 if (settings.stepGoal == undefined) {
-  const d = storage.readJSON("wpedom.json", 1) || {};
+  const d = storage.readJSON("wpedom.json", true) || {};
   settings.stepGoal = d != undefined && d.settings != undefined ? d.settings.goal : 10000;
 }
 
@@ -69,7 +70,7 @@ const widgetOffset = showWidgets ? 24 : 0;
 const dowOffset = circleCount == 3 ? 22 : 24; // dow offset relative to date
 const h = g.getHeight() - widgetOffset;
 const w = g.getWidth();
-const hOffset = 30 - widgetOffset;
+const hOffset = (circleCount == 3 ? 34 : 30) - widgetOffset;
 const h1 = Math.round(1 * h / 5 - hOffset);
 const h2 = Math.round(3 * h / 5 - hOffset);
 const h3 = Math.round(8 * h / 8 - hOffset - 3); // circle y position
@@ -125,17 +126,17 @@ function draw() {
   g.fillRect(0, widgetOffset, w, h2 + 22);
 
   // time
-  g.setFont("Vector:50");
+  g.setFontRobotoRegular50NumericOnly();
   g.setFontAlign(0, -1);
   g.setColor(colorFg);
   g.drawString(locale.time(new Date(), 1), w / 2, h1 + 8);
   now = Math.round(new Date().getTime() / 1000);
 
   // date & dow
-  g.setFont("Vector:21");
-  g.setFontAlign(-1, 0);
-  g.drawString(locale.date(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2);
-  g.drawString(locale.dow(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2 + dowOffset);
+  g.setFontRobotoRegular21();
+  g.setFontAlign(0, 0);
+  g.drawString(locale.date(new Date()), w / 2, h2);
+  g.drawString(locale.dow(new Date()), w / 2, h2 + dowOffset);
 
   drawCircle(1);
   drawCircle(2);
@@ -279,10 +280,10 @@ function drawSteps(w) {
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("steps") || colorBlue;
+  const color = getCircleColor("steps");
 
   let percent;
-  const stepGoal = settings.stepGoal || 10000;
+  const stepGoal = settings.stepGoal;
   if (stepGoal > 0) {
     percent = steps / stepGoal;
     if (stepGoal < steps) percent = 1;
@@ -299,15 +300,15 @@ function drawSteps(w) {
 function drawStepsDistance(w) {
   if (!w) w = getCircleXPosition("stepsDistance");
   const steps = getSteps();
-  const stepDistance = settings.stepLength || 0.8;
+  const stepDistance = settings.stepLength;
   const stepsDistance = Math.round(steps * stepDistance);
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("stepsDistance") || colorGreen;
+  const color = getCircleColor("stepsDistance");
 
   let percent;
-  const stepDistanceGoal = settings.stepDistanceGoal || 8000;
+  const stepDistanceGoal = settings.stepDistanceGoal;
   if (stepDistanceGoal > 0) {
     percent = stepsDistance / stepDistanceGoal;
     if (stepDistanceGoal < stepsDistance) percent = 1;
@@ -326,12 +327,12 @@ function drawHeartRate(w) {
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("hr") || colorRed;
+  const color = getCircleColor("hr");
 
   let percent;
   if (hrtValue != undefined) {
-    const minHR = settings.minHR || 40;
-    const maxHR = settings.maxHR || 200;
+    const minHR = settings.minHR;
+    const maxHR = settings.maxHR;
     percent = (hrtValue - minHR) / (maxHR - minHR);
     if (isNaN(percent)) percent = 0;
     drawGauge(w, h3, percent, color);
@@ -350,7 +351,7 @@ function drawBattery(w) {
 
   drawCircleBackground(w);
 
-  let color = getCircleColor("battery") || colorYellow;
+  let color = getCircleColor("battery");
 
   let percent;
   if (battery > 0) {
@@ -380,9 +381,9 @@ function drawWeather(w) {
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("weather") || colorYellow;
+  const color = getCircleColor("weather");
   let percent;
-  const data = settings.weatherCircleData || "humidity";
+  const data = settings.weatherCircleData;
   switch (data) {
     case "humidity":
       const humidity = weather ? weather.hum : undefined;
@@ -427,7 +428,7 @@ function drawSunProgress(w) {
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("sunprogress") || colorYellow;
+  const color = getCircleColor("sunprogress");
 
   drawGauge(w, h3, percent, color);
 
@@ -467,7 +468,7 @@ function drawTemperature(w) {
   getPressureValue("temperature").then((temperature) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("temperature") || colorGreen;
+    const color = getCircleColor("temperature");
 
     let percent;
     if (temperature) {
@@ -493,7 +494,7 @@ function drawPressure(w) {
   getPressureValue("pressure").then((pressure) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("pressure") || colorGreen;
+    const color = getCircleColor("pressure");
 
     let percent;
     if (pressure && pressure > 0) {
@@ -519,7 +520,7 @@ function drawAltitude(w) {
   getPressureValue("altitude").then((altitude) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("altitude") || colorGreen;
+    const color = getCircleColor("altitude");
 
     let percent;
     if (altitude) {
@@ -578,23 +579,23 @@ function getWeatherIconByCode(code) {
         default:
           return weatherRainy;
       }
-    case 6:
-      return weatherSnowy;
-    case 7:
-      return weatherFoggy;
-    case 8:
-      switch (code) {
-        case 800:
-          return isDay() ? weatherSunny : weatherMoon;
-        case 801:
-          return weatherPartlyCloudy;
-        case 802:
-          return weatherPartlyCloudy;
+      case 6:
+        return weatherSnowy;
+      case 7:
+        return weatherFoggy;
+      case 8:
+        switch (code) {
+          case 800:
+            return isDay() ? weatherSunny : weatherMoon;
+          case 801:
+            return weatherPartlyCloudy;
+          case 802:
+            return weatherPartlyCloudy;
+          default:
+            return weatherCloudy;
+        }
         default:
-          return weatherCloudy;
-      }
-    default:
-      return undefined;
+          return undefined;
   }
 }
 
@@ -797,7 +798,7 @@ Bangle.on('lock', function(isLocked) {
 let timerHrm;
 Bangle.on('HRM', function(hrm) {
   if (isCircleEnabled("hr")) {
-    if (hrm.confidence >= (settings.confidence || 0)) {
+    if (hrm.confidence >= (settings.confidence)) {
       hrtValue = hrm.bpm;
       if (Bangle.isLCDOn()) {
         drawHeartRate();
@@ -809,7 +810,7 @@ Bangle.on('HRM', function(hrm) {
       timerHrm = setTimeout(() => {
         hrtValue = '...';
         drawHeartRate();
-      }, settings.hrmValidity * 1000 || 30000);
+      }, settings.hrmValidity * 1000);
     }
   }
 });
@@ -826,5 +827,10 @@ if (isCircleEnabled("hr")) {
 Bangle.setUI("clock");
 Bangle.loadWidgets();
 
+// schedule a draw for the next minute
+setTimeout(function() {
+  // draw every 60 seconds
+  setInterval(draw,60000);
+}, 60000 - (Date.now() % 60000));
+
 draw();
-setInterval(draw, 60000);
diff --git a/apps/circlesclock/default.json b/apps/circlesclock/default.json
new file mode 100644
index 000000000..cb6bfcff8
--- /dev/null
+++ b/apps/circlesclock/default.json
@@ -0,0 +1,25 @@
+{
+  "minHR": 40,
+  "maxHR": 200,
+  "confidence": 0,
+  "stepGoal": 10000,
+  "stepDistanceGoal": 8000,
+  "stepLength": 0.8,
+  "batteryWarn": 30,
+  "showWidgets": false,
+  "weatherCircleData": "humidity",
+  "circleCount": 3,
+  "circle1": "hr",
+  "circle2": "steps",
+  "circle3": "battery",
+  "circle4": "weather",
+  "circle1color": "green-red",
+  "circle2color": "#0000ff",
+  "circle3color": "red-green",
+  "circle4color": "#ffff00",
+  "circle1colorizeIcon": true,
+  "circle2colorizeIcon": true,
+  "circle3colorizeIcon": true,
+  "circle4colorizeIcon": false,
+  "hrmValidity": 60
+}
diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json
index f426a1681..3279ec2cf 100644
--- a/apps/circlesclock/metadata.json
+++ b/apps/circlesclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "circlesclock",
   "name": "Circles clock",
   "shortName":"Circles clock",
-  "version":"0.09",
+  "version":"0.10",
   "description": "A clock with three or four circles for different data at the bottom in a probably familiar style",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot-dark.png"}, {"url":"screenshot-light.png"}, {"url":"screenshot-dark-4.png"}, {"url":"screenshot-light-4.png"}],
@@ -13,7 +13,8 @@
   "storage": [
     {"name":"circlesclock.app.js","url":"app.js"},
     {"name":"circlesclock.img","url":"app-icon.js","evaluate":true},
-    {"name":"circlesclock.settings.js","url":"settings.js"}
+    {"name":"circlesclock.settings.js","url":"settings.js"},
+    {"name":"circlesclock.default.json","url":"default.json"}
    ],
    "data": [
      {"name":"circlesclock.json"}
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js
index 348d187eb..bec539376 100644
--- a/apps/circlesclock/settings.js
+++ b/apps/circlesclock/settings.js
@@ -1,7 +1,11 @@
 (function(back) {
   const SETTINGS_FILE = "circlesclock.json";
   const storage = require('Storage');
-  let settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+  let settings = Object.assign(
+    storage.readJSON("circlesclock.default.json", true) || {},
+    storage.readJSON(SETTINGS_FILE, true) || {}
+  );
+
   function save(key, value) {
     settings[key] = value;
     storage.write(SETTINGS_FILE, settings);
@@ -10,8 +14,8 @@
   const valuesCircleTypes = ["empty", "steps", "stepsDist", "hr", "battery", "weather", "sunprogress", "temperature", "pressure", "altitude"];
   const namesCircleTypes = ["empty", "steps", "distance", "heart", "battery", "weather", "sun", "temperature", "pressure", "altitude"];
 
-  const valuesColors = ["", "#ff0000", "#00ff00", "#0000ff", "#ffff00", "#ff00ff", "#00ffff", "#fff", "#000", "green-red", "red-green"];
-  const namesColors = ["default", "red", "green", "blue", "yellow", "magenta", "cyan", "white", "black", "green->red", "red->green"];
+  const valuesColors = ["",        "#ff0000", "#00ff00", "#0000ff", "#ffff00", "#ff00ff", "#00ffff", "#fff",  "#000", "green-red",   "red-green"];
+  const namesColors =  ["default", "red",     "green",   "blue",    "yellow",  "magenta", "cyan",    "white", "black", "green->red", "red->green"];
 
   const weatherData = ["empty", "humidity", "wind"];
 
@@ -20,7 +24,7 @@
       '': { 'title': 'Circles clock' },
       /*LANG*/'< Back': back,
       /*LANG*/'circle count': {
-        value: "circleCount" in settings ? settings.circleCount : 3,
+        value:  settings.circleCount,
         min: 3,
         max : 4,
         step: 1,
@@ -33,7 +37,7 @@
       /*LANG*/'heartrate': ()=>showHRMenu(),
       /*LANG*/'steps': ()=>showStepMenu(),
       /*LANG*/'battery warn': {
-        value: "batteryWarn" in settings ? settings.batteryWarn : 30,
+        value: settings.batteryWarn,
         min: 10,
         max : 100,
         step: 10,
@@ -43,12 +47,12 @@
         onchange: x => save('batteryWarn', x),
       },
       /*LANG*/'show widgets': {
-        value: "showWidgets" in settings ? settings.showWidgets : false,
+        value: !!settings.showWidgets,
         format: () => (settings.showWidgets ? 'Yes' : 'No'),
         onchange: x => save('showWidgets', x),
       },
-      /*LANG*/'weather circle': {
-        value: settings.weatherCircleData ? weatherData.indexOf(settings.weatherCircleData) : 1,
+      /*LANG*/'weather data': {
+        value: weatherData.indexOf(settings.weatherCircleData),
         min: 0, max: 2,
         format: v => weatherData[v],
         onchange: x => save('weatherCircleData', weatherData[x]),
@@ -62,7 +66,7 @@
       '': { 'title': /*LANG*/'Heartrate' },
       /*LANG*/'< Back': ()=>showMainMenu(),
       /*LANG*/'minimum': {
-        value: "minHR" in settings ? settings.minHR : 40,
+        value: settings.minHR,
         min: 0,
         max : 250,
         step: 5,
@@ -72,7 +76,7 @@
         onchange: x => save('minHR', x),
       },
       /*LANG*/'maximum': {
-        value: "maxHR" in settings ? settings.maxHR : 200,
+        value: settings.maxHR,
         min: 20,
         max : 250,
         step: 5,
@@ -82,7 +86,7 @@
         onchange: x => save('maxHR', x),
       },
       /*LANG*/'min. confidence': {
-        value: "confidence" in settings ? settings.confidence : 0,
+        value: settings.confidence,
         min: 0,
         max : 100,
         step: 10,
@@ -92,7 +96,7 @@
         onchange: x => save('confidence', x),
       },
       /*LANG*/'valid period': {
-        value: "hrmValidity" in settings ? settings.hrmValidity : 30,
+        value: settings.hrmValidity,
         min: 10,
         max : 600,
         step: 10,
@@ -110,7 +114,7 @@
       '': { 'title': /*LANG*/'Steps' },
       /*LANG*/'< Back': ()=>showMainMenu(),
       /*LANG*/'goal': {
-        value: "stepGoal" in settings ? settings.stepGoal : 10000,
+        value: settings.stepGoal,
         min: 2000,
         max : 50000,
         step: 2000,
@@ -120,7 +124,7 @@
         onchange: x => save('stepGoal', x),
       },
       /*LANG*/'distance goal': {
-        value: "stepDistanceGoal" in settings ? settings.stepDistanceGoal : 8000,
+        value: settings.stepDistanceGoal,
         min: 2000,
         max : 30000,
         step: 1000,
@@ -130,7 +134,7 @@
         onchange: x => save('stepDistanceGoal', x),
       },
       /*LANG*/'step length': {
-        value: "stepLength" in settings ? settings.stepLength : 0.8,
+        value: settings.stepLength,
         min: 0.1,
         max : 1.5,
         step: 0.01,
@@ -142,9 +146,6 @@
     };
     E.showMenu(menu);
   }
-
-  const defaultCircleTypes = ["steps", "hr", "battery", "weather"];
-
   function showCircleMenu(circleId) {
     const circleName = "circle" + circleId;
     const colorKey = circleName + "color";
@@ -154,19 +155,19 @@
       '': { 'title': /*LANG*/'Circle ' + circleId },
       /*LANG*/'< Back': ()=>showMainMenu(),
       /*LANG*/'data': {
-        value: settings[circleName]!=undefined ? valuesCircleTypes.indexOf(settings[circleName]) : valuesCircleTypes.indexOf(defaultCircleTypes[circleId -1]),
+        value: valuesCircleTypes.indexOf(settings[circleName]),
         min: 0, max: valuesCircleTypes.length - 1,
         format: v => namesCircleTypes[v],
         onchange: x => save(circleName, valuesCircleTypes[x]),
       },
       /*LANG*/'color': {
-        value: settings[colorKey] ? valuesColors.indexOf(settings[colorKey]) : 0,
+        value: valuesColors.indexOf(settings[colorKey]) || 0,
         min: 0, max: valuesColors.length - 1,
         format: v => namesColors[v],
         onchange: x => save(colorKey, valuesColors[x]),
       },
       /*LANG*/'colorize icon': {
-        value: colorizeIconKey in settings ? settings[colorizeIconKey] : false,
+        value: settings[colorizeIconKey] || false,
         format: () => (settings[colorizeIconKey] ? 'Yes' : 'No'),
         onchange: x => save(colorizeIconKey, x),
       },
diff --git a/apps/contourclock/ChangeLog b/apps/contourclock/ChangeLog
index b8d01ff86..0b6709d24 100644
--- a/apps/contourclock/ChangeLog
+++ b/apps/contourclock/ChangeLog
@@ -3,3 +3,4 @@
 0.21: Fixed settings menu, four more fonts
 0.22: Changed timing code, original "Nunito" Font is back!
 0.23: Customizer! Unused fonts no longer take up precious memory.
+0.24: Added previews to the customizer.
diff --git a/apps/contourclock/custom.html b/apps/contourclock/custom.html
index 7d780d39c..602182573 100644
--- a/apps/contourclock/custom.html
+++ b/apps/contourclock/custom.html
@@ -1,70 +1,74 @@
 <html>
 <head>
   <link rel="stylesheet" href="../../css/spectre.min.css">
+  <style>
+    input[type=checkbox] {
+      opacity:0;
+    }
+    input[type=checkbox] + label {
+      opacity:0.2;
+    }
+    input[type=checkbox]:checked + label {
+      opacity:1;
+    }
+  </style>
 </head>
 <body>
+  <h3>&nbsp;&nbsp;&nbsp;Select Fonts to upload:</h3>
   <form>
     <input type="checkbox" id="BarlowCond">
-    <label for="BarlowCond">Barlow Condensed</label><br>
+    <label for="BarlowCond"><img src="fonts/BarlowCond-p1.png"> <img src="fonts/BarlowCond-p2.png"></label><br>
     <input type="checkbox" id="BebasNeue">
-    <label for="BebasNeue">Bebas Neue</label><br>
+    <label for="BebasNeue"><img src="fonts/BebasNeue-p1.png"> <img src="fonts/BebasNeue-p2.png"></label><br>
     <input type="checkbox" id="Dekko">
-    <label for="Dekko">Dekko</label><br>
+    <label for="Dekko"><img src="fonts/Dekko-p1.png"> <img src="fonts/Dekko-p2.png"></label><br>
     <input type="checkbox" id="DinAlternate">
-    <label for="DinAlternate">Din Alternate</label><br>
-    <input type="checkbox" id="Dosis">
-    <label for="Dosis">Dosis</label><br>
+    <label for="DinAlternate"><img src="fonts/DinAlternate-p1.png"> <img src="fonts/DinAlternate-p2.png"></label><br>
     <input type="checkbox" id="Impact">
-    <label for="Impact">Impact</label><br>
+    <label for="Impact"><img src="fonts/Impact-p1.png"> <img src="fonts/Impact-p2.png"></label><br>
     <input type="checkbox" id="Nunito">
-    <label for="Nunito">Nunito</label><br>
+    <label for="Nunito"><img src="fonts/Nunito-p1.png"> <img src="fonts/Nunito-p2.png"></label><br>
     <input type="checkbox" id="OpenSansEC">
-    <label for="OpenSansEC">Open Sans Extra Condensed</label><br>
+    <label for="OpenSansEC"><img src="fonts/OpenSansEC-p1.png"> <img src="fonts/OpenSansEC-p2.png"></label><br>
     <input type="checkbox" id="Phosphate">
-    <label for="Phosphate">Phosphate</label><br>
+    <label for="Phosphate"><img src="fonts/Phosphate-p1.png"> <img src="fonts/Phosphate-p2.png"></label><br>
     <input type="checkbox" id="Quicksand">
-    <label for="Quicksand">Quicksand</label><br>
-    <input type="checkbox" id="SairaCond">
-    <label for="SairaCond">Saira Condensed</label><br>
+    <label for="Quicksand"><img src="fonts/Quicksand-p1.png"> <img src="fonts/Quicksand-p2.png"></label><br>
     <input type="checkbox" id="SairaEC">
-    <label for="SairaEC">Saira Extra Condensed</label><br>
+    <label for="SairaEC"><img src="fonts/SairaEC-p1.png"> <img src="fonts/SairaEC-p2.png"></label><br>
     <input type="checkbox" id="Teko">
-    <label for="Teko">Teko</label><br>
+    <label for="Teko"><img src="fonts/Teko-p1.png"> <img src="fonts/Teko-p2.png"></label><br>
     <input type="checkbox" id="Yumaro">
-    <label for="Yumaro">Yumaro</label><br>
+    <label for="Yumaro"><img src="fonts/Yumaro-p1.png"> <img src="fonts/Yumaro-p2.png"></label><br>
     <input type="checkbox" id="YuseiMagic">
-    <label for="YuseiMagic">Yusei Magic</label><br>
-    <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
+    <label for="YuseiMagic"><img src="fonts/YuseiMagic-p1.png"> <img src="fonts/YuseiMagic-p2.png"></label><br>
+    <p><button id="upload" class="btn btn-primary">Upload selected Fonts</button></p>
     <script src="../../core/lib/customize.js"></script>
     <script>
-    FontList = ["BarlowCond", "BebasNeue", "Dekko", "DinAlternate", "Dosis",
-    "Impact", "Nunito", "OpenSansEC", "Phosphate", "Quicksand", "SairaCond", "SairaEC",
-  "Yumaro", "YuseiMagic"]
-    // When the 'upload' button is clicked...
-    document.getElementById("upload").addEventListener("click", function() {
-      var n=0;
-      var fonts = [];
-      for (fontName of FontList) {
-        if (document.getElementById(fontName).checked==true) {
-          var f = new Object();
-          f.name="contourclock-"+n+".json";
-          f.url="font-"+fontName+".json";
-          //fonts.push({name:"contourclock-"+n+".json", url:"font-"+fontName+".json"});
-          fonts.push(f);
-          //console.log("contourclock-"+n+".json  <-  font-"+fontName+".json");
-          n++;
+      FontList = ["BarlowCond", "BebasNeue", "Dekko", "DinAlternate",
+      "Impact", "Nunito", "OpenSansEC", "Phosphate", "Quicksand", "SairaEC",
+      "Yumaro", "YuseiMagic"]
+      // When the 'upload' button is clicked...
+      document.getElementById("upload").addEventListener("click", function() {
+        var n=0;
+        var fonts = [];
+        for (fontName of FontList) {
+          if (document.getElementById(fontName).checked==true) {
+            var f = new Object();
+            fonts.push({
+              name:"contourclock-"+n+".json",
+              url:"font-"+fontName+".json"
+            });
+            n++;
+          }
         }
-      }
-      //console.log(fonts[0]);
-      sendCustomizedApp(storage=fonts);
-      /*sendCustomizedApp({
-      storage:[
-      {name:"myapp.app.js", url:"app.js", content:app},
-    ]
-  });*/
-});
-
-</script>
+        if (n>0)
+          sendCustomizedApp({storage:fonts});
+        else
+          alert("Please select at least one Font!");
 
+    });
+    </script>
+  </form>
 </body>
 </html>
diff --git a/apps/contourclock/fonts/BarlowCond-p1.png b/apps/contourclock/fonts/BarlowCond-p1.png
new file mode 100644
index 000000000..fc1e66797
Binary files /dev/null and b/apps/contourclock/fonts/BarlowCond-p1.png differ
diff --git a/apps/contourclock/fonts/BarlowCond-p2.png b/apps/contourclock/fonts/BarlowCond-p2.png
new file mode 100644
index 000000000..09f0cd5b6
Binary files /dev/null and b/apps/contourclock/fonts/BarlowCond-p2.png differ
diff --git a/apps/contourclock/fonts/BebasNeue-p1.png b/apps/contourclock/fonts/BebasNeue-p1.png
new file mode 100644
index 000000000..7bcec6894
Binary files /dev/null and b/apps/contourclock/fonts/BebasNeue-p1.png differ
diff --git a/apps/contourclock/fonts/BebasNeue-p2.png b/apps/contourclock/fonts/BebasNeue-p2.png
new file mode 100644
index 000000000..9ef333b06
Binary files /dev/null and b/apps/contourclock/fonts/BebasNeue-p2.png differ
diff --git a/apps/contourclock/fonts/Dekko-p1.png b/apps/contourclock/fonts/Dekko-p1.png
new file mode 100644
index 000000000..de2da2646
Binary files /dev/null and b/apps/contourclock/fonts/Dekko-p1.png differ
diff --git a/apps/contourclock/fonts/Dekko-p2.png b/apps/contourclock/fonts/Dekko-p2.png
new file mode 100644
index 000000000..d82129543
Binary files /dev/null and b/apps/contourclock/fonts/Dekko-p2.png differ
diff --git a/apps/contourclock/fonts/DinAlternate-p1.png b/apps/contourclock/fonts/DinAlternate-p1.png
new file mode 100644
index 000000000..5957d2c5a
Binary files /dev/null and b/apps/contourclock/fonts/DinAlternate-p1.png differ
diff --git a/apps/contourclock/fonts/DinAlternate-p2.png b/apps/contourclock/fonts/DinAlternate-p2.png
new file mode 100644
index 000000000..fdc9b38a3
Binary files /dev/null and b/apps/contourclock/fonts/DinAlternate-p2.png differ
diff --git a/apps/contourclock/fonts/Impact-p1.png b/apps/contourclock/fonts/Impact-p1.png
new file mode 100644
index 000000000..5ce675ba4
Binary files /dev/null and b/apps/contourclock/fonts/Impact-p1.png differ
diff --git a/apps/contourclock/fonts/Impact-p2.png b/apps/contourclock/fonts/Impact-p2.png
new file mode 100644
index 000000000..0474caea8
Binary files /dev/null and b/apps/contourclock/fonts/Impact-p2.png differ
diff --git a/apps/contourclock/fonts/Nunito-p1.png b/apps/contourclock/fonts/Nunito-p1.png
new file mode 100644
index 000000000..44697c671
Binary files /dev/null and b/apps/contourclock/fonts/Nunito-p1.png differ
diff --git a/apps/contourclock/fonts/Nunito-p2.png b/apps/contourclock/fonts/Nunito-p2.png
new file mode 100644
index 000000000..4312d15ec
Binary files /dev/null and b/apps/contourclock/fonts/Nunito-p2.png differ
diff --git a/apps/contourclock/fonts/OpenSansEC-p1.png b/apps/contourclock/fonts/OpenSansEC-p1.png
new file mode 100644
index 000000000..c5fe85494
Binary files /dev/null and b/apps/contourclock/fonts/OpenSansEC-p1.png differ
diff --git a/apps/contourclock/fonts/OpenSansEC-p2.png b/apps/contourclock/fonts/OpenSansEC-p2.png
new file mode 100644
index 000000000..f1d6381f2
Binary files /dev/null and b/apps/contourclock/fonts/OpenSansEC-p2.png differ
diff --git a/apps/contourclock/fonts/Phosphate-p1.png b/apps/contourclock/fonts/Phosphate-p1.png
new file mode 100644
index 000000000..2d0786c0a
Binary files /dev/null and b/apps/contourclock/fonts/Phosphate-p1.png differ
diff --git a/apps/contourclock/fonts/Phosphate-p2.png b/apps/contourclock/fonts/Phosphate-p2.png
new file mode 100644
index 000000000..af11fea32
Binary files /dev/null and b/apps/contourclock/fonts/Phosphate-p2.png differ
diff --git a/apps/contourclock/fonts/Quicksand-p1.png b/apps/contourclock/fonts/Quicksand-p1.png
new file mode 100644
index 000000000..692fb9253
Binary files /dev/null and b/apps/contourclock/fonts/Quicksand-p1.png differ
diff --git a/apps/contourclock/fonts/Quicksand-p2.png b/apps/contourclock/fonts/Quicksand-p2.png
new file mode 100644
index 000000000..00ac7aef4
Binary files /dev/null and b/apps/contourclock/fonts/Quicksand-p2.png differ
diff --git a/apps/contourclock/fonts/SairaEC-p1.png b/apps/contourclock/fonts/SairaEC-p1.png
new file mode 100644
index 000000000..82b43af02
Binary files /dev/null and b/apps/contourclock/fonts/SairaEC-p1.png differ
diff --git a/apps/contourclock/fonts/SairaEC-p2.png b/apps/contourclock/fonts/SairaEC-p2.png
new file mode 100644
index 000000000..d32fd51b4
Binary files /dev/null and b/apps/contourclock/fonts/SairaEC-p2.png differ
diff --git a/apps/contourclock/fonts/Teko-p1.png b/apps/contourclock/fonts/Teko-p1.png
new file mode 100644
index 000000000..6c33087f9
Binary files /dev/null and b/apps/contourclock/fonts/Teko-p1.png differ
diff --git a/apps/contourclock/fonts/Teko-p2.png b/apps/contourclock/fonts/Teko-p2.png
new file mode 100644
index 000000000..8dcd86d43
Binary files /dev/null and b/apps/contourclock/fonts/Teko-p2.png differ
diff --git a/apps/contourclock/fonts/Yumaro-p1.png b/apps/contourclock/fonts/Yumaro-p1.png
new file mode 100644
index 000000000..5e99dd668
Binary files /dev/null and b/apps/contourclock/fonts/Yumaro-p1.png differ
diff --git a/apps/contourclock/fonts/Yumaro-p2.png b/apps/contourclock/fonts/Yumaro-p2.png
new file mode 100644
index 000000000..ac72818f5
Binary files /dev/null and b/apps/contourclock/fonts/Yumaro-p2.png differ
diff --git a/apps/contourclock/fonts/YuseiMagic-p1.png b/apps/contourclock/fonts/YuseiMagic-p1.png
new file mode 100644
index 000000000..27485a658
Binary files /dev/null and b/apps/contourclock/fonts/YuseiMagic-p1.png differ
diff --git a/apps/contourclock/fonts/YuseiMagic-p2.png b/apps/contourclock/fonts/YuseiMagic-p2.png
new file mode 100644
index 000000000..5b01ea036
Binary files /dev/null and b/apps/contourclock/fonts/YuseiMagic-p2.png differ
diff --git a/apps/contourclock/fonts/temp b/apps/contourclock/fonts/temp
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/apps/contourclock/fonts/temp
@@ -0,0 +1 @@
+
diff --git a/apps/contourclock/metadata.json b/apps/contourclock/metadata.json
index 9b9238703..a5d764f2d 100644
--- a/apps/contourclock/metadata.json
+++ b/apps/contourclock/metadata.json
@@ -1,13 +1,12 @@
 { "id": "contourclock",
   "name": "Contour Clock",
   "shortName" : "Contour Clock",
-  "version":"0.23",
+  "version":"0.24",
   "icon": "app.png",
   "description": "A Minimalist clockface with large Digits. Now with more fonts!",
   "screenshots" : [{"url":"cc-screenshot-1.png"},{"url":"cc-screenshot-2.png"}],
   "tags": "clock",
   "custom": "custom.html",
-  "allow_emulator":true,
   "supports" : ["BANGLEJS2"],
   "type": "clock",
   "storage": [
diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog
index 62a0cab9f..556472eaa 100644
--- a/apps/dtlaunch/ChangeLog
+++ b/apps/dtlaunch/ChangeLog
@@ -5,3 +5,4 @@
 0.05: add Bangle 2 version
 0.06: Adds settings page (hide clocks or launchers)
 0.07: Adds setting for directly launching app on touch for Bangle 2
+0.08: Optimize line wrapping for Bangle 2
diff --git a/apps/dtlaunch/app-b2.js b/apps/dtlaunch/app-b2.js
index 800ec456c..96e562add 100644
--- a/apps/dtlaunch/app-b2.js
+++ b/apps/dtlaunch/app-b2.js
@@ -45,11 +45,23 @@ function draw_icon(p,n,selected) {
     g.setColor(g.theme.fg);
     try{g.drawImage(apps[p*4+n].icon,x+12,y+4);} catch(e){}
     g.setFontAlign(0,-1,0).setFont("6x8",1);
-    var txt =  apps[p*4+n].name.split(" ");
-    for (var i = 0; i < txt.length; i++) {
-        txt[i] = txt[i].trim();
-        g.drawString(txt[i],x+36,y+54+i*8);
+    var txt =  apps[p*4+n].name.replace(/([a-z])([A-Z])/g, "$1 $2").split(" ");
+    var lineY = 0;
+    var line = "";
+    while (txt.length > 0){      
+      var c = txt.shift();
+      
+      if (c.length + 1 + line.length > 13){
+        if (line.length > 0){
+          g.drawString(line.trim(),x+36,y+54+lineY*8);
+          lineY++;
+        }
+        line = c;
+      } else {
+        line += " " + c;
+      }
     }
+    g.drawString(line.trim(),x+36,y+54+lineY*8);
 }
 
 function drawPage(p){
diff --git a/apps/dtlaunch/metadata.json b/apps/dtlaunch/metadata.json
index 8ff5bd592..6cd1dbe73 100644
--- a/apps/dtlaunch/metadata.json
+++ b/apps/dtlaunch/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "dtlaunch",
   "name": "Desktop Launcher",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.",
   "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}],
   "icon": "icon.png",
diff --git a/apps/gbmusic/ChangeLog b/apps/gbmusic/ChangeLog
index 316b98a84..8b1a3e4aa 100644
--- a/apps/gbmusic/ChangeLog
+++ b/apps/gbmusic/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Bangle.js 2 support
 0.07: Fix "previous" button image
 0.08: Fix scrolling title background color
+0.09: Move event listener from widget to boot code, stops music from showing up in messages
diff --git a/apps/gbmusic/app.js b/apps/gbmusic/app.js
index 1bddf70f7..c8395f745 100644
--- a/apps/gbmusic/app.js
+++ b/apps/gbmusic/app.js
@@ -175,10 +175,8 @@ function rIcon(l) {
 }
 let layout;
 function makeUI() {
-  global.gbmusic_active = true; // we don't need our widget (needed for <2.09 devices)
   Bangle.loadWidgets();
   Bangle.drawWidgets();
-  delete (global.gbmusic_active);
   const Layout = require("Layout");
   layout = new Layout({
     type: "v", c: [
@@ -331,7 +329,7 @@ function formatNum(info) {
  * Update music info
  * @param {Object} info - Gadgetbridge musicinfo event
  */
-function musicInfo(info) {
+function info(info) {
   scrollStop();
   layout.title.label = info.track || "";
   layout.album.label = info.album || "";
@@ -360,7 +358,7 @@ let tPxt, tIxt; // Timeouts to eXiT when Paused/Inactive for too long
  * Update music state
  * @param {Object} e - Gadgetbridge musicstate event
  */
-function musicState(e) {
+function state(e) {
   stat = e.state;
   // if paused for five minutes, load the clock
   // (but timeout resets if we get new info, even while paused)
@@ -584,8 +582,8 @@ function startEmulator() {
       println: (line) => {console.log("Bluetooth:", line);},
     };
     // some example info
-    GB({"t": "musicinfo", "artist": "Some Artist Name", "album": "The Album Name", "track": "The Track Title Goes Here", "dur": 241, "c": 2, "n": 2});
-    GB({"t": "musicstate", "state": "play", "position": 0, "shuffle": 1, "repeat": 1});
+    info({"t": "musicinfo", "artist": "Some Artist Name", "album": "The Album Name", "track": "The Track Title Goes Here", "dur": 241, "c": 2, "n": 2});
+    state({"t": "musicstate", "state": "play", "position": 0, "shuffle": 1, "repeat": 1});
   }
 }
 function startWatches() {
@@ -596,25 +594,6 @@ function startWatches() {
 
 function start() {
   makeUI();
-  // start listening for music updates
-  const _GB = global.GB;
-  global.GB = (event) => {
-    // we eat music events!
-    switch(event.t) {
-      case "musicinfo":
-        musicInfo(event);
-        break;
-      case "musicstate":
-        musicState(event);
-        break;
-      default:
-        // pass on other events
-        if (_GB) {
-          setTimeout(_GB, 0, event);
-        }
-        return;
-    }
-  };
   startWatches();
   tick();
   startEmulator();
@@ -625,11 +604,11 @@ function init() {
   let saved = require("Storage").readJSON("gbmusic.load.json", true);
   require("Storage").erase("gbmusic.load.json");
   if (saved) {
-    // autoloaded: load state was saved by widget
+    // autoloaded: load state as saved by widget
     auto = true;
     start();
-    musicInfo(saved.info);
-    musicState(saved.state);
+    info(saved.info);
+    state(saved.state);
     return;
   }
 
diff --git a/apps/gbmusic/boot.js b/apps/gbmusic/boot.js
new file mode 100644
index 000000000..154f85c2b
--- /dev/null
+++ b/apps/gbmusic/boot.js
@@ -0,0 +1,37 @@
+setTimeout( // make other boot code run first, so we override e.g. android.boot.js GB
+  () => {
+    const APP = global.__FILE__==="gbmusic.app.js",
+      a = !!(require("Storage").readJSON("gbmusic.json", 1) || {}).autoStart;
+
+    let s, i; // state, info
+    /**
+     * Save current song and check if we want to load the gbmusic app
+     *
+     * Only runs while other apps are loaded
+     */
+    function check() {
+      if (s!=="play" || !i || !a || !Bangle.CLOCK) return; // only launch app if we know which song we are playing, and autoLoad is enabled
+      delete (i.t);
+      // store info and launch music app
+      require("Storage").writeJSON("gbmusic.load.json", {
+        state: s,
+        info: i,
+      });
+      load("gbmusic.app.js");
+    }
+
+    global.GB = (_GB => e => {
+      // we eat music events!
+      switch(e.t) {
+        case "musicinfo":
+          i = e;
+          return APP ? info(e) : check();
+        case "musicstate":
+          s = e.state;
+          return APP ? state(e) : check();
+        default:
+          // pass on other events
+          if (_GB) setTimeout(_GB, 0, e);
+      }
+    })(global.GB);
+  }, 1);
diff --git a/apps/gbmusic/metadata.json b/apps/gbmusic/metadata.json
index 9400f70e0..f578f1f48 100644
--- a/apps/gbmusic/metadata.json
+++ b/apps/gbmusic/metadata.json
@@ -2,7 +2,7 @@
   "id": "gbmusic",
   "name": "Gadgetbridge Music Controls",
   "shortName": "Music Controls",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Control the music on your Gadgetbridge-connected phone",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot_v1.png"},{"url":"screenshot_v2.png"}],
@@ -14,7 +14,7 @@
   "storage": [
     {"name":"gbmusic.app.js","url":"app.js"},
     {"name":"gbmusic.settings.js","url":"settings.js"},
-    {"name":"gbmusic.wid.js","url":"widget.js"},
+    {"name":"gbmusic.boot.js","url":"boot.js"},
     {"name":"gbmusic.img","url":"icon.js","evaluate":true}
   ],
   "data": [{"name":"gbmusic.json"},{"name":"gbmusic.load.json"}]
diff --git a/apps/gbmusic/widget.js b/apps/gbmusic/widget.js
deleted file mode 100644
index 86bda99a1..000000000
--- a/apps/gbmusic/widget.js
+++ /dev/null
@@ -1,44 +0,0 @@
-(() => {
-  if (global.gbmusic_active || !(require("Storage").readJSON("gbmusic.json", 1) || {}).autoStart) {
-    return;
-  }
-  if (typeof __FILE__ === 'string') { // only exists since 2v09
-    const info = require("Storage").readJSON(__FILE__.split(".")[0]+".info", 1) || false;
-    if (info && info.type!=="clock") { // info can have no type (but then it isn't a clock)
-      return;
-    }
-  }
-
-  let state, info;
-  function checkMusic() {
-    if (state!=="play" || !info) {
-      return;
-    }
-    // playing music: launch music app
-    require("Storage").writeJSON("gbmusic.load.json", {
-      state: state,
-      info: info,
-    });
-    load("gbmusic.app.js");
-  }
-
-  const _GB = global.GB;
-  global.GB = (event) => {
-    // we eat music events!
-    switch(event.t) {
-      case "musicinfo":
-        info = event;
-        delete (info.t);
-        checkMusic();
-        break;
-      case "musicstate":
-        state = event.state;
-        checkMusic();
-        break;
-      default:
-        if (_GB) {
-          setTimeout(_GB, 0, event);
-        }
-    }
-  };
-})();
diff --git a/apps/gpssetup/README.md b/apps/gpssetup/README.md
index 8e64c6a30..8c9445ec9 100644
--- a/apps/gpssetup/README.md
+++ b/apps/gpssetup/README.md
@@ -107,3 +107,8 @@ try {
 
 * Some useful code on Github can be found [here](https://portal.u-blox.com/s/question/0D52p0000925T00CAE/ublox-max-m8q-getting-stuck-when-sleeping-with-extint-pin-control)
 and [here](https://github.com/thasti/utrak/blob/master/gps.c)
+
+
+Written by: [Hugh Barney, with support from Gordon Williams](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/kitchen/README.md b/apps/kitchen/README.md
index 2a1b148fd..102881d15 100644
--- a/apps/kitchen/README.md
+++ b/apps/kitchen/README.md
@@ -280,3 +280,8 @@ The following error codes will be displayed if one of the dependancies is not me
 * Add a small graph to the heart rate monitor app
 * Add a facility to call the Arrow calibration process
 * Maybe create waypoints.json file if missing
+
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index a8c55f8fd..7d8fecb1e 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -14,4 +14,5 @@
 0.14: Added altitude as an option to display.
 0.15: Using wpedom to count steps.
 0.16: Improved stability. Wind can now be shown.
-0.17: Settings for mph/kph and other minor improvements.
\ No newline at end of file
+0.17: Settings for mph/kph and other minor improvements.
+0.18: Fullscreen mode can now be enabled or disabled in the settings.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index b6bfda2c1..f979b2304 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -11,7 +11,7 @@ with Gadgetbride and the weather app must be installed.
 
 ## Features
  * LCARS Style watch face.
- * Full screen mode - widgets are still loaded but not shown.
+ * Enable or disable fullscreen mode (widgets are always loaded, but hidden if fullscreen).
  * Tab on left/right to switch between different screens.
  * Cusomizable data that is shown on screen 1 (steps, weather etc.)
  * Shows random and real images of planets.
@@ -33,7 +33,7 @@ with Gadgetbride and the weather app must be installed.
 ## Multiple screens support
 Access different screens via tap on the left/ right side of the screen
 
-![](screenshot.png)
+![](screenshot_1.png)
 ![](screenshot_2.png)
 
 
diff --git a/apps/lcars/bg_left_small.png b/apps/lcars/bg_left_small.png
new file mode 100644
index 000000000..bfdb110d9
Binary files /dev/null and b/apps/lcars/bg_left_small.png differ
diff --git a/apps/lcars/bg_right_small.png b/apps/lcars/bg_right_small.png
new file mode 100644
index 000000000..df9d32b38
Binary files /dev/null and b/apps/lcars/bg_right_small.png differ
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index dcbd294bb..7d5da2d8e 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -7,6 +7,7 @@ let settings = {
   dataRow2: "Temp",
   dataRow3: "Battery",
   speed: "kph",
+  fullscreen: false,
 };
 let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
 for (const key in saved_settings) {
@@ -30,23 +31,39 @@ let lcarsViewPos = 0;
 // let hrmValue = 0;
 var plotMonth = false;
 
+
 /*
  * Requirements and globals
  */
 
 
-var bgLeft =  {
+var bgLeftFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress(atob("AAUM2XLlgCCwAJBBAuy4EAmQIF5cggAIGlmwgYIG2XIF42wF4ImGF4ImHJoQmGJoQdJhZNHNY47CgRNGBIJZHHgRiGBIRQ/KH5QCAFCh/eX5Q/KAwdCAGVbtu27YCCoAJBkuWrNlAQRGCiwRDAQPQBIMJCIYCBsAJBgomEtu0WoQmEy1YBIMBHYttIwQ7FyxQ/KHFlFAQ7F2weCHYplKChRTCCg5TCHw5TMAD0GzVp0wCCBBGaBIMaBAtpwECBA2mwEJBAugDgMmCIwJBF5EABAtoeQQvGCYQdPJoI7LMQzTCLJKAGzAJBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A=="))
 };
 
-var bgRight =  {
+var bgLeftNotFullscreen = {
+  width : 27, height : 152, bpp : 3,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("AAUM2XLlgCCwAJBBAuy4EAmQIF5cggAIGlmwgYIG2XIF42wF4ImGF4ImHJoQmGJoQdJhZNHNY47CgRNGBIJZHHgRiGBIRQ/KH5QCAGVbtu27YCCoAJBkuWrNlAQRkCiwRDAQPQBIMJCIYCBsAJBgomEtu0WoQmEy1YBIMBHYttIwQ7FyxQ/KHFlFAQ7F2weCHYplKChRTCCg5TCHw5TMAD0GzVp0wCCBBGaBIMaBAtpwECBA2mwEJBAugDgMmCIwJBF5EABAtoeQQvGCYQdPJoI7LMQzTCLJKAGzAJBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A="))
+};
+
+var bgRightFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress(atob("lmy5YCDBIUyBAmy5AJBhYUG2EAhgIFAQMAgQIGCgQABCg4ABEAwUNFI2AKZHAKZEgGRZTGOIUDQxJxGKH5Q/agwAnUP7y/KH4yGeVYAJrdt23bAQVABIMly1ZsoCCMgUWCIYCB6AJBhIRDAQNgBIMFEwlt2i1CEwmWrAJBgI7FtpGCHYuWKH5QxEwpQDlo7F0A7IqBZBEwo7BCIwCBJo53CJoxiCJpIAdgOmzVpAQR/CgAIEAQJ2CBAoCBBIMmCg1oD4QLGFQUCCjQ+CKYw+CKY4JCKYwoCGRMaGREJDoroCgwdFzBlLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJox/CgAA="))
 };
 
+var bgRightNotFullscreen =  {
+  width : 27, height : 152, bpp : 3,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("lmy5YCDBIUyBAmy5AJBhYUG2EAhgIFAQMAgQIGCgQABCg4ABEAwUNFI2AKZHAKZEgGRZTGOIUDQxJxGKH5Q/agwAxrdt23bAQVABIMly1ZsoCCMgUWCIYCB6AJBhIRDAQNgBIMFEwlt2i1CEwmWrAJBgI7FtpGCHYuWKH5QxEwpQDlo7F0A7IqBZBEwo7BCIwCBJo53CJoxiCJpIAdgOmzVpAQR/CgAIEAQJ2CBAoCBBIMmCg1oD4QLGFQUCCjQ+CKYw+CKY4JCKYwoCGRMaGREJDoroCgwdFzBlLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJox/CgA="))
+};
+
+var bgLeft = settings.fullscreen ? bgLeftFullscreen : bgLeftNotFullscreen;
+var bgRight= settings.fullscreen ? bgRightFullscreen : bgRightNotFullscreen;
+
 var iconEarth = {
   width : 50, height : 50, bpp : 3,
   buffer : require("heatshrink").decompress(atob("AFtx48ECBsDwU5k/yhARLjgjBjlzAQMQEZcIkOP/fn31IEZgCBnlz58cEpM4geugEgwU/8+WNZJHDuHHvgmBCQ8goEOnVgJoMnyV58mACItHI4X8uAFBuVHnnz4BuGxk4////Egz3IkmWvPgNw8f/prB//BghTC+AjE7848eMjNnzySBwUJkmf/BuGuPDAQIjBiPHhhTCSQnjMo0ITANJn44Dg8MuFBggCCiFBcAJ0Bv5xEh+ITo2OhHkyf/OIQdBWwVHhgjBNwUE+fP/5EEgePMoYLBhMgyVJk/+BQQdC688I4XxOIc8v//NAvr+QEBj/5NwKVBy1/QYUciPBhk1EAJrC+KeC489QYaMBgU/8BNB9+ChEjz1Jkn/QYMBDQIgCcYTCCiP/nlzJQmenMAgV4//uy/9wRaB/1J8iVCcAfHjt9TYYICnhKCgRKBw159/v//r927OIeeoASBDQccvv3791KYVDBYPLJQeCnPnz//AAP6ocEjEkXgMgJQtz79fLAP8KYkccAcJ8Gf/f/xu/cAMQ4eP5MlyQRCMolx40YsOGBAPfnnzU4KVDpKMBvz8Dh0/8me7IICgkxJQXPIgZTD58sEgcJk+eNoONnFBhk4/5uB/pcDg5KD+4mEv4CBXISVDhEn31/8/+mH7x//JQK5CAAMB4JBCnnxJQf/+fJEgkAa4L+CAQOOjMn/1bXIRxDJQXx58f//Hhlz/88EgsChMgz/Zs/+nfkyV/8huDOI6SD498NwoACi1Z8+S/Plz17/+QCI7jC+ZxBmfPnojIAAMDcYWSp//2wRJEwq2GABECjMgNYwAmA="))
@@ -217,7 +234,7 @@ function drawHorizontalBgLine(color, x1, x2, y, h){
 
 
 function drawInfo(){
-  if(lcarsViewPos != 0){
+  if(lcarsViewPos != 0 || !settings.fullscreen){
     return;
   }
 
@@ -276,9 +293,10 @@ function drawState(){
 
 function drawPosition0(){
   // Draw background image
-  g.drawImage(bgLeft, 0, 0);
-  drawHorizontalBgLine(cBlue, 25, 120, 0, 4);
-  drawHorizontalBgLine(cBlue, 130, 176, 0, 4);
+  var offset = settings.fullscreen ? 0 : 24;
+  g.drawImage(bgLeft, 0, offset);
+  drawHorizontalBgLine(cBlue, 25, 120, offset, 4);
+  drawHorizontalBgLine(cBlue, 130, 176, offset, 4);
   drawHorizontalBgLine(cPurple, 20, 70, 80, 4);
   drawHorizontalBgLine(cPurple, 80, 176, 80, 4);
   drawHorizontalBgLine(cOrange, 35, 110, 87, 4);
@@ -304,15 +322,26 @@ function drawPosition0(){
   var currentDate = new Date();
   var timeStr = locale.time(currentDate,1);
   g.setFontAntonioLarge();
-  g.drawString(timeStr, 27, 10);
+  if(settings.fullscreen){
+    g.drawString(timeStr, 27, 10);
+  } else {
+    g.drawString(timeStr, 27, 33);
+  }
 
   // Write date
   g.setColor(cWhite);
   g.setFontAntonioMedium();
-  var dayStr = locale.dow(currentDate, true).toUpperCase();
-  dayStr += " " + currentDate.getDate();
-  dayStr += " " + locale.month(currentDate, 1).toUpperCase();
-  g.drawString(dayStr, 30, 56);
+  if(settings.fullscreen){
+    var dayStr = locale.dow(currentDate, true).toUpperCase();
+    dayStr += " " + currentDate.getDate();
+    dayStr += " " + locale.month(currentDate, 1).toUpperCase();
+    g.drawString(dayStr, 30, 56);
+  } else {
+    var dayStr = locale.dow(currentDate, true).toUpperCase();
+    var date = currentDate.getDate();
+    g.drawString(dayStr, 128, 35);
+    g.drawString(date, 128, 55);
+  }
 
   // Draw data
   g.setFontAlign(-1, -1, 0);
@@ -327,8 +356,11 @@ function drawPosition0(){
 
 function drawPosition1(){
   // Draw background image
-  g.drawImage(bgRight, 149, 0);
-  drawHorizontalBgLine(cBlue, 0, 140, 0, 4);
+  var offset = settings.fullscreen ? 0 : 24;
+  g.drawImage(bgRight, 149, offset);
+  if(settings.fullscreen){
+    drawHorizontalBgLine(cBlue, 0, 140, offset, 4);
+  }
   drawHorizontalBgLine(cPurple, 0, 80, 80, 4);
   drawHorizontalBgLine(cPurple, 90, 150, 80, 4);
   drawHorizontalBgLine(cOrange, 0, 50, 87, 4);
@@ -388,8 +420,13 @@ function drawPosition1(){
     g.setFontAlign(1, 1, 0);
     g.setFontAntonioMedium();
     g.setColor(cWhite);
-    g.drawString("M-HRM", 154, 27);
-    g.drawString("M-STEPS [K]", 154, 115);
+
+    if(settings.fullscreen){
+      g.drawString("M-HRM", 154, 27);
+      g.drawString("M-STEPS [K]", 154, 115);
+    } else {
+      g.drawString("MONTH", 154, 115);
+    }
 
   // Plot day
   } else {
@@ -429,8 +466,13 @@ function drawPosition1(){
     g.setFontAlign(1, 1, 0);
     g.setFontAntonioMedium();
     g.setColor(cWhite);
-    g.drawString("D-HRM", 154, 27);
-    g.drawString("D-STEPS", 154, 115);
+
+    if(settings.fullscreen){
+      g.drawString("D-HRM", 154, 27);
+      g.drawString("D-STEPS", 154, 115);
+    } else {
+      g.drawString("DAY", 154, 115);
+    }
   }
 }
 
@@ -451,6 +493,13 @@ function draw(){
     } else if (lcarsViewPos == 1) {
       drawPosition1();
     }
+
+    // After drawing the watch face, we can draw the widgets
+    if(settings.fullscreen){
+      for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
+    } else {
+      Bangle.drawWidgets();
+    }
 }
 
 
@@ -501,8 +550,9 @@ function getWeather(){
   weather.hum = weather.hum + "%";
 
   // Wind
-  var speedFactor = settings.speed == "kph" ? 1.60934 : 1.0;
-  weather.wind = Math.round(weather.wind * speedFactor);
+  const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
+  var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
+  weather.wind = Math.round(wind[1] * speedFactor);
 
   return weather
 }
@@ -652,16 +702,7 @@ Bangle.on('touch', function(btn, e){
 // Show launcher when middle button pressed
 Bangle.setUI("clock");
 Bangle.loadWidgets();
-/*
- * we are not drawing the widgets as we are taking over the whole screen
- * so we will blank out the draw() functions of each widget and change the
- * area to the top bar doesn't get cleared.
- */
-for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
 
 // Clear the screen once, at startup and draw clock
 g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear();
 draw();
-
-// After drawing the watch face, we can draw the widgets
-// Bangle.drawWidgets();
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 176f88593..75add1ece 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -9,6 +9,7 @@
     dataRow2: "Steps",
     dataRow3: "Temp",
     speed: "kph",
+    fullscreen: false,
   };
   let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
   for (const key in saved_settings) {
@@ -52,6 +53,14 @@
         save();
       },
     },
+    'Full Screen': {
+      value: settings.fullscreen,
+      format: () => (settings.fullscreen ? 'Yes' : 'No'),
+      onchange: () => {
+        settings.fullscreen = !settings.fullscreen;
+        save();
+      },
+    },
     'Speed': {
       value: 0 | speedOptions.indexOf(settings.speed),
       min: 0, max: 1,
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index a402b35a4..e6ca10f79 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,13 +3,15 @@
   "name": "LCARS Clock",
   "shortName":"LCARS",
   "icon": "lcars.png",
-  "version":"0.17",
+  "version":"0.18",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",
   "type": "clock",
   "tags": "clock",
-  "screenshots": [{"url":"screenshot.png"}],
+  "screenshots": [
+    {"url":"screenshot_1.png"},
+    {"url":"screenshot_3.png"}],
   "storage": [
     {"name":"lcars.app.js","url":"lcars.app.js"},
     {"name":"lcars.img","url":"lcars.icon.js","evaluate":true},
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
deleted file mode 100644
index e2d2cbd5f..000000000
Binary files a/apps/lcars/screenshot.png and /dev/null differ
diff --git a/apps/lcars/screenshot_1.png b/apps/lcars/screenshot_1.png
new file mode 100644
index 000000000..09a604069
Binary files /dev/null and b/apps/lcars/screenshot_1.png differ
diff --git a/apps/lcars/screenshot_2.png b/apps/lcars/screenshot_2.png
index 52ad295c4..a7a94db39 100644
Binary files a/apps/lcars/screenshot_2.png and b/apps/lcars/screenshot_2.png differ
diff --git a/apps/lcars/screenshot_3.png b/apps/lcars/screenshot_3.png
new file mode 100644
index 000000000..931ea15de
Binary files /dev/null and b/apps/lcars/screenshot_3.png differ
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 99c867ef2..4811cd19b 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -30,3 +30,4 @@
       If showMessage called with no message (eg all messages deleted) now return to the clock (fix #1267)
 0.19: Use a larger font for message text if it'll fit
 0.20: Allow tapping on the body to show a scrollable view of the message and title in a bigger font (fix #1405, #1031)
+0.21: Improve list readability on dark theme
diff --git a/apps/messages/app.js b/apps/messages/app.js
index ec147daf8..4aaf97369 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -27,7 +27,7 @@ var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
 var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
 var colBg = g.theme.dark ? "#141":"#4f4";
 var colSBg1 = g.theme.dark ? "#121":"#cFc";
-var colSBg2 = g.theme.dark ? "#242":"#9F9";
+var colSBg2 = g.theme.dark ? "#000":"#9F9";
 // hack for 2v10 firmware's lack of ':size' font handling
 try {
   g.setFont("6x8:2");
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 7b6141cae..6834693ae 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.20",
+  "version": "0.21",
   "description": "App to display notifications from iOS and Gadgetbridge",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/mylocation/ChangeLog b/apps/mylocation/ChangeLog
index 653f859ae..b9eba67f4 100644
--- a/apps/mylocation/ChangeLog
+++ b/apps/mylocation/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First release
 0.02: Enhanced icon, make it bolder
+0.03: Fixed issue with defaulting back to London
diff --git a/apps/mylocation/metadata.json b/apps/mylocation/metadata.json
index b26a97290..a7fd8356c 100644
--- a/apps/mylocation/metadata.json
+++ b/apps/mylocation/metadata.json
@@ -4,7 +4,7 @@
   "icon": "mylocation.png",
   "type": "app",
   "screenshots": [{"url":"screenshot_1.png"}],
-  "version":"0.02",
+  "version":"0.03",
   "description": "Sets and stores the lat and long of your preferred City or it can be set from the GPS. mylocation.json can be used by other apps that need your main location lat and lon. See README",
   "readme": "README.md",
   "tags": "tool,utility",
diff --git a/apps/mylocation/mylocation.app.js b/apps/mylocation/mylocation.app.js
index fb2f73fa7..27ab17ea5 100644
--- a/apps/mylocation/mylocation.app.js
+++ b/apps/mylocation/mylocation.app.js
@@ -9,32 +9,35 @@ let s = {
   'lat': 51.5072,
   'lon': 0.1276,
   'location': "London"
-}
+};
 
 function loadSettings() {
-  settings = require('Storage').readJSON(SETTINGS_FILE, 1) || s;
+  settings = require('Storage').readJSON(SETTINGS_FILE, 1) || {};
+  for (const key in settings) {
+    s[key] = settings[key]
+  }
 }
 
 function save() {
-  settings = s
-  require('Storage').write(SETTINGS_FILE, settings)
+  settings = s;
+  require('Storage').write(SETTINGS_FILE, settings);
 }
 
-const locations = ["London", "Newcastle", "Edinburgh", "Paris", "New York", "Tokyo","???"];
-const lats = [51.5072 ,54.9783 ,55.9533 ,48.8566 ,40.7128 ,35.6762, 0.0];
-const lons = [-0.1276  ,-1.6178  ,-3.1883  ,2.3522  , -74.0060 ,139.6503, 0.0];
+const locations = ["London" ,"Newcastle","Edinburgh", "Paris" , "New York" , "Tokyo"  , "Frankfurt", "Auckland", "???"];
+const lats =      [ 51.5072 ,  54.9783  , 55.9533   , 48.8566 ,  40.7128   ,  35.6762 ,  50.1236   ,  -36.9    ,  0.0 ];
+const lons =      [ -0.1276 ,  -1.6178  , -3.1883   ,  2.3522 , -74.0060   , 139.6503 ,   8.6553   ,  174.7832 ,  0.0 ];
 
 function setFromGPS() {
   Bangle.on('GPS', (gps) => {
     //console.log(".");
     if (gps.fix === 0) return;
     //console.log("fix from GPS");
-    s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' }
+    s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' };
     Bangle.buzz(1500); // buzz on first position
     Bangle.setGPSPower(0);
     save();
 
-    Bangle.setUI("updown", ()=>{ load() });
+    Bangle.setUI("updown", ()=>{ load(); });
     E.showPrompt("Location has been saved from the GPS fix",{
       title:"Location Saved",
       buttons : {"OK":1}
@@ -49,13 +52,13 @@ function setFromGPS() {
 }
 
 function showMainMenu() {
-  console.log("showMainMenu");
+  //console.log("showMainMenu");
   const mainmenu = {
     '': { 'title': 'My Location' },
     '<Back': ()=>{ load(); },
     'City': {
       value: 0 | locations.indexOf(s.location),
-      min: 0, max: 6,
+      min: 0, max: locations.length - 1,
       format: v => locations[v],
       onchange: v => {
         if (v != 6) {
@@ -67,7 +70,7 @@ function showMainMenu() {
       }
     },
     'Set From GPS': ()=>{ setFromGPS(); }
-  }
+  };
   return E.showMenu(mainmenu);
 }
 
diff --git a/apps/neonx/ChangeLog b/apps/neonx/ChangeLog
new file mode 100644
index 000000000..af7f83942
--- /dev/null
+++ b/apps/neonx/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial release
diff --git a/apps/neonx/README.md b/apps/neonx/README.md
new file mode 100644
index 000000000..d836dfab3
--- /dev/null
+++ b/apps/neonx/README.md
@@ -0,0 +1,20 @@
+# Neon X and IO X Clock
+
+| ![Neon X](neonx-screenshot.png) | ![Neon IO X](neoniox-screenshot.png) |
+|---------------------------------|--------------------------------------|
+| <center>Neon X</center>         | <center>Neon IO X</center>           |
+
+This is a clock based on Pebble's Neon X and Neon IO X watchfaces by Sam Jerichow. 
+Can be switched between in the Settings menu, which can be accessed through 
+the app/widget settings menu of the Bangle.js
+
+## Settings
+
+### Neon IO X:
+Activate the Neon IO X clock look, a bit hard to read until one gets used to it.
+
+### Thickness
+The thickness of watch lines, from 1 to 5.
+
+### Date on touch
+Shows the current date as DD MM on touch and reverts back to time after 5 seconds or with another touch.
diff --git a/apps/neonx/metadata.json b/apps/neonx/metadata.json
new file mode 100644
index 000000000..41b16d11b
--- /dev/null
+++ b/apps/neonx/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "neonx",
+  "name": "Neon X & IO X Clock",
+  "shortName": "Neon X Clock",
+  "version": "0.01",
+  "description": "Pebble Neon X & Neon IO X for Bangle.js",
+  "icon": "neonx.png",
+  "type": "clock",
+  "readme": "README.md",
+  "tags": "neonx,neonio,neoniox,clock",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "allow_emulator": true,
+  "screenshots": [{"url": "neonx-screenshot.png"}, {"url": "neoniox-screenshot.png"}],
+  "storage": [
+    {"name": "neonx.app.js", "url": "neonx.app.js"},
+    {"name": "neonx.img", "url": "neonx-icon.js", "evaluate": true},
+    {"name": "neonx.settings.js", "url": "neonx.settings.js"}
+  ],
+  "data": [{"name": "neonx.json"}]
+}
diff --git a/apps/neonx/neoniox-screenshot.png b/apps/neonx/neoniox-screenshot.png
new file mode 100644
index 000000000..0b33b0819
Binary files /dev/null and b/apps/neonx/neoniox-screenshot.png differ
diff --git a/apps/neonx/neonx-icon.js b/apps/neonx/neonx-icon.js
new file mode 100644
index 000000000..3ed628b0b
--- /dev/null
+++ b/apps/neonx/neonx-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("MDCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAwAAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAALaAAAAAAAAAAG2AAAAAAAAAABQAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgABttttttttsAAEkAAAAAAAEkANtttttttttgAEkAAAAAAAEkABttttttttsAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAEkAAAAAAAEkAAAAAAAAAAAAAAgAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkAAAAAAAAAAAAAAAAAAAAAAEkABttttttttsAAAAAAAAAAAEkANtttttttttgAAAAAAAAAAAgABttttttttsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="))
diff --git a/apps/neonx/neonx-screenshot.png b/apps/neonx/neonx-screenshot.png
new file mode 100644
index 000000000..f18348f52
Binary files /dev/null and b/apps/neonx/neonx-screenshot.png differ
diff --git a/apps/neonx/neonx.app.js b/apps/neonx/neonx.app.js
new file mode 100644
index 000000000..967fc8582
--- /dev/null
+++ b/apps/neonx/neonx.app.js
@@ -0,0 +1,153 @@
+/**
+ * Bangle.js Neon X/IO X Clock
+ *
+ * Author: Bundyo
+ * Repo: https://github.com/bundyo/BangleApps/tree/master/apps/neonx
+ * Initial code based on Numerals Clock by Raik M.
+ * Pebble Watchface Author: Sam Jerichow
+ * Created: February 2022
+ */
+
+const digits = {
+  0:[[15,15,85,15,85,85,15,85,15,15]],
+  1:[[85,15,85,85]],
+  2:[[15,15,85,15,85,50], [15,50,15,85,85,85]],
+  3:[[15,15,85,15,85,85,15,85]],
+  4:[[15,15,15,50], [85,15,85,85]],
+  5:[[85,15,15,15,15,50], [85,50,85,85,15,85]],
+  6:[[85,15,15,15,15,85,85,85,85,50]],
+  7:[[15,15,85,15,85,85]],
+  8:[[15,15,85,15],[15,85,85,85]],
+  9:[[15,50,15,15,85,15,85,85,15,85]],
+};
+
+const colors = {
+  x: [
+    ["#FF00FF", "#00FFFF"],
+    ["#00FF00", "#FFFF00"]
+  ],
+  io: [
+    ["#FF00FF", "#FFFF00"],
+    ["#00FF00", "#00FFFF"]
+  ]
+};
+
+const is12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||false;
+const screenWidth = g.getWidth();
+const halfWidth = screenWidth / 2;
+const scale = screenWidth / 240;
+const REFRESH_RATE = 10E3;
+
+let interval = 0;
+let showingDate = false;
+
+function drawLine(poly, thickness){
+  for (let i = 0; i < poly.length; i = i + 2){
+    if (poly[i + 2] === undefined) {
+      break;
+    }
+
+    if (poly[i] !== poly[i + 2]) {
+      g.fillRect(poly[i], poly[i + 1] - thickness / 2, poly[i + 2], poly[i + 3] + thickness / 2);
+    } else {
+      g.fillRect(poly[i] - thickness / 2, poly[i + 1], poly[i + 2] + thickness / 2, poly[i + 3]);
+    }
+
+    g.fillCircle(poly[i], poly[i + 1], thickness / 2);
+    g.fillCircle(poly[i + 2], poly[i + 3], thickness / 2);
+  }
+}
+
+let settings = require('Storage').readJSON('neonx.json', 1);
+
+if (!settings) {
+  settings = {
+    thickness: 4,
+    io: 0,
+    showDate: 1
+  };
+}
+
+function drawClock(num){
+  let tx, ty;
+
+  for (let x = 0; x <= 1; x++) {
+    for (let y = 0; y <= 1; y++) {
+      const current = ((y + 1) * 2 + x - 1);
+      let newScale = scale;
+
+      g.setColor(colors[settings.io ? 'io' : 'x'][y][x]);
+
+      if (!settings.io) {
+        tx = (x * 100 + 18) * newScale;
+        ty = (y * 100 + 32) * newScale;
+      } else {
+        newScale = 0.33 + current * 0.4;
+
+        tx = (halfWidth - 139) * newScale + halfWidth;
+        ty = (halfWidth - 139) * newScale + halfWidth + 12;
+      }
+
+      for (let i = 0; i < digits[num[y][x]].length; i++) {
+        drawLine(g.transformVertices(digits[num[y][x]][i], { x: tx, y: ty, scale: newScale}), settings.thickness);
+      }
+    }
+  }
+}
+
+function draw(date){
+  let d = new Date();
+  let l1, l2;
+
+  showingDate = date;
+
+  if (date) {
+    setUpdateInt(0);
+
+    l1 = ('0' + (new Date()).getDate()).substr(-2);
+    l2 = ('0' + ((new Date()).getMonth() + 1)).substr(-2);
+
+    setTimeout(_ => {
+      draw();
+      setUpdateInt(1);
+    }, 5000);
+  } else {
+    l1 = ('0' + (d.getHours() % (is12hour ? 12 : 24))).substr(-2);
+    l2 = ('0' + d.getMinutes()).substr(-2);
+  }
+
+  g.clearRect(0,24,240,240);
+
+  drawClock([l1, l2]);
+}
+
+function setUpdateInt(set){
+  if (interval) {
+    clearInterval(interval);
+  }
+
+  if (set) {
+    interval = setInterval(draw, REFRESH_RATE);
+  }
+}
+
+g.clear(1);
+
+Bangle.setUI("clock");
+
+setUpdateInt(1);
+draw();
+
+if (settings.showDate) {
+  Bangle.on('touch', () => draw(!showingDate));
+}
+
+Bangle.on('lcdPower', function(on){
+  if (on){
+    draw();
+    setUpdateInt(1);
+  } else setUpdateInt(0);
+});
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/neonx/neonx.png b/apps/neonx/neonx.png
new file mode 100644
index 000000000..5c7563051
Binary files /dev/null and b/apps/neonx/neonx.png differ
diff --git a/apps/neonx/neonx.settings.js b/apps/neonx/neonx.settings.js
new file mode 100644
index 000000000..0e205e03b
--- /dev/null
+++ b/apps/neonx/neonx.settings.js
@@ -0,0 +1,54 @@
+(function(back) {
+  function updateSettings() {
+    storage.write('neonx.json', neonXSettings);
+  }
+
+  function resetSettings() {
+    neonXSettings = {
+      thickness: 4,
+      io: 0,
+      showDate: 1
+    };
+
+    updateSettings();
+  }
+
+  let neonXSettings = storage.readJSON('neonx.json',1);
+
+  if (!neonXSettings) resetSettings();
+
+  let thicknesses = [1, 2, 3, 4, 5];
+
+  const menu = {
+    "" : { "title":"Neon X & IO"},
+    "< Back": back,
+    "Neon IO X": {
+      value: 0 | neonXSettings.io,
+      min: 0, max: 1,
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        neonXSettings.io = v;
+        updateSettings();
+      }
+    },
+    "Thickness": {
+      value: 0 | thicknesses.indexOf(neonXSettings.thickness),
+      min: 0, max: thicknesses.length - 1,
+      format: v => thicknesses[v],
+      onchange: v => {
+        neonXSettings.thickness = thicknesses[v];
+        updateSettings();
+      }
+    },
+    "Date on touch": {
+      value: 0 | neonXSettings.showDate,
+      min: 0, max: 1,
+      format: v => v ? "On" : "Off",
+      onchange: v => {
+        neonXSettings.showDate = v;
+        updateSettings();
+      }
+    }
+  };
+  E.showMenu(menu);
+})
diff --git a/apps/pastel/ChangeLog b/apps/pastel/ChangeLog
index 570c37507..d133697b3 100644
--- a/apps/pastel/ChangeLog
+++ b/apps/pastel/ChangeLog
@@ -13,3 +13,6 @@
       which requires 2.11.27 firmware to reset at midnight
 0.13: call process.memory(false) to avoid triggering a GC of memory
       supported in pre 2.12.13 firmware
+0.14: incorporated lazybones idle timer, configuration settings to come
+0.15: fixed tendancy for mylocation to default to London
+      added setting to enable/disable idle timer warning
diff --git a/apps/pastel/metadata.json b/apps/pastel/metadata.json
index 0a04491fc..da3c18eae 100644
--- a/apps/pastel/metadata.json
+++ b/apps/pastel/metadata.json
@@ -2,8 +2,8 @@
   "id": "pastel",
   "name": "Pastel Clock",
   "shortName": "Pastel",
-  "version": "0.13",
-  "description": "A Configurable clock with custom fonts, background and weather display. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times.",
+  "version": "0.15",
+  "description": "A Configurable clock with custom fonts, background and weather display. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times",
   "icon": "pastel.png",
   "dependencies": {"mylocation":"app","weather":"app"},
   "screenshots": [{"url":"screenshot_pastel.png"}, {"url":"weather_icons.png"}],
diff --git a/apps/pastel/pastel.app.js b/apps/pastel/pastel.app.js
index 5def5737c..605b78ad0 100644
--- a/apps/pastel/pastel.app.js
+++ b/apps/pastel/pastel.app.js
@@ -4,9 +4,18 @@ const storage = require('Storage');
 const locale = require("locale");
 const SETTINGS_FILE = "pastel.json";
 const LOCATION_FILE = "mylocation.json";
+const w = g.getWidth();
+const h = g.getHeight();
 let settings;
 let location;
 
+// variable for controlling idle alert
+let lastStep = getTime();
+let lastStepTime = '??';
+let warned = 0;
+let idle = false;
+let IDLE_MINUTES = 26;
+
 // cloud, sun, partSun, snow, rain, storm, error
 // create 1 bit, max contrast, brightness set to 85
 var cloudIcon = require("heatshrink").decompress(atob("kEggIfcj+AAYM/8ADBuFwAYPAmADCCAMBwEf8ADBhFwg4aBnEPAYMYjAVBhgDDDoQDHCYc4jwDB+EP///FYIDBMTgA=="));
@@ -16,16 +25,24 @@ var snowIcon = require("heatshrink").decompress(atob("kEggITQj/AAYM98ADBsEwAYPAj
 var rainIcon = require("heatshrink").decompress(atob("kEggIPMh+AAYM/8ADBuFwAYPgmADB4EbAYOAj/ggOAhnwg4aBnAeCjEcCIMMjADCDoQDHjAPCnAXCuEP///8EDAYJECAAXBwkAgPDhwDBwUMgEEhkggEOjFgFgMQLYQAOA=="));
 var errIcon = require("heatshrink").decompress(atob("kEggILIgOAAYsD4ADBg/gAYMGsADBhkwAYsYjADCjgDBmEMAYNxxwDBsOGAYPBwYDEgOBwOAgYDB4EDHYPAgwDBsADDhgDBFIcwjAHBjE4AYMcmADBhhNCKIcG/4AGOw4A=="));
 
+// saves having to recode all the small font calls
+function setSmallFont() {
+  g.setFontLatoSmall();
+}
 
 function loadSettings() {
   settings = require("Storage").readJSON(SETTINGS_FILE,1)||{};
   settings.grid = settings.grid||false;
   settings.font = settings.font||"Lato";
+  settings.idle_check = settings.idle_check||true;
 }
 
 // requires the myLocation app
 function loadLocation() {
-  location = require("Storage").readJSON(LOCATION_FILE,1)||{"lat":51.5072,"lon":0.1276,"location":"London"};
+  location = require("Storage").readJSON(LOCATION_FILE,1)||{};
+  location.lat = location.lat||51.5072;
+  location.lon = location.lon||0.1276;
+  location.location = location.location||"London";
 }
 
 function extractTime(d){
@@ -71,17 +88,18 @@ function getSteps() {
     if (WIDGETS.wpedom !== undefined) 
       return WIDGETS.wpedom.getSteps();
     else
-      return '???'
+      return '???';
   }
 }
 
 const infoData = {
   ID_BLANK: { calc: () => '' },
-  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_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_LAST:  { calc: () => 'Last Step: ' + lastStepTime },
   ID_BATT:  { calc: () => 'Battery: ' + E.getBattery() + '%' },
   ID_MEM:   { calc: () => {var val = process.memory(false); return 'Ram: ' + Math.round(val.usage*100/val.total) + '%';} },
   ID_ID:    { calc: () => {var val = NRF.getAddress().split(':'); return 'Id: ' + val[4] + val[5];} },
@@ -152,6 +170,14 @@ function getWeather() {
 }
 
 function draw() {
+  if (!idle)
+    drawClock();
+  else
+    drawIdle();
+  queueDraw();
+}
+
+function drawClock() {
   var d = new Date();
   var da = d.toString().split(" ");
   var time = da[4].substr(0,5);
@@ -166,11 +192,8 @@ function draw() {
   if (parseInt(hh) > 12)
     hh = h2.substr(h2.length -2);
 
-  var w = g.getWidth();
-  var h = g.getHeight();
   var x = (g.getWidth()/2);
   var y = (g.getHeight()/3);
-
   var weatherJson = getWeather();
   var w_temp;
   var w_icon;
@@ -190,7 +213,8 @@ function draw() {
   }
 
   g.reset();
-  g.clearRect(0, 30, w, h - 24);
+  g.setColor(g.theme.bg);
+  g.fillRect(Bangle.appRect);
   
   // draw a grid like graph paper
   if (settings.grid && process.env.HWVERSION !=1) {
@@ -249,6 +273,141 @@ function draw() {
   queueDraw();
 }
 
+
+/////////////////   IDLE TIMER /////////////////////////////////////
+
+function log_debug(o) {
+  //print(o);
+}
+
+function drawIdle() {
+  let mins = Math.round((getTime() - lastStep) / 60);
+  g.reset();
+  g.setColor(g.theme.bg);
+  g.fillRect(Bangle.appRect);
+  g.setColor(g.theme.fg);
+  setSmallFont();
+  g.setFontAlign(0, 0);
+  g.drawString('Last step was', w/2, (h/3));
+  g.drawString(mins + ' minutes ago', w/2, 20+(h/3));
+  dismissBtn.draw();
+}
+
+///////////////   BUTTON CLASS ///////////////////////////////////////////
+
+// simple on screen button class
+function BUTTON(name,x,y,w,h,c,f,tx) {
+  this.name = name;
+  this.x = x;
+  this.y = y;
+  this.w = w;
+  this.h = h;
+  this.color = c;
+  this.callback = f;
+  this.text = tx;
+}
+
+// if pressed the callback
+BUTTON.prototype.check = function(x,y) {
+  //console.log(this.name + ":check() x=" + x + " y=" + y +"\n");
+  
+  if (x>= this.x && x<= (this.x + this.w) && y>= this.y && y<= (this.y + this.h)) {
+    log_debug(this.name + ":callback\n");
+    this.callback();
+    return true;
+  }
+  return false;
+};
+
+BUTTON.prototype.draw = function() {
+  g.setColor(this.color);
+  g.fillRect(this.x, this.y, this.x + this.w, this.y + this.h);
+  g.setColor("#000"); // the icons and boxes are drawn black
+  setSmallFont();
+  g.setFontAlign(0, 0);
+  g.drawString(this.text, (this.x + this.w/2), (this.y + this.h/2));
+  g.drawRect(this.x, this.y, (this.x + this.w), (this.y + this.h));
+};
+
+function dismissPrompt() {
+  idle = false;
+  warned = false;
+  lastStep = getTime();
+  Bangle.buzz(100);
+  draw();
+}
+
+var dismissBtn = new BUTTON("big",0, 3*h/4 ,w, h/4, "#0ff", dismissPrompt, "Dismiss");
+
+Bangle.on('touch', function(button, xy) {
+  if (idle && dismissBtn.check(xy.x, xy.y)) return;
+});
+
+// if we get a step then we are not idle
+Bangle.on('step', s => {
+  setLastStepTime();
+  lastStep = getTime();
+  // redraw if we had been idle
+  if (idle == true) {
+    dismissPrompt();
+  }
+  idle = false;
+  warned = 0;
+});
+
+function setLastStepTime() {
+  var date = new Date();
+  lastStepTime = require("locale").time(date,1);
+}
+
+function checkIdle() {
+  if (!settings.idle_check) {
+    idle = false;
+    warned = false;
+    return;
+  }
+  
+  let hour = (new Date()).getHours();
+  let active = (hour >= 9 && hour < 21);
+  //let active = true;
+  let dur = getTime() - lastStep;
+
+  if (active && dur > IDLE_MINUTES * 60) {
+    drawIdle();
+    if (warned++ < 3) {
+      buzzer(warned);
+      log_debug("checkIdle: warned=" + warned);
+      Bangle.setLocked(false);
+    }
+    idle = true;
+  } else {
+    idle = false;
+    warned = 0;
+  }
+}
+
+setLastStepTime();
+
+// timeout for multi-buzzer
+var buzzTimeout;
+
+// n buzzes
+function buzzer(n) {
+  log_debug("buzzer n=" + n);
+
+  if (n-- < 1) return;
+  Bangle.buzz(250);
+  
+  if (buzzTimeout) clearTimeout(buzzTimeout);
+  buzzTimeout = setTimeout(function() {
+    buzzTimeout = undefined;
+    buzzer(n);
+  }, 500);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+
 // timeout used to update every minute
 var drawTimeout;
 
@@ -258,6 +417,7 @@ function queueDraw() {
   drawTimeout = setTimeout(function() {
     drawTimeout = undefined;
     prevInfo();
+    checkIdle();
     draw();
   }, 60000 - (Date.now() % 60000));
 }
diff --git a/apps/pastel/pastel.settings.js b/apps/pastel/pastel.settings.js
index bf83fa7c2..26dafd271 100644
--- a/apps/pastel/pastel.settings.js
+++ b/apps/pastel/pastel.settings.js
@@ -5,6 +5,7 @@
   let s = {
     'grid': false,
     'weather': false,
+    'idle_check': true,
     'font': "Lato"
   }
 
@@ -51,6 +52,24 @@
         s.weather = !s.weather;
         save();
       },
+    },
+    // for use when the new menu system goes live
+    /*
+    'Idle Warning': {
+      value: s.idle_check,
+      onchange : v => {
+        s.idle_check = v;
+        save();
+      },
+    },
+    */
+    'Idle Warning': {
+      value: s.idle_check,
+      format: () => (s.idle_check ? 'Yes' : 'No'),
+      onchange: () => {
+        s.idle_check = !s.idle_check;
+        save();
+      },
     }
   })
 })
diff --git a/apps/recorder/interface.html b/apps/recorder/interface.html
index 08021374d..8cf339e85 100644
--- a/apps/recorder/interface.html
+++ b/apps/recorder/interface.html
@@ -4,8 +4,11 @@
   </head>
   <body>
     <div id="tracks"></div>
+    <div class="container" id="toastcontainer" stlye="position:fixed; bottom:8px; left:0px; right:0px; z-index: 100;"></div>
 
     <script src="../../core/lib/interface.js"></script>
+    <script src="../../core/js/ui.js"></script>
+    <script src="../../core/js/utils.js"></script>
     <script>
 var domTracks = document.getElementById("tracks");
 
@@ -70,9 +73,15 @@ ${track.map(pt=>`            <gx:value>${0|pt.Skin}</gx:value>\n`).join("")}
       document.body.removeChild(a);
       window.URL.revokeObjectURL(url);
   }, 0);
+  showToast("Download finished.", "success");
 }
 
 function saveGPX(track, title) {
+  if (!track || !track[0] || !"Time" in track[0] || !track[0].Time) {
+    showToast("Error in trackfile.", "error");
+    return;
+  }
+
   var gpx = `<?xml version="1.0" encoding="UTF-8"?>
 <gpx creator="Bangle.js" version="1.1" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
   <metadata>
@@ -109,6 +118,7 @@ function saveGPX(track, title) {
       document.body.removeChild(a);
       window.URL.revokeObjectURL(url);
   }, 0);
+  showToast("Download finished.", "success");
 }
 
 function saveCSV(track, title) {
@@ -121,6 +131,7 @@ function saveCSV(track, title) {
     }).join(",")+"\n";
   });
   Util.saveCSV(title, csv);
+  showToast("Download finished.", "success");
 }
 
 function trackLineToObject(headers, l) {
@@ -171,6 +182,10 @@ function getTrackList() {
   return {headers:headers,l:data};
 })(${JSON.stringify(filename)})`, trackInfo=>{
           console.log(filename," => ",trackInfo);
+          if (!trackInfo || !"headers" in trackInfo) {
+            showToast("Error loading track list.", "error");
+            resolve();
+          }
           trackInfo.headers = trackInfo.headers.split(",");
           trackList.push({
             filename : filename,
diff --git a/apps/red7game/ChangeLog b/apps/red7game/ChangeLog
index b193cddde..93dd81c5b 100644
--- a/apps/red7game/ChangeLog
+++ b/apps/red7game/ChangeLog
@@ -1 +1,3 @@
-1.0: Initial version of game 
+0.01: Initial version of game 
+0.02: Fix mistake preventing game from ending in some cases.
+0.03: Update help screen with more details.
\ No newline at end of file
diff --git a/apps/red7game/README.md b/apps/red7game/README.md
index 3f81375c7..8a6318e7b 100644
--- a/apps/red7game/README.md
+++ b/apps/red7game/README.md
@@ -9,7 +9,7 @@ For rules, see [here](https://asmadigames.com/Red7Rules.pdf).
 ## Usage
 
 Current rule card is shown in center of screen when viewing your hand.
-Swipe left to see your palettes and right on the palette screen to go back to your hand. Tap on a card to see it's details and then swipe either left or right to play the card as a rule or a palette card.
+Swipe left to see your palettes and right on the palette screen to go back to your hand. Tap on a card to see it's details and then swipe either left or right to play the card as a rule or a palette card. Taping anywhere besides the card will dismis the card details.
 Press the watch button to bring up the menu, which you can undo your card plays, end your turn, or start a new game.
 
 ## Creator
diff --git a/apps/red7game/metadata.json b/apps/red7game/metadata.json
index 7002720d5..c8f9e1aa1 100644
--- a/apps/red7game/metadata.json
+++ b/apps/red7game/metadata.json
@@ -2,7 +2,7 @@
   "name": "Red 7 Card Game",
   "shortName" : "Red 7",
   "icon": "icon.png",
-  "version":"1.0",
+  "version":"0.03",
   "description": "An implementation of the card game Red 7 for your watch. Play against the AI and be the last player still in the game to win!",
   "tags": "game",
   "supports":["BANGLEJS2"],
diff --git a/apps/red7game/red7.js b/apps/red7game/red7.js
index 6b2341144..901bc186f 100644
--- a/apps/red7game/red7.js
+++ b/apps/red7game/red7.js
@@ -654,7 +654,52 @@ function drawScreen2() {
 }
 
 function drawScreenHelp() {
-  E.showAlert("Rules can be found on asmadigames.com").then(function(){drawMainMenu();});
+  //E.showAlert("Rules can be found on asmadigames.com").then(function(){drawMainMenu();});
+  E.showScroller({
+    h: 25,
+    c: 10,
+    draw: (idx,r) => {
+      g.setBgColor("#000").clearRect(r.x,r.y,r.x+r.w-1,r.y+r.h-1);
+      g.setColor("#fff");
+      switch(idx) {
+        case 0:
+          g.setFont("6x8:2").drawString("Rules can be",r.x+10,r.y+4);
+          break;
+        case 1:
+          g.setFont("6x8:2").drawString("found on",r.x+10,r.y+4);
+          break;
+        case 2:
+          g.setFont("Vector:18").drawString("asmadigames.com",r.x+10,r.y+4);
+          break;
+        case 3:
+          g.setFont("6x8:1").drawString("Use button to show menu.",r.x+10,r.y+4);
+          break;
+        case 4:
+          g.setFont("6x8:1").drawString("Swipe L/R for hand/palette.",r.x+10,r.y+4);
+          break;
+        case 5:
+          g.setFont("6x8:1").drawString("Tap card to see details.",r.x+10,r.y+4);
+          break;
+        case 6:
+          g.setFont("6x8:1").drawString("Swipe card L/R to play.",r.x+10,r.y+4);
+          break;
+        case 7:
+          g.setFont("6x8:1").drawString("Finish turn in menu.",r.x+10,r.y+4);
+          break;
+        case 9:
+          g.fillRect(r.x+40,r.y+0,r.x+140,r.y+20);
+          g.setColor(0,0,0);
+          g.setFont("Vector:14").drawString("OK",r.x+80,r.y+4);
+          break;
+      }
+    },
+    select: (idx) => {
+      if(idx === 9){
+        E.showScroller();
+        drawMainMenu();
+      }
+    }
+  });
 }
 
 function drawGameOver(win) {
@@ -678,9 +723,7 @@ function finishTurn() {
     } else if(playerHand.handCards.length === 0) {
       drawGameOver(false);
     } else if(!canPlay(playerHand, playerPalette, AIPalette)) {
-      console.log("no play");
-      //drawGameOver(false);
-      drawScreen1();
+      drawGameOver(false);
     } else {
       E.showMenu();
       drawScreen1();
diff --git a/apps/rolex/ChangeLog b/apps/rolex/ChangeLog
new file mode 100644
index 000000000..3bfed4a4e
--- /dev/null
+++ b/apps/rolex/ChangeLog
@@ -0,0 +1,3 @@
+0.01: Initial Release
+0.02: Minor tweaks for light theme
+0.03: Made images 2 bit and fixed theme honoring
\ No newline at end of file
diff --git a/apps/rolex/README.md b/apps/rolex/README.md
new file mode 100644
index 000000000..4c24aad0c
--- /dev/null
+++ b/apps/rolex/README.md
@@ -0,0 +1,12 @@
+# Rolex
+
+![](screenshot.png)
+
+Created with the aid of the Espruino documentation and looking through many of the wonderful exising watchfaces that have been made.
+This has not been tested on a watch yet as I haven't aquired one but has been tested in the emulator.
+The hands don't rotate dead on center but they're as close as I could get them to.
+
+Special thanks to: 
+* rozek (for his updated widget draw code for utilization with background images)
+* Gordon Williams (Bangle.js, watchapps for reference code and documentation)
+* The community (for helping drive such a wonderful project)
diff --git a/apps/rolex/app-icon.js b/apps/rolex/app-icon.js
new file mode 100644
index 000000000..563a4a78b
--- /dev/null
+++ b/apps/rolex/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEBxURiIlUgMxiUQC6cCiMhmAqPmQEDkUhF4cjGhUD/4FDn/zAof/GhYMEC4kCEQgAHl/xGoYcDj/yC5ZIFJgnwPBglIn6rNBpEBXp8QiQSBiMQFpMCS4sDXgMjgMhgYXFEgIDBh//kA/EiEhiURiMBBYs/FYSwB+YdBCQIBBkAYBiUQkACBCwTOEUYKaBkUhAAIXCDYMRkYxBIILNDAAMTHgZxBiBFBFQKOCgMvbRUBgUxIYJ3BSYUBmYJBU5QsCkIDBgQIBkcyYJwAFkczeBoAGiYWVgYWTbQMCmchfojgBDxc/+f/mUjC4abBkEf/4ABDY0C+cvmQKFgcxkTyBC47pBC4LgDAAUPmMyh4IEiUQiUyiJHBIwJ9GmMxC4kBmXyGYcBdQMykIPEcIIlBFgMikMzIAxiBkSPEIYqSKmX/mLWTgEimRiGAB0T+bwTVocCMBEAj51GAA4aGif/+AXNh//FAcC//ziEBgEhiCxBiADCXAIDBCIYdFgLCBaIMCkKNBkQIBkQTBgZBDgRdEiIsBGoMBAoLoDLQRxIkMhewMigMyiESiRrNWqpMB+QJHl4hMh/zBI//a5IlDYQcBFQcf+IWKgLJEj4cDgY5IBgf/AoYXEEQp2HHggXEKQIXKAAoXFACIXkA"))
\ No newline at end of file
diff --git a/apps/rolex/app.js b/apps/rolex/app.js
new file mode 100644
index 000000000..e409704fc
--- /dev/null
+++ b/apps/rolex/app.js
@@ -0,0 +1,144 @@
+var imgBg = {
+  width : 176, height : 176, bpp : 1,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("ABMBwAVpmfMCqdxxwVpmOMCiUDmOIoAVRg8xzHwCqUZCqcDCoPAYBwDDzOZYx0DB4QVGF5UPComRAoZbKn4hD7uzGof4CpN/8AVI/wVO5+3T4YVKn5NDt/2Cqd/CAcP/gVJj5jDCogJECpc/EwYVLG4gVEJYgAGMYgVVLgqjDAA0D/5GDRAgVPg4VD/77DAA0B/+ABBwAEEQ4VVJQgAIMg4VVUQgAIn4VUj5kGgbfDABEeBA7fDABEMBA84CpYAIiAVUAHVAh4USgf4j+HVgPg4AVOxlw44DBuLMGcgQVFg1gs0DgE7JowVCGognB4AVB0DiFgPgAYMPAYRXD8AVB+EOHooVDfQkDjBBDj4VEh/wAYMf/wVEhkw40Tg0zNok/Cof/BQcDxyZB+f8sJjE/49Cn//Uh0B//8FYYwCwEgAYMQVQ4VDh4ECgfSufOvF548c8+CuQmGgf//4eBv3BxFMtuN23DmVzCAN//6rDCoPAg1suEMsAVBmgVBrYPDPwZuCCoMZhhBBx84CoPyNgSqETQUDpnZhFIsODmGDiX7KIRsCOYeAgOAuDsBgKhB8UMwPAFYJsCT4avNX41/Cpz2EgEeAYU+jl8vwHBnl8BQV+DgpSBAAMjmkQoEDsVmnAKCvA2JkcmCocweocwCpMhm0QvECsccCoYAKkd+FYNCscGCp0ysQVBs0iAgIVNn1DPYM8AAIVOhACBnkYhEYChoA/AH4A/AH4A/AC1///+CtH/AAIVVAAIuQCqkBCv4V/CozERCqrxZCtF/QCAA/AH4A/AH4A/AH4ArhgONkAGFnwVNuAGFvwVN/gFEgP/CpoOFg4VNEgOAAwcfAwoVJ8AGDn//4AVLgf//BHEFZoVB/wFIIJZnDh//RQMYhGICxN/KIZWB+EAmEfzsN4Ew8PMw3JnYMBPoIDBNgk6u8XjmA8OT2XJ/8zvg8ECoRsBh1/jscwdhj/ztO7iV4NAQVCj5sCh1Tzseydhy/jnO3icwSgSaCh4DCnOBwviwcw+Msm0BidINwRXCh4DCABsfCIUHbJgADg7yCg4IDhlmjEgAgPssOGsDHDCoQAEiXMs9yt8R5VrzmwBoY9HCoNjuVGiHOpOcyBKLiWMsd6s0R51LjgVMjkIjEPukM5UIjiQMhkAjEDmEMMoMGNoYA0jAVUjgIHuAVLn4IH/AVLv7OGgf8Cpj6Gg4VM/4rGg/+CsEB/+AK43/CpQMIDwIVVGgxONMA4VIj/wCp0PUwYVEXA4VZj7+DCok/AgYAGn4VID4gVHCAgVPJogVEMIgVRXJClGCojPJFYQVIgYVKj79DCoptKh4VIgKvKgYwECohLDABYVEACAV/Cv4V7"))
+};
+
+/* Set hour hand image */
+
+var imgHour = {
+  width : 19, height : 62, bpp : 2,
+  transparent : 0,
+  buffer : E.toArrayBuffer(atob("AAP/wAAA///wAA////AA////8A/////A/////8P/////D/////w/////8P/////D/////w/////8D////8AP////AA////AAD///AAAP//AAAA//AAAAPXwAAAD18AAAA9fAAAAPXwAAAD18AAAA9fAAAAPXwAAAD18AAAA9fAAAAPXwAAAD18AAAA//AAAA//wAAA///wAD/X1/AD/V9X8A/VfVfw/VX1V8PVV9VXD1VfVV89VX1VfPVf/1Xz1f//V89/9f/fP/1Vf/A/VVVfwP1VVXwA/VVX8AD/VfwAAP//wAAA//wAAAD18AAAA9fAAAAPXAAAAD1wAAAAN8AAAAD8AAAAA/AAAAAPwAAAAA8AAAAAMAAAAADAAAAAAwAAAAAAAAAA=="))
+};
+
+/* Set minute hand image */
+
+var imgMin = {
+  width : 10, height : 80, bpp : 2,
+  transparent : 0,
+  buffer : E.toArrayBuffer(atob("AAAADwAP/wP//D//z/////////8//8P//A//AD/AA/wAP8AD/AA/8A/8AP/wD/8A//AP/wD/8A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A9fAPXwD18A//AP/wA/wAP8AD/AA/wAP8AA/AAPAADwAA8AAPAADwAAMAAAAAAAA="))
+};
+
+/* Set second hand image */
+
+var imgSec = {
+  width : 8, height : 116, bpp : 2,
+  transparent : 2,
+  buffer : E.toArrayBuffer(atob("v/q//r/+v/qv+q/qq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qv+v/6/D/wD8PDw8PwD/w///6v+qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqr+r//v///X/1X/Vf9V/1X/1///+//q/qq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq+qr6qvqq6qrqg=="))
+};
+
+/* Set variables to get screen width, height and center points */
+
+let W = g.getWidth();
+let H = g.getHeight();
+let cx = W/2;
+let cy = H/2;
+let Timeout;
+
+/* set font */
+
+require("Font4x5Numeric").add(Graphics);
+
+Bangle.loadWidgets();
+
+/* Custom version of Bangle.drawWidgets (does not clear the widget areas) Thanks to rozek */
+
+Bangle.drawWidgets = function () {
+  var w = g.getWidth(), h = g.getHeight();
+
+  var pos = {
+    tl:{x:0,   y:0,    r:0, c:0}, // if r==1, we're right->left
+    tr:{x:w-1, y:0,    r:1, c:0},
+    bl:{x:0,   y:h-24, r:0, c:0},
+    br:{x:w-1, y:h-24, r:1, c:0}
+  };
+
+  if (global.WIDGETS) {
+    for (var wd of WIDGETS) {
+      var p = pos[wd.area];
+      if (!p) continue;
+
+      wd.x = p.x - p.r*wd.width;
+      wd.y = p.y;
+
+      p.x += wd.width*(1-2*p.r);
+      p.c++;
+    }
+
+    g.reset();                                 // also loads the current theme
+
+    try {
+      for (var wd of WIDGETS) {
+        g.setClipRect(wd.x,wd.y, wd.x+wd.width-1,23);
+        wd.draw(wd);
+      }
+    } catch (e) { print(e); }
+
+    g.reset();                               // clears the clipping rectangle!
+    }
+  };
+
+/* Draws the clock hands and date */
+
+function drawHands() {
+  let d = new Date();
+
+  let hour = d.getHours() % 12;
+  let min = d.getMinutes();
+  let sec = d.getSeconds();
+
+  let twoPi = 2*Math.PI;
+  let Pi = Math.PI;
+  let halfPi = Math.PI/2;
+
+  let hourAngle = (hour+(min/60))/12 * twoPi - Pi;
+  let minAngle = (min/60) * twoPi - Pi;
+  let secAngle = (sec/60) * twoPi - Pi;
+
+  let hourSin = Math.sin(hourAngle);
+  let hourCos = Math.cos(hourAngle);
+  let minSin = Math.sin(minAngle);
+  let minCos = Math.cos(minAngle);
+  let secSin = Math.sin(secAngle);
+  let secCos = Math.cos(secAngle);
+
+  g.drawImage(imgHour,cx-22*hourSin,cy+22*hourCos,{rotate:hourAngle});
+  g.drawImage(imgMin,cx-34*minSin,cy+34*minCos,{rotate:minAngle});
+  g.drawImage(imgSec,cx-25*secSin,cy+25*secCos,{rotate:secAngle});
+  g.setFont("4x5Numeric:3");
+  g.setColor(g.theme.bg);
+  g.drawString(d.getDate(),157,81);
+}
+
+function drawBackground() {
+  g.clear(1);
+  g.setBgColor(g.theme.bg);
+  g.setColor(g.theme.fg);
+  g.drawImage(imgBg,0,0);
+  g.reset();
+}
+
+/* Refresh the display every second */
+
+function displayRefresh() {
+  g.clear(true);
+  drawBackground();
+  drawHands();
+  Bangle.drawWidgets();
+
+  let Pause = 1000 - (Date.now() % 1000);
+  Timeout = setTimeout(displayRefresh,Pause);
+}
+
+Bangle.on('lcdPower', (on) => {
+  if (on) {
+    if (Timeout != null) { clearTimeout(Timeout); Timeout = undefined;}
+    displayRefresh();
+  }
+});
+
+Bangle.setUI("clock");
+// load widgets after 'setUI' so they're aware there is a clock active
+Bangle.loadWidgets(); 
+displayRefresh();
\ No newline at end of file
diff --git a/apps/rolex/metadata.json b/apps/rolex/metadata.json
new file mode 100644
index 000000000..e24344dad
--- /dev/null
+++ b/apps/rolex/metadata.json
@@ -0,0 +1,17 @@
+{ "id": "rolex",
+    "name": "rolex",
+    "shortName":"rolex",
+    "icon": "rolex.png",
+    "screenshots": [{"url":"screenshot.png"}],
+    "version":"0.03",
+    "description": "A rolex like watch face",
+    "tags": "clock",
+    "type": "clock",
+    "supports":["BANGLEJS2"],
+    "readme": "README.md",
+    "allow_emulator": true,
+    "storage": [
+      {"name":"rolex.app.js","url":"app.js"},
+      {"name":"rolex.img","url":"app-icon.js","evaluate":true}
+    ]
+   }
\ No newline at end of file
diff --git a/apps/rolex/rolex.png b/apps/rolex/rolex.png
new file mode 100644
index 000000000..2e2043763
Binary files /dev/null and b/apps/rolex/rolex.png differ
diff --git a/apps/rolex/screenshot.png b/apps/rolex/screenshot.png
new file mode 100644
index 000000000..288c82cf4
Binary files /dev/null and b/apps/rolex/screenshot.png differ
diff --git a/apps/ruuviwatch/ChangeLog b/apps/ruuviwatch/ChangeLog
index 15ff601f0..7a1d5db21 100644
--- a/apps/ruuviwatch/ChangeLog
+++ b/apps/ruuviwatch/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Hello Ruuvi Watch!
 0.02: Clear gfx on startup.
 0.03: Improve design and code, reduce flicker.
+0.04: Ability to rename tags. Sauna, Fridge & Freezer alert. Support °F based on locale.
\ No newline at end of file
diff --git a/apps/ruuviwatch/README.md b/apps/ruuviwatch/README.md
index c96e032d7..27e323628 100644
--- a/apps/ruuviwatch/README.md
+++ b/apps/ruuviwatch/README.md
@@ -2,6 +2,8 @@
 
 Watch the status of [RuuviTags](https://ruuvi.com) in range.
 
+By Marc Englund [GitHub](https://github.com/emarc) | [Twitter](https://twitter.com/marcenglund)
+
 ![Ruuvi Watch in action](/BangleApps/apps/ruuviwatch/ruuviwatch-in-action.jpg)
 
 - Id
@@ -9,18 +11,23 @@ Watch the status of [RuuviTags](https://ruuvi.com) in range.
 - Humidity (%)
 - Pressure (hPa)
 - Battery voltage
-
-Also shows how "fresh" the data is (age of reading).
+- Reading "freshness" (age)
+- Ability to name tags
+- Alerts for Sauna, Fridge, Freezer
 
 ## Usage
 
 - Scans for devices when launched and every N seconds.
-- Page trough devices with BTN1/BTN3.
-- Trigger scan with BTN2.
+- Page trough devices with left/right swipe or BTN1/BTN3.
+- Page past last/first to trigger scan.
+- BTN2 = Menu; name tag & trigger scan
+- Change locale (via App Loader) to get Farenheit.
 
 ## Todo / ideas
 
-- Settings for scan frequency, units
-- Allow to "name" known devices
-- Include more data
+- Bangle 2 support (I don't have one, let me know if you want to help with testing!)
+- Settings for scan frequency
+- Settings for alert limits
+- Alert for "Wine cellar"
+- Alert for Washer & Dryer (stops shaking = ready)
 - Support older Ruuvi protocols
diff --git a/apps/ruuviwatch/metadata.json b/apps/ruuviwatch/metadata.json
index 413d96153..eab9f64bf 100644
--- a/apps/ruuviwatch/metadata.json
+++ b/apps/ruuviwatch/metadata.json
@@ -2,7 +2,7 @@
   "name": "Ruuvi Watch",
   "shortName":"Ruuvi Watch",
   "icon": "ruuviwatch.png",
-  "version":"0.03",
+  "version":"0.04",
   "description": "Keep an eye on RuuviTag devices (https://ruuvi.com). For RuuviTags using the v5 format.",
   "readme":"README.md",
   "tags": "bluetooth",
diff --git a/apps/ruuviwatch/ruuviwatch.app.js b/apps/ruuviwatch/ruuviwatch.app.js
index 674319dd8..249303382 100644
--- a/apps/ruuviwatch/ruuviwatch.app.js
+++ b/apps/ruuviwatch/ruuviwatch.app.js
@@ -7,11 +7,21 @@ require("Storage").write("ruuviwatch.info", {
 
 const lookup = {};
 const ruuvis = [];
+const names = require("Storage").readJSON("RuuviNames") || {};
 let current = 0;
 let scanning = false;
 
+let paused = false;
+
 const SCAN_FREQ = 1000 * 30;
 
+// ALERT LIMITS
+LIMIT_SAUNA = 60;
+LIMIT_FRIDGE = 4;
+LIMIT_FREEZER = -18;
+// TODO add wine cellar limits
+// TODO configurable limits
+
 // Fonts
 const FONT_L = "Vector:60";
 const FONT_M = "Vector:20";
@@ -80,8 +90,8 @@ function p(data) {
     int2Hex(data[OFFSET + 23]),
   ].join(":");
 
-  robject.name =
-    "Ruuvi " + int2Hex(data[OFFSET + 22]) + int2Hex(data[OFFSET + 23]);
+  robject.id = int2Hex(data[OFFSET + 22]) + int2Hex(data[OFFSET + 23]);
+
   return robject;
 }
 
@@ -114,6 +124,7 @@ function drawAge() {
 }
 
 function redrawAge() {
+  if (paused) return;
   const originalColor = g.getColor();
   g.clearRect(0, SCANNING_Y - 10, g.getWidth(), SCANNING_Y + 10);
   g.setFont(FONT_S);
@@ -128,9 +139,15 @@ function redrawAge() {
   g.setColor(originalColor);
 }
 
+function getName(id) {
+  let name = names[id] || "Ruuvi";
+  return name + " (" + id + ")";
+}
+
 function redraw() {
   g.clear();
   g.setColor("#ffffff");
+  g.setFontAlign(0, 0);
 
   if (ruuvis.length > 0 && ruuvis[current]) {
     const ruuvi = ruuvis[current];
@@ -145,14 +162,22 @@ function redraw() {
 
     // name
     g.setFont(FONT_M);
-    g.drawString(ruuvi.name, CENTER, NAME_Y);
+    g.drawString(getName(ruuvi.id), CENTER, NAME_Y);
 
     // age
     redrawAge();
 
     // temp
     g.setFont(FONT_L);
-    g.drawString(ruuvi.temperature.toFixed(2) + "°c", CENTER, TEMP_Y);
+    if (
+      (ruuvi.name.startsWith("Sauna") && ruuvi.temperature > LIMIT_SAUNA) ||
+      (ruuvi.name.startsWith("Fridge") && ruuvi.temperature > LIMIT_FRIDGE) ||
+      (ruuvi.name.startsWith("Freezer") && ruuvi.temperature > LIMIT_FREEZER)
+    ) {
+      g.setColor("#ffe800");
+    }
+    g.drawString(getTempString(ruuvi.temperature), CENTER, TEMP_Y);
+    g.setColor("#ffffff");
 
     // humid & pressure
     g.setFont(FONT_M);
@@ -175,8 +200,28 @@ function redraw() {
   }
 }
 
+function getTempString(temp) {
+  // workaround: built-in 'locale' looses precision :-(
+  let unit = "°C";
+  const isF = require("locale").temp(1).endsWith("F");
+  if (isF) {
+    unit = "°F";
+    temp = (temp + 40) * 1.8 - 40;
+  }
+  return temp.toFixed(2) + unit;
+}
+
+function attention(message) {
+  // message ignored for now
+  Bangle.beep();
+  Bangle.beep();
+  Bangle.beep();
+  Bangle.buzz();
+}
+
 function scan() {
   if (scanning) return;
+  if (paused) return;
   scanning = true;
   NRF.findDevices(
     function (devices) {
@@ -184,11 +229,36 @@ function scan() {
       devices.forEach((device) => {
         const data = p(device.data);
         data.time = new Date().getTime();
-        const idx = lookup[data.name];
+        data.name = names[data.id] || "Ruuvi";
+
+        const idx = lookup[data.id];
         if (idx !== undefined) {
+          const old = ruuvis[idx];
+          if (
+            data.name.startsWith("Sauna") &&
+            old.temperature < LIMIT_SAUNA &&
+            data.temperature > LIMIT_SAUNA
+          ) {
+            current = idx;
+            attention(data.name + " ready!");
+          } else if (
+            data.name.startsWith("Fridge") &&
+            old.temperature < LIMIT_FRIDGE &&
+            data.temperature > LIMIT_FRIDGE
+          ) {
+            current = idx;
+            attention(data.name + " warning!");
+          } else if (
+            data.name.startsWith("Freezer") &&
+            old.temperature < LIMIT_FREEZER &&
+            data.temperature > LIMIT_FREEZER
+          ) {
+            current = idx;
+            attention(data.name + " warning!");
+          }
           ruuvis[idx] = data;
         } else {
-          lookup[data.name] = ruuvis.push(data) - 1;
+          lookup[data.id] = ruuvis.push(data) - 1;
           foundNew = true;
         }
       });
@@ -202,23 +272,195 @@ function scan() {
   );
 }
 
+function setName(newName) {
+  const ruuvi = ruuvis[current];
+  ruuvi.name = newName;
+  names[ruuvi.id] = ruuvi.name;
+  require("Storage").writeJSON("RuuviNames", names);
+}
+
+function closeMenu() {
+  E.showMenu();
+  paused = false;
+  redraw();
+}
+
+function showMenu() {
+  // TODO make this DRY + indicate current in menu
+  if (!ruuvis.length) {
+    scan();
+    return;
+  }
+  paused = true;
+  const ruuvi = ruuvis[current];
+  const id = ruuvi.id;
+  const name = getName(id);
+
+  var mainmenu = {
+    "": { title: name },
+    "Scan now": function () {
+      closeMenu();
+      scan();
+    },
+    "Rename tag": function () {
+      E.showMenu(namemenu);
+    },
+    "< Back": function () {
+      closeMenu();
+    }, // remove the menu
+  };
+  // Submenu
+  var namemenu = {
+    "": { title: "Rename " + name },
+    Ruuvi: function () {
+      setName("Ruuvi");
+      closeMenu();
+    },
+    Indoors: function () {
+      setName("Indoors");
+      closeMenu();
+    },
+    Downstairs: function () {
+      setName("Downstairs");
+      closeMenu();
+    },
+    Upstairs: function () {
+      setName("Upstairs");
+      closeMenu();
+    },
+    Attic: function () {
+      setName("Attic");
+      closeMenu();
+    },
+    Basement: function () {
+      setName("Basement");
+      closeMenu();
+    },
+    Kitchen: function () {
+      setName("Kitchen");
+      closeMenu();
+    },
+    Pantry: function () {
+      setName("Pantry");
+      closeMenu();
+    },
+    "Living room": function () {
+      setName("Living room");
+      closeMenu();
+    },
+    "Dining room": function () {
+      setName("Dining room");
+      closeMenu();
+    },
+    Office: function () {
+      setName("Office");
+      closeMenu();
+    },
+    Bedroom: function () {
+      setName("Bedroom");
+      closeMenu();
+    },
+    Bathroom: function () {
+      setName("Bathroom");
+      closeMenu();
+    },
+    Sauna: function () {
+      setName("Sauna");
+      closeMenu();
+    },
+    "Wine cellar": function () {
+      setName("Wine cellar");
+      closeMenu();
+    },
+    Outdoors: function () {
+      setName("Outdoors");
+      closeMenu();
+    },
+    Porch: function () {
+      setName("Porch");
+      closeMenu();
+    },
+    Backyard: function () {
+      setName("Backyard");
+      closeMenu();
+    },
+    Garage: function () {
+      setName("Garage");
+      closeMenu();
+    },
+    Greenhouse: function () {
+      setName("Greenhouse");
+      closeMenu();
+    },
+    Shed: function () {
+      setName("Shed");
+      closeMenu();
+    },
+    Fridge: function () {
+      setName("Fridge");
+      closeMenu();
+    },
+    Freezer: function () {
+      setName("Freezer");
+      closeMenu();
+    },
+    Dryer: function () {
+      setName("Dryer");
+      closeMenu();
+    },
+    Washer: function () {
+      setName("Washer");
+      closeMenu();
+    },
+    "< Back": function () {
+      E.showMenu(mainmenu);
+    },
+  };
+  // Actually display the menu
+  E.showMenu(mainmenu);
+}
+
+function nextPage() {
+  current++;
+  if (current >= ruuvis.length) {
+    current = 0;
+    scan();
+  }
+  redraw();
+}
+
+function prevPage() {
+  current--;
+  if (current < 0) {
+    current = ruuvis.length - 1;
+    scan();
+  }
+  redraw();
+}
+
 // START
+Bangle.on("swipe", function (dir) {
+  if (paused) return;
+  if (dir > 0) {
+    prevPage();
+  } else {
+    nextPage();
+  }
+});
 // Button 1 pages up
 setWatch(
   () => {
-    current--;
-    if (current < 0) {
-      current = ruuvis.length - 1;
-    }
-    redraw();
+    if (paused) return;
+    prevPage();
   },
   BTN1,
   { repeat: true }
 );
-// button triggers scan
+// button triggers menu
 setWatch(
   () => {
-    scan();
+    if (paused) return;
+    showMenu();
   },
   BTN2,
   { repeat: true }
@@ -226,11 +468,8 @@ setWatch(
 // button 3 pages down
 setWatch(
   () => {
-    current++;
-    if (current >= ruuvis.length) {
-      current = 0;
-    }
-    redraw();
+    if (paused) return;
+    nextPage();
   },
   BTN3,
   { repeat: true }
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 77c7b2040..39b4897b8 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -44,3 +44,4 @@
 0.39: Fix misbehaving debug info option
 0.40: Moved off into Utils, put System after Apps
 0.41: Stop users disabling all wake-up methods and locking themselves out (fix #1272)
+0.42: Fix theme customizer on new Bangle 2 firmware
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 1e82f97b4..4bb5ec129 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.41",
+  "version": "0.42",
   "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 9bd63491f..09d95934f 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -243,12 +243,11 @@ function showThemeMenu() {
   });
 
   function showCustomThemeMenu() {
-    function cv(x) { return g.setColor(x).getColor(); }
     function setT(t, v) {
       let th = g.theme;
       th[t] = v;
       if (t==="bg") {
-        th['dark'] = (v===cv("#000"));
+        th['dark'] = (v===cl("#000"));
       }
       upd(th);
     }
@@ -260,11 +259,7 @@ function showThemeMenu() {
     let colors = [], names = [];
     for(const c in rgb) {
       names.push(c);
-      colors.push(cv(rgb[c]));
-    }
-    function cn(v) {
-      const i = colors.indexOf(v);
-      return i!== -1 ? names[i] : v; // another color: just show value
+      colors.push(cl(rgb[c]));
     }
     let menu = {
       '':{title:'Custom Theme'},
@@ -277,14 +272,11 @@ function showThemeMenu() {
     };
     ["fg", "bg", "fg2", "bg2", "fgH", "bgH"].forEach(t => {
       menu[labels[t]] = {
-          value: colors.indexOf(g.theme[t]),
-          format: () => cn(g.theme[t]),
+          min : 0, max : colors.length-1, wrap : true,
+          value: Math.max(colors.indexOf(g.theme[t]),0),
+          format: v => names[v],
           onchange: function(v) {
-            // wrap around
-            if (v>=colors.length) {v = 0;}
-            if (v<0) {v = colors.length-1;}
-            this.value = v;
-            const c = colors[v];
+            var c = colors[v];
             // if we select the same fg and bg: set the other to the old color
             // e.g. bg=black;fg=white, user selects fg=black -> bg changes to white automatically
             // so users don't end up with a black-on-black menu
diff --git a/apps/simplest/metadata.json b/apps/simplest/metadata.json
index d938aab9f..d9d032376 100644
--- a/apps/simplest/metadata.json
+++ b/apps/simplest/metadata.json
@@ -3,6 +3,7 @@
   "name": "Simplest Clock",
   "version": "0.06",
   "description": "The simplest working clock, acts as a tutorial piece",
+  "readme": "README.md",
   "icon": "simplest.png",
   "screenshots": [{"url":"screenshot_simplest.png"}],
   "type": "clock",
diff --git a/apps/sleeplog/ChangeLog b/apps/sleeplog/ChangeLog
index 7dee1a116..d12c565ac 100644
--- a/apps/sleeplog/ChangeLog
+++ b/apps/sleeplog/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New App!
-0.02: Fix crash on start
+0.02: Fix crash on start #1423
+0.03: Added power saving mode, move all read/write log actions into lib/module
+0.04: Fix #1445, display loading info, add icons to display service states
diff --git a/apps/sleeplog/README.md b/apps/sleeplog/README.md
index 24f47c23c..4b10438ef 100644
--- a/apps/sleeplog/README.md
+++ b/apps/sleeplog/README.md
@@ -2,20 +2,26 @@
 
 This app logs and displays the four following states:  
 _unknown, not worn, awake, sleeping_  
-It derived from the [SleepPhaseAlarm](https://banglejs.com/apps/#sleepphasealarm) and uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments ([ESS](https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en)) and the internal temperature to decide _sleeping_ or _not worn_ when the watch is resting.
+It derived from the [SleepPhaseAlarm](https://banglejs.com/apps/#sleepphasealarm) and uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments ([ESS](https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en)) and
+also provides a power saving mode using the built in movement calculation. The internal temperature is used to decide if the status is _sleeping_ or _not worn_.
 
 #### Operating Principle
 * __ESS calculation__  
   The accelerometer polls values with 12.5Hz. On each poll the magnitude value is saved. When 13 values are collected, every 1.04 seconds, the standard deviation over this values is calculated.  
-  Is the calculated standard deviation lower than the "no movement" threshold (__NoMoThresh__) a "no movement" counter is incremented. Each time the "no movement" threshold is reached the "no movement" counter will be reset.  
-  When the "no movement" counter reaches the sleep threshold the watch is considered as resting. (The sleep threshold is calculated from the __MinDuration__ setting, Example: _sleep threshold = MinDuration * 60 / calculation interval => 10min * 60s/min / 1.04s ~= 576,9 rounded up to 577_)  
-  To check if a resting watch indicates as sleeping, the internal temperature must be greater than the temperature threshold (__TempThresh__). Otherwise the watch is considered as not worn.
+  Is the calculated standard deviation lower than the "no movement" threshold (__NoMo Thresh__) a "no movement" counter is incremented. Each time the "no movement" threshold is reached the "no movement" counter will be reset. The first time no movement is detected the actual timestamp is cached (in _sleeplog.firstnomodate_) for logging.  
+  When the "no movement" counter reaches the sleep threshold the watch is considered as resting. (The sleep threshold is calculated from the __Min Duration__ setting, Example: _sleep threshold = Min Duration * 60 / calculation interval => 10min * 60s/min / 1.04s ~= 576,9 rounded up to 577_)
+* __Power Saving Mode__  
+  On power saving mode the movement value of bangle's build in health event is checked against the maximal movement threshold (__Max Move__). The event is only triggered every 10 minutes which decreases the battery impact but also reduces accurracy.
+* ___Sleeping___ __or__ ___Not Worn___  
+  To check if a resting watch indicates a sleeping status, the internal temperature must be greater than the temperature threshold (__Temp Thresh__). Otherwise the watch is considered as not worn.
 * __True Sleep__  
   The true sleep value is a simple addition of all registert sleeping periods.
 * __Consecutive Sleep__  
-  In addition the consecutive sleep value tries to predict the complete time you were asleep, even the light sleeping phases with registered movements. All periods after a sleeping period will be summarized til the first following non sleeping period that is longer then the maximal awake duration (__MaxAwake__). If this sum is lower than the minimal consecutive sleep duration (__MinConsec__) it is not considered, otherwise it will be added to the consecutive sleep value.
+  In addition the consecutive sleep value tries to predict the complete time you were asleep, even the light sleeping phases with registered movements. All periods after a sleeping period will be summarized til the first following non sleeping period that is longer then the maximal awake duration (__Max Awake__). If this sum is lower than the minimal consecutive sleep duration (__Min Consec__) it is not considered, otherwise it will be added to the consecutive sleep value.
 * __Logging__  
-  To minimize the log size only a changed state is logged.
+  To minimize the log size only a changed state is logged. The logged timestamp is matching the beginning of its measurement period.  
+  When not on power saving mode a movement is detected nearly instantaneous and the detection of a no movement period is delayed by the minimal no movement duration. To match the beginning of the measurement period a cached timestamp (_sleeplog.firstnomodate_) is logged.  
+  On power saving mode the measurement period is fixed to 10 minutes and all logged timestamps are also set back 10 minutes.
 
 ---
 ### Control
@@ -28,32 +34,44 @@ It derived from the [SleepPhaseAlarm](https://banglejs.com/apps/#sleepphasealarm
 ---
 ### Settings
 ---
-* __BreakTod__ break at time of day  
+* __Break Tod__ | break at time of day  
   _0_ / _1_ / _..._ / __10__ / _..._ / _12_  
   Change time of day on wich the lower graph starts and the upper graph ends. 
-* __MaxAwake__ maximal awake duration  
+* __Max Awake__ | maximal awake duration  
   _15min_ / _20min_ / _..._ / __60min__ / _..._ / _120min_  
   Adjust the maximal awake duration upon the exceeding of which aborts the consecutive sleep period.
-* __MinConsec__ minimal consecutive sleep duration  
+* __Min Consec__ | minimal consecutive sleep duration  
   _15min_ / _20min_ / _..._ / __30min__ / _..._ / _120min_  
   Adjust the minimal consecutive sleep duration that will be considered for the consecutive sleep value.
-* __TempThresh__ temperature threshold  
+* __Temp Thresh__ | temperature threshold  
   _20°C_ / _20.5°C_ / _..._ / __25°C__ / _..._ / _40°C_  
   The internal temperature must be greater than this threshold to log _sleeping_, otherwise it is _not worn_.
-* __NoMoThresh__ no movement threshold  
+* __Power Saving__  
+  _on_ / __off__  
+  En-/Disable power saving mode. _Saves battery, but might decrease accurracy._  
+  In app icon showing that power saving mode is enabled: ![](powersaving.png)
+* __Max Move__ | maximal movement threshold  
+  (only available when on power saving mode)  
+  _50_ / _51_ / _..._ / __100__ / _..._ / _200_  
+  On power saving mode the watch is considered resting if this threshold is lower or equal to the movement value of bangle's health event.
+* __NoMo Thresh__ | no movement threshold  
+  (only available when not on power saving mode)  
   _0.006_ / _0.007_ / _..._ / __0.012__ / _..._ / _0.020_  
   The standard deviation over the measured values needs to be lower then this threshold to count as not moving.  
   The defaut threshold value worked best for my watch. A threshold value below 0.008 may get triggert by noise.
-* __MinDuration__ minimal no movement duration  
+* __Min Duration__ | minimal no movement duration  
+  (only available when not on power saving mode)  
   _5min_ / _6min_ / _..._ / __10min__ / _..._ / _15min_  
   If no movement is detected for this duration, the watch is considered as resting.
 * __Enabled__  
   __on__ / _off_  
-  En-/Disable the service (all background activities). _Saves battery, but might make this app useless._
+  En-/Disable the service (all background activities). _Saves the most battery, but might make this app useless._  
+  In app icon showing that the service is disabled: ![](disabled.png)
 * __Logfile__  
   __default__ / _off_  
   En-/Disable logging by setting the logfile to _sleeplog.log_ / _undefined_.  
-  If the logfile has been customized it is displayed with _custom_.
+  If the logfile has been customized it is displayed with _custom_.  
+  In app icon showing that logging is disabled: ![](nolog.png)
   
 ---
 ### Global Object and Module Functions
@@ -65,8 +83,9 @@ For easy access from the console or other apps the following parameters, values
   enabled: true,                // bool   / service status indicator
   logfile: "sleeplog.log",      // string / used logfile
   resting: false,               // bool   / indicates if the watch is resting
-  status: 2,                    // int    / actual status: 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
-  firstnomodate: 1644435877595, // number / Date.now() from first recognised no movement
+  status: 2,                    // int    / actual status:
+    / undefined = service stopped, 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
+  firstnomodate: 1644435877595, // number / Date.now() from first recognised no movement, not available in power saving mode
   stop: function () { ... },    // funct  / stops the service until the next load()
   start: function () { ... },   // funct  / restarts the service
   ...
@@ -74,42 +93,54 @@ For easy access from the console or other apps the following parameters, values
 
 >require("sleeplog")
 ={
-  setEnabled: function (enable, logfile) { ... },
-    // en-/disable the service and/or logging
-    // * enable  / bool / service status to change to
-    // * logfile / bool or string
+  setEnabled: function (enable, logfile, powersaving) { ... },
+    // restarts the service with changed settings
+    // * enable        / bool / new service status
+    // * logfile       / bool or string
     //   - true            = enables logging to "sleeplog.log"
     //   - "some_file.log" = enables logging to "some_file.log"
     //   - false           = disables logging
-    // returns: bool or undefined
-    // - true      = changes executed
-    // - false     = no changes needed
+    // * (powersaving) / bool / new power saving status, default: false
+    // returns: true or undefined
+    // - true      = service restart executed
     // - undefined = no global.sleeplog found
-  readLog: function (since, until) { ... },
+  readLog: function (logfile, since, until) { ... },
     // read the raw log data for a specific time period
-    // * since / Date or number / startpoint of period
-    // * until / Date or number / endpoint of period
+    // * logfile / string / on no string uses logfile from global object or "sleeplog.log" 
+    // * (since) / Date or number / startpoint of period, default: 0
+    // * (until) / Date or number / endpoint of period, default: 1E14
     // returns: array
     // * [[number, int, string], [...], ... ] / sorting: latest first
     //   - number // timestamp in ms
     //   - int    // status: 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
     //   - string // additional information
-    // * [] = no data available or global.sleeplog found
-  getReadableLog: function (printLog, since, until) { ... }
+    // * [] = no data available or global.sleeplog not found
+  writeLog: function (logfile, input) { ... },
+    // append or replace log depending on input
+    // * logfile / string / on no string uses logfile from global object or default 
+    // * input   / array
+    //   - append input if array length >1 and element[0] >9E11
+    //   - replace log with input if at least one entry like above is inside another array
+    // returns: true or undefined
+    // - true      = changest written to storage
+    // - undefined = wrong input
+  getReadableLog: function (printLog, since, until, logfile) { ... }
     // read the log data as humanreadable string for a specific time period
-    // * since / Date or number / startpoint of period
-    // * until / Date or number / endpoint of period
+    // * (printLog) / bool / direct print output with additional information, default: false
+    // * (since)    / Date or number / see readLog(..)
+    // * (until)    / Date or number / see readLog(..)
+    // * (logfile)  / string / see readLog(..)
     // returns: string
     // * "{substring of ISO date} - {status} for {duration}min\n...", sorting: latest last
     // * undefined = no data available or global.sleeplog found
   restoreLog: function (logfile) { ... }
     // eliminate some errors inside a specific logfile
-    // * logfile / string / name of the logfile that will be restored
+    // * (logfile)  / string / see readLog(..)
     // returns: int / number of changes that were made
   reinterpretTemp: function (logfile, tempthresh) { ... }
     // reinterpret worn status based on given temperature threshold
-    // * logfile    / string / name of the logfile
-    // * tempthresh / float  / new temperature threshold
+    // * (logfile)    / string / see readLog(..)
+    // * (tempthresh) / float  / new temperature threshold, on default uses tempthresh from global object or 27
     // returns: int / number of changes that were made
  }
 ```
@@ -120,7 +151,9 @@ For easy access from the console or other apps the following parameters, values
 #### To do list
 * Send the logged information to Gadgetbridge.
   _(For now I have no idea how to achieve this, help is appreciated.)_
+* View, down- and upload log functions via App Loader.
 * Calculate and display overall sleep statistics.
+* Option to automatically change power saving mode depending on time of day.
 
 #### Requests, Bugs and Feedback
 Please leave requests and bug reports by raising an issue at [github.com/storm64/BangleApps](https://github.com/storm64/BangleApps) or send me a [mail](mailto:banglejs@storm64.de).
diff --git a/apps/sleeplog/app.js b/apps/sleeplog/app.js
index cbfad4bda..8077b4d62 100644
--- a/apps/sleeplog/app.js
+++ b/apps/sleeplog/app.js
@@ -25,7 +25,7 @@ function drawLog(topY, viewUntil) {
   var y = topY + graphHeight;
 
   // read 12h wide log
-  var log = require("sleeplog").readLog(timestamp0, viewUntil.valueOf());
+  var log = require("sleeplog").readLog(0, timestamp0, viewUntil.valueOf());
 
   // format log array if not empty
   if (log.length) {
@@ -64,7 +64,7 @@ function drawLog(topY, viewUntil) {
   for (var x = 0; x < hours; x++) {
     g.fillRect(x * stepwidth, y + 2, x * stepwidth, y + 4);
     g.setFontAlign(-1, -1).setFont("6x8")
-      .drawString((startHour + x) % 24, x * stepwidth, y + 6);
+      .drawString((startHour + x) % 24, x * stepwidth + 1, y + 6);
   }
 
   // define variables for sleep calculation
@@ -127,34 +127,24 @@ function drawLog(topY, viewUntil) {
   return output.map(value => value /= 6E4);
 }
 
-// define draw night to function
-function drawNightTo(prevDays) {
-  // calculate 10am of this or a previous day
-  var date = Date();
-  date = Date(date.getFullYear(), date.getMonth(), date.getDate() - prevDays, breaktod);
+// define function to draw the analysis
+function drawAnalysis(toDate) {
+  //var t0 = Date.now();
 
   // get width
   var width = g.getWidth();
 
-  // clear app area
-  g.clearRect(0, 24, width, width);
-
   // define variable for sleep calculation
   var outputs = [0, 0]; // [estimated, true]
-  // draw log graphs and read outputs
-  drawLog(110, date).forEach(
-    (value, index) => outputs[index] += value);
-  drawLog(145, Date(date.valueOf() - 432E5)).forEach(
-    (value, index) => outputs[index] += value);
 
-  // reduce date by 1s to ensure correct headline
-  date = Date(date.valueOf() - 1E3);
-  // draw headline, on red bg if service or loggging disabled
-  g.setColor(global.sleeplog && sleeplog.enabled && sleeplog.logfile ? g.theme.bg : 63488);
-  g.fillRect(0, 30, width, 66).reset();
-  g.setFont("12x20").setFontAlign(0, -1);
-  g.drawString("Night to " + require('locale').dow(date, 1) + "\n" +
-    require('locale').date(date, 1), width / 2, 30);
+  // clear analysis area
+  g.clearRect(0, 71, width, width);
+
+  // draw log graphs and read outputs
+  drawLog(110, toDate).forEach(
+    (value, index) => outputs[index] += value);
+  drawLog(144, Date(toDate.valueOf() - 432E5)).forEach(
+    (value, index) => outputs[index] += value);
 
   // draw outputs
   g.reset(); // area: 0, 70, width, 105
@@ -166,8 +156,57 @@ function drawNightTo(prevDays) {
     Math.floor(outputs[0] % 60) + "min", width - 10, 70);
   g.drawString(Math.floor(outputs[1] / 60) + "h " +
     Math.floor(outputs[1] % 60) + "min", width - 10, 90);
+
+  //print("analysis processing seconds:", Math.round(Date.now() - t0) / 1000);
 }
 
+// define draw night to function
+function drawNightTo(prevDays) {
+  // calculate 10am of this or a previous day
+  var toDate = Date();
+  toDate = Date(toDate.getFullYear(), toDate.getMonth(), toDate.getDate() - prevDays, breaktod);
+
+  // get width
+  var width = g.getWidth();
+  var center = width / 2;
+
+  // reduce date by 1s to ensure correct headline
+  toDate = Date(toDate.valueOf() - 1E3);
+
+  // clear heading area
+  g.clearRect(0, 24, width, 70);
+
+  // display service states: service, loggging and powersaving
+  if (!sleeplog.enabled) {
+    // draw disabled service icon
+    g.setColor(1, 0, 0)
+      .drawImage(atob("FBSBAAH4AH/gH/+D//w/n8f5/nud7znP85z/f+/3/v8/z/P895+efGPj4Hw//8H/+Af+AB+A"), 2, 36);
+  } else if (!sleeplog.logfile) {
+    // draw disabled log icon
+    g.reset().drawImage(atob("EA6BAM//z/8AAAAAz//P/wAAAADP/8//AAAAAM//z/8="), 4, 40)
+      .setColor(1, 0, 0).fillPoly([2, 38, 4, 36, 22, 54, 20, 56]);
+  }
+  // draw power saving icon
+  if (sleeplog.powersaving) g.setColor(0, 1, 0)
+    .drawImage(atob("FBSBAAAAcAD/AH/wP/4P/+H//h//4//+fv/nj/7x/88//Of/jH/4j/8I/+Af+AH+AD8AA4AA"), width - 22, 36);
+
+  // draw headline
+  g.reset().setFont("12x20").setFontAlign(0, -1);
+  g.drawString("Night to " + require('locale').dow(toDate, 1) + "\n" +
+    require('locale').date(toDate, 1), center, 30);
+
+  // show loading info
+  var info = "calculating data ...\nplease be patient :)";
+  var y0 = center + 30;
+  var bounds = [center - 80, y0 - 20, center + 80, y0 + 20];
+  g.clearRect.apply(g, bounds).drawRect.apply(g, bounds);
+  g.setFont("6x8").setFontAlign(0, 0);
+  g.drawString(info, center, y0);
+
+  // calculate and draw analysis after timeout for faster feedback
+  if (ATID) ATID = clearTimeout(ATID);
+  ATID = setTimeout(drawAnalysis, 100, toDate);
+}
 
 // define function to draw and setup UI
 function startApp() {
@@ -182,8 +221,9 @@ function startApp() {
   });
 }
 
-// define day to display
+// define day to display and analysis timeout id
 var prevDays = 0;
+var ATID;
 
 // setup app
 g.clear();
diff --git a/apps/sleeplog/boot.js b/apps/sleeplog/boot.js
index 883e497a5..f989e2835 100644
--- a/apps/sleeplog/boot.js
+++ b/apps/sleeplog/boot.js
@@ -2,139 +2,168 @@
 // Marko Borazio, Eugen Berlin, Nagihan Kücükyildiz, Philipp M. Scholl and Kristof Van Laerhoven, "Towards a Benchmark for Wearable Sleep Analysis with Inertial Wrist-worn Sensing Units", ICHI 2014, Verona, Italy, IEEE Press, 2014.
 // https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en
 
-// sleeplog.status values: 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
+// sleeplog.status values: undefined = service stopped,  0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
 
 // load settings into global object 
 global.sleeplog = Object.assign({
   enabled: true, // en-/disable completely
   logfile: "sleeplog.log", // logfile
+  powersaving: false, // disables ESS and uses build in movement detection
   winwidth: 13, // 13 values, read with 12.5Hz = every 1.04s
   nomothresh: 0.012, // values lower than 0.008 getting triggert by noise
   sleepthresh: 577, // 577 times no movement * 1.04s window width > 10min
+  maxmove: 100, // movement threshold on power saving mode
   tempthresh: 27, // every temperature above ist registered as worn
 }, require("Storage").readJSON("sleeplog.json", true) || {});
 
 // delete app settings
-["breaktod", "maxawake", "minconsec"].forEach(property => delete global.sleeplog[property]);
+["breaktod", "maxawake", "minconsec"].forEach(property => delete sleeplog[property]);
 
 // check if service enabled
-if (global.sleeplog.enabled) {
+if (sleeplog.enabled) {
 
-  // add cached values and functions to global object
-  global.sleeplog = Object.assign(global.sleeplog, {
+  // add always used values and functions to global object
+  sleeplog = Object.assign(sleeplog, {
     // set cached values
-    ess_values: [],
-    nomocount: 0,
-    firstnomodate: undefined,
     resting: undefined,
-    status: 0,
+    status: undefined,
 
-    // define acceleration listener function
-    accel: function(xyz) {
-      // save acceleration magnitude and start calculation on enough saved data
-      if (global.sleeplog.ess_values.push(xyz.mag) >= global.sleeplog.winwidth) global.sleeplog.calc();
-    },
-
-    // define calculator function
-    calc: function() {
-      // calculate standard deviation over 
-      var mean = this.ess_values.reduce((prev, cur) => cur + prev) / this.winwidth;
-      var stddev = Math.sqrt(this.ess_values.map(val => Math.pow(val - mean, 2)).reduce((prev, cur) => prev + cur) / this.winwidth);
-      // reset saved acceleration data
-      this.ess_values = [];
-
-      // check for non-movement according to the threshold
-      if (stddev < this.nomothresh) {
-        // increment non-movement sections count, set date of first non-movement
-        if (++this.nomocount == 1) this.firstnomodate = Math.floor(Date.now());
-        // check resting state and non-movement count against threshold
-        if (this.resting !== true && this.nomocount >= this.sleepthresh) {
-          // change resting state, status and write to log
-          this.resting = true;
-          // check if the watch is worn
-          if (E.getTemperature() > this.tempthresh) {
-            // set status and write to log as sleping
-            this.status = 3;
-            this.log(this.firstnomodate, 3, E.getTemperature());
-          } else {
-            // set status and write to log as not worn
-            this.status = 1;
-            this.log(this.firstnomodate, 1, E.getTemperature());
-          }
-        }
-      } else {
-        // reset non-movement sections count
-        this.nomocount = 0;
-        // check resting state
-        if (this.resting !== false) {
-          // change resting state
-          this.resting = false;
-          // set status and write to log as awake
-          this.status = 2;
-          this.log(Math.floor(Date.now()), 2);
+    // define function to handle stopping the service, it will be restarted on reload if enabled
+    stopHandler: function() {
+      // remove all listeners
+      Bangle.removeListener('accel', sleeplog.accel);
+      Bangle.removeListener('health', sleeplog.health);
+      // write log with undefined sleeping status
+      require("sleeplog").writeLog(0, [Math.floor(Date.now()), 0]);
+      // reset cached values if sleeplog is defined
+      if (global.sleeplog) {
+        sleeplog.resting = undefined;
+        sleeplog.status = undefined;
+        // reset cached ESS calculation values
+        if (!sleeplog.powersaving) {
+          sleeplog.ess_values = [];
+          sleeplog.nomocount = 0;
+          sleeplog.firstnomodate = undefined;
         }
       }
     },
 
-    // define logging function
-    log: function(date, status, temperature, info) {
-      // skip logging if logfile is undefined or does not end with ".log"
-      if (!this.logfile || !this.logfile.endsWith(".log")) return;
-      // prevent logging on implausible date
-      if (date < 9E11 || Date() < 9E11) return;
-
-      // set default value for status
-      status = status || 0;
-
-      // define storage
-      var storage = require("Storage");
-
-      // read previous logfile
-      var logContent = storage.read(this.logfile) || "";
-
-      // parse previous logfile
-      var log = JSON.parse(logContent.length > 0 ? atob(logContent) : "[]") ;
-
-      // remove last state if it was unknown and is less then 10min ago
-      if (log.length > 0 && log[0][1] === 0 &&
-        Math.floor(Date.now()) - log[0][0] < 600000) log.shift();
-
-      // add actual status at the first position if it has changed
-      if (log.length === 0 || log[0][1] !== status)
-        log.unshift(info ? [date, status, temperature, info] : temperature ? [date, status, temperature] : [date, status]);
-
-      // write log to storage
-      storage.write(this.logfile, btoa(JSON.stringify(log)));
-
-      // clear variables
-      log = undefined;
-      storage = undefined;
-    },
-
-    // define stop function (logging will restart if enabled and boot file is executed)
+    // define function to remove the kill listener and stop the service
+    // https://github.com/espruino/BangleApps/issues/1445
     stop: function() {
-      // remove acceleration and kill listener
-      Bangle.removeListener('accel', global.sleeplog.accel);
-      E.removeListener('kill', global.sleeplog.stop);
-      // write log with undefined sleeping status
-      global.sleeplog.log(Math.floor(Date.now()));
-      // reset cached values
-      global.sleeplog.ess_values = [];
-      global.sleeplog.nomocount = 0;
-      global.sleeplog.firstnomodate = undefined;
-      global.sleeplog.resting = undefined;
-      global.sleeplog.status = 0;
+      E.removeListener('kill', sleeplog.stopHandler);
+      sleeplog.stopHandler();
     },
 
-    // define restart function (also use for initial starting)
+    // define function to initialy start or restart the service
     start: function() {
-      // add acceleration listener
-      Bangle.on('accel', global.sleeplog.accel);
       // add kill listener
-      E.on('kill', global.sleeplog.stop);
-    },
+      E.on('kill', sleeplog.stopHandler);
+      // add health listener if defined and 
+      if (sleeplog.health) Bangle.on('health', sleeplog.health);
+      // add acceleration listener if defined and set status to unknown
+      if (sleeplog.accel) Bangle.on('accel', sleeplog.accel);
+      // read log since 5min ago and restore status to last known state or unknown
+      sleeplog.status = (require("sleeplog").readLog(0, Date.now() - 3E5)[1] || [0, 0])[1];
+      // update resting according to status
+      sleeplog.resting = sleeplog.status % 2;
+      // write restored status to log
+      require("sleeplog").writeLog(0, [Math.floor(Date.now()), sleeplog.status]);
+    }
   });
 
+  // check for power saving mode
+  if (sleeplog.powersaving) {
+    // power saving mode using build in movement detection
+    // delete unused settings
+    ["winwidth", "nomothresh", "sleepthresh"].forEach(property => delete sleeplog[property]);
+    // add cached values and functions to global object
+    sleeplog = Object.assign(sleeplog, {
+      // define health listener function
+      health: function(data) {
+        // set global object and check for existence
+        var gObj = global.sleeplog;
+        if (!gObj) return;
+
+        // calculate timestamp for this measurement
+        var timestamp = Math.floor(Date.now() - 6E5);
+
+        // check for non-movement according to the threshold
+        if (data.movement <= gObj.maxmove) {
+          // check resting state
+          if (gObj.resting !== true) {
+            // change resting state
+            gObj.resting = true;
+            // set status to sleeping or worn
+            gObj.status = E.getTemperature() > gObj.tempthresh ? 3 : 1;
+            // write status to log, 
+            require("sleeplog").writeLog(0, [timestamp, gObj.status, E.getTemperature()]);
+          }
+        } else {
+          // check resting state
+          if (gObj.resting !== false) {
+            // change resting state, set status and write status to log
+            gObj.resting = false;
+            gObj.status = 2;
+            require("sleeplog").writeLog(0, [timestamp, 2]);
+          }
+        }
+      }
+    });
+  } else {
+    // full ESS calculation
+    // add cached values and functions to global object
+    sleeplog = Object.assign(sleeplog, {
+      // set cached values
+      ess_values: [],
+      nomocount: 0,
+      firstnomodate: undefined,
+
+      // define acceleration listener function
+      accel: function(xyz) {
+        // save acceleration magnitude and start calculation on enough saved data
+        if (global.sleeplog && sleeplog.ess_values.push(xyz.mag) >= sleeplog.winwidth) sleeplog.calc();
+      },
+
+      // define calculator function
+      calc: function() {
+        // exit on wrong this
+        if (this.enabled === undefined) return;
+        // calculate standard deviation over 
+        var mean = this.ess_values.reduce((prev, cur) => cur + prev) / this.winwidth;
+        var stddev = Math.sqrt(this.ess_values.map(val => Math.pow(val - mean, 2)).reduce((prev, cur) => prev + cur) / this.winwidth);
+        // reset saved acceleration data
+        this.ess_values = [];
+
+        // check for non-movement according to the threshold
+        if (stddev < this.nomothresh) {
+          // increment non-movement sections count, set date of first non-movement
+          if (++this.nomocount == 1) this.firstnomodate = Math.floor(Date.now());
+          // check resting state and non-movement count against threshold
+          if (this.resting !== true && this.nomocount >= this.sleepthresh) {
+            // change resting state
+            this.resting = true;
+            // set status to sleeping or worn
+            this.status = E.getTemperature() > this.tempthresh ? 3 : 1;
+            // write status to log, with first no movement timestamp
+            require("sleeplog").writeLog(0, [this.firstnomodate, this.status, E.getTemperature()]);
+          }
+        } else {
+          // reset non-movement sections count
+          this.nomocount = 0;
+          // check resting state
+          if (this.resting !== false) {
+            // change resting state and set status
+            this.resting = false;
+            this.status = 2;
+            // write status to log 
+            require("sleeplog").writeLog(0, [Math.floor(Date.now()), 2]);
+          }
+        }
+      }
+    });
+  }
+
   // initial starting
   global.sleeplog.start();
 }
diff --git a/apps/sleeplog/disabled.png b/apps/sleeplog/disabled.png
new file mode 100644
index 000000000..8e7d9fb2c
Binary files /dev/null and b/apps/sleeplog/disabled.png differ
diff --git a/apps/sleeplog/lib.js b/apps/sleeplog/lib.js
index 81bca0f3f..7b35d8a85 100644
--- a/apps/sleeplog/lib.js
+++ b/apps/sleeplog/lib.js
@@ -1,17 +1,12 @@
 exports = {
-  // define en-/disable function
-  setEnabled: function(enable, logfile) {
+  // define en-/disable function, restarts the service to make changes take effect
+  setEnabled: function(enable, logfile, powersaving) {
     // check if sleeplog is available
     if (typeof global.sleeplog !== "object") return;
 
     // set default logfile
-    logfile = logfile.endsWith(".log") ? logfile :
-      logfile === false ? undefined :
-      "sleeplog.log";
-
-    // check if status needs to be changed
-    if (enable === global.sleeplog.enabled ||
-      logfile === global.sleeplog.logfile) return false;
+    if ((typeof logfile !== "string" || !logfile.endsWith(".log")) &&
+      logfile !== false) logfile = "sleeplog.log";
 
     // stop if enabled
     if (global.sleeplog.enabled) global.sleeplog.stop();
@@ -23,7 +18,8 @@ exports = {
     // change enabled value in settings
     storage.writeJSON(filename, Object.assign(storage.readJSON(filename, true) || {}, {
       enabled: enable,
-      logfile: logfile
+      logfile: logfile,
+      powersaving: powersaving || false
     }));
 
     // force changes to take effect by executing the boot script
@@ -42,32 +38,80 @@ exports = {
   // - int    // status: 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
   // - float  // internal temperature
   // - string // additional information
-  readLog: function(since, until) {
-    // set logfile
-    var logfile = (global.sleeplog || {}).logfile || "sleeplog.log";
+  readLog: function(logfile, since, until) {
+    // check/set logfile
+    if (typeof logfile !== "string" || !logfile.endsWith(".log")) {
+      logfile = (global.sleeplog || {}).logfile || "sleeplog.log";
+    }
 
     // check if since is in the future
     if (since > Date()) return [];
 
-    // read log json to array
-    var log = JSON.parse(atob(require("Storage").read(logfile)));
+    // read logfile
+    var log = require("Storage").read(logfile);
+    // return empty log
+    if (!log) return [];
+    // decode data if needed 
+    if (log[0] !== "[") log = atob(log);
+    // do a simple check before parsing
+    if (!log.startsWith("[[") || !log.endsWith("]]")) return [];
+    log = JSON.parse(log) || [];
 
-    // search for latest entry befor since
-    since = (log.find(element => element[0] <= since) || [0])[0];
-
-    // filter selected time period
-    log = log.filter(element => (element[0] >= since) && (element[0] <= (until || 1E14)));
+    // check if filtering is needed
+    if (since || until) {
+      // search for latest entry befor since
+      if (since) since = (log.find(element => element[0] <= since) || [0])[0];
+      // filter selected time period
+      log = log.filter(element => (element[0] >= since) && (element[0] <= (until || 1E14)));
+    }
 
     // output log
     return log;
   },
 
+  // define write log function, append or replace log depending on input
+  // append input if array length >1 and element[0] >9E11
+  // replace log with input if at least one entry like above is inside another array
+  writeLog: function(logfile, input) {
+    // check/set logfile
+    if (typeof logfile !== "string" || !logfile.endsWith(".log")) {
+      if (!global.sleeplog || sleeplog.logfile === false) return;
+      logfile = sleeplog.logfile || "sleeplog.log";
+    }
+
+    // check if input is an array
+    if (typeof input !== "object" || typeof input.length !== "number") return;
+
+    // check for entry plausibility
+    if (input.length > 1 && input[0] * 1 > 9E11) {
+      // read log
+      var log = this.readLog(logfile);
+
+      // remove last state if it was unknown and less then 5min ago
+      if (log.length > 0 && log[0][1] === 0 &&
+        Math.floor(Date.now()) - log[0][0] < 3E5) log.shift();
+
+      // add entry at the first position if it has changed
+      if (log.length === 0 || input.some((e, index) => index > 0 && input[index] !== log[0][index])) log.unshift(input);
+
+      // map log as input
+      input = log;
+    }
+
+    // simple check for log plausibility
+    if (input[0].length > 1 && input[0][0] * 1 > 9E11) {
+      // write log to storage
+      require("Storage").write(logfile, btoa(JSON.stringify(input)));
+      return true;
+    }
+  },
+
   // define log to humanreadable string function
   // sorting: latest last, format:
   // "{substring of ISO date} - {status} for {duration}min\n..."
-  getReadableLog: function(printLog, since, until) {
+  getReadableLog: function(printLog, since, until, logfile) {
     // read log and check
-    var log = this.readLog(since, until);
+    var log = this.readLog(logfile, since, until);
     if (!log.length) return;
     // reverse array to set last timestamp to the end
     log.reverse();
@@ -81,8 +125,11 @@ exports = {
       logString[index] = "" +
         Date(element[0] - Date().getTimezoneOffset() * 6E4).toISOString().substr(0, 19).replace("T", " ") + " - " +
         statusText[element[1]] +
-        (index === log.length - 1 ? "" : " for " + Math.round((log[index + 1][0] - element[0]) / 60000) + "min") +
-        (element[2] ? " | Temp: " + element[2] + "°C" : "") +
+        (index === log.length - 1 ?
+          element.length < 3 ? "" : " ".repeat(12) :
+          " for " + ("" + Math.round((log[index + 1][0] - element[0]) / 60000)).padStart(4) + "min"
+        ) +
+        (element[2] ? " | Temp: " + ("" + element[2]).padEnd(5) + "°C" : "") +
         (element[3] ? " | " + element[3] : "");
     });
     logString = logString.join("\n");
@@ -100,11 +147,9 @@ exports = {
 
   // define function to eliminate some errors inside the log
   restoreLog: function(logfile) {
-    // define storage
-    var storage = require("Storage");
-
-    // read log json to array
-    var log = JSON.parse(atob(storage.read(logfile)));
+    // read log and check
+    var log = this.readLog(logfile);
+    if (!log.length) return;
 
     // define output variable to show number of changes
     var output = log.length;
@@ -112,8 +157,8 @@ exports = {
     // remove non decremental entries
     log = log.filter((element, index) => log[index][0] >= (log[index + 1] || [0])[0]);
 
-    // write log to storage
-    storage.write(logfile, btoa(JSON.stringify(log)));
+    // write log
+    this.writeLog(logfile, log);
 
     // return difference in length
     return output - log.length;
@@ -121,11 +166,12 @@ exports = {
 
   // define function to reinterpret worn status based on given temperature threshold
   reinterpretTemp: function(logfile, tempthresh) {
-    // define storage
-    var storage = require("Storage");
+    // read log and check
+    var log = this.readLog(logfile);
+    if (!log.length) return;
 
-    // read log json to array
-    var log = JSON.parse(atob(storage.read(logfile)));
+    // set default tempthresh
+    tempthresh = tempthresh || (global.sleeplog ? sleeplog.tempthresh : 27);
 
     // define output variable to show number of changes
     var output = 0;
@@ -140,8 +186,8 @@ exports = {
       return element;
     });
 
-    // write log to storage
-    storage.write(logfile, btoa(JSON.stringify(log)));
+    // write log
+    this.writeLog(logfile, log);
 
     // return output
     return output;
diff --git a/apps/sleeplog/metadata.json b/apps/sleeplog/metadata.json
index f4590f7c0..8cf6979d6 100644
--- a/apps/sleeplog/metadata.json
+++ b/apps/sleeplog/metadata.json
@@ -2,8 +2,8 @@
   "id":"sleeplog",
   "name":"Sleep Log",
   "shortName": "SleepLog",
-  "version": "0.02",
-  "description": "Log and view your sleeping habits. This app derived from SleepPhaseAlarm and uses also the principe of Estimation of Stationary Sleep-segments (ESS).",
+  "version": "0.04",
+  "description": "Log and view your sleeping habits. This app derived from SleepPhaseAlarm and uses also the principe of Estimation of Stationary Sleep-segments (ESS). It also provides a power saving mode using the built in movement calculation.",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,boot",
diff --git a/apps/sleeplog/nolog.png b/apps/sleeplog/nolog.png
new file mode 100644
index 000000000..b153b5769
Binary files /dev/null and b/apps/sleeplog/nolog.png differ
diff --git a/apps/sleeplog/powersaving.png b/apps/sleeplog/powersaving.png
new file mode 100644
index 000000000..ea487b48c
Binary files /dev/null and b/apps/sleeplog/powersaving.png differ
diff --git a/apps/sleeplog/screenshot1.png b/apps/sleeplog/screenshot1.png
index 9ab384ca9..200a305c4 100644
Binary files a/apps/sleeplog/screenshot1.png and b/apps/sleeplog/screenshot1.png differ
diff --git a/apps/sleeplog/screenshot2.png b/apps/sleeplog/screenshot2.png
index 69e370042..61f580336 100644
Binary files a/apps/sleeplog/screenshot2.png and b/apps/sleeplog/screenshot2.png differ
diff --git a/apps/sleeplog/screenshot3.png b/apps/sleeplog/screenshot3.png
index 79433949a..4a29b5008 100644
Binary files a/apps/sleeplog/screenshot3.png and b/apps/sleeplog/screenshot3.png differ
diff --git a/apps/sleeplog/settings.js b/apps/sleeplog/settings.js
index 6137e2082..11c7c0adb 100644
--- a/apps/sleeplog/settings.js
+++ b/apps/sleeplog/settings.js
@@ -8,6 +8,8 @@
     maxawake: 36E5, // 60min in ms
     minconsec: 18E5, // 30min in ms
     tempthresh: 27, // every temperature above ist registered as worn
+    powersaving: false, // disables ESS and uses build in movement detection
+    maxmove: 100, // movement threshold on power saving mode
     nomothresh: 0.012, // values lower than 0.008 getting triggert by noise
     sleepthresh: 577, // 577 times no movement * 1.04s window width > 10min
     winwidth: 13, // 13 values, read with 12.5Hz = every 1.04s
@@ -27,90 +29,117 @@
     storage.writeJSON(filename, settings);
   }
 
-  // define circulate function
-  function circulate(min, max, value) {
-    return value > max ? min : value < min ? max : value;
+  // define function to change values that need a restart of the service
+  function changeRestart() {
+    require("sleeplog").setEnabled(settings.enabled, settings.logfile, settings.powersaving);
   }
 
   // calculate sleepthresh factor
   var stFactor = settings.winwidth / 12.5 / 60;
 
   // show main menu
-  function showMain() {
-    var mainMenu = E.showMenu({
+  function showMain(selected) {
+    var mainMenu = {
       "": {
-        title: "Sleep Log"
+        title: "Sleep Log",
+        selected: selected
       },
-      "< Exit": () => load(),
+      "Exit": () => load(),
       "< Back": () => back(),
-      "BreakTod": {
+      "Break Tod": {
         value: settings.breaktod,
         step: 1,
-        onchange: function(v) {
-          this.value = v = circulate(0, 23, v);
-          writeSetting("breaktod", v);
-        }
+        min: 0,
+        max: 23,
+        wrap: true,
+        onchange: v => writeSetting("breaktod", v),
       },
-      "MaxAwake": {
+      "Max Awake": {
         value: settings.maxawake / 6E4,
         step: 5,
+        min: 15,
+        max: 120,
+        wrap: true,
         format: v => v + "min",
-        onchange: function(v) {
-          this.value = v = circulate(15, 120, v);
-          writeSetting("maxawake", v * 6E4);
-        }
+        onchange: v => writeSetting("maxawake", v * 6E4),
       },
-      "MinConsec": {
+      "Min Consec": {
         value: settings.minconsec / 6E4,
         step: 5,
+        min: 15,
+        max: 120,
+        wrap: true,
         format: v => v + "min",
-        onchange: function(v) {
-          this.value = v = circulate(15, 120, v);
-          writeSetting("minconsec", v * 6E4);
-        }
+        onchange: v => writeSetting("minconsec", v * 6E4),
       },
-      "TempThresh": {
+      "Temp Thresh": {
         value: settings.tempthresh,
         step: 0.5,
+        min: 20,
+        max: 40,
+        wrap: true,
         format: v => v + "°C",
+        onchange: v => writeSetting("tempthresh", v),
+      },
+      "Power Saving": {
+        value: settings.powersaving,
+        format: v => v ? "on" : "off",
         onchange: function(v) {
-          this.value = v = circulate(20, 40, v);
-          writeSetting("tempthresh", v);
+          settings.powersaving = v;
+          changeRestart();
+          // redraw menu with changed entries subsequent to onchange
+          // https://github.com/espruino/Espruino/issues/2149
+          setTimeout(showMain, 1, 6);
         }
       },
-      "NoMoThresh": {
+      "Max Move": {
+        value: settings.maxmove,
+        step: 1,
+        min: 50,
+        max: 200,
+        wrap: true,
+        onchange: v => writeSetting("maxmove", v),
+      },
+      "NoMo Thresh": {
         value: settings.nomothresh,
         step: 0.001,
+        min: 0.006,
+        max: 0.02,
+        wrap: true,
         format: v => ("" + v).padEnd(5, "0"),
-        onchange: function(v) {
-          this.value = v = circulate(0.006, 0.02, v);
-          writeSetting("nomothresh", v);
-        }
+        onchange: v => writeSetting("nomothresh", v),
       },
-      "MinDuration": {
+      "Min Duration": {
         value: Math.floor(settings.sleepthresh * stFactor),
         step: 1,
+        min: 5,
+        max: 15,
+        wrap: true,
         format: v => v + "min",
-        onchange: function(v) {
-          this.value = v = circulate(5, 15, v);
-          writeSetting("sleepthresh", Math.ceil(v / stFactor));
-        }
+        onchange: v => writeSetting("sleepthresh", Math.ceil(v / stFactor)),
       },
       "Enabled": {
         value: settings.enabled,
         format: v => v ? "on" : "off",
         onchange: function(v) {
-          writeSetting("enabled", v);
+          settings.enabled = v;
+          changeRestart();
         }
       },
       "Logfile ": {
-        value: settings.logfile === "sleeplog.log" ? true : settings.logfile.endsWith(".log") ? "custom" : false,
+        value: settings.logfile === "sleeplog.log" ? true : (settings.logfile || "").endsWith(".log") ? "custom" : false,
         format: v => v === true ? "default" : v ? "custom" : "off",
         onchange: function(v) {
-          if (v !== "custom") writeSetting("logfile", v ? "sleeplog.log" : undefined);
+          if (v !== "custom") {
+            settings.logfile = v ? "sleeplog.log" : false;
+            changeRestart();
+          }
         }
-      },
-    });
+      }
+    };
+    // check power saving mode to delete unused entries
+    (settings.powersaving ? ["NoMo Thresh", "Min Duration"] : ["Max Move"]).forEach(property => delete mainMenu[property]);
+    var menu = E.showMenu(mainMenu);
   }
 
   // draw main menu
diff --git a/apps/speedalt/ChangeLog b/apps/speedalt/ChangeLog
index 09d33f615..0550f9b86 100644
--- a/apps/speedalt/ChangeLog
+++ b/apps/speedalt/ChangeLog
@@ -8,3 +8,4 @@
 0.08: New features. Added waypoints file and distance to selected waypoint display. Added integration with GPS Setup module to switch GPS to low power mode when screen off. Save display settings and restore when app restarted.
 0.09: Add third screen mode with large clock and waypoint selection display to ease visibility in bright daylight.
 0.10: Add Kalman filter to smooth the speed and altitude values. Can be disabled in settings.
+0.11: Now also runs on Bangle.js 2 with basic functionality
diff --git a/apps/speedalt/README.md b/apps/speedalt/README.md
index db3c7e673..c21828aff 100644
--- a/apps/speedalt/README.md
+++ b/apps/speedalt/README.md
@@ -1,6 +1,8 @@
 # GPS Speed, Altimeter and Distance to Waypoint
 
-You can switch between three display modes. One showing speed and altitude (A), one showing speed and distance to waypoint (D) and a large dispay of time and selected waypoint. 
+You can switch between three display modes. One showing speed and altitude (A), one showing speed and distance to waypoint (D) and a large dispay of time and selected waypoint.
+
+*Note for **Bangle.js 2:** Currently only the BTN3 functionality is working with the Bangle.js 2 button.*
 
 Within the [A]ltitude and [D]istance displays modes one figure is displayed on the watch face using the largest possible characters depending on the number of digits. The other is in a smaller characters below that. Both are always visible. You can display the current or maximum observed speed/altitude values. Current time is always displayed. 
 
@@ -10,6 +12,8 @@ The waypoints list is the same as that used with the [GPS Navigation](https://ba
 
 BTN3 : Cycles the modes between Speed+[A]ltitude,  Speed+[D]istance and large Time/Waypoint
 
+***Bangle.js 2:** Currently only this button function is working*
+
 ### [A]ltitude mode
 
 BTN1 : Short press < 2 secs toggles the displays between showing the current speed/alt values or the maximum speed/alt values recorded.
diff --git a/apps/speedalt/app.js b/apps/speedalt/app.js
index c8735479d..f979762f1 100644
--- a/apps/speedalt/app.js
+++ b/apps/speedalt/app.js
@@ -5,7 +5,16 @@ Mike Bennett mike[at]kereru.com
 1.01 : Third mode large clock display
 1.02 : add smoothing with kalman filter
 */
-var v = '1.02g';
+//var v = '1.02g';
+
+const BANGLEJS2 = process.env.HWVERSION==2;
+const screenH  = g.getHeight();
+const screenH_Half        = screenH / 2;
+const screenH_Third       = screenH / 3;
+const screenH_TwoThirds   = screenH * 2 / 3;
+const screenW  = g.getWidth();
+const screenW_Half        = screenW / 2;
+const fontFactorB2 = 2/3;
 
 /*kalmanjs, Wouter Bulten, MIT, https://github.com/wouterbulten/kalmanjs */
 var KalmanFilter = (function () {
@@ -171,10 +180,11 @@ var KalmanFilter = (function () {
 }());
 
 
-var buf = Graphics.createArrayBuffer(240,160,2,{msb:true});
 
-// Load fonts
-require("Font7x11Numeric7Seg").add(Graphics);
+var buf = Graphics.createArrayBuffer(screenW,screenH_TwoThirds,2,{msb:true});
+
+if (!BANGLEJS2)
+require("Font7x11Numeric7Seg").add(Graphics); // Load fonts
 
 var lf = {fix:0,satellites:0};
 var showMax = 0;        // 1 = display the max values. 0 = display the cur fix
@@ -188,9 +198,10 @@ max.spd = 0;
 max.alt = 0;
 max.n = 0;    // counter. Only start comparing for max after a certain number of fixes to allow kalman filter to have smoohed the data.
 
-var emulator = (process.env.BOARD=="EMSCRIPTEN")?1:0;  // 1 = running in emulator. Supplies test values;
+var emulator = (process.env.BOARD=="EMSCRIPTEN" || process.env.BOARD=="EMSCRIPTEN2")?1:0;  // 1 = running in emulator. Supplies test values;
 
 var wp = {};        // Waypoint to use for distance from cur position.
+var SATinView = 0;
 
 function nxtWp(inc){
   cfg.wp+=inc;
@@ -212,7 +223,7 @@ function radians(a) {
 function distance(a,b){
   var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2));
   var y = radians(b.lat-a.lat);
-  
+
   // Distance in selected units
   var d = Math.sqrt(x*x + y*y) * 6371000;
   d = (d/parseFloat(cfg.dist)).toFixed(2);
@@ -228,41 +239,53 @@ function drawFix(dat) {
 
   buf.clear();
 
-  var v = '';  
+  var v = '';
   var u='';
-  
+
   // Primary Display
   v = (cfg.primSpd)?dat.speed.toString():dat.alt.toString();
-  
+
   // Primary Units
   u = (cfg.primSpd)?cfg.spd_unit:dat.alt_units;
 
   drawPrimary(v,u);
-  
+
   // Secondary Display
   v = (cfg.primSpd)?dat.alt.toString():dat.speed.toString();
 
   // Secondary Units
   u = (cfg.primSpd)?dat.alt_units:cfg.spd_unit;
-  
+
   drawSecondary(v,u);
-  
+
   // Time
   drawTime();
 
   // Waypoint name
   drawWP();
-  
+
   //Sats
   if ( dat.age > 10 ) {
     if ( dat.age > 90 ) dat.age = '>90';
     drawSats('Age:'+dat.age);
   }
   else drawSats('Sats:'+dat.sats);
-  
+
+/*  else if (!BANGLEJS2) {
+    drawSats('Sats:'+dat.sats);
+  } else {
+    if (lf.fix) {
+      if(emulator)console.log("fix "+lf.fix);
+      drawSats('Sats:'+dat.sats);
+    } else {
+      if(emulator)console.log("inView: "+SATinView);
+      drawSats('View:' + SATinView);
+    }
+  }
+*/
   g.reset();
   g.drawImage(img,0,40);
-  
+
 }
 
 function drawClock() {
@@ -275,125 +298,143 @@ function drawClock() {
 }
 
 function drawPrimary(n,u) {
-  
+  if(emulator)console.log("drawPrimary: " + n +" "+ u);
   // Primary Display
-  
+
   var s=40;    // Font size
   var l=n.length;
-  
+
   if ( l <= 7 ) s=48;
   if ( l <= 6 ) s=55;
   if ( l <= 5 ) s=66;
   if ( l <= 4 ) s=85;
   if ( l <= 3 ) s=110;
-        
-  buf.setFontAlign(0,-1); //Centre 
-  buf.setColor(1);  
+
+  buf.setFontAlign(0,-1); //Centre
+  buf.setColor(1);
+  if (BANGLEJS2) s *= fontFactorB2;
   buf.setFontVector(s);
-  buf.drawString(n,110,0);
- 
- 
-  
-    // Primary Units
+  buf.drawString(n,screenW_Half-10,0);
+
+  // Primary Units
+  s = 35;    // Font size
   buf.setFontAlign(1,-1,3); //right
-  buf.setColor(2);  
-  buf.setFontVector(35);
-  buf.drawString(u,210,0);  
+  buf.setColor(2);
+  if (BANGLEJS2) s = 20;
+  buf.setFontVector(s);
+  buf.drawString(u,screenW-30,0);
 }
 
 function drawSecondary(n,u) {
-
-  var s=180;    // units X position
+  if(emulator)console.log("drawSecondary: " + n +" "+ u);
+  var xu = 180;    // units X position
   var l=n.length;
-  if ( l <= 5 ) s=155;
-  if ( l <= 4 ) s=125;
-  if ( l <= 3 ) s=100;
-  if ( l <= 2 ) s=65;
-  if ( l <= 1 ) s=35;
-  
-  buf.setFontAlign(-1,1); //left, bottom 
-  buf.setColor(1);  
-  buf.setFontVector(45);
-  buf.drawString(n,5,140);
-    
+  if ( l <= 5 ) xu = 155;
+  if ( l <= 4 ) xu = 125;
+  if ( l <= 3 ) xu = 100;
+  if ( l <= 2 ) xu = 65;
+  if ( l <= 1 ) xu = 35;
+
+  buf.setFontAlign(-1,1); //left, bottom
+  buf.setColor(1);
+  var s = 45;    // Font size
+  if (BANGLEJS2) s *= fontFactorB2;
+  buf.setFontVector(s);
+  buf.drawString(n,5,screenH_TwoThirds-20);
+
   // Secondary Units
   buf.setFontAlign(-1,1); //left, bottom
-  buf.setColor(2);  
-  buf.setFontVector(30);
-  buf.drawString(u,s,135);
+
+  buf.setColor(2);
+  s = 30;    // Font size
+  if (BANGLEJS2) s *= fontFactorB2;
+  buf.setFontVector(s);
+  buf.drawString(u,xu - (BANGLEJS2*20),screenH_TwoThirds-25);
 }
 
 function drawTime() {
   var x, y;
-  
+
   if ( cfg.modeA == 2 ) {
-    x=120;
-    y=0;
-    buf.setFontAlign(0,-1); 
-    buf.setFontVector(80);
+    x = screenW_Half;
+    y = 0;
+    buf.setFontAlign(0,-1);
+    buf.setFontVector(screenH_Third);
   }
   else {
     x = 0;
-    y = 160;
+    y = screenH_TwoThirds;
     buf.setFontAlign(-1,1);
+    if (!BANGLEJS2)
     buf.setFont("7x11Numeric7Seg", 2);
+    else
+    buf.setFont("6x8", 2);
   }
 
 
   buf.setColor(0);
   buf.drawString(time,x,y);
   time = require("locale").time(new Date(),1);
-  buf.setColor(3);  
+  buf.setColor(3);
   buf.drawString(time,x,y);
 }
 
-function drawWP() {
+function drawWP() { // from  waypoints.json - see README.md
   var nm = wp.name;
   if ( nm == undefined || nm == 'NONE' || cfg.modeA ==1 ) nm = '';
-  buf.setColor(2);  
-  
+  if (emulator) nm="waypoint";
+  buf.setColor(2);
+  var s = 20;    // Font size
+
   if ( cfg.modeA == 0 ) {  // dist mode
+    if(emulator)console.log("drawWP() 0: "+nm);
     buf.setFontAlign(-1,1); //left, bottom
-    buf.setFontVector(20);
-    buf.drawString(nm.substring(0,6),72,160);  
+    if (BANGLEJS2) s *= fontFactorB2;
+    buf.setFontVector(s);
+    buf.drawString(nm.substring(0,6),72,screenH_TwoThirds-(BANGLEJS2 * 20));
   }
 
   if ( cfg.modeA == 2 ) {  // clock/large mode
+    if(emulator)console.log("drawWP() 2: "+nm);
+    s = 55;    // Font size
     buf.setFontAlign(0,1); //left, bottom
-    buf.setFontVector(55);
-    buf.drawString(nm.substring(0,6),120,160);  
+    if (BANGLEJS2) s *= fontFactorB2;
+    buf.setFontVector(s);
+    buf.drawString(nm.substring(0,6),screenW_Half,screenH_TwoThirds-(BANGLEJS2 * 20));
   }
-  
+
 }
 
 function drawSats(sats) {
 
-  buf.setColor(3);  
+  buf.setColor(3);
   buf.setFont("6x8", 2);
   buf.setFontAlign(1,1); //right, bottom
-  buf.drawString(sats,240,160);  
+  buf.drawString(sats,screenW,screenH_TwoThirds);
+
+  s = 30;    // Font size
+  if (BANGLEJS2) s = 18;
+  buf.setFontVector(s);
+  buf.setColor(2);
 
-  buf.setFontVector(30);
-  buf.setColor(2); 
-  
   if ( cfg.modeA == 1 ) {
-    buf.drawString('A',240,140);
+    buf.drawString('A',screenW,140-(BANGLEJS2 * 40));
     if ( showMax ) {
       buf.setFontAlign(0,1); //centre, bottom
       buf.drawString('MAX',120,164);
     }
   }
-  if ( cfg.modeA == 0 ) buf.drawString('D',240,140);
+  if ( cfg.modeA == 0 ) buf.drawString('D',screenW,140-(BANGLEJS2 * 40));
 }
 
 function onGPS(fix) {
-  
+
  if ( emulator ) {
     fix.fix = 1;
     fix.speed = 10 + (Math.random()*5);
     fix.alt = 354 + (Math.random()*50);
     fix.lat = -38.92;
-    fix.lon = 175.7613350;   
+    fix.lon = 175.7613350;
     fix.course = 245;
     fix.satellites = 12;
     fix.time = new Date();
@@ -402,7 +443,7 @@ function onGPS(fix) {
 
   var m;
 
-  var sp = '---';        
+  var sp = '---';
   var al = '---';
   var di = '---';
   var age = '---';
@@ -411,6 +452,8 @@ function onGPS(fix) {
 
     if (lf.fix) {
 
+//    if (BANGLEJS2 && !emulator) Bangle.removeListener('GPS-raw', onGPSraw);
+
     // Smooth data
     if ( lf.smoothed !== 1 ) {
       if ( cfg.spdFilt ) lf.speed = spdFilter.filter(lf.speed);
@@ -418,8 +461,8 @@ function onGPS(fix) {
       lf.smoothed = 1;
       if ( max.n <= 15 ) max.n++;
     }
-  
-    
+
+
     // Speed
     if ( cfg.spd == 0 ) {
       m = require("locale").speed(lf.speed).match(/([0-9,\.]+)(.*)/); // regex splits numbers from units
@@ -427,7 +470,7 @@ function onGPS(fix) {
       cfg.spd_unit = m[2];
     }
     else sp = parseFloat(lf.speed)/parseFloat(cfg.spd); // Calculate for selected units
-    
+
     if ( sp < 10 ) sp = sp.toFixed(1);
     else sp = Math.round(sp);
     if (parseFloat(sp) > parseFloat(max.spd) && max.n > 15 ) max.spd = parseFloat(sp);
@@ -444,9 +487,9 @@ function onGPS(fix) {
     // Age of last fix (secs)
     age = Math.max(0,Math.round(getTime())-(lf.time.getTime()/1000));
   }
-      
+
   if ( cfg.modeA == 1 ) {
-    if ( showMax ) 
+    if ( showMax )
       drawFix({
         speed:max.spd,
         sats:lf.satellites,
@@ -455,7 +498,7 @@ function onGPS(fix) {
         age:age,
         fix:lf.fix
       }); // Speed and alt maximums
-    else 
+    else
       drawFix({
         speed:sp,
         sats:lf.satellites,
@@ -467,7 +510,7 @@ function onGPS(fix) {
   }
   if ( cfg.modeA == 0 )  {
     // Show speed/distance
-    if ( di <= 0 ) 
+    if ( di <= 0 )
       drawFix({
         speed:sp,
         sats:lf.satellites,
@@ -476,7 +519,7 @@ function onGPS(fix) {
         age:age,
         fix:lf.fix
       }); // No WP selected
-    else 
+    else
       drawFix({
         speed:sp,
         sats:lf.satellites,
@@ -494,7 +537,7 @@ function onGPS(fix) {
 }
 
 function setButtons(){
-
+if (!BANGLEJS2) { // Buttons for Bangle.js
   // Spd+Dist : Select next waypoint
   setWatch(function(e) {
     var dur = e.time - e.lastTime;
@@ -506,10 +549,10 @@ function setButtons(){
     else nxtWp(1);  // Spd+Dist or Clock mode - Select next waypoint
     onGPS(lf);
   }, BTN1, { edge:"falling",repeat:true});
-  
-  // Power saving on/off 
+
+  // Power saving on/off
   setWatch(function(e){
-    pwrSav=!pwrSav; 
+    pwrSav=!pwrSav;
     if ( pwrSav ) {
       LED1.reset();
       var s = require('Storage').readJSON('setting.json',1)||{};
@@ -522,15 +565,15 @@ function setButtons(){
       LED1.set();
     }
   }, BTN2, {repeat:true,edge:"falling"});
-  
+
   // Toggle between alt or dist
   setWatch(function(e){
     cfg.modeA = cfg.modeA+1;
     if ( cfg.modeA > 2 ) cfg.modeA = 0;
     savSettings();
-    onGPS(lf); 
+    onGPS(lf);
   }, BTN3, {repeat:true,edge:"falling"});
-  
+
   // Touch left screen to toggle display
   setWatch(function(e){
     cfg.primSpd = !cfg.primSpd;
@@ -538,11 +581,42 @@ function setButtons(){
     onGPS(lf);  // Update display
   }, BTN4, {repeat:true,edge:"falling"});
 
+} else {                                  // Buttons for Bangle.js 2
+  setWatch(function(e){ // Bangle.js BTN3
+    cfg.modeA = cfg.modeA+1;
+    if ( cfg.modeA > 2 ) cfg.modeA = 0;
+    if(emulator)console.log("cfg.modeA="+cfg.modeA);
+    savSettings();
+    onGPS(lf);
+  }, BTN1, {repeat:true,edge:"falling"});
+
+/*  Bangle.on('tap', function(data) { // data - {dir, double, x, y, z}
+    cfg.primSpd = !cfg.primSpd;
+    if(emulator)console.log("!cfg.primSpd");
+  }); */
+
+/*  Bangle.on('swipe', function(dir) {
+    if (dir < 0) { // left: Bangle.js BTN3
+      cfg.modeA = cfg.modeA+1;
+      if ( cfg.modeA > 2 ) cfg.modeA = 0;
+      if(emulator)console.log("cfg.modeA="+cfg.modeA);
+    }
+    else
+    {             // right: Bangle.js BTN4
+      cfg.primSpd = !cfg.primSpd;
+      if(emulator)console.log("!cfg.primSpd");
+    }
+  });
+*/
+  savSettings();
+  onGPS(lf);
+  }
 }
 
+
 function updateClock() {
   if (!canDraw) return;
-  drawTime(); 
+  drawTime();
   g.reset();
   g.drawImage(img,0,40);
   if ( emulator ) {max.spd++;max.alt++;}
@@ -573,21 +647,21 @@ function setLpMode(m) {
 
 // =Main Prog
 
-// Read settings. 
+// Read settings.
 let cfg = require('Storage').readJSON('speedalt.json',1)||{};
 
 cfg.spd = cfg.spd||0;  // Multiplier for speed unit conversions. 0 = use the locale values for speed
-cfg.spd_unit = cfg.spd_unit||'';  // Displayed speed unit
-cfg.alt = cfg.alt||0.3048;// Multiplier for altitude unit conversions.
-cfg.alt_unit = cfg.alt_unit||'feet';  // Displayed altitude units
+cfg.spd_unit = cfg.spd_unit||'km/h';  // Displayed speed unit
+cfg.alt = cfg.alt||1;// Multiplier for altitude unit conversions. (feet:'0.3048')
+cfg.alt_unit = cfg.alt_unit||'meter';  // Displayed altitude units ('feet')
 cfg.dist = cfg.dist||1000;// Multiplier for distnce unit conversions.
 cfg.dist_unit = cfg.dist_unit||'km';  // Displayed altitude units
 cfg.colour = cfg.colour||0;          // Colour scheme.
 cfg.wp = cfg.wp||0;        // Last selected waypoint for dist
-cfg.modeA = cfg.modeA||0;    // 0 = [D]ist, 1 = [A]ltitude, 2 = [C]lock
-cfg.primSpd = cfg.primSpd||0;    // 1 = Spd in primary, 0 = Spd in secondary
+cfg.modeA = cfg.modeA||1;    // 0 = [D]ist, 1 = [A]ltitude, 2 = [C]lock
+cfg.primSpd = cfg.primSpd||1;    // 1 = Spd in primary, 0 = Spd in secondary
 
-cfg.spdFilt = cfg.spdFilt==undefined?true:cfg.spdFilt; 
+cfg.spdFilt = cfg.spdFilt==undefined?true:cfg.spdFilt;
 cfg.altFilt = cfg.altFilt==undefined?true:cfg.altFilt;
 
 if ( cfg.spdFilt ) var spdFilter = new KalmanFilter({R: 0.1 , Q: 1 });
@@ -602,29 +676,43 @@ Colour Pallet Idx
 2 : Units
 3 : Sats
 */
+const background = 0; // g.theme.bg = 0xFFFF = gelb!?
 var img = {
   width:buf.getWidth(),
   height:buf.getHeight(),
   bpp:2,
   buffer:buf.buffer,
-  palette:new Uint16Array([0,0x4FE0,0xEFE0,0x07DB])
+  palette:new Uint16Array([background,0x4FE0,0xEFE0,0x07DB]) // "Default"
 };
 
-if ( cfg.colour == 1 ) img.palette = new Uint16Array([0,0xFFFF,0xFFF6,0xDFFF]);
-if ( cfg.colour == 2 ) img.palette = new Uint16Array([0,0xFF800,0xFAE0,0xF813]);
+if ( cfg.colour == 1 ) img.palette = new Uint16Array([background,0xFFFF,0xFFF6,0xDFFF]); // "Hi contrast"
+if ( cfg.colour == 2 ) img.palette = new Uint16Array([background,0xFF800,0xFAE0,0xF813]); // "Night"
 
 var SCREENACCESS = {
       withApp:true,
       request:function(){this.withApp=false;stopDraw();},
       release:function(){this.withApp=true;startDraw();}
-}; 
+};
 
 Bangle.on('lcdPower',function(on) {
   if (!SCREENACCESS.withApp) return;
-  if (on) startDraw(); 
+  if (on) startDraw();
   else stopDraw();
 });
 
+/*
+function onGPSraw(nmea) {
+  var nofGP = 0, nofBD = 0, nofGL = 0;
+  if (nmea.slice(3,6) == "GSV") {
+    // console.log(nmea.slice(1,3) + "  " + nmea.slice(11,13));
+    if (nmea.slice(0,7) == "$GPGSV,") nofGP = Number(nmea.slice(11,13));
+    if (nmea.slice(0,7) == "$BDGSV,") nofBD = Number(nmea.slice(11,13));
+    if (nmea.slice(0,7) == "$GLGSV,") nofGL = Number(nmea.slice(11,13));
+    SATinView = nofGP + nofBD + nofGL;
+  } }
+if(BANGLEJS2) Bangle.on('GPS-raw', onGPSraw);
+*/
+
 var gpssetup;
 try {
   gpssetup = require("gpssetup");
@@ -634,8 +722,6 @@ try {
 
 // All set up. Lets go.
 g.clear();
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 onGPS(lf);
 Bangle.setGPSPower(1);
 
@@ -650,3 +736,5 @@ Bangle.on('GPS', onGPS);
 
 setButtons();
 setInterval(updateClock, 10000);
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/speedalt/metadata.json b/apps/speedalt/metadata.json
index 458023278..617ac4b8e 100644
--- a/apps/speedalt/metadata.json
+++ b/apps/speedalt/metadata.json
@@ -2,12 +2,12 @@
   "id": "speedalt",
   "name": "GPS Adventure Sports",
   "shortName": "GPS Adv Sport",
-  "version": "0.10",
+  "version": "0.11",
   "description": "GPS speed, altitude and distance to waypoint display. Designed for easy viewing and use during outdoor activities such as para-gliding, hang-gliding, sailing, cycling etc.",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,outdoors",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [
diff --git a/apps/speedalt/settings.js b/apps/speedalt/settings.js
index 63d77971e..8906e2e2c 100644
--- a/apps/speedalt/settings.js
+++ b/apps/speedalt/settings.js
@@ -49,14 +49,14 @@
     '': {'title': 'Units'},
     '< Back': function() { E.showMenu(appMenu); },
     'default (spd)' : function() { setUnits(0,''); },
-    'Kph (spd)' : function() { setUnits(1,'kph'); },
+    'km/h (spd)' : function() { setUnits(1,'km/h'); },
     'Knots (spd)' : function() { setUnits(1.852,'kts'); },
     'Mph (spd)' : function() { setUnits(1.60934,'mph'); },
     'm/s (spd)' : function() { setUnits(3.6,'m/s'); },
     'Km (dist)' : function() { setUnitsDist(1000,'km'); },
     'Miles (dist)' : function() { setUnitsDist(1609.344,'mi'); },
     'Nm (dist)' : function() { setUnitsDist(1852.001,'nm'); },
-    'Meters (alt)' : function() { setUnitsAlt(1,'m'); },
+    'Meters (alt)' : function() { setUnitsAlt(1,'meter'); },
     'Feet (alt)' : function() { setUnitsAlt(0.3048,'ft'); }
   };
 
diff --git a/apps/speedalt2/ChangeLog b/apps/speedalt2/ChangeLog
index 4ff386666..602147856 100644
--- a/apps/speedalt2/ChangeLog
+++ b/apps/speedalt2/ChangeLog
@@ -12,3 +12,4 @@
 1.10: Adds Kalman filter.
 1.14: Add VMG and coordinates screens
 1.43: Adds mirroring of the watch face to an Android device. See README.md
+1.48: Droidscript mirroring prog automatically uses last connection address. Auto connects when run.
diff --git a/apps/speedalt2/GPS Adv Sports II.js b/apps/speedalt2/GPS Adv Sports II.js
index 5eb9b64c8..176113248 100644
--- a/apps/speedalt2/GPS Adv Sports II.js	
+++ b/apps/speedalt2/GPS Adv Sports II.js	
@@ -3,27 +3,66 @@
 
 app.LoadPlugin("PuckJS");
 
+app.SetDebugEnabled(true);
+
+
+v = '1.52'                      // Version of this script
+requiredBangleVer = '1.47';     // Minimum speedalt2 version required on Bangle
+curBangleVer = '-.--'
+isStopped = true;               // Data receive turned off
+lastData = new Date().getTime() / 1000;   // Time of last data received
+
+//Colours
+//    Mode = 0 // 0=SPD, 1=ALT, 2=DST, 3=VMG, 4=POSN, 5=TIME
+btnOff = '#175A63'
+btnOn = '#4285F4'
+col = new Array(['black'],['#64FF00'],['#FCFA00'],['#00E4FF'])   // bg, main, units, wp   - 0xFFFF,0x007F,0x0054,0x0054
+
+// Settings
+conf = JSON.parse( app.LoadText( "settings", "{}" ))
+if ( typeof(conf.btAddr) != 'string' ) conf.btAddr = '' // Address of last connection
+if ( typeof(conf.btName) != 'string' ) conf.btName = '' // Name of last connection
+
+// Extend PuckJS
+app.CreateBangleJS = function( options ) 
+{ 
+    return new BangleJS( options );
+}
+
+class BangleJS extends PuckJS {
+    
+    constructor(options) {
+        super(options)
+    }
+
+}
 
 //Called when application is started.
 function OnStart() {
 
-    v = '1.49'                      // Version of this script
-    requiredBangleVer = '1.46';     // Minimum speedalt2 version required on Bangle
-    curBangleVer = '-.--'
-    isStopped = true;               // Data receive turned off
-    lastData = new Date().getTime() / 1000;   // Time of last data received
-    addr = '';                     // Address of last connection
-
-    //    Mode = 0 // 0=SPD, 1=ALT, 2=DST, 3=VMG, 4=POSN, 5=TIME
-    btnOff = '#175A63'
-    btnOn = '#4285F4'
-    col = new Array(['black'],['#64FF00'],['#FCFA00'],['#00E4FF'])   // bg, main, units, wp   - 0xFFFF,0x007F,0x0054,0x0054
 
     // Connect to Bangle
-    puck = app.CreatePuckJS();
-    puck.SetOnConnect(onConnect);       // Callback.
-    puck.SetOnReceive(readResponse);    // Callback to capture console output from app.
-    puck.Scan("Bangle");
+     if( !app.IsBluetoothEnabled() ) app.SetBluetoothEnabled( true );
+
+//    puck = app.CreatePuckJS();
+    bngl = app.CreateBangleJS();
+    bngl.SetOnConnect(onConnect);       // Callback.
+    bngl.SetOnReceive(readResponse);    // Callback to capture console output from app.
+
+
+    if ( conf.btAddr == '' ) {
+        console.log('Scanning')
+        bngl.Scan("Bangle");
+    }
+    else {
+        console.log('Reconnecting to : '+conf.btAddr)
+        bngl.address = conf.btAddr
+        bngl.name = conf.btName
+        bngl.Connect(bngl.address);
+    }
+
+    app.SetDebugEnabled(false);
+
     setInterval(checkConnection,5000)   // Periodic check for data timeout and attempt a reconnect
 
     // Controls
@@ -198,7 +237,7 @@ function readResponse(data) {
 
     if (d.m == 5) { // Time
         val.SetTextSize(90)
-        val2.SetTextSize(10)
+        val2.SetTextSize(0)
 
         dt = new Date();
 
@@ -222,10 +261,16 @@ function setLED(canvas,on,colour) {
     canvas.Update()
 }
 
-function onConnect(name, address, bonded, rssi) {
-    addr = address
-    console.log( "Connected to " + address );
+function onConnect(name, address) {
+//    app.SetDebugEnabled(true)
+
+    if ( typeof(address) == 'string' ) conf.btAddr = address
+    if ( typeof(name) == 'string' ) conf.btName = name
+    app.SaveText( "settings", JSON.stringify( conf ))  // persist connection for future so no need to scan each time used.
+    
+    console.log( "Connected to : " + conf.btAddr );
     btn_OnStart() // Once connect tell app to start sending updates
+    app.SetDebugEnabled(false)
 }
 
 // Periodic check for data timeout and attempt a reconnect
@@ -233,30 +278,33 @@ function checkConnection() {
     if (isStopped) return
     if ( parseFloat(new Date().getTime() / 1000) - lastData > 30 ) {
 
-        console.log( "Reconnecting to : "+addr);
+        console.log( "Reconnecting to : "+conf.btAddr);
 
         // Flash orange 'led' indicator for connection attempts.
         setLED(led,true,"#FC8A00")
         setTimeout(function() {setLED(led,false,-1)}, 500)
-        puck.Connect(addr)
+        bngl.Connect(conf.btAddr)
     }
 }
 
 function btn_OnAbout() {
-    app.ShowPopup("GPS Adv Sports II\nAndroid Mirror : "+v+"\nBangle.js : "+curBangleVer,"Long")
+    app.ShowPopup(
+        "GPS Adv Sports II\nAndroid Mirror : "+v+
+        "\nBangle.js : "+curBangleVer+
+        "\nConnected : "+conf.btName,"Long")
 }
 
 function btn_OnStart() {
     btnStart.SetBackColor(btnOn)
     btnStop.SetBackColor(btnOff)
-    puck.SendCode('btOn(1)\n') // Enable the data send
+    bngl.SendCode('btOn(1)\n') // Enable the data send
     isStopped = false
 }
 
 function btn_OnStop() {
     btnStart.SetBackColor(btnOff)
     btnStop.SetBackColor(btnOn)
-    puck.SendCode('btOn(0)\n') // Disable the data send
+    bngl.SendCode('btOn(0)\n') // Disable the data send
     isStopped = true
     val.SetText('')
     val2.SetText('')
@@ -268,6 +316,5 @@ function btn_OnStop() {
 function btn_OnScan() {
     btnStart.SetBackColor(btnOff)
     btnStop.SetBackColor(btnOff)
-    puck.Scan("Bangle");
+    bngl.Scan("Bangle");
 }
-
diff --git a/apps/speedalt2/app.js b/apps/speedalt2/app.js
index cf414296e..73fa3bacb 100644
--- a/apps/speedalt2/app.js
+++ b/apps/speedalt2/app.js
@@ -6,8 +6,8 @@ Mike Bennett mike[at]kereru.com
 1.34 : Add bluetooth data stream for Droidscript
 1.43 : Keep GPS in SuperE mode while using Droiscript screen mirroring
 */
-var v = '1.46';
-var vDroid = '1.46';    // Required DroidScript program version
+var v = '1.49';
+var vDroid = '1.50';    // Required DroidScript program version
 
 /*kalmanjs, Wouter Bulten, MIT, https://github.com/wouterbulten/kalmanjs */
 var KalmanFilter = (function () {
@@ -175,15 +175,17 @@ var KalmanFilter = (function () {
 
 var buf = Graphics.createArrayBuffer(240,160,2,{msb:true});
 
+
 let LED = // LED as minimal and only definition (as instance / singleton)
 { isOn: false // status on / off, not needed if you don't need to ask for it
 , set: function(v) { // turn on w/ no arg or truey, else off
-   g.setColor((this.isOn=(v===undefined||!!v))?1:0,0,0).fillCircle(40,10,10); }
+   g.setColor((this.isOn=(v===undefined||!!v))?1:0,0,0).fillCircle(120,10,10); }
 , reset: function() { this.set(false); } // turn off
 , write: function(v) { this.set(v); }  // turn on w/ no arg or truey, else off
 , toggle: function() { this.set( ! this.isOn); } // toggle the LED
 }, LED1 = LED; // LED1 as 'synonym' for LED 
 
+
 var lf = {fix:0,satellites:0};
 var showMax = 0;        // 1 = display the max values. 0 = display the cur fix
 var pwrSav = 1;         // 1 = default power saving with watch screen off and GPS to PMOO mode. 0 = screen kept on.
@@ -645,7 +647,7 @@ function btSend(dat) {
   var dur = getTime() - btLast;
   if ( dur < 1.0 ) return;                  // Don't need to transmit more than every 1.0 secs.
   btLast = getTime();
-  console.log(JSON.stringify(dat));         // transmit the data
+  Bluetooth.println(JSON.stringify(dat));         // transmit the data
 }
 
 // == Events
diff --git a/apps/speedalt2/metadata.json b/apps/speedalt2/metadata.json
index bb3fefb35..4ace46854 100644
--- a/apps/speedalt2/metadata.json
+++ b/apps/speedalt2/metadata.json
@@ -2,7 +2,7 @@
   "id": "speedalt2",
   "name": "GPS Adventure Sports II",
   "shortName":"GPS Adv Sport II",
-  "version":"1.46",
+  "version":"1.49",
   "description": "GPS speed, altitude and distance to waypoint display. Designed for easy viewing and use during outdoor activities such as para-gliding, hang-gliding, sailing, cycling etc.",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/stepo/README.md b/apps/stepo/README.md
index d26f656b7..d3eae7c41 100644
--- a/apps/stepo/README.md
+++ b/apps/stepo/README.md
@@ -34,3 +34,7 @@ clothing catches it.
   is 160*160 and is larger than required. The reason for this is that
   I plan to use this watch face with others in a multiclock format
   and want to be able to reuse the arrayBuffer with other clocks.
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/tapelauncher/README.md b/apps/tapelauncher/README.md
index 2296dc357..899f15654 100644
--- a/apps/tapelauncher/README.md
+++ b/apps/tapelauncher/README.md
@@ -15,3 +15,8 @@ Reminiscent of a Telegram or Turing machine tape.
 **Swipe Left** -  move forward to the next app icon
 
 **Swipe Right** - move backwards (to the left) to the previous app
+
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/vectorclock/ChangeLog b/apps/vectorclock/ChangeLog
index cf746a20d..abbfcbb99 100644
--- a/apps/vectorclock/ChangeLog
+++ b/apps/vectorclock/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Adds costumizable colours and the respective settings menu
 0.05: "Chime the time" (buzz or beep) with up/down swipe added
 0.06: Redraw widgets when time is updated
+0.07: Fix problem with "Bangle.CLOCK": github.com/espruino/BangleApps/issues/1437
diff --git a/apps/vectorclock/app.js b/apps/vectorclock/app.js
index a10fc7038..8d2961c4a 100644
--- a/apps/vectorclock/app.js
+++ b/apps/vectorclock/app.js
@@ -162,8 +162,6 @@ if ("buzz"==chimetype || "beep"==chimetype)
 
 g.clear();
 tick();
+Bangle.setUI("clock"); // Show launcher when middle button is pressed
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
diff --git a/apps/vectorclock/metadata.json b/apps/vectorclock/metadata.json
index 50e2de807..0f558e3ee 100644
--- a/apps/vectorclock/metadata.json
+++ b/apps/vectorclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "vectorclock",
   "name": "Vector Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A digital clock that uses the built-in vector font.",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/walkersclock/README.md b/apps/walkersclock/README.md
index 7ff45a06a..e99b2e610 100644
--- a/apps/walkersclock/README.md
+++ b/apps/walkersclock/README.md
@@ -59,3 +59,8 @@ on the second line of the watch.
 ## Future Enhancements
 * Ability to turn on the heart rate monitor and display the rate on the info line
 * Maybe a simple stopwatch capability
+
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/waypointer/README.md b/apps/waypointer/README.md
index 3f0f529b8..e98fdbb7e 100644
--- a/apps/waypointer/README.md
+++ b/apps/waypointer/README.md
@@ -174,3 +174,7 @@ The majority of the code in this application is a merge of
 [jeffmer's](https://github.com/jeffmer/JeffsBangleAppsDev) GPS
 Navigation and Compass Navigation Applications.
 
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/widcal/ChangeLog b/apps/widcal/ChangeLog
new file mode 100644
index 000000000..a4bc24d1a
--- /dev/null
+++ b/apps/widcal/ChangeLog
@@ -0,0 +1 @@
+0.01: First version
\ No newline at end of file
diff --git a/apps/widcal/metadata.json b/apps/widcal/metadata.json
new file mode 100644
index 000000000..74ab6d488
--- /dev/null
+++ b/apps/widcal/metadata.json
@@ -0,0 +1,13 @@
+{
+  "id": "widcal",
+  "name": "Calendar Widget",
+  "version": "0.01",
+  "description": "Widget with the current date",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget,calendar",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widcal.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widcal/widget.js b/apps/widcal/widget.js
new file mode 100644
index 000000000..4214d280a
--- /dev/null
+++ b/apps/widcal/widget.js
@@ -0,0 +1,30 @@
+(function() {
+  WIDGETS["cal"] = {
+    area: "tl", width: 22, draw: function() {
+      const x = this.x, y = this.y,
+        x2 = x+21, y2 = y+23,
+        date = new Date(),
+        month = require("locale").month(date, true),
+        day = date.getDate();
+
+      g.reset().setFontAlign(0, 0) // center all text
+        // header
+        .setBgColor("#f00").setColor("#fff")
+        .clearRect(x, y, x2, y+8).setFont("4x6").drawString(month, (x+x2)/2+1, y+5)
+        // date
+        .setBgColor("#fff").setColor("#000")
+        .clearRect(x, y+9, x2, y2).setFont("Vector:16").drawString(day, (x+x2)/2+2, y+17);
+      if (!g.theme.dark) {
+        // black border around date for light themes
+        g.setColor("#000").drawPoly([
+          x, y+9,
+          x, y2,
+          x2, y2,
+          x2, y+9
+        ]);
+      }
+      // redraw when date changes
+      setTimeout(()=>WIDGETS["cal"].draw(), (86401 - Math.floor(date/1000) % 86400)*1000);
+    }
+  };
+})();
diff --git a/apps/widcal/widget.png b/apps/widcal/widget.png
new file mode 100644
index 000000000..254382eb8
Binary files /dev/null and b/apps/widcal/widget.png differ
diff --git a/apps/widcom/README.md b/apps/widcom/README.md
index 1e45d9090..5043dadea 100644
--- a/apps/widcom/README.md
+++ b/apps/widcom/README.md
@@ -9,3 +9,8 @@ aware.
 - Uses Bangle.isCompassOn(), requires firmware v2.08.167 or later
 - Shows in grey when the compass is off
 - Shows in amber when the compass is on
+
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/widgps/ChangeLog b/apps/widgps/ChangeLog
index 57bb53bb7..3d47b8a0c 100644
--- a/apps/widgps/ChangeLog
+++ b/apps/widgps/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First version
 0.02: Don't break if running on 2v08 firmware (just don't display anything)
 0.03: Fix positioning
+0.04: Show GPS fix status
diff --git a/apps/widgps/README.md b/apps/widgps/README.md
index 372747486..37e088bcf 100644
--- a/apps/widgps/README.md
+++ b/apps/widgps/README.md
@@ -1,10 +1,17 @@
 # GPS Power Status Widget
 
-A simple widget that shows the on/off status of the GPS.
+A simple widget that shows the on/off and fix status of the GPS.
 
 The GPS can quickly run the battery down if it is on all the time so
 it is useful to know if it has been switched on or not.
 
 - Uses Bangle.isGPSOn()
 - Shows in grey when the GPS is off
-- Shows in amber when the GPS is on
+- Shows in amber when the GPS is on but has no fix
+- Shows in green when the GPS is on and has a fix
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
+
+Extended by Marco ([myxor](https://github.com/myxor))
diff --git a/apps/widgps/metadata.json b/apps/widgps/metadata.json
index 87790a895..2f59aa82a 100644
--- a/apps/widgps/metadata.json
+++ b/apps/widgps/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "widgps",
   "name": "GPS Widget",
-  "version": "0.03",
-  "description": "Tiny widget to show the power on/off status of the GPS",
+  "version": "0.04",
+  "description": "Tiny widget to show the power and fix status of the GPS",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,gps",
diff --git a/apps/widgps/widget.js b/apps/widgps/widget.js
index 6ef55e27b..25df2178a 100644
--- a/apps/widgps/widget.js
+++ b/apps/widgps/widget.js
@@ -4,7 +4,12 @@
   function draw() {
     g.reset();
     if (Bangle.isGPSOn()) {
-      g.setColor("#FD0");     // on = amber
+      const gpsObject = Bangle.getGPSFix();
+      if (gpsObject && gpsObject.fix > 0) {
+        g.setColor("#0F0"); // on and has fix = green
+      } else {
+        g.setColor("#FD0"); // on but no fix = amber
+      }
     } else {
       g.setColor("#888"); // off = grey
     }
@@ -15,7 +20,7 @@
   Bangle.on('lcdPower', function(on) {
     if (on) {
       WIDGETS.gps.draw();
-      if (!timerInterval) timerInterval = setInterval(()=>WIDGETS["gps"].draw(), 2000);
+      if (!timerInterval) timerInterval = setInterval(()=>WIDGETS.gps.draw(), 2000);
     } else {
       if (timerInterval) {
         clearInterval(timerInterval);
diff --git a/apps/widhrt/README.md b/apps/widhrt/README.md
index db16d3d35..dc1bb4388 100644
--- a/apps/widhrt/README.md
+++ b/apps/widhrt/README.md
@@ -6,3 +6,7 @@ Monitor.
 - Uses Bangle.isHRTOn(). Requires firmware v2.08.167 or later.
 - Shows in grey when the HRT is off
 - Shows in red when the HRT is on
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support
+and discussion please post in the [Bangle JS
+Forum](http://forum.espruino.com/microcosms/1424/)
diff --git a/apps/widmp/ChangeLog b/apps/widmp/ChangeLog
index 3996d9e74..02658296a 100644
--- a/apps/widmp/ChangeLog
+++ b/apps/widmp/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Fix position and overdraw bugs
-      Better memory usage, theme support
+0.03: Better memory usage, theme support
+0.04: Replace the 8 phases by a more exact drawing, see forum.espruino.com/conversations/371985
diff --git a/apps/widmp/metadata.json b/apps/widmp/metadata.json
index 9c7506a09..94f05a426 100644
--- a/apps/widmp/metadata.json
+++ b/apps/widmp/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "widmp",
   "name": "Moon Phase Widget",
-  "version": "0.02",
-  "description": "Display the current moon phase in blueish for the northern hemisphere in eight phases",
+  "version": "0.04",
+  "description": "Display the current moon phase in blueish for both hemispheres. In the southern hemisphere the 'My Location' app is needed.",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,tools",
diff --git a/apps/widmp/widget.js b/apps/widmp/widget.js
index d8abc3a9c..6da572aab 100644
--- a/apps/widmp/widget.js
+++ b/apps/widmp/widget.js
@@ -1,26 +1,63 @@
 WIDGETS["widmoon"] = { area: "tr", width: 24, draw: function() {
-  const MC = 29.5305882, NM = 694039.09; 
-  var r = 11, mx = this.x + 12; my = this.y + 12;
+  const CenterX = this.x + 12, CenterY = this.y + 12, Radius = 11;
+  var southernHemisphere = false; // when in southern hemisphere, use the "My Location" App
 
-  function moonPhase(d) {
-    var tmp, month = d.getMonth(), year = d.getFullYear(), day = d.getDate();
+  const simulate = false; // simulate one month in one minute
+  const updateR = 1000; // update every x ms in simulation
+
+  function moonPhase() {
+    const d = Date();
+    var month = d.getMonth(), year = d.getFullYear(), day = d.getDate();
+    if (simulate) day = d.getSeconds() / 2 +1;
     if (month < 3) {year--; month += 12;}
-    tmp = ((365.25 * year + 30.6 * ++month + day - NM) / MC);
-    return Math.round(((tmp - (tmp | 0)) * 7)+1);
+    mproz = ((365.25 * year + 30.6 * ++month + day - 694039.09) /  29.5305882);
+    mproz = mproz - (mproz | 0);  // strip integral digits, result is between 0 and <1
+    if (simulate) console.log(mproz + "  " + day);
+    return (mproz);
   }
 
-  const BLACK = g.theme.bg, MOON = 0x41f;
-  var moon = {
-    0: () => { g.reset().setColor(BLACK).fillRect(mx - r, my - r, mx + r, my + r);},
-    1: () => { moon[0](); g.setColor(MOON).drawCircle(mx, my, r);},
-    2: () => { moon[3](); g.setColor(BLACK).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
-    3: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r).setColor(BLACK).fillRect(mx - r, my - r, mx, my + r);},
-    4: () => { moon[3](); g.setColor(MOON).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
-    5: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r);},
-    6: () => { moon[7](); g.setColor(MOON).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
-    7: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r).setColor(BLACK).fillRect(mx, my - r, mx + r, my + r);},
-    8: () => { moon[7](); g.setColor(BLACK).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);}
-  };
-  moon[moonPhase(Date())]();
-} };
+  function loadLocation() {
+    // "mylocation.json" is created by the "My Location" app
+    location = require("Storage").readJSON("mylocation.json",1)||{"lat":50.1236,"lon":8.6553,"location":"Frankfurt"};
+    if (location.lat < 0) southernHemisphere = true;
+  }
 
+  // code source: github.com/rozek/banglejs-2-activities/blob/main/README.md#drawmoonphase
+  function drawMoonPhase (CenterX,CenterY, Radius, leftFactor,rightFactor) {
+    let x = Radius, y = 0, Error = Radius;
+    g.drawLine(CenterX-leftFactor*x,CenterY, CenterX+rightFactor*x,CenterY);
+    let dx,dy;
+    while (y <= x) {
+      dy = 1 + 2*y; y++; Error -= dy;
+      if (Error < 0) {
+        dx = 1 - 2*x; x--; Error -= dx;
+      }
+      g.drawLine(CenterX-leftFactor*x,CenterY-y, CenterX+rightFactor*x,CenterY-y);
+      g.drawLine(CenterX-leftFactor*x,CenterY+y, CenterX+rightFactor*x,CenterY+y);
+      g.drawLine(CenterX-leftFactor*y,CenterY-x, CenterX+rightFactor*y,CenterY-x);
+      g.drawLine(CenterX-leftFactor*y,CenterY+x, CenterX+rightFactor*y,CenterY+x);
+    }
+  }
+
+  function updateWidget() {
+    g.reset().setColor(g.theme.bg);
+    g.fillRect(CenterX - Radius, CenterY - Radius, CenterX + Radius, CenterY + Radius);
+    g.setColor(0x41f);
+
+    mproz = moonPhase(); // mproz = 0..<1
+
+    leftFactor = mproz * 4 - 1;
+    rightFactor = (1 - mproz) * 4 - 1;
+    if (mproz >= 0.5) leftFactor = 1; else rightFactor = 1;
+    if (true == southernHemisphere) {
+      var tmp=leftFactor; leftFactor=rightFactor; rightFactor=tmp;
+    }
+
+    drawMoonPhase(CenterX,CenterY, Radius, leftFactor,rightFactor);
+
+    if (simulate) setTimeout(updateWidget, updateR);
+  }
+
+  loadLocation();
+  updateWidget();
+} };
diff --git a/apps/wpmoto/README.md b/apps/wpmoto/README.md
index 96c72ff55..42afa12b9 100644
--- a/apps/wpmoto/README.md
+++ b/apps/wpmoto/README.md
@@ -52,7 +52,8 @@ where "*n*" is the next unused number.
 
 Select a waypoint using the menu. Once the waypoint is selected and you're
 back on the main screen, press either the top or bottom button (`BTN1` or
-`BTN3`). Confirm that you want to delete the waypoint with the middle
+`BTN3`), or, on Bangle.js 2, scroll the screen up or down.
+Confirm that you want to delete the waypoint with the middle
 button (`BTN2`).
 
 ## Waypoint editor
@@ -68,27 +69,43 @@ This will load up the waypoint editor:
 
 ### Add a waypoint
 
-Use the map to find your destination. Clicking on the map will
-populate the latitude/longitude input boxes with the coordinates
-of the point you clicked on. Type in a name for the waypoint and
-click "Add Waypoint". Click "Upload" to send the updated list of
-waypoints to the watch.
+Click on the map to add a waypoint. You'll be prompted to give it
+a name.
 
 ### Edit a waypoint
 
-Click on the pencil icon next to the waypoint you wish to edit.
-This will remove the waypoint from the list and populate the
-input boxes.
-Edit the coordinates by hand, or by clicking on the map. Edit
-the name if you want. Click "Add Waypoint" to save the waypoint
-back to the list. Click "Upload" to send the updated list of
-waypoints to the watch.
+Click on the map marker of the waypoint you wish to edit. You
+can then click on the blue pencil icon to edit the name of the
+waypoint. If you want to move the waypoint to a new location then
+you need to delete it and re-add it.
 
 ### Delete a waypoint
 
-Click on the pencil icon next to the waypoint you wish to edit.
-This will remove the waypoint from the list.
-Click "Upload" to send the updated list of waypoints to the watch.
+Click on the map marker of the waypoint you wish to delete. You
+can then click on the red bin icon to delete the waypoint.
+
+### Add a route
+
+![](newroute.png)
+
+Click on the map to place the first waypoint. The name of the first
+waypoint will become the name of the route.
+
+Click on the map marker for the new waypoint and click "Make route".
+Now every time you click on the map it will add another point
+on this route. When you're done either right click or click the
+"Close route" button above the map.
+
+Points along the route don't have names by default, but if you wish
+to add one you can click on the waypoint and use the blue pencil icon
+to give it a name.
+
+![](editroute.png)
+
+### Delete a route
+
+Click on the map marker for any point on the route, and select
+"Delete entire route".
 
 ## Mounting the watch on the bike
 
@@ -123,6 +140,7 @@ Compared to the original Way Pointer app, Waypointer Moto:
  * can add new waypoints from inside the app without requiring a blank slot
  * can delete waypoints from inside the app without needing the PC
  * still uses the same `waypoints.json` file
+ * supports "routes" which automatically step from one waypoint to the next
 
 ## Gotchas
 
@@ -144,8 +162,6 @@ turns white again.
 
 ## Possible Future Enhancements
 
- - "routes" with multiple waypoints; automatically step from one
-   waypoint to the next when you get near to it
  - some way to manually input coordinates directly on the watch
  - make the text & arrow more legible in direct sunlight
  - integrate a charging connector into the handlebar mount
diff --git a/apps/wpmoto/app.js b/apps/wpmoto/app.js
index 8a0e86ef6..7deacb6ca 100644
--- a/apps/wpmoto/app.js
+++ b/apps/wpmoto/app.js
@@ -1,10 +1,15 @@
 var loc = require("locale");
 
-var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"NONE"}];
+var waypoints = require("Storage").readJSON("waypoints.json") || [];
 var wp = waypoints[0];
+if (wp == undefined) wp = {name:"NONE"};
 var wp_bearing = 0;
+var routeidx = 0;
 var candraw = true;
 
+const ROUTE_STEP = 50; // metres
+const EPSILON = 1; // degrees
+
 var direction = 0;
 var dist = 0;
 
@@ -15,138 +20,130 @@ var previous = {
   wp_name: '',
   course: 180,
   selected: false,
+  routeidx: -1,
 };
 
 /*** Drawing ***/
 
-var pal_by = new Uint16Array([0x0000,0xFFC0],0,1); // black, yellow
-var pal_bw = new Uint16Array([0x0000,0xffff],0,1);  // black, white
-var pal_bb = new Uint16Array([0x0000,0x07ff],0,1); // black, blue
-var pal_br = new Uint16Array([0x0000,0xf800],0,1); // black, red
-var pal_compass = pal_by;
+var W = g.getWidth();
+var H = g.getHeight();
+// layout (XXX: this should probably use the Layout library instead)
+var L = { // banglejs1
+  arrow: {
+    x: 120,
+    y: 80,
+    r1: 79,
+    r2: 69,
+    bufh: 160,
+    bufy: 40,
+  },
+  text: {
+    bufh: 40,
+    bufy: 200,
+    largesize: 40,
+    smallsize: 15,
+    waypointy: 20,
+  },
+};
+if (W == 176) {
+  L = { // banglejs2
+    arrow: {
+      x: 88,
+      y: 70,
+      r1: 70,
+      r2: 62,
+      bufh: 160,
+      bufy: 0,
+    },
+    text: {
+      bufh: 40,
+      bufy: 142,
+      largesize: 40,
+      smallsize: 14,
+      waypointy: 20,
+    },
+  };
+}
 
-var buf = Graphics.createArrayBuffer(160,160,1, {msb:true});
+var pal_by = new Uint16Array([0x0000,0xffc0],0,1); // black, yellow
+var pal_bw = new Uint16Array([0x0000,0xffff],0,1); // black, white
+var pal_br = new Uint16Array([0x0000,0xf800],0,1); // black, red
+
+var buf = Graphics.createArrayBuffer(240,160, 1, {msb:true});
 var arrow_img = require("heatshrink").decompress(atob("vF4wJC/AEMYBxs8Bxt+Bxv/BpkB/+ABxcD//ABxcH//gBxcP//wBxcf//4Bxc///8Bxd///+OxgABOxgABPBR2BAAJ4KOwIABPBR2BAAJ4KOwIABPBR2BAAJ4KOwIABPBQNCPBR2DPBR2DPBR2DPBR2DPBR2DPBR2DPBR2DPBQNEPBB2FPBB2FPBB2FPBB2FPBB2FPBB2FPBB2FPBANGPAx2HPAx2HPAx2HPAx2HPAx2HPAx2HeJTeJB34O/B34O/B34O/B34O/B34O/B34O/B34O/B34OTAH4AT"));
 
-function flip1(x,y,palette) {
-  g.drawImage({width:160,height:160,bpp:1,buffer:buf.buffer, palette:palette},x,y);
+function flip(y,h,palette) {
+  g.drawImage({width:240,height:h,bpp:1,buffer:buf.buffer, palette:palette},0,y);
   buf.clear();
 }
 
-function flip2_bw(x,y) {
-  g.drawImage({width:160,height:40,bpp:1,buffer:buf.buffer, palette:pal_bw},x,y);
-  buf.clear();
-}
-
-function flip2_bb(x,y) {
-  g.drawImage({width:160,height:40,bpp:1,buffer:buf.buffer, palette:pal_bb},x,y);
-  buf.clear();
-}
-
-function drawCompass(course) {
+function draw(force) {
   if (!candraw) return;
 
-  previous.course = course;
-
-  buf.setColor(1);
-  buf.fillCircle(80,80, 79);
-  buf.setColor(0);
-  buf.fillCircle(80,80, 69);
-  buf.setColor(1);
-  buf.drawImage(arrow_img, 80, 80, {rotate:radians(course)} );
-  var palette = pal_br;
-  if (savedfix !== undefined && savedfix.fix !== 0) palette = pal_compass;
-  flip1(40, 30, palette);
-}
-
-function drawN(force){
-  if (!candraw) return;
-
-  buf.setFont("Vector",24);
+  var course = direction;
   var dst = loc.distance(dist);
 
-  // distance on left
-  if (force || previous.dst !== dst) {
+  if (force || previous.dst !== dst || previous.wp_name !== wp.name || previous.routeidx !== routeidx || Math.abs(course-previous.course)>EPSILON) {
+    previous.course = course;
+
+    var palette = pal_br;
+    if (savedfix !== undefined && savedfix.fix !== 0)
+      palette = isNaN(savedfix.course) ? pal_by : pal_bw;
+
+    buf.setColor(1);
+    buf.fillCircle(L.arrow.x,L.arrow.y, L.arrow.r1);
+    buf.setColor(0);
+    buf.fillCircle(L.arrow.x,L.arrow.y, L.arrow.r2);
+    buf.setColor(1);
+    buf.drawImage(arrow_img, L.arrow.x, L.arrow.y, {rotate:radians(course)} );
+    flip(L.arrow.bufy,L.arrow.bufh,palette);
+
+    // distance on left
     previous.dst = dst;
+    previous.wp_name = wp.name;
+    previous.routeidx = routeidx;
+
     buf.setColor(1);
     buf.setFontAlign(-1, -1);
-    buf.setFont("Vector",40);
+    buf.setFont("Vector",L.text.largesize);
     buf.drawString(dst,0,0);
-    flip2_bw(8, 200);
-  }
 
-  // waypoint name on right
-  if (force || previous.wp_name !== wp.name) {
-    previous.wp_name = wp.name;
+    // waypoint name on right
     buf.setColor(1);
     buf.setFontAlign(1, -1);
-    buf.setFont("Vector", 15);
-    buf.drawString(wp.name, 80, 0);
-    flip2_bw(160, 220);
+    buf.setFont("Vector", L.text.smallsize);
+    buf.drawString(wp.name, W, L.text.waypointy);
+
+    // if this is a route, draw the step name above the route name
+    if (wp.route) {
+      buf.drawString((wp.route[routeidx].name||'') + " " + (routeidx+1) + "/" + wp.route.length, W, 0);
+    }
+
+    flip(L.text.bufy,L.text.bufh,pal_bw);
   }
 }
 
-function drawAll(force) {
-  if (!candraw) return;
-
-  g.setColor(1,1,1);
-  drawN(force);
-  drawCompass(direction);
-}
-
 /*** Heading ***/
 
 var heading = 0;
-function newHeading(m,h){
-    var s = Math.abs(m - h);
-    var delta = (m>h)?1:-1;
-    if (s>=180){s=360-s; delta = -delta;}
-    if (s<2) return h;
-    var hd = h + delta*(1 + Math.round(s/5));
-    if (hd<0) hd+=360;
-    if (hd>360)hd-= 360;
-    return hd;
-}
-
-var CALIBDATA = require("Storage").readJSON("magnav.json",1)||null;
-
-function tiltfixread(O,S){
-  var start = Date.now();
-  var m = Bangle.getCompass();
-  var g = Bangle.getAccel();
-  m.dx =(m.x-O.x)*S.x; m.dy=(m.y-O.y)*S.y; m.dz=(m.z-O.z)*S.z;
-  var d = Math.atan2(-m.dx,m.dy)*180/Math.PI;
-  if (d<0) d+=360;
-  var phi = Math.atan(-g.x/-g.z);
-  var cosphi = Math.cos(phi), sinphi = Math.sin(phi);
-  var theta = Math.atan(-g.y/(-g.x*sinphi-g.z*cosphi));
-  var costheta = Math.cos(theta), sintheta = Math.sin(theta);
-  var xh = m.dy*costheta + m.dx*sinphi*sintheta + m.dz*cosphi*sintheta;
-  var yh = m.dz*sinphi - m.dx*cosphi;
-  var psi = Math.atan2(yh,xh)*180/Math.PI;
-  if (psi<0) psi+=360;
-  return psi;
-}
-
 function read_heading() {
-  if (savedfix !== undefined && !isNaN(savedfix.course)) {
+  if (savedfix !== undefined && savedfix.satellites > 0 && !isNaN(savedfix.course)) {
     Bangle.setCompassPower(0);
     heading = savedfix.course;
-    pal_compass = pal_bw;
   } else {
-    var d = tiltfixread(CALIBDATA.offset,CALIBDATA.scale);
     Bangle.setCompassPower(1);
-    heading = newHeading(d,heading);
-    pal_compass = pal_by;
+    var d = 0;
+    var m = Bangle.getCompass();
+    if (!isNaN(m.heading)) d = -m.heading;
+    heading = d;
   }
 
   direction = wp_bearing - heading;
   if (direction < 0) direction += 360;
   if (direction > 360) direction -= 360;
-  drawCompass(direction);
+  draw();
 }
 
-
 /*** Maths ***/
 
 function radians(a) {
@@ -218,23 +215,39 @@ function onGPS(fix) {
   savedfix = fix;
 
   if (fix !== undefined && fix.fix == 1){
-    dist = distance(fix, wp);
+    if (wp.route) {
+      while (true) {
+        dist = distance(fix, wp.route[routeidx]);
+        // step to next point if we're within ROUTE_STEP metres
+        if (!isNaN(dist) && dist < ROUTE_STEP && routeidx < wp.route.length-1)
+          routeidx++;
+        else
+          break;
+      }
+    } else {
+      dist = distance(fix, wp);
+    }
     if (isNaN(dist)) dist = 0;
-    wp_bearing = bearing(fix, wp);
+
+    if (wp.route) {
+      wp_bearing = bearing(fix, wp.route[routeidx]);
+    } else {
+      wp_bearing = bearing(fix, wp);
+    }
     if (isNaN(wp_bearing)) wp_bearing = 0;
-    drawN();
+    draw();
   }
 }
 
 function startTimers() {
   setInterval(function() {
-    Bangle.setLCDPower(1);
+    if (W==240) Bangle.setLCDPower(1); // keep banglejs1 display on
     read_heading();
-  }, 500);
+  }, 250);
 }
 
 function addWaypointToMenu(menu, i) {
-  menu[waypoints[i].name] = function() {
+  menu[waypoints[i].name + (waypoints[i].route ? " (R)" : "")] = function() {
     wp = waypoints[i];
     mainScreen();
   };
@@ -243,7 +256,9 @@ function addWaypointToMenu(menu, i) {
 function mainScreen() {
   E.showMenu();
   candraw = true;
-  drawAll(true);
+  g.setColor(0,0,0);
+  g.fillRect(0,0,W,H);
+  draw(true);
 
   Bangle.setUI("updown", function(v) {
     if (v === undefined) {
@@ -262,11 +277,13 @@ function mainScreen() {
       E.showMenu(menu);
     } else {
       candraw = false;
-      E.showPrompt("Delete waypoint: " + wp.name + "?").then(function(confirmed) {
+      var thing = wp.route ? "route" : "waypoint";
+      E.showPrompt("Delete " + thing + ": " + wp.name + "?").then(function(confirmed) {
         var name = wp.name;
         if (confirmed) {
+          var thing = wp.route ? "Route" : "Waypoint";
           deleteWaypoint(wp);
-          E.showAlert("Waypoint deleted: " + name).then(mainScreen);
+          E.showAlert(thing + " deleted: " + name).then(mainScreen);
         } else {
           mainScreen();
         }
@@ -281,7 +298,6 @@ Bangle.on('kill',()=>{
 });
 
 g.clear();
-Bangle.setLCDBrightness(1);
 Bangle.setGPSPower(1);
 startTimers();
 Bangle.on('GPS', onGPS);
diff --git a/apps/wpmoto/editor.png b/apps/wpmoto/editor.png
index 0d2f9841b..b8983d3ab 100644
Binary files a/apps/wpmoto/editor.png and b/apps/wpmoto/editor.png differ
diff --git a/apps/wpmoto/editroute.png b/apps/wpmoto/editroute.png
new file mode 100644
index 000000000..556dbfc8c
Binary files /dev/null and b/apps/wpmoto/editroute.png differ
diff --git a/apps/wpmoto/metadata.json b/apps/wpmoto/metadata.json
index 4e6c3497a..f562b23ba 100644
--- a/apps/wpmoto/metadata.json
+++ b/apps/wpmoto/metadata.json
@@ -2,11 +2,11 @@
   "id": "wpmoto",
   "name": "Waypointer Moto",
   "shortName": "Waypointer Moto",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Waypoint-based motorcycle navigation aid",
   "icon": "wpmoto.png",
   "tags": "tool,outdoors,gps",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot-menu.png"},{"url":"screenshot-delete.png"}],
   "readme": "README.md",
   "interface": "wpmoto.html",
diff --git a/apps/wpmoto/newroute.png b/apps/wpmoto/newroute.png
new file mode 100644
index 000000000..9f57cd11e
Binary files /dev/null and b/apps/wpmoto/newroute.png differ
diff --git a/apps/wpmoto/wpmoto.html b/apps/wpmoto/wpmoto.html
index 2fb7c9455..9966f51f6 100644
--- a/apps/wpmoto/wpmoto.html
+++ b/apps/wpmoto/wpmoto.html
@@ -1,198 +1,352 @@
-<html>
-  <head>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
     <link rel="stylesheet" href="../../css/spectre.min.css">
     <link rel="stylesheet" href="../../css/spectre-icons.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.12.0/css/ol.css" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/ol-geocoder@latest/dist/ol-geocoder.min.css" rel="stylesheet">
-  </head>
-  <body>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.css">
 
-    <h4>List of waypoints</h4>
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Lat.</th>
-          <th>Long.</th>
-          <th>Actions</th>
-        </tr>
-      </thead>
-      <tbody id="waypoints">
-        
-      </tbody>
-    </table>
-    <br>
-    <h4>Add a new waypoint</h4>
-    <form id="add_waypoint_form">
-      <div class="columns">
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" type="text" id="add_waypoint_name" placeholder="Name">
+    <style type="text/css">
+        html, body { height: 100% }
+        .flex-col { display:flex; flex-direction:column; height:100% }
+        #map { width:100%; height:100% }
+
+        /* https://stackoverflow.com/a/58686215 */
+        .arrow-icon {
+            width: 14px;
+            height: 14px;
+        }
+        .arrow-icon > div {
+            margin-left: -1px;
+            margin-top: -3px;
+            transform-origin: center center;
+            font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+        }
+    </style>
+</head>
+<body>
+    <div class="flex-col">
+        <div id="statusarea">
+            <button id="download" class="btn btn-error">Reload</button> <button id="upload" class="btn btn-primary">Upload</button>
+            <span id="status"></span>
+            <span id="routestatus"></span>
         </div>
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_latitude" placeholder="Lat">
+        <div style="flex: 1">
+            <div id="map"></div>
         </div>
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_longitude" placeholder="Long">
-        </div>
-      </div>
-      <div class="columns">
-        <div class="column col-3 col-xs-8">
-          <button id="add_waypoint_button" class="btn btn-primary btn-sm">Add Waypoint</button>
-        </div>
-      </div>
-    </form>
-    <br>
-    <button id="Download" class="btn btn-error">Reload</button> <button id="Upload" class="btn btn-primary">Upload</button>
-    <br>
-    <div id="map" class="map" style="width:100%; height:400px"></div>
-    
-    <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.12.0/build/ol.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/ol-geocoder"></script>
+    </div>
+
+    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.js"></script>
+    <script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
     <script src="../../core/lib/interface.js"></script>
 
     <script>
-      var map = new ol.Map({
-        target: 'map',
-        layers: [
-          new ol.layer.Tile({
-            source: new ol.source.OSM()
-          })
-        ],
-        view: new ol.View({
-          center: ol.proj.fromLonLat([37.41, 8.82]),
-          zoom: 4
-        })
-      });
+        var map;
+        var waypoints = [];
+        var mapmarkers = L.layerGroup();
+        var searchresult = L.layerGroup();
+        var dynamicarrow = L.layerGroup();
+        var editingroute = null;
+        var lastroutepoint;
 
-      var geocoder = new Geocoder('nominatim', {
-        provider: 'osm',
-        lang: 'en-GB',
-        placeholder: 'Search...',
-        targetType: 'text-input',
-      });
-      map.addControl(geocoder);
-      geocoder.on('addresschosen', function(e) {
-        map.getView().animate({
-            center: e.coordinate,
-            zoom: Math.max(map.getView().getZoom(),16)
+        /*** map ***/
+
+        map = L.map('map').setView([51.505, -0.09], 8);
+
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+            subdomains: ['a','b','c'],
+        }).addTo(map);
+
+        L.Control.geocoder({defaultMarkGeocode: false}).addTo(map).on('markgeocode', function(e) {
+            searchresult.clearLayers();
+            var bbox = e.geocode.bbox;
+            var poly = L.polygon([
+                bbox.getSouthEast(),
+                bbox.getNorthEast(),
+                bbox.getNorthWest(),
+                bbox.getSouthWest()
+            ], {fill:false}).addTo(searchresult);
+            map.addLayer(searchresult);
+            map.fitBounds(poly.getBounds());
         });
 
-        var lonlat = ol.proj.toLonLat(e.coordinate);
-        $longitude.value = lonlat[0];
-        $latitude.value = lonlat[1];
-      });
+        map.on('click', function(e) {
+            if (editingroute != null) {
+                searchresult.clearLayers();
+                addWaypoint(waypoints[editingroute].route, e.latlng.lat, e.latlng.lng, "");
+            } else {
+                swal({
+                    icon: 'info',
+                    text: "Enter a name for the waypoint:",
+                    buttons: true,
+                    content: 'input',
+                }).then((name) => {
+                    if (name != null && name != "") {
+                        searchresult.clearLayers();
+                        addWaypoint(waypoints, e.latlng.lat, e.latlng.lng, name);
+                    }
+                });
+            }
+        });
+        map.on('mousemove', function(e) {
+            if (editingroute == null) return;
+            let latlngs = [lastroutepoint, [e.latlng.lat, e.latlng.lng]];
+            dynamicarrow.clearLayers();
+            L.polyline(latlngs, { color:'black'}).addTo(dynamicarrow);
+            L.featureGroup(getArrows(latlngs, 'black', 2, map)).addTo(dynamicarrow)
+            map.addLayer(dynamicarrow);
+        });
+        clean();
+        renderAllWaypoints();
 
-      var waypoints = []
+        /*** status ***/
 
-      var $name = document.getElementById('add_waypoint_name')
-      var $form = document.getElementById('add_waypoint_form')
-      var $button = document.getElementById('add_waypoint_button')
-      var $latitude = document.getElementById('add_latitude')
-      var $longitude = document.getElementById('add_longitude')
-      var $list = document.getElementById('waypoints')
-
-      map.on('click', function(e) {
-        var lonlat = ol.proj.toLonLat(e.coordinate);
-        $longitude.value = lonlat[0];
-        $latitude.value = lonlat[1];
-      });
-
-      function compare(a, b){
-            var x = a.name.toLowerCase();
-            var y = b.name.toLowerCase();
-            if (x=="none") {return -1};
-            if (y=="none") {return 1};
-            if (x < y) {return -1;}
-            if (x > y) {return 1;}
-            return 0;
+        function clean() {
+            $('#status').html('<i class="icon icon-check"></i> No pending changes.');
+            routestatus();
         }
 
-      $button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-        var lat = parseFloat($latitude.value).toPrecision(8);
-        var lon = parseFloat($longitude.value).toPrecision(8);
+        function dirty() {
+            $('#status').html('<b><i class="icon icon-edit"></i> Changes have not been sent to the watch.</b>');
+            routestatus();
+        }
 
-        waypoints.push({
-          name, lat,lon,
-        });
-        
-        waypoints.sort(compare);
+        function routestatus() {
+            if (editingroute == null) {
+                $('#routestatus').html('');
+                dynamicarrow.clearLayers();
+            } else {
+                $('#routestatus').html('Editing route: ' + escapeHTML(waypoints[editingroute].name) + ' <button class="btn btn-sm btn-primary" onclick="closeRoute()">close route</button>');
+            }
+        }
 
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = (0).toPrecision(8);
-        $longitude.value = (0).toPrecision(8);
-      });
+        /*** waypoints ***/
 
-      function removeWaypoint(index){
-        $name.value = waypoints[index].name
-        if (waypoints[index].lat !== undefined && waypoints[index].lon !== undefined
-                && !isNaN(waypoints[index].lat) && !isNaN(waypoints[index].lon)) {
-            $latitude.value = waypoints[index].lat
-            $longitude.value = waypoints[index].lon
-            map.getView().animate({
-                center: ol.proj.fromLonLat([waypoints[index].lon, waypoints[index].lat]),
-                zoom: Math.max(map.getView().getZoom(),16)
+        function addWaypoint(arr, lat, lon, name) {
+            arr.push({lat:lat, lon:lon, name:name});
+            renderAllWaypoints();
+            dirty();
+        }
+
+        function deleteWaypoint(arr, i) {
+            arr.splice(i, 1);
+            if (editingroute != null) {
+                // XXX: ugly: fix editingroute index
+                if (editingroute == i) editingroute = null;
+                else if (editingroute > i) editingroute--;
+            }
+            renderAllWaypoints();
+            dirty();
+        }
+
+        function renameWaypoint(arr, i) {
+            var name = prompt("Enter new name for the waypoint:", arr[i].name);
+            if (name == null || name == "" || name == arr[i].name)
+                return;
+            arr[i].name = name;
+            renderAllWaypoints();
+            dirty();
+        }
+
+        function renderWaypoints(wps, isroute, parentidx) {
+            var latlngs = [];
+            for (var i = 0; i < wps.length; i++) {
+                if (wps[i].route) {
+                    renderWaypoints(wps[i].route, true, i);
+                    continue;
+                }
+                if (wps[i].lat == null || wps[i].lon == null)
+                    continue;
+
+                if (isroute) {
+                    L.marker([wps[i].lat, wps[i].lon], {title: wps[i].name})
+                        .bindPopup(`<h4><b>${wps[i].name}</b> <a class="btn btn-primary" href="javascript:renameWaypoint(waypoints[${parentidx}].route,${i})"><i class="icon icon-edit"></i></a> <a class="btn btn-error" href="javascript:deleteWaypoint(waypoints[${parentidx}].route, ${i})"><i class="icon icon-delete"></i></a></h4><button class="btn btn-sm btn-error" onclick="javascript:deleteEntireRoute(${parentidx})">Delete entire route</button>`)
+                        .addTo(mapmarkers);
+                    latlngs.push([wps[i].lat, wps[i].lon]);
+                    lastroutepoint = [wps[i].lat, wps[i].lon];
+                } else {
+                    L.marker([wps[i].lat, wps[i].lon], {title: wps[i].name})
+                        .bindPopup(`<h4><b>${wps[i].name}</b> <a class="btn btn-primary" href="javascript:renameWaypoint(waypoints,${i})"><i class="icon icon-edit"></i></a> <a class="btn btn-error" href="javascript:deleteWaypoint(waypoints, ${i})"><i class="icon icon-delete"></i></a></h4><button class="btn btn-sm btn-primary" onclick="javascript:makeRoute(${i})">Make route</button>`)
+                        .addTo(mapmarkers);
+                }
+            }
+            if (isroute) {
+                L.polyline(latlngs, { color:'black'}).addTo(mapmarkers);
+                L.featureGroup(getArrows(latlngs, 'black', 2, map)).addTo(mapmarkers)
+            }
+        }
+
+        function renderAllWaypoints() {
+            mapmarkers.clearLayers();
+            renderWaypoints(waypoints, false, 0);
+            map.addLayer(mapmarkers);
+        }
+
+        /*** routes ***/
+
+        function openRoute(i) {
+            editingroute = i;
+            console.log("edit route "+ i);
+            map.on('contextmenu', closeRoute);
+            renderAllWaypoints();
+        }
+
+        function makeRoute(i) {
+            waypoints[i].route = [{
+                name: waypoints[i].name,
+                lat: waypoints[i].lat,
+                lon: waypoints[i].lon,
+            }];
+            openRoute(i);
+            dirty();
+        }
+
+        function closeRoute() {
+            map.off('contextmenu', closeRoute);
+            editingroute = null;
+            renderAllWaypoints();
+            routestatus();
+        }
+
+        function deleteEntireRoute(i) {
+            swal({
+                icon: 'warning',
+                text: "Really delete entire route '" + waypoints[i].name + "'?",
+                buttons: true,
+            }).then((v) => {
+                console.log(v)
+                if (v) {
+                    deleteWaypoint(waypoints, i);
+                }
             });
         }
-        waypoints = waypoints.filter((p,i) => i!==index)
-        renderWaypoints()
-      }
 
-      function renderWaypoints(){
-        $list.innerHTML = ''
-        waypoints.forEach((waypoint,index) => {
-          var $waypoint = document.createElement('tr')  
-          if (index==0){
-              $waypoint.innerHTML = `<td>${waypoint.name}</td>`
-          } else if(waypoint.lat==undefined){
-          $waypoint.innerHTML = `<td>${waypoint.name}</td><td>------</td><td>-----</td><td><button class="btn btn-action btn-primary" onclick="removeWaypoint(${index})"><i class="icon icon-edit"></i></button></td>`
-          } else {
-          $waypoint.innerHTML = `<td>${waypoint.name}</td><td>${waypoint.lat}</td><td>${waypoint.lon}</td><td><button class="btn btn-action btn-primary" onclick="removeWaypoint(${index})"><i class="icon icon-edit"></i></button></td>`
-          }
-          $list.appendChild($waypoint)
-        })
-        $name.focus()    
-      }
+        /*** util ***/
 
-      function downloadJSONfile(fileid, callback) {
-        Puck.write(`\x10(function() {
-          var pts = require("Storage").readJSON("${fileid}")||[{name:"NONE"}];
-          Bluetooth.print(JSON.stringify(pts));
-         })()\n`,contents=>{
-              var storedpts = JSON.parse(contents);
-              callback(storedpts);
+        // https://stackoverflow.com/a/22706073
+        function escapeHTML(str){
+            return new Option(str).innerHTML;
+        }
+
+        /*** Bangle.js ***/
+
+        function downloadJSONfile(fileid, callback) {
+            Puck.write(`\x10(function() {
+                var pts = require("Storage").readJSON("${fileid}")||[{name:"NONE"}];
+                Bluetooth.print(JSON.stringify(pts));
+            })()\n`, contents => {
+                var storedpts = JSON.parse(contents);
+                callback(storedpts);
+                clean();
+            });
+        }
+
+        function uploadFile(fileid, contents) {
+            Puck.write(`\x10(function() {
+                require("Storage").write("${fileid}",'${contents}');
+                Bluetooth.print("OK");
+            })()\n`, ret => {
+                console.log("uploadFile", ret);
+                if (ret == "OK")
+                    clean();
+            });
+        }
+
+        function gotStored(pts) {
+            waypoints = pts;
+
+            var latlngs = waypoints.map(p => [p.lat, p.lon]);
+            var poly = L.polygon(latlngs);
+            map.fitBounds(poly.getBounds());
+
+            renderAllWaypoints();
+        }
+
+        function onInit() {
+            downloadJSONfile("waypoints.json", gotStored);
+        }
+
+        $('#download').on('click', function() {
+            downloadJSONfile("waypoints.json", gotStored);
         });
-      }
 
-      function uploadFile(fileid, contents) {      
-        Puck.write(`\x10(function() {
-          require("Storage").write("${fileid}",'${contents}');
-          Bluetooth.print("OK");
-         })()\n`,ret=>{
-            console.log("uploadFile",ret);
+        $('#upload').click(function() {
+            var data =  JSON.stringify(waypoints);
+            uploadFile("waypoints.json",data);
         });
-      }
 
-      function gotStored(pts){
-          waypoints = pts;
-          renderWaypoints();
-      }
+        $('#statusarea').click(closeRoute);
 
-      function onInit() {
-         downloadJSONfile("waypoints.json", gotStored);
-      }
+        /*** map arrows ***/
+        // https://stackoverflow.com/a/58686215
+        function getArrows(arrLatlngs, color, arrowCount, mapObj) {
+            if (typeof arrLatlngs === undefined || arrLatlngs == null ||
+        (!arrLatlngs.length) || arrLatlngs.length < 2)
+            return [];
 
-      document.getElementById("Download").addEventListener("click", function() {
-        downloadJSONfile("waypoints.json", gotStored);
-      });
+            if (typeof arrowCount === 'undefined' || arrowCount == null)
+                arrowCount = 1;
 
-      document.getElementById("Upload").addEventListener("click", function() {
-        var data =  JSON.stringify(waypoints);
-        uploadFile("waypoints.json",data); 
-      });
+            if (typeof color === 'undefined' || color == null)
+                color = '';
+            else
+                color = 'color:' + color;
+
+            var result = [];
+            for (var i = 1; i < arrLatlngs.length; i++) {
+                var icon = L.divIcon({ className: 'arrow-icon', bgPos: [5, 5], html: '<div style="' + color + ';transform: rotate(' + getAngle(arrLatlngs[i - 1], arrLatlngs[i], -1).toString() + 'deg)">▶</div>' });
+                for (var c = 1; c <= arrowCount; c++) {
+                    result.push(L.marker(myMidPoint(arrLatlngs[i], arrLatlngs[i - 1], (c / (arrowCount + 1)), mapObj), { icon: icon }));
+                }
+            }
+            return result;
+        }
+
+        function getAngle(latLng1, latlng2, coef) {
+            var dy = latlng2[0] - latLng1[0];
+            var dx = Math.cos(Math.PI / 180 * latLng1[0]) * (latlng2[1] - latLng1[1]);
+            var ang = ((Math.atan2(dy, dx) / Math.PI) * 180 * coef);
+            return (ang).toFixed(2);
+        }
+
+        function myMidPoint(latlng1, latlng2, per, mapObj) {
+            if (!mapObj)
+                throw new Error('map is not defined');
+
+            var halfDist, segDist, dist, p1, p2, ratio,
+                points = [];
+
+            p1 = mapObj.project(new L.latLng(latlng1));
+            p2 = mapObj.project(new L.latLng(latlng2));
+
+            halfDist = distanceTo(p1, p2) * per;
+
+            if (halfDist === 0)
+                return mapObj.unproject(p1);
+
+            dist = distanceTo(p1, p2);
+
+            if (dist > halfDist) {
+                ratio = (dist - halfDist) / dist;
+                var res = mapObj.unproject(new Point(p2.x - ratio * (p2.x - p1.x), p2.y - ratio * (p2.y - p1.y)));
+                return [res.lat, res.lng];
+            }
+        }
+
+        function distanceTo(p1, p2) {
+            var x = p2.x - p1.x,
+                y = p2.y - p1.y;
+
+            return Math.sqrt(x * x + y * y);
+        }
+
+        function Point(x, y, round) {
+            this.x = (round ? Math.round(x) : x);
+            this.y = (round ? Math.round(y) : y);
+        }
     </script>
-  </body>
-</html>
+</body>
diff --git a/core b/core
index 187af1527..bf29f5697 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 187af1527e0b830c804049aae834ed658ffeed08
+Subproject commit bf29f5697445686255a785476e6b1ed6a13ff697