diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index a3469e7bb..7c0cfca3a 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -22,9 +22,6 @@ jobs:
       - name: Install typescript dependencies
         working-directory: ./typescript
         run: npm ci
-      - name: Build types
-        working-directory: ./typescript
-        run: npm run build:types
       - name: Build all TS apps and widgets
         working-directory: ./typescript
         run: npm run build
diff --git a/.gitignore b/.gitignore
index a9398e871..f4588ac6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ tests/Layout/testresult.bmp
 apps.local.json
 _site
 .jekyll-cache
+.owncloudsync.log
+Desktop.ini
+.sync_*.db*
diff --git a/README.md b/README.md
index ea485da86..d2f7022e9 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,7 @@ and which gives information about the app for the Launcher.
 ```
 
 * name, icon and description present the app in the app loader.
-* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget`, `launcher` or empty.
+* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget`, `launcher`, `bluetooth` or empty.
 * storage is used to identify the app files and how to handle them
 * data is used to clean up files when the app is uninstalled
 
diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js
index aa174b2d2..aa6672a4f 100644
--- a/apps/7x7dotsclock/7x7dotsclock.app.js
+++ b/apps/7x7dotsclock/7x7dotsclock.app.js
@@ -149,11 +149,11 @@ function drawHSeg(x1,y1,x2,y2,Num,Color,Size) {
         if (Color == "fg") {
           g.setColor(g.theme.fg);
         } else {
-        g.setColor(mColor[0],mColor[1],mColor[2]);        
+        g.setColor(mColor[0],mColor[1],mColor[2]);
         }
         g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,Size);
       } else {
-        g.setColor(bColor[0],bColor[1],bColor[2]);        
+        g.setColor(bColor[0],bColor[1],bColor[2]);
         g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,1);
       }
     }
@@ -166,7 +166,7 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) {
     for (let j = 1; j < 8; j++) {
       if (Font[Num][j-1][i-1] == 1) {
         if (Color == "fg") {
-       g.setColor(sColor[0],sColor[1],sColor[2]);        
+       g.setColor(sColor[0],sColor[1],sColor[2]);
         } else {
           g.setColor(g.theme.fg);
           //g.setColor(0.7,0.7,0.7);
@@ -253,8 +253,8 @@ function actions(v){
    if(BTN1.read() === true) {
       print("BTN pressed");
       Bangle.showLauncher();
-   }        
-  
+   }
+
    if(v==-1){
      print("up swipe event");
      if(settings.swupApp != "") load(settings.swupApp);
@@ -269,7 +269,7 @@ function actions(v){
 }
 
 // Get Messages status
-var messages = require("Storage").readJSON("messages.json",1)||[];
+var messages_installed = require("Storage").read("messages") !== undefined;
 
 //var BTconnected = NRF.getSecurityStatus().connected;
 //NRF.on('connect',BTconnected = NRF.getSecurityStatus().connected);
@@ -289,27 +289,27 @@ function drawWidgeds() {
     g.setColor((g.getBPP()>8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
   else
     g.setColor(g.theme.dark ? "#666" : "#999");
-  g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),x1Bt,y1Bt);  
+  g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),x1Bt,y1Bt);
+
 
-  
   //Battery
   //print(E.getBattery());
   //print(Bangle.isCharging());
-  
+
   var x1B = 130;
   var y1B = 2;
   var x2B = x1B + 20;
   var y2B = y1B + 15;
-  
+
   g.setColor(g.theme.bg);
   g.clearRect(x1B,y1B,x2B,y2B);
-  
+
   g.setColor(g.theme.fg);
   g.drawRect(x1B,y1B,x2B,y2B);
   g.fillRect(x1B,y1B,x1B+(E.getBattery()*(x2B-x1B)/100),y2B);
   g.fillRect(x2B,y1B+(y2B-y1B)/2-3,x2B+4,y1B+(y2B-y1B)/2+3);
 
-  
+
 
   //Messages
 
@@ -318,25 +318,25 @@ function drawWidgeds() {
   var x2M = x1M + 25;
   var y2M = y2B;
 
-  if (messages.some(m=>m.new)) {
+  if (messages_installed && require("messages").status() == "new") {
     g.setColor(g.theme.fg);
     g.fillRect(x1M,y1M,x2M,y2M);
     g.setColor(g.theme.bg);
     g.drawLine(x1M,y1M,x1M+(x2M-x1M)/2,y1M+(y2M-y1M)/2);
     g.drawLine(x1M+(x2M-x1M)/2,y1M+(y2M-y1M)/2,x2M,y1M);
   }
-  
+
   var strDow = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'];
   var d = new Date();
   var dow = d.getDay(),day = d.getDate(), month = d.getMonth() + 1, year = d.getFullYear();
 
   print(strDow[dow] + ' ' + day  + '.' + month  + ' ' + year);
-  
+
   g.setColor(g.theme.fg);
   g.setFontAlign(-1, -1,0);
   g.setFont("Vector", 20);
   g.drawString(strDow[dow] + ' ' + day, 0, 0, true);
-  
+
 }
 
 
@@ -354,7 +354,7 @@ function SetFull(on) {
     } else {
       Ys = 30;
       Bangle.setUI("updown",actions);
-      Bangle.on('swipe', function(direction) { 
+      Bangle.on('swipe', function(direction) {
         switch (direction) {
           case 1:
             print("swipe left event");
@@ -362,7 +362,7 @@ function SetFull(on) {
             print(settings.swleftApp);
             break;
           case -1:
-            print("swipe right event");            
+            print("swipe right event");
             if(settings.swrightApp != "")  load(settings.swrightApp);
             print(settings.swrightApp);
             break;
@@ -374,7 +374,7 @@ function SetFull(on) {
 
     SegH = (Ye-Ys)/2;
     Dy = SegH/16;
-  
+
     draw();
 
     if (on != true) {
diff --git a/apps/7x7dotsclock/ChangeLog b/apps/7x7dotsclock/ChangeLog
index d2c98a472..5e8e48b0b 100644
--- a/apps/7x7dotsclock/ChangeLog
+++ b/apps/7x7dotsclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial version for upload
-0.02: better theme support, configurable colors, small improvements
+0.02: Better theme support, configurable colors, small improvements
+0.03: Use `messages` library to check for new messages
\ No newline at end of file
diff --git a/apps/7x7dotsclock/metadata.json b/apps/7x7dotsclock/metadata.json
index 41f0836d3..ba1996544 100644
--- a/apps/7x7dotsclock/metadata.json
+++ b/apps/7x7dotsclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "7x7dotsclock",
   "name": "7x7 Dots Clock",
   "shortName":"7x7 Dots Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A clock with a big 7x7 dots Font",
   "icon": "dotsfontclock.png",
   "tags": "clock",
diff --git a/apps/90sclk/ChangeLog b/apps/90sclk/ChangeLog
index feb008f5f..057d6ff73 100644
--- a/apps/90sclk/ChangeLog
+++ b/apps/90sclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
-0.02: Fullscreen settings.
\ No newline at end of file
+0.02: Fullscreen settings.
+0.03: Tell clock widgets to hide.
diff --git a/apps/90sclk/app.js b/apps/90sclk/app.js
index 6babbfec2..351c235e0 100644
--- a/apps/90sclk/app.js
+++ b/apps/90sclk/app.js
@@ -115,6 +115,9 @@ function draw() {
   }
 }
 
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 
 // Clear the screen once, at startup
@@ -140,5 +143,3 @@ Bangle.on('lock', function(isLocked) {
 });
 
 
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
diff --git a/apps/90sclk/metadata.json b/apps/90sclk/metadata.json
index fb2824a6f..59b627427 100644
--- a/apps/90sclk/metadata.json
+++ b/apps/90sclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "90sclk",
   "name": "90s Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A 90s style watch-face",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/a_dndtoggle/ChangeLog b/apps/a_dndtoggle/ChangeLog
new file mode 100644
index 000000000..ec66c5568
--- /dev/null
+++ b/apps/a_dndtoggle/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial version
diff --git a/apps/a_dndtoggle/README.md b/apps/a_dndtoggle/README.md
new file mode 100644
index 000000000..bd0981c5b
--- /dev/null
+++ b/apps/a_dndtoggle/README.md
@@ -0,0 +1,13 @@
+# a_dndtoggle - Toggle Quiet Mode of the watch
+
+When Quiet mode is off, just start this app to set quiet mode. Start it again to turn off quiet mode.
+Work in progress.
+
+#ToDo
+Settings page, current status indicator.
+
+## Creator
+
+Hank - contact at http://forum.espruino.com 
+
+
diff --git a/apps/a_dndtoggle/a_dndtoggle.app.js b/apps/a_dndtoggle/a_dndtoggle.app.js
new file mode 100644
index 000000000..c0b968f2c
--- /dev/null
+++ b/apps/a_dndtoggle/a_dndtoggle.app.js
@@ -0,0 +1,43 @@
+
+const modeNames = [/*LANG*/"Noisy", /*LANG*/"Alarms", /*LANG*/"Silent"];
+let bSettings = require('Storage').readJSON('setting.json',true)||{};
+let current = 0|bSettings.quiet;
+//0 off
+//1 alarms
+//2 silent
+
+console.log("old: " + current);
+
+switch (current) {
+	case 0:
+		bSettings.quiet = 2;
+		Bangle.buzz();
+		setTimeout('Bangle.buzz();',500);
+		break;
+	case 1:
+		bSettings.quiet = 0;  
+		Bangle.buzz();
+		break;
+	case 2:
+		bSettings.quiet = 0;
+		Bangle.buzz();
+		break;
+	default:
+		bSettings.quiet = 0;
+		Bangle.buzz(); 
+}
+	
+console.log("new: " + bSettings.quiet);
+
+E.showMessage(modeNames[current] + " -> " + modeNames[bSettings.quiet]);
+setTimeout('exitApp();', 2000);
+
+
+function exitApp(){
+
+require("Storage").writeJSON("setting.json", bSettings);
+// reload clocks with new theme, otherwise just wait for user to switch apps
+
+load()
+ 
+}
\ No newline at end of file
diff --git a/apps/a_dndtoggle/a_dndtoggle.png b/apps/a_dndtoggle/a_dndtoggle.png
new file mode 100644
index 000000000..4c8b74c0c
Binary files /dev/null and b/apps/a_dndtoggle/a_dndtoggle.png differ
diff --git a/apps/a_dndtoggle/app-icon.js b/apps/a_dndtoggle/app-icon.js
new file mode 100644
index 000000000..0b08cc65b
--- /dev/null
+++ b/apps/a_dndtoggle/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwJC/AAl/Agf/AAUAgIFDwEHAofgh/g/0Ag/wj+AnwVB/EegEfEIN4nkAh+AgE8vgVBAoV4Aoce/EAgfADQIFcjwpFHYIFCnxBFJopZBn5ZCMopxFPoqJFSowA/gA="))
\ No newline at end of file
diff --git a/apps/a_dndtoggle/metadata.json b/apps/a_dndtoggle/metadata.json
new file mode 100644
index 000000000..f5ae9cc31
--- /dev/null
+++ b/apps/a_dndtoggle/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "a_dndtoggle",
+  "name": "a_dndtoggle - Toggle Quiet Mode of the watch",
+  "shortName": "A_DND Toggle",
+  "version": "0.01",
+  "description": "Toggle Quiet Mode of the watch just by starting this app.",
+  "icon": "a_dndtoggle.png",
+  "type": "app",
+  "tags": "tool",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"a_dndtoggle.app.js","url":"a_dndtoggle.app.js"},
+	{"name":"a_dndtoggle.img","url":"app-icon.js","evaluate":true}
+  ],  
+  "readme": "README.md"
+}
diff --git a/apps/about/ChangeLog b/apps/about/ChangeLog
index f5638fdd2..ffe9de081 100644
--- a/apps/about/ChangeLog
+++ b/apps/about/ChangeLog
@@ -10,3 +10,4 @@
 0.10: Added separate Bangle.js 2 file with Bangle.js 2 kickstarter pixels (as of 28 Oct 2021)
 0.11: Bangle.js2: New pixels, btn1 to exit
 0.12: Actual pixels as of 29th Nov 2021
+0.13: Bangle.js 2: Use setUI to add software back button
diff --git a/apps/about/app-bangle2.js b/apps/about/app-bangle2.js
index 978d36193..471b0670f 100644
--- a/apps/about/app-bangle2.js
+++ b/apps/about/app-bangle2.js
@@ -10,7 +10,7 @@ var img = atob("sIwDkm2S66DYwA2AAAAAHAHGSRxJEkAAgmGGBxDIADIdAFJIbAHF9HP00kBUC6Dt
 var imgHeight = g.imageMetrics(img).height;
 var imgScroll = Math.floor(Math.random()*imgHeight);
 
-g.reset().setFont("6x15").setFontAlign(0,0);
+g.clear(1).setFont("6x15").setFontAlign(0,0);
 g.drawString(ENV.VERSION + "  " + NRF.getAddress(), g.getWidth()/2, 171);
 g.drawImage(img,0,24);
 
@@ -69,4 +69,7 @@ function drawImage() {
 
 // TODO: a nice little animation before
 setTimeout(drawInfo, 1000);
-setWatch(_=>load(), BTN1);
+Bangle.setUI({
+  mode : "custom",
+  back : load
+});
diff --git a/apps/about/metadata.json b/apps/about/metadata.json
index 6c22bdc56..648576576 100644
--- a/apps/about/metadata.json
+++ b/apps/about/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "about",
   "name": "About",
-  "version": "0.12",
+  "version": "0.13",
   "description": "Bangle.js About page - showing software version, stats, and a collaborative mural from the Bangle.js KickStarter backers",
   "icon": "app.png",
   "tags": "tool,system",
diff --git a/apps/accellog/ChangeLog b/apps/accellog/ChangeLog
index 80981fe27..94241c7a7 100644
--- a/apps/accellog/ChangeLog
+++ b/apps/accellog/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Use the new multiplatform 'Layout' library
 0.03: Exit as first menu option, dont show decimal places for seconds
 0.04: Localisation, change Exit->Back to allow back-arrow to appear on 2v13 firmware
+0.05: Add max G values during recording, record actual G values and magnitude to CSV
diff --git a/apps/accellog/app.js b/apps/accellog/app.js
index f4c1b3c5a..147f7503f 100644
--- a/apps/accellog/app.js
+++ b/apps/accellog/app.js
@@ -1,5 +1,6 @@
 var fileNumber = 0;
 var MAXLOGS = 9;
+var logRawData = false;
 
 function getFileName(n) {
   return "accellog."+n+".csv";
@@ -24,6 +25,11 @@ function showMenu() {
     /*LANG*/"View Logs" : function() {
       viewLogs();
     },
+    /*LANG*/"Log raw data" : {
+      value : logRawData,
+      format : v => v?/*LANG*/"Yes":/*LANG*/"No",
+      onchange : v => { logRawData=v; }
+    },
   };
   E.showMenu(menu);
 }
@@ -78,6 +84,7 @@ function viewLogs() {
 }
 
 function startRecord(force) {
+  var stopped = false;
   if (!force) {
     // check for existing file
     var f = require("Storage").open(getFileName(fileNumber), "r");
@@ -92,39 +99,101 @@ function startRecord(force) {
 
   var Layout = require("Layout");
   var layout = new Layout({ type: "v", c: [
-      {type:"txt", font:"6x8", label:/*LANG*/"Samples", pad:2},
-      {type:"txt", id:"samples", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
-      {type:"txt", font:"6x8", label:/*LANG*/"Time", pad:2},
-      {type:"txt", id:"time", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
-      {type:"txt", font:"6x8:2", label:/*LANG*/"RECORDING", bgCol:"#f00", pad:5, fillx:1},
-    ]
-  },{btns:[ // Buttons...
-    {label:/*LANG*/"STOP", cb:()=>{
-      Bangle.removeListener('accel', accelHandler);
-      showMenu();
+    { type: "h", c: [
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Samples", pad:2},
+        {type:"txt", id:"samples", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Time", pad:2},
+        {type:"txt", id:"time", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+    ]},
+    { type: "h", c: [
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max X", pad:2},
+        {type:"txt", id:"maxX", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max Y", pad:2},
+        {type:"txt", id:"maxY", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max Z", pad:2},
+        {type:"txt", id:"maxZ", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+    ]},
+    {type:"txt", font:"6x8", label:/*LANG*/"Max G", pad:2},
+    {type:"txt", id:"maxMag", font:"6x8:4", label:"  -  ", pad:5, bgCol:g.theme.bg},
+    {type:"txt", id:"state", font:"6x8:2", label:/*LANG*/"RECORDING", bgCol:"#f00", pad:5, fillx:1},
+  ]},
+  {
+    btns:[ // Buttons...
+    {id: "btnStop", label:/*LANG*/"STOP", cb:()=>{
+      if (stopped) {
+        showMenu();
+      }
+      else {
+        Bangle.removeListener('accel', accelHandler);
+        layout.state.label = /*LANG*/"STOPPED";
+        layout.state.bgCol = /*LANG*/"#0f0";
+        stopped = true;
+        layout.render();
+      }
     }}
   ]});
   layout.render();
 
   // now start writing
   var f = require("Storage").open(getFileName(fileNumber), "w");
-  f.write("Time (ms),X,Y,Z\n");
+  f.write("Time (ms),X,Y,Z,Total\n");
   var start = getTime();
   var sampleCount = 0;
+  var maxMag = 0;
+  var maxX = 0;
+  var maxY = 0;
+  var maxZ = 0;
 
   function accelHandler(accel) {
     var t = getTime()-start;
-    f.write([
-      t*1000,
-      accel.x*8192,
-      accel.y*8192,
-      accel.z*8192].map(n=>Math.round(n)).join(",")+"\n");
+    if (logRawData) {
+      f.write([
+        t*1000,
+        accel.x*8192,
+        accel.y*8192,
+        accel.z*8192,
+        accel.mag*8192,
+      ].map(n=>Math.round(n)).join(",")+"\n");
+    } else {
+      f.write([
+        Math.round(t*1000),
+        accel.x,
+        accel.y,
+        accel.z,
+        accel.mag,
+      ].join(",")+"\n");
+    }
+    if (accel.mag > maxMag) {
+      maxMag = accel.mag.toFixed(2);
+    }
+    if (accel.x > maxX) {
+      maxX = accel.x.toFixed(2);
+    }
+    if (accel.y > maxY) {
+      maxY = accel.y.toFixed(2);
+    }
+    if (accel.z > maxZ) {
+      maxZ = accel.z.toFixed(2);
+    }
 
     sampleCount++;
     layout.samples.label = sampleCount;
     layout.time.label = Math.round(t)+"s";
-    layout.render(layout.samples);
-    layout.render(layout.time);
+    layout.maxX.label = maxX;
+    layout.maxY.label = maxY;
+    layout.maxZ.label = maxZ;
+    layout.maxMag.label = maxMag;
+    layout.render();
   }
 
   Bangle.setPollInterval(80); // 12.5 Hz - the default
diff --git a/apps/accellog/metadata.json b/apps/accellog/metadata.json
index fdf6cf320..903c57903 100644
--- a/apps/accellog/metadata.json
+++ b/apps/accellog/metadata.json
@@ -2,7 +2,7 @@
   "id": "accellog",
   "name": "Acceleration Logger",
   "shortName": "Accel Log",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Logs XYZ acceleration data to a CSV file that can be downloaded to your PC",
   "icon": "app.png",
   "tags": "outdoor",
diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog
index 37820dce6..3811425ac 100644
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@@ -6,3 +6,5 @@
 0.06: Add a temperature threshold to detect (and not alert) if the BJS isn't worn. Better support for the peoples using the app at night
 0.07: Fix bug on the cutting edge firmware
 0.08: Use default Bangle formatter for booleans
+0.09: New app screen (instead of showing settings or the alert) and some optimisations
+0.10: Add software back button via setUI
diff --git a/apps/activityreminder/alert.js b/apps/activityreminder/alert.js
new file mode 100644
index 000000000..96a9b76c4
--- /dev/null
+++ b/apps/activityreminder/alert.js
@@ -0,0 +1,37 @@
+(function () {
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  const storage = require("Storage");
+  let activityreminder_data = activityreminder.loadData();
+
+  function run() {
+    E.showPrompt("Inactivity detected", {
+      title: "Activity reminder",
+      buttons: { "Ok": 1, "Dismiss": 2, "Pause": 3 }
+    }).then(function (v) {
+      if (v == 1) {
+        activityreminder_data.okDate = new Date();
+      }
+      if (v == 2) {
+        activityreminder_data.dismissDate = new Date();
+      }
+      if (v == 3) {
+        activityreminder_data.pauseDate = new Date();
+      }
+      activityreminder.saveData(activityreminder_data);
+      load();
+    });
+
+    // Obey system quiet mode:
+    if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
+      Bangle.buzz(400);
+    }
+    setTimeout(load, 20000);
+  }
+
+  g.clear();
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  run();
+
+})();
\ No newline at end of file
diff --git a/apps/activityreminder/app.js b/apps/activityreminder/app.js
index c2b626fb3..81e10d8dd 100644
--- a/apps/activityreminder/app.js
+++ b/apps/activityreminder/app.js
@@ -1,46 +1,58 @@
 (function () {
-    // load variable before defining functions cause it can trigger a ReferenceError
-    const activityreminder = require("activityreminder");
-    const storage = require("Storage");
-    const activityreminder_settings = activityreminder.loadSettings();
-    let activityreminder_data = activityreminder.loadData();
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  let activityreminder_data = activityreminder.loadData();
+  let W = g.getWidth();
+  // let H = g.getHeight();
 
-    function drawAlert() {
-        E.showPrompt("Inactivity detected", {
-            title: "Activity reminder",
-            buttons: { "Ok": 1, "Dismiss": 2, "Pause": 3 }
-        }).then(function (v) {
-            if (v == 1) {
-                activityreminder_data.okDate = new Date();
-            }
-            if (v == 2) {
-                activityreminder_data.dismissDate = new Date();
-            }
-            if (v == 3) {
-                activityreminder_data.pauseDate = new Date();
-            }
-            activityreminder.saveData(activityreminder_data);
-            load();
-        });
-        
-        // Obey system quiet mode:
-        if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
-            Bangle.buzz(400);
-        }
-        setTimeout(load, 20000);
-    }
-    
-    function run() {
-        if (activityreminder.mustAlert(activityreminder_data, activityreminder_settings)) {
-            drawAlert();
-        } else {
-            eval(storage.read("activityreminder.settings.js"))(() => load());
-        }
-    }
+  function getHoursMins(date){
+    var h = date.getHours();
+    var m = date.getMinutes();
+    return (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
+  }
 
+  function drawData(name, value, y){
+    g.drawString(name, 10, y);
+    g.drawString(value, 100, y);
+  }
+  
+  function drawInfo() {
+    var h=18, y = h;
+    g.setColor(g.theme.fg);
+    g.setFont("Vector",h).setFontAlign(-1,-1);
+
+    // Header
+    g.drawLine(0,25,W,25);
+    g.drawLine(0,26,W,26);
+  
+    g.drawString("Current Cycle", 10, y+=h);
+    drawData("Start", getHoursMins(activityreminder_data.stepsDate), y+=h);
+    drawData("Steps", getCurrentSteps(), y+=h);
+
+    /*
+    g.drawString("Button Press", 10, y+=h*2);
+    drawData("Ok", getHoursMins(activityreminder_data.okDate), y+=h);
+    drawData("Dismiss", getHoursMins(activityreminder_data.dismissDate), y+=h);
+    drawData("Pause", getHoursMins(activityreminder_data.pauseDate), y+=h);
+    */
+  }
+
+  function getCurrentSteps(){
+    let health = Bangle.getHealthStatus("day");
+    return health.steps - activityreminder_data.stepsOnDate;
+  }
+
+  function run() {
     g.clear();
     Bangle.loadWidgets();
     Bangle.drawWidgets();
-    run();
-    
-})();
\ No newline at end of file
+    drawInfo();
+    Bangle.setUI({
+      mode : "custom",
+      back : load
+    })
+  }
+
+  run();
+
+})();
diff --git a/apps/activityreminder/boot.js b/apps/activityreminder/boot.js
index f97cf274d..5a11d73b8 100644
--- a/apps/activityreminder/boot.js
+++ b/apps/activityreminder/boot.js
@@ -1,70 +1,81 @@
 (function () {
-    // load variable before defining functions cause it can trigger a ReferenceError
-    const activityreminder = require("activityreminder");
-    const activityreminder_settings = activityreminder.loadSettings();
-    let activityreminder_data = activityreminder.loadData();
-    
-    if (activityreminder_data.firstLoad) {
-        activityreminder_data.firstLoad = false;
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  const activityreminder_settings = activityreminder.loadSettings();
+  let activityreminder_data = activityreminder.loadData();
+
+  if (activityreminder_data.firstLoad) {
+    activityreminder_data.firstLoad = false;
+    activityreminder.saveData(activityreminder_data);
+  }
+
+  function run() {
+    if (isNotWorn()) return;
+    let now = new Date();
+    let h = now.getHours();
+
+    if (isDuringAlertHours(h)) {
+      let health = Bangle.getHealthStatus("day");
+      if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
+        || health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
+        activityreminder_data.stepsOnDate = health.steps;
+        activityreminder_data.stepsDate = now;
         activityreminder.saveData(activityreminder_data);
-    }
-
-    function run() {
-        if (isNotWorn()) return;
-        let now = new Date();
-        let h = now.getHours();
-
-        if (isDuringAlertHours(h)) {
-            let health = Bangle.getHealthStatus("day");
-            if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
-                || health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
-                activityreminder_data.stepsOnDate = health.steps;
-                activityreminder_data.stepsDate = now;
-                activityreminder.saveData(activityreminder_data);
-                /* todo in a futur release 
-                Add settimer to trigger like 30 secs after going in this part cause the person have been walking 
-                (pass some argument to run() to handle long walks and not triggering so often)
-                */
-            }
-
-            if (activityreminder.mustAlert(activityreminder_data, activityreminder_settings)) {
-                load('activityreminder.app.js');
-            }
-        }
-
-    }
-
-    function isNotWorn() {
-        return (Bangle.isCharging() || activityreminder_settings.tempThreshold >= E.getTemperature());
-    }
-
-    function isDuringAlertHours(h) {
-        if (activityreminder_settings.startHour < activityreminder_settings.endHour) { // not passing through midnight
-            return (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour);
-        } else { // passing through midnight
-            return (h >= activityreminder_settings.startHour || h < activityreminder_settings.endHour);
-        }
-    }
-
-    Bangle.on('midnight', function () {
-        /*
-        Usefull trick to have the app working smothly for people using it at night 
-        */
-        let now = new Date();
-        let h = now.getHours();
-        if (activityreminder_settings.enabled && isDuringAlertHours(h)) {
-            // updating only the steps and keeping the original stepsDate on purpose 
-            activityreminder_data.stepsOnDate = 0;
-            activityreminder.saveData(activityreminder_data);
-        }
-    });
-
-
-    if (activityreminder_settings.enabled) {
-        setInterval(run, 60000);
         /* todo in a futur release 
-        increase setInterval time to something that is still sensible (5 mins ?)
-        when we added a settimer
+        Add settimer to trigger like 30 secs after going in this part cause the person have been walking 
+        (pass some argument to run() to handle long walks and not triggering so often)
         */
+      }
+
+      if (mustAlert(now)) {
+        load('activityreminder.alert.js');
+      }
     }
+
+  }
+
+  function isNotWorn() {
+    return (Bangle.isCharging() || activityreminder_settings.tempThreshold >= E.getTemperature());
+  }
+
+  function isDuringAlertHours(h) {
+    if (activityreminder_settings.startHour < activityreminder_settings.endHour) { // not passing through midnight
+      return (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour);
+    } else { // passing through midnight
+      return (h >= activityreminder_settings.startHour || h < activityreminder_settings.endHour);
+    }
+  }
+
+  function mustAlert(now) {
+    if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected
+      if ((now - activityreminder_data.okDate) / 60000 > 3 && // last alert anwsered with ok was more than 3 min ago
+        (now - activityreminder_data.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago
+        (now - activityreminder_data.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago
+        return true;
+      }
+    }
+    return false;
+  }
+
+  Bangle.on('midnight', function () {
+    /*
+    Usefull trick to have the app working smothly for people using it at night 
+    */
+    let now = new Date();
+    let h = now.getHours();
+    if (activityreminder_settings.enabled && isDuringAlertHours(h)) {
+      // updating only the steps and keeping the original stepsDate on purpose 
+      activityreminder_data.stepsOnDate = 0;
+      activityreminder.saveData(activityreminder_data);
+    }
+  });
+
+
+  if (activityreminder_settings.enabled) {
+    setInterval(run, 60000);
+    /* todo in a futur release 
+    increase setInterval time to something that is still sensible (5 mins ?)
+    when we added a settimer
+    */
+  }
 })();
diff --git a/apps/activityreminder/lib.js b/apps/activityreminder/lib.js
index 704d35641..a5c35190c 100644
--- a/apps/activityreminder/lib.js
+++ b/apps/activityreminder/lib.js
@@ -1,56 +1,44 @@
 exports.loadSettings = function () {
-    return Object.assign({
-        enabled: true,
-        startHour: 9,
-        endHour: 20,
-        maxInnactivityMin: 30,
-        dismissDelayMin: 15,
-        pauseDelayMin: 120,
-        minSteps: 50,
-        tempThreshold: 27
-    }, require("Storage").readJSON("activityreminder.s.json", true) || {});
+  return Object.assign({
+    enabled: true,
+    startHour: 9,
+    endHour: 20,
+    maxInnactivityMin: 30,
+    dismissDelayMin: 15,
+    pauseDelayMin: 120,
+    minSteps: 50,
+    tempThreshold: 27
+  }, require("Storage").readJSON("activityreminder.s.json", true) || {});
 };
 
 exports.writeSettings = function (settings) {
-    require("Storage").writeJSON("activityreminder.s.json", settings);
+  require("Storage").writeJSON("activityreminder.s.json", settings);
 };
 
 exports.saveData = function (data) {
-    require("Storage").writeJSON("activityreminder.data.json", data);
+  require("Storage").writeJSON("activityreminder.data.json", data);
 };
 
 exports.loadData = function () {
-    let health = Bangle.getHealthStatus("day");
-    let data = Object.assign({
-        firstLoad: true,
-        stepsDate: new Date(),
-        stepsOnDate: health.steps,
-        okDate: new Date(1970),
-        dismissDate: new Date(1970),
-        pauseDate: new Date(1970),
-    },
+  let health = Bangle.getHealthStatus("day");
+  let data = Object.assign({
+    firstLoad: true,
+    stepsDate: new Date(),
+    stepsOnDate: health.steps,
+    okDate: new Date(1970),
+    dismissDate: new Date(1970),
+    pauseDate: new Date(1970),
+  },
     require("Storage").readJSON("activityreminder.data.json") || {});
 
-    if(typeof(data.stepsDate) == "string")
-        data.stepsDate = new Date(data.stepsDate);
-    if(typeof(data.okDate) == "string")
-        data.okDate = new Date(data.okDate);
-    if(typeof(data.dismissDate) == "string")
-        data.dismissDate = new Date(data.dismissDate);
-    if(typeof(data.pauseDate) == "string")
-        data.pauseDate = new Date(data.pauseDate);
+  if (typeof (data.stepsDate) == "string")
+    data.stepsDate = new Date(data.stepsDate);
+  if (typeof (data.okDate) == "string")
+    data.okDate = new Date(data.okDate);
+  if (typeof (data.dismissDate) == "string")
+    data.dismissDate = new Date(data.dismissDate);
+  if (typeof (data.pauseDate) == "string")
+    data.pauseDate = new Date(data.pauseDate);
 
-    return data;
+  return data;
 };
-
-exports.mustAlert = function(activityreminder_data, activityreminder_settings) {
-    let now = new Date();
-    if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected
-        if ((now - activityreminder_data.okDate) / 60000 > 3 && // last alert anwsered with ok was more than 3 min ago
-            (now - activityreminder_data.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago
-            (now - activityreminder_data.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago
-            return true;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json
index 75ebf80b2..a7fb0c487 100644
--- a/apps/activityreminder/metadata.json
+++ b/apps/activityreminder/metadata.json
@@ -3,7 +3,7 @@
   "name": "Activity Reminder",
   "shortName":"Activity Reminder",
   "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.08",
+  "version":"0.10",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,activity",
@@ -13,11 +13,12 @@
     {"name": "activityreminder.app.js", "url":"app.js"},
     {"name": "activityreminder.boot.js", "url": "boot.js"},
     {"name": "activityreminder.settings.js", "url": "settings.js"},
+    {"name": "activityreminder.alert.js", "url": "alert.js"},
     {"name": "activityreminder", "url": "lib.js"},
     {"name": "activityreminder.img", "url": "app-icon.js", "evaluate": true}
   ],
   "data": [
     {"name": "activityreminder.s.json"},
-    {"name": "activityreminder.data.json"}
+    {"name": "activityreminder.data.json", "storageFile": true}
   ]
 }
diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js
index de490b796..051c0dcd8 100644
--- a/apps/activityreminder/settings.js
+++ b/apps/activityreminder/settings.js
@@ -1,80 +1,86 @@
 (function (back) {
-    // Load settings
-    const activityreminder = require("activityreminder");
-    let settings = activityreminder.loadSettings();
+  // Load settings
+  const activityreminder = require("activityreminder");
+  let settings = activityreminder.loadSettings();
 
-    // Show the menu
-    E.showMenu({
-        "": { "title": "Activity Reminder" },
-        "< Back": () => back(),
-        'Enable': {
-            value: settings.enabled,
-            onchange: v => {
-                settings.enabled = v;
-                activityreminder.writeSettings(settings);
-            }
-        },
-        'Start hour': {
-            value: settings.startHour,
-            min: 0, max: 24,
-            onchange: v => {
-                settings.startHour = v;
-                activityreminder.writeSettings(settings);
-            }
-        },
-        'End hour': {
-            value: settings.endHour,
-            min: 0, max: 24,
-            onchange: v => {
-                settings.endHour = v;
-                activityreminder.writeSettings(settings);
-            }
-        },
-        'Max inactivity': {
-            value: settings.maxInnactivityMin,
-            min: 15, max: 120,
-            onchange: v => {
-                settings.maxInnactivityMin = v;
-                activityreminder.writeSettings(settings);
-            },
-            format: x =>   x + "m"
-        },
-        'Dismiss delay': {
-            value: settings.dismissDelayMin,
-            min: 5, max: 60,
-            onchange: v => {
-                settings.dismissDelayMin = v;
-                activityreminder.writeSettings(settings);
-            },
-            format: x => x + "m"
-        },
-        'Pause delay': {
-            value: settings.pauseDelayMin,
-            min: 30, max: 240, step: 5,
-            onchange: v => {
-                settings.pauseDelayMin = v;
-                activityreminder.writeSettings(settings);
-            },
-            format: x => {
-                return x + "m";
-            }
-        },
-        'Min steps': {
-            value: settings.minSteps,
-            min: 10, max: 500, step: 10,
-            onchange: v => {
-                settings.minSteps = v;
-                activityreminder.writeSettings(settings);
-            }
-        },
-        'Temp Threshold': {
-            value: settings.tempThreshold,
-            min: 20, max: 40, step: 0.5,
-            format: v => v + "°C",
-            onchange: v => {
-                settings.tempThreshold = v;
-                activityreminder.writeSettings(settings);
-            }
+  function getMainMenu(){
+    var mainMenu = {
+      "": { "title": "Activity Reminder" },
+      "< Back": () => back(),
+      'Enable': {
+        value: settings.enabled,
+        onchange: v => {
+          settings.enabled = v;
+          activityreminder.writeSettings(settings);
         }
-    });
+      },
+      'Start hour': {
+        value: settings.startHour,
+        min: 0, max: 24,
+        onchange: v => {
+          settings.startHour = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'End hour': {
+        value: settings.endHour,
+        min: 0, max: 24,
+        onchange: v => {
+          settings.endHour = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'Max inactivity': {
+        value: settings.maxInnactivityMin,
+        min: 15, max: 120,
+        onchange: v => {
+          settings.maxInnactivityMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => x + "m"
+      },
+      'Dismiss delay': {
+        value: settings.dismissDelayMin,
+        min: 5, max: 60,
+        onchange: v => {
+          settings.dismissDelayMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => x + "m"
+      },
+      'Pause delay': {
+        value: settings.pauseDelayMin,
+        min: 30, max: 240, step: 5,
+        onchange: v => {
+          settings.pauseDelayMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => {
+          return x + "m";
+        }
+      },
+      'Min steps': {
+        value: settings.minSteps,
+        min: 10, max: 500, step: 10,
+        onchange: v => {
+          settings.minSteps = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'Temp Threshold': {
+        value: settings.tempThreshold,
+        min: 20, max: 40, step: 0.5,
+        format: v => v + "°C",
+        onchange: v => {
+          settings.tempThreshold = v;
+          activityreminder.writeSettings(settings);
+        }
+      }
+    };
+
+    return mainMenu;
+  }
+
+  // Show the menu
+  E.showMenu(getMainMenu());
 })
diff --git a/apps/advcasio/ChangeLog b/apps/advcasio/ChangeLog
index 7de176672..a1b528cf6 100644
--- a/apps/advcasio/ChangeLog
+++ b/apps/advcasio/ChangeLog
@@ -1 +1,3 @@
 0.01: AdvCasio first version
+0.02: Remove un-needed fonts to improve memory usage
+0.03: Tell clock widgets to hide.
diff --git a/apps/advcasio/app.js b/apps/advcasio/app.js
index 8c27b7823..8cb904f90 100644
--- a/apps/advcasio/app.js
+++ b/apps/advcasio/app.js
@@ -1,7 +1,5 @@
 const storage = require('Storage');
 
-require("Font6x12").add(Graphics);
-require("Font6x8").add(Graphics);
 require("Font8x12").add(Graphics);
 require("Font7x11Numeric7Seg").add(Graphics);
 
@@ -257,7 +255,6 @@ function draw() {
 		
 		
 		g.setColor(0, 0, 0);
-		g.setFont("6x12");
 		if(dataJson && dataJson.weather) drawWeather(dataJson.weather);
 		if(dataJson && dataJson.tasks) drawTasks(dataJson.tasks);
 		
@@ -297,9 +294,10 @@ Bangle.on("lock", (locked) => {
 });
 
 
+Bangle.setUI("clock");
+
 // Load widgets, but don't show them
 Bangle.loadWidgets();
-Bangle.setUI("clock");
 
 g.reset();
 g.clear();
diff --git a/apps/advcasio/metadata.json b/apps/advcasio/metadata.json
index 0f0c75c07..152f47132 100644
--- a/apps/advcasio/metadata.json
+++ b/apps/advcasio/metadata.json
@@ -1,7 +1,7 @@
 { "id": "advcasio",
   "name": "Advanced Casio Clock",
   "shortName":"advcasio",
-  "version":"0.01",
+  "version":"0.03",
   "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
   "icon": "app.png",
   "tags": "clock",
diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog
index ae650deeb..0a7916810 100644
--- a/apps/agenda/ChangeLog
+++ b/apps/agenda/ChangeLog
@@ -1,2 +1,7 @@
 0.01: Basic agenda with events from GB
 0.02: Added settings page to force calendar sync
+0.03: Disable past events display from settings
+0.04: Added awareness of allDay field
+0.05: Displaying calendar colour and name
+0.06: Added clkinfo for clocks.
+0.07: Clkinfo improvements.
\ No newline at end of file
diff --git a/apps/agenda/README.md b/apps/agenda/README.md
index a546e0a89..1a0ec9264 100644
--- a/apps/agenda/README.md
+++ b/apps/agenda/README.md
@@ -1,3 +1,30 @@
 # Agenda
 
-Basic agenda reading the events synchronised from GadgetBridge
+Basic agenda reading the events synchronised from GadgetBridge.
+
+### Functionalities
+
+* List all events in the next week (or whatever is synchronized)
+* Optionally view past events (until GB removes them)
+* Show start time and location of the events in the list
+* Show the colour of the calendar in the list
+* Display description, location and calendar name after tapping on events
+
+### Troubleshooting
+
+For the events sync to work, GadgetBridge needs to have the calendar permission and calendar sync should be enabled in the devices settings (gear sign in GB, also check the blacklisted calendars there, if events are missing).  
+Keep in mind that GadgetBridge won't synchronize all events on your calendar, just the ones in a time window of 7 days (you don't want your watch to explode), ideally every day old events get deleted since they appear out of such window.
+
+#### Force Sync
+
+If for any reason events still cannot sync or some are missing, you can try any of the following (just one, you normally don't need to do this):
+1. from GB open the burger menu (side), tap debug and set time.
+2. from the bangle, open settings > apps > agenda > Force calendar sync, then select not to delete the local events (this is equivalent to option 1).
+3. do like option 2 but delete events, GB will synchronize a fresh database instead of patching the old one (good in case you somehow cannot get rid of older events)
+
+After any of the options, you may need to disconnect/force close Gadgetbridge before reconnecting and let it sync (give it some time for that too), restart the agenda app on the bangle after a while to see the changes.
+
+### Report a bug
+
+You can easily open an issue in the espruino repo, but I won't be notified and it might take time.  
+If you want a (hopefully) quicker response, just report [on my fork](https://github.com/glemco/BangleApps).
diff --git a/apps/agenda/agenda.clkinfo.js b/apps/agenda/agenda.clkinfo.js
new file mode 100644
index 000000000..6c2ddb3da
--- /dev/null
+++ b/apps/agenda/agenda.clkinfo.js
@@ -0,0 +1,29 @@
+(function() {
+    var agendaItems = {
+        name: "Agenda",
+        img: atob("GBiBAf////////85z/AAAPAAAPgAAP////AAAPAAAPAAAPAAAOAAAeAAAeAAAcAAA8AAAoAABgAADP//+P//8PAAAPAAAPgAAf///w=="),
+        items: []
+      };
+
+      var now = new Date();
+      var agenda = storage.readJSON("android.calendar.json")
+              .filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000)
+              .sort((a,b)=>a.timestamp - b.timestamp);
+
+      agenda.forEach((entry, i) => {
+
+        var title = entry.title.slice(0,18);
+        var date = new Date(entry.timestamp*1000);
+        var dateStr = locale.date(date).replace(/\d\d\d\d/,"");
+        dateStr += entry.durationInSeconds < 86400 ? "/ " + locale.time(date,1) : "";
+
+        agendaItems.items.push({
+          name: null,
+          get: () => ({ text: title + "\n" + dateStr, img: null}),
+          show: function() { agendaItems.items[i].emit("redraw"); },
+          hide: function () {}
+        });
+      });
+
+    return agendaItems;
+})
\ No newline at end of file
diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js
index f39e31c75..9cffe0265 100644
--- a/apps/agenda/agenda.js
+++ b/apps/agenda/agenda.js
@@ -6,6 +6,8 @@
     title,
     description,
     location,
+    color:int,
+    calName,
     allDay: bool,
   }
 */
@@ -24,19 +26,23 @@ var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
 
 //FIXME maybe write the end from GB already? Not durationInSeconds here (or do while receiving?)
 var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[];
+var settings = require("Storage").readJSON("agenda.settings.json",true)||{};
 
-CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp)
+CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp);
 
 function getDate(timestamp) {
   return new Date(timestamp*1000);
 }
-function formatDateLong(date, includeDay) {
-  if(includeDay)
-    return Locale.date(date)+" "+Locale.time(date,1);
-  return Locale.time(date,1);
+function formatDateLong(date, includeDay, allDay) {
+  let shortTime = Locale.time(date,1)+Locale.meridian(date);
+  if(allDay) shortTime = "";
+  if(includeDay || allDay)
+    return Locale.date(date)+" "+shortTime;
+  return shortTime;
 }
-function formatDateShort(date) {
-  return Locale.date(date).replace(/\d\d\d\d/,"")+Locale.time(date,1);
+function formatDateShort(date, allDay) {
+  return Locale.date(date).replace(/\d\d\d\d/,"")+(allDay?
+    "" : Locale.time(date,1)+Locale.meridian(date));
 }
 
 var lines = [];
@@ -45,7 +51,7 @@ function showEvent(ev) {
   if(!ev) return;
   g.setFont(bodyFont);
   //var lines = [];
-  if (ev.title) lines = g.wrapString(ev.title, g.getWidth()-10)
+  if (ev.title) lines = g.wrapString(ev.title, g.getWidth()-10);
   var titleCnt = lines.length;
   var start = getDate(ev.timestamp);
   var end = getDate((+ev.timestamp) + (+ev.durationInSeconds));
@@ -53,22 +59,24 @@ function showEvent(ev) {
   if (titleCnt) lines.push(""); // add blank line after title
   if(start.getDay() == end.getDay() && start.getMonth() == end.getMonth())
     includeDay = false;
-  if(includeDay) {
+  if(includeDay || ev.allDay) {
     lines = lines.concat(
       /*LANG*/"Start:",
-      g.wrapString(formatDateLong(start, includeDay), g.getWidth()-10),
+      g.wrapString(formatDateLong(start, includeDay, ev.allDay), g.getWidth()-10),
       /*LANG*/"End:",
-      g.wrapString(formatDateLong(end, includeDay), g.getWidth()-10));
+      g.wrapString(formatDateLong(end, includeDay, ev.allDay), g.getWidth()-10));
   } else {
     lines = lines.concat(
       g.wrapString(Locale.date(start), g.getWidth()-10),
-      g.wrapString(/*LANG*/"Start"+": "+formatDateLong(start, includeDay), g.getWidth()-10),
-      g.wrapString(/*LANG*/"End"+": "+formatDateLong(end, includeDay), g.getWidth()-10));
+      g.wrapString(/*LANG*/"Start"+": "+formatDateLong(start, includeDay, ev.allDay), g.getWidth()-10),
+      g.wrapString(/*LANG*/"End"+": "+formatDateLong(end, includeDay, ev.allDay), g.getWidth()-10));
   }
   if(ev.location)
     lines = lines.concat(/*LANG*/"Location"+": ", g.wrapString(ev.location, g.getWidth()-10));
   if(ev.description)
     lines = lines.concat("",g.wrapString(ev.description, g.getWidth()-10));
+  if(ev.calName)
+    lines = lines.concat(/*LANG*/"Calendar"+": ", g.wrapString(ev.calName, g.getWidth()-10));
   lines = lines.concat(["",/*LANG*/"< Back"]);
   E.showScroller({
     h : g.getFontHeight(), // height of each menu item in pixels
@@ -89,6 +97,12 @@ function showEvent(ev) {
 }
 
 function showList() {
+  //it might take time for GB to delete old events, decide whether to show them grayed out or hide entirely
+  if(!settings.pastEvents) {
+    let now = new Date();
+    //TODO add threshold here?
+    CALENDAR = CALENDAR.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000);
+  }
   if(CALENDAR.length == 0) {
     E.showMessage("No events");
     return;
@@ -101,24 +115,21 @@ function showList() {
       g.setColor(g.theme.fg);
       g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
       if (!ev) return;
-      var isPast = ev.timestamp + ev.durationInSeconds < (new Date())/1000;
+      var isPast = false;
       var x = r.x+2, title = ev.title;
-      var body = formatDateShort(getDate(ev.timestamp))+"\n"+ev.location;
-      var m = ev.title+"\n"+ev.location, longBody=false;
+      var body = formatDateShort(getDate(ev.timestamp),ev.allDay)+"\n"+(ev.location?ev.location:/*LANG*/"No location");
+      if(settings.pastEvents) isPast = ev.timestamp + ev.durationInSeconds < (new Date())/1000;
       if (title) g.setFontAlign(-1,-1).setFont(fontBig)
-        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x,r.y+2);
+        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x+4,r.y+2);
       if (body) {
         g.setFontAlign(-1,-1).setFont(fontMedium).setColor(isPast ? "#888" : g.theme.fg);
-        var l = g.wrapString(body, r.w-(x+14));
-        if (l.length>3) {
-          l = l.slice(0,3);
-          l[l.length-1]+="...";
-        }
-        longBody = l.length>2;
-        g.drawString(l.join("\n"), x+10,r.y+20);
+        g.drawString(body, x+10,r.y+20);
       }
-      //if (!longBody && msg.src) g.setFontAlign(1,1).setFont("6x8").drawString(msg.src, r.x+r.w-2, r.y+r.h-2);
       g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items
+      if(ev.color) {
+        g.setColor("#"+(0x1000000+Number(ev.color)).toString(16).padStart(6,"0"));
+        g.fillRect(r.x,r.y+4,r.x+3, r.y+r.h-4);
+      }
     },
     select : idx => showEvent(CALENDAR[idx]),
     back : () => load()
diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json
index ce8438686..6d91455f0 100644
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.02",
+  "version": "0.07",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
@@ -12,6 +12,8 @@
   "storage": [
     {"name":"agenda.app.js","url":"agenda.js"},
     {"name":"agenda.settings.js","url":"settings.js"},
+    {"name":"agenda.clkinfo.js","url":"agenda.clkinfo.js"},
     {"name":"agenda.img","url":"agenda-icon.js","evaluate":true}
-  ]
+  ],
+  "data": [{"name":"agenda.settings.json"}]
 }
diff --git a/apps/agenda/settings.js b/apps/agenda/settings.js
index fe9dab2d8..4220fcb63 100644
--- a/apps/agenda/settings.js
+++ b/apps/agenda/settings.js
@@ -3,6 +3,10 @@
     Bluetooth.println("");
     Bluetooth.println(JSON.stringify(message));
   }
+  var settings = require("Storage").readJSON("agenda.settings.json",1)||{};
+  function updateSettings() {
+    require("Storage").writeJSON("agenda.settings.json", settings);
+  }
   var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[];
   var mainmenu = {
     "" : { "title" : "Agenda" },
@@ -32,6 +36,13 @@
         E.showAlert(/*LANG*/"You are not connected").then(()=>E.showMenu(mainmenu));
       }
     },
+    /*LANG*/"Show past events" : {
+      value : !!settings.pastEvents,
+      onchange: v => {
+        settings.pastEvents = v;
+        updateSettings();
+      }
+    },
   };
   E.showMenu(mainmenu);
 })
diff --git a/apps/agpsdata/ChangeLog b/apps/agpsdata/ChangeLog
index c17eac852..89844a132 100644
--- a/apps/agpsdata/ChangeLog
+++ b/apps/agpsdata/ChangeLog
@@ -1 +1,4 @@
 0.01: First, proof of concept
+0.02: Load AGPS data on app start and automatically in background
+0.03: Do not load AGPS data on boot
+      Increase minimum interval to 6 hours
diff --git a/apps/agpsdata/README.md b/apps/agpsdata/README.md
index 93cc94259..57bb055a1 100644
--- a/apps/agpsdata/README.md
+++ b/apps/agpsdata/README.md
@@ -1,18 +1,19 @@
 # A-GPS Data
 
-Load assisted GPS data directly to the watch using the new http requests on Android GadgetBridge.
+Load assisted GPS (A-GPS) data directly to your Bangle.js using the new http requests on Android GadgetBridge.
+
+Will download A-GPS data in background (if enabled in settings).
+
+The GNSS type can be configured in the settings.
 
 Make sure:
 * your GadgetBridge version supports http requests
 * turn on internet access in GadgetBridge settings
 
-Currently proof of concept on Bangle2 only. Will eventually add a widget for automatic download. 
-
-![](screenshot.png)
-![](screenshot2.png)
-![](screenshot3.png)
-![](screenshot4.png)
-![](screenshot5.png)
+Currently proof of concept on Bangle.js 2 only.
 
 ## Creator
 [@pidajo](https://github.com/pidajo)
+
+## Contributor
+[@myxor](https://github.com/myxor)
diff --git a/apps/agpsdata/app.js b/apps/agpsdata/app.js
index 825eda273..647723bb4 100644
--- a/apps/agpsdata/app.js
+++ b/apps/agpsdata/app.js
@@ -1,125 +1,54 @@
-var _GB = global.GB;
-var counter = 0;
-
-function GB(msg) {
-  console.log(msg);
-  if (msg.t == "http") {
-    display("Received", "(" + msg.resp.length + ") Touch to apply", () => {
-      display("Apply data..", "");
-      setTimeout(() => {
-        if (setAGPS(msg.resp)) {
-          display("Success", "Touch for restart", httpTest);
-        }
-        else {
-          display("Error", "Touch for restart", httpTest);
-        }
-      }, 1);
-    });
-  }
-  if (_GB) {
-    _GB(msg);
-  }
-}
-
-function setAGPS(data) {
-  var js = jsFromBase64(data);
-  console.log(js);
-  try {
-    eval(js);
-    return true;
-  }
-  catch(e) {
-    console.log("Error:", e);
-  }
-  return false;
-}
-
-function jsFromBase64(b64) {
-  var bin = atob(b64);
-  var chunkSize = 128;
-  var js = "Bangle.setGPSPower(1);\n"; // turn GPS on
-  var gnss_select="1";
-  js += `Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnss_select)}")\n`; // set GNSS mode
-  // What about:
-  // NAV-TIMEUTC (0x01 0x10)
-  // NAV-PV (0x01 0x03)
-  // or AGPS.zip uses AID-INI (0x0B 0x01)
-
-  for (var i=0;i<bin.length;i+=chunkSize) {
-    var chunk = bin.substr(i,chunkSize);
-    js += `Serial1.write(atob("${btoa(chunk)}"))\n`;
-  }
-  return js;
-}
-
-function CASIC_CHECKSUM(cmd) {
-  var cs = 0;
-  for (var i=1;i<cmd.length;i++)
-    cs = cs ^ cmd.charCodeAt(i);
-  return cmd+"*"+cs.toString(16).toUpperCase().padStart(2, '0');
-}
-
-function display(text1, text2, next) {
+function display(text1, text2) {
   g.reset();
   g.clear();
   var img = require("Storage").read("agpsdata.img");
   if (img) {
-    g.drawImage(img, g.getWidth() - 48, g.getHeight()-48-24);
+    g.drawImage(img, g.getWidth() - 48, g.getHeight() - 48 - 24);
   }
-  g.setFont("Vector", 30);
+  g.setFont("Vector", 18);
   g.setFontAlign(0, 1);
   g.drawString(text1, g.getWidth() / 2, g.getHeight() / 3 + 24);
-  g.setFont("Vector", 15);
-  g.setFontAlign(-1, -1);
-  g.drawString(text2, 0, g.getHeight() / 3 + 29);
+  if (text2 != undefined) {
+    g.setFont("Vector", 12);
+    g.setFontAlign(-1, -1);
+    g.drawString(text2, 5, g.getHeight() / 3 + 29);
+  }
   Bangle.drawWidgets();
-  nextStep = null;
-  if (next) {
-    nextStep = next;
-  }
 }
 
-function httpTest() {
-  counter++;  
-  display("AGPS Data", "Touch for start", () => {
-    display("Request...", "Touch for restart", httpTest);
-    if (Bluetooth.println) {
-      console.log("On device");
-      Bluetooth.println(JSON.stringify({t:"info", msg:"HTTP Request"}));
-      Bluetooth.println(JSON.stringify({t:"http", url:"https://www.espruino.com/agps/casic.base64"}));
-    }
-    else {
-      console.log("Testing on Emulator");
-      setTimeout(() => {
-        GB({t:"http", resp:testData});
-      }, 1);
-    }
-  });
-}
-
-var nextStep = null;
-
-Bangle.on("touch", () => {
-  if (nextStep) {
-    nextStep();
-  }
-});
-
-httpTest();
-
 // Show launcher when middle button pressed
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
+let waiting = false;
 
-/*
-require("Storage").write("httptest.info",{
-  "id":"httptest",
-  "name":"Http Test",
-  "src":"httptest.js",
-  "icon":"wristlight.img"
-});
-*/
+function start() {
+  g.reset();
+  g.clear();
+  waiting = false;
+  display("Retry?", "touch to retry");
+  Bangle.on("touch", () => { updateAgps(); });
+}
 
-var testData = "QUdOU1MgZGF0YSBmcm9tIENBU0lDLgpEYXRhTGVuZ3RoOiAyNTk4LgpMaW1pdGF0aW9uOiAzLzEwMDAuCrrOSAAIB7YdxSr+Sg2h8NYlBux1jiUgQbrXgJk/KJvFZVv8pP//uy3i/PH6rv9EMQH6SwBfAOxepgDsXgAAlCULALv/AAtCAAAAAQMAALQ7kly6zkgACAdBzVam9HANoXGycgoqGmnG5X9h3mKrWicvBKhXAp7//+00U/9j/jP/SDHM/Vn/JADrXqYA614AAF6d6v8DAADaEAAAAAIDAADKmrVTus5IAAgHTUirJrjvDKHJDjACcmXJJ+8Lv6rw5LQnl4OChUCt//9XKG3/+u6ZE84ZQuwDAMf/7F6mAOxeAADa0Pb/mP8ABDUAAAADAwAA4pBeVLrOSAAIB5291DTIzAyhJGfzAJ7pCIcIUQMgcfEoJ2TIjrHkqv//YjDTCKj/wRPdGIz/8/9NAOxepgDsXgAAl9/6/yQAAPbhAAAABAMAAIJ7sXC6zkgACAeKKDOgmwEOocKrFwP8Jmgqq4lOQ1VtLSfEi8yDVqn//5MskP6E7WQRPxzv6vv/0//sXqYA7F4AAM4w/f/0/wDoJwAAAAUDAABcUW5Hus5IAAgHu+Va48nxDaFaw0UBkVc73Y3FB+HFmDgoUWIPW+Ck//+iLcf9X/t5/ikzgPrT/wgA7F6mAOxeAAADVgsAiQAACB0AAAAGAwAAvsu9zbrOSAAIB0OVp/7+JQ2hFANPCF+F6KOOMwe9/nC5JsX0CtthqP//WzhzADr/dgqbIRj/nwDj/+xepgDsXgAAP4oKAPv/AOg4AAAABwMAAM4qVwS6zkgACAey9J9b+zwOofLIzwObDg0HLdEmMOA3PydWaUQvr6b//0wxwf/7EJ8K/yLREhkANADsXqYA7F4AALug/f/y/wALLAAAAAgDAACs6Ue+us5IAAgHm7NJLLhaDKEumRQBAFtVTExfuke3AeEmNg9cr2Cq//92MTIJm/63FCkXPv4gABgA616mAOteAACQQfX/HgAAAzUAAAAJAwAAfmebX7rOSAAIB9fgVnnchw2hNlTrAyWnJ5rnBMWFV9GyJzPfZYV8rf//Oyh2AA3xmhLdGtXu/f/Z/+xepgDsXgAA8gXx/37/AAU/AAAACgMAAPbBtfm6zkgACAc+F7Ct97wMoVEVPQCJJG1yeakXMm80PSet+BBd+aH//5AzPf2J+uX97jG7+fj/DgDsXqYA7F4AAGqE//8WAADufQIAAAsDAADELmhius5IAAgHW3g6rwRJDqFpPmYEPf8lNRy9lKO/IX8nJPRjCLOt//90Lir7QQcEGFYUTAguAA4A7F6mAOxeAADrZfj/zP8A5SsAAAAMAwAA/vB8ZbrOSAAIB1mVSsfiXw2hUX8RA60JSyUgLkEgC910JykTq7Usqv//8S9rBw//HhIpGyT/+v8fAOxepgDsXgAAitgKAD4AAOcpAAAADQMAAPoqnZW6zkgACAcCLzz8Q1ANocBvBQFuUWqAxVSgoRjR0SaS5AkH3qr//7cx3vlcB2AYPROjCOr/vf/sXqYA7F4AAA5Y/P/7/wDvGwMAAA4DAABMXoD/us5IAAgH+RiyseCLDKGnOjkHATiXLOud6AnbGuclr2roqg2l///FNxcHi/0hFLoW4fyj/10A7F6mAOxeAAANRf7/GgAA6TQAAAAPAwAAOjJsarrOSAAIB1/+xFM3Xg2hVDKBBg6Tsx25u5hYROV9J/QyJQmLrf//zC1e+7QGxRfmFOAHhf+s/+xepgDsXgAAaE/v/+j/AOonAAAAEAMAAAb9ka66zkgACAc74z4AUZEMofLN6wbbUEjD/w54MWPC3SfOFa4yQ6f//4wtrwH5EOwKOCRTFLz/UP/sXqYA7F4AAOaAFAApAADoOQAAABEDAAC+xoUHus5IAAgH1yXSbYfZDaFOrzwBIM5keona3uYD8JYnC6ekWw+l//8JMC/9ivsaAGEwM/ssAN//7F6mAOxeAAAymwQAof8A7l8AAAASAwAA9kus4rrOSAAIB/9znedCsA2h5VDBBLdHG1Uw8P6P93bRJw5UgTR9qf//LS1BAj0TAwkqJioWBABHAOxepgDsXgAAD54FACwAAN6xAAAAEwMAAEboQta6zkgACAdVJvSzetsMoRclcgKU4/OAvUl5A73wdCYbpBB/P6X//08yQ/4N7voNgx5160gAFwDsXqYA7F4AADa+EADk/wDuLwAAABQDAADyTPBuus5IAAgHhpZXHJnuDaGfsmkMbSLS2QeTnDZBLR8ntwGPV8mj//+SM6n8rftj/EUyZfw7AaX/7F6mAOxeAAAvSQUAAAAA6j4AAAAVAwAAVC23P7rOSAAIB8FSSGuHmw2hXoTeBoU+tLS9TdsrYGopJ+h3h7O9p///mjEIB3X/GhN5GXP/c//V/+xepgDsXgAASREJADgAAO4rAAAAFgMAAMqlmN26zkgACAeGsPJwF8ENoU2cJwHhxiN62PG7uVyKfydPWVyEG6z//8spSgCQ8NkRnxsl7sr/EQDsXqYA7F4AAI0S///u/wDudQEAABcDAABUYe3ous5IAAgHtHJyvWVdDaFr1mwGwPVWIZcaxOQXwAwmeHqW1+Sh//+PPnAAQgAOCxwhof8sAGwA7F6mAOxeAAAhMQcAtf8ABjsAAAAYAwAAsOXsgbrOSAAIB4nxObhoSQ2hOjBcBf2n5ijflOaX/Iz8JpPiNAUTrP//ajEL++oEchfzE9AFSgDT/+tepgDrXgAAohMLACkAAAweAAAAGQMAAFrje3e6zkgACAexAdJ/MyYOoeXvjwPazb0PcXcXfIVaNCZ2mjMDkqn//z02W/qPBMcW7BM7BcX/6//sXqYA7F4AABv4BgAVAAAPIgAAABoDAACqA6wGus5IAAgHxYz/b8dNDaH6/WQF3AILHLKDgTJ+VponRocZMKSm//8bLycAMRANDG8i/RHR/2wA7F6mAOxeAAArEwcAHAAABEgAAQAbAwAA0hkH57rOSAAIB5HXkJcOjA2h8B4kAebzvl2gmkU1K1TzJ86wODP6qP//0CzCAM4OmQrkI1UR7f/n/+xepgDsXgAAcs/u/9//AOplAAAAHQMAAGqvKTa6zkgACAekogIGh+8NoYBTBQMDtQeTiKQ4u0KYHiYkF4HbzaT//7A80v9N/gQLmSC4/icA6v/sXqYA7F4AAB2V7v/2/wAIGQAAAB4DAACQRQ0Tus5IAAgHUsOCUJ71DaHkPFgFdJcpEDguP6ldR+UmgbrM2+6m//9vOPT/S/7vC1sh6/49AJH/7F6mAOxeAAAQCfr/8/8A4wwAAAAfAwAA7IYNqLrOSAAIByZDZIfa4AyhxlEVA9QtFKN+R+1NPIIIJ8xm1q8Qqv//djDzB9H+pBNQGGj+rv++/+xepgDsXgAA3f/6/67/AAFUAAAAIAMAAJSG0BW6zhQACAWVGZOmAAAAAPr///8SEpCmiQcDAD4zLlK6zhAACAZIDf33DwP+/jYK//gDAAAAoBoC9g==";
+function updateAgps() {
+  g.reset();
+  g.clear();
+  if (!waiting) {
+    waiting = true;
+    display("Updating A-GPS...");
+    require("agpsdata").pull(function() {
+      waiting = false;
+      display("A-GPS updated.", "touch to close");
+      Bangle.on("touch", () => { load(); });
+    },
+    function(error) {
+      waiting = false;
+      E.showAlert(error, "Error")
+                    .then(() => { start(); });
+    });
+  } else {
+    display("Waiting...");
+  }
+}
+updateAgps();
diff --git a/apps/agpsdata/boot.js b/apps/agpsdata/boot.js
new file mode 100644
index 000000000..2b1e6819c
--- /dev/null
+++ b/apps/agpsdata/boot.js
@@ -0,0 +1,26 @@
+(function() {
+  let waiting = false;
+  let settings = require("Storage").readJSON("agpsdata.settings.json", 1) || {
+    enabled: true,
+    refresh: 1440
+  };
+  
+  if (settings.refresh == undefined) settings.refresh = 1440;
+
+  function successCallback(){
+    waiting = false;
+  }
+
+  function errorCallback(){
+    waiting = false;
+  }
+
+  if (settings.enabled) {
+    setInterval(() => {
+      if (!waiting && NRF.getSecurityStatus().connected){
+        waiting = true;
+        require("agpsdata").pull(successCallback, errorCallback);
+      }
+    }, settings.refresh * 1000 * 60);
+  }
+})();
diff --git a/apps/agpsdata/default.json b/apps/agpsdata/default.json
new file mode 100644
index 000000000..0b6e0cecf
--- /dev/null
+++ b/apps/agpsdata/default.json
@@ -0,0 +1 @@
+{"enabled":true,"refresh":1440,"gnsstype":1}
diff --git a/apps/agpsdata/lib.js b/apps/agpsdata/lib.js
new file mode 100644
index 000000000..7d9758c0a
--- /dev/null
+++ b/apps/agpsdata/lib.js
@@ -0,0 +1,75 @@
+function readSettings() {
+  settings = Object.assign(
+      require('Storage').readJSON("agpsdata.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {});
+}
+
+var FILE = "agpsdata.settings.json";
+var settings;
+readSettings();
+
+function setAGPS(data) {
+  var js = jsFromBase64(data);
+  try {
+    eval(js);
+    return true;
+  }
+  catch(e) {
+    console.log("error:", e);
+  }
+  return false;
+}
+
+function jsFromBase64(b64) {
+  var bin = atob(b64);
+  var chunkSize = 128;
+  var js = "Bangle.setGPSPower(1);\n"; // turn GPS on
+  var gnsstype = settings.gnsstype || 1; // default GPS
+  js += `Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnsstype)}")\n`; // set GNSS mode
+  // What about:
+  // NAV-TIMEUTC (0x01 0x10)
+  // NAV-PV (0x01 0x03)
+  // or AGPS.zip uses AID-INI (0x0B 0x01)
+
+  for (var i=0;i<bin.length;i+=chunkSize) {
+    var chunk = bin.substr(i,chunkSize);
+    js += `Serial1.write(atob("${btoa(chunk)}"))\n`;
+  }
+  return js;
+}
+
+function CASIC_CHECKSUM(cmd) {
+  var cs = 0;
+  for (var i=1;i<cmd.length;i++)
+    cs = cs ^ cmd.charCodeAt(i);
+  return cmd+"*"+cs.toString(16).toUpperCase().padStart(2, '0');
+}
+
+function updateLastUpdate() {
+  const file = "agpsdata.json";
+  let data = require("Storage").readJSON(file, 1) || {};
+  data.lastUpdate = Math.round(Date.now());
+  require("Storage").writeJSON(file, data);
+}
+
+exports.pull = function(successCallback, failureCallback) {
+  let uri = "https://www.espruino.com/agps/casic.base64";
+  if (Bangle.http){
+    Bangle.http(uri, {timeout:10000}).then(event => {
+      let result = setAGPS(event.resp);
+      if (result) {
+          updateLastUpdate();
+          if (successCallback) successCallback();
+      } else {
+          console.log("error applying AGPS data");
+          if (failureCallback) failureCallback("Error applying AGPS data");
+      }
+    }).catch((e)=>{
+      console.log("error", e);
+      if (failureCallback) failureCallback(e);
+    });
+  } else {
+    console.log("error: No http method found");
+    if (failureCallback) failureCallback(/*LANG*/"No http method");
+  }
+};
diff --git a/apps/agpsdata/metadata.json b/apps/agpsdata/metadata.json
index af51f3a10..1ce299532 100644
--- a/apps/agpsdata/metadata.json
+++ b/apps/agpsdata/metadata.json
@@ -1,16 +1,24 @@
 { "id": "agpsdata",
-  "name": "A-GPS Data",
-  "shortName":"AGPS Data",
+  "name": "A-GPS Data Downloader App",
+  "shortName":"A-GPS Data",
   "icon": "agpsdata.png",
-  "version":"0.01",
-  "description": "Download assisted GPS data directly to watch",
-  "tags": "assisted,gps,agps,http",
+  "version":"0.03",
+  "description": "Once installed, this app allows you to download assisted GPS (A-GPS) data directly to your Bangle.js **via Gadgetbridge on an Android phone** when you run the app. If you just want to upload the latest AGPS data from this app loader, please use the `Assisted GPS Update (AGPS)` app.",
+  "tags": "boot,tool,assisted,gps,agps,http",
   "allow_emulator":true, 
   "supports": ["BANGLEJS2"],
   "readme":"README.md",
-  "screenshots" : [ { "url":"screenshot.png" }, { "url":"screenshot2.png" }, { "url":"screenshot3.png" }, { "url":"screenshot4.png" }, { "url":"screenshot5.png" } ],
+  "screenshots" : [ { "url":"screenshot.png" }, { "url":"screenshot2.png" } ],
   "storage": [
     {"name":"agpsdata.app.js","url":"app.js"},
-    {"name":"agpsdata.img","url":"agpsdata-icon.js","evaluate":true}
+    {"name":"agpsdata.img","url":"agpsdata-icon.js","evaluate":true},
+    {"name":"agpsdata.default.json","url":"default.json"},
+    {"name":"agpsdata.boot.js","url":"boot.js"},
+    {"name":"agpsdata","url":"lib.js"},
+    {"name":"agpsdata.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name": "agpsdata.json"},
+    {"name": "agpsdata.settings.json"}
   ]
 }
diff --git a/apps/agpsdata/screenshot.png b/apps/agpsdata/screenshot.png
index fae53ba85..1fcb2d8ee 100644
Binary files a/apps/agpsdata/screenshot.png and b/apps/agpsdata/screenshot.png differ
diff --git a/apps/agpsdata/screenshot2.png b/apps/agpsdata/screenshot2.png
index 7cdba1487..7c546e4b5 100644
Binary files a/apps/agpsdata/screenshot2.png and b/apps/agpsdata/screenshot2.png differ
diff --git a/apps/agpsdata/screenshot3.png b/apps/agpsdata/screenshot3.png
deleted file mode 100644
index be152ba28..000000000
Binary files a/apps/agpsdata/screenshot3.png and /dev/null differ
diff --git a/apps/agpsdata/screenshot4.png b/apps/agpsdata/screenshot4.png
deleted file mode 100644
index 305a166d0..000000000
Binary files a/apps/agpsdata/screenshot4.png and /dev/null differ
diff --git a/apps/agpsdata/screenshot5.png b/apps/agpsdata/screenshot5.png
deleted file mode 100644
index 6468a1872..000000000
Binary files a/apps/agpsdata/screenshot5.png and /dev/null differ
diff --git a/apps/agpsdata/settings.js b/apps/agpsdata/settings.js
new file mode 100644
index 000000000..64fa25330
--- /dev/null
+++ b/apps/agpsdata/settings.js
@@ -0,0 +1,71 @@
+(function(back) {
+function writeSettings(key, value) {
+  var s = Object.assign(
+      require('Storage').readJSON(settingsDefaultFile, true) || {},
+      require('Storage').readJSON(settingsFile, true) || {});
+  s[key] = value;
+  require('Storage').writeJSON(settingsFile, s);
+  readSettings();
+}
+
+function readSettings() {
+  settings = Object.assign(
+      require('Storage').readJSON(settingsDefaultFile, true) || {},
+      require('Storage').readJSON(settingsFile, true) || {});
+}
+
+var settingsFile = "agpsdata.settings.json";
+var settingsDefaultFile = "agpsdata.default.json";
+
+var settings;
+readSettings();
+
+const gnsstypes = [
+  "", "GPS", "BDS", "GPS+BDS", "GLONASS", "GPS+GLONASS", "BDS+GLONASS",
+  "GPS+BDS+GLON."
+];
+
+function buildMainMenu() {
+  var mainmenu = {
+    '' : {'title' : 'AGPS download'},
+    '< Back' : back,
+    "Enabled" : {
+      value : !!settings.enabled,
+      onchange : v => { writeSettings("enabled", v); }
+    },
+    "Refresh every" : {
+      value : settings.refresh / 60,
+      min : 6,
+      max : 168,
+      step : 1,
+      format : v => v + "h",
+      onchange : v => { writeSettings("refresh", Math.round(v * 60)); }
+    },
+    "GNSS type" : {
+      value : settings.gnsstype,
+      min : 1,
+      max : 7,
+      step : 1,
+      format : v => gnsstypes[v],
+      onchange : x => writeSettings('gnsstype', x)
+    },
+    "Force refresh" : () => {
+      E.showMessage("Loading A-GPS data");
+      require("agpsdata")
+          .pull(
+              function() {
+                E.showAlert("Success").then(
+                    () => { E.showMenu(buildMainMenu()); });
+              },
+              function(error) {
+                E.showAlert(error, "Error")
+                    .then(() => { E.showMenu(buildMainMenu()); });
+              });
+    }
+  };
+
+  return mainmenu;
+}
+
+E.showMenu(buildMainMenu());
+});
diff --git a/apps/aiclock/ChangeLog b/apps/aiclock/ChangeLog
new file mode 100644
index 000000000..31c55aef1
--- /dev/null
+++ b/apps/aiclock/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New app!
+0.02: Design improvements and fixes.
+0.03: Indicate battery level through line occurrence.
\ No newline at end of file
diff --git a/apps/aiclock/README.md b/apps/aiclock/README.md
new file mode 100644
index 000000000..9e23de3a6
--- /dev/null
+++ b/apps/aiclock/README.md
@@ -0,0 +1,23 @@
+# AI Clock
+This clock was designed by stable diffusion ([paper](https://arxiv.org/abs/2112.10752)) using the following prompt:
+
+`A rectangle banglejs watchface`
+
+
+The original output of stable diffusion is shown here:
+
+![](orig.png)
+
+My implementation is shown below. Note that horizontal lines occur randomly, but the
+probability is correlated with the battery level. So if your screen contains only
+a few lines its time to charge your bangle again ;)
+
+![](impl.png)
+
+
+# Thanks to
+The great open-source community: I used an open-source diffusion model (https://github.com/CompVis/stable-diffusion)
+to generate a watch face for the open-source smartwatch BangleJs.
+
+## Creator
+- [David Peer](https://github.com/peerdavid).
\ No newline at end of file
diff --git a/apps/aiclock/aiclock.app.js b/apps/aiclock/aiclock.app.js
new file mode 100644
index 000000000..dbd053f2c
--- /dev/null
+++ b/apps/aiclock/aiclock.app.js
@@ -0,0 +1,225 @@
+/**
+ * AI Clock
+ */
+require("Font7x11Numeric7Seg").add(Graphics);
+Graphics.prototype.setFontGochiHand = function(scale) {
+    // Actual height 27 (29 - 3)
+    this.setFontCustom(
+      atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAA8AAAAADwAAAAAPAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAA/+AAAB//4AAH///gAH///gAAf//AAAB/+AAAAH8AAAAAAAAAAAAAAAAAAAAH8AAAAB/8AAAAP/4AAAB//wAAAPx/AAAB8B+AAAHgD4AAA+AHgAADwAeAAAPAB4AAA8AHgAAD4AeAAAPgB4AAAeAPgAAB8A8AAAH4HwAAAP/+AAAAf/wAAAA/+AAAAB/wAAAAB8AAAAAAAAAAADgAAAAAfAAAAAB4AAAAAPAAAAAB8AAAAAHgAAAAA8AAAAADwAAAAAf4AAAAB//8AAAD//4AAAH//gAAAD/+AAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AHgAAHgA+AAA/AD4AAD4AfgAAfAD+AAB4Af4AAHgD/gAAeAfeAAB4D54AAHw/HgAAf/4fAAA//B8AAD/4DwAAH+APAAAHgA8AAAAADwAAAAAOAAAAAAAAABgAAAAAPAAAAAB8AAAAAHwAYAAAeAD4AAD4APwAAPA4fgAA8Hw+AADwfB4AAPh4HwAA+HgPAAB/+A8AAH/4DwAAP/weAAAf/j4AAAc//gAAAB/8AAAAD/gAAAAD8AAAAAAAAAAAAAAAAAADAAAAAA+AAAAAP4AAAAB/wAAAAP/AAAAD+8AAAAfzwAAAf8HAAAB/gcAAAH/hwAAAf//gAAA//+AAAAf//gAAAP//gAAAD/+AAAAB/4AAAAH/AAAAAeAAAAAAgAAAAAAAAAAAAcAAAB8H8AAAP4f4AAA/x/wAAD/H/gAAf+A+AAB74B4AAHnwHgAAefAfAAB58A8AAHj4DwAAePgPAAB4fA8AAHh+HgAAeD8+AAB4P/4AAHgf/AAAeA/4AAAAA+AAAAAAAAAAAAAAAAAAHgAAAAD/wAAAA//gAAAH//AAAA//+AAAD4H8AAAfA/wAAB4D/AAAHgP+AAAeB54AAB4HngAAHweeAAAfB54AAA4HngAAAAeeAAAAB/4AAAAH/AAAAAP4AAAAAfAAADwAAAAAPAAAAAA8HgAAADweAAAAPB4AAAA8HgAAADweAAAAPh4AAAA+HgAAAB4eAAAAHx4AAAAf//8AAA///wAAD//+AAAH//4AAAAeAAAAAB4AAAAAHgAAAAAeAAAAAB4AAAAAHgAAAAAAAAAAAAAAAAAAD+AAAA+f+AAAH//8AAA///wAAH/4fgAAePgeAAB4+B4AAHj4HwAAePgPAAB4+A8AAHz4DwAAfngeAAA//B4AAD/+HgAAH//8AAAP//wAAAAf+AAAAA/wAAAAAYAAAAAAAAAAA/gAAAAH/AAAAA/8AAAAD34AAAAeHgAAAB4eAAAAHh4AAAA8HgAAADweAAAAPDwAAAA8PAAAADx4AAAAPvgAAAAf///AAB///8AAH///wAAP///AAA/wA4AABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOA4AAAA8DwAAADwPAAAAPA8AAAAYBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
+      46,
+      atob("DQoXEBQVExUUFRYUDQ=="),
+      40+(scale<<8)+(1<<16)
+    );
+    return this;
+}
+
+/*
+ * Set some important constants such as width, height and center
+ */
+var W = g.getWidth(),R=W/2;
+var H = g.getHeight();
+var cx = W/2;
+var cy = H/2;
+var drawTimeout;
+
+/*
+ * Based on the great multi clock from https://github.com/jeffmer/BangleApps/
+ */
+Graphics.prototype.drawRotRect = function(w, r1, r2, angle) {
+    angle = angle % 360;
+    var w2=w/2, h=r2-r1, theta=angle*Math.PI/180;
+    return this.fillPoly(this.transformVertices([-w2,0,-w2,-h,w2,-h,w2,0],
+        {x:cx+r1*Math.sin(theta),y:cy-r1*Math.cos(theta),rotate:theta}));
+};
+
+
+function drawBackground() {
+    g.setFontAlign(0,0);
+    g.setColor(g.theme.fg);
+
+    var bat = E.getBattery() / 100.0;
+    var y = 0;
+    while(y < H){
+        // Show less lines in case of small battery level.
+        if(Math.random() > bat){
+            y += 5;
+            continue;
+        }
+
+        y += 3 + Math.floor(Math.random() * 10);
+        g.drawLine(0, y, W, y);
+        g.drawLine(0, y+1, W, y+1);
+        g.drawLine(0, y+2, W, y+2);
+        y += 2;
+    }
+}
+
+
+function drawCircle(isLocked){
+    g.setColor(g.theme.fg);
+    g.fillCircle(cx, cy, 12);
+
+    var c = isLocked ? "#f00" : g.theme.bg;
+    g.setColor(c);
+    g.fillCircle(cx, cy, 6);
+}
+
+function toAngle(a){
+    if (a < 0){
+        return 360 + a;
+    }
+
+    if(a > 360) {
+        return 360 - a;
+    }
+
+    return a
+}
+
+function drawTime(){
+    var drawHourHand = g.drawRotRect.bind(g,8,12,R-38);
+    var drawMinuteHand = g.drawRotRect.bind(g,6,12,R-12 );
+
+    g.setFontAlign(0,0);
+
+    // Compute angles
+    var date = new Date();
+    var m = parseInt(date.getMinutes() * 360 / 60);
+    var h = date.getHours();
+    h = h > 12 ? h-12 : h;
+    h += date.getMinutes()/60.0;
+    h = parseInt(h*360/12);
+
+    // Draw minute and hour bg
+    g.setColor(g.theme.bg);
+    drawHourHand(toAngle(h-3));
+    drawHourHand(toAngle(h+3));
+    drawMinuteHand(toAngle(m-2));
+    drawMinuteHand(toAngle(m+3));
+
+    // Draw minute and hour fg
+    g.setColor(g.theme.fg);
+    drawHourHand(h);
+    drawMinuteHand(m);
+}
+
+
+
+function drawDate(){
+    var date = new Date();
+    g.setFontAlign(0,0);
+    g.setFontGochiHand();
+
+    var text = ("0"+date.getDate()).substr(-2) + "/" + ("0"+(date.getMonth()+1)).substr(-2);
+    var w = g.stringWidth(text);
+    g.setColor(g.theme.bg);
+    g.fillRect(cx-w/2-4, 20, cx+w/2+4, 40+12);
+
+    g.setColor(g.theme.fg);
+    // Draw right line as designed by stable diffusion
+    g.drawLine(cx+w/2+5, 20, cx+w/2+5, 40+12);
+    g.drawLine(cx+w/2+6, 20, cx+w/2+6, 40+12);
+    g.drawLine(cx+w/2+7, 20, cx+w/2+7, 40+12);
+
+    // And finally the text
+    g.drawString(text, cx, 40);
+}
+
+
+function drawDigits(){
+    var date = new Date();
+
+    g.setFontAlign(0,0);
+    g.setFont("7x11Numeric7Seg",3);
+
+    var text = ("0"+date.getHours()).substr(-2) + ":" + ("0"+date.getMinutes()).substr(-2); //Bangle.getHealthStatus("day").steps;
+    var w = g.stringWidth(text);
+    g.setColor(g.theme.bg);
+    g.fillRect(cx-w/2-4, 120, cx+w/2+4, 140+20);
+
+    // Draw right line as designed by stable diffusion
+    g.setColor(g.theme.fg);
+    g.drawLine(cx+w/2+5, 120, cx+w/2+5, 140+20);
+    g.drawLine(cx+w/2+6, 120, cx+w/2+6, 140+20);
+    g.drawLine(cx+w/2+7, 120, cx+w/2+7, 140+20);
+
+    // And the 7set text
+    g.setColor("#BBB");
+    g.drawString("88:88", cx, 140);
+    g.drawString("88:88", cx+1, 140);
+    g.drawString("88:88", cx, 141);
+
+    g.setColor(g.theme.fg);
+    g.drawString(text, cx, 140);
+    g.drawString(text, cx+1, 140);
+    g.drawString(text, cx, 141);
+}
+
+
+
+function draw(){
+    // Queue draw in one minute
+    queueDraw();
+
+
+    g.reset();
+    g.clearRect(0, 0, g.getWidth(), g.getHeight());
+
+    g.setColor(1,1,1);
+    drawBackground();
+    drawDate();
+    drawDigits();
+    drawTime();
+    drawCircle(Bangle.isLocked());
+}
+
+
+/*
+ * Listeners
+ */
+Bangle.on('lcdPower',on=>{
+    if (on) {
+        draw(true);
+    } else { // stop draw timer
+        if (drawTimeout) clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+    }
+});
+
+Bangle.on('lock', function(isLocked) {
+    drawCircle(isLocked);
+});
+
+
+/*
+ * Some helpers
+ */
+function queueDraw() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      draw();
+    }, 60000 - (Date.now() % 60000));
+}
+
+
+
+/*
+ * Lets start widgets, listen for btn etc.
+ */
+// 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:"#fff",fg:"#000",dark:false}).clear();
+draw();
+
+// After drawing the watch face, we can draw the widgets
+// Bangle.drawWidgets();
diff --git a/apps/aiclock/aiclock.icon.js b/apps/aiclock/aiclock.icon.js
new file mode 100644
index 000000000..0033b3848
--- /dev/null
+++ b/apps/aiclock/aiclock.icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgP/ACfAEZU/ECZELIKhSR/+PAoWAv4FDhk/x/ggP+j0fx/AgP8n8PCIX8CwIFC/F/w4FBgP4gEHC4QFE//w//DC4QFB8YFC+P/8IdCAoYdBAoPxDoQAd+CiKh4dQwDhfAA4A="))
\ No newline at end of file
diff --git a/apps/aiclock/aiclock.png b/apps/aiclock/aiclock.png
new file mode 100644
index 000000000..104261254
Binary files /dev/null and b/apps/aiclock/aiclock.png differ
diff --git a/apps/aiclock/impl.png b/apps/aiclock/impl.png
new file mode 100644
index 000000000..92374b680
Binary files /dev/null and b/apps/aiclock/impl.png differ
diff --git a/apps/aiclock/metadata.json b/apps/aiclock/metadata.json
new file mode 100644
index 000000000..2124b1b7e
--- /dev/null
+++ b/apps/aiclock/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "aiclock",
+  "name": "AI Clock",
+  "shortName":"AI Clock",
+  "icon": "aiclock.png",
+  "version":"0.03",
+  "readme": "README.md",
+  "supports": ["BANGLEJS2"],
+  "description": "A watch face that was designed by an AI (stable diffusion) and implemented by a human.",
+  "type": "clock",
+  "tags": "clock",
+  "screenshots": [
+    {"url":"orig.png"},
+    {"url":"impl.png"}
+  ],
+  "storage": [
+    {"name":"aiclock.app.js","url":"aiclock.app.js"},
+    {"name":"aiclock.img","url":"aiclock.icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/aiclock/orig.png b/apps/aiclock/orig.png
new file mode 100644
index 000000000..009826454
Binary files /dev/null and b/apps/aiclock/orig.png differ
diff --git a/apps/alpinenav/ChangeLog b/apps/alpinenav/ChangeLog
new file mode 100644
index 000000000..b3d1e0874
--- /dev/null
+++ b/apps/alpinenav/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/alpinenav/app.js b/apps/alpinenav/app.js
index 29eeab0c9..7cffc39c3 100644
--- a/apps/alpinenav/app.js
+++ b/apps/alpinenav/app.js
@@ -224,7 +224,7 @@ Bangle.on('mag', function (m) {
     if (isNaN(m.heading))
         compass_heading = "---";
     else
-        compass_heading = 360 - Math.round(m.heading);
+        compass_heading = Math.round(m.heading);
     current_colour = g.getColor();
     g.reset();
     g.setColor(background_colour);
diff --git a/apps/alpinenav/metadata.json b/apps/alpinenav/metadata.json
index dcb56e912..c5a0e0611 100644
--- a/apps/alpinenav/metadata.json
+++ b/apps/alpinenav/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "alpinenav",
   "name": "Alpine Nav",
-  "version": "0.01",
+  "version": "0.02",
   "description": "App that performs GPS monitoring to track and display position relative to a given origin in realtime",
   "icon": "app-icon.png",
   "tags": "outdoors,gps",
diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index 76658af49..a65326941 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -11,4 +11,6 @@
 0.10: Fix SMS bug
 0.12: Use default Bangle formatter for booleans
 0.13: Added Bangle.http function (see Readme file for more info)
-0.14: Fix timeout of http function not beeing cleaned up
+0.14: Fix timeout of http function not being cleaned up
+0.15: Allow method/body/headers to be specified for `http` (needs Gadgetbridge 0.68.0b or later)
+0.16: Bangle.http now fails immediately if there is no Bluetooth connection (fix #2152)
diff --git a/apps/android/boot.js b/apps/android/boot.js
index 99d4dbb2c..0d1edae99 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -139,6 +139,8 @@
   // options = {id,timeout,xpath}
   Bangle.http = (url,options)=>{
     options = options||{};
+    if (!NRF.getSecurityStatus().connected)
+      return Promise.reject("Not connected to Bluetooth");
     if (Bangle.httpRequest === undefined)
       Bangle.httpRequest={};
     if (options.id === undefined) {
@@ -150,6 +152,9 @@
     //send the request
     var req = {t: "http", url:url, id:options.id};
     if (options.xpath) req.xpath = options.xpath;
+    if (options.method) req.method = options.method;
+    if (options.body) req.body = options.body;
+    if (options.headers) req.headers = options.headers;
     gbSend(req);
     //create the promise
     var promise = new Promise(function(resolve,reject) {
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index 91f74c36f..ab340340c 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.14",
+  "version": "0.16",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",
diff --git a/apps/animclk/ChangeLog b/apps/animclk/ChangeLog
index 348448c34..76d15bdb1 100644
--- a/apps/animclk/ChangeLog
+++ b/apps/animclk/ChangeLog
@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Fix bug if image clock wasn't installed
 0.03: Update to use setUI
+0.04: Tell clock widgets to hide. Move loadWidgets() so it only runs on
+startup and not on every draw.
diff --git a/apps/animclk/app.js b/apps/animclk/app.js
index 4bf63daf6..bdc399fbe 100644
--- a/apps/animclk/app.js
+++ b/apps/animclk/app.js
@@ -87,7 +87,6 @@ if (g.drawImages) {
   draw();
   var secondInterval = setInterval(draw,100);
   // load widgets
-  Bangle.loadWidgets();
   Bangle.drawWidgets();
   // Stop when LCD goes off
   Bangle.on('lcdPower',on=>{
@@ -104,3 +103,5 @@ if (g.drawImages) {
 }
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();
diff --git a/apps/animclk/metadata.json b/apps/animclk/metadata.json
index 31dfe453f..0b426a37d 100644
--- a/apps/animclk/metadata.json
+++ b/apps/animclk/metadata.json
@@ -2,7 +2,7 @@
   "id": "animclk",
   "name": "Animated Clock",
   "shortName": "Anim Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/antonclk/ChangeLog b/apps/antonclk/ChangeLog
index f7e95b5fa..4ef0cee75 100644
--- a/apps/antonclk/ChangeLog
+++ b/apps/antonclk/ChangeLog
@@ -10,4 +10,7 @@
       week is buffered until date or timezone changes
 0.07: align default settings with app.js (otherwise the initial displayed settings will be confusing to users)
 0.08: fixed calendar weeknumber not shortened to two digits
-0.09: Use default Bangle formatter for booleans
\ No newline at end of file
+0.09: Use default Bangle formatter for booleans
+0.10: Use Bangle.setUI({remove:...}) to allow loading the launcher without a full reset on 2v16
+0.11: Moved enhanced Anton clock to 'Anton Clock Plus' and stripped this clock back down to make it faster for new users (270ms -> 170ms)
+      Modified to avoid leaving functions defined when using setUI({remove:...})
diff --git a/apps/antonclk/app.js b/apps/antonclk/app.js
index 4b1e71bda..528866588 100644
--- a/apps/antonclk/app.js
+++ b/apps/antonclk/app.js
@@ -1,230 +1,45 @@
 // Clock with large digits using the "Anton" bold font
-
-const SETTINGSFILE = "antonclk.json";
-
 Graphics.prototype.setFontAnton = function(scale) {
   // Actual height 69 (68 - 0)
   g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAA/gAAAAAAAAAAP/gAAAAAAAAAH//gAAAAAAAAB///gAAAAAAAAf///gAAAAAAAP////gAAAAAAD/////gAAAAAA//////gAAAAAP//////gAAAAH///////gAAAB////////gAAAf////////gAAP/////////gAD//////////AA//////////gAA/////////4AAA////////+AAAA////////gAAAA///////wAAAAA//////8AAAAAA//////AAAAAAA/////gAAAAAAA////4AAAAAAAA///+AAAAAAAAA///gAAAAAAAAA//wAAAAAAAAAA/8AAAAAAAAAAA/AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////AAAAAB///////8AAAAH////////AAAAf////////wAAA/////////4AAB/////////8AAD/////////+AAH//////////AAP//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wA//8AAAAAB//4A//wAAAAAAf/4A//gAAAAAAP/4A//gAAAAAAP/4A//gAAAAAAP/4A//wAAAAAAf/4A///////////4Af//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH//////////AAD/////////+AAB/////////8AAA/////////4AAAP////////gAAAD///////+AAAAAf//////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/gAAAAAAAAAAP/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/AAAAAAAAAAA//AAAAAAAAAAA/+AAAAAAAAAAB/8AAAAAAAAAAD//////////gAH//////////gAP//////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAAB/gAAD//4AAAAf/gAAP//4AAAB//gAA///4AAAH//gAB///4AAAf//gAD///4AAA///gAH///4AAD///gAP///4AAH///gAP///4AAP///gAf///4AAf///gAf///4AB////gAf///4AD////gA////4AH////gA////4Af////gA////4A/////gA//wAAB/////gA//gAAH/////gA//gAAP/////gA//gAA///8//gA//gAD///w//gA//wA////g//gA////////A//gA///////8A//gA///////4A//gAf//////wA//gAf//////gA//gAf/////+AA//gAP/////8AA//gAP/////4AA//gAH/////gAA//gAD/////AAA//gAB////8AAA//gAA////wAAA//gAAP///AAAA//gAAD//8AAAA//gAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/+AAAAAD/wAAB//8AAAAP/wAAB///AAAA//wAAB///wAAB//wAAB///4AAD//wAAB///8AAH//wAAB///+AAP//wAAB///+AAP//wAAB////AAf//wAAB////AAf//wAAB////gAf//wAAB////gA///wAAB////gA///wAAB////gA///w//AAf//wA//4A//AAA//wA//gA//AAAf/wA//gB//gAAf/wA//gB//gAAf/wA//gD//wAA//wA//wH//8AB//wA///////////gA///////////gA///////////gA///////////gAf//////////AAf//////////AAP//////////AAP/////////+AAH/////////8AAH///+/////4AAD///+f////wAAA///8P////gAAAf//4H///+AAAAH//gB///wAAAAAP4AAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wAAAAAAAAAA//wAAAAAAAAAP//wAAAAAAAAB///wAAAAAAAAf///wAAAAAAAH////wAAAAAAA/////wAAAAAAP/////wAAAAAB//////wAAAAAf//////wAAAAH///////wAAAA////////wAAAP////////wAAA///////H/wAAA//////wH/wAAA/////8AH/wAAA/////AAH/wAAA////gAAH/wAAA///4AAAH/wAAA//+AAAAH/wAAA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAH/4AAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB//8AAA/////+B///AAA/////+B///wAA/////+B///4AA/////+B///8AA/////+B///8AA/////+B///+AA/////+B////AA/////+B////AA/////+B////AA/////+B////gA/////+B////gA/////+B////gA/////+A////gA//gP/gAAB//wA//gf/AAAA//wA//gf/AAAAf/wA//g//AAAAf/wA//g//AAAA//wA//g//gAAA//wA//g//+AAP//wA//g////////gA//g////////gA//g////////gA//g////////gA//g////////AA//gf///////AA//gf//////+AA//gP//////+AA//gH//////8AA//gD//////4AA//gB//////wAA//gA//////AAAAAAAH////8AAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////gAAAAB///////+AAAAH////////gAAAf////////4AAB/////////8AAD/////////+AAH//////////AAH//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wAf//////////4A//wAD/4AAf/4A//gAH/wAAP/4A//gAH/wAAP/4A//gAP/wAAP/4A//gAP/4AAf/4A//wAP/+AD//4A///wP//////4Af//4P//////wAf//4P//////wAf//4P//////wAf//4P//////wAP//4P//////gAP//4H//////gAH//4H//////AAH//4D/////+AAD//4D/////8AAB//4B/////4AAA//4A/////wAAAP/4AP////AAAAB/4AD///4AAAAAAAAAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//AAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAADgA//gAAAAAAP/gA//gAAAAAH//gA//gAAAAB///gA//gAAAAP///gA//gAAAD////gA//gAAAf////gA//gAAB/////gA//gAAP/////gA//gAB//////gA//gAH//////gA//gA///////gA//gD///////gA//gf///////gA//h////////gA//n////////gA//////////gAA/////////AAAA////////wAAAA///////4AAAAA///////AAAAAA//////4AAAAAA//////AAAAAAA/////4AAAAAAA/////AAAAAAAA////8AAAAAAAA////gAAAAAAAA///+AAAAAAAAA///4AAAAAAAAA///AAAAAAAAAA//4AAAAAAAAAA/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//gB///wAAAAP//4H///+AAAA///8P////gAAB///+f////4AAD///+/////8AAH/////////+AAH//////////AAP//////////gAP//////////gAf//////////gAf//////////wAf//////////wAf//////////wA///////////wA//4D//wAB//4A//wB//gAA//4A//gA//gAAf/4A//gA//AAAf/4A//gA//gAAf/4A//wB//gAA//4A///P//8AH//4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////gAP//////////gAP//////////AAH//////////AAD/////////+AAD///+/////8AAB///8f////wAAAf//4P////AAAAH//wD///8AAAAA/+AAf//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//gAAAAAAAAB///+AA/+AAAAP////gA//wAAAf////wA//4AAB/////4A//8AAD/////8A//+AAD/////+A///AAH/////+A///AAP//////A///gAP//////A///gAf//////A///wAf//////A///wAf//////A///wAf//////A///wA///////AB//4A//4AD//AAP/4A//gAB//AAP/4A//gAA//AAP/4A//gAA/+AAP/4A//gAB/8AAP/4A//wAB/8AAf/4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH/////////+AAD/////////8AAB/////////4AAAf////////wAAAP////////AAAAB///////4AAAAAD/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAB/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("EiAnGicnJycnJycnEw=="), 78 + (scale << 8) + (1 << 16));
 };
 
-Graphics.prototype.setFontAntonSmall = function(scale) {
-  // Actual height 53 (52 - 0)
-  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAAAAAAAAAAAAAMAAAAAAAAD8AAAAAAAA/8AAAAAAAf/8AAAAAAH//8AAAAAB///8AAAAA////8AAAAP////8AAAD/////8AAB//////8AAf//////8AH///////4A///////+AA///////AAA//////wAAA/////8AAAA////+AAAAA////gAAAAA///4AAAAAA//8AAAAAAA//AAAAAAAA/wAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/////wAAA//////8AAB//////+AAH///////gAH///////gAP///////wAf///////4Af///////4A////////8A////////8A////////8A//AAAAD/8A/8AAAAA/8A/8AAAAA/8A/8AAAAA/8A/+AAAAB/8A////////8A////////8A////////8Af///////4Af///////4AP///////wAP///////wAH///////gAD///////AAA//////8AAAP/////wAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAA/4AAAAAAAA/4AAAAAAAB/wAAAAAAAB/wAAAAAAAD/wAAAAAAAD/gAAAAAAAH///////8AP///////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAP8AA//4AAA/8AB//4AAH/8AH//4AAP/8AP//4AA//8AP//4AB//8Af//4AD//8Af//4AP//8A///4Af//8A///4A///8A///4D///8A//AAH///8A/8AAP///8A/8AA//+/8A/8AD//8/8A/+Af//w/8A//////g/8A/////+A/8A/////8A/8Af////4A/8Af////wA/8AP////AA/8AP///+AA/8AH///8AA/8AD///wAA/8AA///AAA/8AAP/4AAA/8AAAAAAAAAAAAAAAAAAAAAAH4AAf/gAAA/4AAf/8AAD/4AAf//AAH/4AAf//gAP/4AAf//wAP/4AAf//wAf/4AAf//4Af/4AAf//4A//4AAf//8A//4AAf//8A//4AAP//8A//A/8AB/8A/8A/8AA/8A/8B/8AA/8A/8B/8AA/8A/+D//AB/8A////////8A////////8A////////8Af///////4Af///////4Af///////wAP///////gAH//9////gAD//4///+AAB//wf//4AAAP/AH//gAAAAAAAAAAAAAAAAAAAAAAAAAAAH/wAAAAAAB//wAAAAAAP//wAAAAAD///wAAAAA////wAAAAH////wAAAB/////wAAAf/////wAAD//////wAA///////wAA/////h/wAA////wB/wAA///8AB/wAA///AAB/wAA//gAAB/wAA////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8AAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAAAAAAAAAAAAAAAAAAAAAP/4AA////4P/+AA////4P//AA////4P//gA////4P//wA////4P//wA////4P//4A////4P//4A////4P//8A////4P//8A////4P//8A/8H/AAB/8A/8H+AAA/8A/8P+AAA/8A/8P+AAA/8A/8P/gAD/8A/8P/////8A/8P/////8A/8P/////8A/8P/////4A/8H/////4A/8H/////wA/8D/////wA/8B/////gA/8A////+AA/8AP///4AAAAAB///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////wAAAf/////8AAB///////AAH///////gAP///////wAP///////wAf///////4Af///////4A////////8A////////8A////////8A/+AH/AB/8A/8AP+AA/8A/4Af+AA/8A/8Af+AA/8A/8Af/gH/8A//4f////8A//4f////8A//4f////8Af/4f////4Af/4f////4AP/4P////wAP/4P////gAH/4H////AAD/4D///+AAB/4B///4AAAP4AP//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/8AAAAAAAA/8AAAAAAAA/8AAAAAB8A/8AAAAB/8A/8AAAAf/8A/8AAAH//8A/8AAA///8A/8AAH///8A/8AA////8A/8AD////8A/8Af////8A/8B/////8A/8P/////8A/8//////8A////////AA///////AAA//////gAAA/////4AAAA/////AAAAA////4AAAAA////AAAAAA///8AAAAAA///gAAAAAA//+AAAAAAA//wAAAAAAA/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/gD//gAAA//4P//8AAD//8f///AAH//+////gAH///////wAP///////4AP///////8Af///////8Af///////+Af///////+A////////+A//B//AB/+A/+A/+AA/+A/8Af+AA/+A/+Af+AA/+A//A//AB/+A////////+Af///////+Af///////+Af///////8Af///////8AP///////4AH///////4AH//+////wAD//+////AAA//4P//+AAAP/gH//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//gAfgAAA///8A/8AAB///+A//AAH////A//gAH////g//wAP////g//wAf////w//4Af////w//4A/////w//8A/////w//8A/////w//8A//gP/wA/8A/8AD/wA/8A/8AD/wAf8A/8AD/gA/8A/+AH/AB/8A////////8A////////8A////////8Af///////4Af///////4Af///////wAP///////wAH///////gAD//////+AAA//////4AAAP/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("DhgeFB4eHh4eHh4eDw=="), 60 + (scale << 8) + (1 << 16));
-};
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+let drawTimeout;
 
-// variables defined from settings
-var secondsMode;
-var secondsColoured;
-var secondsWithColon;
-var dateOnMain;
-var dateOnSecs;
-var weekDay;
-var calWeek;
-var upperCase;
-var vectorFont;
+// Actually draw the watch face
+let draw = function() {
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2;
+  g.reset().clearRect(Bangle.appRect); // clear whole background (w/o widgets)
+  var date = new Date();
+  var timeStr = require("locale").time(date, 1); // Hour and minute
+  g.setFontAlign(0, 0).setFont("Anton").drawString(timeStr, x, y);
+  // Show date and day of week
+  var dateStr = require("locale").date(date, 0).toUpperCase()+"\n"+
+                require("locale").dow(date, 0).toUpperCase();
+  g.setFontAlign(0, 0).setFont("6x8", 2).drawString(dateStr, x, y+48);
 
-// dynamic variables
-var drawTimeout;
-var queueMillis = 1000;
-var secondsScreen = true;
-
-var isBangle1 = (process.env.HWVERSION == 1);
-
-//For development purposes
-/*
-require('Storage').writeJSON(SETTINGSFILE, {
-  secondsMode: "Unlocked", // "Never", "Unlocked", "Always"
-  secondsColoured: true,
-  secondsWithColon: true,
-  dateOnMain: "Long", // "Short", "Long", "ISO8601"
-  dateOnSecs: "Year", // "No", "Year", "Weekday", LEGACY: true/false
-  weekDay: true,
-  calWeek: true,
-  upperCase: true,
-  vectorFont: true,
-});
-*/
-
-// OR (also for development purposes)
-/*
-require('Storage').erase(SETTINGSFILE);
-*/ 
-
-// Load settings
-function loadSettings() {
-  // Helper function default setting
-  function def (value, def) {return value !== undefined ? value : def;}
-
-  var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-  secondsMode = def(settings.secondsMode, "Never");
-  secondsColoured = def(settings.secondsColoured, true);
-  secondsWithColon = def(settings.secondsWithColon, true);
-  dateOnMain = def(settings.dateOnMain, "Long");
-  dateOnSecs = def(settings.dateOnSecs, "Year");
-  weekDay = def(settings.weekDay, true);
-  calWeek = def(settings.calWeek, false);
-  upperCase = def(settings.upperCase, true);
-  vectorFont = def(settings.vectorFont, false);
-
-  // Legacy
-  if (dateOnSecs === true)
-    dateOnSecs = "Year";
-  if (dateOnSecs === false)
-    dateOnSecs = "No";
-}
-
-// schedule a draw for the next second or minute
-function queueDraw() {
+  // queue next draw
   if (drawTimeout) clearTimeout(drawTimeout);
   drawTimeout = setTimeout(function() {
     drawTimeout = undefined;
     draw();
-  }, queueMillis - (Date.now() % queueMillis));
-}
+  }, 60000 - (Date.now() % 60000));
+};
 
-function updateState() {
-  if (Bangle.isLCDOn()) {
-    if ((secondsMode === "Unlocked" && !Bangle.isLocked()) || secondsMode === "Always") {
-      secondsScreen = true;
-      queueMillis = 1000;
-    } else {
-      secondsScreen = false;
-      queueMillis = 60000;
-    }
-    draw(); // draw immediately, queue redraw
-  } else { // stop draw timer
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
-  }
-}
-
-function isoStr(date) {
-  return date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2);
-}
-
-var calWeekBuffer = [false,false,false]; //buffer tz, date, week no (once calculated until other tz or date is requested)
-function ISO8601calWeek(date) { //copied from: https://gist.github.com/IamSilviu/5899269#gistcomment-3035480
-  dateNoTime = date; dateNoTime.setHours(0,0,0,0);
-  if (calWeekBuffer[0] === date.getTimezoneOffset() && calWeekBuffer[1] === dateNoTime) return calWeekBuffer[2];
-  calWeekBuffer[0] = date.getTimezoneOffset();
-  calWeekBuffer[1] = dateNoTime;
-  var tdt = new Date(date.valueOf());
-  var dayn = (date.getDay() + 6) % 7;
-  tdt.setDate(tdt.getDate() - dayn + 3);
-  var firstThursday = tdt.valueOf();
-  tdt.setMonth(0, 1);
-  if (tdt.getDay() !== 4) {
-      tdt.setMonth(0, 1 + ((4 - tdt.getDay()) + 7) % 7);
-  }
-  calWeekBuffer[2] = 1 + Math.ceil((firstThursday - tdt) / 604800000);
-  return calWeekBuffer[2];
-}
-
-function doColor() {
-  return !isBangle1 && !Bangle.isLocked() && secondsColoured;
-}
-
-// Actually draw the watch face
-function draw() {
-  var x = g.getWidth() / 2;
-  var y = g.getHeight() / 2 - (secondsMode !== "Never" ? 24 : (vectorFont ? 12 : 0));
-  g.reset();
-  /* This is to mark the widget areas during development.
-  g.setColor("#888")
-    .fillRect(0, 0, g.getWidth(), 23)
-    .fillRect(0, g.getHeight() - 23, g.getWidth(), g.getHeight()).reset();
-  /* */
-  g.clearRect(0, 24, g.getWidth(), g.getHeight() - 24); // clear whole background (w/o widgets)
-  var date = new Date(); // Actually the current date, this one is shown
-  var timeStr = require("locale").time(date, 1); // Hour and minute
-  g.setFontAlign(0, 0).setFont("Anton").drawString(timeStr, x, y); // draw time
-  if (secondsScreen) {
-    y += 65;
-    var secStr = (secondsWithColon ? ":" : "") + ("0" + date.getSeconds()).slice(-2);
-    if (doColor())
-      g.setColor(0, 0, 1);
-    g.setFont("AntonSmall");
-    if (dateOnSecs !== "No") { // A bit of a complex drawing with seconds on the right and date on the left
-      g.setFontAlign(1, 0).drawString(secStr, g.getWidth() - (isBangle1 ? 32 : 2), y); // seconds
-      y -= (vectorFont ? 15 : 13);
-      x = g.getWidth() / 4 + (isBangle1 ? 12 : 4) + (secondsWithColon ? 0 : g.stringWidth(":") / 2);
-      var dateStr2 = (dateOnMain === "ISO8601" ? isoStr(date) : require("locale").date(date, 1));
-      var year;
-      var md;
-      var yearfirst;
-      if (dateStr2.match(/\d\d\d\d$/)) { // formatted date ends with year
-        year = (dateOnSecs === "Year" ? dateStr2.slice(-4) : require("locale").dow(date, 1));
-        md = dateStr2.slice(0, -4);
-        if (!md.endsWith(".")) // keep separator before the year only if it is a dot (31.12. but 31/12)
-          md = md.slice(0, -1);
-        yearfirst = false;
-      } else { // formatted date begins with year
-        if (!dateStr2.match(/^\d\d\d\d/)) // if year position cannot be detected...
-          dateStr2 = isoStr(date); // ...use ISO date format instead
-        year = (dateOnSecs === "Year" ? dateStr2.slice(0, 4) : require("locale").dow(date, 1));
-        md = dateStr2.slice(5); // never keep separator directly after year
-        yearfirst = true;
-      }
-      if (dateOnSecs === "Weekday" && upperCase)
-        year = year.toUpperCase();
-      g.setFontAlign(0, 0);
-      if (vectorFont)
-        g.setFont("Vector", 24);
-      else
-        g.setFont("6x8", 2);
-      if (doColor())
-        g.setColor(1, 0, 0);
-      g.drawString(md, x, (yearfirst ? y + (vectorFont ? 26 : 16) : y));
-      g.drawString(year, x, (yearfirst ? y : y + (vectorFont ? 26 : 16)));
-    } else {
-      g.setFontAlign(0, 0).drawString(secStr, x, y); // Just the seconds centered
-    }
-  } else { // No seconds screen: Show date and optionally day of week
-    y += (vectorFont ? 50 : (secondsMode !== "Never") ? 52 : 40);
-    var dateStr = (dateOnMain === "ISO8601" ? isoStr(date) : require("locale").date(date, (dateOnMain === "Long" ? 0 : 1)));
-    if (upperCase)
-      dateStr = dateStr.toUpperCase();
-    g.setFontAlign(0, 0);
-    if (vectorFont)
-      g.setFont("Vector", 24);
-    else
-      g.setFont("6x8", 2);
-    g.drawString(dateStr, x, y);
-    if (calWeek || weekDay) {
-      var dowcwStr = "";
-      if (calWeek)
-        dowcwStr = " #" + ("0" + ISO8601calWeek(date)).slice(-2);
-      if (weekDay) 
-        dowcwStr = require("locale").dow(date, calWeek ? 1 : 0) + dowcwStr;  //weekDay e.g. Monday or weekDayShort #<calWeek> e.g. Mon #01
-      else //week #01
-        dowcwStr = /*LANG*/"week" + dowcwStr;
-      if (upperCase)
-      dowcwStr = dowcwStr.toUpperCase();
-      g.drawString(dowcwStr, x, y + (vectorFont ? 26 : 16));
-    }
-  }
-
-  // queue next draw
-  queueDraw();
-}
-
-// Init the settings of the app
-loadSettings();
-// Clear the screen once, at startup
-g.clear();
-// Set dynamic state and perform initial drawing
-updateState();
-// Register hooks for LCD on/off event and screen lock on/off event
-Bangle.on('lcdPower', on => {
-  updateState();
-});
-Bangle.on('lock', on => {
-  updateState();
-});
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
+    delete Graphics.prototype.setFontAnton;
+  }});
 // Load widgets
 Bangle.loadWidgets();
-Bangle.drawWidgets();
-
-// end of file
\ No newline at end of file
+draw();
+setTimeout(Bangle.drawWidgets,0);
+}
diff --git a/apps/antonclk/app.png b/apps/antonclk/app.png
index a38093c5f..bb764d2a1 100644
Binary files a/apps/antonclk/app.png and b/apps/antonclk/app.png differ
diff --git a/apps/antonclk/metadata.json b/apps/antonclk/metadata.json
index 16bdf3aa8..b8242f11a 100644
--- a/apps/antonclk/metadata.json
+++ b/apps/antonclk/metadata.json
@@ -1,9 +1,8 @@
 {
   "id": "antonclk",
   "name": "Anton Clock",
-  "version": "0.09",
-  "description": "A clock using the bold Anton font, optionally showing seconds and date in ISO-8601 format.",
-  "readme":"README.md",
+  "version": "0.11",
+  "description": "A simple clock using the bold Anton font. See `Anton Clock Plus` for an enhanced version",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",
@@ -12,8 +11,6 @@
   "allow_emulator": true,
   "storage": [
     {"name":"antonclk.app.js","url":"app.js"},
-    {"name":"antonclk.settings.js","url":"settings.js"},
     {"name":"antonclk.img","url":"app-icon.js","evaluate":true}
-  ],
-  "data": [{"name":"antonclk.json"}]
+  ]
 }
diff --git a/apps/antonclk/screenshot.png b/apps/antonclk/screenshot.png
index e949b8a24..9b38e90d5 100644
Binary files a/apps/antonclk/screenshot.png and b/apps/antonclk/screenshot.png differ
diff --git a/apps/antonclkplus/ChangeLog b/apps/antonclkplus/ChangeLog
new file mode 100644
index 000000000..3b0a3d8b8
--- /dev/null
+++ b/apps/antonclkplus/ChangeLog
@@ -0,0 +1,15 @@
+0.01: New App!
+0.02: Load widgets after setUI so widclk knows when to hide
+0.03: Clock now shows day of week under date.
+0.04: Clock can optionally show seconds, date optionally in ISO-8601 format, weekdays and uppercase configurable, too.
+0.05: Clock can optionally show ISO-8601 calendar weeknumber (default: Off)
+      when weekday name "Off": week #:<num>
+      when weekday name "On": weekday name is cut at 6th position and .#<week num> is added
+0.06: fixes #1271 - wrong settings name
+      when weekday name and calendar weeknumber are on then display is <weekday short> #<calweek>
+      week is buffered until date or timezone changes
+0.07: align default settings with app.js (otherwise the initial displayed settings will be confusing to users)
+0.08: fixed calendar weeknumber not shortened to two digits
+0.09: Use default Bangle formatter for booleans
+0.10: Use Bangle.setUI({remove:...}) to allow loading the launcher without a full reset on 2v16
+      Modified to avoid leaving functions defined when using setUI({remove:...})
diff --git a/apps/antonclk/README.md b/apps/antonclkplus/README.md
similarity index 87%
rename from apps/antonclk/README.md
rename to apps/antonclkplus/README.md
index 28a38f5fd..25b478dd9 100644
--- a/apps/antonclk/README.md
+++ b/apps/antonclkplus/README.md
@@ -1,6 +1,6 @@
-# Anton Clock - Large font digital watch with seconds and date
+# Anton Clock Plus - Large font digital watch with seconds and date
 
-Anton clock uses the "Anton" bold font to show the time in a clear, easily readable manner. On the Bangle.js 2, the time can be read easily even if the screen is locked and unlit.
+Anton Clock Plus uses the "Anton" bold font to show the time in a clear, easily readable manner. On the Bangle.js 2, the time can be read easily even if the screen is locked and unlit.
 
 ## Features
 
@@ -16,16 +16,16 @@ The basic time representation only shows hours and minutes of the current time.
 
 ## Usage
 
-Install Anton clock through the Bangle.js app loader.
-Configure it through the default Bangle.js configuration mechanism
+* Install Anton Clock Plus through the Bangle.js app loader.
+* Configure it through the default Bangle.js configuration mechanism
 (Settings app, "Apps" menu, "Anton clock" submenu).
-If you like it, make it your default watch face
+* If you like it, make it your default watch face
 (Settings app, "System" menu, "Clock" submenu, select "Anton clock").
 
 ## Configuration
 
-Anton clock is configured by the standard settings mechanism of Bangle.js's operating system:
-Open the "Settings" app, then the "Apps" submenu and below it the "Anton clock" menu.
+Anton Clock is configured by the standard settings mechanism of Bangle.js's operating system:
+Open the `Settings` app, then the `Apps` submenu and below it the `Anton Clock+` menu.
 You configure Anton clock through several "on/off" switches in two menus.
 
 ### The main menu
diff --git a/apps/antonclkplus/app-icon.js b/apps/antonclkplus/app-icon.js
new file mode 100644
index 000000000..0c3aeb210
--- /dev/null
+++ b/apps/antonclkplus/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgf/AH4At/l/Aofgh4DB+EAj4REQoM/AgP4AoeACIoLCg4FB4AFDCIwLCgAROgYIB8EBAoUH/gVBCIxQBCKYHBCJp9DI4ICBLJYRCn4RQEYMOR5ARDIgIRMYQZZBgARGZwZBDCKQrCgEDR5AdBUIQRJDoLXFCJD7J/xrICIQFCn4RH/4LDAoTaCCI4Ar/LLDCBfypMkCgMkyV/CJOSCIOf5IRGFwOfCJNP//JnmT588z/+pM/BYIRCk4RC/88+f/n4RCngRCz1JCIf5/nzGoQRIHwXPCIPJI4f8CJHJGQJKCCI59LCI5ZCCJ/+v/kBoM/+V/HIJrHBYJWB/JKB5x9JEYP8AQKdBpwRL841Dp41KZoTxBHYTXBWY77PCKKhJ/4/CcgMkXoQAiA="))
diff --git a/apps/antonclkplus/app.js b/apps/antonclkplus/app.js
new file mode 100644
index 000000000..409d7d487
--- /dev/null
+++ b/apps/antonclkplus/app.js
@@ -0,0 +1,238 @@
+// Clock with large digits using the "Anton" bold font
+Graphics.prototype.setFontAnton = function(scale) {
+  // Actual height 69 (68 - 0)
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAA/gAAAAAAAAAAP/gAAAAAAAAAH//gAAAAAAAAB///gAAAAAAAAf///gAAAAAAAP////gAAAAAAD/////gAAAAAA//////gAAAAAP//////gAAAAH///////gAAAB////////gAAAf////////gAAP/////////gAD//////////AA//////////gAA/////////4AAA////////+AAAA////////gAAAA///////wAAAAA//////8AAAAAA//////AAAAAAA/////gAAAAAAA////4AAAAAAAA///+AAAAAAAAA///gAAAAAAAAA//wAAAAAAAAAA/8AAAAAAAAAAA/AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////AAAAAB///////8AAAAH////////AAAAf////////wAAA/////////4AAB/////////8AAD/////////+AAH//////////AAP//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wA//8AAAAAB//4A//wAAAAAAf/4A//gAAAAAAP/4A//gAAAAAAP/4A//gAAAAAAP/4A//wAAAAAAf/4A///////////4Af//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH//////////AAD/////////+AAB/////////8AAA/////////4AAAP////////gAAAD///////+AAAAAf//////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/gAAAAAAAAAAP/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/AAAAAAAAAAA//AAAAAAAAAAA/+AAAAAAAAAAB/8AAAAAAAAAAD//////////gAH//////////gAP//////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAAB/gAAD//4AAAAf/gAAP//4AAAB//gAA///4AAAH//gAB///4AAAf//gAD///4AAA///gAH///4AAD///gAP///4AAH///gAP///4AAP///gAf///4AAf///gAf///4AB////gAf///4AD////gA////4AH////gA////4Af////gA////4A/////gA//wAAB/////gA//gAAH/////gA//gAAP/////gA//gAA///8//gA//gAD///w//gA//wA////g//gA////////A//gA///////8A//gA///////4A//gAf//////wA//gAf//////gA//gAf/////+AA//gAP/////8AA//gAP/////4AA//gAH/////gAA//gAD/////AAA//gAB////8AAA//gAA////wAAA//gAAP///AAAA//gAAD//8AAAA//gAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/+AAAAAD/wAAB//8AAAAP/wAAB///AAAA//wAAB///wAAB//wAAB///4AAD//wAAB///8AAH//wAAB///+AAP//wAAB///+AAP//wAAB////AAf//wAAB////AAf//wAAB////gAf//wAAB////gA///wAAB////gA///wAAB////gA///w//AAf//wA//4A//AAA//wA//gA//AAAf/wA//gB//gAAf/wA//gB//gAAf/wA//gD//wAA//wA//wH//8AB//wA///////////gA///////////gA///////////gA///////////gAf//////////AAf//////////AAP//////////AAP/////////+AAH/////////8AAH///+/////4AAD///+f////wAAA///8P////gAAAf//4H///+AAAAH//gB///wAAAAAP4AAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wAAAAAAAAAA//wAAAAAAAAAP//wAAAAAAAAB///wAAAAAAAAf///wAAAAAAAH////wAAAAAAA/////wAAAAAAP/////wAAAAAB//////wAAAAAf//////wAAAAH///////wAAAA////////wAAAP////////wAAA///////H/wAAA//////wH/wAAA/////8AH/wAAA/////AAH/wAAA////gAAH/wAAA///4AAAH/wAAA//+AAAAH/wAAA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAH/4AAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB//8AAA/////+B///AAA/////+B///wAA/////+B///4AA/////+B///8AA/////+B///8AA/////+B///+AA/////+B////AA/////+B////AA/////+B////AA/////+B////gA/////+B////gA/////+B////gA/////+A////gA//gP/gAAB//wA//gf/AAAA//wA//gf/AAAAf/wA//g//AAAAf/wA//g//AAAA//wA//g//gAAA//wA//g//+AAP//wA//g////////gA//g////////gA//g////////gA//g////////gA//g////////AA//gf///////AA//gf//////+AA//gP//////+AA//gH//////8AA//gD//////4AA//gB//////wAA//gA//////AAAAAAAH////8AAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////gAAAAB///////+AAAAH////////gAAAf////////4AAB/////////8AAD/////////+AAH//////////AAH//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wAf//////////4A//wAD/4AAf/4A//gAH/wAAP/4A//gAH/wAAP/4A//gAP/wAAP/4A//gAP/4AAf/4A//wAP/+AD//4A///wP//////4Af//4P//////wAf//4P//////wAf//4P//////wAf//4P//////wAP//4P//////gAP//4H//////gAH//4H//////AAH//4D/////+AAD//4D/////8AAB//4B/////4AAA//4A/////wAAAP/4AP////AAAAB/4AD///4AAAAAAAAAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//AAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAADgA//gAAAAAAP/gA//gAAAAAH//gA//gAAAAB///gA//gAAAAP///gA//gAAAD////gA//gAAAf////gA//gAAB/////gA//gAAP/////gA//gAB//////gA//gAH//////gA//gA///////gA//gD///////gA//gf///////gA//h////////gA//n////////gA//////////gAA/////////AAAA////////wAAAA///////4AAAAA///////AAAAAA//////4AAAAAA//////AAAAAAA/////4AAAAAAA/////AAAAAAAA////8AAAAAAAA////gAAAAAAAA///+AAAAAAAAA///4AAAAAAAAA///AAAAAAAAAA//4AAAAAAAAAA/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//gB///wAAAAP//4H///+AAAA///8P////gAAB///+f////4AAD///+/////8AAH/////////+AAH//////////AAP//////////gAP//////////gAf//////////gAf//////////wAf//////////wAf//////////wA///////////wA//4D//wAB//4A//wB//gAA//4A//gA//gAAf/4A//gA//AAAf/4A//gA//gAAf/4A//wB//gAA//4A///P//8AH//4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////gAP//////////gAP//////////AAH//////////AAD/////////+AAD///+/////8AAB///8f////wAAAf//4P////AAAAH//wD///8AAAAA/+AAf//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//gAAAAAAAAB///+AA/+AAAAP////gA//wAAAf////wA//4AAB/////4A//8AAD/////8A//+AAD/////+A///AAH/////+A///AAP//////A///gAP//////A///gAf//////A///wAf//////A///wAf//////A///wAf//////A///wA///////AB//4A//4AD//AAP/4A//gAB//AAP/4A//gAA//AAP/4A//gAA/+AAP/4A//gAB/8AAP/4A//wAB/8AAf/4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH/////////+AAD/////////8AAB/////////4AAAf////////wAAAP////////AAAAB///////4AAAAAD/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAB/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("EiAnGicnJycnJycnEw=="), 78 + (scale << 8) + (1 << 16));
+};
+
+Graphics.prototype.setFontAntonSmall = function(scale) {
+  // Actual height 53 (52 - 0)
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAf8AAAAAAAAAAAAAAAAAAAAMAAAAAAAAD8AAAAAAAA/8AAAAAAAf/8AAAAAAH//8AAAAAB///8AAAAA////8AAAAP////8AAAD/////8AAB//////8AAf//////8AH///////4A///////+AA///////AAA//////wAAA/////8AAAA////+AAAAA////gAAAAA///4AAAAAA//8AAAAAAA//AAAAAAAA/wAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/////wAAA//////8AAB//////+AAH///////gAH///////gAP///////wAf///////4Af///////4A////////8A////////8A////////8A//AAAAD/8A/8AAAAA/8A/8AAAAA/8A/8AAAAA/8A/+AAAAB/8A////////8A////////8A////////8Af///////4Af///////4AP///////wAP///////wAH///////gAD///////AAA//////8AAAP/////wAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAA/4AAAAAAAA/4AAAAAAAB/wAAAAAAAB/wAAAAAAAD/wAAAAAAAD/gAAAAAAAH///////8AP///////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAP8AA//4AAA/8AB//4AAH/8AH//4AAP/8AP//4AA//8AP//4AB//8Af//4AD//8Af//4AP//8A///4Af//8A///4A///8A///4D///8A//AAH///8A/8AAP///8A/8AA//+/8A/8AD//8/8A/+Af//w/8A//////g/8A/////+A/8A/////8A/8Af////4A/8Af////wA/8AP////AA/8AP///+AA/8AH///8AA/8AD///wAA/8AA///AAA/8AAP/4AAA/8AAAAAAAAAAAAAAAAAAAAAAH4AAf/gAAA/4AAf/8AAD/4AAf//AAH/4AAf//gAP/4AAf//wAP/4AAf//wAf/4AAf//4Af/4AAf//4A//4AAf//8A//4AAf//8A//4AAP//8A//A/8AB/8A/8A/8AA/8A/8B/8AA/8A/8B/8AA/8A/+D//AB/8A////////8A////////8A////////8Af///////4Af///////4Af///////wAP///////gAH//9////gAD//4///+AAB//wf//4AAAP/AH//gAAAAAAAAAAAAAAAAAAAAAAAAAAAH/wAAAAAAB//wAAAAAAP//wAAAAAD///wAAAAA////wAAAAH////wAAAB/////wAAAf/////wAAD//////wAA///////wAA/////h/wAA////wB/wAA///8AB/wAA///AAB/wAA//gAAB/wAA////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8A////////8AAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAAAAAAAAAAAAAAAAAAAAAP/4AA////4P/+AA////4P//AA////4P//gA////4P//wA////4P//wA////4P//4A////4P//4A////4P//8A////4P//8A////4P//8A/8H/AAB/8A/8H+AAA/8A/8P+AAA/8A/8P+AAA/8A/8P/gAD/8A/8P/////8A/8P/////8A/8P/////8A/8P/////4A/8H/////4A/8H/////wA/8D/////wA/8B/////gA/8A////+AA/8AP///4AAAAAB///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////wAAAf/////8AAB///////AAH///////gAP///////wAP///////wAf///////4Af///////4A////////8A////////8A////////8A/+AH/AB/8A/8AP+AA/8A/4Af+AA/8A/8Af+AA/8A/8Af/gH/8A//4f////8A//4f////8A//4f////8Af/4f////4Af/4f////4AP/4P////wAP/4P////gAH/4H////AAD/4D///+AAB/4B///4AAAP4AP//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/8AAAAAAAA/8AAAAAAAA/8AAAAAB8A/8AAAAB/8A/8AAAAf/8A/8AAAH//8A/8AAA///8A/8AAH///8A/8AA////8A/8AD////8A/8Af////8A/8B/////8A/8P/////8A/8//////8A////////AA///////AAA//////gAAA/////4AAAA/////AAAAA////4AAAAA////AAAAAA///8AAAAAA///gAAAAAA//+AAAAAAA//wAAAAAAA/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/gD//gAAA//4P//8AAD//8f///AAH//+////gAH///////wAP///////4AP///////8Af///////8Af///////+Af///////+A////////+A//B//AB/+A/+A/+AA/+A/8Af+AA/+A/+Af+AA/+A//A//AB/+A////////+Af///////+Af///////+Af///////8Af///////8AP///////4AH///////4AH//+////wAD//+////AAA//4P//+AAAP/gH//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//gAfgAAA///8A/8AAB///+A//AAH////A//gAH////g//wAP////g//wAf////w//4Af////w//4A/////w//8A/////w//8A/////w//8A//gP/wA/8A/8AD/wA/8A/8AD/wAf8A/8AD/gA/8A/+AH/AB/8A////////8A////////8A////////8Af///////4Af///////4Af///////wAP///////wAH///////gAD//////+AAA//////4AAAP/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAP+AA/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("DhgeFB4eHh4eHh4eDw=="), 60 + (scale << 8) + (1 << 16));
+};
+
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+
+const SETTINGSFILE = "antonclk.json";
+const isBangle1 = (process.env.HWVERSION == 1);
+
+// variables defined from settings
+let secondsMode;
+let secondsColoured;
+let secondsWithColon;
+let dateOnMain;
+let dateOnSecs;
+let weekDay;
+let calWeek;
+let upperCase;
+let vectorFont;
+
+// dynamic variables
+let drawTimeout;
+let queueMillis = 1000;
+let secondsScreen = true;
+
+
+
+//For development purposes
+/*
+require('Storage').writeJSON(SETTINGSFILE, {
+  secondsMode: "Unlocked", // "Never", "Unlocked", "Always"
+  secondsColoured: true,
+  secondsWithColon: true,
+  dateOnMain: "Long", // "Short", "Long", "ISO8601"
+  dateOnSecs: "Year", // "No", "Year", "Weekday", LEGACY: true/false
+  weekDay: true,
+  calWeek: true,
+  upperCase: true,
+  vectorFont: true,
+});
+*/
+
+// OR (also for development purposes)
+/*
+require('Storage').erase(SETTINGSFILE);
+*/
+
+// Load settings
+let loadSettings = function() {
+  // Helper function default setting
+  function def (value, def) {return value !== undefined ? value : def;}
+
+  var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
+  secondsMode = def(settings.secondsMode, "Never");
+  secondsColoured = def(settings.secondsColoured, true);
+  secondsWithColon = def(settings.secondsWithColon, true);
+  dateOnMain = def(settings.dateOnMain, "Long");
+  dateOnSecs = def(settings.dateOnSecs, "Year");
+  weekDay = def(settings.weekDay, true);
+  calWeek = def(settings.calWeek, false);
+  upperCase = def(settings.upperCase, true);
+  vectorFont = def(settings.vectorFont, false);
+
+  // Legacy
+  if (dateOnSecs === true)
+    dateOnSecs = "Year";
+  if (dateOnSecs === false)
+    dateOnSecs = "No";
+}
+
+// schedule a draw for the next second or minute
+let queueDraw = function() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, queueMillis - (Date.now() % queueMillis));
+}
+
+let updateState = function() {
+  if (Bangle.isLCDOn()) {
+    if ((secondsMode === "Unlocked" && !Bangle.isLocked()) || secondsMode === "Always") {
+      secondsScreen = true;
+      queueMillis = 1000;
+    } else {
+      secondsScreen = false;
+      queueMillis = 60000;
+    }
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+}
+
+let isoStr = function(date) {
+  return date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2);
+}
+
+let calWeekBuffer = [false,false,false]; //buffer tz, date, week no (once calculated until other tz or date is requested)
+let ISO8601calWeek = function(date) { //copied from: https://gist.github.com/IamSilviu/5899269#gistcomment-3035480
+  dateNoTime = date; dateNoTime.setHours(0,0,0,0);
+  if (calWeekBuffer[0] === date.getTimezoneOffset() && calWeekBuffer[1] === dateNoTime) return calWeekBuffer[2];
+  calWeekBuffer[0] = date.getTimezoneOffset();
+  calWeekBuffer[1] = dateNoTime;
+  var tdt = new Date(date.valueOf());
+  var dayn = (date.getDay() + 6) % 7;
+  tdt.setDate(tdt.getDate() - dayn + 3);
+  var firstThursday = tdt.valueOf();
+  tdt.setMonth(0, 1);
+  if (tdt.getDay() !== 4) {
+      tdt.setMonth(0, 1 + ((4 - tdt.getDay()) + 7) % 7);
+  }
+  calWeekBuffer[2] = 1 + Math.ceil((firstThursday - tdt) / 604800000);
+  return calWeekBuffer[2];
+}
+
+let doColor = function() {
+  return !isBangle1 && !Bangle.isLocked() && secondsColoured;
+}
+
+// Actually draw the watch face
+let draw = function() {
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2 - (secondsMode !== "Never" ? 24 : (vectorFont ? 12 : 0));
+  g.reset();
+  /* This is to mark the widget areas during development.
+  g.setColor("#888")
+    .fillRect(0, 0, g.getWidth(), 23)
+    .fillRect(0, g.getHeight() - 23, g.getWidth(), g.getHeight()).reset();
+  /* */
+  g.clearRect(0, 24, g.getWidth(), g.getHeight() - 24); // clear whole background (w/o widgets)
+  var date = new Date(); // Actually the current date, this one is shown
+  var timeStr = require("locale").time(date, 1); // Hour and minute
+  g.setFontAlign(0, 0).setFont("Anton").drawString(timeStr, x, y); // draw time
+  if (secondsScreen) {
+    y += 65;
+    var secStr = (secondsWithColon ? ":" : "") + ("0" + date.getSeconds()).slice(-2);
+    if (doColor())
+      g.setColor(0, 0, 1);
+    g.setFont("AntonSmall");
+    if (dateOnSecs !== "No") { // A bit of a complex drawing with seconds on the right and date on the left
+      g.setFontAlign(1, 0).drawString(secStr, g.getWidth() - (isBangle1 ? 32 : 2), y); // seconds
+      y -= (vectorFont ? 15 : 13);
+      x = g.getWidth() / 4 + (isBangle1 ? 12 : 4) + (secondsWithColon ? 0 : g.stringWidth(":") / 2);
+      var dateStr2 = (dateOnMain === "ISO8601" ? isoStr(date) : require("locale").date(date, 1));
+      var year;
+      var md;
+      var yearfirst;
+      if (dateStr2.match(/\d\d\d\d$/)) { // formatted date ends with year
+        year = (dateOnSecs === "Year" ? dateStr2.slice(-4) : require("locale").dow(date, 1));
+        md = dateStr2.slice(0, -4);
+        if (!md.endsWith(".")) // keep separator before the year only if it is a dot (31.12. but 31/12)
+          md = md.slice(0, -1);
+        yearfirst = false;
+      } else { // formatted date begins with year
+        if (!dateStr2.match(/^\d\d\d\d/)) // if year position cannot be detected...
+          dateStr2 = isoStr(date); // ...use ISO date format instead
+        year = (dateOnSecs === "Year" ? dateStr2.slice(0, 4) : require("locale").dow(date, 1));
+        md = dateStr2.slice(5); // never keep separator directly after year
+        yearfirst = true;
+      }
+      if (dateOnSecs === "Weekday" && upperCase)
+        year = year.toUpperCase();
+      g.setFontAlign(0, 0);
+      if (vectorFont)
+        g.setFont("Vector", 24);
+      else
+        g.setFont("6x8", 2);
+      if (doColor())
+        g.setColor(1, 0, 0);
+      g.drawString(md, x, (yearfirst ? y + (vectorFont ? 26 : 16) : y));
+      g.drawString(year, x, (yearfirst ? y : y + (vectorFont ? 26 : 16)));
+    } else {
+      g.setFontAlign(0, 0).drawString(secStr, x, y); // Just the seconds centered
+    }
+  } else { // No seconds screen: Show date and optionally day of week
+    y += (vectorFont ? 50 : (secondsMode !== "Never") ? 52 : 40);
+    var dateStr = (dateOnMain === "ISO8601" ? isoStr(date) : require("locale").date(date, (dateOnMain === "Long" ? 0 : 1)));
+    if (upperCase)
+      dateStr = dateStr.toUpperCase();
+    g.setFontAlign(0, 0);
+    if (vectorFont)
+      g.setFont("Vector", 24);
+    else
+      g.setFont("6x8", 2);
+    g.drawString(dateStr, x, y);
+    if (calWeek || weekDay) {
+      var dowcwStr = "";
+      if (calWeek)
+        dowcwStr = " #" + ("0" + ISO8601calWeek(date)).slice(-2);
+      if (weekDay)
+        dowcwStr = require("locale").dow(date, calWeek ? 1 : 0) + dowcwStr;  //weekDay e.g. Monday or weekDayShort #<calWeek> e.g. Mon #01
+      else //week #01
+        dowcwStr = /*LANG*/"week" + dowcwStr;
+      if (upperCase)
+      dowcwStr = dowcwStr.toUpperCase();
+      g.drawString(dowcwStr, x, y + (vectorFont ? 26 : 16));
+    }
+  }
+
+  // queue next draw
+  queueDraw();
+}
+
+// Init the settings of the app
+loadSettings();
+// Clear the screen once, at startup
+g.clear();
+// Set dynamic state and perform initial drawing
+updateState();
+// Register hooks for LCD on/off event and screen lock on/off event
+Bangle.on('lcdPower', updateState);
+Bangle.on('lock', updateState);
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    Bangle.removeListener('lcdPower', updateState);
+    Bangle.removeListener('lock', updateState);
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    delete Graphics.prototype.setFontAnton;
+    delete Graphics.prototype.setFontAntonSmall;
+  }});
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+}
diff --git a/apps/antonclkplus/app.png b/apps/antonclkplus/app.png
new file mode 100644
index 000000000..a38093c5f
Binary files /dev/null and b/apps/antonclkplus/app.png differ
diff --git a/apps/antonclkplus/metadata.json b/apps/antonclkplus/metadata.json
new file mode 100644
index 000000000..05c59a4fb
--- /dev/null
+++ b/apps/antonclkplus/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "antonclkplus",
+  "name": "Anton Clock Plus",
+  "shortName": "Anton Clock+",
+  "version": "0.10",
+  "description": "A clock using the bold Anton font, optionally showing seconds and date in ISO-8601 format.",
+  "readme":"README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"antonclkplus.app.js","url":"app.js"},
+    {"name":"antonclkplus.settings.js","url":"settings.js"},
+    {"name":"antonclkplus.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"antonclkplus.json"}]
+}
diff --git a/apps/antonclkplus/screenshot.png b/apps/antonclkplus/screenshot.png
new file mode 100644
index 000000000..e949b8a24
Binary files /dev/null and b/apps/antonclkplus/screenshot.png differ
diff --git a/apps/antonclk/settings.js b/apps/antonclkplus/settings.js
similarity index 100%
rename from apps/antonclk/settings.js
rename to apps/antonclkplus/settings.js
diff --git a/apps/assistedgps/metadata.json b/apps/assistedgps/metadata.json
index 1dbc42c87..4c91dcd35 100644
--- a/apps/assistedgps/metadata.json
+++ b/apps/assistedgps/metadata.json
@@ -1,11 +1,12 @@
 {
   "id": "assistedgps",
-  "name": "Assisted GPS Update (AGPS)",
+  "name": "Assisted GPS Updater (AGPS)",
   "version": "0.03",
-  "description": "Downloads assisted GPS (AGPS) data to Bangle.js 1 or 2 for faster GPS startup and more accurate fixes. **No app will be installed**, this just uploads new data to the GPS chip.",
+  "description": "Downloads assisted GPS (AGPS) data to Bangle.js for faster GPS startup and more accurate fixes. **No app will be installed**, this just uploads new data to the GPS chip.",
+  "sortorder": -1,
   "icon": "app.png",
   "type": "RAM",
-  "tags": "tool,outdoors,agps",
+  "tags": "tool,outdoors,agps,gps,a-gps",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "custom": "custom.html",
   "customConnect": true,
diff --git a/apps/astral/ChangeLog b/apps/astral/ChangeLog
index a51c96760..747e5ac2e 100644
--- a/apps/astral/ChangeLog
+++ b/apps/astral/ChangeLog
@@ -1,3 +1,5 @@
 0.01: Create astral clock app
 0.02: Fixed Whirlpool galaxy RA/DA, larger compass display, fixed moonphase overlapping battery widget
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
+0.05: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/astral/app.js b/apps/astral/app.js
index c445463f2..a435ca9e3 100644
--- a/apps/astral/app.js
+++ b/apps/astral/app.js
@@ -767,6 +767,24 @@ function draw() {
 g.clear();
 current_moonphase = getMoonPhase();
 
+Bangle.setUI("clockupdown", btn => {
+  if (btn==0) {
+    if (!processing) {
+        if (!modeswitch) {
+            modeswitch = true;
+            if (mode == "planetary") mode = "extras";
+            else mode = "planetary";
+        }
+        else
+            modeswitch = false;
+    }
+  } else {
+    if (!processing)
+        ready_to_compute = true;
+  }
+});
+
+
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -799,23 +817,6 @@ Bangle.setGPSPower(1);
 // Show launcher when button pressed
 Bangle.setClockMode();
 
-Bangle.setUI("clockupdown", btn => {
-  if (btn==0) {
-    if (!processing) {
-        if (!modeswitch) {
-            modeswitch = true;
-            if (mode == "planetary") mode = "extras";
-            else mode = "planetary";
-        }
-        else
-            modeswitch = false;
-    }
-  } else {
-    if (!processing)
-        ready_to_compute = true;
-  }
-});
-
 setWatch(function () {
     if (!astral_settings.astral_default) {
         colours_switched = true;
@@ -833,7 +834,7 @@ Bangle.on('mag', function (m) {
     if (isNaN(m.heading))
         compass_heading = "---";
     else
-        compass_heading = 360 - Math.round(m.heading);
+        compass_heading = Math.round(m.heading);
   //  g.setColor("#000000");
    // g.fillRect(160, 10, 160, 20);
     g.setColor(display_colour);
diff --git a/apps/astral/metadata.json b/apps/astral/metadata.json
index 3317092db..647066a13 100644
--- a/apps/astral/metadata.json
+++ b/apps/astral/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "astral",
   "name": "Astral Clock",
-  "version": "0.03",
+  "version": "0.05",
   "description": "Clock that calculates and displays Alt Az positions of all planets, Sun as well as several other astronomy targets (customizable) and current Moon phase. Coordinates are calculated by GPS & time and onscreen compass assists orienting. See Readme before using.",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/banglexercise/ChangeLog b/apps/banglexercise/ChangeLog
index 5f1d3bd7d..6cf589541 100644
--- a/apps/banglexercise/ChangeLog
+++ b/apps/banglexercise/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Add sit ups
       Add more feedback to the user about the exercises
       Clean up code
+0.03: Add software back button on main menu
diff --git a/apps/banglexercise/app.js b/apps/banglexercise/app.js
index bc6e35f07..9659ee81f 100644
--- a/apps/banglexercise/app.js
+++ b/apps/banglexercise/app.js
@@ -71,7 +71,8 @@ function showMainMenu() {
   let menu;
   menu = {
     "": {
-      title: "BanglExercise"
+      title: "BanglExercise",
+      back: load
     }
   };
 
@@ -381,4 +382,5 @@ Bangle.on('HRM', function(hrm) {
 });
 
 g.clear(1);
+Bangle.loadWidgets();
 showMainMenu();
diff --git a/apps/banglexercise/metadata.json b/apps/banglexercise/metadata.json
index 9bb93f112..f4ce1894b 100644
--- a/apps/banglexercise/metadata.json
+++ b/apps/banglexercise/metadata.json
@@ -1,7 +1,7 @@
 { "id": "banglexercise",
   "name": "BanglExercise",
   "shortName":"BanglExercise",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Can automatically track exercises while wearing the Bangle.js watch.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index ba44ecef8..a00ae9325 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -12,3 +12,4 @@
 0.12: Add settings to hide date,widgets
 0.13: Add font setting
 0.14: Use ClockFace_menu.addItems
+0.15: Add Power saving option
\ No newline at end of file
diff --git a/apps/barclock/README.md b/apps/barclock/README.md
index ff66a5cbb..28572e37c 100644
--- a/apps/barclock/README.md
+++ b/apps/barclock/README.md
@@ -7,4 +7,5 @@ A simple digital clock showing seconds as a horizontal bar.
 
 ## Settings
 * `Show date`: display date at the bottom of screen
-* `Font`: choose between bitmap or vector fonts
\ No newline at end of file
+* `Font`: choose between bitmap or vector fonts
+* `Power saving`: (Bangle.js 2 only) don't draw the seconds bar while the watch is locked
\ No newline at end of file
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 61ce07dfb..5a7dfc8c0 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -13,16 +13,20 @@ let locale = require("locale");
   locale.hasMeridian = (locale.meridian(date)!=="");
 }
 
+let barW = 0, prevX = 0;
 function renderBar(l) {
-  if (!this.fraction) {
-    // zero-size fillRect stills draws one line of pixels, we don't want that
-    return;
-  }
-  const width = this.fraction*l.w;
-  g.fillRect(l.x, l.y, l.x+width-1, l.y+l.height-1);
+  "ram";
+  if (l) prevX = 0; // called from Layout: drawing area was cleared
+  else l = clock.layout.bar;
+  let x2 = l.x+barW;
+  if (clock.powerSave && Bangle.isLocked()) x2 = 0; // hide bar
+  if (x2===prevX) return; // nothing to do
+  if (x2===0) x2--; // don't leave 1px line
+  if (x2<Math.max(0, prevX)) g.setBgColor(l.bgCol || g.theme.bg).clearRect(x2+1, l.y, prevX, l.y2);
+  else g.setColor(l.col || g.theme.fg).fillRect(prevX+1, l.y, x2, l.y2);
+  prevX = x2;
 }
 
-
 function timeText(date) {
   if (!clock.is12Hour) {
     return locale.time(date, true);
@@ -47,22 +51,21 @@ function dateText(date) {
   return `${dayName}  ${dayMonth}`;
 }
 
-
 const ClockFace = require("ClockFace"),
   clock = new ClockFace({
-    precision:1,
-    settingsFile:'barclock.settings.json',
+    precision: 1,
+    settingsFile: "barclock.settings.json",
     init: function() {
       const Layout = require("Layout");
       this.layout = new Layout({
         type: "v", c: [
           {
             type: "h", c: [
-              {id: "time", label: "88:88", type: "txt", font: "6x8:5", col:g.theme.fg, bgCol: g.theme.bg}, // updated below
-              {id: "ampm", label: "  ", type: "txt", font: "6x8:2", col:g.theme.fg, bgCol: g.theme.bg},
+              {id: "time", label: "88:88", type: "txt", font: "6x8:5", col: g.theme.fg, bgCol: g.theme.bg}, // updated below
+              {id: "ampm", label: "  ", type: "txt", font: "6x8:2", col: g.theme.fg, bgCol: g.theme.bg},
             ],
           },
-          {id: "bar", type: "custom", fraction: 0, fillx: 1, height: 6, col: g.theme.fg2, render: renderBar},
+          {id: "bar", type: "custom", fillx: 1, height: 6, col: g.theme.fg2, render: renderBar},
           this.showDate ? {height: 40} : {},
           this.showDate ? {id: "date", type: "txt", font: "10%", valign: 1} : {},
         ],
@@ -76,7 +79,8 @@ const ClockFace = require("ClockFace"),
         this.layout.ampm.label = "";
         thickness = Math.floor(Bangle.appRect.w/(5*6));
       }
-      this.layout.bar.height = thickness+1;
+      let bar = this.layout.bar;
+      bar.height = thickness+1;
       if (this.font===1) { // vector
         const B2 = process.env.HWVERSION>1;
         if (this.is12Hour && locale.hasMeridian) {
@@ -89,17 +93,32 @@ const ClockFace = require("ClockFace"),
         this.layout.time.font = "6x8:"+thickness;
       }
       this.layout.update();
+      bar.y2 = bar.y+bar.height-1;
     },
     update: function(date, c) {
+      "ram";
       if (c.m) this.layout.time.label = timeText(date);
       if (c.h) this.layout.ampm.label = ampmText(date);
       if (c.d && this.showDate) this.layout.date.label = dateText(date);
-      const SECONDS_PER_MINUTE = 60;
-      if (c.s) this.layout.bar.fraction = date.getSeconds()/SECONDS_PER_MINUTE;
-      this.layout.render();
+      if (c.m) this.layout.render();
+      if (c.s) {
+        barW = Math.round(date.getSeconds()/60*this.layout.bar.w);
+        renderBar();
+      }
     },
     resume: function() {
+      prevX = 0; // force redraw of bar
       this.layout.forgetLazyState();
     },
   });
+
+// power saving: only update once a minute while locked, hide bar
+if (clock.powerSave) {
+  Bangle.on("lock", lock => {
+    clock.precision = lock ? 60 : 1;
+    clock.tick();
+    renderBar(); // hide/redraw bar right away
+  });
+}
+
 clock.start();
diff --git a/apps/barclock/metadata.json b/apps/barclock/metadata.json
index 0c227dc52..5b783dbda 100644
--- a/apps/barclock/metadata.json
+++ b/apps/barclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "barclock",
   "name": "Bar Clock",
-  "version": "0.14",
+  "version": "0.15",
   "description": "A simple digital clock showing seconds as a bar",
   "icon": "clock-bar.png",
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot_pm.png"}],
diff --git a/apps/barclock/settings.js b/apps/barclock/settings.js
index dfe25581c..7b88b7021 100644
--- a/apps/barclock/settings.js
+++ b/apps/barclock/settings.js
@@ -17,10 +17,14 @@
       onchange: v => save("font", v),
     },
   };
-  require("ClockFace_menu").addItems(menu, save, {
+  let items = {
     showDate: s.showDate,
     loadWidgets: s.loadWidgets,
-  });
-
+  };
+  // Power saving for Bangle.js 1 doesn't make sense (no updates while screen is off anyway)
+  if (process.env.HWVERSION>1) {
+    items.powerSave = s.powerSave;
+  }
+  require("ClockFace_menu").addItems(menu, save, items);
   E.showMenu(menu);
 });
diff --git a/apps/barcode/ChangeLog b/apps/barcode/ChangeLog
index 4f99f15ac..7ab5d8587 100644
--- a/apps/barcode/ChangeLog
+++ b/apps/barcode/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Step count resets at midnight
 0.08: Step count stored in memory to survive reloads. Now shows step count daily and since last reboot.
 0.09: NOW it really should reset daily (instead of every other day...)
+0.10: Tell clock widgets to hide.
diff --git a/apps/barcode/barcode.app.js b/apps/barcode/barcode.app.js
index 89419f33c..0d9df78d5 100644
--- a/apps/barcode/barcode.app.js
+++ b/apps/barcode/barcode.app.js
@@ -416,13 +416,13 @@ var layout = new Layout( {
 
 // Clear the screen once, at startup
 g.clear();
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-Bangle.setUI("clock");
 layout.render();
 
 Bangle.on('lock', function(locked) {
     if(!locked) {
         layout.render();
     }
-});
\ No newline at end of file
+});
diff --git a/apps/barcode/metadata.json b/apps/barcode/metadata.json
index cef267b2b..3f6bf06e6 100644
--- a/apps/barcode/metadata.json
+++ b/apps/barcode/metadata.json
@@ -2,7 +2,7 @@
   "name": "Barcode clock",
   "shortName":"Barcode clock",
   "icon": "barcode.icon.png",
-  "version":"0.09",
+  "version":"0.10",
   "description": "EAN-8 compatible barcode clock.",
   "tags": "barcode,ean,ean-8,watchface,clock,clockface",
   "type": "clock",
diff --git a/apps/barometer/ChangeLog b/apps/barometer/ChangeLog
index de3a5cb96..b429dda17 100644
--- a/apps/barometer/ChangeLog
+++ b/apps/barometer/ChangeLog
@@ -1,3 +1,4 @@
 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
+0.04: Update every second, go back with short button press
diff --git a/apps/barometer/app.js b/apps/barometer/app.js
index 77d4c974f..7e793af4f 100644
--- a/apps/barometer/app.js
+++ b/apps/barometer/app.js
@@ -59,6 +59,7 @@ function drawTicks(){
 function drawScaleLabels(){
   g.setColor(g.theme.fg);
   g.setFont("Vector",12);
+  g.setFontAlign(-1,-1);
 
   let label = MIN;
   for (let i=0;i <= NUMBER_OF_LABELS; i++){
@@ -103,22 +104,29 @@ function drawIcons() {
 }
 
 g.setBgColor(g.theme.bg);
-g.clear();
-
-drawTicks();
-drawScaleLabels();
-drawIcons();
 
 try {
   function baroHandler(data) {
-    if (data===undefined) // workaround for https://github.com/espruino/BangleApps/issues/1429
-      setTimeout(() => Bangle.getPressure().then(baroHandler), 500);
-    else
+    g.clear();
+
+    drawTicks();
+    drawScaleLabels();
+    drawIcons();
+    if (data!==undefined) {
       drawHand(Math.round(data.pressure));
+    }
   }
   Bangle.getPressure().then(baroHandler);
+  setInterval(() => Bangle.getPressure().then(baroHandler), 1000);
 } catch(e) {
-  print(e.message);
-  print("barometer not supporter, show a demo value");
+  if (e !== undefined) {
+    print(e.message);
+  }
+  print("barometer not supported, show a demo value");
   drawHand(MIN);
 }
+
+Bangle.setUI({
+  mode : "custom",
+  back : function() {load();}
+});
diff --git a/apps/barometer/metadata.json b/apps/barometer/metadata.json
index a385f2be2..767fa630b 100644
--- a/apps/barometer/metadata.json
+++ b/apps/barometer/metadata.json
@@ -1,7 +1,7 @@
 { "id": "barometer",
   "name": "Barometer",
   "shortName":"Barometer",
-  "version":"0.03",
+  "version":"0.04",
   "description": "A simple barometer that displays the current air pressure",
   "icon": "barometer.png",
   "tags": "tool,outdoors",
diff --git a/apps/batclock/ChangeLog b/apps/batclock/ChangeLog
index e6e21b146..2a2d91b74 100644
--- a/apps/batclock/ChangeLog
+++ b/apps/batclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: App Created!
 0.02: Update to use Bangle.setUI instead of setWatch
+0.03: Tell clock widgets to hide.
diff --git a/apps/batclock/bat-clock.app.js b/apps/batclock/bat-clock.app.js
index 31b8f5b9b..dc649160f 100644
--- a/apps/batclock/bat-clock.app.js
+++ b/apps/batclock/bat-clock.app.js
@@ -249,6 +249,9 @@ g.clear();
 g.setColor(0, 0.5, 0).drawImage(bg_crack);
 g.setColor(1, 1, 1).drawImage(batman);
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -256,5 +259,3 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/batclock/metadata.json b/apps/batclock/metadata.json
index 8aa115780..e6520cb90 100644
--- a/apps/batclock/metadata.json
+++ b/apps/batclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "batclock",
   "name": "Bat Clock",
   "shortName": "Bat Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Morphing Clock, with an awesome \"The Dark Knight\" themed logo.",
   "icon": "bat-clock.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/bclock/ChangeLog b/apps/bclock/ChangeLog
index 5b2cf598c..79c198431 100644
--- a/apps/bclock/ChangeLog
+++ b/apps/bclock/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
diff --git a/apps/bclock/clock-binary.js b/apps/bclock/clock-binary.js
index fdf945ee6..c08a7abe6 100644
--- a/apps/bclock/clock-binary.js
+++ b/apps/bclock/clock-binary.js
@@ -100,10 +100,12 @@ Bangle.on('lcdPower', on => {
   if (on) drawClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(() => { drawClock(); }, 1000);
 drawClock();
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/bclock/metadata.json b/apps/bclock/metadata.json
index 94219a30b..c6a24d89f 100644
--- a/apps/bclock/metadata.json
+++ b/apps/bclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "bclock",
   "name": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A simple binary clock watch face",
   "icon": "clock-binary.png",
   "type": "clock",
diff --git a/apps/beer/ChangeLog b/apps/beer/ChangeLog
new file mode 100644
index 000000000..21ec45242
--- /dev/null
+++ b/apps/beer/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Added adjustment for Bangle.js magnetometer heading fix
+      Bangle.js 2 compatibility
diff --git a/apps/beer/app-icon.js b/apps/beer/app-icon.js
index c700b3bd2..734985cb5 100644
--- a/apps/beer/app-icon.js
+++ b/apps/beer/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwghC/AB0O/4AG8AXNgYXHmAXl94XH+AXNn4XH/wXW+YX/C6oWHAAIXN7sz9vdAAoXN9sznvuAAXf/vuC53jC4Xd7wXQ93jn3u9vv9vt7wXT/4tBAgIXQ7wvCC4PgC5sO6czIQJfBC6PumaPDC6wwCC50NYAJcBVgIDBCxrAFbgYXP7yoDF6TADL4YXPVAIXCRyAXC7wXW9zwBC6cNC9zABC4gWQC653CR4fQC6x3TF6gXXI4M9d6wAEC9EN73dAAZfQgczAAkwC/4XXAH4"))
+require("heatshrink").decompress(atob("mEw4cA///wH9/++1P+u3//3/qv/gv+KHkJkmABxcBBwNJkmQCJYOByQCCCBUCCItJkARQkgQHggLBku25IRDJQ4LCtu27Mt2RKJCInbAQIRLpYROglt24OB6wSC7dwLQ4LB9u2EgfbsARJ8u2mwRO+u3CNJtHCJFpCINALJoRCpCiGBoMSdQcpegIRGyaPB+QRDkARIyQRBc4YRKyet23iCJxHB6QRBzOJCJ+dCJY1CpfMGphrCp2YNZlL54CBEZgLBAQoRBiTFFCNMvmQRPndiEcJHEyQQECJMpAYIRQyARQwAROI4IAGB4wCBNAoRmhIRHCA4A/AAo"))
diff --git a/apps/beer/custom.html b/apps/beer/custom.html
index a357ab378..f0895f93f 100644
--- a/apps/beer/custom.html
+++ b/apps/beer/custom.html
@@ -127,6 +127,8 @@
 var img_nofix = require("heatshrink").decompress(atob("mUyxH+ACYhJDygtYGsqLVF8u02gziGBoyhQ5gwDGRozRGCQydGCgybGCwyZC5gAaGPQwnGRAwpGQ4xwGFYyFDKsrlYxYDCsBmUyg4yXLyUsFwMyq1WAgUsNCRjUmVXroAEq8yMbcllkskwCEkplDmQwDq0sC54xEHQ9RqQAGqIwCFgOBAASYBSgMBltRAA0sgJsOGJeBxAAGwMrgIXIloxOJYNSvl8CwIDCqMBlYxNC4wxQDIOCwVYDIIDBGJ9YwV8rADBwRJCSqAVCAYaVMC4oxCPYYxQSo4xMSpIxPY4T5HY54XIMbIxKgwXKfKjhEllWGJNWlgXJGLNXruCGI+CrtXGKP+GJB9HMZ6VO/wxJcI8lfJclfKAxKfJEAGJIXLGKSvBWYQZCMZbfEqTHBGJYyFfIo1DGJ4tDGJQwCGJB9IMZyVNGIYyEfJQxPfJgwEMgoZJgAxMltRAA0tGJQyEksslkmAQklGINXxDTBFwIDCq8rC4YACC4gwJMowAJldWAAwwBABowIGJ4AYGJIymGBQylGBgyjGBwyhGCAzeF6YycGCwzYF7IzVF7o1PDqYA=="));
 var img_fix = require("heatshrink").decompress(atob("mUyxH+ACYhJDygtYGsqLVF94zaDYkq6wAOlQyYJo2A63VAAIoC2m0GI16My5/H5/V64ABGQIwBGQ+rTKwWHkhiBGIYwDGQ3VZioVIqoiBGAJhEGRFPGSYTIYwQxCGA4yFqodJGKeqSgQwJGQmkGKQSJfAYwLGQfPDxQwRgHVfAi/EAA4xLGQwRLYwb5BABoxQCBcA43G5wABAgIAMEBgxQ0QxB54xB5gAG4xgBBYOiGJ4PMGInPGIhcCGIt4EJoxPvHM5oxBGAnO6xrCGoXMqgxdpwxD5qQFL4QADlQxdgAhBGILIDMYoADEBwwPgCHBfQzHDAAb4NACTIIAA74OACLIIMo7GOACQoBZAoHBHQPNA4QwggGiZBA5B54HBY0DIKMYtUGMMqFYLIGY4jGhZAr6FAAYwiZAgxIY0TIFfQgADvAfR/zISGJTGR/wxRkj6CGJBiSGKL6DGP4xOGSKVDGAwxRGAQxU5oxcGR75DGJEkGCYxPlXM5vPGA/MlQxUGR1OGIL4I5lOGCgyOqgxBShHMqgwVGJt4GJd4GKwyMvHG5vGABAxMGBQyM1mtABWsGC4yLGBYABGDAyKGKwwQGZKVUF6b/OABowWGbAvZGaovdGp4dTA"));
 
+var W = g.getWidth(), H = g.getHeight();
+
 // https://github.com/Leaflet/Leaflet/blob/master/src/geo/projection/Projection.SphericalMercator.js
 function project(latlong) {
   var d = Math.PI / 180,
@@ -170,32 +172,30 @@ Bangle.on('GPS', function(f) {
 
 Bangle.on('mag', function(m) {
   if (!Bangle.isLCDOn()) return;
-  var headingrad = m.heading*Math.PI/180; // in radians
+  var headingrad = (360-m.heading)*Math.PI/180; // in radians
   if (!isFinite(headingrad)) headingrad=0;
   if (nearest)
-    g.drawImage(img_fix,120,120,{
+    g.drawImage(img_fix,W/2,H/2,{
       rotate: (Math.PI/2)+headingrad-nearestangle,
       scale:3,
     });
   else
-    g.drawImage(img_nofix,120,120,{
+    g.drawImage(img_nofix,W/2,H/2,{
       rotate: headingrad,
       scale:2,
     });
-  g.clearRect(60,0,180,24);
-  g.setFontAlign(0,0);
-  g.setFont("6x8");
+  g.clearRect(0,0,W,24).setFontAlign(0,0).setFont("6x8");
   if (fix.fix) {
-    g.drawString(nearest ? nearest.name : "---",120,4);
+    g.drawString(nearest ? nearest.name : "---",W/2,4);
     g.setFont("6x8",2);
-    g.drawString(nearest ? Math.round(nearestdist)+"m" : "---",120,16);
+    g.drawString(nearest ? Math.round(nearestdist)+"m" : "---",W/2,16);
   } else {
-    g.drawString(fix.satellites+" satellites",120,4);
+    g.drawString(fix.satellites+" satellites",W/2,4);
   }
 });
 Bangle.setCompassPower(1);
 Bangle.setGPSPower(1);
-g.clear();`;
+g.setColor("#fff").setBgColor("#000").clear();`;
 
         sendCustomizedApp({
           storage:[
diff --git a/apps/beer/metadata.json b/apps/beer/metadata.json
index cf69aee90..3a2421bd1 100644
--- a/apps/beer/metadata.json
+++ b/apps/beer/metadata.json
@@ -1,11 +1,11 @@
 {
   "id": "beer",
   "name": "Beer Compass",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Uploads all the pubs in an area onto your watch, so it can always point you at the nearest one",
   "icon": "app.png",
   "tags": "",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "custom": "custom.html",
   "storage": [
     {"name":"beer.app.js"},
diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 09cc978fb..c92d139bb 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -3,3 +3,5 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
+0.06: Tell clock widgets to hide.
+0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index c013c6188..a8e2b38df 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -11,6 +11,8 @@ Graphics.prototype.setFontOpenSans = function(scale) {
 };
 
 var drawTimeout;
+var lastBattCheck = 0;
+var width = 0;
 
 function queueDraw(millis_now) {
     if (drawTimeout) clearTimeout(drawTimeout);
@@ -24,12 +26,15 @@ function draw() {
     var date = new Date();
     var h = date.getHours(),
         m = date.getMinutes();
-    var d = date.getDate(),
-        w = date.getDay(); // d=1..31; w=0..6
-    const level = E.getBattery();
-    const width = level + (level/2);
+    var d = date.getDate();
     var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
-    var dows = require("date_utils").dows(0,1);
+    var dow = require("date_utils").dows(0,1)[date.getDay()];
+
+    if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
+      lastBattcheck = date.getTime();
+      width = E.getBattery();
+      width += width/2;
+    }
 
     g.reset();
     g.clear();
@@ -47,24 +52,35 @@ function draw() {
     g.drawString(d, g.getWidth() -6, 98);
     g.setFont('Vector', 52);
     g.setFontAlign(-1, -1);
-    g.drawString(dows[w].slice(0,2).toUpperCase(), 6, 103);
+    g.drawString(dow.slice(0,2).toUpperCase(), 6, 103);
 
     g.fillRect(9,159,166,171);
     g.fillRect(167,163,170,167);
     if (Bangle.isCharging()) {
       g.setColor(1,1,0);
-    } else if (level > 40) {
-      g.setColor(0,1,0);
+      g.fillRect(12,162,12+width,168);
     } else {
       g.setColor(1,0,0);
+      g.fillRect(12,162,57,168);
+      g.setColor(1,1,0);
+      g.fillRect(58,162,72,168);
+      g.setColor(0,1,0);
+      g.fillRect(73,162,162,168);
     }
-    g.fillRect(12,162,12+width,168);
-    if (level < 100) {
+    if (width < 150) {
       g.setColor(g.theme.bg);
       g.fillRect(12+width+1,162,162,168);
     }
 
-    g.setColor(0, 1, 0);
+    if (Bangle.isCharging()) {
+      g.setColor(1,1,0);
+    } else if (width <= 45) {
+      g.setColor(1,0,0);
+    } else if (width <= 60) {
+      g.setColor(1,1,0);
+    } else {
+      g.setColor(0, 1, 0);
+    }
     g.fillRect(0, 90, g.getWidth(), 94);
 
     // widget redraw
@@ -85,7 +101,8 @@ Bangle.on('charging', (charging) => {
     draw();
 });
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
-Bangle.setUI("clock");
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
index 7359bcf20..30352ca1a 100644
--- a/apps/bigdclock/metadata.json
+++ b/apps/bigdclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version":"0.05",
+  "version":"0.07",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",
diff --git a/apps/bigdclock/screenshot.png b/apps/bigdclock/screenshot.png
index 8a12b266e..acac53ea9 100644
Binary files a/apps/bigdclock/screenshot.png and b/apps/bigdclock/screenshot.png differ
diff --git a/apps/binclock/ChangeLog b/apps/binclock/ChangeLog
index dc4ed8308..7c31cc0d3 100644
--- a/apps/binclock/ChangeLog
+++ b/apps/binclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Fixed bug where screen didn't clear so incorrect time displayed.
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
diff --git a/apps/binclock/app.js b/apps/binclock/app.js
index f8cbe8dd5..d9c74e6ce 100644
--- a/apps/binclock/app.js
+++ b/apps/binclock/app.js
@@ -164,9 +164,6 @@ Bangle.on('lcdPower',on=>{
     draw(); // draw immediately
   }
 });
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clockupdown", btn=>{
   if (btn!=1) return;
@@ -176,3 +173,6 @@ Bangle.setUI("clockupdown", btn=>{
     displayTime = 0;
   }
 });
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/binclock/metadata.json b/apps/binclock/metadata.json
index d17045868..2ca2755a6 100644
--- a/apps/binclock/metadata.json
+++ b/apps/binclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "binclock",
   "name": "Binary Clock",
   "shortName": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A binary clock with hours and minutes. BTN1 toggles a digital clock.",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/binwatch/ChangeLog b/apps/binwatch/ChangeLog
index 1e54f489c..e355155b3 100644
--- a/apps/binwatch/ChangeLog
+++ b/apps/binwatch/ChangeLog
@@ -2,3 +2,5 @@
 0.02: first running version for BangleJs2
 0.03: corrected icon, added screen shot, extended description
 0.04: corrected format of background image (raw binary)
+0.05: move setUI() up before draw() as to not have a false positive 'sanity
+check' when building on github.
diff --git a/apps/binwatch/app.js b/apps/binwatch/app.js
index 28d7a06a5..153bebb32 100644
--- a/apps/binwatch/app.js
+++ b/apps/binwatch/app.js
@@ -334,6 +334,7 @@ function setRuntimeValues(resolution) {
 var hour = 0, minute = 1, second = 50;
 var batVLevel = 20;
 
+Bangle.setUI("clock");
 
 function draw() {
   var d = new Date();
@@ -371,7 +372,6 @@ function draw() {
 }
 
 // Show launcher when button pressed
-Bangle.setUI("clock");
 setRuntimeValues(g.getWidth());
 g.reset().clear();
 Bangle.loadWidgets();
diff --git a/apps/binwatch/metadata.json b/apps/binwatch/metadata.json
index 0b5fb2c72..0b4dbc697 100644
--- a/apps/binwatch/metadata.json
+++ b/apps/binwatch/metadata.json
@@ -3,7 +3,7 @@
   "shortName":"BinWatch",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.04",
+  "version":"0.05",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator":true,
diff --git a/apps/blobclk/ChangeLog b/apps/blobclk/ChangeLog
index 9c4ef5b7b..193eb5024 100644
--- a/apps/blobclk/ChangeLog
+++ b/apps/blobclk/ChangeLog
@@ -5,3 +5,4 @@
 0.04: Modified to account for changes in the behavior of Graphics.fillPoly
 0.05: Slight increase to draw speed after LCD on
 0.06: Update to use Bangle.setUI instead of setWatch, allow themes and different size screens
+0.07: Tell clock widgets to hide.
diff --git a/apps/blobclk/clock-blob.js b/apps/blobclk/clock-blob.js
index c84b8a1e6..d23e18ff9 100644
--- a/apps/blobclk/clock-blob.js
+++ b/apps/blobclk/clock-blob.js
@@ -99,6 +99,10 @@ function startTimers() {
   Bangle.drawWidgets();
   intervalRef = setInterval(redraw,1000);
 }
+
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 startTimers();
 Bangle.on('lcdPower',function(on) {
@@ -108,5 +112,3 @@ Bangle.on('lcdPower',function(on) {
     clearTimers();
   }
 });
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/blobclk/metadata.json b/apps/blobclk/metadata.json
index 85d7deabe..3ae8de222 100644
--- a/apps/blobclk/metadata.json
+++ b/apps/blobclk/metadata.json
@@ -2,7 +2,7 @@
   "id": "blobclk",
   "name": "Large Digit Blob Clock",
   "shortName": "Blob Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A clock with big digits",
   "icon": "clock-blob.png",
   "type": "clock",
diff --git a/apps/boldclk/ChangeLog b/apps/boldclk/ChangeLog
index 30ac31c61..0c6e8cb52 100644
--- a/apps/boldclk/ChangeLog
+++ b/apps/boldclk/ChangeLog
@@ -3,3 +3,4 @@
 0.04: Work with themes, smaller screens
 0.05: Adjust hand lengths to be within 'tick' points
 0.06: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up". 
+0.07: Tell clock widgets to hide.
diff --git a/apps/boldclk/bold_clock.js b/apps/boldclk/bold_clock.js
index 9d3ea0756..763530a32 100644
--- a/apps/boldclk/bold_clock.js
+++ b/apps/boldclk/bold_clock.js
@@ -130,9 +130,10 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/boldclk/metadata.json b/apps/boldclk/metadata.json
index cf961347d..086203142 100644
--- a/apps/boldclk/metadata.json
+++ b/apps/boldclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "boldclk",
   "name": "Bold Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Simple, readable and practical clock",
   "icon": "bold_clock.png",
   "screenshots": [{"url":"screenshot_bold.png"}],
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index a43ecf86e..7b95d8686 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -52,3 +52,10 @@
 0.46: Fix no clock found error on Bangle.js 2
 0.47: Add polyfill for setUI with an object as an argument (fix regression for 2v12 devices after Layout module changed)
 0.48: Workaround for BTHRM issues on Bangle.js 1 (write .boot files in chunks)
+0.49: Store first found clock as a setting to speed up further boots
+0.50: Allow setting of screen rotation
+      Remove support for 2v11 and earlier firmware
+0.51: Remove patches for 2v10 firmware (BEEPSET and setUI)
+      Add patch to ensure that compass heading is corrected on pre-2v15.68 firmware
+      Ensure clock is only fast-loaded if it doesn't contain widgets
+0.52: Ensure heading patch for pre-2v15.68 firmware applies to getCompass
diff --git a/apps/boot/bootloader.js b/apps/boot/bootloader.js
index 45e271f30..6e6466f48 100644
--- a/apps/boot/bootloader.js
+++ b/apps/boot/bootloader.js
@@ -1,8 +1,13 @@
 // This runs after a 'fresh' boot
-var clockApp=(require("Storage").readJSON("setting.json",1)||{}).clock;
-if (clockApp) clockApp = require("Storage").read(clockApp);
-if (!clockApp) {
-  clockApp = require("Storage").list(/\.info$/)
+var s = require("Storage").readJSON("setting.json",1)||{};
+/* If were being called from JS code in order to load the clock quickly (eg from a launcher)
+and the clock in question doesn't have widgets, force a normal 'load' as this will then
+reset everything and remove the widgets. */
+if (global.__FILE__ && !s.clockHasWidgets) {load();throw "Clock has no widgets, can't fast load";}
+// Otherwise continue to try and load the clock
+var _clkApp = require("Storage").read(s.clock);
+if (!_clkApp) {
+  _clkApp = require("Storage").list(/\.info$/)
     .map(file => {
       const app = require("Storage").readJSON(file,1);
       if (app && app.type == "clock") {
@@ -11,9 +16,14 @@ if (!clockApp) {
     })
     .filter(x=>x)
     .sort((a, b) => a.sortorder - b.sortorder)[0];
-  if (clockApp)
-    clockApp = require("Storage").read(clockApp.src);
+  if (_clkApp){
+    s.clock = _clkApp.src;
+    _clkApp = require("Storage").read(_clkApp.src);
+    s.clockHasWidgets = _clkApp.includes("Bangle.loadWidgets");
+    require("Storage").writeJSON("setting.json", s);
+  }
 }
-if (!clockApp) clockApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
-eval(clockApp);
-delete clockApp;
+delete s;
+if (!_clkApp) _clkApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
+eval(_clkApp);
+delete _clkApp;
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 4cb3c52e4..e9a24f5f5 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -62,23 +62,6 @@ if (s.ble===false) boot += `if (!NRF.getSecurityStatus().connected) NRF.sleep();
 if (s.timeout!==undefined) boot += `Bangle.setLCDTimeout(${s.timeout});\n`;
 if (!s.timeout) boot += `Bangle.setLCDPower(1);\n`;
 boot += `E.setTimeZone(${s.timezone});`;
-// Set vibrate, beep, etc IF on older firmwares
-if (!Bangle.F_BEEPSET) {
-  if (!s.vibrate) boot += `Bangle.buzz=Promise.resolve;\n`
-  if (s.beep===false) boot += `Bangle.beep=Promise.resolve;\n`
-  else if (s.beep=="vib" && !BANGLEJS2) boot += `Bangle.beep = function (time, freq) {
-    return new Promise(function(resolve) {
-      if ((0|freq)<=0) freq=4000;
-      if ((0|time)<=0) time=200;
-      if (time>5000) time=5000;
-      analogWrite(D13,0.1,{freq:freq});
-      setTimeout(function() {
-        digitalWrite(D13,0);
-        resolve();
-      }, time);
-    });
-  };\n`;
-}
 // Draw out of memory errors onto the screen
 boot += `E.on('errorFlag', function(errorFlags) {
   g.reset(1).setColor("#ff0000").setFont("6x8").setFontAlign(0,1).drawString(errorFlags,g.getWidth()/2,g.getHeight()-1).flip();
@@ -92,76 +75,14 @@ if (s.options) boot+=`Bangle.setOptions(${E.toJS(s.options)});\n`;
 if (s.brightness && s.brightness!=1) boot+=`Bangle.setLCDBrightness(${s.brightness});\n`;
 if (s.passkey!==undefined && s.passkey.length==6) boot+=`NRF.setSecurity({passkey:${E.toJS(s.passkey.toString())}, mitm:1, display:1});\n`;
 if (s.whitelist) boot+=`NRF.on('connect', function(addr) { if (!(require('Storage').readJSON('setting.json',1)||{}).whitelist.includes(addr)) NRF.disconnect(); });\n`;
-// Pre-2v10 firmwares without a theme/setUI
-delete g.theme; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!g.theme) {
-  boot += `g.theme={fg:-1,bg:0,fg2:-1,bg2:7,fgH:-1,bgH:0x02F7,dark:true};\n`;
-}
-try {
-  Bangle.setUI({}); // In 2v12.xx we added the option for mode to be an object - for 2v12 and earlier, add a fix if it fails with an object supplied
-} catch(e) {
-  boot += `Bangle._setUI = Bangle.setUI;
-Bangle.setUI=function(mode, cb) {
-  if (Bangle.uiRemove) {
-    Bangle.uiRemove();
-    delete Bangle.uiRemove;
-  }
-  if ("object"==typeof mode) {
-    // TODO: handle mode.back?
-    mode = mode.mode;
-  }
-  Bangle._setUI(mode, cb);
-};\n`;
-}
-delete E.showScroller; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!E.showScroller) { // added in 2v11 - this is a limited functionality polyfill
-  boot += `E.showScroller = (function(a){function n(){g.reset();b>=l+c&&(c=1+b-l);b<c&&(c=b);g.setColor(g.theme.fg);for(var d=0;d<l;d++){var m=d+c;if(0>m||m>=a.c)break;var f=24+d*a.h;a.draw(m,{x:0,y:f,w:h,h:a.h});d+c==b&&g.setColor(g.theme.fg).drawRect(0,f,h-1,f+a.h-1).drawRect(1,f+1,h-2,f+a.h-2)}g.setColor(c?g.theme.fg:g.theme.bg);g.fillPoly([e,6,e-14,20,e+14,20]);g.setColor(a.c>l+c?g.theme.fg:g.theme.bg);g.fillPoly([e,k-7,e-14,k-21,e+14,k-21])}if(!a)return Bangle.setUI();var b=0,c=0,h=g.getWidth(),
-k=g.getHeight(),e=h/2,l=Math.floor((k-48)/a.h);g.reset().clearRect(0,24,h-1,k-1);n();Bangle.setUI("updown",d=>{d?(b+=d,0>b&&(b=a.c-1),b>=a.c&&(b=0),n()):a.select(b)})});\n`;
-}
-delete g.imageMetrics; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!g.imageMetrics) { // added in 2v11 - this is a limited functionality polyfill
-  boot += `Graphics.prototype.imageMetrics=function(src) {
-  if (src[0]) return {width:src[0],height:src[1]};
-  else if ('object'==typeof src) return {
-    width:("width" in src) ? src.width : src.getWidth(),
-    height:("height" in src) ? src.height : src.getHeight()};
-  var im = E.toString(src);
-  return {width:im.charCodeAt(0), height:im.charCodeAt(1)};
-};\n`;
-}
-delete g.stringMetrics; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!g.stringMetrics) { // added in 2v11 - this is a limited functionality polyfill
-  boot += `Graphics.prototype.stringMetrics=function(txt) {
-  txt = txt.toString().split("\\n");
-  return {width:Math.max.apply(null,txt.map(x=>g.stringWidth(x))), height:this.getFontHeight()*txt.length};
-};\n`;
-}
-delete g.wrapString; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!g.wrapString) { // added in 2v11 - this is a limited functionality polyfill
-  boot += `Graphics.prototype.wrapString=function(str, maxWidth) {
-  var lines = [];
-  for (var unwrappedLine of str.split("\\n")) {
-    var words = unwrappedLine.split(" ");
-    var line = words.shift();
-    for (var word of words) {
-      if (g.stringWidth(line + " " + word) > maxWidth) {
-        lines.push(line);
-        line = word;
-      } else {
-        line += " " + word;
-      }
-    }
-    lines.push(line);
-  }
-  return lines;
-};\n`;
-}
-delete Bangle.appRect; // deleting stops us getting confused by our own decl. builtins can't be deleted
-if (!Bangle.appRect) { // added in 2v11 - polyfill for older firmwares
-  boot += `Bangle.appRect = ((y,w,h)=>({x:0,y:0,w:w,h:h,x2:w-1,y2:h-1}))(g.getWidth(),g.getHeight());
-  (lw=>{ Bangle.loadWidgets = () => { lw(); Bangle.appRect = ((y,w,h)=>({x:0,y:y,w:w,h:h-y,x2:w-1,y2:h-(1+h)}))(global.WIDGETS?24:0,g.getWidth(),g.getHeight()); }; })(Bangle.loadWidgets);\n`;
-}
+if (s.rotate) boot+=`g.setRotation(${s.rotate&3},${s.rotate>>2});\n` // screen rotation
+// ================================================== FIXING OLDER FIRMWARES
+// 2v15.68 and before had compass heading inverted.
+if (process.version.replace("v","")<215.68)
+  boot += `Bangle.on('mag',e=>{if(!isNaN(e.heading))e.heading=360-e.heading;});
+Bangle.getCompass=(c=>(()=>{e=c();if(!isNaN(e.heading))e.heading=360-e.heading;return e;}))(Bangle.getCompass);`;
 
+// ================================================== BOOT.JS
 // Append *.boot.js files
 // These could change bleServices/bleServiceOptions if needed
 var bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{
diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json
index 62adc4db1..339f8503e 100644
--- a/apps/boot/metadata.json
+++ b/apps/boot/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.48",
+  "version": "0.52",
   "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/bthrm/ChangeLog b/apps/bthrm/ChangeLog
index 57f0ecf3d..a70ae3f8a 100644
--- a/apps/bthrm/ChangeLog
+++ b/apps/bthrm/ChangeLog
@@ -29,3 +29,4 @@
       Use default boolean formatter in custom menu and directly apply config if useful
       Allow recording unmodified internal HR
       Better connection retry handling
+0.13: Less time used during boot if disabled
diff --git a/apps/bthrm/boot.js b/apps/bthrm/boot.js
index aa97d83b7..3e3d35737 100644
--- a/apps/bthrm/boot.js
+++ b/apps/bthrm/boot.js
@@ -1,633 +1 @@
-(function() {
-  var settings = Object.assign(
-    require('Storage').readJSON("bthrm.default.json", true) || {},
-    require('Storage').readJSON("bthrm.json", true) || {}
-  );
-
-  var log = function(text, param){
-    if (global.showStatusInfo)
-      showStatusInfo(text);
-    if (settings.debuglog){
-      var logline = new Date().toISOString() + " - " + text;
-      if (param) logline += ": " + JSON.stringify(param);
-      print(logline);
-    }
-  };
-
-  log("Settings: ", settings);
-
-  if (settings.enabled){
-
-    var clearCache = function() {
-      return require('Storage').erase("bthrm.cache.json");
-    };
-
-    var getCache = function() {
-      var cache = require('Storage').readJSON("bthrm.cache.json", true) || {};
-      if (settings.btid && settings.btid === cache.id) return cache;
-      clearCache();
-      return {};
-    };
-
-    var addNotificationHandler = function(characteristic) {
-      log("Setting notification handler"/*supportedCharacteristics[characteristic.uuid].handler*/);
-      characteristic.on('characteristicvaluechanged', (ev) => supportedCharacteristics[characteristic.uuid].handler(ev.target.value));
-    };
-
-    var writeCache = function(cache) {
-      var oldCache = getCache();
-      if (oldCache !== cache) {
-        log("Writing cache");
-        require('Storage').writeJSON("bthrm.cache.json", cache);
-      } else {
-        log("No changes, don't write cache");
-      }
-    };
-
-    var characteristicsToCache = function(characteristics) {
-      log("Cache characteristics");
-      var cache = getCache();
-      if (!cache.characteristics) cache.characteristics = {};
-      for (var c of characteristics){
-        //"handle_value":16,"handle_decl":15
-        log("Saving handle " + c.handle_value + " for characteristic: ", c);
-        cache.characteristics[c.uuid] = {
-          "handle": c.handle_value,
-          "uuid": c.uuid,
-          "notify": c.properties.notify,
-          "read": c.properties.read
-        };
-      }
-      writeCache(cache);
-    };
-
-    var characteristicsFromCache = function(device) {
-      var service = { device : device }; // fake a BluetoothRemoteGATTService
-      log("Read cached characteristics");
-      var cache = getCache();
-      if (!cache.characteristics) return [];
-      var restored = [];
-      for (var c in cache.characteristics){
-        var cached = cache.characteristics[c];
-        var r = new BluetoothRemoteGATTCharacteristic();
-        log("Restoring characteristic ", cached);
-        r.handle_value = cached.handle;
-        r.uuid = cached.uuid;
-        r.properties = {};
-        r.properties.notify = cached.notify;
-        r.properties.read = cached.read;
-        r.service = service;
-        addNotificationHandler(r);
-        log("Restored characteristic: ", r);
-        restored.push(r);
-      }
-      return restored;
-    };
-
-    log("Start");
-
-    var lastReceivedData={
-    };
-
-    var supportedServices = [
-      "0x180d", // Heart Rate
-      "0x180f", // Battery
-    ];
-
-    var bpmTimeout;
-
-    var supportedCharacteristics = {
-      "0x2a37": {
-        //Heart rate measurement
-        active: false,
-        handler: function (dv){
-          var flags = dv.getUint8(0);
-
-          var bpm = (flags & 1) ? (dv.getUint16(1) / 100 /* ? */ ) : dv.getUint8(1); // 8 or 16 bit
-          supportedCharacteristics["0x2a37"].active = bpm > 0;
-          log("BTHRM BPM " + supportedCharacteristics["0x2a37"].active);
-          if (supportedCharacteristics["0x2a37"].active) stopFallback();
-          if (bpmTimeout) clearTimeout(bpmTimeout);
-          bpmTimeout = setTimeout(()=>{
-            supportedCharacteristics["0x2a37"].active = false;
-            startFallback();
-          }, 3000);
-
-          var sensorContact;
-
-          if (flags & 2){
-            sensorContact = !!(flags & 4);
-          }
-
-          var idx = 2 + (flags&1);
-
-          var energyExpended;
-          if (flags & 8){
-            energyExpended = dv.getUint16(idx,1);
-            idx += 2;
-          }
-          var interval;
-          if (flags & 16) {
-            interval = [];
-            var maxIntervalBytes = (dv.byteLength - idx);
-            log("Found " + (maxIntervalBytes / 2) + " rr data fields");
-            for(var i = 0 ; i < maxIntervalBytes / 2; i++){
-              interval[i] = dv.getUint16(idx,1); // in milliseconds
-              idx += 2;
-            }
-          }
-
-          var location;
-          if (lastReceivedData && lastReceivedData["0x180d"] && lastReceivedData["0x180d"]["0x2a38"]){
-            location = lastReceivedData["0x180d"]["0x2a38"];
-          }
-
-          var battery;
-          if (lastReceivedData && lastReceivedData["0x180f"] && lastReceivedData["0x180f"]["0x2a19"]){
-            battery = lastReceivedData["0x180f"]["0x2a19"];
-          }
-
-          if (settings.replace){
-            var repEvent = {
-              bpm: bpm,
-              confidence: (sensorContact || sensorContact === undefined)? 100 : 0,
-              src: "bthrm"
-            };
-
-            log("Emitting HRM", repEvent);
-            Bangle.emit("HRM_int", repEvent);
-          }
-
-          var newEvent = {
-            bpm: bpm
-          };
-
-          if (location) newEvent.location = location;
-          if (interval) newEvent.rr = interval;
-          if (energyExpended) newEvent.energy = energyExpended;
-          if (battery) newEvent.battery = battery;
-          if (sensorContact) newEvent.contact = sensorContact;
-
-          log("Emitting BTHRM", newEvent);
-          Bangle.emit("BTHRM", newEvent);
-        }
-      },
-      "0x2a38": {
-        //Body sensor location
-        handler: function(dv){
-          if (!lastReceivedData["0x180d"]) lastReceivedData["0x180d"] = {};
-          lastReceivedData["0x180d"]["0x2a38"] = parseInt(dv.buffer, 10);
-        }
-      },
-      "0x2a19": {
-        //Battery
-        handler: function (dv){
-          if (!lastReceivedData["0x180f"]) lastReceivedData["0x180f"] = {};
-          lastReceivedData["0x180f"]["0x2a19"] = dv.getUint8(0);
-        }
-      }
-    };
-
-    var device;
-    var gatt;
-    var characteristics = [];
-    var blockInit = false;
-    var currentRetryTimeout;
-    var initialRetryTime = 40;
-    var maxRetryTime = 60000;
-    var retryTime = initialRetryTime;
-
-    var connectSettings = {
-      minInterval: 7.5,
-      maxInterval: 1500
-    };
-
-    var waitingPromise = function(timeout) {
-      return new Promise(function(resolve){
-        log("Start waiting for " + timeout);
-        setTimeout(()=>{
-          log("Done waiting for " + timeout);
-          resolve();
-        }, timeout);
-      });
-    };
-
-    if (settings.enabled){
-      Bangle.isBTHRMActive = function (){
-        return supportedCharacteristics["0x2a37"].active;
-      };
-
-      Bangle.isBTHRMOn = function(){
-        return (Bangle._PWR && Bangle._PWR.BTHRM && Bangle._PWR.BTHRM.length > 0);
-      };
-
-      Bangle.isBTHRMConnected = function(){
-        return gatt && gatt.connected;
-      };
-    }
-
-    if (settings.replace){
-      Bangle.origIsHRMOn = Bangle.isHRMOn;
-
-      Bangle.isHRMOn = function() {
-        if (settings.enabled && !settings.replace){
-            return Bangle.origIsHRMOn();
-        } else if (settings.enabled && settings.replace){
-            return Bangle.isBTHRMOn();
-        }
-        return Bangle.origIsHRMOn() || Bangle.isBTHRMOn();
-      };
-    }
-
-    var clearRetryTimeout = function(resetTime) {
-      if (currentRetryTimeout){
-        log("Clearing timeout " + currentRetryTimeout);
-        clearTimeout(currentRetryTimeout);
-        currentRetryTimeout = undefined;
-      }
-      if (resetTime) {
-        log("Resetting retry time");
-        retryTime = initialRetryTime;
-      }
-    };
-
-    var retry = function() {
-      log("Retry");
-
-      if (!currentRetryTimeout){
-
-        var clampedTime = retryTime < 100 ? 100 : retryTime;
-
-        log("Set timeout for retry as " + clampedTime);
-        clearRetryTimeout();
-        currentRetryTimeout = setTimeout(() => {
-          log("Retrying");
-          currentRetryTimeout = undefined;
-          initBt();
-        }, clampedTime);
-
-        retryTime = Math.pow(clampedTime, 1.1);
-        if (retryTime > maxRetryTime){
-          retryTime = maxRetryTime;
-        }
-      } else {
-        log("Already in retry...");
-      }
-    };
-
-    var buzzing = false;
-    var onDisconnect = function(reason) {
-      log("Disconnect: " + reason);
-      log("GATT", gatt);
-      log("Characteristics", characteristics);
-      clearRetryTimeout(reason != "Connection Timeout");
-      supportedCharacteristics["0x2a37"].active = false;
-      startFallback();
-      blockInit = false;
-      if (settings.warnDisconnect && !buzzing){
-        buzzing = true;
-        Bangle.buzz(500,0.3).then(()=>waitingPromise(4500)).then(()=>{buzzing = false;});
-      }
-      if (Bangle.isBTHRMOn()){
-        retry();
-      }
-    };
-
-    var createCharacteristicPromise = function(newCharacteristic) {
-      log("Create characteristic promise", newCharacteristic);
-      var result = Promise.resolve();
-      // For values that can be read, go ahead and read them, even if we might be notified in the future
-      // Allows for getting initial state of infrequently updating characteristics, like battery
-      if (newCharacteristic.readValue){
-        result = result.then(()=>{
-          log("Reading data", newCharacteristic);
-          return newCharacteristic.readValue().then((data)=>{
-            if (supportedCharacteristics[newCharacteristic.uuid] && supportedCharacteristics[newCharacteristic.uuid].handler) {
-              supportedCharacteristics[newCharacteristic.uuid].handler(data);
-            }
-          });
-        });
-      }
-      if (newCharacteristic.properties.notify){
-        result = result.then(()=>{
-          log("Starting notifications", newCharacteristic);
-          var startPromise = newCharacteristic.startNotifications().then(()=>log("Notifications started", newCharacteristic));
-          if (settings.gracePeriodNotification > 0){
-            log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
-            startPromise = startPromise.then(()=>{
-              log("Wait after connect");
-              return waitingPromise(settings.gracePeriodNotification);
-            });
-          }
-          return startPromise;
-        });
-      }
-      return result.then(()=>log("Handled characteristic", newCharacteristic));
-    };
-
-    var attachCharacteristicPromise = function(promise, characteristic) {
-      return promise.then(()=>{
-        log("Handling characteristic:", characteristic);
-        return createCharacteristicPromise(characteristic);
-      });
-    };
-
-    var createCharacteristicsPromise = function(newCharacteristics) {
-      log("Create characteristics promis ", newCharacteristics);
-      var result = Promise.resolve();
-      for (var c of newCharacteristics){
-        if (!supportedCharacteristics[c.uuid]) continue;
-        log("Supporting characteristic", c);
-        characteristics.push(c);
-        if (c.properties.notify){
-          addNotificationHandler(c);
-        }
-
-        result = attachCharacteristicPromise(result, c);
-      }
-      return result.then(()=>log("Handled characteristics"));
-    };
-
-    var createServicePromise = function(service) {
-      log("Create service promise", service);
-      var result = Promise.resolve();
-      result = result.then(()=>{
-        log("Handling service" + service.uuid);
-        return service.getCharacteristics().then((c)=>createCharacteristicsPromise(c));
-      });
-      return result.then(()=>log("Handled service" + service.uuid));
-    };
-
-    var attachServicePromise = function(promise, service) {
-      return promise.then(()=>createServicePromise(service));
-    };
-
-    var initBt = function () {
-      log("initBt with blockInit: " + blockInit);
-      if (blockInit){
-        retry();
-        return;
-      }
-
-      blockInit = true;
-
-      var promise;
-      var filters;
-
-      if (!device){
-        if (settings.btid){
-          log("Configured device id", settings.btid);
-          filters = [{ id: settings.btid }];
-        } else {
-          return;
-        }
-        log("Requesting device with filters", filters);
-        promise = NRF.requestDevice({ filters: filters, active: true });
-
-        if (settings.gracePeriodRequest){
-          log("Add " + settings.gracePeriodRequest + "ms grace period after request");
-        }
-
-        promise = promise.then((d)=>{
-          log("Got device", d);
-          d.on('gattserverdisconnected', onDisconnect);
-          device = d;
-        });
-
-        promise = promise.then(()=>{
-          log("Wait after request");
-          return waitingPromise(settings.gracePeriodRequest);
-        });
-      } else {
-        promise = Promise.resolve();
-        log("Reuse device", device);
-      }
-
-      promise = promise.then(()=>{
-        if (gatt){
-          log("Reuse GATT", gatt);
-        } else {
-          log("GATT is new", gatt);
-          characteristics = [];
-          var cachedId = getCache().id;
-          if (device.id !== cachedId){
-            log("Device ID changed from " + cachedId + " to " + device.id + ", clearing cache");
-            clearCache();
-          }
-          var newCache = getCache();
-          newCache.id = device.id;
-          writeCache(newCache);
-          gatt = device.gatt;
-        }
-
-        return Promise.resolve(gatt);
-      });
-
-      promise = promise.then((gatt)=>{
-        if (!gatt.connected){
-          log("Connecting...");
-          var connectPromise = gatt.connect(connectSettings).then(function() {
-            log("Connected.");
-          });
-          if (settings.gracePeriodConnect > 0){
-            log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
-            connectPromise = connectPromise.then(()=>{
-              log("Wait after connect");
-              return waitingPromise(settings.gracePeriodConnect);
-            });
-          }
-          return connectPromise;
-        } else {
-          return Promise.resolve();
-        }
-      });
-
-/*      promise = promise.then(() => {
-        log(JSON.stringify(gatt.getSecurityStatus()));
-        if (gatt.getSecurityStatus()['bonded']) {
-          log("Already bonded");
-          return Promise.resolve();
-        } else {
-          log("Start bonding");
-          return gatt.startBonding()
-            .then(() => console.log(gatt.getSecurityStatus()));
-        }
-      });*/
-
-      promise = promise.then(()=>{
-        if (!characteristics || characteristics.length === 0){
-          characteristics = characteristicsFromCache(device);
-        }
-      });
-
-      promise = promise.then(()=>{
-        var characteristicsPromise = Promise.resolve();
-        if (characteristics.length === 0){
-          characteristicsPromise = characteristicsPromise.then(()=>{
-            log("Getting services");
-            return gatt.getPrimaryServices();
-          });
-
-          characteristicsPromise = characteristicsPromise.then((services)=>{
-            log("Got services", services);
-            var result = Promise.resolve();
-            for (var service of services){
-              if (!(supportedServices.includes(service.uuid))) continue;
-              log("Supporting service", service.uuid);
-              result = attachServicePromise(result, service);
-            }
-            if (settings.gracePeriodService > 0) {
-              log("Add " + settings.gracePeriodService + "ms grace period after services");
-              result = result.then(()=>{
-                log("Wait after services");
-                return waitingPromise(settings.gracePeriodService);
-              });
-            }
-            return result;
-          });
-        } else {
-          for (var characteristic of characteristics){
-            characteristicsPromise = attachCharacteristicPromise(characteristicsPromise, characteristic, true);
-          }
-        }
-
-        return characteristicsPromise;
-      });
-
-      return promise.then(()=>{
-        log("Connection established, waiting for notifications");
-        characteristicsToCache(characteristics);
-        clearRetryTimeout(true);
-      }).catch((e) => {
-        characteristics = [];
-        log("Error:", e);
-        onDisconnect(e);
-      });
-    };
-
-    Bangle.setBTHRMPower = function(isOn, app) {
-      // Do app power handling
-      if (!app) app="?";
-      if (Bangle._PWR===undefined) Bangle._PWR={};
-      if (Bangle._PWR.BTHRM===undefined) Bangle._PWR.BTHRM=[];
-      if (isOn && !Bangle._PWR.BTHRM.includes(app)) Bangle._PWR.BTHRM.push(app);
-      if (!isOn && Bangle._PWR.BTHRM.includes(app)) Bangle._PWR.BTHRM = Bangle._PWR.BTHRM.filter(a=>a!==app);
-      isOn = Bangle._PWR.BTHRM.length;
-      // so now we know if we're really on
-      if (isOn) {
-        switchFallback();
-        if (!Bangle.isBTHRMConnected()) initBt();
-      } else { // not on
-        log("Power off for " + app);
-        clearRetryTimeout(true);
-        if (gatt) {
-          if (gatt.connected){
-            log("Disconnect with gatt", gatt);
-            try{
-              gatt.disconnect().then(()=>{
-                log("Successful disconnect");
-              }).catch((e)=>{
-                log("Error during disconnect promise", e);
-              });
-            } catch (e){
-              log("Error during disconnect attempt", e);
-            }
-          }
-        }
-      }
-    };
-
-    if (settings.replace){
-      Bangle.on("HRM", (e) => {
-        e.modified = true;
-        Bangle.emit("HRM_int", e);
-      });
-
-      Bangle.origOn = Bangle.on;
-      Bangle.on = function(name, callback) {
-        if (name == "HRM") {
-          Bangle.origOn("HRM_int", callback);
-        } else {
-          Bangle.origOn(name, callback);
-        }
-      };
-
-      Bangle.origRemoveListener = Bangle.removeListener;
-      Bangle.removeListener = function(name, callback) {
-        if (name == "HRM") {
-          Bangle.origRemoveListener("HRM_int", callback);
-        } else {
-          Bangle.origRemoveListener(name, callback);
-        }
-      };
-
-    }
-
-    Bangle.origSetHRMPower = Bangle.setHRMPower;
-
-    if (settings.startWithHrm){
-
-      Bangle.setHRMPower = function(isOn, app) {
-        log("setHRMPower for " + app + ": " + (isOn?"on":"off"));
-        if (settings.enabled){
-          Bangle.setBTHRMPower(isOn, app);
-        }
-        if ((settings.enabled && !settings.replace) || !settings.enabled){
-          Bangle.origSetHRMPower(isOn, app);
-        }
-      };
-    }
-
-    var fallbackActive = false;
-    var inSwitch = false;
-
-    var stopFallback = function(){
-      if (fallbackActive){
-        Bangle.origSetHRMPower(0, "bthrm_fallback");
-        fallbackActive = false;
-        log("Fallback to HRM disabled");
-      }
-    };
-
-    var startFallback = function(){
-      if (!fallbackActive && settings.allowFallback) {
-        fallbackActive = true;
-        Bangle.origSetHRMPower(1, "bthrm_fallback");
-        log("Fallback to HRM enabled");
-      }
-    };
-
-    var switchFallback = function() {
-      log("Check falling back to HRM");
-      if (!inSwitch){
-        inSwitch = true;
-        if (Bangle.isBTHRMActive()){
-          stopFallback();
-        } else {
-          startFallback();
-        }
-      }
-      inSwitch = false;
-    };
-
-    if (settings.replace){
-      log("Replace HRM event");
-      if (Bangle._PWR && Bangle._PWR.HRM){
-        for (var i = 0; i < Bangle._PWR.HRM.length; i++){
-          var app = Bangle._PWR.HRM[i];
-          log("Moving app " + app);
-          Bangle.origSetHRMPower(0, app);
-          Bangle.setBTHRMPower(1, app);
-          if (Bangle._PWR.HRM===undefined) break;
-        }
-      }
-    }
-
-    E.on("kill", ()=>{
-      if (gatt && gatt.connected){
-        log("Got killed, trying to disconnect");
-        gatt.disconnect().then(()=>log("Disconnected on kill")).catch((e)=>log("Error during disconnnect on kill", e));
-      }
-    });
-  }
-})();
+if ((require('Storage').readJSON("bthrm.json", true) || {}).enabled != false) require("bthrm").enable();
diff --git a/apps/bthrm/lib.js b/apps/bthrm/lib.js
new file mode 100644
index 000000000..9e2f0fe63
--- /dev/null
+++ b/apps/bthrm/lib.js
@@ -0,0 +1,633 @@
+exports.enable = () => {
+  var settings = Object.assign(
+    require('Storage').readJSON("bthrm.default.json", true) || {},
+    require('Storage').readJSON("bthrm.json", true) || {}
+  );
+
+  var log = function(text, param){
+    if (global.showStatusInfo)
+      showStatusInfo(text);
+    if (settings.debuglog){
+      var logline = new Date().toISOString() + " - " + text;
+      if (param) logline += ": " + JSON.stringify(param);
+      print(logline);
+    }
+  };
+
+  log("Settings: ", settings);
+
+  if (settings.enabled){
+
+    var clearCache = function() {
+      return require('Storage').erase("bthrm.cache.json");
+    };
+
+    var getCache = function() {
+      var cache = require('Storage').readJSON("bthrm.cache.json", true) || {};
+      if (settings.btid && settings.btid === cache.id) return cache;
+      clearCache();
+      return {};
+    };
+
+    var addNotificationHandler = function(characteristic) {
+      log("Setting notification handler"/*supportedCharacteristics[characteristic.uuid].handler*/);
+      characteristic.on('characteristicvaluechanged', (ev) => supportedCharacteristics[characteristic.uuid].handler(ev.target.value));
+    };
+
+    var writeCache = function(cache) {
+      var oldCache = getCache();
+      if (oldCache !== cache) {
+        log("Writing cache");
+        require('Storage').writeJSON("bthrm.cache.json", cache);
+      } else {
+        log("No changes, don't write cache");
+      }
+    };
+
+    var characteristicsToCache = function(characteristics) {
+      log("Cache characteristics");
+      var cache = getCache();
+      if (!cache.characteristics) cache.characteristics = {};
+      for (var c of characteristics){
+        //"handle_value":16,"handle_decl":15
+        log("Saving handle " + c.handle_value + " for characteristic: ", c);
+        cache.characteristics[c.uuid] = {
+          "handle": c.handle_value,
+          "uuid": c.uuid,
+          "notify": c.properties.notify,
+          "read": c.properties.read
+        };
+      }
+      writeCache(cache);
+    };
+
+    var characteristicsFromCache = function(device) {
+      var service = { device : device }; // fake a BluetoothRemoteGATTService
+      log("Read cached characteristics");
+      var cache = getCache();
+      if (!cache.characteristics) return [];
+      var restored = [];
+      for (var c in cache.characteristics){
+        var cached = cache.characteristics[c];
+        var r = new BluetoothRemoteGATTCharacteristic();
+        log("Restoring characteristic ", cached);
+        r.handle_value = cached.handle;
+        r.uuid = cached.uuid;
+        r.properties = {};
+        r.properties.notify = cached.notify;
+        r.properties.read = cached.read;
+        r.service = service;
+        addNotificationHandler(r);
+        log("Restored characteristic: ", r);
+        restored.push(r);
+      }
+      return restored;
+    };
+
+    log("Start");
+
+    var lastReceivedData={
+    };
+
+    var supportedServices = [
+      "0x180d", // Heart Rate
+      "0x180f", // Battery
+    ];
+
+    var bpmTimeout;
+
+    var supportedCharacteristics = {
+      "0x2a37": {
+        //Heart rate measurement
+        active: false,
+        handler: function (dv){
+          var flags = dv.getUint8(0);
+
+          var bpm = (flags & 1) ? (dv.getUint16(1) / 100 /* ? */ ) : dv.getUint8(1); // 8 or 16 bit
+          supportedCharacteristics["0x2a37"].active = bpm > 0;
+          log("BTHRM BPM " + supportedCharacteristics["0x2a37"].active);
+          if (supportedCharacteristics["0x2a37"].active) stopFallback();
+          if (bpmTimeout) clearTimeout(bpmTimeout);
+          bpmTimeout = setTimeout(()=>{
+            supportedCharacteristics["0x2a37"].active = false;
+            startFallback();
+          }, 3000);
+
+          var sensorContact;
+
+          if (flags & 2){
+            sensorContact = !!(flags & 4);
+          }
+
+          var idx = 2 + (flags&1);
+
+          var energyExpended;
+          if (flags & 8){
+            energyExpended = dv.getUint16(idx,1);
+            idx += 2;
+          }
+          var interval;
+          if (flags & 16) {
+            interval = [];
+            var maxIntervalBytes = (dv.byteLength - idx);
+            log("Found " + (maxIntervalBytes / 2) + " rr data fields");
+            for(var i = 0 ; i < maxIntervalBytes / 2; i++){
+              interval[i] = dv.getUint16(idx,1); // in milliseconds
+              idx += 2;
+            }
+          }
+
+          var location;
+          if (lastReceivedData && lastReceivedData["0x180d"] && lastReceivedData["0x180d"]["0x2a38"]){
+            location = lastReceivedData["0x180d"]["0x2a38"];
+          }
+
+          var battery;
+          if (lastReceivedData && lastReceivedData["0x180f"] && lastReceivedData["0x180f"]["0x2a19"]){
+            battery = lastReceivedData["0x180f"]["0x2a19"];
+          }
+
+          if (settings.replace){
+            var repEvent = {
+              bpm: bpm,
+              confidence: (sensorContact || sensorContact === undefined)? 100 : 0,
+              src: "bthrm"
+            };
+
+            log("Emitting HRM", repEvent);
+            Bangle.emit("HRM_int", repEvent);
+          }
+
+          var newEvent = {
+            bpm: bpm
+          };
+
+          if (location) newEvent.location = location;
+          if (interval) newEvent.rr = interval;
+          if (energyExpended) newEvent.energy = energyExpended;
+          if (battery) newEvent.battery = battery;
+          if (sensorContact) newEvent.contact = sensorContact;
+
+          log("Emitting BTHRM", newEvent);
+          Bangle.emit("BTHRM", newEvent);
+        }
+      },
+      "0x2a38": {
+        //Body sensor location
+        handler: function(dv){
+          if (!lastReceivedData["0x180d"]) lastReceivedData["0x180d"] = {};
+          lastReceivedData["0x180d"]["0x2a38"] = parseInt(dv.buffer, 10);
+        }
+      },
+      "0x2a19": {
+        //Battery
+        handler: function (dv){
+          if (!lastReceivedData["0x180f"]) lastReceivedData["0x180f"] = {};
+          lastReceivedData["0x180f"]["0x2a19"] = dv.getUint8(0);
+        }
+      }
+    };
+
+    var device;
+    var gatt;
+    var characteristics = [];
+    var blockInit = false;
+    var currentRetryTimeout;
+    var initialRetryTime = 40;
+    var maxRetryTime = 60000;
+    var retryTime = initialRetryTime;
+
+    var connectSettings = {
+      minInterval: 7.5,
+      maxInterval: 1500
+    };
+
+    var waitingPromise = function(timeout) {
+      return new Promise(function(resolve){
+        log("Start waiting for " + timeout);
+        setTimeout(()=>{
+          log("Done waiting for " + timeout);
+          resolve();
+        }, timeout);
+      });
+    };
+
+    if (settings.enabled){
+      Bangle.isBTHRMActive = function (){
+        return supportedCharacteristics["0x2a37"].active;
+      };
+
+      Bangle.isBTHRMOn = function(){
+        return (Bangle._PWR && Bangle._PWR.BTHRM && Bangle._PWR.BTHRM.length > 0);
+      };
+
+      Bangle.isBTHRMConnected = function(){
+        return gatt && gatt.connected;
+      };
+    }
+
+    if (settings.replace){
+      Bangle.origIsHRMOn = Bangle.isHRMOn;
+
+      Bangle.isHRMOn = function() {
+        if (settings.enabled && !settings.replace){
+            return Bangle.origIsHRMOn();
+        } else if (settings.enabled && settings.replace){
+            return Bangle.isBTHRMOn();
+        }
+        return Bangle.origIsHRMOn() || Bangle.isBTHRMOn();
+      };
+    }
+
+    var clearRetryTimeout = function(resetTime) {
+      if (currentRetryTimeout){
+        log("Clearing timeout " + currentRetryTimeout);
+        clearTimeout(currentRetryTimeout);
+        currentRetryTimeout = undefined;
+      }
+      if (resetTime) {
+        log("Resetting retry time");
+        retryTime = initialRetryTime;
+      }
+    };
+
+    var retry = function() {
+      log("Retry");
+
+      if (!currentRetryTimeout){
+
+        var clampedTime = retryTime < 100 ? 100 : retryTime;
+
+        log("Set timeout for retry as " + clampedTime);
+        clearRetryTimeout();
+        currentRetryTimeout = setTimeout(() => {
+          log("Retrying");
+          currentRetryTimeout = undefined;
+          initBt();
+        }, clampedTime);
+
+        retryTime = Math.pow(clampedTime, 1.1);
+        if (retryTime > maxRetryTime){
+          retryTime = maxRetryTime;
+        }
+      } else {
+        log("Already in retry...");
+      }
+    };
+
+    var buzzing = false;
+    var onDisconnect = function(reason) {
+      log("Disconnect: " + reason);
+      log("GATT", gatt);
+      log("Characteristics", characteristics);
+      clearRetryTimeout(reason != "Connection Timeout");
+      supportedCharacteristics["0x2a37"].active = false;
+      startFallback();
+      blockInit = false;
+      if (settings.warnDisconnect && !buzzing){
+        buzzing = true;
+        Bangle.buzz(500,0.3).then(()=>waitingPromise(4500)).then(()=>{buzzing = false;});
+      }
+      if (Bangle.isBTHRMOn()){
+        retry();
+      }
+    };
+
+    var createCharacteristicPromise = function(newCharacteristic) {
+      log("Create characteristic promise", newCharacteristic);
+      var result = Promise.resolve();
+      // For values that can be read, go ahead and read them, even if we might be notified in the future
+      // Allows for getting initial state of infrequently updating characteristics, like battery
+      if (newCharacteristic.readValue){
+        result = result.then(()=>{
+          log("Reading data", newCharacteristic);
+          return newCharacteristic.readValue().then((data)=>{
+            if (supportedCharacteristics[newCharacteristic.uuid] && supportedCharacteristics[newCharacteristic.uuid].handler) {
+              supportedCharacteristics[newCharacteristic.uuid].handler(data);
+            }
+          });
+        });
+      }
+      if (newCharacteristic.properties.notify){
+        result = result.then(()=>{
+          log("Starting notifications", newCharacteristic);
+          var startPromise = newCharacteristic.startNotifications().then(()=>log("Notifications started", newCharacteristic));
+          if (settings.gracePeriodNotification > 0){
+            log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
+            startPromise = startPromise.then(()=>{
+              log("Wait after connect");
+              return waitingPromise(settings.gracePeriodNotification);
+            });
+          }
+          return startPromise;
+        });
+      }
+      return result.then(()=>log("Handled characteristic", newCharacteristic));
+    };
+
+    var attachCharacteristicPromise = function(promise, characteristic) {
+      return promise.then(()=>{
+        log("Handling characteristic:", characteristic);
+        return createCharacteristicPromise(characteristic);
+      });
+    };
+
+    var createCharacteristicsPromise = function(newCharacteristics) {
+      log("Create characteristics promis ", newCharacteristics);
+      var result = Promise.resolve();
+      for (var c of newCharacteristics){
+        if (!supportedCharacteristics[c.uuid]) continue;
+        log("Supporting characteristic", c);
+        characteristics.push(c);
+        if (c.properties.notify){
+          addNotificationHandler(c);
+        }
+
+        result = attachCharacteristicPromise(result, c);
+      }
+      return result.then(()=>log("Handled characteristics"));
+    };
+
+    var createServicePromise = function(service) {
+      log("Create service promise", service);
+      var result = Promise.resolve();
+      result = result.then(()=>{
+        log("Handling service" + service.uuid);
+        return service.getCharacteristics().then((c)=>createCharacteristicsPromise(c));
+      });
+      return result.then(()=>log("Handled service" + service.uuid));
+    };
+
+    var attachServicePromise = function(promise, service) {
+      return promise.then(()=>createServicePromise(service));
+    };
+
+    var initBt = function () {
+      log("initBt with blockInit: " + blockInit);
+      if (blockInit){
+        retry();
+        return;
+      }
+
+      blockInit = true;
+
+      var promise;
+      var filters;
+
+      if (!device){
+        if (settings.btid){
+          log("Configured device id", settings.btid);
+          filters = [{ id: settings.btid }];
+        } else {
+          return;
+        }
+        log("Requesting device with filters", filters);
+        promise = NRF.requestDevice({ filters: filters, active: true });
+
+        if (settings.gracePeriodRequest){
+          log("Add " + settings.gracePeriodRequest + "ms grace period after request");
+        }
+
+        promise = promise.then((d)=>{
+          log("Got device", d);
+          d.on('gattserverdisconnected', onDisconnect);
+          device = d;
+        });
+
+        promise = promise.then(()=>{
+          log("Wait after request");
+          return waitingPromise(settings.gracePeriodRequest);
+        });
+      } else {
+        promise = Promise.resolve();
+        log("Reuse device", device);
+      }
+
+      promise = promise.then(()=>{
+        if (gatt){
+          log("Reuse GATT", gatt);
+        } else {
+          log("GATT is new", gatt);
+          characteristics = [];
+          var cachedId = getCache().id;
+          if (device.id !== cachedId){
+            log("Device ID changed from " + cachedId + " to " + device.id + ", clearing cache");
+            clearCache();
+          }
+          var newCache = getCache();
+          newCache.id = device.id;
+          writeCache(newCache);
+          gatt = device.gatt;
+        }
+
+        return Promise.resolve(gatt);
+      });
+
+      promise = promise.then((gatt)=>{
+        if (!gatt.connected){
+          log("Connecting...");
+          var connectPromise = gatt.connect(connectSettings).then(function() {
+            log("Connected.");
+          });
+          if (settings.gracePeriodConnect > 0){
+            log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
+            connectPromise = connectPromise.then(()=>{
+              log("Wait after connect");
+              return waitingPromise(settings.gracePeriodConnect);
+            });
+          }
+          return connectPromise;
+        } else {
+          return Promise.resolve();
+        }
+      });
+
+/*      promise = promise.then(() => {
+        log(JSON.stringify(gatt.getSecurityStatus()));
+        if (gatt.getSecurityStatus()['bonded']) {
+          log("Already bonded");
+          return Promise.resolve();
+        } else {
+          log("Start bonding");
+          return gatt.startBonding()
+            .then(() => console.log(gatt.getSecurityStatus()));
+        }
+      });*/
+
+      promise = promise.then(()=>{
+        if (!characteristics || characteristics.length === 0){
+          characteristics = characteristicsFromCache(device);
+        }
+      });
+
+      promise = promise.then(()=>{
+        var characteristicsPromise = Promise.resolve();
+        if (characteristics.length === 0){
+          characteristicsPromise = characteristicsPromise.then(()=>{
+            log("Getting services");
+            return gatt.getPrimaryServices();
+          });
+
+          characteristicsPromise = characteristicsPromise.then((services)=>{
+            log("Got services", services);
+            var result = Promise.resolve();
+            for (var service of services){
+              if (!(supportedServices.includes(service.uuid))) continue;
+              log("Supporting service", service.uuid);
+              result = attachServicePromise(result, service);
+            }
+            if (settings.gracePeriodService > 0) {
+              log("Add " + settings.gracePeriodService + "ms grace period after services");
+              result = result.then(()=>{
+                log("Wait after services");
+                return waitingPromise(settings.gracePeriodService);
+              });
+            }
+            return result;
+          });
+        } else {
+          for (var characteristic of characteristics){
+            characteristicsPromise = attachCharacteristicPromise(characteristicsPromise, characteristic, true);
+          }
+        }
+
+        return characteristicsPromise;
+      });
+
+      return promise.then(()=>{
+        log("Connection established, waiting for notifications");
+        characteristicsToCache(characteristics);
+        clearRetryTimeout(true);
+      }).catch((e) => {
+        characteristics = [];
+        log("Error:", e);
+        onDisconnect(e);
+      });
+    };
+
+    Bangle.setBTHRMPower = function(isOn, app) {
+      // Do app power handling
+      if (!app) app="?";
+      if (Bangle._PWR===undefined) Bangle._PWR={};
+      if (Bangle._PWR.BTHRM===undefined) Bangle._PWR.BTHRM=[];
+      if (isOn && !Bangle._PWR.BTHRM.includes(app)) Bangle._PWR.BTHRM.push(app);
+      if (!isOn && Bangle._PWR.BTHRM.includes(app)) Bangle._PWR.BTHRM = Bangle._PWR.BTHRM.filter(a=>a!==app);
+      isOn = Bangle._PWR.BTHRM.length;
+      // so now we know if we're really on
+      if (isOn) {
+        switchFallback();
+        if (!Bangle.isBTHRMConnected()) initBt();
+      } else { // not on
+        log("Power off for " + app);
+        clearRetryTimeout(true);
+        if (gatt) {
+          if (gatt.connected){
+            log("Disconnect with gatt", gatt);
+            try{
+              gatt.disconnect().then(()=>{
+                log("Successful disconnect");
+              }).catch((e)=>{
+                log("Error during disconnect promise", e);
+              });
+            } catch (e){
+              log("Error during disconnect attempt", e);
+            }
+          }
+        }
+      }
+    };
+
+    if (settings.replace){
+      Bangle.on("HRM", (e) => {
+        e.modified = true;
+        Bangle.emit("HRM_int", e);
+      });
+
+      Bangle.origOn = Bangle.on;
+      Bangle.on = function(name, callback) {
+        if (name == "HRM") {
+          Bangle.origOn("HRM_int", callback);
+        } else {
+          Bangle.origOn(name, callback);
+        }
+      };
+
+      Bangle.origRemoveListener = Bangle.removeListener;
+      Bangle.removeListener = function(name, callback) {
+        if (name == "HRM") {
+          Bangle.origRemoveListener("HRM_int", callback);
+        } else {
+          Bangle.origRemoveListener(name, callback);
+        }
+      };
+
+    }
+
+    Bangle.origSetHRMPower = Bangle.setHRMPower;
+
+    if (settings.startWithHrm){
+
+      Bangle.setHRMPower = function(isOn, app) {
+        log("setHRMPower for " + app + ": " + (isOn?"on":"off"));
+        if (settings.enabled){
+          Bangle.setBTHRMPower(isOn, app);
+        }
+        if ((settings.enabled && !settings.replace) || !settings.enabled){
+          Bangle.origSetHRMPower(isOn, app);
+        }
+      };
+    }
+
+    var fallbackActive = false;
+    var inSwitch = false;
+
+    var stopFallback = function(){
+      if (fallbackActive){
+        Bangle.origSetHRMPower(0, "bthrm_fallback");
+        fallbackActive = false;
+        log("Fallback to HRM disabled");
+      }
+    };
+
+    var startFallback = function(){
+      if (!fallbackActive && settings.allowFallback) {
+        fallbackActive = true;
+        Bangle.origSetHRMPower(1, "bthrm_fallback");
+        log("Fallback to HRM enabled");
+      }
+    };
+
+    var switchFallback = function() {
+      log("Check falling back to HRM");
+      if (!inSwitch){
+        inSwitch = true;
+        if (Bangle.isBTHRMActive()){
+          stopFallback();
+        } else {
+          startFallback();
+        }
+      }
+      inSwitch = false;
+    };
+
+    if (settings.replace){
+      log("Replace HRM event");
+      if (Bangle._PWR && Bangle._PWR.HRM){
+        for (var i = 0; i < Bangle._PWR.HRM.length; i++){
+          var app = Bangle._PWR.HRM[i];
+          log("Moving app " + app);
+          Bangle.origSetHRMPower(0, app);
+          Bangle.setBTHRMPower(1, app);
+          if (Bangle._PWR.HRM===undefined) break;
+        }
+      }
+    }
+
+    E.on("kill", ()=>{
+      if (gatt && gatt.connected){
+        log("Got killed, trying to disconnect");
+        gatt.disconnect().then(()=>log("Disconnected on kill")).catch((e)=>log("Error during disconnnect on kill", e));
+      }
+    });
+  }
+};
diff --git a/apps/bthrm/metadata.json b/apps/bthrm/metadata.json
index 4d2cb811b..7eedd223c 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.12",
+  "version": "0.13",
   "description": "Overrides Bangle.js's build in heart rate monitor with an external Bluetooth one.",
   "icon": "app.png",
   "type": "app",
@@ -15,6 +15,7 @@
     {"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","url":"lib.js"},
     {"name":"bthrm.default.json","url":"default.json"}
   ]
 }
diff --git a/apps/bwclk/ChangeLog b/apps/bwclk/ChangeLog
index 8a6fe4f9a..546c83894 100644
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@@ -10,4 +10,14 @@
 0.10: HomeAssistant integration if HomeAssistant is installed.
 0.11: Performance improvements.
 0.12: Implements a 2D menu.
-0.13: Clicks < 24px are for widgets, if fullscreen mode is disabled.
\ No newline at end of file
+0.13: Clicks < 24px are for widgets, if fullscreen mode is disabled.
+0.14: Adds humidity to weather data.
+0.15: Added option for a dynamic mode to show widgets only if unlocked.
+0.16: You can now show your agenda if your calendar is synced with Gadgetbridge.
+0.17: Fix - Step count was no more shown in the menu.
+0.18: Set timer for an agenda entry by simply clicking in the middle of the screen. Only one timer can be set.
+0.19: Fix - Compatibility with "Digital clock widget"
+0.20: Better handling of async data such as getPressure.
+0.21: On the default menu the week of year can be shown.
+0.22: Use the new clkinfo module for the menu.
+0.23: Feedback of apps after run is now optional and decided by the corresponding clkinfo.
\ No newline at end of file
diff --git a/apps/bwclk/README.md b/apps/bwclk/README.md
index eb5356a7e..d869fa2cf 100644
--- a/apps/bwclk/README.md
+++ b/apps/bwclk/README.md
@@ -1,46 +1,49 @@
 # BW Clock
-A very minimalistic clock with date and time in focus.
+A very minimalistic clock.
 
 ![](screenshot.png)
 
 ## Features
-The BW clock provides many features as well as 3rd party integrations:
+The BW clock implements features that are exposed by other apps through the `clkinfo` module.
+For example, if you install the HomeAssistant app, this menu item will be shown if you click right
+and additionally allows you to send triggers directly from the clock (select triggers via up/down and
+send via click center). Here are examples of other apps that are integrated:
+
 - Bangle data such as steps, heart rate, battery or charging state.
-- A timer can be set directly. *Requirement: Scheduler library*
+- Show agenda entries. A timer for an agenda entry can also be set by simply clicking in the middle of the screen. This can be used to not forget a meeting etc. Note that only one agenda-timer can be set at a time. *Requirement: Gadgetbridge calendar sync enabled*
 - Weather temperature as well as the wind speed can be shown. *Requirement: Weather app*
 - HomeAssistant triggers can be executed directly. *Requirement: HomeAssistant app*
 
 Note: If some apps are not installed (e.gt. weather app), then this menu item is hidden.
 
-## Menu
-2D menu allows you to display lots of different data including data from 3rd party apps and it's also possible to control things e.g. to set a timer or send a HomeAssistant trigger.
-
-Simply click left / right to go through the menu entries such as Bangle, Timer etc.
-and click up/down to move into this sub-menu. You can then click in the middle of the screen
-to e.g. send a trigger via HomeAssistant once you selected it.
-
-```
-                    +5min
-                      |
-  Bangle   -- Timer[Optional] -- Weather[Optional] -- HomeAssistant [Optional]
-    |                 |              |                       |
-   Bpm              -5min         Temperature             Trigger1
-    |                                |                       |
-  Steps                             ...                     ...
-    |
-  Battery
-```
-
 ## Settings
-- Fullscreen on/off (widgets are still loaded).
-- Enable/disable lock icon in the settings. Useful if fullscreen is on.
+- Screen: Normal (widgets shown), Dynamic (widgets shown if unlocked) or Full (widgets are hidden).
+- Enable/disable lock icon in the settings. Useful if fullscreen mode is on.
 - The colon (e.g. 7:35 = 735) can be hidden in the settings for an even larger time font to improve readability further.
-- There are no design settings, as your bangle sys settings are used.
+- Your bangle uses the sys color settings so you can change the color too.
+
+## Menu structure
+2D menu allows you to display lots of different data including data from 3rd party apps and it's also possible to control things e.g. to trigger HomeAssistant.
+
+Simply click left / right to go through the menu entries such as Bangle, Weather etc.
+and click up/down to move into this sub-menu. You can then click in the middle of the screen
+to e.g. send a trigger via HomeAssistant once you selected it. The actions really depend
+on the app that provide this sub-menu through the `clkinfo` module.
+
+```
+  Bangle  -- Agenda  --  Weather  --  HomeAssistant
+    |           |           |               |
+ Battery     Entry 1   Temperature      Trigger1
+    |           |           |               |
+  Steps        ...         ...             ...
+    |
+   ...
+```
 
 
 ## Thanks to
-<a href="https://www.flaticon.com/free-icons/" title="Icons">Icons created by Flaticon</a>
-
+- Thanks to Gordon Williams not only for the great BangleJs, but specifically also for the implementation of `clkinfo` which simplified the BWClock a lot and moved complexety to the apps where it should be located.
+- <a href="https://www.flaticon.com/free-icons/" title="Icons">Icons created by Flaticon</a>
 
 ## Creator
 [David Peer](https://github.com/peerdavid)
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index 2d629abe8..7dcca9d75 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -1,22 +1,25 @@
-/************
+/************************************************
  * Includes
  */
 const locale = require('locale');
 const storage = require('Storage');
+const clock_info = require("clock_info");
 
-/************
- * Statics
+
+/************************************************
+ * Globals
  */
 const SETTINGS_FILE = "bwclk.setting.json";
-const TIMER_IDX = "bwclk";
 const W = g.getWidth();
 const H = g.getHeight();
+var lock_input = false;
 
-/************
+
+/************************************************
  * Settings
  */
 let settings = {
-  fullscreen: false,
+  screen: "Normal",
   showLock: true,
   hideColon: false,
   menuPosX: 0,
@@ -28,22 +31,10 @@ for (const key in saved_settings) {
   settings[key] = saved_settings[key]
 }
 
-
-/************
+/************************************************
  * Assets
  */
 // Manrope font
-Graphics.prototype.setXLargeFont = function(scale) {
-  // Actual height 53 (55 - 3)
-  this.setFontCustom(
-    E.toString(require('heatshrink').decompress(atob('AHM/8AIG/+AA4sD/wQGh/4EWQA/AC8YA40HNA0BRY8/RY0P/6LFgf//4iFA4IiFj4HBEQkHCAQiDHIIZGv4HCFQY5BDAo5CAAIpDDAfACA3wLYv//hsFKYxcCMgoiBOooiBQwwiBS40AHIgA/ACS/DLYjYCBAjQEBAYQDBAgHDUAbyDZQi3CegoHEVQQZFagUfW4Y0DaAgECaIJSEFYMPbIYNDv5ACGAIrBCgJ1EFYILCAAQWCj4zDGgILCegcDEQRNDHIIiCHgZ2BEQShFIqUDFYidCh5ODg4NCn40DAgd/AYR5BDILZEAAIMDAAYVCh7aHdYhKDbQg4Dv7rGBAihFCAwIDCAgA/AB3/eoa7GAAk/dgbVGDJrvCDK67DDIjaGdYpbCdYonCcQjjDEVUBEQ4A/AEMcAYV/NAUHcYUDawd/cYUPRYSmBBgaLBToP8BgYiBSgIiCj4iCg//EQSuDW4IMDVwYiCBgIiBBgrRDCATeBaIYqCv70DCgT4CEQMfIgQZBBoRnDv/3EQIvBDIffEQMHFwReBRYUfOgX/+IiDKIeHEQRRECwUHKwIuB8AiDIoJEBCwZFCv/4HIZaBIgPAEQS2CUYQiCD4SABEQcfOwIZBEQaHBO4RcEAAI/BEQQgBSIQiDTIRZBEQZuBVYQiDHoKWCEQQICFQIiDBAQeCEQQA/AANwA40BLIJ5BO4JWCBAUPAYR5En7RBUIQECN4SYCQQIiEh6CCEQk/BoQiBgYeCBoTrCAgT0CCgIfCFYQiBg4IBGgIiDj6rBg4rCBYLRDFYIiBbYIfBLgQiBIQYiD4JCCLgf/bQIWDBYV/EQV/BYXz/5FBgIiD5//IowZBD4M/NAX/BIPgDIJoC//5GgKUDn//4f/8KLE/wTBAAI8BEQPwj4HBVwYmBDgIZDN4QZCGYKJCHQP/JoSgCBATrCh5dBKITVDG4gICAAbvDAH5SCL4QADK4J5CCAiTCCAp1BCAqCDCAgiGCAIiFCAQiFeoIiFg6/FCAgiECAXnEQgQB/kfEQYQC4F/EQYQCgIiDfoIQBg4iDCAUAEQZUCcgIiDDIIQBEQhuBBoIiENoYiFDwQiECAQiFwEBPQQNCAQKDDEYMDDoMfRh4iGUwqvEESBiBaQ5oEbgr0FNAo+EEIwA+oAHGgJoFRAMHe4L0CAALNBBAT0BfwScDCAXweAL0DWgUPQYQiDwF/QYQiC/zTB+C0FBAL0CEQYIBGgMPCgIxBg4rCJIKsCh5IBBwTPCj4WBgYLBZ4V/MAIiBBQQrBEQYtCBYQiCO4QLFCwgiDIQIiGIoMHEQpFBn5FFD4JoENwRoGDgSUCAoKfBw//DgIiCT4auCFwN/T4RRET4TaCEQKoCDIQiCGgK/DAAQICdYQACHoIqCBAoQFEwIhFAH4AFQIROEj4IGXwIIGNwIACbgIhEBAiRCVwoqDTogHEW4QZFXgIZB/z9Cv49CF4MPBwI0Ca4LlB8ATCJoP4AoINDfQPAg7PBg4cBBwUfD4MfFYILCCwgOCf4QLEwEPCwILCgJaBn4WBBYQxCIQQiD+EDCYI5CBYRQBIo4fBMQIuBC4N/NAv8AoIcBSgU/FYIIBZIYrCW4hOCXIQZCgYUBv7jEh4uBZAscewZ8CgEgUYT0EEoQIBA4gICFQQIEHYQA+KQzdDAArdCAArpCEScHaIQiEvwiGe4QiFUwQiEbgIiFYIL0DEQTkBEQrJEEQc/cYYiCg4HBDIQiCfoRoEHQLaDEQQHBbQYiBCAT8Dn/BCAoXBJYP/OgZKC/6OEEARLCEQZLEEQZLEEQjKFEQI6EEQZLDEQbsGEQLjGYYYA/JIxzEg/AfgJSDAoPgfgiDC8COFAoPnaQj6CAAR+CW4TCFA4i6CDIqhCDIfwHoYHCYIN/GgKuBJ4JDBFYUf/C5CBYIZBv/Ag4ZBg4rBBYQTBAQIcBg4FBn5UBAQUfFwIfCEQeAgYfBAQUBFAKbCAQQiCGwIiE+A2BwBFNwE/AoM/EQJoIWwKCCh4cBFYKUERYV/W46uHFYIZGaJA0B/glBGYT0JIITiEMIJvCFQQAEHYQA/ABBlEOIhdGQAIRFSgQIBgQICn4IB8EAjiBCUYglCbQYeBEoQZCTwM/CYIZD/gEBUwIzBJ4UHYAU/EwIrBh4rCAoIXCn4rBCgUDAQN/FYMfBYIXBCYJnCBYXggf8HgQLCwEPEQQuBgJOECwILDCwgiLHIUHBYJFGD4IxBgYWCn4rBBwJoFDIYNBCgPADgKHBRYfDBQN/GAIrBToTLDVwYACDILiCWAb8DAAYzBYAjTCAAI9BAARNCBAoqCBAgQDFgbYCAH4AufgQACf4T8CAAT/CfgQACBwITCAAYOBCYQioh4iEAHQA=='))),
-    46,
-    atob("FR4uHyopKyksJSssGA=="),
-    70+(scale<<8)+(1<<16)
-  );
-};
-
-
 Graphics.prototype.setLargeFont = function(scale) {
   // Actual height 47 (48 - 2)
   this.setFontCustom(
@@ -55,14 +46,12 @@ Graphics.prototype.setLargeFont = function(scale) {
   return this;
 };
 
-
 Graphics.prototype.setMediumFont = function(scale) {
   // Actual height 41 (42 - 2)
   this.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAB/AAAAAAAP/AAAAAAD//AAAAAA///AAAAAP///AAAAB///8AAAAf///AAAAH///wAAAB///+AAAAH///gAAAAH//4AAAAAH/+AAAAAAH/wAAAAAAH8AAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///8AAAAH////AAAAP////wAAAf////4AAA/////8AAB/////+AAD/gAAH+AAD+AAAD/AAH8AAAB/AAH4AAAA/gAH4AAAAfgAH4AAAAfgAPwAAAAfgAPwAAAAfgAPwAAAAfgAHwAAAAfgAH4AAAAfgAH4AAAA/gAH8AAAA/AAD+AAAD/AAD/gAAH/AAB/////+AAB/////8AAA/////4AAAf////wAAAH////gAAAB///+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAfwAAAAAAA/gAAAAAAA/AAAAAAAB/AAAAAAAD+AAAAAAAD8AAAAAAAH8AAAAAAAH//////AAH//////AAH//////AAH//////AAH//////AAH//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAA/AAAP4AAB/AAAf4AAD/AAA/4AAD/AAB/4AAH/AAD/4AAP/AAH/AAAf/AAH8AAA//AAH4AAB//AAP4AAD//AAPwAAH+/AAPwAAP8/AAPwAAf4/AAPwAA/4/AAPwAA/w/AAPwAB/g/AAPwAD/A/AAP4AH+A/AAH8AP8A/AAH/A/4A/AAD///wA/AAD///gA/AAB///AA/AAA//+AA/AAAP/8AA/AAAD/wAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAH4AAAHwAAH4AAAH4AAH4AAAH8AAH4AAAP+AAH4AAAH+AAH4A4AB/AAH4A+AA/AAH4B/AA/gAH4D/AAfgAH4H+AAfgAH4P+AAfgAH4f+AAfgAH4/+AAfgAH5/+AAfgAH5//AAfgAH7+/AA/gAH/8/gB/AAH/4f4H/AAH/wf//+AAH/gP//8AAH/AH//8AAH+AD//wAAH8AB//gAAD4AAf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAD/AAAAAAAP/AAAAAAB//AAAAAAH//AAAAAAf//AAAAAB///AAAAAH///AAAAAf/8/AAAAB//w/AAAAH/+A/AAAA//4A/AAAD//gA/AAAH/+AA/AAAH/4AA/AAAH/gAA/AAAH+AAA/AAAHwAAA/AAAHAAf///AAEAAf///AAAAAf///AAAAAf///AAAAAf///AAAAAf///AAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAP/AHgAAH///AP4AAH///gP8AAH///gP8AAH///gP+AAH///gD/AAH/A/AB/AAH4A/AA/gAH4A+AAfgAH4B+AAfgAH4B+AAfgAH4B8AAfgAH4B8AAfgAH4B+AAfgAH4B+AAfgAH4B+AA/gAH4B/AA/AAH4A/gD/AAH4A/4H+AAH4Af//+AAH4AP//8AAH4AP//4AAHwAD//wAAAAAB//AAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///8AAAAD////AAAAP////wAAAf////4AAA/////8AAB/////+AAD/gP4H+AAD/AfgD/AAH8A/AB/AAH8A/AA/gAH4B+AAfgAH4B+AAfgAPwB8AAfgAPwB8AAfgAPwB+AAfgAPwB+AAfgAH4B+AAfgAH4B/AA/gAH8B/AB/AAH+A/wD/AAD+A/8P+AAB8Af//+AAB4AP//8AAAwAH//4AAAAAD//gAAAAAA//AAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAHAAPwAAAA/AAPwAAAD/AAPwAAAf/AAPwAAB//AAPwAAP//AAPwAA//8AAPwAH//wAAPwAf/+AAAPwB//4AAAPwP//AAAAPw//8AAAAP3//gAAAAP//+AAAAAP//wAAAAAP//AAAAAAP/4AAAAAAP/gAAAAAAP+AAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAH+A//gAAAf/h//4AAA//z//8AAB/////+AAD/////+AAD///+H/AAH+H/4B/AAH8B/wA/gAH4A/gAfgAH4A/gAfgAPwA/AAfgAPwA/AAfgAPwA/AAfgAPwA/AAfgAH4A/gAfgAH4A/gAfgAH8B/wA/gAH/H/4B/AAD///+H/AAD/////+AAB/////+AAA//z//8AAAf/h//4AAAH+A//gAAAAAAH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAD/8AAAAAAP/+AAAAAAf//AAcAAA///gA8AAB///wB+AAD/x/4B/AAD+AP4B/AAH8AH8A/gAH4AH8A/gAH4AD8AfgAP4AD8AfgAPwAB8AfgAPwAB8AfgAPwAB8AfgAPwAB8AfgAH4AD8AfgAH4AD4A/gAH8AH4B/AAD+APwD/AAD/g/wP+AAB/////+AAA/////8AAAf////4AAAP////wAAAH////AAAAA///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("DxcjFyAfISAiHCAiEg=="), 54+(scale<<8)+(1<<16));
   return this;
 };
 
-
 Graphics.prototype.setSmallFont = function(scale) {
   // Actual height 28 (27 - 0)
   this.setFontCustom(
@@ -74,6 +63,16 @@ Graphics.prototype.setSmallFont = function(scale) {
   return this;
 };
 
+Graphics.prototype.setMiniFont = function(scale) {
+  // Actual height 16 (15 - 0)
+  this.setFontCustom(
+    atob('AAAAAAAAAAAAAP+w/5AAAAAA4ADgAOAA4AAAAAAAAAABgBmAGbAb8D+A+YDZ8B/wf4D5gJmAGQAQAAAAAAAeOD8cMwzxj/GPMYwc/Az4AAAAAHAA+DDIYMjA+YBzAAYADeA7MHMw4zDD4ADAAAAz4H/wzjDHMMMwwbBj4APgADAAAAAA4ADgAAAAAAAAAAfwH/54B+ABAAAAAOABeAcf/gfwAAAAACAAaAD4APgAOABgAAAAAAACAAIAAgA/wAMAAgACAAAAAAAAPAA4AAAAAAIAAgACAAIAAgAAAAAAADAAMAAAAAAAcAfwf4D4AIAAAAA/wH/gwDDAMMAwwDB/4D/AAAAAAGAAwAD/8P/wAAAAAHAw8HDA8MHww7DnMH4wGBAAAMBgyHDcMPww/DDv4MfAAAAAAAHgD+A+YPhgwGAH8AfwAEAAAAAA/GD8cMwwzDDMMM5wx+ABgAAAP8B/4MwwzDDMMMwwx+ADwAAAgADAAMBwwfDPgP4A8ADAAAAAe+D/8M4wxjDGMP5wf+ABwAAAfAB+cMYwwjDCMMYwf+A/wAAAAAAAAAxgBCAAAAAAAAAYPBA4AAAAAAAAAgAHAA+AHMAYYAAAAAAAAAAAAAAJAAkACQAJAAkACQAJAAkAAAAAAAAAAAAAABhgHMAPgAcAAgAAAAAAAABgAOAAwbDDsMYA/AA4AAAAAAAD4A/wGBgxzDPsMyQjJDPkM+wYIBxgD+AAAAAAABAA8A/gf8DwwODA/sAfwAHwADAAAP/w//DGMMYwxjDOMP9we+ABwA8AP8Bw4MAwwDDAMMAwwDDgcHDgMMAAAAAA//D/8MAwwDDAMMAw4HB/4D/AAAAAAP/w//DGMMYwxjDGMMQwgBAAAP/w//DDAMMAwwDDAMAADwA/wHDgwDDAMMAwwDDCMOJwc+ADwAAA//D/8AMAAwADAAMAAwD/8P/wAAAAAP/w//AAAABgAHAAMAAwAHD/4P+AAAAAAP/w//AOAB+AOcBw4MBwgDAAEAAA//D/8AAwADAAMAAwADAAAP/w//A8AA8AA+AA8AHwB8AeAHgA//D/8AAAAAD/8P/wcAAcAA8AA4AB4P/w//AAAA8AP8Bw4MAwwDDAMMAwwDDgcH/gP8AAAAAA//D/8MMAwwDDAMYA7gB8ABgADwA/wHDgwDDAMMAwwDDA8ODwf/A/8AAAAAD/8P/wwwDDAMMAx4Dv4HxwEBAAAHjg/HDMMMYwxjDGMONwc+ABwMAAwADAAMAA//D/8MAAwADAAIAAAAD/wP/gAHAAMAAwADAAMAHg/8AAAMAA+AA/AAfgAPAA8AfgPwD4AMAAwAD4AD+AA/AA8A/g/gDwAP4AH8AB8APwH8D8AMAAgBDAMPDgO8APAB8AOcDw8MAwgBCAAOAAeAAeAAfwH/B4AOAAwAAAAMAwwPDB8Mew3jD4MPAwwDAAAAAAAAB//3//QABAAAAAAADgAP4AH+AB8AAQAABAAEAAf/9//wAAAAAAAAAAGAAwAGAAwABgADAAGAAAAAAAAAQABAAEAAQABAAEAAQABAAEAAQABAAAAAAAAAAAAAAAAAAAAAAAQA3wHbAZMBswGzAf4A/wAAAAAP/w//AYMBgwGDAYMA/gB8AAAAEAD+Ae8BgwGDAYMBgwDGAAAAMAD+Ae8BgwGDAYMBhw//D/8AAAAYAP4B/wGTAZMBkwGTAP4AcAEAAYAP/w//CQAJAAAwAP4hz3GDMQMxAzGHcf/h/8AAAAAP/w//AYABgAGAAYAA/wB/AAAAAA3/Df8AAAAAOf/9//AAAAAP/w//ADgAfADGAYMBAQAAD/8P/wAAAAAB/wH/AYABgAGAAf8A/wGAAYABgAH/AP8AAAAAAf8B/wGAAYABgAGAAP8AfwAAADAA/gHvAYMBgwGDAYMA/gB8AAAAAAH/8f/xgwGDAYMBgwD+AHwAAAAwAP4B7wGDAYMBgwGHAf/x//AAAAAB/wH/AYABgAEAAAAA5gHzAbMBkwGbAd8AzgEAAYAP/wf/AQMBAwAAAAAB/gH/AAMAAwADAAcB/wH/AAABAAHgAPwAHwAPAH4B8AGAAQAB8AB+AA8APwHwAeAA/AAPAD8B+AHAAQEBgwHOAHwAOAD+AccBAwAAAQAB4AD4EB/wB8A/APgBwAAAAAEBgwGPAZ8B8wHjAcMBAQAAAAAABgf/9/n2AAAAAAAP/w//AAAEAAYAB/nz//AGAAAAAAAAAAAAcABgAGAAcAAwAHAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'),
+    32,
+    atob("AwUHDwoOCwQHBwcJBAcEBgoGCQkKCQoICQoFBQoMCgkPCgoMCwkICwsECAoIDgsMCgwKCgoLCg8KCQoHBgcLCwgJCgkKCQYKCgQECAQOCgoKCgYIBwoIDAkJCAcEBwsQ"),
+    16+(scale<<8)+(1<<16)
+  );
+  return this;
+};
 
 function imgLock(){
   return {
@@ -83,279 +82,100 @@ function imgLock(){
   }
 }
 
-function imgSteps(){
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/H///wv4CBn4CD8ACCj4IBj8f+Eeh/wjgCBngCCg/4nEH//4h/+jEP/gRBAQX+jkf/wgB//8GwP4FoICDHgICCBwIA=="))
-  }
-}
 
-function imgBattery(){
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/4AN4EAg4TBgd///9oEAAQv8ARQRDDQQgCEwQ4OA"))
-  }
-}
-
-function imgCharging() {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("//+v///k///4AQPwBANgBoMxBoMb/P+h/w/kH8H4gfB+EBwfggHH4EAt4CBn4CBj4CBh4FCCIO/8EB//Agf/wEH/8Gh//x////fAQIA="))
-  }
-}
-
-function imgBpm() {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/4AOn4CD/wCCjgCCv/8jF/wGYgOA5MB//BC4PDAQnjAQPnAQgANA"))
-  }
-}
-
-function imgTemperature() {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("//D///wICBjACBngCNkgCP/0kv/+s1//nDn/8wICEBAIOC/08v//IYJECA=="))
-  }
-}
-
-function imgWeather(){
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 0,
-    buffer : require("heatshrink").decompress(atob("AAcYAQ0MgEwAQUAngLB/8AgP/wACCgf/4Fz//OAQQICCIoaCEAQpGHA4ACA="))
-  }
-}
-
-function imgWind () {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/0f//8h///Pn//zAQXzwf/88B//mvGAh18gEevn/DIICB/PwgEBAQMHBAIADFwM/wEAGAP/54CD84CE+eP//wIQU/A=="))
-  }
-}
-
-function imgTimer() {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/+B/4CD84CEBAPygFP+F+h/x/+P+fz5/n+HnAQNn5/wuYCBmYCC5kAAQfOgFz80As/ngHn+fD54mC/F+j/+gF/HAQA=="))
-  }
-}
-
-function imgWatch() {
-  return {
-    width : 24, height : 24, bpp : 1,
-    transparent : 1,
-    buffer : require("heatshrink").decompress(atob("/8B//+ARANB/l4//5/1/+f/n/n5+fAQnf9/P44CC8/n7/n+YOB/+fDQQgCEwQsCHBBEC"))
-  }
-}
-
-function imgHomeAssistant() {
-  return {
-    width : 48, height : 48, bpp : 1,
-    transparent : 0,
-    buffer : require("heatshrink").decompress(atob("AD8BwAFDg/gAocP+AFDj4FEn/8Aod//wFD/1+FAf4j+8AoMD+EPDAUH+OPAoUP+fPAoUfBYk/C4l/EYIwC//8n//FwIFEgYFD4EH+E8nkP8BdBAonjjk44/wj/nzk58/4gAFDF4PgCIMHAoPwhkwh4FB/EEkEfIIWAHwIFC4A+BAoXgg4FDL4IFDL4IFDLIYFkAEQA=="))
-  }
-}
-
-
-/************
- * 2D MENU with entries of:
- * [name, icon, opt[customDownFun], opt[customUpFun], opt[customCenterFun]]
- *
+/************************************************
+ * Menu
  */
-var menu = [
-  [
-    function(){ return [ null, null ] },
-  ],
-  [
-    function(){ return [ "Bangle", imgWatch() ] },
-    function(){ return [ E.getBattery() + "%", Bangle.isCharging() ? imgCharging() : imgBattery() ] },
-    function(){ return [ getSteps(), imgSteps() ] },
-    function(){ return [ Math.round(Bangle.getHealthStatus("last").bpm) + " bpm", imgBpm()] },
+// Custom bwItems menu - therefore, its added here and not in a clkinfo.js file.
+var bwItems = {
+  name: null,
+  img: null,
+  items: [
+  { name: "WeekOfYear",
+    get: () => ({ text: "Week " + weekOfYear(), img: null}),
+    show: function() { bwItems.items[0].emit("redraw"); },
+    hide: function () {}
+  },
   ]
-]
+};
 
-/*
- * Timer Menu
- */
-try{
-  require('sched');
-  menu.push([
-    function(){
-      var text = isAlarmEnabled() ? getAlarmMinutes() + " min." : "Timer";
-      return [text, imgTimer(), () => decreaseAlarm(), () => increaseAlarm(), null ]
-    },
-  ]);
-} catch(ex) {
-  // If sched is not installed, we hide this menu item
-}
-
-/*
- * WEATHER MENU
- */
-if(storage.readJSON('weather.json') !== undefined){
-  menu.push([
-    function(){ return [ "Weather", imgWeather() ] },
-    function(){ return [ getWeather().temp, imgTemperature() ] },
-    function(){ return [ getWeather().wind, imgWind() ] },
-  ]);
+function weekOfYear() {
+  var date = new Date();
+  date.setHours(0, 0, 0, 0);
+  // Thursday in current week decides the year.
+  date.setDate(date.getDate() + 3 - (date.getDay() + 6) % 7);
+  // January 4 is always in week 1.
+  var week1 = new Date(date.getFullYear(), 0, 4);
+  // Adjust to Thursday in week 1 and count number of weeks from date to week1.
+  return 1 + Math.round(((date.getTime() - week1.getTime()) / 86400000
+                        - 3 + (week1.getDay() + 6) % 7) / 7);
 }
 
 
-/*
- * HOME ASSISTANT MENU
- */
-try{
-  var triggers = require("ha.lib.js").getTriggers();
-  var haMenu = [
-    function(){ return [ "Home", imgHomeAssistant() ] },
-  ];
+// Load menu
+var menu = clock_info.load();
+menu = menu.concat(bwItems);
 
-  triggers.forEach(trigger => {
-    haMenu.push(function(){
-      return [trigger.display, trigger.getIcon(), () => {}, () => {}, function(){
-        var ha = require("ha.lib.js");
-        ha.sendTrigger("TRIGGER_BW");
-        ha.sendTrigger(trigger.trigger);
-      }]
-    });
+
+// Ensure that our settings are still in range (e.g. app uninstall). Otherwise reset the position it.
+if(settings.menuPosX >= menu.length || settings.menuPosY > menu[settings.menuPosX].items.length ){
+  settings.menuPosX = 0;
+  settings.menuPosY = 0;
+}
+
+// Set draw functions for each item
+menu.forEach((menuItm, x) => {
+  menuItm.items.forEach((item, y) => {
+    function drawItem() {
+      // For the clock, we have a special case, as we don't wanna redraw
+      // immediately when something changes. Instead, we update data each minute
+      // to save some battery etc. Therefore, we hide (and disable the listener)
+      // immedeately after redraw...
+      item.hide();
+
+      // After drawing the item, we enable inputs again...
+      lock_input = false;
+
+      var info = item.get();
+      drawMenuItem(info.text, info.img);
+    }
+
+    item.on('redraw', drawItem);
   })
-  menu.push(haMenu);
-} catch(ex){
-  // If HomeAssistant is not installed, we hide this item
-}
+});
 
 
-function getMenuEntry(){
-  // In case the user removes HomeAssistant entries, showInfo
-  // could be larger than infoArray.length...
-  settings.menuPosX = settings.menuPosX % menu.length;
-  settings.menuPosY = settings.menuPosY % menu[settings.menuPosX].length;
-  return menu[settings.menuPosX][settings.menuPosY]();
-}
-
-
-/************
- * Helper
- */
-function getSteps() {
-  var steps = 0;
-  try{
-      if (WIDGETS.wpedom !== undefined) {
-          steps = WIDGETS.wpedom.getSteps();
-      } else if (WIDGETS.activepedom !== undefined) {
-          steps = WIDGETS.activepedom.getSteps();
-      } else {
-        steps = Bangle.getHealthStatus("day").steps;
-      }
-  } catch(ex) {
-      // In case we failed, we can only show 0 steps.
+function canRunMenuItem(){
+  if(settings.menuPosY == 0){
+    return false;
   }
 
-  steps = Math.round(steps/100) / 10; // This ensures that we do not show e.g. 15.0k and 15k instead
-  return steps + "k";
+  var menuEntry = menu[settings.menuPosX];
+  var item = menuEntry.items[settings.menuPosY-1];
+  return item.run !== undefined;
 }
 
 
-function getWeather(){
-  var weatherJson;
-
-  try {
-    weatherJson = storage.readJSON('weather.json');
-    var weather = weatherJson.weather;
-
-    // Temperature
-    weather.temp = locale.temp(weather.temp-273.15);
-
-    // Humidity
-    weather.hum = weather.hum + "%";
-
-    // Wind
-    const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
-    weather.wind = Math.round(wind[1]) + "kph";
-
-    return weather
-
-  } catch(ex) {
-    // Return default
+function runMenuItem(){
+  if(settings.menuPosY == 0){
+    return;
   }
 
-  return {
-    temp: " ? ",
-    hum: " ? ",
-    txt: " ? ",
-    wind: " ? ",
-    wdir: " ? ",
-    wrose: " ? "
-  };
-}
-
-
-function isAlarmEnabled(){
+  var menuEntry = menu[settings.menuPosX];
+  var item = menuEntry.items[settings.menuPosY-1];
   try{
-    var alarm = require('sched');
-    var alarmObj = alarm.getAlarm(TIMER_IDX);
-    if(alarmObj===undefined || !alarmObj.on){
-      return false;
+    var ret = item.run();
+    if(ret){
+      Bangle.buzz(300, 0.6);
     }
-
-    return true;
-
-  } catch(ex){ }
-  return false;
-}
-
-
-function getAlarmMinutes(){
-  if(!isAlarmEnabled()){
-    return -1;
+  } catch (ex) {
+    // Simply ignore it...
   }
-
-  var alarm = require('sched');
-  var alarmObj =  alarm.getAlarm(TIMER_IDX);
-  return Math.round(alarm.getTimeToAlarm(alarmObj)/(60*1000));
 }
 
 
-function increaseAlarm(){
-  try{
-    var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
-    var alarm = require('sched')
-    alarm.setAlarm(TIMER_IDX, {
-      timer : (minutes+5)*60*1000,
-    });
-    alarm.reload();
-  } catch(ex){ }
-}
-
-
-function decreaseAlarm(){
-  try{
-    var minutes = getAlarmMinutes();
-    minutes -= 5;
-
-    var alarm = require('sched')
-    alarm.setAlarm(TIMER_IDX, undefined);
-
-    if(minutes > 0){
-      alarm.setAlarm(TIMER_IDX, {
-        timer : minutes*60*1000,
-      });
-    }
-
-    alarm.reload();
-  } catch(ex){ }
-}
-
-
-/************
- * DRAW
+/************************************************
+ * Draw
  */
 function draw() {
   // Queue draw again
@@ -363,7 +183,7 @@ function draw() {
 
   // Draw clock
   drawDate();
-  drawTime();
+  drawMenuAndTime();
   drawLock();
   drawWidgets();
 }
@@ -371,12 +191,12 @@ function draw() {
 
 function drawDate(){
     // Draw background
-    var y = H/5*2;
-    g.reset().clearRect(0,0,W,W);
+    var y = H/5*2 + (isFullscreen() ? 0 : 8);
+    g.reset().clearRect(0,0,W,y);
 
     // Draw date
     y = parseInt(y/2)+4;
-    y += settings.fullscreen ? 0 : 13;
+    y += isFullscreen() ? 0 : 8;
     var date = new Date();
     var dateStr = date.getDate();
     dateStr = ("0" + dateStr).substr(-2);
@@ -395,15 +215,12 @@ function drawDate(){
 
     g.setMediumFont();
     g.setColor(g.theme.fg);
-    g.drawString(dateStr, W/2 - fullDateW / 2, y+1);
+    g.drawString(dateStr, W/2 - fullDateW / 2, y+2);
 }
 
 
-function drawTime(){
+function drawTime(y, smallText){
   // Draw background
-  var y = H/5*2 + (settings.fullscreen ? 0 : 8);
-  g.setColor(g.theme.fg);
-  g.fillRect(0,y,W,H);
   var date = new Date();
 
   // Draw time
@@ -419,45 +236,65 @@ function drawTime(){
   // Set y coordinates correctly
   y += parseInt((H - y)/2) + 5;
 
-  var menuEntry = getMenuEntry();
-  var menuName = menuEntry[0];
-  var menuImg = menuEntry[1];
-  var printImgLeft = settings.menuPosY != 0;
-
   // Show large or small time depending on info entry
-  if(menuName == null){
-    if(settings.hideColon){
-      g.setXLargeFont();
-    } else {
-      g.setLargeFont();
-    }
-  } else {
+  if(smallText){
     y -= 15;
     g.setMediumFont();
+  } else {
+    g.setLargeFont();
   }
   g.drawString(timeStr, W/2, y);
+}
 
-  // Draw menu if set
-  if(menuName == null){
+function drawMenuItem(text, image){
+  // First clear the time region
+  var y = H/5*2 + (isFullscreen() ? 0 : 8);
+
+  g.setColor(g.theme.fg);
+  g.fillRect(0,y,W,H);
+
+  // Draw menu text
+  var hasText = (text != null && text != "");
+  if(hasText){
+    g.setFontAlign(0,0);
+
+    // For multiline text we show an even smaller font...
+    text = String(text);
+    if(text.split('\n').length > 1){
+      g.setMiniFont();
+    } else {
+      g.setSmallFont();
+    }
+
+    var imgWidth = image == null ? 0 : 24;
+    var strWidth = g.stringWidth(text);
+    g.setColor(g.theme.fg).fillRect(0, 149-14, W, H);
+    g.setColor(g.theme.bg).drawString(text, W/2 + imgWidth/2 + 2, 149+3);
+
+    if(image != null){
+      var scale = imgWidth / image.width;
+      g.drawImage(image, W/2 + -strWidth/2-4 - parseInt(imgWidth/2), 149 - parseInt(imgWidth/2), {scale: scale});
+    }
+  }
+
+  // Draw time
+  drawTime(y, hasText);
+}
+
+
+function drawMenuAndTime(){
+  var menuEntry = menu[settings.menuPosX];
+
+  // The first entry is the overview...
+  if(settings.menuPosY == 0){
+    drawMenuItem(menuEntry.name, menuEntry.img);
     return;
   }
 
-  y += 35;
-  g.setFontAlign(0,0);
-  g.setSmallFont();
-  var imgWidth = 0;
-  if(menuImg !== undefined){
-    imgWidth = 24.0;
-    var strWidth = g.stringWidth(menuName);
-    var scale = imgWidth / menuImg.width;
-    g.drawImage(
-      menuImg,
-      W/2 + (printImgLeft ? -strWidth/2-2 : strWidth/2+2) - parseInt(imgWidth/2),
-      y - parseInt(imgWidth/2),
-      { scale: scale }
-    );
-  }
-  g.drawString(menuName, printImgLeft ? W/2 + imgWidth/2 + 2 : W/2 - imgWidth/2 - 2, y+3);
+  // Draw item if needed
+  lock_input = true;
+  var item = menuEntry.items[settings.menuPosY-1];
+  item.show();
 }
 
 
@@ -470,7 +307,7 @@ function drawLock(){
 
 
 function drawWidgets(){
-  if(settings.fullscreen){
+  if(isFullscreen()){
     for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
   } else {
     Bangle.drawWidgets();
@@ -478,9 +315,19 @@ function drawWidgets(){
 }
 
 
+function isFullscreen(){
+  var s = settings.screen.toLowerCase();
+  if(s == "dynamic"){
+    return Bangle.isLocked()
+  } else {
+    return s == "full"
+  }
+}
 
-/*
- * Draw timeout
+
+
+/************************************************
+ * Listener
  */
 // timeout used to update every minute
 var drawTimeout;
@@ -508,6 +355,13 @@ Bangle.on('lcdPower',on=>{
 Bangle.on('lock', function(isLocked) {
   if (drawTimeout) clearTimeout(drawTimeout);
   drawTimeout = undefined;
+
+  if(!isLocked && settings.screen.toLowerCase() == "dynamic"){
+    // If we have to show the widgets again, we load it from our
+    // cache and not through Bangle.loadWidgets as its much faster!
+    for (let wd of WIDGETS) {wd.draw=wd._draw;wd.area=wd._area;}
+  }
+
   draw();
 });
 
@@ -516,13 +370,13 @@ Bangle.on('charging',function(charging) {
   drawTimeout = undefined;
 
   // Jump to battery
-  settings.menuPosX = 1;
+  settings.menuPosX = 0;
   settings.menuPosY = 1;
   draw();
 });
 
 Bangle.on('touch', function(btn, e){
-  var widget_size = settings.fullscreen ? 0 : 20; // Its not exactly 24px -- empirically it seems that 20 worked better...
+  var widget_size = isFullscreen() ? 0 : 20; // Its not exactly 24px -- empirically it seems that 20 worked better...
   var left = parseInt(g.getWidth() * 0.22);
   var right = g.getWidth() - left;
   var upper = parseInt(g.getHeight() * 0.22) + widget_size;
@@ -534,17 +388,15 @@ Bangle.on('touch', function(btn, e){
   var is_right = e.x > right && !is_upper && !is_lower;
   var is_center = !is_upper && !is_lower && !is_left && !is_right;
 
+  if(lock_input){
+    return;
+  }
+
   if(is_lower){
     Bangle.buzz(40, 0.6);
-    settings.menuPosY = (settings.menuPosY+1) % menu[settings.menuPosX].length;
+    settings.menuPosY = (settings.menuPosY+1) % (menu[settings.menuPosX].items.length+1);
 
-    // Handle custom menu entry function
-    var menuEntry = getMenuEntry();
-    if(menuEntry.length > 2){
-      menuEntry[2]();
-    }
-
-    drawTime();
+    drawMenuAndTime();
   }
 
   if(is_upper){
@@ -554,22 +406,16 @@ Bangle.on('touch', function(btn, e){
 
     Bangle.buzz(40, 0.6);
     settings.menuPosY  = settings.menuPosY-1;
-    settings.menuPosY = settings.menuPosY < 0 ? menu[settings.menuPosX].length-1 : settings.menuPosY;
+    settings.menuPosY = settings.menuPosY < 0 ? menu[settings.menuPosX].items.length : settings.menuPosY;
 
-    // Handle custom menu entry function
-    var menuEntry = getMenuEntry();
-    if(menuEntry.length > 3){
-      menuEntry[3]();
-    }
-
-    drawTime();
+    drawMenuAndTime();
   }
 
   if(is_right){
     Bangle.buzz(40, 0.6);
     settings.menuPosX = (settings.menuPosX+1) % menu.length;
     settings.menuPosY = 0;
-    drawTime();
+    drawMenuAndTime();
   }
 
   if(is_left){
@@ -577,23 +423,12 @@ Bangle.on('touch', function(btn, e){
     settings.menuPosY = 0;
     settings.menuPosX  = settings.menuPosX-1;
     settings.menuPosX = settings.menuPosX < 0 ? menu.length-1 : settings.menuPosX;
-    drawTime();
+    drawMenuAndTime();
   }
 
   if(is_center){
-    var menuEntry = getMenuEntry();
-    if(menuEntry.length > 4){
-      Bangle.buzz(80, 0.6).then(()=>{
-        try{
-          menuEntry[4]();
-          setTimeout(()=>{
-            Bangle.buzz(80, 0.6);
-          }, 250);
-        } catch(ex){
-          // In case it fails, we simply ignore it.
-        }
-      }
-      );
+    if(canRunMenuItem()){
+      runMenuItem();
     }
   }
 });
@@ -608,17 +443,24 @@ E.on("kill", function(){
 });
 
 
-/*
- * Draw clock the first time
+/************************************************
+ * Startup Clock
  */
+
 // The upper part is inverse i.e. light if dark and dark if light theme
 // is enabled. In order to draw the widgets correctly, we invert the
 // dark/light theme as well as the colors.
 g.setTheme({bg:g.theme.fg,fg:g.theme.bg, dark:!g.theme.dark}).clear();
 
-// Load widgets and draw clock the first time
-Bangle.loadWidgets();
-draw();
-
 // Show launcher when middle button pressed
 Bangle.setUI("clock");
+
+// Load widgets and draw clock the first time
+Bangle.loadWidgets();
+
+// Cache draw function for dynamic screen to hide / show widgets
+// Bangle.loadWidgets() could also be called later on but its much slower!
+for (let wd of WIDGETS) {wd._draw=wd.draw; wd._area=wd.area;}
+
+// Draw first time
+draw();
diff --git a/apps/bwclk/metadata.json b/apps/bwclk/metadata.json
index 45d337ebf..fbae0e1e7 100644
--- a/apps/bwclk/metadata.json
+++ b/apps/bwclk/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.13",
-  "description": "A very minimalistic clock with date and time in focus.",
+  "version": "0.23",
+  "description": "A very minimalistic clock to mainly show date and time.",
   "readme": "README.md",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot_2.png"}, {"url":"screenshot_3.png"}, {"url":"screenshot_4.png"}],
diff --git a/apps/bwclk/screenshot_3.png b/apps/bwclk/screenshot_3.png
index f9a9a7d3f..8d982cac4 100644
Binary files a/apps/bwclk/screenshot_3.png and b/apps/bwclk/screenshot_3.png differ
diff --git a/apps/bwclk/settings.js b/apps/bwclk/settings.js
index a421e81a9..116253fda 100644
--- a/apps/bwclk/settings.js
+++ b/apps/bwclk/settings.js
@@ -4,7 +4,7 @@
     // initialize with default settings...
     const storage = require('Storage')
     let settings = {
-      fullscreen: false,
+      screen: "Normal",
       showLock: true,
       hideColon: false,
     };
@@ -17,15 +17,16 @@
       storage.write(SETTINGS_FILE, settings)
     }
 
-
+    var screenOptions = ["Normal", "Dynamic", "Full"];
     E.showMenu({
       '': { 'title': 'BW Clock' },
       '< Back': back,
-      'Fullscreen': {
-        value: settings.fullscreen,
-        format: () => (settings.fullscreen ? 'Yes' : 'No'),
-        onchange: () => {
-          settings.fullscreen = !settings.fullscreen;
+      'Screen': {
+        value: 0 | screenOptions.indexOf(settings.screen),
+        min: 0, max: 2,
+        format: v => screenOptions[v],
+        onchange: v => {
+          settings.screen = screenOptions[v];
           save();
         },
       },
diff --git a/apps/calclock/ChangeLog b/apps/calclock/ChangeLog
new file mode 100644
index 000000000..f4a0c96f5
--- /dev/null
+++ b/apps/calclock/ChangeLog
@@ -0,0 +1,4 @@
+0.01: Initial version
+0.02: More compact rendering & app icon
+0.03: Tell clock widgets to hide.
+0.04: Improve current time readability in light theme.
diff --git a/apps/calclock/README.md b/apps/calclock/README.md
new file mode 100644
index 000000000..2b4e93a0c
--- /dev/null
+++ b/apps/calclock/README.md
@@ -0,0 +1,9 @@
+# Calendar Clock - Your day at a glance
+
+This clock shows a chronological view of your current and future events.
+It uses events synced from Gadgetbridge to achieve this.
+
+The current time and date is highlighted in cyan.
+
+## Screenshot
+![](screenshot.png)
diff --git a/apps/calclock/calclock-icon.js b/apps/calclock/calclock-icon.js
new file mode 100644
index 000000000..9d5514d80
--- /dev/null
+++ b/apps/calclock/calclock-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwgpm5gAB4AVRhgWCAAQWWDCARC/4ACJR4uB54WDAAP8DBotFGIgXLFwv4GAouQC4gwMLooXF/gXJOowXGJBIXBCIgXQxgXLMAIXXMAmIC5OIx4XJhH/wAXIxnIC78IxGIHoIABI44MBC4wQBEQIDB5gXGPAJgEC6IxBC5oABC4wwDa4YTCxAWD5nPDAzvGFYgAB5AXWJBK+GcAq5CGBIuBC5X4GBIJBdoQXB/GIx4CDPJAuEC5JoCDAgWBFwYXJxCBIFwYXKYwoACCwZ3IPQoWIC5YABGYIABCwpHKAQYMBCwwX/C5QAMC8R3/R/4XNhAXNwAXHgGIABgWIAFwA=="))
diff --git a/apps/calclock/calclock.js b/apps/calclock/calclock.js
new file mode 100644
index 000000000..a55dc05f9
--- /dev/null
+++ b/apps/calclock/calclock.js
@@ -0,0 +1,119 @@
+var calendar = [];
+var current = [];
+var next = [];
+
+function updateCalendar() {
+  calendar = require("Storage").readJSON("android.calendar.json",true)||[];
+  calendar = calendar.filter(e => isActive(e) || getTime() <= e.timestamp);
+  calendar.sort((a,b) => a.timestamp - b.timestamp);
+
+  current = calendar.filter(isActive);
+  next = calendar.filter(e=>!isActive(e));
+}
+
+function isActive(event) {
+  var timeActive = getTime() - event.timestamp;
+  return timeActive >= 0 && timeActive <= event.durationInSeconds;
+}
+function zp(str) {
+  return ("0"+str).substr(-2);
+}
+
+function drawEventHeader(event, y) {
+  g.setFont("Vector", 24);
+
+  var time = isActive(event) ? new Date() : new Date(event.timestamp * 1000);
+  var timeStr = zp(time.getHours()) + ":" + zp(time.getMinutes());
+  g.drawString(timeStr, 5, y);
+  y += 24;
+
+  g.setFont("12x20", 1);
+  if (isActive(event)) {
+    g.drawString(zp(time.getDate())+". " + require("locale").month(time,1),15*timeStr.length,y-21);
+  } else {
+    var offset = 0-time.getTimezoneOffset()/1440;
+    var days = Math.floor((time.getTime()/1000)/86400+offset)-Math.floor(getTime()/86400+offset);
+    if(days > 0) {
+      var daysStr = days===1?/*LANG*/"tomorrow":/*LANG*/"in "+days+/*LANG*/" days";
+      g.drawString(daysStr,15*timeStr.length,y-21);
+    }
+  }
+  return y;
+}
+
+function drawEventBody(event, y) {
+  g.setFont("12x20", 1);
+  var lines = g.wrapString(event.title, g.getWidth()-10);
+  if (lines.length > 2) {
+    lines = lines.slice(0,2);
+    lines[1] = lines[1].slice(0,-3)+"...";
+  }
+  g.drawString(lines.join('\n'), 5, y);
+  y+=20 * lines.length;
+  if(event.location) {
+    g.drawImage(atob("DBSBAA8D/H/nDuB+B+B+B3Dn/j/B+A8A8AYAYAYAAAAAAA=="),5,y);
+    g.drawString(event.location, 20, y);
+    y+=20;
+  }
+  y+=5;
+  return y;
+}
+
+function drawEvent(event, y) {
+  y = drawEventHeader(event, y);
+  y = drawEventBody(event, y);
+  return y;
+}
+
+var curEventHeight = 0;
+
+function drawCurrentEvents(y) {
+  g.setColor(g.theme.dark ? "#0ff" : "#0000ff");
+  g.clearRect(5, y, g.getWidth() - 5, y + curEventHeight);
+  curEventHeight = y;
+
+  if(current.length === 0) {
+    y = drawEvent({timestamp: getTime(), durationInSeconds: 100}, y);
+  } else {
+    y = drawEventHeader(current[0], y);
+    for (var e of current) {
+      y = drawEventBody(e, y);
+    }
+  }
+  curEventHeight = y - curEventHeight;
+  return y;
+}
+
+function drawFutureEvents(y) {
+  g.setColor(g.theme.fg);
+  for (var e of next) {
+    y = drawEvent(e, y);
+    if(y>g.getHeight())break;
+  }
+  return y;
+}
+
+function fullRedraw() {
+  g.clearRect(5,24,g.getWidth()-5,g.getHeight());
+  updateCalendar();
+  var y = 30;
+  y = drawCurrentEvents(y);
+  drawFutureEvents(y);
+}
+
+function redraw() {
+  g.reset();
+  if (current.find(e=>!isActive(e)) || next.find(isActive)) {
+    fullRedraw();
+  } else {
+    drawCurrentEvents(30);
+  }
+}
+
+g.clear();
+fullRedraw();
+var minuteInterval = setInterval(redraw, 60 * 1000);
+
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/calclock/calclock.png b/apps/calclock/calclock.png
new file mode 100644
index 000000000..5f953c1ee
Binary files /dev/null and b/apps/calclock/calclock.png differ
diff --git a/apps/calclock/location.png b/apps/calclock/location.png
new file mode 100644
index 000000000..619e55775
Binary files /dev/null and b/apps/calclock/location.png differ
diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json
new file mode 100644
index 000000000..3aab55186
--- /dev/null
+++ b/apps/calclock/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "calclock",
+  "name": "Calendar Clock",
+  "shortName": "CalClock",
+  "version": "0.04",
+  "description": "Show the current and upcoming events synchronized from Gadgetbridge",
+  "icon": "calclock.png",
+  "type": "clock",
+  "tags": "clock agenda",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"calclock.app.js","url":"calclock.js"},
+    {"name":"calclock.img","url":"calclock-icon.js","evaluate":true}
+  ],
+  "screenshots": [{"url":"screenshot.png"}]
+}
diff --git a/apps/calclock/screenshot.png b/apps/calclock/screenshot.png
new file mode 100644
index 000000000..4ab503f2b
Binary files /dev/null and b/apps/calclock/screenshot.png differ
diff --git a/apps/calculator/ChangeLog b/apps/calculator/ChangeLog
index a08a0f5a7..f3ce3a928 100644
--- a/apps/calculator/ChangeLog
+++ b/apps/calculator/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Support for different screen sizes and touchscreen
 0.04: Display current operation on LHS
 0.05: Grid positioning and swipe controls to switch between numbers, operators and special (for Bangle.js 2)
+0.06: Bangle.js 2: Exit with a short press of the physical button
diff --git a/apps/calculator/app.js b/apps/calculator/app.js
index 40953254e..571a5b27f 100644
--- a/apps/calculator/app.js
+++ b/apps/calculator/app.js
@@ -402,6 +402,7 @@ if (process.env.HWVERSION==1) {
   swipeEnabled = false;
   drawGlobal();
 } else { // touchscreen?
+  setWatch(_ => {load();}, BTN1, {edge:'falling'}); // Exit with a short press to physical button
   selected = "NONE";
   swipeEnabled = true;
   prepareScreen(numbers, numbersGrid, COLORS.DEFAULT);
@@ -419,26 +420,20 @@ if (process.env.HWVERSION==1) {
       }
     }
   });
-  var lastX = 0, lastY = 0;
-  Bangle.on('drag', (e) => {
-    if (!e.b) {
-      if (lastX > 50) { // right
-        drawSpecials();
-      } else if (lastX < -50) { // left
-        drawOperators();
-      } else if (lastY > 50) { // down
-        drawNumbers();
-      } else if (lastY < -50) { // up
-        drawNumbers();
-      }
-      lastX = 0;
-      lastY = 0;
-    } else {
-      lastX = lastX + e.dx;
-      lastY = lastY + e.dy;
+  Bangle.on('swipe', (LR, UD) => {
+    if (LR == 1) { // right
+      drawSpecials();
+    }
+    if (LR == -1) { // left
+      drawOperators();
+    }
+    if (UD == 1) { // down
+      drawNumbers();
+    }
+    if (UD == -1) { // up
+      drawNumbers();
     }
   });
 }
 
-
 displayOutput(0);
diff --git a/apps/calculator/metadata.json b/apps/calculator/metadata.json
index e78e4d54f..536a6955e 100644
--- a/apps/calculator/metadata.json
+++ b/apps/calculator/metadata.json
@@ -2,7 +2,7 @@
   "id": "calculator",
   "name": "Calculator",
   "shortName": "Calculator",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Basic calculator reminiscent of MacOs's one. Handy for small calculus.",
   "icon": "calculator.png",
   "screenshots": [{"url":"screenshot_calculator.png"}],
diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
index 0583ea45f..db455679c 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -9,3 +9,4 @@
       read start of week from system settings
 0.09: Fix scope of let variables
 0.10: Use default Bangle formatter for booleans
+0.11: Fix off-by-one-error on next year
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index f4676fc22..f8785e52c 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -226,15 +226,14 @@ drawCalendar(date);
 clearWatch();
 Bangle.on("touch", area => {
   const month = date.getMonth();
-  let prevMonth;
   if (area == 1) {
     let prevMonth = month > 0 ? month - 1 : 11;
     if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
     date.setMonth(prevMonth);
   } else {
-    let prevMonth = month < 11 ? month + 1 : 0;
-    if (prevMonth === 0) date.setFullYear(date.getFullYear() + 1);
-    date.setMonth(month + 1);
+    let nextMonth = month < 11 ? month + 1 : 0;
+    if (nextMonth === 0) date.setFullYear(date.getFullYear() + 1);
+    date.setMonth(nextMonth);
   }
   drawCalendar(date);
 });
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index 48fd52d3e..88f20026d 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "calendar",
   "name": "Calendar",
-  "version": "0.10",
+  "version": "0.11",
   "description": "Simple calendar",
   "icon": "calendar.png",
   "screenshots": [{"url":"screenshot_calendar.png"}],
diff --git a/apps/cassioWatch/ChangeLog b/apps/cassioWatch/ChangeLog
index 419810021..883bd2585 100644
--- a/apps/cassioWatch/ChangeLog
+++ b/apps/cassioWatch/ChangeLog
@@ -8,4 +8,5 @@
 0.7: Update Rocket Sequences Scope to not use memory all time
 0.8: Update Some Variable Scopes to not use memory until need
 0.9: Remove ESLint spaces
-0.10: Show daily steps, heartrate and the temperature if weather information is available.
\ No newline at end of file
+0.10: Show daily steps, heartrate and the temperature if weather information is available.
+0.11: Tell clock widgets to hide.
diff --git a/apps/cassioWatch/app.js b/apps/cassioWatch/app.js
index 6bbb9e823..91f6737ad 100644
--- a/apps/cassioWatch/app.js
+++ b/apps/cassioWatch/app.js
@@ -165,11 +165,11 @@ Bangle.on("lock", (locked) => {
   }
 });
 
+Bangle.setUI("clock");
 
 // Load widgets, but don't show them
 Bangle.loadWidgets();
-Bangle.setUI("clock");
 
 g.reset();
 g.clear();
-draw();
\ No newline at end of file
+draw();
diff --git a/apps/cassioWatch/metadata.json b/apps/cassioWatch/metadata.json
index dabdc2c93..abfee9b93 100644
--- a/apps/cassioWatch/metadata.json
+++ b/apps/cassioWatch/metadata.json
@@ -4,7 +4,7 @@
   "description": "Animated Clock with Space Cassio Watch Style",
   "screenshots": [{ "url": "screens/screen_night.png" },{ "url": "screens/screen_day.png" }],
   "icon": "app.png",
-  "version": "0.10",
+  "version": "0.11",
   "type": "clock",
   "tags": "clock, weather, cassio, retro",
   "supports": ["BANGLEJS2"],
diff --git a/apps/chimer/ChangeLog b/apps/chimer/ChangeLog
new file mode 100644
index 000000000..01bd00a0a
--- /dev/null
+++ b/apps/chimer/ChangeLog
@@ -0,0 +1,2 @@
+0.01: Initial Creation
+0.02: Fixed some sleep bugs. Added a sleep mode toggle
\ No newline at end of file
diff --git a/apps/chimer/README.MD b/apps/chimer/README.MD
new file mode 100644
index 000000000..a78c677f2
--- /dev/null
+++ b/apps/chimer/README.MD
@@ -0,0 +1,11 @@
+# Chimer - For the BangleJS
+
+A fork of [Hour Chime](https://github.com/espruino/BangleApps/tree/master/apps/widchime) that adds extra features such as:
+
+- Buzz or beep on every 60, 30 or 15 minutes.
+- Repeat Chime up to 3 times
+- Set hours to disable chime
+
+Setting the hours you don't want your watch to chime for is done by setting the hour you want it to stop, and the hour you want it to start.
+
+Hours range from 0 - 23.
diff --git a/apps/chimer/icon.txt b/apps/chimer/icon.txt
new file mode 100644
index 000000000..cc969bc81
--- /dev/null
+++ b/apps/chimer/icon.txt
@@ -0,0 +1,2 @@
+
+widget.png: "https://icons8.com/icon/114436/alarm"
\ No newline at end of file
diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
new file mode 100644
index 000000000..d5bc04950
--- /dev/null
+++ b/apps/chimer/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "chimer",
+  "name": "Chimer",
+  "version": "0.02",
+  "description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Reapeat Chime up to 3 times \n - Set hours to disable chime",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme": "README.MD",
+  "storage": [
+    { "name": "chimer.wid.js", "url": "widget.js" },
+    { "name": "chimer.settings.js", "url": "settings.js" }
+  ],
+  "data": [{ "name": "chimer.json" }]
+}
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
new file mode 100644
index 000000000..55160c9be
--- /dev/null
+++ b/apps/chimer/settings.js
@@ -0,0 +1,94 @@
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+
+(function (back) {
+  // default to buzzing
+  var FILE = "chimer.json";
+  var settings = {};
+  const chimes = ["Off", "Buzz", "Beep", "Both"];
+  const frequency = ["60 min", "30 min", "15 min", "1 min"];
+
+  var showMainMenu = () => {
+    E.showMenu({
+      "": { title: "Chimer" },
+      "< Back": () => back(),
+      "Chime Type": {
+        value: settings.type,
+        min: 0,
+        max: 2, // both is just silly
+        format: (v) => chimes[v],
+        onchange: (v) => {
+          settings.type = v;
+          writeSettings(settings);
+        },
+      },
+      Frequency: {
+        value: settings.freq,
+        min: 0,
+        max: 2,
+        format: (v) => frequency[v],
+        onchange: (v) => {
+          settings.freq = v;
+          writeSettings(settings);
+        },
+      },
+      Repetition: {
+        value: settings.repeat,
+        min: 1,
+        max: 5,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.repeat = v;
+          writeSettings(settings);
+        },
+      },
+      "Sleep Mode": {
+        value: !!settings.sleep,
+        onchange: (v) => {
+          settings.sleep = v;
+          writeSettings(settings);
+        },
+      },
+      "Sleep Start": {
+        value: settings.start,
+        min: 0,
+        max: 23,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.start = v;
+          writeSettings(settings);
+        },
+      },
+      "Sleep End": {
+        value: settings.end,
+        min: 0,
+        max: 23,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.end = v;
+          writeSettings(settings);
+        },
+      },
+    });
+  };
+
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+      repeat: 1,
+      sleep: true,
+      start: 6,
+      end: 22,
+    };
+    return settings;
+  };
+
+  var writeSettings = (settings) => {
+    require("Storage").writeJSON(FILE, settings);
+  };
+
+  settings = readSettings();
+  showMainMenu();
+});
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
new file mode 100644
index 000000000..18358df9e
--- /dev/null
+++ b/apps/chimer/widget.js
@@ -0,0 +1,134 @@
+(function () {
+  // 0: off, 1: buzz, 2: beep, 3: both
+  var FILE = "chimer.json";
+
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+      repeat: 1,
+      sleep: true,
+      start: 6,
+      end: 22,
+    };
+    return settings;
+  };
+
+  var settings = readSettings();
+
+  function sleep(milliseconds) {
+    const date = Date.now();
+    let currentDate = null;
+    do {
+      currentDate = Date.now();
+    } while (currentDate - date < milliseconds);
+  }
+
+  function chime() {
+    for (var i = 0; i < settings.repeat; i++) {
+      if (settings.type === 1) {
+        Bangle.buzz(100);
+      } else if (settings.type === 2) {
+        Bangle.beep();
+      } else {
+        return;
+      }
+      sleep(150);
+    }
+  }
+
+  let lastHour = new Date().getHours();
+  let lastMinute = new Date().getMinutes(); // don't chime when (re)loaded at a whole hour
+  function check() {
+    const now = new Date(),
+      h = now.getHours(),
+      m = now.getMinutes(),
+      s = now.getSeconds(),
+      ms = now.getMilliseconds();
+    if (
+      (settings.sleep && h > settings.end) ||
+      (settings.sleep && h >= settings.end && m !== 0) ||
+      (settings.sleep && h < settings.start)
+    ) {
+      var mLeft = 60 - m,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+      return;
+    }
+    if (settings.freq === 1) {
+      if ((m !== lastMinute && m === 0) || (m !== lastMinute && m === 30))
+        chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 30 minutes
+      switch (true) {
+        case m / 30 >= 1:
+          var mLeft = 30 - (m - 30),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 30 < 1:
+          var mLeft = 30 - m,
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+      }
+      setTimeout(check, msLeft);
+    } else if (settings.freq === 2) {
+      if (
+        (m !== lastMinute && m === 0) ||
+        (m !== lastMinute && m === 15) ||
+        (m !== lastMinute && m === 30) ||
+        (m !== lastMinute && m === 45)
+      )
+        chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 15 minutes
+      switch (true) {
+        case m / 15 >= 3:
+          var mLeft = 15 - (m - 45),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 >= 2:
+          var mLeft = 15 - (m - 30),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 >= 1:
+          var mLeft = 15 - (m - 15),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 < 1:
+          var mLeft = 15 - m,
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+      }
+      setTimeout(check, msLeft);
+    } else if (settings.freq === 3) {
+      if (m !== lastMinute) chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 1 minute
+
+      var mLeft = 1,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+    } else {
+      if (h !== lastHour && m === 0) chime();
+      lastHour = h;
+      // check again in 60 minutes
+      var mLeft = 60 - m,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+    }
+  }
+
+  check();
+})();
diff --git a/apps/chimer/widget.png b/apps/chimer/widget.png
new file mode 100644
index 000000000..14edf4150
Binary files /dev/null and b/apps/chimer/widget.png differ
diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog
index c398a89b6..26e531be7 100644
--- a/apps/circlesclock/ChangeLog
+++ b/apps/circlesclock/ChangeLog
@@ -26,3 +26,7 @@
 0.12: Allow configuration of update interval
 0.13: Load step goal from Bangle health app as fallback
       Memory optimizations
+0.14: Support to show big weather info
+0.15: Use Bangle.setUI({remove:...}) to allow loading the launcher without a full reset on 2v16
+0.16: Fix const error
+      Use widget_utils if available
diff --git a/apps/circlesclock/README.md b/apps/circlesclock/README.md
index aa429d5ec..8c8fbe4ae 100644
--- a/apps/circlesclock/README.md
+++ b/apps/circlesclock/README.md
@@ -9,10 +9,11 @@ It can show the following information (this can be configured):
   * Steps distance
   * Heart rate (automatically updates when screen is on and unlocked)
   * Battery (including charging status and battery low warning)
-  * Weather (requires [weather app](https://banglejs.com/apps/#weather))
+  * Weather (requires [OWM weather provider](https://banglejs.com/apps/?id=owmweather))
        * Humidity or wind speed as circle progress
        * Temperature inside circle
        * Condition as icon below circle
+       * Big weather icon next to clock
   * Time and progress until next sunrise or sunset (requires [my location app](https://banglejs.com/apps/#mylocation))
   * Temperature, air pressure or altitude from internal pressure sensor
 
@@ -27,6 +28,8 @@ The color of each circle can be configured. The following colors are available:
 ![Screenshot light theme](screenshot-light.png)
 ![Screenshot dark theme with four circles](screenshot-dark-4.png)
 ![Screenshot light theme with four circles](screenshot-light-4.png)
+![Screenshot light theme with big weather enabled](screenshot-light-with-big-weather.png)
+
 
 ## Ideas
 * Show compass heading
@@ -35,4 +38,5 @@ The color of each circle can be configured. The following colors are available:
 Marco ([myxor](https://github.com/myxor))
 
 ## Icons
-Icons taken from [materialdesignicons](https://materialdesignicons.com) under Apache License 2.0
+Most of the icons are taken from [materialdesignicons](https://materialdesignicons.com) under Apache License 2.0 except the big weather icons which are from 
+[icons8](https://icons8.com/icon/set/weather/small--static--black)
diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index fc501a5d0..25e34cce0 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -1,5 +1,5 @@
-const locale = require("locale");
-const storage = require("Storage");
+let locale = require("locale");
+let storage = require("Storage");
 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));
@@ -12,7 +12,7 @@ Graphics.prototype.setFontRobotoRegular21 = function(scale) {
   return this;
 };
 
-const SETTINGS_FILE = "circlesclock.json";
+let SETTINGS_FILE = "circlesclock.json";
 let settings = Object.assign(
   storage.readJSON("circlesclock.default.json", true) || {},
   storage.readJSON(SETTINGS_FILE, true) || {}
@@ -22,13 +22,16 @@ let settings = Object.assign(
 if (settings.stepGoal == undefined) {
   let d = storage.readJSON("health.json", true) || {};
   settings.stepGoal = d != undefined && d.settings != undefined ? d.settings.stepGoal : undefined;
-  
-  if (settings.stepGoal == undefined) {  
+
+  if (settings.stepGoal == undefined) {
     d = storage.readJSON("wpedom.json", true) || {};
     settings.stepGoal = d != undefined && d.settings != undefined ? d.settings.goal : 10000;
   }
 }
 
+let timerHrm;
+let drawTimeout;
+
 /*
  * Read location from myLocation app
  */
@@ -37,29 +40,30 @@ function getLocation() {
 }
 let location = getLocation();
 
-const showWidgets = settings.showWidgets || false;
-const circleCount = settings.circleCount || 3;
+let showWidgets = settings.showWidgets || false;
+let circleCount = settings.circleCount || 3;
+let showBigWeather = settings.showBigWeather || false;
 
 let hrtValue;
 let now = Math.round(new Date().getTime() / 1000);
 
 
 // layout values:
-const colorFg = g.theme.dark ? '#fff' : '#000';
-const colorBg = g.theme.dark ? '#000' : '#fff';
-const colorGrey = '#808080';
-const colorRed = '#ff0000';
-const colorGreen = '#008000';
-const colorBlue = '#0000ff';
-const colorYellow = '#ffff00';
-const widgetOffset = showWidgets ? 24 : 0;
-const dowOffset = circleCount == 3 ? 20 : 22; // dow offset relative to date
-const h = g.getHeight() - widgetOffset;
-const w = g.getWidth();
-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
+let colorFg = g.theme.dark ? '#fff' : '#000';
+let colorBg = g.theme.dark ? '#000' : '#fff';
+let colorGrey = '#808080';
+let colorRed = '#ff0000';
+let colorGreen = '#008000';
+let colorBlue = '#0000ff';
+let colorYellow = '#ffff00';
+let widgetOffset = showWidgets ? 24 : 0;
+let dowOffset = circleCount == 3 ? 20 : 22; // dow offset relative to date
+let h = g.getHeight() - widgetOffset;
+let w = g.getWidth();
+let hOffset = (circleCount == 3 ? 34 : 30) - widgetOffset;
+let h1 = Math.round(1 * h / 5 - hOffset);
+let h2 = Math.round(3 * h / 5 - hOffset);
+let h3 = Math.round(8 * h / 8 - hOffset - 3); // circle y position
 
 /*
  * circle x positions
@@ -73,21 +77,22 @@ const h3 = Math.round(8 * h / 8 - hOffset - 3); // circle y position
  * | (1) (2) (3) (4) |
  * => circles start at 1,3,5,7 / 8
  */
-const parts = circleCount * 2;
-const circlePosX = [
+let parts = circleCount * 2;
+let circlePosX = [
   Math.round(1 * w / parts), // circle1
   Math.round(3 * w / parts), // circle2
   Math.round(5 * w / parts), // circle3
   Math.round(7 * w / parts), // circle4
 ];
 
-const radiusOuter = circleCount == 3 ? 25 : 20;
-const radiusInner = circleCount == 3 ? 20 : 15;
-const circleFontSmall = circleCount == 3 ? "Vector:14" : "Vector:10";
-const circleFont = circleCount == 3 ? "Vector:15" : "Vector:11";
-const circleFontBig = circleCount == 3 ? "Vector:16" : "Vector:12";
-const iconOffset = circleCount == 3 ? 6 : 8;
-const defaultCircleTypes = ["steps", "hr", "battery", "weather"];
+let radiusOuter = circleCount == 3 ? 25 : 20;
+let radiusInner = circleCount == 3 ? 20 : 15;
+let circleFontSmall = circleCount == 3 ? "Vector:14" : "Vector:10";
+let circleFont = circleCount == 3 ? "Vector:15" : "Vector:11";
+let circleFontBig = circleCount == 3 ? "Vector:16" : "Vector:12";
+let iconOffset = circleCount == 3 ? 6 : 8;
+let defaultCircleTypes = ["steps", "hr", "battery", "weather"];
+
 
 function hideWidgets() {
   /*
@@ -105,9 +110,16 @@ function hideWidgets() {
 
 function draw() {
   g.clear(true);
+  let widgetUtils;
+  
+  try {
+    widgetUtils = require("widget_utils");
+  } catch (e) {
+  }
   if (!showWidgets) {
-    hideWidgets();
+    if (widgetUtils) widgetUtils.hide(); else hideWidgets();
   } else {
+    if (widgetUtils) widgetUtils.show();
     Bangle.drawWidgets();
   }
 
@@ -116,27 +128,53 @@ function draw() {
 
   // time
   g.setFontRobotoRegular50NumericOnly();
-  g.setFontAlign(0, -1);
   g.setColor(colorFg);
-  g.drawString(locale.time(new Date(), 1), w / 2, h1 + 6);
+  if (!showBigWeather) {
+    g.setFontAlign(0, -1);
+    g.drawString(locale.time(new Date(), 1), w / 2, h1 + 6);
+  }
+  else {
+    g.setFontAlign(-1, -1);
+    g.drawString(locale.time(new Date(), 1), 2, h1 + 6);
+  }
   now = Math.round(new Date().getTime() / 1000);
 
   // date & dow
   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);
-  
+  if (!showBigWeather) {
+    g.setFontAlign(0, 0);
+    g.drawString(locale.date(new Date()), w / 2, h2);
+    g.drawString(locale.dow(new Date()), w / 2, h2 + dowOffset);
+  } else {
+    g.setFontAlign(-1, 0);
+    g.drawString(locale.date(new Date()), 2, h2);
+    g.drawString(locale.dow(new Date()), 2, h2 + dowOffset, 1);
+  }
+
+  // weather
+  if (showBigWeather) {
+    let weather = getWeather();
+    let tempString = weather ? locale.temp(weather.temp - 273.15) : undefined;
+    g.setFontAlign(1, 0);
+    if (tempString) g.drawString(tempString, w, h2);
+
+    let code = weather ? weather.code : -1;
+    let icon = getWeatherIconByCode(code, true);
+    if (icon) g.drawImage(icon, w - 48, h1, {scale:0.75});
+  }
+
   drawCircle(1);
   drawCircle(2);
   drawCircle(3);
   if (circleCount >= 4) drawCircle(4);
+
+  queueDraw();
 }
 
 function drawCircle(index) {
   let type = settings['circle' + index];
   if (!type) type = defaultCircleTypes[index - 1];
-  const w = getCircleXPosition(type);
+  let w = getCircleXPosition(type);
 
   switch (type) {
     case "steps":
@@ -188,7 +226,7 @@ function getCirclePosition(type) {
     return circlePositionsCache[type];
   }
   for (let i = 1; i <= circleCount; i++) {
-    const setting = settings['circle' + i];
+    let setting = settings['circle' + i];
     if (setting == type) {
       circlePositionsCache[type] = i - 1;
       return i - 1;
@@ -204,7 +242,7 @@ function getCirclePosition(type) {
 }
 
 function getCircleXPosition(type) {
-  const circlePos = getCirclePosition(type);
+  let circlePos = getCirclePosition(type);
   if (circlePos != undefined) {
     return circlePosX[circlePos];
   }
@@ -216,14 +254,14 @@ function isCircleEnabled(type) {
 }
 
 function getCircleColor(type) {
-  const pos = getCirclePosition(type);
-  const color = settings["circle" + (pos + 1) + "color"];
+  let pos = getCirclePosition(type);
+  let color = settings["circle" + (pos + 1) + "color"];
   if (color && color != "") return color;
 }
 
 function getCircleIconColor(type, color, percent) {
-  const pos = getCirclePosition(type);
-  const colorizeIcon = settings["circle" + (pos + 1) + "colorizeIcon"] == true;
+  let pos = getCirclePosition(type);
+  let colorizeIcon = settings["circle" + (pos + 1) + "colorizeIcon"] == true;
   if (colorizeIcon) {
     return getGradientColor(color, percent);
   } else {
@@ -234,18 +272,18 @@ function getCircleIconColor(type, color, percent) {
 function getGradientColor(color, percent) {
   if (isNaN(percent)) percent = 0;
   if (percent > 1) percent = 1;
-  const colorList = [
+  let colorList = [
     '#00FF00', '#80FF00', '#FFFF00', '#FF8000', '#FF0000'
   ];
   if (color == "fg") {
     color = colorFg;
   }
   if (color == "green-red") {
-    const colorIndex = Math.round(colorList.length * percent);
+    let colorIndex = Math.round(colorList.length * percent);
     return colorList[Math.min(colorIndex, colorList.length) - 1] || "#00ff00";
   }
   if (color == "red-green") {
-    const colorIndex = colorList.length - Math.round(colorList.length * percent);
+    let colorIndex = colorList.length - Math.round(colorList.length * percent);
     return colorList[Math.min(colorIndex, colorList.length)] || "#ff0000";
   }
   return color;
@@ -268,14 +306,14 @@ function getImage(graphic, color) {
 
 function drawSteps(w) {
   if (!w) w = getCircleXPosition("steps");
-  const steps = getSteps();
+  let steps = getSteps();
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("steps");
+  let color = getCircleColor("steps");
 
   let percent;
-  const stepGoal = settings.stepGoal;
+  let stepGoal = settings.stepGoal;
   if (stepGoal > 0) {
     percent = steps / stepGoal;
     if (stepGoal < steps) percent = 1;
@@ -291,16 +329,16 @@ function drawSteps(w) {
 
 function drawStepsDistance(w) {
   if (!w) w = getCircleXPosition("stepsDistance");
-  const steps = getSteps();
-  const stepDistance = settings.stepLength;
-  const stepsDistance = Math.round(steps * stepDistance);
+  let steps = getSteps();
+  let stepDistance = settings.stepLength;
+  let stepsDistance = Math.round(steps * stepDistance);
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("stepsDistance");
+  let color = getCircleColor("stepsDistance");
 
   let percent;
-  const stepDistanceGoal = settings.stepDistanceGoal;
+  let stepDistanceGoal = settings.stepDistanceGoal;
   if (stepDistanceGoal > 0) {
     percent = stepsDistance / stepDistanceGoal;
     if (stepDistanceGoal < stepsDistance) percent = 1;
@@ -317,16 +355,16 @@ function drawStepsDistance(w) {
 function drawHeartRate(w) {
   if (!w) w = getCircleXPosition("hr");
 
-  const heartIcon = atob("EBCBAAAAAAAeeD/8P/x//n/+P/w//B/4D/AH4APAAYAAAAAA");
+  let heartIcon = atob("EBCBAAAAAAAeeD/8P/x//n/+P/w//B/4D/AH4APAAYAAAAAA");
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("hr");
+  let color = getCircleColor("hr");
 
   let percent;
   if (hrtValue != undefined) {
-    const minHR = settings.minHR;
-    const maxHR = settings.maxHR;
+    let minHR = settings.minHR;
+    let maxHR = settings.maxHR;
     percent = (hrtValue - minHR) / (maxHR - minHR);
     if (isNaN(percent)) percent = 0;
     drawGauge(w, h3, percent, color);
@@ -341,9 +379,9 @@ function drawHeartRate(w) {
 
 function drawBattery(w) {
   if (!w) w = getCircleXPosition("battery");
-  const battery = E.getBattery();
+  let battery = E.getBattery();
 
-  const powerIcon = atob("EBCBAAAAA8ADwA/wD/AP8A/wD/AP8A/wD/AP8A/wD/AH4AAA");
+  let powerIcon = atob("EBCBAAAAA8ADwA/wD/AP8A/wD/AP8A/wD/AP8A/wD/AH4AAA");
 
   drawCircleBackground(w);
 
@@ -371,18 +409,18 @@ function drawBattery(w) {
 
 function drawWeather(w) {
   if (!w) w = getCircleXPosition("weather");
-  const weather = getWeather();
-  const tempString = weather ? locale.temp(weather.temp - 273.15) : undefined;
-  const code = weather ? weather.code : -1;
+  let weather = getWeather();
+  let tempString = weather ? locale.temp(weather.temp - 273.15) : undefined;
+  let code = weather ? weather.code : -1;
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("weather");
+  let color = getCircleColor("weather");
   let percent;
-  const data = settings.weatherCircleData;
+  let data = settings.weatherCircleData;
   switch (data) {
     case "humidity":
-      const humidity = weather ? weather.hum : undefined;
+      let humidity = weather ? weather.hum : undefined;
       if (humidity >= 0) {
         percent = humidity / 100;
         drawGauge(w, h3, percent, color);
@@ -390,7 +428,7 @@ function drawWeather(w) {
       break;
     case "wind":
       if (weather) {
-        const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
+        let wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
         if (wind[1] >= 0) {
           if (wind[2] == "kmh") {
             wind[1] = windAsBeaufort(wind[1]);
@@ -410,25 +448,24 @@ function drawWeather(w) {
   writeCircleText(w, tempString ? tempString : "?");
 
   if (code > 0) {
-    const icon = getWeatherIconByCode(code);
+    let icon = getWeatherIconByCode(code);
     if (icon) g.drawImage(getImage(icon, getCircleIconColor("weather", color, percent)), w - iconOffset, h3 + radiusOuter - iconOffset);
   } else {
     g.drawString("?", w, h3 + radiusOuter);
   }
 }
 
-
 function drawSunProgress(w) {
   if (!w) w = getCircleXPosition("sunprogress");
-  const percent = getSunProgress();
+  let percent = getSunProgress();
 
   // sunset icons:
-  const sunSetDown = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAAGYAPAAYAAAAAA");
-  const sunSetUp = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAABgAPABmAAAAAA");
+  let sunSetDown = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAAGYAPAAYAAAAAA");
+  let sunSetUp = atob("EBCBAAAAAAABgAAAAAATyAZoBCB//gAAAAABgAPABmAAAAAA");
 
   drawCircleBackground(w);
 
-  const color = getCircleColor("sunprogress");
+  let color = getCircleColor("sunprogress");
 
   drawGauge(w, h3, percent, color);
 
@@ -436,15 +473,15 @@ function drawSunProgress(w) {
 
   let icon = sunSetDown;
   let text = "?";
-  const times = getSunData();
+  let times = getSunData();
   if (times != undefined) {
-    const sunRise = Math.round(times.sunrise.getTime() / 1000);
-    const sunSet = Math.round(times.sunset.getTime() / 1000);
+    let sunRise = Math.round(times.sunrise.getTime() / 1000);
+    let sunSet = Math.round(times.sunset.getTime() / 1000);
     if (!isDay()) {
       // night
       if (now > sunRise) {
         // after sunRise
-        const upcomingSunRise = sunRise + 60 * 60 * 24;
+        let upcomingSunRise = sunRise + 60 * 60 * 24;
         text = formatSeconds(upcomingSunRise - now);
       } else {
         text = formatSeconds(sunRise - now);
@@ -468,12 +505,12 @@ function drawTemperature(w) {
   getPressureValue("temperature").then((temperature) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("temperature");
+    let color = getCircleColor("temperature");
 
     let percent;
     if (temperature) {
-      const min = -40;
-      const max = 85;
+      let min = -40;
+      let max = 85;
       percent = (temperature - min) / (max - min);
       drawGauge(w, h3, percent, color);
     }
@@ -482,7 +519,7 @@ function drawTemperature(w) {
 
     if (temperature)
       writeCircleText(w, locale.temp(temperature));
-    
+
     g.drawImage(getImage(atob("EBCBAAAAAYADwAJAAkADwAPAA8ADwAfgB+AH4AfgA8ABgAAA"), getCircleIconColor("temperature", color, percent)), w - iconOffset, h3 + radiusOuter - iconOffset);
 
   });
@@ -494,12 +531,12 @@ function drawPressure(w) {
   getPressureValue("pressure").then((pressure) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("pressure");
+    let color = getCircleColor("pressure");
 
     let percent;
     if (pressure && pressure > 0) {
-      const minPressure = 950;
-      const maxPressure = 1050;
+      let minPressure = 950;
+      let maxPressure = 1050;
       percent = (pressure - minPressure) / (maxPressure - minPressure);
       drawGauge(w, h3, percent, color);
     }
@@ -520,12 +557,12 @@ function drawAltitude(w) {
   getPressureValue("altitude").then((altitude) => {
     drawCircleBackground(w);
 
-    const color = getCircleColor("altitude");
+    let color = getCircleColor("altitude");
 
     let percent;
     if (altitude) {
-      const min = 0;
-      const max = 10000;
+      let min = 0;
+      let max = 10000;
       percent = (altitude - min) / (max - min);
       drawGauge(w, h3, percent, color);
     }
@@ -544,7 +581,7 @@ function drawAltitude(w) {
  * wind goes from 0 to 12 (see https://en.wikipedia.org/wiki/Beaufort_scale)
  */
 function windAsBeaufort(windInKmh) {
-  const beaufort = [2, 6, 12, 20, 29, 39, 50, 62, 75, 89, 103, 118];
+  let beaufort = [2, 6, 12, 20, 29, 39, 50, 62, 75, 89, 103, 118];
   let l = 0;
   while (l < beaufort.length && beaufort[l] < windInKmh) {
     l++;
@@ -557,20 +594,22 @@ function windAsBeaufort(windInKmh) {
  * Choose weather icon to display based on weather conditition code
  * https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2
  */
-function getWeatherIconByCode(code) {
-  const codeGroup = Math.round(code / 100);
+function getWeatherIconByCode(code, big) {
+  let codeGroup = Math.round(code / 100);
+  if (big == undefined) big = false;
 
   // weather icons:
-  const weatherCloudy = atob("EBCBAAAAAAAAAAfgD/Af8H/4//7///////9//z/+AAAAAAAA");
-  const weatherSunny = atob("EBCBAAAAAYAQCBAIA8AH4A/wb/YP8A/gB+ARiBAIAYABgAAA");
-  const weatherMoon = atob("EBCBAAAAAYAP8B/4P/w//D/8f/5//j/8P/w//B/4D/ABgAAA");
-  const weatherPartlyCloudy = atob("EBCBAAAAAAAYQAMAD8AIQBhoW+AOYBwwOBBgHGAGP/wf+AAA");
-  const weatherRainy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA");
-  const weatherPartlyRainy = atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA");
-  const weatherSnowy = atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA");
-  const weatherFoggy = atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA");
-  const weatherStormy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA");
-
+  let weatherCloudy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAAAAAfg+AAAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD3gAAAAAAAAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP////////8Af////////gA////////8AAf//////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAAAAAfgD/Af8H/4//7///////9//z/+AAAAAAAA");
+  let weatherSunny = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAwADwADAAAAHgAPAAeAAAAfAA8AD4AAAA+ADwAfAAAAB8APAD4AAAAD4B+AfAAAAAHw//D4AAAAAPv//fAAAAAAf///4AAAAAA/4H/AAAAAAB+AH4AAAAAAPgAHwAAAAAA8AAPAAAAAAHwAA+AAAAAAeAAB4AAAAAB4AAHgAAAAAPAAAPAAAA//8AAA//8AD//wAAD//wAP//AAAP//AA//8AAA//8AAADwAADwAAAAAHgAAeAAAAAAeAAB4AAAAAB8AAPgAAAAADwAA8AAAAAAPgAHwAAAAAAfgB+AAAAAAD/gf8AAAAAAf///4AAAAAD7//3wAAAAAfD/8PgAAAAD4B+AfAAAAAfADwA+AAAAD4APAB8AAAAfAA8AD4AAAB4ADwAHgAAADAAPAAMAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAQCBAIA8AH4A/wb/YP8A/gB+ARiBAIAYABgAAA");
+  let weatherMoon = big ?  atob("QEDBAP//wxgAAAYAAAAPAAAAD4AAAA8AAAAPwAAADwAAAA/gAAAPAAAAB/APAP/wAAAH+A8A//AAAAf4DwD/8AAAB/wPAP/wAAAH/gAADwAAAAe+AAAPAAAAB54AAA8AAAAHngAADwAAAAePAAAAAAAAD48OAAAAAAAPDw+AAAAAAB8PD8AAAAAAHg8P4AAAAAA+DwPwAAAAAHwfAfgAAAAB+D4A/AAA8AfwfgB/8AD//+D+AD/8AP//wfgAH/4Af/8B8AAf/wB//APgAAgfgD+AA8AAAAfAH8AHwAAAA+AP8B+AAAAB4Af//4AAAAHgA///gAAAAPAA//8AAAAA8AAf/wAAAADwAAAAAAAAAPAAAAAAAAAA8AcAAAAAAADwD+AAAAAAAfAfgAAAAAAB+D4AAAAAAAB8fAAAAAAAAD54AAAAAAAAHngAAAAAAAAe8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAPeAAAAAAAAB54AAAAAAAAHnwAAAAAAAA+PgAAAAAAAHwfgAAAAAAB+A/////////wB////////+AD////////wAB///////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAP8B/4P/w//D/8f/5//j/8P/w//B/4D/ABgAAA");
+  let weatherPartlyCloudy = big ? atob("QEDBAP//wxgAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAABwAPAA4AAAAHgA8AHgAAAAfADwA+AAAAA+AfgHwAAAAB8P/w+AAAAAD7//3wAAAAAH///+BAAAAAP+B/wOAAAAAfgB+B8AAAAD4AD8H4AAAAPAA/wPwAAAB8AH+Af/AAAHgA/AA//AAAeAH4AB/+AADwAfAAH/8A//AD4AAIH4D/8AfAAAAHwP/wB4AAAAPg//AHgAAAAeAA8B+AAAAB4AB4fwAAAADwAHn/AAAAAPAAff8AAAAA8AA/8AAAAADwAD/AAAAAAPAEH4AAAAAA8A4PgAAAAAHwHgcAAAAAAfg+AwAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD3gAAAAAAAAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP////////8Af////////gA////////8AAf//////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAAYQAMAD8AIQBhoW+AOYBwwOBBgHGAGP/wf+AAA");
+  let weatherRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4APAA8AAfg+AA8ADwAAfHwADwAPAAA+eAAPAA8AAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AADw8PDwAP8AAPDw8PAA/wAA8PDw8AD3gADw8PDwAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP/w8PDw8P8Af/Dw8PDw/gA/8PDw8PD8AAfw8PDw8OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAPAAAAAAAPAA8AAAAAAA8ADwAAAAAADwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA");
+  let weatherPartlyRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAA8AAfg+AAAADwAAfHwAAAAPAAA+eAAAAA8AAB54AAAADwAAHvAAAAAPAAAP8AAAAA8AAA/wAAAADwAAD/AAAA8PAAAP8AAADw8AAA/wAAAPDwAAD3gAAA8PAAAeeAAADw8AAB58AAAPDwAAPj4AAA8PAAB8H4AADw8AAfgP//8PDw//8Af//w8PD//gA///Dw8P/8AAf/8PDw/+AAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA");
+  let weatherSnowy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAADwAfg+AAAAAPAAfHwAAAAA8AA+eAAAAADwAB54AA8AD/8AHvAADwAP/wAP8AAPAA//AA/wAA8AD/8AD/AA//AA8AAP8AD/8ADwAA/wAP/wAPAAD3gA//AA8AAeeAAPAAAAAB58AA8AAAAAPj4ADwAAAAB8H4APAAAAAfgP/wAA8A//8Af/AADwD//gA/8AAPAP/8AAfwAA8A/+AAAAAA//AAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA");
+  let weatherFoggy = big ? atob("QEDBAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAwADwADAAAAHgAPAAeAAAAfAA8AD4AAAA+ADwAfAAAAB8APAD4AAAAD4B+AfAAAAAHw//D4AAAAAPv//fAAAAAAf///4AAAAAA/4H/AAAAAAB+AH4AAAAAAPgAHwAAAAAA8AAPAAAAAAHwAA+AAAAAAeAAB4AAAAAB4AAHgAAAAAPAAAPAAAAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AD///AADwAAAP//8AAeAAAA///wAB4AAAD///AAPgAAAAAAAAA8AAAAAAAAAHwAAAAAAAAB+AAAAAAAAAf8AAAAD///D/4AAAAP//8P3wAAAA///w8PgAAAD///CAfAAAAAAAAAA+AAAAAAAAAB8AAAAAAAAAD4AAAAAAAAAHgAAP//8PAAMAAA///w8AAAAAD///DwAAAAAP//8PAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA");
+  let weatherStormy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAAAAAfg+AAAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAD/AAHvAAAAAf4AAP8AAAAB/gAA/wAAAAP8AAD/AAAAA/gAAP8AAAAH+AAA/wAAAAfwAAD3gAAAD/AAAeeAAAAP4AAB58AAAB/AAAPj4AAAH8AAB8H4AAA/gAAfgP//+D//D/8Af//4f/4P/gA///B//B/8AAf/8P/8P+AAAAAAAPgAAAAAAAAB8AAAAAAAAAHwAAAAAAAAA+AAAAAAAAADwAAAAAAAAAfAAAAAAAAAB4AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA");
+  let unknown = big ? atob("QEDBAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAf/4AAAAAAAH//4AAAAAAA///wAAAAAAH+B/gAAAAAA/AA/AAAAAAH4AB+AAAAAA/AAD4AAAAAD4H4HwAAAAAfB/4PgAAAAB8P/weAAAAAHg//h4AAAAA+Hw+HwAAAAD4eB8PAAAAAP/wDw8AAAAA//APDwAAAAD/8A8PAAAAAH/gDw8AAAAAAAAfDwAAAAAAAH4fAAAAAAAB/B4AAAAAAAf4HgAAAAAAD/A+AAAAAAAfwHwAAAAAAD8A+AAAAAAAPgH4AAAAAAB8B/AAAAAAAHgf4AAAAAAA+H+AAAAAAADwfwAAAAAAAPD8AAAAAAAA8PAAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAAB/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAADw8AAAAAAAAPDwAAAAAAAA8PAAAAAAAADw8AAAAAAAAP/wAAAAAAAA//AAAAAAAAD/8AAAAAAAAH/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : undefined;
+  
   switch (codeGroup) {
     case 2:
       return weatherStormy;
@@ -607,16 +646,16 @@ function getWeatherIconByCode(code) {
             return weatherCloudy;
         }
       default:
-        return undefined;
+        return unknown;
   }
 }
 
 
 function isDay() {
-  const times = getSunData();
+  let times = getSunData();
   if (times == undefined) return true;
-  const sunRise = Math.round(times.sunrise.getTime() / 1000);
-  const sunSet = Math.round(times.sunset.getTime() / 1000);
+  let sunRise = Math.round(times.sunrise.getTime() / 1000);
+  let sunSet = Math.round(times.sunset.getTime() / 1000);
 
   return (now > sunRise && now < sunSet);
 }
@@ -633,7 +672,7 @@ function formatSeconds(s) {
 
 function getSunData() {
   if (location != undefined && location.lat != undefined) {
-    const SunCalc = require("https://raw.githubusercontent.com/mourner/suncalc/master/suncalc.js");
+    let SunCalc = require("https://raw.githubusercontent.com/mourner/suncalc/master/suncalc.js");
     // get today's sunlight times for lat/lon
     return SunCalc ? SunCalc.getTimes(new Date(), location.lat, location.lon) : undefined;
   }
@@ -646,14 +685,14 @@ function getSunData() {
  * Taken from rebble app and modified
  */
 function getSunProgress() {
-  const times = getSunData();
+  let times = getSunData();
   if (times == undefined) return 0;
-  const sunRise = Math.round(times.sunrise.getTime() / 1000);
-  const sunSet = Math.round(times.sunset.getTime() / 1000);
+  let sunRise = Math.round(times.sunrise.getTime() / 1000);
+  let sunSet = Math.round(times.sunset.getTime() / 1000);
 
   if (isDay()) {
     // during day
-    const dayLength = sunSet - sunRise;
+    let dayLength = sunSet - sunRise;
     if (now > sunRise) {
       return (now - sunRise) / dayLength;
     } else {
@@ -662,10 +701,10 @@ function getSunProgress() {
   } else {
     // during night
     if (now < sunRise) {
-      const prevSunSet = sunSet - 60 * 60 * 24;
+      let prevSunSet = sunSet - 60 * 60 * 24;
       return 1 - (sunRise - now) / (sunRise - prevSunSet);
     } else {
-      const upcomingSunRise = sunRise + 60 * 60 * 24;
+      let upcomingSunRise = sunRise + 60 * 60 * 24;
       return (upcomingSunRise - now) / (upcomingSunRise - sunSet);
     }
   }
@@ -700,16 +739,16 @@ function radians(a) {
  * This draws the actual gauge consisting out of lots of little filled circles
  */
 function drawGauge(cx, cy, percent, color) {
-  const offset = 15;
-  const end = 360 - offset;
-  const radius = radiusInner + (circleCount == 3 ? 3 : 2);
-  const size = radiusOuter - radiusInner - 2;
+  let offset = 15;
+  let end = 360 - offset;
+  let radius = radiusInner + (circleCount == 3 ? 3 : 2);
+  let size = radiusOuter - radiusInner - 2;
 
   if (percent <= 0) return; // no gauge needed
   if (percent > 1) percent = 1;
 
-  const startRotation = -offset;
-  const endRotation = startRotation - ((end - offset) * percent);
+  let startRotation = -offset;
+  let endRotation = startRotation - ((end - offset) * percent);
 
   color = getGradientColor(color, percent);
   g.setColor(color);
@@ -723,7 +762,7 @@ function drawGauge(cx, cy, percent, color) {
 
 function writeCircleText(w, content) {
   if (content == undefined) return;
-  const font = String(content).length > 4 ? circleFontSmall : String(content).length > 3 ? circleFont : circleFontBig;
+  let font = String(content).length > 4 ? circleFontSmall : String(content).length > 3 ? circleFont : circleFontBig;
   g.setFont(font);
 
   g.setFontAlign(0, 0);
@@ -755,7 +794,7 @@ function getSteps() {
 }
 
 function getWeather() {
-  const jsonWeather = storage.readJSON('weather.json');
+  let jsonWeather = storage.readJSON('weather.json');
   return jsonWeather && jsonWeather.weather ? jsonWeather.weather : undefined;
 }
 
@@ -796,7 +835,7 @@ function getPressureValue(type) {
   });
 }
 
-Bangle.on('lock', function(isLocked) {
+function onLock(isLocked) {
   if (!isLocked) {
     draw();
     if (isCircleEnabled("hr")) {
@@ -805,11 +844,10 @@ Bangle.on('lock', function(isLocked) {
   } else {
     Bangle.setHRMPower(0, "circleclock");
   }
-});
+}
+Bangle.on('lock', onLock);
 
-
-let timerHrm;
-Bangle.on('HRM', function(hrm) {
+function onHRM(hrm) {
   if (isCircleEnabled("hr")) {
     if (hrm.confidence >= (settings.confidence)) {
       hrtValue = hrm.bpm;
@@ -826,23 +864,48 @@ Bangle.on('HRM', function(hrm) {
       }, settings.hrmValidity * 1000);
     }
   }
-});
+}
+Bangle.on('HRM', onHRM);
 
-Bangle.on('charging', function(charging) {
+function onCharging(charging) {
   if (isCircleEnabled("battery")) drawBattery();
-});
+}
+Bangle.on('charging', onCharging);
+
 
 if (isCircleEnabled("hr")) {
   enableHRMSensor();
 }
 
-Bangle.setUI("clock");
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    Bangle.removeListener('charging', onCharging);
+    Bangle.removeListener('lock', onLock);
+    Bangle.removeListener('HRM', onHRM);
+
+    Bangle.setHRMPower(0, "circleclock");
+
+    if (timerHrm) clearTimeout(timerHrm);
+    timerHrm = undefined;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+
+    delete Graphics.prototype.setFontRobotoRegular50NumericOnly;
+    delete Graphics.prototype.setFontRobotoRegular21;
+  }});
+
 Bangle.loadWidgets();
 
-// schedule a draw for the next minute
-setTimeout(function() {
-  // draw in interval
-  setInterval(draw, settings.updateInterval * 1000);
-}, 60000 - (Date.now() % 60000));
+// schedule a draw for the next second or minute
+function queueDraw() {
+  let queueMillis = settings.updateInterval * 1000;
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, queueMillis - (Date.now() % queueMillis));
+}
 
 draw();
diff --git a/apps/circlesclock/default.json b/apps/circlesclock/default.json
index ea00dc347..6247c058c 100644
--- a/apps/circlesclock/default.json
+++ b/apps/circlesclock/default.json
@@ -22,5 +22,6 @@
   "circle3colorizeIcon": true,
   "circle4colorizeIcon": false,
   "hrmValidity": 60,
-  "updateInterval": 60
+  "updateInterval": 60,
+  "showBigWeather": false
 }
diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json
index 837fcaa88..c2d3b3364 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.13",
+  "version":"0.16",
   "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"}],
diff --git a/apps/circlesclock/screenshot-light-with-big-weather.png b/apps/circlesclock/screenshot-light-with-big-weather.png
new file mode 100644
index 000000000..d1d569247
Binary files /dev/null and b/apps/circlesclock/screenshot-light-with-big-weather.png differ
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js
index fb23f8d5e..0aa8dc826 100644
--- a/apps/circlesclock/settings.js
+++ b/apps/circlesclock/settings.js
@@ -68,6 +68,11 @@
           return x + 's';
         },
         onchange: x => save('updateInterval', x),
+      },
+      /*LANG*/'show big weather': {
+        value: !!settings.showBigWeather,
+        format: () => (settings.showBigWeather ? 'Yes' : 'No'),
+        onchange: x => save('showBigWeather', x),
       }
     };
     E.showMenu(menu);
diff --git a/apps/clockcal/ChangeLog b/apps/clockcal/ChangeLog
index 20a46b5b7..27d4fc7f4 100644
--- a/apps/clockcal/ChangeLog
+++ b/apps/clockcal/ChangeLog
@@ -2,3 +2,5 @@
 0.02: Added scrollable calendar and swipe gestures
 0.03: Configurable drag gestures
 0.04: Use default Bangle formatter for booleans
+0.05: Improved colors (connected vs disconnected)
+0.06: Tell clock widgets to hide.
diff --git a/apps/clockcal/app.js b/apps/clockcal/app.js
index 5e8c7f796..58ddd7ef5 100644
--- a/apps/clockcal/app.js
+++ b/apps/clockcal/app.js
@@ -1,3 +1,4 @@
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 
 var s = Object.assign({
@@ -123,7 +124,7 @@ function drawMinutes() {
     var d = new Date();
     var hours = s.MODE24 ? d.getHours().toString().padStart(2, ' ') : ((d.getHours() + 24) % 12 || 12).toString().padStart(2, ' ');
     var minutes = d.getMinutes().toString().padStart(2, '0');
-    var textColor = NRF.getSecurityStatus().connected ? '#fff' : '#f00';
+    var textColor = NRF.getSecurityStatus().connected ? '#99f' : '#fff';
     var size = 50;
     var clock_x = (w - 20) / 2;
     if (dimSeconds) {
@@ -307,4 +308,4 @@ NRF.on('disconnect', BTevent);
 
 dimSeconds = Bangle.isLocked();
 drawWatch();
-Bangle.setUI("clock");
+
diff --git a/apps/clockcal/metadata.json b/apps/clockcal/metadata.json
index 6d547a7a3..872211495 100644
--- a/apps/clockcal/metadata.json
+++ b/apps/clockcal/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "clockcal",
   "name": "Clock & Calendar",
-  "version": "0.04",
+  "version": "0.06",
   "description": "Clock with Calendar",
   "readme":"README.md",
   "icon": "app.png",
diff --git a/apps/colorful_clock/ChangeLog b/apps/colorful_clock/ChangeLog
index c72634017..54ee389e3 100644
--- a/apps/colorful_clock/ChangeLog
+++ b/apps/colorful_clock/ChangeLog
@@ -1,2 +1,3 @@
 ...
 0.03: First update with ChangeLog Added
+0.04: Tell clock widgets to hide.
diff --git a/apps/colorful_clock/app.js b/apps/colorful_clock/app.js
index afc6b321f..ba6272e9b 100644
--- a/apps/colorful_clock/app.js
+++ b/apps/colorful_clock/app.js
@@ -3,6 +3,8 @@
 
   let outerRadius = Math.min(CenterX,CenterY) * 0.9;
 
+  Bangle.setUI('clock');
+
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -241,7 +243,3 @@
       refreshDisplay();
     }
   });
-
-  Bangle.loadWidgets();
-
-  Bangle.setUI('clock');
diff --git a/apps/colorful_clock/metadata.json b/apps/colorful_clock/metadata.json
index 5b6dbe87e..237acf81c 100644
--- a/apps/colorful_clock/metadata.json
+++ b/apps/colorful_clock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "colorful_clock",
   "name": "Colorful Analog Clock",
   "shortName":"Colorful Clock",
-  "version":"0.03",
+  "version":"0.04",
   "description": "a colorful analog clock",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
index deb1072f5..cb1c6d463 100644
--- a/apps/compass/ChangeLog
+++ b/apps/compass/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Fix bearing not clearing correctly (visible in single or double digit bearings)
 0.06: Add button for force compass calibration
 0.07: Use 360-heading to output the correct heading value (fix #1866)
+0.08: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index dd398ffa6..9a7aec2fc 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -20,7 +20,7 @@ ag.setColor(1).fillCircle(AGM,AGM,AGM-1,AGM-1);
 ag.setColor(0).fillCircle(AGM,AGM,AGM-11,AGM-11);
 
 function arrow(r,c) {
-  r=r*Math.PI/180;
+  r=(360-r)*Math.PI/180;
   var p = Math.PI/2;
   ag.setColor(c).fillPoly([
     AGM+AGH*Math.sin(r), AGM-AGH*Math.cos(r),
@@ -34,7 +34,7 @@ var oldHeading = 0;
 Bangle.on('mag', function(m) {
   if (!Bangle.isLCDOn()) return;
   g.reset();
-  if (isNaN(m.heading)) {    
+  if (isNaN(m.heading)) {
     if (!wasUncalibrated) {
       g.clearRect(0,24,W,48);
       g.setFontAlign(0,-1).setFont("6x8");
@@ -49,7 +49,7 @@ Bangle.on('mag', function(m) {
     g.setFontAlign(0,0).setFont("6x8",3);
     var y = 36;
     g.clearRect(M-40,24,M+40,48);
-    g.drawString(Math.round(360-m.heading),M,y,true);
+    g.drawString(Math.round(m.heading),M,y,true);
   }
 
 
diff --git a/apps/compass/metadata.json b/apps/compass/metadata.json
index a3995a123..1a614e1f8 100644
--- a/apps/compass/metadata.json
+++ b/apps/compass/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "compass",
   "name": "Compass",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Simple compass that points North",
   "icon": "compass.png",
   "screenshots": [{"url":"screenshot_compass.png"}],
diff --git a/apps/configurable_clock/ChangeLog b/apps/configurable_clock/ChangeLog
index 84e7affed..9d55c1a91 100644
--- a/apps/configurable_clock/ChangeLog
+++ b/apps/configurable_clock/ChangeLog
@@ -1,2 +1,3 @@
 ...
 0.02: First update with ChangeLog Added
+0.03: Tell clock widgets to hide.
diff --git a/apps/configurable_clock/app.js b/apps/configurable_clock/app.js
index 157d57741..45c86c7e9 100644
--- a/apps/configurable_clock/app.js
+++ b/apps/configurable_clock/app.js
@@ -5,6 +5,7 @@
   let ScreenWidth  = g.getWidth(),  CenterX;
   let ScreenHeight = g.getHeight(), CenterY, outerRadius;
 
+  Bangle.setUI('clock');
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -1377,4 +1378,3 @@
     }
   });
 
-  Bangle.setUI('clock');
diff --git a/apps/configurable_clock/metadata.json b/apps/configurable_clock/metadata.json
index 28feae7e4..687a5b212 100644
--- a/apps/configurable_clock/metadata.json
+++ b/apps/configurable_clock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "configurable_clock",
   "name": "Configurable Analog Clock",
   "shortName":"Configurable Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "an analog clock with several kinds of faces, hands and colors to choose from",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/counter/ChangeLog b/apps/counter/ChangeLog
index f3f1c4eac..8402b3467 100644
--- a/apps/counter/ChangeLog
+++ b/apps/counter/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Added decrement and touch functions
 0.03: Set color - ensures widgets don't end up coloring the counter's text
+0.04: Adopted for BangleJS 2
diff --git a/apps/counter/counter.js b/apps/counter/counter.js
index 3e0687944..0054ada6d 100644
--- a/apps/counter/counter.js
+++ b/apps/counter/counter.js
@@ -1,45 +1,104 @@
 var counter = 0;
+const BANGLEJS2 = process.env.HWVERSION == 2;
+
+if (BANGLEJS2) {  
+ var drag;
+ var y = 45;
+ var x = 5;
+} else {
+ var y = 100;
+ var x = 25;
+}
 
 function updateScreen() {
-  g.clearRect(0, 50, 250, 150);
-  g.setColor(0xFFFF);
+  if (BANGLEJS2) { 	
+    g.clearRect(0, 50, 250, 130);
+  } else {
+    g.clearRect(0, 50, 250, 150);
+  }  
+  g.setBgColor(g.theme.bg).setColor(g.theme.fg);
   g.setFont("Vector",40).setFontAlign(0,0);
   g.drawString(Math.floor(counter), g.getWidth()/2, 100);
-  g.drawString('-', 45, 100);
-  g.drawString('+', 185, 100);
+  if (!BANGLEJS2) { 
+   g.drawString('-', 45, 100);
+   g.drawString('+', 185, 100);
+  }
 }
 
 
-// add a count by using BTN1 or BTN5
-setWatch(() => {
-  counter += 1;
-  updateScreen();
-}, BTN1, {repeat:true});
+if (BANGLEJS2) {  
+ setWatch(() => {
+   counter = 0;
+   updateScreen();
+ }, BTN1, {repeat:true});
+ Bangle.on("drag", e => {
+  if (!drag) { // start dragging
+   drag = {x: e.x, y: e.y};
+  } else if (!e.b) { // released
+   const dx = e.x-drag.x, dy = e.y-drag.y;
+   drag = null;
+   if (Math.abs(dx)>Math.abs(dy)+10) {
+    // horizontal
+    if (dx < dy) {
+     //console.log("left " + dx + " " + dy);
+    } else {
+     //console.log("right " + dx + " " + dy);
+    }
+   } else if (Math.abs(dy)>Math.abs(dx)+10) {
+    // vertical
+    if (dx < dy) {
+     //console.log("down " + dx + " " + dy);
+     if (counter > 0) counter -= 1;
+     updateScreen();
+    } else {
+     //console.log("up " + dx + " " + dy);
+     counter += 1;
+     updateScreen();
+    }
+   } else {
+    //console.log("tap " + e.x + " " + e.y);
+   }
+  }
+ });
+ } else {
 
-setWatch(() => {
-  counter += 1;
-  updateScreen();
-}, BTN5, {repeat:true});
+ // add a count by using BTN1 or BTN5
+ setWatch(() => {
+   counter += 1;
+   updateScreen();
+ }, BTN1, {repeat:true});
+ 
+ setWatch(() => {
+   counter += 1;
+   updateScreen();
+ }, BTN5, {repeat:true});
+ 
+ // subtract a count by using BTN3 or BTN4
+ setWatch(() => {
+   if (counter > 0) counter -= 1;
+   updateScreen();
+ }, BTN4, {repeat:true});
+ 
+ setWatch(() => {
+   if (counter > 0) counter -= 1;
+   updateScreen();
+ }, BTN3, {repeat:true});
+ 
+ // reset by using BTN2
+ setWatch(() => {
+   counter = 0;
+   updateScreen();
+ }, BTN2, {repeat:true});
+}
 
-// subtract a count by using BTN3 or BTN4
-setWatch(() => {
-  counter -= 1;
-  updateScreen();
-}, BTN4, {repeat:true});
-
-setWatch(() => {
-  counter -= 1;
-  updateScreen();
-}, BTN3, {repeat:true});
-
-// reset by using BTN2
-setWatch(() => {
-  counter = 0;
-  updateScreen();
-}, BTN2, {repeat:true});
 
 g.clear(1).setFont("6x8");
-g.drawString('Tap right or BTN1 to increase\nTap left or BTN3 to decrease\nPress BTN2 to reset.', 25, 200);
+g.setBgColor(g.theme.bg).setColor(g.theme.fg);
+if (BANGLEJS2) { 
+ g.drawString('Swipe up to increase\nSwipe down to decrease\nPress button to reset.', x, 100 + y);
+} else {
+ g.drawString('Tap right or BTN1 to increase\nTap left or BTN3 to decrease\nPress BTN2 to reset.', x, 100 + y);
+}
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
diff --git a/apps/counter/metadata.json b/apps/counter/metadata.json
index e455fda95..daba58d39 100644
--- a/apps/counter/metadata.json
+++ b/apps/counter/metadata.json
@@ -1,11 +1,11 @@
 {
   "id": "counter",
   "name": "Counter",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Simple counter",
   "icon": "counter_icon.png",
   "tags": "tool",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "screenshots": [{"url":"bangle1-counter-screenshot.png"}],
   "allow_emulator": true,
   "storage": [
diff --git a/apps/crowclk/ChangeLog b/apps/crowclk/ChangeLog
index 4f48bdd14..1c4f6f43b 100644
--- a/apps/crowclk/ChangeLog
+++ b/apps/crowclk/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up". 
 0.03: Fix the clock for dark mode.
+0.04: Tell clock widgets to hide.
diff --git a/apps/crowclk/crow_clock.js b/apps/crowclk/crow_clock.js
index eee1653cb..7e608ef19 100644
--- a/apps/crowclk/crow_clock.js
+++ b/apps/crowclk/crow_clock.js
@@ -136,9 +136,9 @@ Bangle.on('lcdPower', (on) => {
 g.clear();
 
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/crowclk/metadata.json b/apps/crowclk/metadata.json
index 6985cf11a..265a0398b 100644
--- a/apps/crowclk/metadata.json
+++ b/apps/crowclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "crowclk",
   "name": "Crow Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A simple clock based on Bold Clock that has MST3K's Crow T. Robot for a face",
   "icon": "crow_clock.png",
   "screenshots": [{"url":"screenshot_crow.png"}],
diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog
index 829ff3d13..b13ce261b 100644
--- a/apps/daisy/ChangeLog
+++ b/apps/daisy/ChangeLog
@@ -5,3 +5,4 @@
 0.05: changed text to uppercase, just looks better, removed colons on text
 0.06: better contrast for light theme, use fg color instead of dithered for ring
 0.07: Use default Bangle formatter for booleans
+0.08: fix idle timer always getting set to true
diff --git a/apps/daisy/app.js b/apps/daisy/app.js
index 7c513726f..848cd1801 100644
--- a/apps/daisy/app.js
+++ b/apps/daisy/app.js
@@ -83,7 +83,7 @@ function loadSettings() {
   settings = require("Storage").readJSON(SETTINGS_FILE,1)||{};
   settings.gy = settings.gy||'#020';
   settings.fg = settings.fg||'#0f0';
-  settings.idle_check = settings.idle_check||true;
+  settings.idle_check = (settings.idle_check === undefined ? true : settings.idle_check);
   assignPalettes();
 }
 
diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json
index 802ba6834..c6cc93620 100644
--- a/apps/daisy/metadata.json
+++ b/apps/daisy/metadata.json
@@ -1,6 +1,6 @@
 { "id": "daisy",
   "name": "Daisy",
-  "version":"0.07",
+  "version":"0.08",
   "dependencies": {"mylocation":"app"},
   "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times",
   "icon": "app.png",
diff --git a/apps/deko/Building_Typeface.ttf b/apps/deko/Building_Typeface.ttf
new file mode 100644
index 000000000..d5a3933ab
Binary files /dev/null and b/apps/deko/Building_Typeface.ttf differ
diff --git a/apps/deko/ChangeLog b/apps/deko/ChangeLog
new file mode 100644
index 000000000..9db0e26c5
--- /dev/null
+++ b/apps/deko/ChangeLog
@@ -0,0 +1 @@
+0.01: first release
diff --git a/apps/deko/README.md b/apps/deko/README.md
new file mode 100644
index 000000000..91e83bd23
--- /dev/null
+++ b/apps/deko/README.md
@@ -0,0 +1,10 @@
+# Deko Clock
+
+A simple clock with an Art Deko font
+
+The font was obtained from https://dafonttop.com/building.font and is free for personal use
+
+
+![](screenshot.png)
+
+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/deko/app-icon.js b/apps/deko/app-icon.js
new file mode 100644
index 000000000..06f93e2ef
--- /dev/null
+++ b/apps/deko/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwIdah/wAof//4ECgYFB4AFBg4FB8AFBj/wh/4AoM/wEB/gFBvwCEBAU/AQP4gfAj8AgPwAoMPwED8AFBg/AAYIBDA4ngg4TB4EBApkPKgJSBJQIFTMgIFCJIIFDKoIFEvgFBGoMAnw7DP4IFEh+BAoItBg+DNIQwBMIaeCKoKxCPoIzCEgKVHUIqtFXIrFFaIrdFdIwAV"))
diff --git a/apps/deko/app.js b/apps/deko/app.js
new file mode 100644
index 000000000..8ae2c1d31
--- /dev/null
+++ b/apps/deko/app.js
@@ -0,0 +1,64 @@
+Graphics.prototype.setFontBuildingTypeface = function(scale) {
+  // Actual height 100 (102 - 3)
+  this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAH/gAAAAAAAAAAAAAAAAAH//gAAAAAAAAAAAAAAAAD///gAAAAAAAAAAAAAAAD////gAAAAAAAAAAAAAAD/////gAAAAAAAAAAAAAB//////gAAAAAAAAAAAAB///////gAAAAAAAAAAAB////////gAAAAAAAAAAA////////4AAAAAAAAAAA////////4AAAAAAAAAAAf///////8AAAAAAAAAAAf///////8AAAAAAAAAAAf///////8AAAAAAAAAAAP///////+AAAAAAAAAAAP///////+AAAAAAAAAAAP///////+AAAAAAAAAAAH////////AAAAAAAAAAAAH///////AAAAAAAAAAAAAH//////AAAAAAAAAAAAAAH/////gAAAAAAAAAAAAAAH////gAAAAAAAAAAAAAAAH///wAAAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////AAAAAAAD/////////////wAAAAAAP/////////////4AAAAAAP/////////////8AAAAAAf/////////////+AAAAAAf/////////////+AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA/4AAAAAAAAAAAH/AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAP/////////////8AAAAAAH/////////////4AAAAAAD/////////////wAAAAAAA/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAf4AAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAH/4AAAAAAAAAAAAAAAAAAf/4AAAAAAAAAAAAAAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/wAAf///////+AAAAAAB//wAB////////+AAAAAAH//wAD////////+AAAAAAH//wAH////////+AAAAAAP//wAP////////+AAAAAAf//wAP////////+AAAAAAf//wAP////////+AAAAAAf//wAf////////+AAAAAAf//wAf////////+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf8AAAf8AAAAAAP+AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA///+AAAAAAP/////8AAAA///+AAAAAAH/////8AAAA///+AAAAAAH/////8AAAA///+AAAAAAB/////8AAAA///+AAAAAAAf////8AAAA///+AAAAAAAAAAAAAAAAA///+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf//gAAAAAAAf//+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf//wAAAAAAA///+AAAAAAf8AAAAAAAAAAAP+AAAAAAf8AAAAAAAAAAAP+AAAAAAf8AAAAAAAAAAAP+AAAAAAf8AAAAEAAAAAAP+AAAAAAf8AAAB8AAAAAAP+AAAAAAf8AAAP8AAAAAAP+AAAAAAf8AAD/8AAAAAAP+AAAAAAf8AA//8AAAAAAP+AAAAAAf8AP//8AAAAAAP+AAAAAAf8B///8AAAAAAP+AAAAAAf8f///8AAAAAAP+AAAAAAf/////8AAAAAAP+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf///8P////////+AAAAAAf///gH////////+AAAAAAf//4AD////////+AAAAAAf/+AAB////////+AAAAAAf/gAAA////////+AAAAAAfwAAAAD///////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/gAAAAAAAAAAAAAAAAAB//gAAAAAAAAAAAAAAAAAH//gAAAAAAAAAAAAAAAAA///gAAAAAAAAAAAAAAAAH///gAAAAAAAAAAAAAAAAf///gAAAAAAAAAAAAAAAD////gAAAAAAAAAAAAAAAf////gAAAAAAAAAAAAAAB/////gAAAAAAAAAAAAAAP///z/gAAAAAAAAAAAAAB///+D/gAAAAAAAAAAAAAH///wD/gAAAAAAAAAAAAA///+AD/gAAAAAAAAAAAAH///wAD/gAAAAAAAAAAAAf//+AAD/gAAAAAAAAAAAD///wAAD/gAAAAAAAAAAAf///AAAD/gAAAAAAAAAAB///4AAAD/gAAAAAAAAAAP///AAAAD/gAAAAAAAAAB///4AAAAD/gAAAAAAAAAH///AAAAAD/gAAAAAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//+AAAAAAAf/////8AAAA///wAAAAAAf/////8AAAA///4AAAAAAf/////8AAAA///8AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA///+AAAAAAf/////8AAAA////AAAAAAf/////8AAAA////AAAAAAf/////8AAAA////AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf8AAAf8AAAAAAH/AAAAAAf//wAf8AAAAAAH/AAAAAAf//wAf/////////AAAAAAf//wAf/////////AAAAAAf//wAf/////////AAAAAAf//wAf////////+AAAAAAf//wAP////////+AAAAAAf//wAP////////8AAAAAAf//wAH////////8AAAAAAf//wAD////////wAAAAAAf//wAA////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////AAAAAAAD/////////////wAAAAAAP/////////////4AAAAAAP/////////////8AAAAAAf/////////////+AAAAAAf/////////////+AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA/4AAAf8AAAAAAH/AAAAAA///wAf8AAAAAAH/AAAAAA///wAf/////////AAAAAA///wAf/////////AAAAAA///wAf/////////AAAAAAf//wAf/////////AAAAAAf//wAP////////+AAAAAAP//wAP////////+AAAAAAH//wAH////////8AAAAAAB//wAD////////4AAAAAAAf/wAB////////wAAAAAAAAAAAAf///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAeAAAAAAf//wAAAAAAAAAP+AAAAAAf//wAAAAAAAAD/+AAAAAAf//wAAAAAAAA//+AAAAAAf//wAAAAAAAf//+AAAAAAf//wAAAAAAH///+AAAAAAf//wAAAAAD////+AAAAAAf8AAAAAAA/////+AAAAAAf8AAAAAAP/////+AAAAAAf8AAAAAH//////8AAAAAAf8AAAAB///////AAAAAAAf8AAAAf//////wAAAAAAAf8AAAP//////4AAAAAAAAf8AAD//////+AAAAAAAAAf8AB///////gAAAAAAAAAf8Af//////4AAAAAAAAAAf8H//////+AAAAAAAAAAAf////////gAAAAAAAAAAAf///////wAAAAAAAAAAAAf//////8AAAAAAAAAAAAAf//////AAAAAAAAAAAAAAf/////wAAAAAAAAAAAAAAf////8AAAAAAAAAAAAAAAf////AAAAAAAAAAAAAAAAf///wAAAAAAAAAAAAAAAAf//4AAAAAAAAAAAAAAAAAf/+AAAAAAAAAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///gf//////+AAAAAAAB////4////////wAAAAAAH////9////////4AAAAAAP/////////////8AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAf/////////////+AAAAAA///////////////AAAAAA///////////////AAAAAA//////4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA/4AAA/4AAAAAAH/AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAP/////////////+AAAAAAP/////////////8AAAAAAH////9////////4AAAAAAB////4////////gAAAAAAAH///gP//////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////+AAAAAAAAAAAAD////////gAD//AAAAAAAP////////wAD//wAAAAAAP////////4AD//4AAAAAAf////////8AD//8AAAAAAf////////8AD//+AAAAAA/////////+AD//+AAAAAA/////////+AD///AAAAAA/////////+AD///AAAAAA/4AAAAAAP+AD///AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA/4AAAAAAP+AAAH/AAAAAA///////////////AAAAAA///////////////AAAAAA///////////////AAAAAAf/////////////+AAAAAAf/////////////+AAAAAAP/////////////8AAAAAAP/////////////4AAAAAAD/////////////wAAAAAAA/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAD/wAAAf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='),
+    46,
+    atob("FCYpGigoKigoJykoFA=="),
+    126+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+
+function draw() {
+  var x = g.getWidth()/2;
+  var y = g.getHeight()/2;
+  g.reset();
+  var date = new Date();
+  var timeStr = require("locale").time(date,1);
+  var dateStr = require("locale").date(date).toUpperCase();
+  // draw time
+  g.setFontAlign(0,0).setFont("BuildingTypeface");
+  g.clearRect(0, 24, g.getWidth(), y+35); // clear the background
+  g.drawString(timeStr,x,y);
+  // draw date
+  y += 60;
+  g.setFontAlign(0,0).setFont("6x8",2);
+  g.clearRect(0,y-8,g.getWidth(),y+8); // clear the background
+  g.drawString(dateStr,x,y);
+  // queue draw in one minute
+  queueDraw();
+}
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first, queue update
+draw();
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/deko/app.png b/apps/deko/app.png
new file mode 100644
index 000000000..6f11e7019
Binary files /dev/null and b/apps/deko/app.png differ
diff --git a/apps/deko/metadata.json b/apps/deko/metadata.json
new file mode 100644
index 000000000..9bdd15429
--- /dev/null
+++ b/apps/deko/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "deko",
+  "name": "Deko Clock",
+  "version": "0.01",
+  "description": "Clock with Art Deko font",
+  "readme": "README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"deko.app.js","url":"app.js"},
+    {"name":"deko.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/deko/screenshot.png b/apps/deko/screenshot.png
new file mode 100644
index 000000000..91ce2ea38
Binary files /dev/null and b/apps/deko/screenshot.png differ
diff --git a/apps/distortclk/ChangeLog b/apps/distortclk/ChangeLog
new file mode 100644
index 000000000..4c7291526
--- /dev/null
+++ b/apps/distortclk/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New face!
+0.02: Improved clock
diff --git a/apps/distortclk/README.md b/apps/distortclk/README.md
new file mode 100644
index 000000000..8c7c433c1
--- /dev/null
+++ b/apps/distortclk/README.md
@@ -0,0 +1,17 @@
+# Distort Watchface
+Was playing around with custom fonts and made something with it
+Made for Bangle.js 2
+
+![screenshot (3)](https://user-images.githubusercontent.com/44651387/157507228-100452bf-94a6-476f-aec6-d13d5dad86d5.png)
+
+## Features
+
+Has a dark mode
+
+## Requests
+
+If you have any issues or would like to suggest a feature, click here to send a message -> [here](https://github.com/elykittytee/BangleApps/issues/new?title=Poketch%20Clock%20Bug).
+
+## Creator
+
+Eleanor Tayam
diff --git a/apps/distortclk/app-icon.js b/apps/distortclk/app-icon.js
new file mode 100644
index 000000000..c375de96e
--- /dev/null
+++ b/apps/distortclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("j0ewkBiIAxHIQMJiBJEIxAaCAIQfHDgIUFDwwNCHYgVFiAVBHYgIDEghKCCIQGCFYoaDAYgORGIJ2DBwYIBHgQOPgAOIPIYOGAgQOFFgh7DHZQeDBwhoFQgh3JEAgOFFoqkHYRzgOfx4bCJ4gNGSIaJEABA7EAGA"))
diff --git a/apps/distortclk/app.js b/apps/distortclk/app.js
new file mode 100644
index 000000000..a9fdd1ef2
--- /dev/null
+++ b/apps/distortclk/app.js
@@ -0,0 +1,65 @@
+Graphics.prototype.setFontSixCaps = function(scale) {
+  // Actual height 60 (59 - 0)
+  this.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0VniarM3u4AAAAAAAAAAAAAAAAAAAAAAAAAAABEZoiqzN3u////////8AAAAAAAAAAAAAAAAAAAJFZ4iqzN3u////////////////8AAAAAAAAAAARGZ4mrzd7v////////////////////////8AAAAAAAqszd7v////////////////////////////7u3MoAAAAAAA//////////////////////////7t3MqohmRCAAAAAAAAAA//////////////////7t3MqohmRAAAAAAAAAAAAAAAAAAA/////////+7dzKqYdlQwAAAAAAAAAAAAAAAAAAAAAAAAAA/+7dzKqIZkQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZkQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWazMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMqVAAAAAAAAAa7//////////////////////////////////+oQAAAAAAC/////////////////////////////////////+wAAAAAAf//////////////////////////////////////3AAAAAA3///7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u///9AAAAAA///GREREREREREREREREREREREREREREREREbP//AAAAAA//8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///AAAAAA///GREREREREREREREREREREREREREREREREbP//AAAAAA3///7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u///9AAAAAAf//////////////////////////////////////3AAAAAAC/////////////////////////////////////+wAAAAAAAa7//////////////////////////////////+oQAAAAAAAAWazMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMqVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACqoAAAAAAA//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAA//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAA//3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3/8AAAAAAA//////////////////////////////////////8AAAAAAA//////////////////////////////////////8AAAAAAA//////////////////////////////////////8AAAAAAA3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADu4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAes3d3d3d0AAAAAAAAAAAAAAAAAAAAAAAADVorAAAAAAAA8////////8AAAAAAAAAAAAAAAAAAAAlaKze///wAAAAAAHf////////8AAAAAAAAAAAAAAAFGis3v///////wAAAAAAn/////////8AAAAAAAAAAARom83v///////////wAAAAAA7//+3d3d3d0AAAAAAEV5rN7//////////////v/wAAAAAA//xTAAAAAAAAA1eKze//////////////7cqXVP/wAAAAAA//UAAAAAFGis3v/////////////+3Kl2QAAAAP/wAAAAAA//6XZoq83v/////////////+26hkEAAAAAAAAP/wAAAAAA3//////////////////tyoZSAAAAAAAAAAAAAP/wAAAAAAb//////////////tuoZAAAAAAAAAAAAAAAAAAP/wAAAAAACv/////////tuXUwAAAAAAAAAAAAAAAAAAAAAP/wAAAAAAAI3////9yoZAAAAAAAAAAAAAAAAAAAAAAAAAAP/wAAAAAAAAJ4qodRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqgAAAAAAAAWazMzMzMzMzAAAAAAAAAAAAAzMzMzMzMzMqVAAAAAAAAAa7//////////wAAAAAAAAAAAA///////////+oQAAAAAADP///////////wAAAAAAAAAAAA/////////////AAAAAAAf////////////wAAAAiIgAAAAA/////////////3AAAAAA3///7u7u7u7u7gAAAA//8AAAAA7u7u7u7u7u///9AAAAAA//11RERERERERAAAAA//8AAAAAREREREREREV9//AAAAAA//QAAAAAAAAAAAAAAB//8QAAAAAAAAAAAAAAAE//AAAAAA//11RERERERERERERa//+lREREREREREREREV9//AAAAAA3///7u7u7u7u7u7u7/////7u7u7u7u7u7u7u///9AAAAAAf//////////////////////////////////////3AAAAAAC/////////////////+q//////////////////+wAAAAAAAa7///////////////0i3////////////////+oQAAAAAAAAWazMzMzMzMzMzMyoIAKKzMzMzMzMzMzMzMqVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkRGZniIqqoAAAAAAAAAAAAAAAAAAAAAAkRGZniIqqrMzd3u7v//////8AAAAAAAAAAAAAAAqqrMzd3u7v////////////////////8AAAAAAAAAAAAAAA//////////////////////////////8AAAAAAAAAAAAAAA//////////////////////////////8AAAAAAAAAAAAAAA///////////////+7t3czKqpiHZm//8AAAAAAAAAAAAAAA//7u3dzMuqqIhmZUQwAAAAAAAAAA//8AAAAAAAAAAAAAAAZmREAAAAAAAAAARERERERERERERE//9EREREREQAAAAAAAAAAAAAAAAAAAAA7u7u7u7u7u7u7u///u7u7u7u4AAAAAAAAAAAAAAAAAAAAA////////////////////////8AAAAAAAAAAAAAAAAAAAAA////////////////////////8AAAAAAAAAAAAAAAAAAAAA////////////////////////8AAAAAAAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARERERERERERERERERERAAABEREREREREREREAAAAAAAAAA7u7u7u7u7u7u7u7u7u7gAADu7u7u7u7u7u7u2TAAAAAAAA///////////////////wAAD//////////////+YAAAAAAA///////////////////wAAD///////////////4wAAAAAA///////////////////wAAD///////////////+gAAAAAA//zMzMzMzMzMzMzM3//AAADMzMzMzMzMzMzM7//wAAAAAA//AAAAAAAAAAAAAG//cAAAAAAAAAAAAAAAAAKf/wAAAAAA//AAAAAAAAAAAAAN//UAAAAAAAAAAAAAAAAAB//wAAAAAA//AAAAAAAAAAAAAP//6qqqqqqqqqqqqqqqqqv//wAAAAAA//AAAAAAAAAAAAAP///////////////////////AAAAAAA//AAAAAAAAAAAAAN//////////////////////9AAAAAAA//AAAAAAAAAAAAAF7/////////////////////gAAAAAAA//AAAAAAAAAAAAAAWu//////////////////7GAAAAAAAAZmAAAAAAAAAAAAAAADZmZmZmZmZmZmZmZmZmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADREREREREREREREREREREREREREREREREMAAAAAAAAAADne7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7ZMAAAAAAABd////////////////////////////////////1QAAAAAALv/////////////////////////////////////iAAAAAAr//////////////////////////////////////6AAAAAA///szMzMzMzMzMzMzP//zMzMzMzMzMzMzMzM3///AAAAAA//ogAAAAAAAAAAAAC//5AAAAAAAAAAAAAAAACf//AAAAAA//cAAAAAAAAAAAAAD//zAAAAAAAAAAAAAAAABf//AAAAAA//+6qqqqqqqqAAAAD//8qqqqqqqqqqqqqqqqrv//AAAAAAz///////////AAAAD//////////////////////8AAAAAAT///////////AAAADv/////////////////////0AAAAAACP//////////AAAAB/////////////////////+AAAAAAAAGzv////////AAAAAGzv/////////////////sYAAAAAAAAABGZmZmZmZmAAAAAABGZmZmZmZmZmZmZmZmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAA//AAAAAAAAAAAAAAAAAAAAAAAAACRGZ4iqrM3e4AAAAAAA//AAAAAAAAAAAAAAACRGZ4iqrM3e7v////////8AAAAAAA//AAAAACRGZ4iqrM3e7v//////////////////8AAAAAAA//iqrM3e7v////////////////////////////8AAAAAAA//////////////////////////////////7u3cwAAAAAAA///////////////////////+7t3MyqmIZmRCAAAAAAAAAA/////////////u3dzLqoiGZUQgAAAAAAAAAAAAAAAAAAAA//7t3cyqqIhmVEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZlRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWazMzMzMqphjAAAAAAAAAARniqrMzMzMzMqVAAAAAAAAAa7//////////+yWEAAAAVi97////////////+oQAAAAAAC///////////////2VAGrf////////////////+wAAAAAAf////////////////+vP///////////////////3AAAAAA3///7u7u7u7/////////////////7u7u7u7u///9AAAAAA///GRERERERmis3////////typhmREREREREbP//AAAAAA//8wAAAAAAAAAAJ8/////8hgAAAAAAAAAAAAA///AAAAAA///GRERERERWis3////////typhmREREREREbP//AAAAAA3///7u7u7u7/////////////////7u7u7u7u///9AAAAAAf////////////////+vP///////////////////3AAAAAAC///////////////2VAGrf////////////////+wAAAAAAAa7//////////+yWIAAAAVi97////////////+oQAAAAAAAAWazMzMzMqphjAAAAAAAAAARniqrMzMzMzMqVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1ZmZmZmZmZmZmZmZmQgAAAAAAZmZmZmZmYwAAAAAAAAAFvv////////////////7rUAAAAA/////////rUAAAAAAAB+////////////////////9gAAAA//////////9wAAAAAAP//////////////////////gAAAA///////////zAAAAAAv//////////////////////wAAAA///////////7AAAAAA///7qqqqqqqqqqqqqqqq3//wAAAAqqqqqqqqrP//AAAAAA//9wAAAAAAAAAAAAAAAAT//wAAAAAAAAAAAAAH//AAAAAA//9wAAAAAAAAAAAAAAAAn//AAAAAAAAAAAAAAZ//AAAAAA///8zMzMzMzMzMzMzMzM///MzMzMzMzMzMzMzf//AAAAAAv//////////////////////////////////////7AAAAAAP//////////////////////////////////////zAAAAAABu////////////////////////////////////5gAAAAAAAEre7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7aQAAAAAAAAAAUREREREREREREREREREREREREREREREREQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMwAAAAAAAAAAAzMzAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//8AAAAAAAAAAA///wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//8AAAAAAAAAAA///wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//8AAAAAAAAAAA///wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//8AAAAAAAAAAA///wAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMwAAAAAAAAAAAzMzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("CAwODQ4PDw8QDA8QCA=="), 69+(scale<<8)+(4<<16));
+  return this;
+};
+
+const offset = 25;
+const width = g.getWidth();
+const height = g.getHeight();
+
+var drawTimeout;
+var fgTime = 0xf800;
+var bgTime = 0x3333ff;
+var dayDate = 0x000;
+
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+function time() {
+  require("Font4x5").add(Graphics);
+  var d = new Date();
+  var day = d.getDate();
+  var time = require("locale").time(d,1);
+  var date = require("locale").date(d);
+  var mo = require("date_utils").month(d.getMonth()+1,0);
+
+  g.setFontAlign(0,0);
+  g.setFontSixCaps(2).setColor(fgTime).drawString(time, width/2, height/2+10);
+  
+  g.setFont("4x5",2);
+  g.setFontAlign(0,0);
+  g.setColor(dayDate).drawString(mo,width-55, height-16);
+  g.drawString(day,width-10, height-16);
+}
+
+function draw() {
+  g.setColor(bgTime).fillRect(0,40,width,height-offset);
+  time();
+  queueDraw();
+}
+
+//program start
+g.clear(); // Clear the screen once, at startup
+
+if (g.theme.dark==true){
+  dayDate = 0xffff;
+}
+else {
+  dayDate=0x000;
+}
+
+draw(); // draw immediately at first
+
+
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/distortclk/app.png b/apps/distortclk/app.png
new file mode 100644
index 000000000..b82a0913e
Binary files /dev/null and b/apps/distortclk/app.png differ
diff --git a/apps/distortclk/metadata.json b/apps/distortclk/metadata.json
new file mode 100644
index 000000000..125dac590
--- /dev/null
+++ b/apps/distortclk/metadata.json
@@ -0,0 +1,17 @@
+{
+    "id": "distortclk",
+    "name": "Distort Clock",
+    "shortName":"Distort Clock",
+    "version": "0.02",
+    "description": "A clockface",
+    "icon": "app.png",
+    "type": "clock",
+    "tags": "clock",
+    "supports": ["BANGLEJS2"],
+    "allow_emulator": true,
+    "readme":"README.md",
+    "storage": [
+      {"name":"distortclk.app.js","url":"app.js"},
+      {"name":"distortclk.img","url":"app-icon.js","evaluate":true}
+    ]
+}
diff --git a/apps/distortclk/screenshot.png b/apps/distortclk/screenshot.png
new file mode 100644
index 000000000..3207b4e1e
Binary files /dev/null and b/apps/distortclk/screenshot.png differ
diff --git a/apps/dotmatrixclock/ChangeLog b/apps/dotmatrixclock/ChangeLog
index 7ab9e14a9..12edf33a3 100644
--- a/apps/dotmatrixclock/ChangeLog
+++ b/apps/dotmatrixclock/ChangeLog
@@ -1 +1,2 @@
 0.01: Create dotmatrix clock app
+0.02: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index ba34d4885..493a3c43f 100644
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -186,7 +186,7 @@ function drawCompass(lastHeading) {
     'NW'
   ];
   const cps = Bangle.getCompass();
-  let angle = cps.heading;
+  let angle = 360-cps.heading;
   let heading = angle?
     directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
     "-- ";
@@ -351,4 +351,4 @@ Bangle.on('faceUp', (up) => {
     setSensors(1);
     resetDisplayTimeout();
   }
-});
\ No newline at end of file
+});
diff --git a/apps/dotmatrixclock/metadata.json b/apps/dotmatrixclock/metadata.json
index 3425dc1b2..fdfb5271f 100644
--- a/apps/dotmatrixclock/metadata.json
+++ b/apps/dotmatrixclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "dotmatrixclock",
   "name": "Dotmatrix Clock",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A clear white-on-blue dotmatrix simulated clock",
   "icon": "dotmatrixclock.png",
   "type": "clock",
diff --git a/apps/drinkcounter/ChangeLog b/apps/drinkcounter/ChangeLog
index 69faa7904..d8d174c4c 100644
--- a/apps/drinkcounter/ChangeLog
+++ b/apps/drinkcounter/ChangeLog
@@ -1,3 +1,4 @@
 0.10: Initial release - still work in progress
 0.15: Added settings and calculations
-0.20: Added status saving
\ No newline at end of file
+0.20: Added status saving
+0.25: Adopted for Bangle.js 1 - kind of
\ No newline at end of file
diff --git a/apps/drinkcounter/README.md b/apps/drinkcounter/README.md
index f1700531b..5638ee066 100644
--- a/apps/drinkcounter/README.md
+++ b/apps/drinkcounter/README.md
@@ -1,11 +1,14 @@
 # Drink Counter
 
-Development still in progress. Counts drinks you had for science. Calculates BAC.
+Counts drinks you had for science. Calculates BAC.
 
 ## Usage
 
 Swipe left/right to select drink. Swipe up/down to add/remove drinks.
 
+## Important notes
+
+No warranty whatsoever. Use at your own risk. Calculations might be wrong. Do not drink and drive - even if BAC is low.
 
 ## Creator
 
diff --git a/apps/drinkcounter/app.js b/apps/drinkcounter/app.js
index 47a4feb13..323d9fb41 100644
--- a/apps/drinkcounter/app.js
+++ b/apps/drinkcounter/app.js
@@ -3,6 +3,7 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 require("Font8x16").add(Graphics);
 
+const BANGLEJS2 = process.env.HWVERSION == 2;
 const SETTINGSFILE = "drinkcounter.json";
 setting = require("Storage").readJSON("setting.json",1);
 E.setTimeZone(setting.timezone); // timezone = 1 for MEZ, = 2 for MESZ
@@ -154,7 +155,9 @@ function updateDrinks(){
 	} 
 
 	g.setBgColor(g.theme.bg).setColor(g.theme.fg);
-	g.drawImage(icoReset,145,145);
+	if (BANGLEJS2) { 
+		g.drawImage(icoReset,145,145);
+	}	
 	
 	drinkStatus.firstDrinkTime = firstDrinkTime; 
 	settings_file = require("Storage").open("drinkcounter.status.json", "w");
@@ -184,6 +187,10 @@ function addDrink(){
 function removeDrink(){
 	if (drinks[activeDrink] > 0) drinks[activeDrink] = drinks[activeDrink] - 1;
 	updateDrinks();
+	
+	if ((!BANGLEJS2) && (drinks[0] == 0) && (drinks[1] == 0) && (drinks[2] == 0)) {
+		resetDrinksFn()
+	}
 }
 
 function previousDrink(){
@@ -203,61 +210,74 @@ function showDrinks() {
 	g.drawImage(icoShot,80,100);
 }
 
-function initDragEvents() {
-  Bangle.on("drag", e => {
-    if (!drag) { // start dragging
-      drag = {x: e.x, y: e.y};
-    } else if (!e.b) { // released
-      const dx = e.x-drag.x, dy = e.y-drag.y;
-      drag = null;
-      if (Math.abs(dx)>Math.abs(dy)+10) {
-        // horizontal
-		if (dx < dy) {
-			//console.log("left " + dx + " " + dy);
-			previousDrink();
-		} else {
-			//console.log("right " + dx + " " + dy);
-			nextDrink();
-		}
-      } else if (Math.abs(dy)>Math.abs(dx)+10) {
-        // vertical
-		if (dx < dy) {
-			//console.log("down " + dx + " " + dy);
-			removeDrink();
-		} else {
-			//console.log("up " + dx + " " + dy);
-			addDrink();
-		}
-    } else {
-		//console.log("tap " + e.x + " " + e.y);
-		if (e.x > 145 && e.y > 145) {
-			g.clearRect(0,34,176,176); //Clear
-			resetDrinks = E.showPrompt("Reset drinks?", {
-				title: "Confirm",
-				buttons: { Yes: true, No: false },
-			});
-			resetDrinks.then((confirm) => {
-				if (confirm) {
-					for (let i = 0; i <= maxDrinks; i++) {
-						drinks[i] = 0;
-					}
-					//console.log("reset to default");
-				}
-				//console.log("reset " + confirm);  
-				firstDrinkTime = null;
-				showDrinks();
-				updateDrinks();
-				updateTime();
-				updateFirstDrinkTime();
-			});
-		}
-	}
-  }
-});
+function resetDrinksFn() {
+					g.clearRect(0,34,176,176); //Clear
+					resetDrinks = E.showPrompt("Reset drinks?", {
+						title: "Confirm",
+						buttons: { Yes: true, No: false },
+					});
+					resetDrinks.then((confirm) => {
+						if (confirm) {
+							for (let i = 0; i <= maxDrinks; i++) {
+								drinks[i] = 0;
+							}
+							//console.log("reset to default");
+						}
+						//console.log("reset " + confirm);  
+						firstDrinkTime = null;
+						showDrinks();
+						updateDrinks();
+						updateTime();
+						updateFirstDrinkTime();
+					});
 }
 
-loadMySettings();
 
+function initDragEvents() {
+	
+if (BANGLEJS2) { 	
+	Bangle.on("drag", e => {
+		if (!drag) { // start dragging
+			drag = {x: e.x, y: e.y};
+		} else if (!e.b) { // released
+			const dx = e.x-drag.x, dy = e.y-drag.y;
+			drag = null;
+			if (Math.abs(dx)>Math.abs(dy)+10) {
+				// horizontal
+				if (dx < dy) {
+					//console.log("left " + dx + " " + dy);
+					previousDrink();
+				} else {
+					//console.log("right " + dx + " " + dy);
+					nextDrink();
+				}
+			} else if (Math.abs(dy)>Math.abs(dx)+10) {
+				// vertical
+				if (dx < dy) {
+					//console.log("down " + dx + " " + dy);
+					removeDrink();
+				} else {
+					//console.log("up " + dx + " " + dy);
+					addDrink();
+				}
+			} else {
+				//console.log("tap " + e.x + " " + e.y);
+				if (e.x > 145 && e.y > 145) {
+					resetDrinksFn();
+				}
+			}
+		}
+	});
+	} else {
+			setWatch(addDrink, BTN1, { repeat: true, debounce:50 });
+			setWatch(removeDrink, BTN3, { repeat: true, debounce:50 });
+			setWatch(previousDrink, BTN4, { repeat: true, debounce:50 });
+			setWatch(nextDrink, BTN5, { repeat: true, debounce:50 });
+		}
+}
+
+
+loadMySettings();
 showDrinks();
 
 
diff --git a/apps/drinkcounter/metadata.json b/apps/drinkcounter/metadata.json
index 3d1a167f0..2b8d7fe71 100644
--- a/apps/drinkcounter/metadata.json
+++ b/apps/drinkcounter/metadata.json
@@ -2,14 +2,14 @@
   "id": "drinkcounter",
   "name": "Drink Counter",
   "shortName": "Drink Counter",
-  "version": "0.20",
+  "version": "0.25",
   "description": "Counts drinks you had for science. Calculates blood alcohol content (BAC)",
   "allow_emulator":true,
   "icon": "drinkcounter.png",
   "type": "app",
   "tags": "health",
   "screenshots": [{"url":"screenshot_drnkcnt.png"}],
-  "supports": ["BANGLEJS2"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"drinkcounter.app.js","url":"app.js"},
diff --git a/apps/entonclk/ChangeLog b/apps/entonclk/ChangeLog
new file mode 100644
index 000000000..62e2d0c20
--- /dev/null
+++ b/apps/entonclk/ChangeLog
@@ -0,0 +1 @@
+0.1: New App!
\ No newline at end of file
diff --git a/apps/entonclk/README.md b/apps/entonclk/README.md
new file mode 100644
index 000000000..8c788c7a5
--- /dev/null
+++ b/apps/entonclk/README.md
@@ -0,0 +1,9 @@
+Enton - Enhanced Anton Clock
+
+This clock face is based on the 'Anton Clock'.
+
+Things I changed:
+
+- The main font for the time is now Audiowide
+- Removed the written out day name and replaced it with steps and bpm
+- Changed the date string to a (for me) more readable string
\ No newline at end of file
diff --git a/apps/entonclk/app-icon.js b/apps/entonclk/app-icon.js
new file mode 100644
index 000000000..9993b0871
--- /dev/null
+++ b/apps/entonclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkE/4A/AH4A/AH4A/AH4Aw+cikf/mQDCAAIFBAwQDBBYgXCgEDAQIABn4JBkAFBgIKDgQwFmMD+UCmcgl/zEIMzmcQmYKBmYiCAAfxC4QrBl8wBwcgkYsGC4sAiMAF4UxiIGBn8QAgMSC48wgMRiEDBAISCiYcFC48v//yC4PzgJAGiAXIiczPgPzC4JyBmf/AYQXI+KcCj8wmYFCgEjAYQ3G+cjbQIABJIMzAoUin7XIADpSEK4rWGI4MhmRJBn8j+U/d4MimUTkUzIw5dBl4UBMgIXBAgMyLYKOBmQXHiSbCDgMyl8z+UjmJ1BHgJbHCgM/IYQABAgQJBYYYA/AH4AtaQU/mTvBBozWBd44KBkUSkLnBEo8jkcvBI0/CgMiDAIXHHYIXImUzJQJHH+Y+Bn6Z/ABQA=="))
\ No newline at end of file
diff --git a/apps/entonclk/app.js b/apps/entonclk/app.js
new file mode 100644
index 000000000..69fdea479
--- /dev/null
+++ b/apps/entonclk/app.js
@@ -0,0 +1,67 @@
+Graphics.prototype.setFontAudiowide = function() {
+  // Actual height 33 (36 - 4)
+  var widths = atob("CiAsESQjJSQkHyQkDA==");
+  var font = atob("AAAAAAAAAAAAAAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAADgAAAAAAHgAAAAAAfgAAAAAA/gAAAAAD/gAAAAAH/gAAAAAf/AAAAAB/8AAAAAD/4AAAAAP/gAAAAAf/AAAAAB/8AAAAAD/4AAAAAP/gAAAAAf+AAAAAB/8AAAAAH/wAAAAAP/gAAAAA/+AAAAAB/8AAAAAD/wAAAAAD/gAAAAAD+AAAAAAD4AAAAAADwAAAAAADAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAA//+AAAAB///AAAAH///wAAAP///4AAAf///8AAA////+AAA/4AP+AAB/gAD/AAB/AA9/AAD+AB+/gAD+AD+/gAD+AD+/gAD8AH+fgAD8AP8fgAD8AP4fgAD8Af4fgAD8A/wfgAD8A/gfgAD8B/gfgAD8D/AfgAD8D+AfgAD8H+AfgAD8P8AfgAD8P4AfgAD8f4AfgAD8/wAfgAD8/gAfgAD+/gA/gAD+/AA/gAB/eAB/AAB/sAD/AAB/wAH/AAA////+AAAf///8AAAP///4AAAH///wAAAD///gAAAA//+AAAAAP/4AAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD/////gAD/////gAD/////gAD/////gAD/////gAD/////gAD/////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//gAAAAH//gAAAAP//gAD8Af//gAD8A///gAD8B///gAD8B///gAD8B/AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD+D+AfgAD//+AfgAD//+AfgAB//8AfgAA//4AfgAAf/wAfgAAP/gAfgAAB8AAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD+B+A/gAD/////gAB/////AAB/////AAA////+AAAf///8AAAP///4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//4AAAAD//8AAAAD//+AAAAD//+AAAAD//+AAAAD//+AAAAD//+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAAAB+AAAAD/////gAD/////gAD/////gAD/////gAD/////gAD/////gAD/////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//AAfgAD//wAfgAD//4AfgAD//8AfgAD//8AfgAD//+AfgAD8D+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B/A/gAD8B///gAD8B///gAD8A///AAD8A///AAAAAf/+AAAAAP/4AAAAAD/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB///AAAAH///wAAAf///8AAAf///8AAA////+AAB/////AAB/h+H/AAD/B+B/gAD+B+A/gAD+B+A/gAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B/A/gAD8B///gAD8B///gAD8A///AAAAAf//AAAAAf/+AAAAAH/4AAAAAB/gAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD8AAAAAAD8AAAAgAD8AAABgAD8AAAHgAD8AAAfgAD8AAA/gAD8AAD/gAD8AAP/gAD8AA//gAD8AB//AAD8AH/8AAD8Af/wAAD8A//AAAD8D/+AAAD8P/4AAAD8f/gAAAD9//AAAAD//8AAAAD//wAAAAD//gAAAAD/+AAAAAD/4AAAAAD/wAAAAAD/AAAAAAD8AAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAH/4AAAAAP/8AAAH+f/+AAAf////AAA/////gAB/////gAB///A/gAD//+AfgAD//+AfgAD+D+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD+D+AfgAD//+AfgAD//+AfgAB///A/gAB/////gAA/////AAAP////AAAD+f/+AAAAAP/8AAAAAH/4AAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAf/wAAAAA//4AAAAB//8AAAAB//8AfgAD//+AfgAD/D+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD8B+AfgAD+B+A/gAD+B+A/gAD/B+B/gAB/////AAB/////AAA////+AAAf///8AAAP///4AAAH///wAAAB///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAPAAAA/AAfgAAA/AAfgAAA/AAfgAAA/AAfgAAAeAAPAAAAAAAAAAAAAAAAAAAAAAAAAA");
+  var scale = 1; // size multiplier for this font
+  g.setFontCustom(font, 46, widths, 48+(scale<<8)+(1<<16));
+};
+
+function getSteps() {
+		var steps = 0;
+		try{
+      if (WIDGETS.wpedom !== undefined) {
+          steps = WIDGETS.wpedom.getSteps();
+      } else if (WIDGETS.activepedom !== undefined) {
+          steps = WIDGETS.activepedom.getSteps();
+      } else {
+        steps = Bangle.getHealthStatus("day").steps;
+      }
+  } catch(ex) {
+      // In case we failed, we can only show 0 steps.
+      return "?";
+  }
+
+		return Math.round(steps);
+}
+
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+let drawTimeout;
+
+
+// Actually draw the watch face
+let draw = function() {
+  var x = g.getWidth() / 2;
+  var y = g.getHeight() / 2;
+  g.reset().clearRect(Bangle.appRect); // clear whole background (w/o widgets)
+  var date = new Date();
+  var timeStr = require("locale").time(date, 1); // Hour and minute
+  g.setFontAlign(0, 0).setFont("Audiowide").drawString(timeStr, x, y);
+  var dateStr = require("locale").date(date, 1).toUpperCase();
+  g.setFontAlign(0, 0).setFont("6x8", 2).drawString(dateStr, x, y+28);
+	g.setFontAlign(0, 0).setFont("6x8", 2);
+  g.drawString(getSteps(), 50, y+70);
+  g.drawString(Math.round(Bangle.getHealthStatus("last").bpm), g.getWidth() -37, y + 70);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+};
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    delete Graphics.prototype.setFontAnton;
+  }});
+// Load widgets
+Bangle.loadWidgets();
+draw();
+setTimeout(Bangle.drawWidgets,0);
+}
diff --git a/apps/entonclk/app.png b/apps/entonclk/app.png
new file mode 100644
index 000000000..5b634de5a
Binary files /dev/null and b/apps/entonclk/app.png differ
diff --git a/apps/entonclk/metadata.json b/apps/entonclk/metadata.json
new file mode 100644
index 000000000..7e4947406
--- /dev/null
+++ b/apps/entonclk/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "entonclk",
+  "name": "Enton Clock",
+  "version": "0.1",
+  "description": "A simple clock using the Audiowide font. ",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "readme":"README.md",
+  "storage": [
+    {"name":"entonclk.app.js","url":"app.js"},
+    {"name":"entonclk.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/entonclk/screenshot.png b/apps/entonclk/screenshot.png
new file mode 100644
index 000000000..0905c6fc8
Binary files /dev/null and b/apps/entonclk/screenshot.png differ
diff --git a/apps/espruinoctrl/README.md b/apps/espruinoctrl/README.md
index a7bca662c..7b2e434e7 100644
--- a/apps/espruinoctrl/README.md
+++ b/apps/espruinoctrl/README.md
@@ -17,7 +17,7 @@ showing available Espruino devices is popped up.
 device being connected to. Use this if you want to print data - eg: `print(E.getBattery())`
 
 When done, click 'Upload'. Your changes will be saved to local storage
-so they'll be remembered next time you upload from the same device.s
+so they'll be remembered next time you upload from the same device.
 
 ## Usage
 
diff --git a/apps/espruinoctrl/app-icon.js b/apps/espruinoctrl/app-icon.js
index 70d2dd062..3f9572f72 100644
--- a/apps/espruinoctrl/app-icon.js
+++ b/apps/espruinoctrl/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwhH+AH4A/AH4A/AH4AFwIuuAAIllAAYIGF041IF34AKqwuuAANXF9QuCAANdGHqQgGBwvdGCIud5mjGB4udAAIwPFz3MSR61VFxQwNci4vGeh4uXGAguHGBK3WGA4AIegtXc69dGBxoBGAouWO4IwNe4gwZa4YwLFwikEFzAwLFwwwCFzQwKFw68YGB4AdF5AwmF5IwlF5QwkF5Yw/F8IwEL9WBB4IuuADwuzGxAugFAgliGBYutAH4A/AH4A/ADA="))
+require("heatshrink").decompress(atob("mEw4UA///muVt9TgH+Jf4AQgILKgtABI9VqkVqAgHqoABC48FBYQKGhEVBQNUBY0qyoLJ1WlEZMq1ILJhWqBZMC1QwCBY0PGAYLGn/qGAQLG/4wDBIkggf8GARfF1ED+BhCTQgTBgfAMISaF1WAAYM61SBG0ADB/wLFgNq1EAHoIcDXYVaCYMP+EqC4kVqwTBn/AhDqFqowBn72HqowCBZAwCBZAwCBZAwCBZIwIiowKBYVWC5VUkAvJXYiaDBYS7FTQVUgr2HC4IgHAAYgHAH4AJA=="))
diff --git a/apps/espruinoctrl/metadata.json b/apps/espruinoctrl/metadata.json
index 253307fa0..5107bc6ae 100644
--- a/apps/espruinoctrl/metadata.json
+++ b/apps/espruinoctrl/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.01",
   "description": "Send commands to other Espruino devices via the Bluetooth UART interface. Customisable commands!",
   "icon": "app.png",
-  "tags": "",
+  "tags": "tool,bluetooth",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "custom": "custom.html",
diff --git a/apps/espruinoprog/ChangeLog b/apps/espruinoprog/ChangeLog
new file mode 100644
index 000000000..6fdcad1d6
--- /dev/null
+++ b/apps/espruinoprog/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New App!
+0.02: Add 'pre' code that can erase the device
+      Wait more between sending code snippets
+      Now force use of 'Storage' (assume 2v00 or later)
diff --git a/apps/espruinoprog/README.md b/apps/espruinoprog/README.md
new file mode 100644
index 000000000..aef4cccad
--- /dev/null
+++ b/apps/espruinoprog/README.md
@@ -0,0 +1,43 @@
+# Espruino Programmer
+
+Finds Bluetooth devices with a specific name (eg `Puck.js`), connects and uploads code. Great for programming many devices at once!
+
+**WARNING:** This will reprogram **any matching Espruino device within range** while
+the app is running. Unless you are careful to remove other devices from the area or
+turn them off, you could find some of your devices unexpectedly get programmed!
+
+## Customising
+
+Click on the Customise button in the app loader to set up the programmer.
+
+* First you need to choose the kind of devices you want to upload to. This is
+the text that should match the Bluetooth advertising name. So `Puck.js` for Puck.js
+devices, or `Bangle.js` for Bangles.
+* In the next box, you have code to run before the upload of the main code. By default
+the code `require("Storage").list().forEach(f=>require("Storage").erase(f));reset();` will
+erase all files on the device and reset it.
+* Now paste in the code you want to write to the device. This is automatically
+written to flash (`.bootcde`). See https://www.espruino.com/Saving#save-on-send-to-flash-
+for more information.
+* Now enter the code that should be sent **after** programming. This code
+should make the device so it doesn't advertise on Bluetooth with the Bluetooth
+name you entered for the first item. It may also help if it indicates to you that
+the device is programmed properly.
+  * You could turn advertising off with `NRF.sleep()`
+  * You could change the advertising name with `NRF.setAdvertising({},{name:"Ok"});`
+  * On a Bangle, you could turn it off with `Bangle.off()`
+* Finally scroll down and click `Upload`
+* Now you can run the new `Programmer` app on the Bangle.
+
+## Usage
+
+Just run the app, and as soon as it starts it'll start scanning for
+devices to upload to!
+
+To stop scanning, long-press the button to return to the clock.
+
+## Notes
+
+* This assumes the device being written to is at least version 2v00 of Espruino
+* Currently, code is not minified before upload (so you need to supply pre-minified
+  code if you want that)
diff --git a/apps/espruinoprog/app-icon.js b/apps/espruinoprog/app-icon.js
new file mode 100644
index 000000000..532c60eea
--- /dev/null
+++ b/apps/espruinoprog/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4cA/4AB7wJB8/5uX+7uUgH41lSKf4AKpMkyQCCggEDAQVtCAMCCNWUx9JufSrmkCJeKqsiytICJtFkWRCJWAEaARCI5BkEoAGBymJ9eSvXkCJZ9JCLI1DyM9uQRLNYWRpRZMR5ARWAwSPCuWR9MuCJZZIgARGPouTCIcSA4OQAoMW7dt2wCEEZECCI1oCJAADrZyBAAcDuQRByOABQkKDAvbtwRBxu24AMFAAcGCIY/B7AQIhpOC3MjKIVsCJe3jYRCwiPEkARBQg227ieDAQO0CJPhCKHJCK1N0ARI28JCIjUDEY4OBzWRfAoRG3ARBygRH3oPBswRB4QjFfAYgCt9pYoJoEkmbCJONCI1ACJGSiQRE7TXDCIuQEYkmCIhpDEYSCFCIj2DCIOTrYRE6ARDAH4AHA"))
diff --git a/apps/espruinoprog/app.js b/apps/espruinoprog/app.js
new file mode 100644
index 000000000..58fac4a0b
--- /dev/null
+++ b/apps/espruinoprog/app.js
@@ -0,0 +1,100 @@
+var uart; // require("ble_uart")
+var device; // BluetoothDevice
+var uploadTimeout; // a timeout used during upload - if we disconnect, kill this
+Bangle.loadWidgets();
+
+var json = require("Storage").readJSON("espruinoprog.json",1);
+/*var json = { // for example
+  namePrefix : "Puck.js ",
+  code : "E.setBootCode('digitalPulse(LED2,1,100);')",
+  post : "LED.set();NRF.sleep()",
+};*/
+
+if ("object" != typeof json) {
+  E.showAlert("JSON not found","Programmer").then(() => load());
+  throw new Error("JSON not found");
+  // stops execution
+}
+
+// Set up terminal
+var R = Bangle.appRect;
+var termg = Graphics.createArrayBuffer(R.w, R.h, 1, {msb:true});
+termg.setFont("6x8");
+var term;
+
+function showTerminal() {
+  E.showMenu(); // clear anything that was drawn
+  if (term) term.print(""); // redraw terminal
+}
+
+function scanAndConnect() {
+  termg.clear();
+  term = require("VT100").connect(termg, {
+    charWidth : 6,
+    charHeight : 8
+  });
+  term.print = str => {
+    for (var i of str) term.char(i);
+    g.reset().drawImage(termg,R.x,R.y);
+  };
+  term.print(`\r\nScanning...\r\n`);
+  NRF.requestDevice({ filters: [{ namePrefix: json.namePrefix }] }).then(function(dev) {
+    term.print(`Found ${dev.name||dev.id.substr(0,17)}\r\n`);
+    device = dev;
+
+    term.print(`Connect to ${dev.name||dev.id.substr(0,17)}...\r\n`);
+    device.removeAllListeners();
+    device.on('gattserverdisconnected', function(reason) {
+      if (!uart) return;
+      term.print(`\r\nDISCONNECTED (${reason})\r\n`);
+      uart = undefined;
+      device = undefined;
+      if (uploadTimeout) clearTimeout(uploadTimeout);
+      uploadTimeout = undefined;
+      setTimeout(scanAndConnect, 1000);
+    });
+    require("ble_uart").connect(device).then(function(u) {
+      uart = u;
+      term.print("Connected...\r\n");
+      uart.removeAllListeners();
+      uart.on('data', function(d) { term.print(d); });
+      term.print("Upload initial...\r\n");
+      uart.write((json.pre||"")+"\n").then(() => {
+        term.print("\r\Done.\r\n");
+        uploadTimeout = setTimeout(function() {
+          uploadTimeout = undefined;
+          term.print("\r\nUpload Code...\r\n");
+          uart.write((json.code||"")+"\n").then(() => {
+            term.print("\r\Done.\r\n");
+            // main upload completed - wait a bit
+            uploadTimeout = setTimeout(function() {
+              uploadTimeout = undefined;
+              term.print("\r\Upload final...\r\n");
+              // now upload the code to run after...
+              uart.write((json.post||"")+"\n").then(() => {
+                term.print("\r\nDone.\r\n");
+                // now wait and disconnect (if not already done!)
+                uploadTimeout = setTimeout(function() {
+                  uploadTimeout = undefined;
+                  term.print("\r\nDisconnecting...\r\n");
+                  if (uart) uart.disconnect();
+                }, 500);
+              });
+            }, 2000);
+          });
+        }, 2000);
+      });
+    });
+  }).catch(err => {
+    if (err.toString().startsWith("No device found")) {
+      // expected - try again
+      scanAndConnect();
+    } else
+      term.print(`\r\ERROR ${err.toString()}\r\n`);
+  });
+}
+
+// now start
+Bangle.drawWidgets();
+showTerminal();
+scanAndConnect();
diff --git a/apps/espruinoprog/app.png b/apps/espruinoprog/app.png
new file mode 100644
index 000000000..b2b435f04
Binary files /dev/null and b/apps/espruinoprog/app.png differ
diff --git a/apps/espruinoprog/custom.html b/apps/espruinoprog/custom.html
new file mode 100644
index 000000000..a12189707
--- /dev/null
+++ b/apps/espruinoprog/custom.html
@@ -0,0 +1,175 @@
+<html>
+
+<head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/addon/lint/lint.min.css">
+</head>
+
+<body>
+    <script src="../../core/lib/customize.js"></script>
+    <script src="../../core/lib/espruinotools.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/mode/javascript/javascript.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/addon/lint/lint.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/addon/lint/javascript-lint.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/addon/hint/javascript-hint.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.11.0/jshint.min.js"></script>
+    <p>Upload code to devices with names starting with:</p>
+    <p><input type="text" id="nameprefix"></input></p>
+    <p>Enter the code to send before upload here:</p>
+    <p><textarea id="pre-code"></textarea></p>
+    <p>Enter your program to upload here:</p>
+    <p><textarea id="js-code"></textarea></p>
+    <p>Enter the code to send after upload here:</p>
+    <p><textarea id="post-code"></textarea></p>
+    <p>Then click <button id="upload" class="btn btn-primary">Upload</button>&nbsp;<span id="btninfo" style="color:orange"></span> </p>
+    <p><a id="setdefault">Click here</a> to reset to defaults.</p>
+    <script>
+  const LS_PRECODE = "espruinoprog.precode";
+  const LS_JSCODE = "espruinoprog.code";
+  const LS_POSTCODE = "espruinoprog.postcode";
+  const LS_NAMEPREFIX = "espruinoprog.namePrefix";
+  var preeditor,jseditor,posteditor;
+
+  function setDefaults() {
+    if (localStorage.getItem(LS_PRECODE) === null) {
+        localStorage.setItem(LS_PRECODE, `// Erase all files (faster than eraseall)
+require("Storage").list().forEach(f=>require("Storage").erase(f));reset();`);
+    }
+    if (localStorage.getItem(LS_JSCODE) === null) {
+        localStorage.setItem(LS_JSCODE, `// Flash LED2 every 2 seconds
+setInterval(function() {
+  LED2.set();
+  setTimeout(function() {
+    LED2.reset();
+  }, 100);
+}, 2000);`);
+    }
+    if (localStorage.getItem(LS_POSTCODE) === null) {
+        localStorage.setItem(LS_POSTCODE, `// Turn red LED on to show programmed
+// Bluetooth off to stop this getting re-programmed
+LED.set();NRF.sleep();`);
+    }
+    if (localStorage.getItem(LS_NAMEPREFIX) === null) {
+        localStorage.setItem(LS_NAMEPREFIX, "Puck.js");
+    }
+    document.getElementById("pre-code").value = localStorage.getItem(LS_PRECODE);
+    if (preeditor) preeditor.setValue(document.getElementById("pre-code").value);
+    document.getElementById("js-code").value = localStorage.getItem(LS_JSCODE);
+    if (jseditor) jseditor.setValue(document.getElementById("js-code").value);
+    document.getElementById("post-code").value = localStorage.getItem(LS_POSTCODE);
+    if (posteditor) posteditor.setValue(document.getElementById("post-code").value);
+    document.getElementById("nameprefix").value = localStorage.getItem(LS_NAMEPREFIX);
+  }
+  setDefaults();
+
+  // The code editor
+  var lintFlags = {
+      esversion: 6, // Enable ES6 for literals, arrow fns, binary
+      evil: true, // don't warn on use of strings in setInterval
+      laxbreak: true, // don't warn about newlines in expressions
+      laxcomma: true // don't warn about commas at the start of the line
+  };
+  preeditor = CodeMirror.fromTextArea(document.getElementById("pre-code"), {
+      width: "100%",
+      height: "auto",
+      matchBrackets: true,
+      mode: { name: "javascript", globalVars: false },
+      lineWrapping: true,
+      showTrailingSpace: true,
+      lint: lintFlags,
+      gutters: ["CodeMirror-linenumbers", "CodeMirror-lint-markers"],
+      lineNumbers: true
+  });
+  jseditor = CodeMirror.fromTextArea(document.getElementById("js-code"), {
+      width: "100%",
+      height: "auto",
+      matchBrackets: true,
+      mode: { name: "javascript", globalVars: false },
+      lineWrapping: true,
+      showTrailingSpace: true,
+      lint: lintFlags,
+      gutters: ["CodeMirror-linenumbers", "CodeMirror-lint-markers"],
+      lineNumbers: true
+  });
+  posteditor = CodeMirror.fromTextArea(document.getElementById("post-code"), {
+      width: "100%",
+      height: "auto",
+      matchBrackets: true,
+      mode: { name: "javascript", globalVars: false },
+      lineWrapping: true,
+      showTrailingSpace: true,
+      lint: lintFlags,
+      gutters: ["CodeMirror-linenumbers", "CodeMirror-lint-markers"],
+      lineNumbers: true
+  });
+  function hasWarnings() {
+    return  preeditor.state.lint.marked.length!=0 ||
+            jseditor.state.lint.marked.length!=0 ||
+            posteditor.state.lint.marked.length!=0;
+  }
+  var editorChangedTimeout;
+  function editorChanged() {
+    if (editorChangedTimeout) clearTimeout(editorChangedTimeout);
+    editorChangedTimeout = setTimeout(function() {
+      if (hasWarnings()) {
+        document.getElementById("btninfo").innerHTML = "There are warnings in the code to be uploaded";
+        //document.getElementById("upload").classList.add("disabled");
+      } else {
+        document.getElementById("btninfo").innerHTML = "";
+        //document.getElementById("upload").classList.remove("disabled");
+      }
+    }, 500);
+  }
+
+  preeditor.on("change", editorChanged);
+  jseditor.on("change", editorChanged);
+  posteditor.on("change", editorChanged);
+
+  document.getElementById("upload").addEventListener("click", function() {
+    if (!hasWarnings()) {
+      var precode = preeditor.getValue();
+      var jscode = jseditor.getValue();
+      var postcode = posteditor.getValue();
+      var namePrefix = document.getElementById("nameprefix").value;
+      localStorage.setItem(LS_PRECODE, precode);
+      localStorage.setItem(LS_JSCODE, jscode);
+      localStorage.setItem(LS_POSTCODE, postcode);
+      localStorage.setItem(LS_NAMEPREFIX, namePrefix);
+
+      // force version - as long as we're above 1v96 we get the ability to upload to different storage files
+      var ENV = Espruino.Core.Env.getData();
+      ENV.VERSION_MAJOR = 2;
+      ENV.VERSION_MINOR = 0;
+      // Now compile
+      Espruino.transform(jscode, {
+        SET_TIME_ON_WRITE : false, // time would just be out of date
+        SAVE_ON_SEND : 1, // save to flash
+        LOAD_STORAGE_FILE : 0, // do not load from storage after saving
+        // PRETOKENISE : true,
+        // MINIFICATION_LEVEL : "ESPRIMA", // maybe?
+      }).then(content => {
+        sendCustomizedApp({
+          storage: [{ name: "espruinoprog.json", content: JSON.stringify({
+              namePrefix : namePrefix,
+              pre : Espruino.Core.CodeWriter.reformatCode(precode),
+              code : Espruino.Core.CodeWriter.reformatCode(content),
+              post : Espruino.Core.CodeWriter.reformatCode(postcode)
+          })}]
+        });
+      });
+    }
+  });
+  document.getElementById("setdefault").addEventListener("click", function(e) {
+    e.preventDefault();
+    localStorage.removeItem(LS_PRECODE);
+    localStorage.removeItem(LS_JSCODE);
+    localStorage.removeItem(LS_POSTCODE);
+    localStorage.removeItem(LS_NAMEPREFIX);
+    setDefaults();
+  });
+  </script>
+</body>
+
+</html>
diff --git a/apps/espruinoprog/metadata.json b/apps/espruinoprog/metadata.json
new file mode 100644
index 000000000..ebb55b23d
--- /dev/null
+++ b/apps/espruinoprog/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "espruinoprog",
+  "name": "Espruino Programmer",
+  "shortName": "Programmer",
+  "version": "0.02",
+  "description": "Finds Bluetooth devices with a specific name (eg 'Puck.js'), connects and uploads code. Great for programming many devices at once!",
+  "icon": "app.png",
+  "tags": "tool,bluetooth",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "custom": "custom.html",
+  "storage": [
+    {"name":"espruinoprog.app.js","url":"app.js"},
+    {"name":"espruinoprog.img","url":"app-icon.js","evaluate":true},
+    {"name":"espruinoprog.json"}
+  ]
+}
diff --git a/apps/ncfrun/ChangeLog b/apps/espruinoterm/ChangeLog
similarity index 100%
rename from apps/ncfrun/ChangeLog
rename to apps/espruinoterm/ChangeLog
diff --git a/apps/espruinoterm/README.md b/apps/espruinoterm/README.md
new file mode 100644
index 000000000..df26d59a0
--- /dev/null
+++ b/apps/espruinoterm/README.md
@@ -0,0 +1,22 @@
+# Espruino Terminal
+
+Send commands to other Espruino devices via the Bluetooth UART interface and
+see the result on a terminal.
+
+## Customising
+
+Once installed and you're connected to the Bangle you can click the button next to the app in the app loader
+to change the commands (they will be read from the device).
+
+When done, click `Save to Bangle.js` and your changes will be saved to the same device.
+
+## Usage
+
+* Load the app and after a few seconds you'll see a menu with Espruino devices
+in the vicinity.
+* Tap on the device you want to connect to
+* A terminal will pop up showing `Connecting...` and then `Connected`
+* Now tap on the right (or press the button) to bring up a menu with options for commands, or the option to disconnect.
+
+You can also choose `Custom` in which case a keyboard (using the currently installed text input method) will
+be displayed and you can enter the command you would like to send.
diff --git a/apps/espruinoterm/app-icon.js b/apps/espruinoterm/app-icon.js
new file mode 100644
index 000000000..f566aedf7
--- /dev/null
+++ b/apps/espruinoterm/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwcCpMkyQC/AVW//4AK/oR/COD8LCP4R/CK8DCKNsCKFt2BHPhu2CJ8BCKAjQI4OQNaIUB23bsCPMCJzp/CP4Rf/4AKCKwC/AVIA=="))
diff --git a/apps/espruinoterm/app.js b/apps/espruinoterm/app.js
new file mode 100644
index 000000000..348190db4
--- /dev/null
+++ b/apps/espruinoterm/app.js
@@ -0,0 +1,101 @@
+var uart; // require("ble_uart")
+var device; // BluetoothDevice
+var customCommand = "";
+// Set up terminal
+Bangle.loadWidgets();
+var R = Bangle.appRect;
+var termg = Graphics.createArrayBuffer(R.w, R.h, 1, {msb:true});
+var termVisible = false;
+termg.setFont("6x8");
+term = require("VT100").connect(termg, {
+  charWidth : 6,
+  charHeight : 8
+});
+term.print = str => {
+  for (var i of str) term.char(i);
+  if (termVisible) g.reset().drawImage(termg,R.x,R.y).setFont("6x8").setFontAlign(0,-1,1).drawString("MORE",R.w-1,(R.y+R.y2)/2);
+};
+
+function showConnectMenu() {
+  termVisible = false;
+  var m = { "" : {title:"Devices"} };
+  E.showMessage("Scanning...");
+    NRF.findDevices(devices => {
+      devices.forEach(dev=>{
+        m[dev.name||dev.id.substr(0,17)] = ()=>{
+          connectTo(dev);
+        };
+      });
+      m["< Back"] = () => showConnectMenu();
+      E.showMenu(m);
+    },{filters:[
+        { namePrefix: 'Puck.js' },
+        { namePrefix: 'Pixl.js' },
+        { namePrefix: 'MDBT42Q' },
+        { namePrefix: 'Bangle.js' },
+        { namePrefix: 'Espruino' },
+        { services: [ "6e400001-b5a3-f393-e0a9-e50e24dcca9e" ] }
+      ],active:true,timeout:4000});
+}
+
+function showOptionsMenu() {
+  if (!uart) showConnectMenu();
+  termVisible = false;
+  var menu = {"":{title:/*LANG*/"Options"},
+    "< Back" : () => showTerminal(),
+  };
+  var json = require("Storage").readJSON("espruinoterm.json",1);
+  if (Array.isArray(json)) {
+    json.forEach(j => { menu[j.title] = () => sendCommand(j.cmd); });
+  } else {
+    Object.assign(menu,{
+      "Version" : () => sendCommand("process.env.VERSION"),
+      "Battery" : () => sendCommand("E.getBattery()"),
+      "Flash LED" : () => sendCommand("LED.set();setTimeout(()=>LED.reset(),1000);")
+    });
+  }
+  menu[/*LANG*/"Custom"] = () => { require("textinput").input({text:customCommand}).then(result => {
+    customCommand = result;
+    sendCommand(customCommand);
+  })};
+  menu[/*LANG*/"Disconnect"] = () => { showTerminal(); term.print("\r\nDisconnecting...\r\n"); uart.disconnect(); }
+
+  E.showMenu(menu);
+}
+
+function showTerminal() {
+  E.showMenu();
+  Bangle.setUI({
+    mode : "custom",
+    btn : n=> { showOptionsMenu(); },
+    touch : (n,e) => { if (n==2) showOptionsMenu(); }
+  });
+  termVisible = true;
+  term.print(""); // redraw terminal
+}
+
+function sendCommand(cmd) {
+  showTerminal();
+  uart.write(cmd+"\n");
+}
+
+function connectTo(dev) {
+  device = dev;
+  showTerminal();
+  term.print(`\r\nConnect to ${dev.name||dev.id.substr(0,17)}...\r\n`);
+  device.on('gattserverdisconnected', function(reason) {
+    term.print(`\r\nDISCONNECTED (${reason})\r\n`);
+    uart = undefined;
+    device = undefined;
+    setTimeout(showConnectMenu, 1000);
+  });
+  require("ble_uart").connect(device).then(function(u) {
+    uart = u;
+    term.print("Connected...\r\n");
+    uart.on('data', function(d) { term.print(d); });
+  });
+}
+
+// now start
+Bangle.drawWidgets();
+showConnectMenu();
diff --git a/apps/espruinoterm/app.json b/apps/espruinoterm/app.json
new file mode 100644
index 000000000..72a12e635
--- /dev/null
+++ b/apps/espruinoterm/app.json
@@ -0,0 +1,5 @@
+[
+  {"title":"Version", "cmd":"process.env.VERSION"},
+  {"title":"Battery", "cmd":"E.getBattery()"},
+  {"title":"Flash LED", "cmd":"LED.set();setTimeout(()=>LED.reset(),1000);"}
+]
diff --git a/apps/espruinoterm/app.png b/apps/espruinoterm/app.png
new file mode 100644
index 000000000..e9a8c3758
Binary files /dev/null and b/apps/espruinoterm/app.png differ
diff --git a/apps/espruinoterm/interface.html b/apps/espruinoterm/interface.html
new file mode 100644
index 000000000..660b3a86c
--- /dev/null
+++ b/apps/espruinoterm/interface.html
@@ -0,0 +1,104 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-exp.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <style>
+    .badgeerror[data-badge]::after { background-color: red; }
+    </style>
+  </head>
+  <body>
+    <p>Enter the menu items you'd like to see appear in the app below. When finished, click `Save to Bangle.js` to save the JavaScript back.</p>
+    <div style="overflow-x:scroll">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Title</th>
+          <th>Command</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="tbody">
+      </tbody>
+    </table>
+  </div>
+    <p><button id="save" class="btn btn-primary">Save to Bangle.js</button></p>
+
+    <script src="../../core/lib/interface.js"></script>
+
+    <script>
+      var options;
+      setDefaults();
+
+      function setDefaults() {
+        options = [
+          {title:"Version", cmd:"process.env.VERSION"},
+          {title:"Battery", cmd:"E.getBattery()"},
+          {title:"Flash LED", cmd:"LED.set();setTimeout(()=>LED.reset(),1000);"}
+        ];
+      }
+
+      function refresh() {
+        var tbody = document.getElementById("tbody");
+        tbody.innerHTML = "";
+        options.forEach((option,idx)=>{
+          var tr = document.createElement("tr");
+          tr.innerHTML = `
+            <td><input type="text" name="title"></td>
+            <td><input type="text" name="command"></td>
+            <td><button class="btn btn-action"><i class="icon icon-delete"></i></button></td>
+          `;
+          var titleInput = tr.children[0].firstChild;
+          titleInput.value = option.title;
+          titleInput.addEventListener("change", function(e) {
+            option.title = titleInput.value;
+          });
+          var cmdInput = tr.children[1].firstChild;
+          cmdInput.value = option.cmd;
+          cmdInput.addEventListener("change", function(e) {
+            option.cmd = cmdInput.value;
+          });
+          tr.children[2].firstChild.addEventListener("click", function() {
+            options.splice(idx,1);
+            refresh();
+          });
+          tbody.appendChild(tr);
+        });
+        var tr = document.createElement("tr");
+        tr.innerHTML = `
+          <td><button class="btn">Reset to Defaults</button></td>
+          <td></td>
+          <td><button class="btn btn-action"><i class="icon icon-plus"></i></button></td>
+        `;
+        tr.children[0].firstChild.addEventListener("click", function() {
+          setDefaults();
+          refresh();
+        });
+        tr.children[2].firstChild.addEventListener("click", function() {
+          options.push({"title":"",cmd:""});
+          refresh();
+        });
+        tbody.appendChild(tr);
+      }
+
+      function onInit() {
+        Util.showModal("Loading...");
+        Util.readStorage("espruinoterm.json", function(j) {
+          Util.hideModal();
+          try {
+            options = JSON.parse(j);
+          } catch (e) {}
+          if (!Array.isArray(options)) setDefaults();
+          refresh();
+        });
+      }
+      refresh();
+      document.getElementById("save").addEventListener("click", function() {
+        Util.showModal("Saving...");
+        Util.writeStorage("espruinoterm.json", JSON.stringify(options), function() {
+          Util.hideModal();
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/apps/espruinoterm/metadata.json b/apps/espruinoterm/metadata.json
new file mode 100644
index 000000000..25e6183e1
--- /dev/null
+++ b/apps/espruinoterm/metadata.json
@@ -0,0 +1,20 @@
+{
+  "id": "espruinoterm",
+  "name": "Espruino Terminal",
+  "shortName": "Espruino Term",
+  "version": "0.01",
+  "description": "Send commands to other Espruino devices via the Bluetooth UART interface, and see the result on a VT100 terminal. Customisable commands!",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "tags": "tool,bluetooth",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "dependencies": {"textinput":"type"},
+  "storage": [
+    {"name":"espruinoterm.app.js","url":"app.js"},
+    {"name":"espruinoterm.img","url":"app-icon.js","evaluate":true}
+  ],"data": [
+    {"name":"espruinoterm.json","url":"app.json"}
+  ]
+}
diff --git a/apps/espruinoterm/screenshot.png b/apps/espruinoterm/screenshot.png
new file mode 100644
index 000000000..cce881a37
Binary files /dev/null and b/apps/espruinoterm/screenshot.png differ
diff --git a/apps/fclock/ChangeLog b/apps/fclock/ChangeLog
index 30e049f69..7e7307c59 100644
--- a/apps/fclock/ChangeLog
+++ b/apps/fclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First published version of app
 0.02: Move to Bangle.setUI to launcher support
+0.03: Tell clock widgets to hide.
diff --git a/apps/fclock/fclock.app.js b/apps/fclock/fclock.app.js
index afa0c5e2d..838a5578d 100644
--- a/apps/fclock/fclock.app.js
+++ b/apps/fclock/fclock.app.js
@@ -173,6 +173,9 @@ const drawHR = function () {
   }
 };
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 // clean app screen
 g.clear();
 Bangle.loadWidgets();
@@ -198,6 +201,3 @@ Bangle.on('HRM', function (d) {
 
 // draw now
 drawClock();
-
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/fclock/metadata.json b/apps/fclock/metadata.json
index da553e110..dffb197a2 100644
--- a/apps/fclock/metadata.json
+++ b/apps/fclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "fclock",
   "name": "fclock",
   "shortName": "F Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Simple design of a digital clock",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/ftclock/ChangeLog b/apps/ftclock/ChangeLog
index 83ec21ee6..c30dae69f 100644
--- a/apps/ftclock/ChangeLog
+++ b/apps/ftclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: first release
 0.02: RAM efficient version of `fourTwentyTz.js` (as suggested by @gfwilliams).
 0.03: `mkFourTwentyTz.js` now handles new timezonedb.com CSV format
+0.04: Tell clock widgets to hide.
diff --git a/apps/ftclock/app.js b/apps/ftclock/app.js
index b12db10f1..4f2cef895 100644
--- a/apps/ftclock/app.js
+++ b/apps/ftclock/app.js
@@ -33,6 +33,8 @@ function draw() {
 
 // Clear the screen once, at startup
 g.clear();
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -47,5 +49,4 @@ Bangle.on('lcdPower',on=>{
     drawTimeout = undefined;
   }
 });
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/ftclock/metadata.json b/apps/ftclock/metadata.json
index 876feb1bb..96a4f84b9 100644
--- a/apps/ftclock/metadata.json
+++ b/apps/ftclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ftclock",
   "name": "Four Twenty Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A clock that tells when and where it's going to be 4:20 next",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot1.png"}],
diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 3f8f50b3f..8ef117933 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -83,6 +83,7 @@ function onInit(device) {
     if (crc==3508163280 || crc==1418074094) version = "2v12";
     if (crc==4056371285) version = "2v13";
     if (crc==1038322422) version = "2v14";
+    if (crc==2560806221) version = "2v15";
     if (!ok) {
       version += 	`(&#9888; update required)`;
     }
diff --git a/apps/gallifr/ChangeLog b/apps/gallifr/ChangeLog
index 0e1f45042..32c1057b0 100644
--- a/apps/gallifr/ChangeLog
+++ b/apps/gallifr/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First released version
 0.02: Changed setWatch to Bangle.setUI
+0.03: Tell clock widgets to hide.
diff --git a/apps/gallifr/app.js b/apps/gallifr/app.js
index d327bcdc1..8468eee48 100644
--- a/apps/gallifr/app.js
+++ b/apps/gallifr/app.js
@@ -238,10 +238,12 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 startTimers();
 Bangle.loadWidgets();
 drawAll();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/gallifr/metadata.json b/apps/gallifr/metadata.json
index 9ce7d7f97..96fe243ed 100644
--- a/apps/gallifr/metadata.json
+++ b/apps/gallifr/metadata.json
@@ -2,7 +2,7 @@
   "id": "gallifr",
   "name": "Time Traveller's Chronometer",
   "shortName": "Time Travel Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A clock for time travellers. The light pie segment shows the minutes, the black circle, the hour. The dial itself reads 'time' just in case you forget.",
   "icon": "gallifr.png",
   "screenshots": [{"url":"screenshot_time.png"}],
diff --git a/apps/geissclk/ChangeLog b/apps/geissclk/ChangeLog
index 7458fadee..cd46173f7 100644
--- a/apps/geissclk/ChangeLog
+++ b/apps/geissclk/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: BTN2->launcher, use smaller text to allow "20:00" to fit on screen
 0.03: Changed setWatch to Bangle.setUI
+0.04: Tell clock widgets to hide.
diff --git a/apps/geissclk/clock.js b/apps/geissclk/clock.js
index f14ea5f39..5401fb142 100644
--- a/apps/geissclk/clock.js
+++ b/apps/geissclk/clock.js
@@ -142,11 +142,13 @@ Bangle.on('lcdPower',function(on) {
     animInterval = setInterval(iterate, 50);
   }
 });
-g.clear();
+
+// Show launcher when button pressed
+Bangle.setUI("clock");g.clear();
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 iterate();
 animInterval = setInterval(iterate, 50);
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/geissclk/metadata.json b/apps/geissclk/metadata.json
index 456854dbd..68bd2a970 100644
--- a/apps/geissclk/metadata.json
+++ b/apps/geissclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "geissclk",
   "name": "Geiss Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "7 segment clock with animated background in the style of Ryan Geiss' music visualisation. NOTE: The first run will take ~1 minute to do some precalculation",
   "icon": "clock.png",
   "type": "clock",
diff --git a/apps/glbasic/ChangeLog b/apps/glbasic/ChangeLog
index 89aee01f8..d97fd44d5 100644
--- a/apps/glbasic/ChangeLog
+++ b/apps/glbasic/ChangeLog
@@ -1,2 +1,3 @@
 0.20: New App!
+0.21: Tell clock widgets to hide.
 
diff --git a/apps/glbasic/glbasic.app.js b/apps/glbasic/glbasic.app.js
index ff7837ada..c1f82f74c 100644
--- a/apps/glbasic/glbasic.app.js
+++ b/apps/glbasic/glbasic.app.js
@@ -178,6 +178,8 @@ function draw() {
 ////////////////////////////////////////////////////
 // Bangle.setBarometerPower(true);
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
@@ -197,6 +199,5 @@ Bangle.on('lcdPower', on => {
     }
 });
 
-Bangle.setUI("clock");
 
 Bangle.drawWidgets();
diff --git a/apps/glbasic/metadata.json b/apps/glbasic/metadata.json
index 7c79097da..6d4c562a3 100644
--- a/apps/glbasic/metadata.json
+++ b/apps/glbasic/metadata.json
@@ -2,7 +2,7 @@
   "id": "glbasic",
   "name": "GLBasic Clock",
   "shortName": "GLBasic",
-  "version": "0.20",
+  "version": "0.21",
   "description": "A clock with large numbers",
   "dependencies": {"widpedom":"app"},
   "icon": "icon48.png",
diff --git a/apps/gpsautotime/settings.js b/apps/gpsautotime/settings.js
index be6e3bbec..34a6364fe 100644
--- a/apps/gpsautotime/settings.js
+++ b/apps/gpsautotime/settings.js
@@ -13,7 +13,7 @@
   E.showMenu({
     "" : { "title" : "GPS auto time" },
     "< Back" : () => back(),
-    'Show Widgets': {
+    'Show Widget': {
       value: !!settings.show,
       onchange: v => {
         settings.show = v;
diff --git a/apps/gpsautotime/widget.js b/apps/gpsautotime/widget.js
index a21c14619..14d6fe140 100644
--- a/apps/gpsautotime/widget.js
+++ b/apps/gpsautotime/widget.js
@@ -9,7 +9,7 @@
 	delete settings;
 
 	Bangle.on('GPS',function(fix) {
-		if (fix.fix) {
+		if (fix.fix && fix.time) {
 			var curTime = fix.time.getTime()/1000;
 			setTime(curTime);
 			lastTimeSet = curTime;
diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog
index b4eaf5472..840f9ecbc 100644
--- a/apps/gpsnav/ChangeLog
+++ b/apps/gpsnav/ChangeLog
@@ -3,4 +3,6 @@
 0.03: Add Waypoint Editor
 0.04: Fix great circle formula
 0.05: Use locale for speed and distance + fix Vector font sizes
-
+0.06: Move waypoints.json (and editor) to 'waypoints' app
+0.07: Add support for b2
+0.08: Fix not displaying of wpindex = 0, correct compass drawing and nm calculation on b2
diff --git a/apps/gpsnav/README.md b/apps/gpsnav/README.md
index af239b233..2b67799b8 100644
--- a/apps/gpsnav/README.md
+++ b/apps/gpsnav/README.md
@@ -4,9 +4,12 @@ The app is aimed at small boat navigation although it can also be used to mark t
 
 The app displays direction of travel (course), speed, direction to waypoint (bearing) and distance to waypoint. The screen shot below is before the app has got a GPS fix.
 
+[Bangle.js 2] Button mappings in brackests. One additional feature:  
+On swiping on the main screen you can change the displayed metrics: Right changes to nautical metrics, left to the default locale metrics.
+
 ![](first_screen.jpg)
 
-The large digits are the course and speed. The top of the display is a linear compass which displays the direction of travel when a fix is received and you are moving. The blue text is the name of the current waypoint. NONE means that there is no waypoint set and so bearing and distance will remain at 0. To select a waypoint, press BTN2 (middle) and wait for the blue text to turn white. Then use BTN1 and BTN3 to select a waypoint. The waypoint choice is fixed by pressing BTN2 again. In the screen shot below a waypoint giving the location of Stone Henge has been selected.
+The large digits are the course and speed. The top of the display is a linear compass which displays the direction of travel when a fix is received and you are moving. The blue text is the name of the current waypoint. NONE means that there is no waypoint set and so bearing and distance will remain at 0. To select a waypoint, press BTN2 (middle) [touch / BTN] and wait for the blue text to turn white. Then use BTN1 and BTN3 [swipe left/right] to select a waypoint. The waypoint choice is fixed by pressing BTN2 [touch / BTN] again. In the screen shot below a waypoint giving the location of Stone Henge has been selected.
 
 ![](waypoint_screen.jpg)
 
@@ -18,7 +21,7 @@ The app lets you mark your current location as follows. There are vacant slots i
 
 ![](select_screen.jpg)
 
-Bearing and distance are both zero as WP1 has currently no GPS location associated with it. To mark the location, press BTN2.
+Bearing and distance are both zero as WP1 has currently no GPS location associated with it. To mark the location, press BTN2 [touch / BTN].
 
 ![](marked_screen.jpg)
 
diff --git a/apps/gpsnav/app.js b/apps/gpsnav/app.js
index 8903e07fb..68bd2cbda 100644
--- a/apps/gpsnav/app.js
+++ b/apps/gpsnav/app.js
@@ -36,7 +36,7 @@ function drawCompass(course) {
     }
     xpos+=15;
   }
-  if (wpindex!=0) {
+  if (wpindex>=0) {
     var bpos = brg - course;
     if (bpos>180) bpos -=360;
     if (bpos<-180) bpos +=360;
@@ -51,10 +51,10 @@ function drawCompass(course) {
 
 //displayed heading
 var heading = 0;
-function newHeading(m,h){ 
+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>=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;
@@ -125,7 +125,7 @@ function drawN(){
   g.setColor(0,0,0);
   g.fillRect(10,230,60,239);
   g.setColor(1,1,1);
-  g.drawString("Sats " + satellites.toString(),10,230);     
+  g.drawString("Sats " + satellites.toString(),10,230);
 }
 
 var savedfix;
@@ -193,11 +193,11 @@ var SCREENACCESS = {
       },
       release:function(){
         this.withApp=true;
-        startdraw(); 
+        startdraw();
         setButtons();
       }
-} 
- 
+}
+
 Bangle.on('lcdPower',function(on) {
   if (!SCREENACCESS.withApp) return;
   if (on) {
@@ -207,7 +207,7 @@ Bangle.on('lcdPower',function(on) {
   }
 });
 
-var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"NONE"}];
+var waypoints = require("waypoints").load();
 wp=waypoints[0];
 
 function nextwp(inc){
@@ -220,10 +220,10 @@ function nextwp(inc){
 }
 
 function doselect(){
-  if (selected && wpindex!=0 && waypoints[wpindex].lat===undefined && savedfix.fix) {
+  if (selected && wpindex>=0 && waypoints[wpindex].lat===undefined && savedfix.fix) {
      waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon};
      wp = waypoints[wpindex];
-     require("Storage").writeJSON("waypoints.json", waypoints);
+     require("waypoints").save(waypoints);
   }
   selected=!selected;
   drawN();
diff --git a/apps/gpsnav/app.min.js b/apps/gpsnav/app.min.js
index 7771e2b98..a01b251e0 100644
--- a/apps/gpsnav/app.min.js
+++ b/apps/gpsnav/app.min.js
@@ -6,6 +6,6 @@ function drawN(){var a=loc.speed(speed);buf.setColor(1);buf.setFont("6x8",2);buf
 0,30);buf.setColor(selected?1:2);buf.drawString(wp.name,140,0);buf.setColor(1);buf.drawString(a,60,0);buf.drawString(loc.distance(dist),60,30);flip(buf,Yoff+130);g.setFont("6x8",1);g.setColor(0,0,0);g.fillRect(10,230,60,239);g.setColor(1,1,1);g.drawString("Sats "+satellites.toString(),10,230)}var savedfix;
 function onGPS(a){savedfix=a;void 0!==a&&(course=isNaN(a.course)?course:Math.round(a.course),speed=isNaN(a.speed)?speed:a.speed,satellites=a.satellites);candraw&&(void 0!==a&&1==a.fix&&(dist=distance(a,wp),isNaN(dist)&&(dist=0),brg=bearing(a,wp),isNaN(brg)&&(brg=0)),drawN())}var intervalRef;function stopdraw(){candraw=!1;intervalRef&&clearInterval(intervalRef)}
 function startTimers(){candraw=!0;intervalRefSec=setInterval(function(){heading=newHeading(course,heading);course!=heading&&drawCompass(heading)},200)}function drawAll(){g.setColor(1,.5,.5);g.fillPoly([120,Yoff+50,110,Yoff+70,130,Yoff+70]);g.setColor(1,1,1);drawN();drawCompass(heading)}function startdraw(){g.clear();Bangle.drawWidgets();startTimers();drawAll()}
-function setButtons(){setWatch(nextwp.bind(null,-1),BTN1,{repeat:!0,edge:"falling"});setWatch(doselect,BTN2,{repeat:!0,edge:"falling"});setWatch(nextwp.bind(null,1),BTN3,{repeat:!0,edge:"falling"})}var SCREENACCESS={withApp:!0,request:function(){this.withApp=!1;stopdraw();clearWatch()},release:function(){this.withApp=!0;startdraw();setButtons()}};Bangle.on("lcdPower",function(a){SCREENACCESS.withApp&&(a?startdraw():stopdraw())});var waypoints=require("Storage").readJSON("waypoints.json")||[{name:"NONE"}];
-wp=waypoints[0];function nextwp(a){selected&&(wpindex+=a,wpindex>=waypoints.length&&(wpindex=0),0>wpindex&&(wpindex=waypoints.length-1),wp=waypoints[wpindex],drawN())}function doselect(){selected&&0!=wpindex&&void 0===waypoints[wpindex].lat&&savedfix.fix&&(waypoints[wpindex]={name:"@"+wp.name,lat:savedfix.lat,lon:savedfix.lon},wp=waypoints[wpindex],require("Storage").writeJSON("waypoints.json",waypoints));selected=!selected;drawN()}g.clear();Bangle.setLCDBrightness(1);Bangle.loadWidgets();Bangle.drawWidgets();
+function setButtons(){setWatch(nextwp.bind(null,-1),BTN1,{repeat:!0,edge:"falling"});setWatch(doselect,BTN2,{repeat:!0,edge:"falling"});setWatch(nextwp.bind(null,1),BTN3,{repeat:!0,edge:"falling"})}var SCREENACCESS={withApp:!0,request:function(){this.withApp=!1;stopdraw();clearWatch()},release:function(){this.withApp=!0;startdraw();setButtons()}};Bangle.on("lcdPower",function(a){SCREENACCESS.withApp&&(a?startdraw():stopdraw())});var waypoints=require("waypoints").load();
+wp=waypoints[0];function nextwp(a){selected&&(wpindex+=a,wpindex>=waypoints.length&&(wpindex=0),0>wpindex&&(wpindex=waypoints.length-1),wp=waypoints[wpindex],drawN())}function doselect(){selected&&0!=wpindex&&void 0===waypoints[wpindex].lat&&savedfix.fix&&(waypoints[wpindex]={name:"@"+wp.name,lat:savedfix.lat,lon:savedfix.lon},wp=waypoints[wpindex],require("waypoints").save(waypoints));selected=!selected;drawN()}g.clear();Bangle.setLCDBrightness(1);Bangle.loadWidgets();Bangle.drawWidgets();
 Bangle.setGPSPower(1);drawAll();startTimers();Bangle.on("GPS",onGPS);setButtons();
diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js
new file mode 100644
index 000000000..ee6519c92
--- /dev/null
+++ b/apps/gpsnav/app_b2.js
@@ -0,0 +1,265 @@
+var candraw = true;
+var brg = 0;
+var wpindex = 0;
+var locindex = 0;
+const labels = ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
+var loc = {
+  speed: [
+    require("locale").speed,
+    (kph) => {
+      return (kph / 1.852).toFixed(1) + "kn ";
+    }
+  ],
+  distance: [
+    require("locale").distance,
+    (m) => {
+      return (m / 1852).toFixed(3) + "nm ";
+    }
+  ]
+};
+
+
+function drawCompass(course) {
+  if (!candraw) return;
+  g.reset().clearRect(0, 24, 175, 71);
+  g.setFont("Vector", 18);
+  var start = course - 90;
+  if (start < 0) start += 360;
+  g.fillRect(14, 67, 162, 71);
+  var xpos = 16;
+  var frag = 15 - start % 15;
+  if (frag < 15) xpos += Math.floor((frag * 4) / 5);
+  else frag = 0;
+  for (var i = frag; i <= 180 - frag; i += 15) {
+    var res = start + i;
+    if (res % 90 == 0) {
+      g.drawString(labels[Math.floor(res / 45) % 8], xpos - 6, 28);
+      g.fillRect(xpos - 2, 47, xpos + 2, 67);
+    } else if (res % 45 == 0) {
+      g.drawString(labels[Math.floor(res / 45) % 8], xpos - 9, 28);
+      g.fillRect(xpos - 2, 52, xpos + 2, 67);
+    } else if (res % 15 == 0) {
+      g.fillRect(xpos, 58, xpos + 1, 67);
+    }
+    xpos += 12;
+  }
+  if (wpindex >= 0) {
+    var bpos = brg - course;
+    if (bpos > 180) bpos -= 360;
+    if (bpos < -180) bpos += 360;
+    bpos = Math.round((bpos * 4) / 5) + 88;
+    if (bpos < 16) bpos = 7;
+    if (bpos > 160) bpos = 169;
+    g.setColor(g.theme.bgH);
+    g.fillCircle(bpos, 63, 8);
+  }
+}
+
+//displayed 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 course = 0;
+var speed = 0;
+var satellites = 0;
+var wp;
+var dist = 0;
+
+function radians(a) {
+  return a * Math.PI / 180;
+}
+
+function degrees(a) {
+  var d = a * 180 / Math.PI;
+  return (d + 360) % 360;
+}
+
+function bearing(a, b) {
+  var delta = radians(b.lon - a.lon);
+  var alat = radians(a.lat);
+  var blat = radians(b.lat);
+  var y = Math.sin(delta) * Math.cos(blat);
+  var x = Math.cos(alat) * Math.sin(blat) -
+    Math.sin(alat) * Math.cos(blat) * Math.cos(delta);
+  return Math.round(degrees(Math.atan2(y, x)));
+}
+
+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);
+  return Math.round(Math.sqrt(x * x + y * y) * 6371000);
+}
+
+var selected = false;
+
+function drawN() {
+  g.reset().clearRect(0, 89, 175, 175);
+  var txt = loc.speed[locindex](speed);
+  g.setFont("6x8", 2);
+  g.drawString("o", 68, 87);
+  g.setFont("6x8", 1);
+  g.drawString(txt.substring(txt.length - 3), 156, 119);
+  g.setFont("Vector", 36);
+  var cs = course.toString().padStart(3, "0");
+  g.drawString(cs, 2, 89);
+  g.drawString(txt.substring(0, txt.length - 3), 92, 89);
+  g.setFont("Vector", 18);
+  var bs = brg.toString().padStart(3, "0");
+  g.drawString("Brg:", 1, 128);
+  g.drawString("Dist:", 1, 148);
+  g.setColor(selected ? g.theme.bgH : g.theme.bg);
+  g.fillRect(90, 127, 175, 143);
+  g.setColor(selected ? g.theme.fgH : g.theme.fg);
+  g.drawString(wp.name, 92, 128);
+  g.setColor(g.theme.fg);
+  g.drawString(bs, 42, 128);
+  g.drawString(loc.distance[locindex](dist), 42, 148);
+  g.setFont("6x8", 0.5);
+  g.drawString("o", 75, 127);
+  g.setFont("6x8", 1);
+  g.setColor(satellites ? g.theme.bg : g.theme.bgH);
+  g.fillRect(0, 167, 75, 175);
+  g.setColor(satellites ? g.theme.fg : g.theme.fgH);
+  g.drawString("Sats:", 1, 168);
+  g.drawString(satellites.toString(), 42, 168);
+}
+
+var savedfix;
+
+function onGPS(fix) {
+  savedfix = fix;
+  if (fix !== undefined) {
+    course = isNaN(fix.course) ? course : Math.round(fix.course);
+    speed = isNaN(fix.speed) ? speed : fix.speed;
+    satellites = fix.satellites;
+  }
+  if (candraw) {
+    if (fix !== undefined && fix.fix == 1) {
+      dist = distance(fix, wp);
+      if (isNaN(dist)) dist = 0;
+      brg = bearing(fix, wp);
+      if (isNaN(brg)) brg = 0;
+    }
+    drawN();
+  }
+}
+
+var intervalRef;
+
+function stopdraw() {
+  candraw = false;
+  if (intervalRef) {
+    clearInterval(intervalRef);
+  }
+}
+
+function startTimers() {
+  candraw = true;
+  intervalRefSec = setInterval(function() {
+    heading = newHeading(course, heading);
+    if (course != heading) drawCompass(heading);
+  }, 200);
+}
+
+function drawAll() {
+  g.setColor(1, 0, 0);
+  g.fillPoly([88, 71, 78, 88, 98, 88]);
+  drawN();
+  drawCompass(heading);
+}
+
+function startdraw() {
+  g.clear();
+  Bangle.drawWidgets();
+  startTimers();
+  drawAll();
+}
+
+function setButtons() {
+  Bangle.setUI("leftright", btn => {
+    if (!btn) {
+      doselect();
+    } else {
+      nextwp(btn);
+    }
+  });
+}
+
+var SCREENACCESS = {
+  withApp: true,
+  request: function() {
+    this.withApp = false;
+    stopdraw();
+    clearWatch();
+  },
+  release: function() {
+    this.withApp = true;
+    startdraw();
+    setButtons();
+  }
+};
+
+Bangle.on('lcdPower', function(on) {
+  if (!SCREENACCESS.withApp) return;
+  if (on) {
+    startdraw();
+  } else {
+    stopdraw();
+  }
+});
+
+var waypoints = require("waypoints").load();
+wp = waypoints[0];
+
+function nextwp(inc) {
+  if (selected) {
+    wpindex += inc;
+    if (wpindex >= waypoints.length) wpindex = 0;
+    if (wpindex < 0) wpindex = waypoints.length - 1;
+    wp = waypoints[wpindex];
+    drawN();
+  } else {
+    locindex = inc > 0 ? 1 : 0;
+    drawN();
+  }
+}
+
+function doselect() {
+  if (selected && wpindex >= 0 && waypoints[wpindex].lat === undefined && savedfix.fix) {
+    waypoints[wpindex] = {
+      name: "@" + wp.name,
+      lat: savedfix.lat,
+      lon: savedfix.lon
+    };
+    wp = waypoints[wpindex];
+    require("waypoints").save(waypoints);
+  }
+  selected = !selected;
+  print("selected = " + selected);
+  drawN();
+}
+
+g.clear();
+Bangle.setLCDBrightness(1);
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+// load widgets can turn off GPS
+Bangle.setGPSPower(1);
+drawAll();
+startTimers();
+Bangle.on('GPS', onGPS);
+// Toggle selected
+setButtons();
diff --git a/apps/gpsnav/metadata.json b/apps/gpsnav/metadata.json
index 5c1830318..bc46a733c 100644
--- a/apps/gpsnav/metadata.json
+++ b/apps/gpsnav/metadata.json
@@ -1,16 +1,17 @@
 {
   "id": "gpsnav",
   "name": "GPS Navigation",
-  "version": "0.05",
+  "version": "0.08",
   "description": "Displays GPS Course and Speed, + Directions to waypoint and waypoint recording, now with waypoint editor",
+  "screenshots": [{"url":"screenshot-b2.png"}],
   "icon": "icon.png",
   "tags": "tool,outdoors,gps",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
-  "interface": "waypoints.html",
+  "dependencies" : { "waypoints":"type" },
   "storage": [
-    {"name":"gpsnav.app.js","url":"app.min.js"},
+    {"name":"gpsnav.app.js","url":"app.min.js","supports":["BANGLEJS"]},
+    {"name":"gpsnav.app.js","url":"app_b2.js","supports":["BANGLEJS2"]},
     {"name":"gpsnav.img","url":"app-icon.js","evaluate":true}
-  ],
-  "data": [{"name":"waypoints.json","url":"waypoints.json"}]
+  ]
 }
diff --git a/apps/gpsnav/screenshot-b2.png b/apps/gpsnav/screenshot-b2.png
new file mode 100644
index 000000000..34ad23679
Binary files /dev/null and b/apps/gpsnav/screenshot-b2.png differ
diff --git a/apps/gpsnav/waypoints.html b/apps/gpsnav/waypoints.html
deleted file mode 100644
index d02260732..000000000
--- a/apps/gpsnav/waypoints.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="../../css/spectre.min.css">
-    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
-  </head>
-  <body>
-
-    <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">
-        </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>
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_longtitude" placeholder="Long">
-        </div>
-      </div>
-      <div class="columns">
-        <div class="column col-3 col-xs-8">
-          <button id="add_name_button" class="btn btn-primary btn-sm">Add Name Only</button>
-        </div>
-        <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>
-    
-    <script src="../../core/lib/interface.js"></script>
-
-    <script>
-
-      var waypoints = []
-
-      var $name = document.getElementById('add_waypoint_name')
-      var $form = document.getElementById('add_waypoint_form')
-      var $button = document.getElementById('add_waypoint_button')
-      var $name_button = document.getElementById('add_name_button')
-      var $latitude = document.getElementById('add_latitude')
-      var $longtitude = document.getElementById('add_longtitude')
-      var $list = document.getElementById('waypoints')
-
-      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;
-        }
-
-      $button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-        var lat = parseFloat($latitude.value).toPrecision(5);
-        var lon = parseFloat($longtitude.value).toPrecision(5);
-
-        waypoints.push({
-          name, lat,lon,
-        });
-        
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = (0).toPrecision(5);
-        $longtitude.value = (0).toPrecision(5);
-      });
-
-      $name_button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-
-        waypoints.push({
-          name
-        });
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = 0.0000
-        $longtitude.value = 0.0000
-      });
-
-
-      function removeWaypoint(index){
-        $name.value = waypoints[index].name
-        $latitude.value = waypoints[index].lat
-        $longtitude.value = waypoints[index].lon
-        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()    
-      }
-
-      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);
-        });
-      }
-
-      function uploadFile(fileid, contents) {      
-        Puck.write(`\x10(function() {
-          require("Storage").write("${fileid}",'${contents}');
-          Bluetooth.print("OK");
-         })()\n`,ret=>{
-            console.log("uploadFile",ret);
-        });
-      }
-
-      function gotStored(pts){
-          waypoints = pts;
-          renderWaypoints();
-      }
-
-      function onInit() {
-         downloadJSONfile("waypoints.json", gotStored);
-      }
-
-      document.getElementById("Download").addEventListener("click", function() {
-        downloadJSONfile("waypoints.json", gotStored);
-      });
-
-      document.getElementById("Upload").addEventListener("click", function() {
-        var data =  JSON.stringify(waypoints);
-        uploadFile("waypoints.json",data); 
-      });
-    </script>
-  </body>
-</html>
diff --git a/apps/gpsnav/waypoints.json b/apps/gpsnav/waypoints.json
deleted file mode 100644
index 98a670c0d..000000000
--- a/apps/gpsnav/waypoints.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-  "name":"NONE"
-  },
-  {
-  "name":"No10",
-  "lat":51.5032,
-  "lon":-0.1269
-  },
-  {
-  "name":"Stone",
-  "lat":51.1788,
-  "lon":-1.8260
-  },
-  { "name":"WP0" },
-  { "name":"WP1" },
-  { "name":"WP2" },
-  { "name":"WP3" },
-  { "name":"WP4" }
-]
\ No newline at end of file
diff --git a/apps/gpstrek/ChangeLog b/apps/gpstrek/ChangeLog
new file mode 100644
index 000000000..d46ada767
--- /dev/null
+++ b/apps/gpstrek/ChangeLog
@@ -0,0 +1,10 @@
+0.01: New App!
+0.02: Make selection of background activity more explicit
+0.03: Fix listener for accel always active
+      Use custom UI with swipes instead of leftright
+0.04: Fix compass heading
+0.05: Added adjustment for Bangle.js magnetometer heading fix
+0.06: Fix waypoint menu always selecting last waypoint
+      Fix widget adding listeners more than once
+0.07: Show checkered flag for target markers
+      Single waypoints are now shown in the compass view
diff --git a/apps/gpstrek/README.md b/apps/gpstrek/README.md
new file mode 100644
index 000000000..c55f5a8bf
--- /dev/null
+++ b/apps/gpstrek/README.md
@@ -0,0 +1,50 @@
+# GPS Trekking
+
+Helper for tracking the status/progress during hiking. Do NOT depend on this for navigation!
+
+This app is inspired by and uses code from "GPS Navigation" and "Navigation compass".
+
+## Usage
+
+Tapping or button to switch to the next information display, swipe right for the menu.
+
+Choose either a route or a waypoint as basis for the display.
+
+After this selection and availability of a GPS fix the compass will show a checkered flag for your destination and a green dot for possibly available waypoints on the way.
+Waypoints are shown with name if available and distance to waypoint.
+
+As long as no GPS signal is available the compass shows the heading from the build in magnetometer. When a GPS fix becomes available, the compass display shows the GPS course. This can be differentiated by the display of bubble levels on top and sides of the compass.
+If they are on display, the source is the magnetometer and you should keep the bangle level. There is currently no tilt compensation for the compass display.
+
+### Route
+
+Routes can be created from .gpx files containing "trkpt" elements with this script: [createRoute.sh](createRoute.sh)
+
+The resulting file needs to be uploaded to the watch and will be shown in the file selection menu.
+
+The route can be mirrored to switch start and destination.
+
+If the GPS position is closer than 30m to the next waypoint, the route is automatically advanced to the next waypoint.
+
+### Waypoints
+
+You can select a waypoint from the "Waypoints" app as destination.
+
+## Calibration
+
+### Altitude
+
+You can correct the barometric altitude display either by manually setting a known correct value or using the GPS fix elevation as reference. This will only affect the display of altitude values.
+
+### Compass
+
+If the compass fallback starts to show unreliable values, you can reset the calibration in the menu. It starts to show values again after turning 360°.
+
+## Widget
+
+The widget keeps the sensors alive and records some very basic statistics when the app is not started. It shows as the app icon in the widget bar when the background task is active.
+This uses a lot of power so ensure to stop the app if you are not actively using it. 
+
+# Creator
+
+[halemmerich](https://github.com/halemmerich)
diff --git a/apps/gpstrek/app-icon.js b/apps/gpstrek/app-icon.js
new file mode 100644
index 000000000..6b2924353
--- /dev/null
+++ b/apps/gpstrek/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwIjggOAApMD4AFJg4FF8AFJh/wApMf/AFJn/8ApN//wFDvfeAof774FD+fPLwYFBMAUB8fHAoUDAoJaCgfD4YFIg+D4JgCAosPAoJgCh6DBAoUfAoJgCjwFBvAFBnwFBvgFBngFBngFBvh3BnwFBvH//8eMgQFBMwX//k//5eB//wh//wAFBAQcDRoU/4EDJQfAbYbfFACYA="))
diff --git a/apps/gpstrek/app.js b/apps/gpstrek/app.js
new file mode 100644
index 000000000..f26811ed3
--- /dev/null
+++ b/apps/gpstrek/app.js
@@ -0,0 +1,857 @@
+const STORAGE = require("Storage");
+const showWidgets = true;
+let numberOfSlices=4;
+
+if (showWidgets){
+  Bangle.loadWidgets();
+}
+
+let state = WIDGETS.gpstrek.getState();
+WIDGETS.gpstrek.start(false);
+
+function parseNumber(toParse){
+  if (toParse.includes(".")) return parseFloat(toParse);
+  return parseFloat("" + toParse + ".0");
+}
+
+function parseWaypoint(filename, offset, result){
+  result.lat = parseNumber(STORAGE.read(filename, offset, 11));
+  result.lon = parseNumber(STORAGE.read(filename, offset += 11, 12));
+  return offset + 12;
+}
+
+function parseWaypointWithElevation(filename, offset, result){
+  offset = parseWaypoint(filename, offset, result);
+  result.alt = parseNumber(STORAGE.read(filename, offset, 6));
+  return offset + 6;
+}
+
+function parseWaypointWithName(filename, offset, result){
+  offset = parseWaypoint(filename, offset, result);
+  return parseName(filename, offset, result);
+}
+
+function parseName(filename, offset, result){
+  let nameLength = STORAGE.read(filename, offset, 2) - 0;
+  result.name = STORAGE.read(filename, offset += 2, nameLength);
+  return offset + nameLength;
+}
+
+function parseWaypointWithElevationAndName(filename, offset, result){
+  offset = parseWaypointWithElevation(filename, offset, result);
+  return parseName(filename, offset, result);
+}
+
+function getEntry(filename, offset, result){
+  result.fileOffset = offset;
+  let type = STORAGE.read(filename, offset++, 1);
+  if (type == "") return -1;
+  switch (type){
+    case "A":
+      offset = parseWaypoint(filename, offset, result);
+      break;
+    case "B":
+      offset = parseWaypointWithName(filename, offset, result);
+      break;
+    case "C":
+      offset = parseWaypointWithElevation(filename, offset, result);
+      break;
+    case "D":
+      offset = parseWaypointWithElevationAndName(filename, offset, result);
+      break;
+    default:
+      print("Unknown entry type", type);
+      return -1;
+  }
+  offset++;
+
+  result.fileLength = offset - result.fileOffset;
+  //print(result);
+  return offset;
+}
+
+const labels = ["N","NE","E","SE","S","SW","W","NW"];
+const loc = require("locale");
+
+function matchFontSize(graphics, text, height, width){
+  graphics.setFontVector(height);
+  let metrics;
+  let size = 1;
+  while (graphics.stringMetrics(text).width > 0.90 * width){
+    size -= 0.05;
+    graphics.setFont("Vector",Math.floor(height*size));
+  }
+}
+
+function getDoubleLineSlice(title1,title2,provider1,provider2,refreshTime){
+  let lastDrawn = Date.now() - Math.random()*refreshTime;
+  return {
+    refresh: function (){
+      return Date.now() - lastDrawn > (Bangle.isLocked()?(refreshTime?refreshTime:5000):(refreshTime?refreshTime*2:10000));
+    },
+    draw: function (graphics, x, y, height, width){
+      lastDrawn = Date.now();
+      if (typeof title1 == "function") title1 = title1();
+      if (typeof title2 == "function") title2 = title2();
+      graphics.clearRect(x,y,x+width,y+height);
+
+      let value = provider1();
+      matchFontSize(graphics, title1 + value, Math.floor(height*0.5), width);
+      graphics.setFontAlign(-1,-1);
+      graphics.drawString(title1, x+2, y);
+      graphics.setFontAlign(1,-1);
+      graphics.drawString(value, x+width, y);
+
+      value = provider2();
+      matchFontSize(graphics, title2 + value, Math.floor(height*0.5), width);
+      graphics.setFontAlign(-1,-1);
+      graphics.drawString(title2, x+2, y+(height*0.5));
+      graphics.setFontAlign(1,-1);
+      graphics.drawString(value, x+width, y+(height*0.5));
+    }
+  };
+}
+
+function getTargetSlice(targetDataSource){
+  let nameIndex = 0;
+  let lastDrawn = Date.now() - Math.random()*3000;
+  return {
+    refresh: function (){
+      return Date.now() - lastDrawn > (Bangle.isLocked()?10000:3000);
+    },
+    draw: function (graphics, x, y, height, width){
+      lastDrawn = Date.now();
+      graphics.clearRect(x,y,x+width,y+height);
+      if (targetDataSource.icon){
+        graphics.drawImage(targetDataSource.icon,x,y + (height - 16)/2);
+        x += 16;
+        width -= 16;
+      }
+
+      if (!targetDataSource.getTarget() || !targetDataSource.getStart()) return;
+
+      let dist = distance(targetDataSource.getStart(),targetDataSource.getTarget());
+      if (isNaN(dist)) dist = Infinity;
+      let bearingString = bearing(targetDataSource.getStart(),targetDataSource.getTarget()) + "°";
+      if (targetDataSource.getTarget().name) {
+        graphics.setFont("Vector",Math.floor(height*0.5));
+        let scrolledName = (targetDataSource.getTarget().name || "").substring(nameIndex);
+        if (graphics.stringMetrics(scrolledName).width > width){
+          nameIndex++;
+        } else {
+          nameIndex = 0;
+        }
+        graphics.drawString(scrolledName, x+2, y);
+
+        let distanceString = loc.distance(dist,2);
+        matchFontSize(graphics, distanceString + bearingString, height*0.5, width);
+        graphics.drawString(bearingString, x+2, y+(height*0.5));
+        graphics.setFontAlign(1,-1);
+        graphics.drawString(distanceString, x + width, y+(height*0.5));
+      } else {
+        graphics.setFont("Vector",Math.floor(height*1));
+        let bearingString = bearing(targetDataSource.getStart(),targetDataSource.getTarget()) + "°";
+        let formattedDist = loc.distance(dist,2);
+        let distNum = (formattedDist.match(/[0-9\.]+/) || [Infinity])[0];
+        let size = 0.8;
+        let distNumMetrics;
+        while (graphics.stringMetrics(bearingString).width + (distNumMetrics = graphics.stringMetrics(distNum)).width > 0.90 * width){
+          size -= 0.05;
+          graphics.setFont("Vector",Math.floor(height*size));
+        }
+        graphics.drawString(bearingString, x+2, y + (height - distNumMetrics.height)/2);
+        graphics.setFontAlign(1,-1);
+        graphics.drawString(distNum, x + width, y + (height - distNumMetrics.height)/2);
+        graphics.setFont("Vector",Math.floor(height*0.25));
+
+        graphics.setFontAlign(-1,1);
+        if (targetDataSource.getProgress){
+          graphics.drawString(targetDataSource.getProgress(), x + 2, y + height);
+        }
+        graphics.setFontAlign(1,1);
+        if (!isNaN(distNum) && distNum != Infinity)
+          graphics.drawString(formattedDist.match(/[a-zA-Z]+/), x + width, y + height);
+      }
+    }
+  };
+}
+
+function drawCompass(graphics, x, y, height, width, increment, start){
+  graphics.setFont12x20();
+  graphics.setFontAlign(0,-1);
+  graphics.setColor(graphics.theme.fg);
+  let frag = 0 - start%15;
+  if (frag>0) frag = 0;
+  let xpos = 0 + frag*increment;
+  for (let i=start;i<=720;i+=15){
+    var res = i + frag;
+    if (res%90==0) {
+      graphics.drawString(labels[Math.floor(res/45)%8],xpos,y+2);
+      graphics.fillRect(xpos-2,Math.floor(y+height*0.6),xpos+2,Math.floor(y+height));
+    } else if (res%45==0) {
+      graphics.drawString(labels[Math.floor(res/45)%8],xpos,y+2);
+      graphics.fillRect(xpos-2,Math.floor(y+height*0.75),xpos+2,Math.floor(y+height));
+    } else if (res%15==0) {
+      graphics.fillRect(xpos,Math.floor(y+height*0.9),xpos+1,Math.floor(y+height));
+    }
+    xpos+=increment*15;
+    if (xpos > width + 20) break;
+  }
+}
+
+function getCompassSlice(compassDataSource){
+  let lastDrawn = Date.now() - Math.random()*2000;
+  const buffers = 4;
+  let buf = [];
+  return {
+    refresh : function (){return Bangle.isLocked()?(Date.now() - lastDrawn > 2000):true;},
+    draw: function (graphics, x,y,height,width){
+      lastDrawn = Date.now();
+      const max = 180;
+      const increment=width/max;
+
+      graphics.clearRect(x,y,x+width,y+height);
+
+      var start = compassDataSource.getCourse() - 90;
+      if (isNaN(compassDataSource.getCourse())) start = -90;
+      if (start<0) start+=360;
+      start = start % 360;
+
+      if (state.acc && compassDataSource.getCourseType() == "MAG"){
+        drawCompass(graphics,0,y+width*0.05,height-width*0.05,width,increment,start);
+      } else {
+        drawCompass(graphics,0,y,height,width,increment,start);
+      }
+
+
+      if (compassDataSource.getPoints){
+        for (let p of compassDataSource.getPoints()){
+          var bpos = p.bearing - compassDataSource.getCourse();
+          if (bpos>180) bpos -=360;
+          if (bpos<-180) bpos +=360;
+          bpos+=120;
+          let min = 0;
+          let max = 180;
+          if (bpos<=min){
+            bpos = Math.floor(width*0.05);
+          } else if (bpos>=max) {
+            bpos = Math.ceil(width*0.95);
+          } else {
+            bpos=Math.round(bpos*increment);
+          }
+          if (p.color){
+            graphics.setColor(p.color);
+          }
+          if (p.icon){
+            graphics.drawImage(p.icon, bpos,y+height-12, {rotate:0,scale:2});
+          } else {
+            graphics.fillCircle(bpos,y+height-12,Math.floor(width*0.03));
+          }
+        }
+      }
+      if (compassDataSource.getMarkers){
+        for (let m of compassDataSource.getMarkers()){
+          g.setColor(m.fillcolor);
+          let mpos = m.xpos * width;
+          if (m.xpos < 0.05) mpos = Math.floor(width*0.05);
+          if (m.xpos > 0.95) mpos = Math.ceil(width*0.95);
+          g.fillPoly(triangle(mpos,y+height-m.height, m.height, m.width));
+          g.setColor(m.linecolor);
+          g.drawPoly(triangle(mpos,y+height-m.height, m.height, m.width),true);
+        }
+      }
+      graphics.setColor(g.theme.fg);
+      graphics.fillRect(x,y,Math.floor(width*0.05),y+height);
+      graphics.fillRect(Math.ceil(width*0.95),y,width,y+height);
+      if (state.acc && compassDataSource.getCourseType() == "MAG") {
+        let xh = E.clip(width*0.5-height/2+(((state.acc.x+1)/2)*height),width*0.5 - height/2, width*0.5 + height/2);
+        let yh = E.clip(y+(((state.acc.y+1)/2)*height),y,y+height);
+
+        graphics.fillRect(width*0.5 - height/2, y, width*0.5 + height/2, y + Math.floor(width*0.05));
+
+        graphics.setColor(g.theme.bg);
+        graphics.drawLine(width*0.5 - 5, y, width*0.5 - 5, y + Math.floor(width*0.05));
+        graphics.drawLine(width*0.5 + 5, y, width*0.5 + 5, y + Math.floor(width*0.05));
+        graphics.fillRect(xh-1,y,xh+1,y+Math.floor(width*0.05));
+
+        let left = Math.floor(width*0.05);
+        let right = Math.ceil(width*0.95);
+        graphics.drawLine(0,y+height/2-5,left,y+height/2-5);
+        graphics.drawLine(right,y+height/2-5,x+width,y+height/2-5);
+        graphics.drawLine(0,y+height/2+5,left,y+height/2+5);
+        graphics.drawLine(right,y+height/2+5,x+width,y+height/2+5);
+        graphics.fillRect(0,yh-1,left,yh+1);
+        graphics.fillRect(right,yh-1,x+width,yh+1);
+      }
+      graphics.setColor(g.theme.fg);
+      graphics.drawRect(Math.floor(width*0.05),y,Math.ceil(width*0.95),y+height);
+    }
+  };
+}
+
+function radians(a) {
+  return a*Math.PI/180;
+}
+
+function degrees(a) {
+  var d = a*180/Math.PI;
+  return (d+360)%360;
+}
+
+function bearing(a,b){
+  if (!a || !b || !a.lon || !a.lat || !b.lon || !b.lat) return Infinity;
+  var delta = radians(b.lon-a.lon);
+  var alat = radians(a.lat);
+  var blat = radians(b.lat);
+  var y = Math.sin(delta) * Math.cos(blat);
+  var x = Math.cos(alat)*Math.sin(blat) -
+        Math.sin(alat)*Math.cos(blat)*Math.cos(delta);
+  return Math.round(degrees(Math.atan2(y, x)));
+}
+
+function distance(a,b){
+  if (!a || !b || !a.lon || !a.lat || !b.lon || !b.lat) return Infinity;
+  var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2));
+  var y = radians(b.lat-a.lat);
+  return Math.round(Math.sqrt(x*x + y*y) * 6371000);
+}
+
+function triangle (x, y, width, height){
+  return  [
+    Math.round(x),Math.round(y),
+    Math.round(x+width * 0.5), Math.round(y+height),
+    Math.round(x-width * 0.5), Math.round(y+height)
+  ];
+}
+
+function onSwipe(dir){
+  if (dir < 0) {
+    nextScreen();
+  } else if (dir > 0) {
+    switchMenu();
+  } else {
+    nextScreen();
+  }
+}
+
+function setButtons(){
+  let options = {
+    mode: "custom",
+    swipe: onSwipe,
+    btn: nextScreen,
+    touch: nextScreen
+  };
+  Bangle.setUI(options);
+}
+
+function getApproxFileSize(name){
+  let currentStart = STORAGE.getStats().totalBytes;
+  let currentSize = 0;
+  for (let i = currentStart; i > 500; i/=2){
+    let currentDiff = i;
+    //print("Searching", currentDiff);
+    while (STORAGE.read(name, currentSize+currentDiff, 1) == ""){
+      //print("Loop", currentDiff);
+      currentDiff = Math.ceil(currentDiff/2);
+    }
+    i = currentDiff*2;
+    currentSize += currentDiff;
+  }
+  return currentSize;
+}
+
+function parseRouteData(filename, progressMonitor){
+  let routeInfo = {};
+
+  routeInfo.filename = filename;
+  routeInfo.refs = [];
+
+  let c = {};
+  let scanOffset = 0;
+  routeInfo.length = 0;
+  routeInfo.count = 0;
+  routeInfo.mirror = false;
+  let lastSeenWaypoint;
+  let lastSeenAlt;
+  let waypoint = {};
+
+  routeInfo.up = 0;
+  routeInfo.down = 0;
+  
+  let size = getApproxFileSize(filename);
+
+  while ((scanOffset = getEntry(filename, scanOffset, waypoint)) > 0) {
+    if (routeInfo.count % 5 == 0) progressMonitor(scanOffset, "Loading", size);
+    if (lastSeenWaypoint){
+      routeInfo.length += distance(lastSeenWaypoint, waypoint);
+
+      let diff = waypoint.alt - lastSeenAlt;
+      //print("Distance", routeInfo.length, "alt", lastSeenAlt, waypoint.alt, diff);   
+      if (waypoint.alt && lastSeenAlt && diff > 3){
+        if (lastSeenAlt < waypoint.alt){
+          //print("Up", diff);
+          routeInfo.up += diff;
+        } else {
+          //print("Down", diff);
+          routeInfo.down += diff;
+        }
+      }
+    }
+    routeInfo.count++;
+    routeInfo.refs.push(waypoint.fileOffset);
+    lastSeenWaypoint = waypoint;
+    if (!isNaN(waypoint.alt)) lastSeenAlt = waypoint.alt;
+    waypoint = {};
+  }
+
+  set(routeInfo, 0);
+  return routeInfo;
+}
+
+function hasPrev(route){
+  if (route.mirror) return route.index < (route.count - 1);
+  return route.index > 0;
+}
+
+function hasNext(route){
+  if (route.mirror) return route.index > 0;
+  return route.index < (route.count - 1);
+}
+
+function next(route){
+  if (!hasNext(route)) return;
+  if (route.mirror) set(route, --route.index);
+  if (!route.mirror) set(route, ++route.index);
+}
+
+function set(route, index){
+  route.currentWaypoint = {};
+  route.index = index;
+  getEntry(route.filename, route.refs[index], route.currentWaypoint);
+}
+
+function prev(route){
+  if (!hasPrev(route)) return;
+  if (route.mirror) set(route, ++route.index);
+  if (!route.mirror) set(route, --route.index);
+}
+
+let lastMirror;
+let cachedLast;
+
+function getLast(route){
+  let wp = {};
+  if (lastMirror != route.mirror){
+    if (route.mirror) getEntry(route.filename, route.refs[0], wp);
+    if (!route.mirror) getEntry(route.filename, route.refs[route.count - 1], wp);
+    lastMirror = route.mirror;
+    cachedLast = wp;
+  }
+  return cachedLast;
+}
+
+function removeMenu(){
+  E.showMenu();
+  switchNav();
+}
+
+function showProgress(progress, title, max){
+  //print("Progress",progress,max)
+  let message = title? title: "Loading";
+  if (max){
+    message += " " + E.clip((progress/max*100),0,100).toFixed(0) +"%";
+  } else {
+    let dots = progress % 4;
+    for (let i = 0; i < dots; i++) message += ".";
+    for (let i = dots; i < 4; i++) message += " ";
+  }
+  E.showMessage(message);
+}
+
+function handleLoading(c){
+  E.showMenu();
+  state.route = parseRouteData(c, showProgress);
+  state.waypoint = null;
+  removeMenu();
+  state.route.mirror = false;
+}
+
+function showRouteSelector (){
+  var menu = {
+    "" : {
+      back : showRouteMenu,
+    }
+  };
+
+  STORAGE.list(/\.trf$/).forEach((file)=>{
+     menu[file] = ()=>{handleLoading(file);};
+  });
+
+  E.showMenu(menu);
+}
+
+function showRouteMenu(){
+  var menu = {
+    "" : {
+      "title" : "Route",
+      back : showMenu,
+    },
+    "Select file" : showRouteSelector
+  };
+
+  if (state.route){
+    menu.Mirror = {
+      value: state && state.route && !!state.route.mirror || false,
+      onchange: v=>{
+        state.route.mirror = v;
+      }
+    };
+    menu['Select closest waypoint'] = function () {
+      if (state.currentPos && state.currentPos.lat){
+        setClosestWaypoint(state.route, null, showProgress); removeMenu();
+      } else {
+        E.showAlert("No position").then(()=>{E.showMenu(menu);});
+      }
+    };
+    menu['Select closest waypoint (not visited)'] = function () {
+      if (state.currentPos && state.currentPos.lat){
+        setClosestWaypoint(state.route, state.route.index, showProgress); removeMenu();
+      } else {
+        E.showAlert("No position").then(()=>{E.showMenu(menu);});
+      }
+    };
+    menu['Select waypoint'] = {
+      value : state.route.index,
+      min:1,max:state.route.count,step:1,
+      onchange : v => { set(state.route, v-1); }
+    };
+    menu['Select waypoint as current position'] = function (){
+      state.currentPos.lat = state.route.currentWaypoint.lat;
+      state.currentPos.lon = state.route.currentWaypoint.lon;
+      state.currentPos.alt = state.route.currentWaypoint.alt;
+      removeMenu();
+    };
+  }
+
+  if (state.route && hasPrev(state.route))
+    menu['Previous waypoint'] = function() { prev(state.route); removeMenu(); };
+  if (state.route && hasNext(state.route))
+    menu['Next waypoint'] = function() { next(state.route); removeMenu(); };
+  E.showMenu(menu);
+}
+
+function showWaypointSelector(){
+  let waypoints = require("waypoints").load();
+  var menu = {
+    "" : {
+      back : showWaypointMenu,
+    }
+  };
+
+  waypoints.forEach((wp,c)=>{
+    menu[waypoints[c].name] = function (){
+      state.waypoint = waypoints[c];
+      state.waypointIndex = c;
+      state.route = null;
+      removeMenu();
+    };
+  });
+
+  E.showMenu(menu);
+}
+
+function showCalibrationMenu(){
+  let menu = {
+    "" : {
+      "title" : "Calibration",
+      back : showMenu,
+    },
+    "Barometer (GPS)" : ()=>{
+      if (!state.currentPos || isNaN(state.currentPos.alt)){
+        E.showAlert("No GPS altitude").then(()=>{E.showMenu(menu);});
+      } else {
+        state.calibAltDiff = state.altitude - state.currentPos.alt;
+        E.showAlert("Calibrated Altitude Difference: " + state.calibAltDiff.toFixed(0)).then(()=>{removeMenu();});
+      }
+    },
+    "Barometer (Manual)" : {
+      value : Math.round(state.currentPos && (state.currentPos.alt != undefined && !isNaN(state.currentPos.alt)) ? state.currentPos.alt: state.altitude),
+      min:-2000,max: 10000,step:1,
+      onchange : v => { state.calibAltDiff = state.altitude - v; }
+    },
+    "Reset Compass" : ()=>{ Bangle.resetCompass(); removeMenu();},
+  };
+  E.showMenu(menu);
+}
+
+function showWaypointMenu(){
+  let menu = {
+    "" : {
+      "title" : "Waypoint",
+      back : showMenu,
+    },
+    "Select waypoint" : showWaypointSelector,
+  };
+  E.showMenu(menu);
+}
+
+function showBackgroundMenu(){
+  let menu = {
+    "" : {
+      "title" : "Background",
+      back : showMenu,
+    },
+    "Start" : ()=>{ E.showPrompt("Start?").then((v)=>{ if (v) {WIDGETS.gpstrek.start(true); removeMenu();} else {showMenu();}}).catch(()=>{E.showMenu(mainmenu);});},
+    "Stop" : ()=>{ E.showPrompt("Stop?").then((v)=>{ if (v) {WIDGETS.gpstrek.stop(true); removeMenu();} else {showMenu();}}).catch(()=>{E.showMenu(mainmenu);});},
+  };
+  E.showMenu(menu);
+}
+
+function showMenu(){
+  var mainmenu = {
+    "" : {
+      "title" : "Main",
+      back : removeMenu,
+    },
+    "Route" : showRouteMenu,
+    "Waypoint" : showWaypointMenu,
+    "Background" : showBackgroundMenu,
+    "Calibration": showCalibrationMenu,
+    "Reset" : ()=>{ E.showPrompt("Do Reset?").then((v)=>{ if (v) {WIDGETS.gpstrek.resetState(); removeMenu();} else {E.showMenu(mainmenu);}});},
+    "Info rows" : {
+      value : numberOfSlices,
+      min:1,max:6,step:1,
+      onchange : v => { setNumberOfSlices(v); }
+    },
+  };
+
+  E.showMenu(mainmenu);
+}
+
+let scheduleDraw = true;
+
+function switchMenu(){
+    screen = 0;
+    scheduleDraw = false;
+    showMenu();
+}
+
+function drawInTimeout(){
+  setTimeout(()=>{
+    draw();
+    if (scheduleDraw)
+      setTimeout(drawInTimeout, 0);
+  },0);
+}
+
+function switchNav(){
+  if (!screen) screen = 1;
+  setButtons();
+  scheduleDraw = true;
+  drawInTimeout();
+}
+
+function nextScreen(){
+  screen++;
+  if (screen > maxScreens){
+    screen = 1;
+  }
+}
+
+function setClosestWaypoint(route, startindex, progress){
+  if (startindex >= state.route.count) startindex = state.route.count - 1;
+  if (!state.currentPos.lat){
+    set(route, startindex);
+    return;
+  }
+  let minDist = 100000000000000;
+  let minIndex = 0;
+  for (let i = startindex?startindex:0; i < route.count - 1; i++){
+    if (progress && (i % 5 == 0)) progress(i-(startindex?startindex:0), "Searching", route.count);
+    let wp = {};
+    getEntry(route.filename, route.refs[i], wp);
+    let curDist = distance(state.currentPos, wp);
+    if (curDist < minDist){
+      minDist = curDist;
+      minIndex = i;
+    } else {
+      if (startindex) break;
+    }
+  }
+  set(route, minIndex);
+}
+
+let screen = 1;
+
+const finishIcon = atob("CggB//meZmeZ+Z5n/w==");
+
+const compassSliceData = {
+  getCourseType: function(){
+    return (state.currentPos && state.currentPos.course) ? "GPS" : "MAG";
+  },
+  getCourse: function (){
+    if(compassSliceData.getCourseType() == "GPS") return state.currentPos.course;
+    return state.compassHeading?state.compassHeading:undefined;
+  },
+  getPoints: function (){
+    let points = [];
+    if (state.currentPos && state.currentPos.lon && state.route && state.route.currentWaypoint){
+      points.push({bearing:bearing(state.currentPos, state.route.currentWaypoint), color:"#0f0"});
+    }
+    if (state.currentPos && state.currentPos.lon && state.route){
+      points.push({bearing:bearing(state.currentPos, getLast(state.route)), icon: finishIcon});
+    }
+    if (state.currentPos && state.currentPos.lon && state.waypoint){
+      points.push({bearing:bearing(state.currentPos, state.waypoint), icon: finishIcon});
+    }
+    return points;
+  },
+  getMarkers: function (){
+    return [{xpos:0.5, width:10, height:10, linecolor:g.theme.fg, fillcolor:"#f00"}];
+  }
+};
+
+const waypointData = {
+  icon: atob("EBCBAAAAAAAAAAAAcIB+zg/uAe4AwACAAAAAAAAAAAAAAAAA"),
+  getProgress: function() {
+    return (state.route.index + 1) + "/" + state.route.count;
+  },
+  getTarget: function (){
+    if (distance(state.currentPos,state.route.currentWaypoint) < 30 && hasNext(state.route)){
+      next(state.route);
+      Bangle.buzz(1000);
+    }
+    return state.route.currentWaypoint;
+  },
+  getStart: function (){
+    return state.currentPos;
+  }
+};
+
+const finishData = {
+  icon: atob("EBABAAA/4DmgJmAmYDmgOaAmYD/gMAAwADAAMAAwAAAAAAA="),
+  getTarget: function (){
+    if (state.route) return getLast(state.route);
+    if (state.waypoint) return state.waypoint;
+  },
+  getStart: function (){
+    return state.currentPos;
+  }
+};
+
+let sliceHeight;
+function setNumberOfSlices(number){
+  numberOfSlices = number;
+  sliceHeight = Math.floor((g.getHeight()-(showWidgets?24:0))/numberOfSlices);
+}
+
+let slices = [];
+let maxScreens = 1;
+setNumberOfSlices(3);
+
+let compassSlice = getCompassSlice(compassSliceData);
+let waypointSlice = getTargetSlice(waypointData);
+let finishSlice = getTargetSlice(finishData);
+let eleSlice = getDoubleLineSlice("Up","Down",()=>{
+  return loc.distance(state.up,3) + "/" + (state.route ? loc.distance(state.route.up,3):"---");
+},()=>{
+  return loc.distance(state.down,3) + "/" + (state.route ? loc.distance(state.route.down,3): "---");
+});
+
+let statusSlice = getDoubleLineSlice("Speed","Alt",()=>{
+  let speed = 0;
+  if (state.currentPos && state.currentPos.speed) speed = state.currentPos.speed;
+  return loc.speed(speed,2);
+},()=>{
+  let alt = Infinity;
+  if (!isNaN(state.altitude)){
+    alt = isNaN(state.calibAltDiff) ? state.altitude : (state.altitude - state.calibAltDiff);
+  }
+  if (state.currentPos && state.currentPos.alt) alt = state.currentPos.alt;
+  return loc.distance(alt,3);
+});
+
+let status2Slice = getDoubleLineSlice("Compass","GPS",()=>{
+  return (state.compassHeading?Math.round(state.compassHeading):"---") + "°";
+},()=>{
+  let course = "---°";
+  if (state.currentPos && state.currentPos.course) course = state.currentPos.course + "°";
+  return course;
+},200);
+
+let healthSlice = getDoubleLineSlice("Heart","Steps",()=>{
+  return state.bpm;
+},()=>{
+  return state.steps;
+});
+
+let system2Slice = getDoubleLineSlice("Bat","",()=>{
+  return (Bangle.isCharging()?"+":"") + E.getBattery().toFixed(0)+"% " + NRF.getBattery().toFixed(2) + "V";
+},()=>{
+  return "";
+});
+
+let systemSlice = getDoubleLineSlice("RAM","Storage",()=>{
+  let ram = process.memory(false);
+  return ((ram.blocksize * ram.free)/1024).toFixed(0)+"kB";
+},()=>{
+  return (STORAGE.getFree()/1024).toFixed(0)+"kB";
+});
+
+function updateSlices(){
+  slices = [];
+  slices.push(compassSlice);
+
+  if (state.currentPos && state.currentPos.lat && state.route && state.route.currentWaypoint && state.route.index < state.route.count - 1) {
+    slices.push(waypointSlice);
+  }
+  if (state.currentPos && state.currentPos.lat && (state.route || state.waypoint)) {
+    slices.push(finishSlice);
+  }
+  if ((state.route && state.route.down !== undefined) || state.down != undefined) {
+    slices.push(eleSlice);
+  }
+  slices.push(statusSlice);
+  slices.push(status2Slice);
+  slices.push(healthSlice);
+  slices.push(systemSlice);
+  slices.push(system2Slice);
+  maxScreens = Math.ceil(slices.length/numberOfSlices);
+}
+
+function clear() {
+  g.clearRect(0,(showWidgets ? 24 : 0), g.getWidth(),g.getHeight());
+}
+let lastDrawnScreen;
+let firstDraw = true;
+
+function draw(){
+  if (!screen) return;
+  let ypos = showWidgets ? 24 : 0;
+
+  let firstSlice = (screen-1)*numberOfSlices;
+
+  updateSlices();
+
+  let force = lastDrawnScreen != screen || firstDraw;
+  if (force){
+    clear();
+    if (showWidgets){
+      Bangle.drawWidgets();
+    }
+  }
+  lastDrawnScreen = screen;
+
+  for (let slice of slices.slice(firstSlice,firstSlice + numberOfSlices)) {
+    g.reset();
+    if (!slice.refresh || slice.refresh() || force) slice.draw(g,0,ypos,sliceHeight,g.getWidth());
+    ypos += sliceHeight+1;
+    g.drawLine(0,ypos-1,g.getWidth(),ypos-1);
+  }
+  firstDraw = false;
+}
+
+
+switchNav();
+
+g.clear();
diff --git a/apps/gpstrek/createRoute.sh b/apps/gpstrek/createRoute.sh
new file mode 100755
index 000000000..729e6af00
--- /dev/null
+++ b/apps/gpstrek/createRoute.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+[ -z "$1" ] && echo Give gpx file name
+
+
+xmlstarlet select -t -m '//_:trkpt' \
+  --if '_:name and _:ele' -o D \
+    --elif '_:ele and not(_:name)' -o C \
+    --elif 'not(_:ele) and _:name' -o B \
+    --else -o A -b \
+  -v 'format-number(@lat,"+00.0000000;-00.0000000")' \
+  -v 'format-number(@lon,"+000.0000000;-000.0000000")' \
+  --if '_:ele' -v 'format-number(_:ele,"+00000;-00000")' -b \
+  --if _:name -v 'format-number(string-length(_:name),"00")' -v '_:name' -b \
+  -n "$1" | iconv -f utf8 -t iso8859-1 > "$(basename "$1" | sed -e "s|.gpx||").trf"
diff --git a/apps/gpstrek/icon.png b/apps/gpstrek/icon.png
new file mode 100644
index 000000000..e1ff2b99d
Binary files /dev/null and b/apps/gpstrek/icon.png differ
diff --git a/apps/gpstrek/metadata.json b/apps/gpstrek/metadata.json
new file mode 100644
index 000000000..cf5d06baa
--- /dev/null
+++ b/apps/gpstrek/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "gpstrek",
+  "name": "GPS Trekking",
+  "version": "0.07",
+  "description": "Helper for tracking the status/progress during hiking. Do NOT depend on this for navigation!",
+  "icon": "icon.png",
+  "screenshots": [{"url":"screen1.png"},{"url":"screen2.png"},{"url":"screen3.png"},{"url":"screen4.png"}],
+  "tags": "tool,outdoors,gps",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "dependencies" : { "waypoints":"type" },
+  "storage": [
+    {"name":"gpstrek.app.js","url":"app.js"},
+    {"name":"gpstrek.wid.js","url":"widget.js"},
+    {"name":"gpstrek.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"gpstrek.state.json"}]
+}
diff --git a/apps/gpstrek/screen1.png b/apps/gpstrek/screen1.png
new file mode 100644
index 000000000..3cfd7d31b
Binary files /dev/null and b/apps/gpstrek/screen1.png differ
diff --git a/apps/gpstrek/screen2.png b/apps/gpstrek/screen2.png
new file mode 100644
index 000000000..9a6e14e06
Binary files /dev/null and b/apps/gpstrek/screen2.png differ
diff --git a/apps/gpstrek/screen3.png b/apps/gpstrek/screen3.png
new file mode 100644
index 000000000..a0c7fd8c3
Binary files /dev/null and b/apps/gpstrek/screen3.png differ
diff --git a/apps/gpstrek/screen4.png b/apps/gpstrek/screen4.png
new file mode 100644
index 000000000..7b6812077
Binary files /dev/null and b/apps/gpstrek/screen4.png differ
diff --git a/apps/gpstrek/widget.js b/apps/gpstrek/widget.js
new file mode 100644
index 000000000..347df2df5
--- /dev/null
+++ b/apps/gpstrek/widget.js
@@ -0,0 +1,155 @@
+(() => {
+const STORAGE=require('Storage');
+let state = STORAGE.readJSON("gpstrek.state.json")||{};
+let bgChanged = false;
+
+function saveState(){
+  state.saved = Date.now();
+  STORAGE.writeJSON("gpstrek.state.json", state);
+}
+
+E.on("kill",()=>{
+  if (bgChanged){
+    saveState();
+  }
+});
+
+
+function onPulse(e){
+  state.bpm = e.bpm;
+}
+
+function onGPS(fix) {
+  if(fix.fix) state.currentPos = fix;
+}
+
+function onMag(e) {
+  if (!state.compassHeading) state.compassHeading = e.heading;
+
+  //if (a+180)mod 360 == b then
+  //return (a+b)/2 mod 360 and ((a+b)/2 mod 360) + 180 (they are both the solution, so you may choose one depending if you prefer counterclockwise or clockwise direction)
+//else
+  //return arctan(  (sin(a)+sin(b)) / (cos(a)+cos(b) )
+
+  /*
+  let average;
+  let a = radians(compassHeading);
+  let b = radians(e.heading);
+  if ((a+180) % 360 == b){
+    average = ((a+b)/2 % 360); //can add 180 depending on rotation
+  } else {
+    average = Math.atan( (Math.sin(a)+Math.sin(b))/(Math.cos(a)+Math.cos(b)) );
+  }
+  print("Angle",compassHeading,e.heading, average);
+  compassHeading = (compassHeading + degrees(average)) % 360;
+  */
+  state.compassHeading = Math.round(e.heading);
+}
+
+function onStep(e) {
+  state.steps++;
+}
+
+function onPressure(e) {
+  state.pressure = e.pressure;
+
+  if (!state.altitude){
+    state.altitude = e.altitude;
+    state.up = 0;
+    state.down = 0;
+  }
+  let diff = state.altitude - e.altitude;
+  if (Math.abs(diff) > 3){
+    if (diff > 0){
+      state.up += diff;
+    } else {
+      state.down -= diff;
+    }
+    state.altitude = e.altitude;
+  }
+}
+
+function onAcc (e){
+  state.acc = e;
+}
+
+function start(bg){
+  Bangle.removeListener('GPS', onGPS);
+  Bangle.removeListener("HRM", onPulse);
+  Bangle.removeListener("mag", onMag);
+  Bangle.removeListener("step", onStep);
+  Bangle.removeListener("pressure", onPressure);
+  Bangle.removeListener('accel', onAcc);
+  Bangle.on('GPS', onGPS);
+  Bangle.on("HRM", onPulse);
+  Bangle.on("mag", onMag);
+  Bangle.on("step", onStep);
+  Bangle.on("pressure", onPressure);
+  Bangle.on('accel', onAcc);
+
+  Bangle.setGPSPower(1, "gpstrek");
+  Bangle.setHRMPower(1, "gpstrek");
+  Bangle.setCompassPower(1, "gpstrek");
+  Bangle.setBarometerPower(1, "gpstrek");
+  if (bg){
+    if (!state.active) bgChanged = true;
+    state.active = true;
+    saveState();
+  }
+  Bangle.drawWidgets();
+}
+
+function stop(bg){
+  if (bg){
+    if (state.active) bgChanged = true;
+    state.active = false;
+  } else if (!state.active) {
+    Bangle.setGPSPower(0, "gpstrek");
+    Bangle.setHRMPower(0, "gpstrek");
+    Bangle.setCompassPower(0, "gpstrek");
+    Bangle.setBarometerPower(0, "gpstrek");
+    Bangle.removeListener('GPS', onGPS);
+    Bangle.removeListener("HRM", onPulse);
+    Bangle.removeListener("mag", onMag);
+    Bangle.removeListener("step", onStep);
+    Bangle.removeListener("pressure", onPressure);
+    Bangle.removeListener('accel', onAcc);
+  }
+  saveState();
+  Bangle.drawWidgets();
+}
+
+function initState(){
+  //cleanup volatile state here
+  state.currentPos={};
+  state.steps = Bangle.getStepCount();
+  state.calibAltDiff = 0;
+  state.up = 0;
+  state.down = 0;
+}
+
+if (state.saved && state.saved < Date.now() - 60000){
+  initState();
+}
+
+if (state.active){
+  start(false);
+}
+
+WIDGETS["gpstrek"]={
+  area:"tl",
+  width:state.active?24:0,
+  resetState: initState,
+  getState: function() {
+    return state;
+  },
+  start:start,
+  stop:stop,
+  draw:function() {
+    if (state.active){
+      g.reset();
+      g.drawImage(atob("GBiBAAAAAAAAAAAYAAAYAAAYAAA8AAA8AAB+AAB+AADbAADbAAGZgAGZgAMYwAMYwAcY4AYYYA5+cA3/sB/D+B4AeBAACAAAAAAAAA=="), this.x, this.y);
+    }
+  }
+};
+})();
diff --git a/apps/groceryaug/ChangeLog b/apps/groceryaug/ChangeLog
new file mode 100644
index 000000000..906046782
--- /dev/null
+++ b/apps/groceryaug/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Refactor code to store grocery list in separate file
diff --git a/apps/groceryaug/README.md b/apps/groceryaug/README.md
new file mode 100644
index 000000000..aa1e62beb
--- /dev/null
+++ b/apps/groceryaug/README.md
@@ -0,0 +1,6 @@
+Modified version of the Grocery App - lets you upload an image with the products you need to shop - Display a list of product and track if you already put them in your cart.
+
+Uses this API to do the OCR: https://rapidapi.com/serendi/api/pen-to-print-handwriting-ocr 
+With a free account you get 100 API calls a month.
+
+![Demonstration of groceryaug app](groceryaug_preview.gif)
diff --git a/apps/groceryaug/app.js b/apps/groceryaug/app.js
new file mode 100644
index 000000000..00408abba
--- /dev/null
+++ b/apps/groceryaug/app.js
@@ -0,0 +1,25 @@
+var filename = 'grocery_list_aug.json';
+var settings = require("Storage").readJSON(filename,1)|| { products: [] };
+
+function updateSettings() {
+  require("Storage").writeJSON(filename, settings);
+  Bangle.buzz();
+}
+
+
+const mainMenu = settings.products.reduce(function(m, p, i){
+const name = p.name;
+  m[name] = {
+    value: p.ok,
+    format: v => v?'[x]':'[ ]',
+    onchange: v => {
+      settings.products[i].ok = v;
+      updateSettings();
+    }
+  };
+  return m;
+}, {
+  '': { 'title': 'Grocery list' }
+});
+mainMenu['< Back'] = ()=>{load();};
+E.showMenu(mainMenu);
diff --git a/apps/groceryaug/groceryaug-icon.js b/apps/groceryaug/groceryaug-icon.js
new file mode 100644
index 000000000..33b649647
--- /dev/null
+++ b/apps/groceryaug/groceryaug-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("MDCEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAiAAMAADAAAwAAMAAiAAMAAAAAAAA/8zP/Mz/zM/8z/zM/8zP/Mz/zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA///MzMzMzMzMzM/////8zP//zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA///MzMzMzMzMz//////8zP//zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA///MzMzMzMzMzM/////8zP//zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA///MzMzMzMzMz//////8zP//zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA/////////////MzMzMzMzP//zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAAAA////////////////////////zAAAAARE////////////////////////zERAAARE////////////////////////zERAAERE////////////////////////zEREAERE////////////////////////zEREAAREzMzMzMzMzMzMzMzMzMzMzMzMzERAAABEREREREREREREREREREREREREREQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="))
diff --git a/apps/groceryaug/groceryaug.html b/apps/groceryaug/groceryaug.html
new file mode 100644
index 000000000..6ed07df62
--- /dev/null
+++ b/apps/groceryaug/groceryaug.html
@@ -0,0 +1,145 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+  </head>
+  <body>
+    <a href="#" onclick="document.getElementById('apikeydiv').style.display='block';return false;" style="font-size:small;" id="apikeylink">Enter/change API key</a>
+    <br>
+      
+    <div id="apikeydiv" style="display:none;margin-bottom:30px;">
+      <input type="text" name="apikey" id="apikey"> <button onclick="localStorage.setItem('apikey', document.getElementById('apikey').value);document.getElementById('apikeysuccess').style.display='inline';setTimeout(removeSuccessMessage,5000);document.getElementById('upload2').value=null;document.getElementById('area').value='';return false;">save API key</button>
+    <span id="apikeysuccess" style="display:none; color:#198754;"><br>API key saved!</span>
+      <br><small>If you don't have an API key, <a href="https://rapidapi.com/serendi/api/pen-to-print-handwriting-ocr" target="_blank">you can create one here</a>. You get 100 API calls a month for free.</small>
+    </div>
+    
+    
+    <h4>Products</h4>
+    <form id="add_product_form">
+    
+    
+      
+      <div class="columns">
+        <textarea id="area" class="form-input" style="width: 80%;margin-left: 2%;margin-bottom: 5%;height: 150px;"></textarea>
+        <div id="loadingstatus" style="display:none;margin-left:2%;">Processing image <div class="loading" id="loading"></div></div>
+        <input style="margin-left:2%;" id="upload2" type=file name="files[]" size=30>
+      </div>
+    </form>
+    <br><br>
+   <button id="upload" class="btn btn-primary">Upload</button>
+    
+    <script>
+      function removeSuccessMessage(){
+        document.getElementById('apikeysuccess').style.display = 'none';
+      }
+
+      
+      if(localStorage.getItem('apikey')) {
+        document.getElementById('apikey').value = localStorage.getItem('apikey');
+      } else {
+        document.getElementById('apikeylink').style.display = 'none';
+        document.getElementById('apikeydiv').style.display = 'block';        
+      }
+      </script>
+
+    <script src="../../core/lib/customize.js"></script>
+
+    <script>
+      
+  
+   var antwort_val="";
+    function handleFileSelect(evt) {
+        
+        document.getElementById("loadingstatus").style.display = "block";
+
+        let files = evt.target.files;
+        let f = files[0];
+        const data = new FormData();
+        data.append("srcImg", f);
+        data.append("Session", "string");
+
+        const xhr = new XMLHttpRequest();
+        xhr.withCredentials = false;
+
+        xhr.addEventListener("readystatechange", function () {
+          if (this.readyState === this.DONE) {
+            document.getElementById("loadingstatus").style.display = "none";
+            console.log(this.responseText);
+            var antwort =JSON.parse(this.responseText);
+            antwort_val = antwort["value"];
+            console.log(antwort_val);
+            if(antwort_val == null){antwort_val = "Please enter an API key first, check that your key is valid and that you haven't exceeded your API quota!";}
+            document.getElementById('area').value = antwort_val;
+          }
+        });
+
+        xhr.open("POST", "https://pen-to-print-handwriting-ocr.p.rapidapi.com/recognize/");
+        xhr.setRequestHeader("x-rapidapi-host", "pen-to-print-handwriting-ocr.p.rapidapi.com");
+        xhr.setRequestHeader("x-rapidapi-key", localStorage.getItem("apikey"));
+
+
+          xhr.send(data);
+      }
+      
+      document.getElementById('upload2').addEventListener('change', handleFileSelect, false);
+
+      var products = []
+     try{
+        var stored = localStorage.getItem('grocery-product-list-aug')
+        if(stored){
+          products = JSON.parse(stored);
+          console.log(products);
+        }
+       
+      }catch(e){}
+      
+      var tstring = "";
+      for(e in products) {
+        tstring += products[e]["name"]+"\n";
+      }
+      document.getElementById("area").value = tstring;
+
+
+      var $form = document.getElementById('add_product_form')
+      var $list = document.getElementById('products')
+      var $area = document.getElementById("area");             
+      var $lines = [];
+      function getLines() {
+        $lines = area.value.replace(/\r\n/g,"\n").split("\n");
+        for (var i in $lines) {
+          $lines[i] = $lines[i].trim();
+        }
+      }
+      getLines();
+
+
+      function save(){
+        localStorage.removeItem('grocery-product-list-aug');
+        localStorage.setItem('grocery-product-list-aug',JSON.stringify(products));
+      }
+
+
+
+      document.getElementById("upload").addEventListener("click", function() {
+        
+        products = [];
+        getLines();
+        for(var i in $lines) {
+          var name = $lines[i];
+          products.push({
+            name,
+            ok: false
+          })
+        }
+          //alert("Products added");
+
+        save()
+        
+        sendCustomizedApp({
+          storage:[
+            { name:"grocery_list_aug.json", content: JSON.stringify({products: products}) }
+          ]
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/apps/groceryaug/groceryaug.png b/apps/groceryaug/groceryaug.png
new file mode 100644
index 000000000..895a6bbca
Binary files /dev/null and b/apps/groceryaug/groceryaug.png differ
diff --git a/apps/groceryaug/groceryaug_preview.gif b/apps/groceryaug/groceryaug_preview.gif
new file mode 100644
index 000000000..9b099f86e
Binary files /dev/null and b/apps/groceryaug/groceryaug_preview.gif differ
diff --git a/apps/groceryaug/metadata.json b/apps/groceryaug/metadata.json
new file mode 100644
index 000000000..13f377584
--- /dev/null
+++ b/apps/groceryaug/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "groceryaug",
+  "name": "Grocery Augmented",
+  "version": "0.02",
+  "description": "Modified version of the Grocery App - lets you upload an image with the products you need to shop - Display a list of product and track if you already put them in your cart.",
+  "icon": "groceryaug.png",
+  "readme":"README.md",
+  "type": "app",
+  "tags": "tool,outdoors,shopping,list",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "custom": "groceryaug.html",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"groceryaug.app.js","url":"app.js"},
+    {"name":"groceryaug.img","url":"groceryaug-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/ha/ChangeLog b/apps/ha/ChangeLog
index e78b4ccd0..a4865be3f 100644
--- a/apps/ha/ChangeLog
+++ b/apps/ha/ChangeLog
@@ -1,2 +1,5 @@
 0.01: Release
-0.02: Includeas the ha.lib.js library that can be used by other apps or clocks.
\ No newline at end of file
+0.02: Includeas the ha.lib.js library that can be used by other apps or clocks.
+0.03: Added clkinfo for clocks.
+0.04: Feedback if clkinfo run is called.
+0.05: Clkinfo improvements.
\ No newline at end of file
diff --git a/apps/ha/ha.clkinfo.js b/apps/ha/ha.clkinfo.js
new file mode 100644
index 000000000..1b1e468d7
--- /dev/null
+++ b/apps/ha/ha.clkinfo.js
@@ -0,0 +1,26 @@
+(function() {
+    var ha = require("ha.lib.js");
+    var triggers = ha.getTriggers();
+
+    var haItems = {
+      name: "Home",
+      img: atob("GBiBAf/////////n///D//+B//8A//48T/wkD/gkD/A8D+AYB8AYA4eZ4QyZMOyZN+fb5+D/B+B+B+A8B+AYB+AYB+AYB+AYB+A8Bw=="),
+      items: []
+    };
+
+    triggers.forEach((trigger, i) => {
+      haItems.items.push({
+        name: null,
+        get: () => ({ text: trigger.display, img: trigger.getIcon()}),
+        show: function() { haItems.items[i].emit("redraw"); },
+        hide: function () {},
+        run: function() {
+          ha.sendTrigger("TRIGGER_BW");
+          ha.sendTrigger(trigger.trigger);
+          return true;
+        }
+      });
+    });
+
+    return haItems;
+})
\ No newline at end of file
diff --git a/apps/ha/metadata.json b/apps/ha/metadata.json
index 63308b933..052e82fe0 100644
--- a/apps/ha/metadata.json
+++ b/apps/ha/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "ha",
   "name": "HomeAssistant",
-  "version": "0.02",
+  "version": "0.05",
   "description": "Integrates your BangleJS into HomeAssistant.",
   "icon": "ha.png",
   "type": "app",
@@ -20,6 +20,7 @@
   "storage": [
     {"name":"ha.app.js","url":"ha.app.js"},
     {"name":"ha.lib.js","url":"ha.lib.js"},
+    {"name":"ha.clkinfo.js","url":"ha.clkinfo.js"},
     {"name":"ha.img","url":"ha.icon.js","evaluate":true}
   ]
 }
diff --git a/apps/hcclock/ChangeLog b/apps/hcclock/ChangeLog
index f70653d58..289c7ac2d 100644
--- a/apps/hcclock/ChangeLog
+++ b/apps/hcclock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Base code
 0.02: Saved settings when switching color scheme
-0.03: Added Button 3 opening messages (if app is installed)
\ No newline at end of file
+0.03: Added Button 3 opening messages (if app is installed)
+0.04: Use `messages` library to check for new messages
\ No newline at end of file
diff --git a/apps/hcclock/hcclock.app.js b/apps/hcclock/hcclock.app.js
index de5163996..9558c052b 100644
--- a/apps/hcclock/hcclock.app.js
+++ b/apps/hcclock/hcclock.app.js
@@ -3,7 +3,7 @@
 // Numbers Rect order (left, top, right, bottom)
 // Each number defines a set of rects to draw
 
-const numbers = 
+const numbers =
 [
   [// Zero
     [0, 0, 1, 0.2],
@@ -64,7 +64,7 @@ const numbers =
     [0, 0.8, 1, 1],
     [0, 0, 0.1, 0.6],
     [0.9, 0, 1, 1]
-  ] 
+  ]
 ];
 
 const months = [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ];
@@ -103,7 +103,7 @@ function updateTime()
   let mo = now.getMonth();
   let y = now.getFullYear();
   let d = now.getDate();
-  
+
   if(h != hour)
   {
     hour = h;
@@ -127,7 +127,7 @@ function updateTime()
     day = d;
     g.setFont("6x8", 2);
     g.setFontAlign(0, -1, 0);
-    g.drawString(fmtDate(d,mo,y,hour), 120, 120); 
+    g.drawString(fmtDate(d,mo,y,hour), 120, 120);
   }
   drawMessages();
 }
@@ -136,7 +136,7 @@ function drawDigits(x, value)
 {
   if(!Bangle.isLCDOn()) // No need to draw when LCD Off
     return;
-  
+
   drawChar(Math.floor(value/10),  15, x, 115, x+50);
   if(value%10 == 1)
     drawChar(value%10, 55, x, 155, x+50);
@@ -228,27 +228,18 @@ function flipColors()
 //  MESSAGE HANDLING()
 //
 
-let messages_installed = require("Storage").read("messages.app.js") != undefined;
+let messages_installed = require("Storage").read("messages") !== undefined;
 
 function handleMessages()
 {
-  if(messages_installed && hasMessages() > 0)
-  {
-    E.showMessage("Loading Messages...");
-    load("messages.app.js");
-  }
+  if(!hasMessages()) return;
+  E.showMessage("Loading Messages...");
+  load("messages.app.js");
 }
 
 function hasMessages()
 {
-  if(!messages_installed)
-    return false;
-
-  var messages = require("Storage").readJSON("messages.json",1)||[];
-  if (messages.some(m=>m.new))
-    return true;
-  else
-    return false;
+  return messages_installed && require("messages").status() === 'new';
 }
 
 let msg = atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+DAADDAADDAADDwAPD8A/DOBzDDn/DA//DAHvDAPvjAPvjAPvjAPvh///gf/vAAD+AAB8AAAAA==");
@@ -256,20 +247,21 @@ let had_messages = false;
 
 function drawMessages()
 {
-  if(!had_messages && hasMessages()) {
+  const has_messages = hasMessages();
+  if(has_messages === had_messages) return;
+  if(has_messages) {
       g.setColor(255,255,255);
       g.drawImage(msg, 184, 212);
       g.setFont("6x8", 2);
       g.setFontAlign(0, -1, 0);
       g.drawString(">", 224, 216);
-      had_messages = true;
-  } 
-  else if (had_messages && !hasMessages())
+  }
+  else
   {
       g.setColor(0,0,0);
       g.fillRect(180, 210, 240, 240);
-      had_messages = false;
   }
+  had_messages = has_messages;
 }
 
 //////////////////////////////////////////
diff --git a/apps/hcclock/metadata.json b/apps/hcclock/metadata.json
index 0d4cbe0cd..b8f8c14b9 100644
--- a/apps/hcclock/metadata.json
+++ b/apps/hcclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "hcclock",
   "name": "Hi-Contrast Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Hi-Contrast Clock : A simple yet very bold clock that aims to be readable in high luninosity environments. Uses big 10x5 pixel digits. Use BTN 1 to switch background and foreground colors.",
   "icon": "hcclock-icon.png",
   "type": "clock",
diff --git a/apps/henkinen/ChangeLog b/apps/henkinen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/henkinen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/henkinen/README.md b/apps/henkinen/README.md
new file mode 100644
index 000000000..e17e86121
--- /dev/null
+++ b/apps/henkinen/README.md
@@ -0,0 +1,7 @@
+# Henkinen
+
+By Jukio Kallio
+
+A tiny app helping you to breath and relax.
+
+![](screenshot1.png) 
diff --git a/apps/henkinen/app-icon.js b/apps/henkinen/app-icon.js
new file mode 100644
index 000000000..7c82a375d
--- /dev/null
+++ b/apps/henkinen/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEogA0/4AKCpNPCxYAB+gtTGJQuOGBAWPGAwuQGAwXH+cykc/C6UhgMSkMQiQXKBQsgiYFDmMCMBIIEmAWEDAUDC5nzBwogDMYgXHBoohJC4wuJEQwXG+ALDmUQgMjEYcPC5MhAYXxgAACj4ICVYYXGIwXzCwYABHAUwC5HyEwXwC4pEC+MvC4/xEoUQC4sBHIQlCC4vwIxBIEGYQXFmJKCC45ECfQQXIRoiRGC5EiOxB4EBwQXdI653XU67XX+QJCPAwrC+JKCC4v/gZIIHIUwCAQXGkIDCSIg4C/8SC5PwEwX/mUQgMjAwXzJQQXH+ZICAA8wEYYXGBgoAEEQoXHGBIhFC44OBcgQADmIgFC5H/kAYEmMCBooXDp4KFkMBiUhiCjDAAX0C5RjBmUjPo4XMABQXEMAwALCwgwRFwowRCwwwPFw4xOCpIArA"))
diff --git a/apps/henkinen/app.js b/apps/henkinen/app.js
new file mode 100644
index 000000000..d7c7bd5ed
--- /dev/null
+++ b/apps/henkinen/app.js
@@ -0,0 +1,127 @@
+// Henkinen
+//
+// Bangle.js 2 breathing helper
+// by Jukio Kallio
+// www.jukiokallio.com
+
+require("FontHaxorNarrow7x17").add(Graphics);
+
+// settings
+const breath = { 
+  theme: "default", 
+  x:0, y:0, w:0, h:0, 
+  size: 60,
+  
+  bgcolor: g.theme.bg,
+  incolor: g.theme.fg,
+  keepcolor: g.theme.fg,
+  outcolor: g.theme.fg,
+  
+  font: "HaxorNarrow7x17", fontsize: 1, 
+  textcolor: g.theme.fg,
+  texty: 18,
+  
+  in: 4000,
+  keep: 7000,
+  out: 8000
+};
+
+// set some additional settings
+breath.w = g.getWidth(); // size of the background
+breath.h = g.getHeight();
+breath.x = breath.w * 0.5; // position of the circles
+breath.y = breath.h * 0.45;
+breath.texty = breath.y + breath.size + breath.texty; // text position
+
+var wait = 100; // wait time, normally a minute
+var time = 0; // for time keeping
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+
+// main function
+function draw() {
+  // make date object
+  var date = new Date();
+  
+  // update current time
+  time += wait - (Date.now() % wait);
+  if (time > breath.in + breath.keep + breath.out) time = 0; // reset time
+
+  // Reset the state of the graphics library
+  g.reset();
+  
+  // Clear the area where we want to draw the time
+  g.setColor(breath.bgcolor);
+  g.fillRect(0, 0, breath.w, breath.h);
+  
+  // calculate circle size
+  var circle = 0;
+  if (time < breath.in) {
+    // breath in
+    circle = time / breath.in;
+    g.setColor(breath.incolor);
+    
+  } else if (time < breath.in + breath.keep) {
+    // keep breath
+    circle = 1;
+    g.setColor(breath.keepcolor);
+    
+  } else if (time < breath.in + breath.keep + breath.out) {
+    // breath out
+    circle = ((breath.in + breath.keep + breath.out) - time) / breath.out;
+    g.setColor(breath.outcolor);
+    
+  }
+  
+  // draw breath circle
+  g.fillCircle(breath.x, breath.y, breath.size * circle);
+  
+  // breath area
+  g.setColor(breath.textcolor);
+  g.drawCircle(breath.x, breath.y, breath.size);
+  
+  // draw text
+  g.setFontAlign(0,0).setFont(breath.font, breath.fontsize).setColor(breath.textcolor);
+  
+  if (time < breath.in) {
+    // breath in
+    g.drawString("Breath in", breath.x, breath.texty);
+    
+  } else if (time < breath.in + breath.keep) {
+    // keep breath
+    g.drawString("Keep it in", breath.x, breath.texty);
+    
+  } else if (time < breath.in + breath.keep + breath.out) {
+    // breath out
+    g.drawString("Breath out", breath.x, breath.texty);
+    
+  }
+  
+  // queue draw
+  queueDraw();
+}
+
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+
+
+// keep LCD on
+Bangle.setLCDPower(1);
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
diff --git a/apps/henkinen/app.png b/apps/henkinen/app.png
new file mode 100644
index 000000000..575ecbcd4
Binary files /dev/null and b/apps/henkinen/app.png differ
diff --git a/apps/henkinen/metadata.json b/apps/henkinen/metadata.json
new file mode 100644
index 000000000..1f1bb77fc
--- /dev/null
+++ b/apps/henkinen/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "henkinen",
+  "name": "Henkinen - Tiny Breathing Helper",
+  "shortName":"Henkinen",
+  "version":"0.01",
+  "description": "A tiny app helping you to breath and relax.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot1.png"}],
+  "tags": "outdoors",
+  "supports" : ["BANGLEJS","BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"henkinen.app.js","url":"app.js"},
+    {"name":"henkinen.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/henkinen/screenshot1.png b/apps/henkinen/screenshot1.png
new file mode 100644
index 000000000..938494673
Binary files /dev/null and b/apps/henkinen/screenshot1.png differ
diff --git a/apps/hrmaccevents/README.md b/apps/hrmaccevents/README.md
index 188ca325a..ecd619152 100644
--- a/apps/hrmaccevents/README.md
+++ b/apps/hrmaccevents/README.md
@@ -13,6 +13,21 @@ This app can use [BTHRM](https://banglejs.com/apps/#bthrm) as a reference.
 * (Recording to file) Stop the recording with a long press of the button and download log.csv with the Espruino IDE.
 * (Recording to browser) Click "Stop" followed by "Save" and store the resulting file on your device.
 
+
+## CSV data format
+
+The CSV data contains the following columns:
+
+* Time - Current time (milliseconds since 1970)
+* Acc_x,Acc_y,Acc_z - X,Y,Z acceleration in Gs
+* HRM_b - BPM figure reported by internal HRM algorithm in Bangle.js
+* HRM_c - BPM confidence figure (0..100%) reported by internal HRM algorithm in Bangle.js
+* HRM_r - `e.raw` from the `Bangle.on("HRM-raw"` event. This is the value that gets passed to the HRM algorithm.
+* HRM_f - `e.filt` from the `Bangle.on("HRM-raw"` event. This is the filtered value that comes from the Bangle's HRM algorithm and which is used for peak detection
+* PPG_r - `e.vcPPG` from the `Bangle.on("HRM-raw"` event. This is the PPG value direct from the sensor
+* PPG_o - `e.vcPPGoffs` from the `Bangle.on("HRM-raw"` event. This is the PPG offset used to map `e.vcPPG` to `e.raw` so there are no glitches when the exposure values in the sensor change.
+* BTHRM - BPM figure from external Bluetooth HRM device (this is our reference BPM)
+
 ## Creator
 
 [halemmerich](https://github.com/halemmerich)
diff --git a/apps/hwid_a_battery_widget/ChangeLog b/apps/hwid_a_battery_widget/ChangeLog
index da289abff..cbdccfecf 100644
--- a/apps/hwid_a_battery_widget/ChangeLog
+++ b/apps/hwid_a_battery_widget/ChangeLog
@@ -4,4 +4,5 @@
 0.04: Increase screen update rate when charging
 0.05: Deleting Background - making Font larger
 0.06: Fixing refresh issues
-0.07: Fixed position after unlocking
\ No newline at end of file
+0.07: Fixed position after unlocking
+0.08: Handling exceptions
\ No newline at end of file
diff --git a/apps/hwid_a_battery_widget/metadata.json b/apps/hwid_a_battery_widget/metadata.json
index 38fd503a2..29b0540c2 100644
--- a/apps/hwid_a_battery_widget/metadata.json
+++ b/apps/hwid_a_battery_widget/metadata.json
@@ -3,7 +3,7 @@
   "name": "A Battery Widget (with percentage) - Hanks Mod",
   "shortName":"H Battery Widget",
   "icon": "widget.png",
-  "version":"0.07",
+  "version":"0.08",
   "type": "widget",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
diff --git a/apps/hwid_a_battery_widget/widget.js b/apps/hwid_a_battery_widget/widget.js
index bd1c4e0c5..e42c15355 100644
--- a/apps/hwid_a_battery_widget/widget.js
+++ b/apps/hwid_a_battery_widget/widget.js
@@ -29,9 +29,9 @@
 	var	y = this.y;
 	if ((typeof x === 'undefined') || (typeof y === 'undefined')) {
 	} else {
-		const l = E.getBattery();
+		const l = E.getBattery(); // debug: Math.floor(Math.random() * 101);
 		let xl = x+4+l*(s-12)/100;
-		if (l != old_l){ // Delete the old value from screen
+		if ((l != old_l) && (typeof old_l != 'undefined') ){ // Delete the old value from screen
 			let xl_old = x+4+old_l*(s-12)/100;
 			g.setColor(COLORS.white);
 			// g.fillRect(x+2,y+5,x+s-6,y+18);
@@ -41,9 +41,9 @@
 			//g.fillRect(old_x,old_y,old_x+4+l*(s-12)/100,old_y+16+3); // clear (lazy) 
 			g.drawString(old_l, old_x + 14, old_y + 10);
 			g.fillRect(x+4,y+14+3,xl_old,y+16+3); // charging bar
-			old_l = l;
+			
 		}
-		
+		old_l = l;
 		//console.log(old_x);
 
 		g.setColor(levelColor(l));
@@ -64,7 +64,7 @@
 	}
 
 	Bangle.on('charging',function(charging) { draw(); });
-	var id = setInterval(()=>WIDGETS["wid_a_battery_widget"].draw(), intervalLow);
+	var id = setInterval(()=>WIDGETS["hwid_a_battery_widget"].draw(), intervalLow);
 
-	WIDGETS["wid_a_battery_widget"]={area:"tr",width:30,draw:draw};
+	WIDGETS["hwid_a_battery_widget"]={area:"tr",width:30,draw:draw};
 })();
diff --git a/apps/hworldclock/README.md b/apps/hworldclock/README.md
index 170a2aa8b..25cc368ca 100644
--- a/apps/hworldclock/README.md
+++ b/apps/hworldclock/README.md
@@ -1,16 +1,16 @@
 # Hanks World Clock - See the time in four locations
 
-In addition to the main clock and date in your current location, you can add up to three other locations. Great for travel or remote working.
-Additionally we show the sunset/sunrise and seconds for the current location and the day name is shown in your locale.
+In addition to the main clock and date in your current location, you can add up to three other locations. Great for travel or remote working.  
+Additionally we show the sunset/sunrise and seconds for the current location and the day name is shown in your locale.  
 If watch is locked, seconds get refreshed every 10 seconds.
 
 ![](hworldclock.png)
 
 ## Usage
 
-Location for sun set / rise set with mylocation app.
+Location for sun set / rise set with mylocation app.  
 
-Provide names and the UTC offsets for up to three other timezones in the app store. These are stored in a json file on your watch. UTC offsets can be decimal (e.g., 5.5 for India). 
+Provide names and the UTC offsets for up to three other timezones in the app store. These are stored in a json file on your watch. UTC offsets can be decimal (e.g., 5.5 for India).  
 
 The clock does not handle summer time / daylight saving time changes automatically. If one of your three locations changes its UTC offset, you can simply change the setting in the app store and update. Currently the clock only supports 24 hour time format for the additional time zones.
 
@@ -23,5 +23,5 @@ Please use [the Espruino Forum](http://forum.espruino.com/microcosms/1424/) if y
 
 Created by Hank.
 
-Based on the great work of "World Clock - 4 time zones". Made by [Scott Hale](https://www.github.com/computermacgyver), based upon the [Simple Clock](https://github.com/espruino/BangleApps/tree/master/apps/sclock). 
+Based on the great work of "World Clock - 4 time zones". Made by [Scott Hale](https://www.github.com/computermacgyver), based upon the [Simple Clock](https://github.com/espruino/BangleApps/tree/master/apps/sclock).  
 And Sun Clock [Sun Clock](https://github.com/espruino/BangleApps/tree/master/apps/sunclock)
\ No newline at end of file
diff --git a/apps/iconlaunch/ChangeLog b/apps/iconlaunch/ChangeLog
index 991f15abb..c71da1467 100644
--- a/apps/iconlaunch/ChangeLog
+++ b/apps/iconlaunch/ChangeLog
@@ -1,3 +1,14 @@
 0.01: Initial release
 0.02: implemented "direct launch" and "one click exit" settings
 0.03: Use default Bangle formatter for booleans
+0.04: Support new fast app switching
+0.05: Allow to directly eval apps instead of loading
+0.06: Cache apps for faster start
+0.07: Read app icons on demand
+      Add swipe-to-exit
+0.08: Only use fast loading for switching to clock to prevent problems in full screen apps
+0.09: Remove fast load option since clocks containing Bangle.loadWidgets are now always normally loaded
+0.10: changed the launch.json file name in iconlaunch.json ( launch.cache.json -> iconlaunch.cache.json)
+      used Object.assing for the settings
+      fix cache not deleted when "showClocks" options is changed
+      added timeOut to return to the clock
diff --git a/apps/iconlaunch/app.js b/apps/iconlaunch/app.js
index 59e9eb0e3..479956019 100644
--- a/apps/iconlaunch/app.js
+++ b/apps/iconlaunch/app.js
@@ -1,163 +1,138 @@
-const s = require("Storage");
-const settings = s.readJSON("launch.json", true) || { showClocks: true, fullscreen: false,direct:false,oneClickExit:false };
+{
+  const s = require("Storage");
+  const settings = Object.assign({
+    showClocks: true,
+    fullscreen: false,
+    direct: false,
+    oneClickExit: false,
+    swipeExit: false,
+    timeOut:"Off"
+  }, s.readJSON("iconlaunch.json", true) || {});
 
-if( settings.oneClickExit)
-  setWatch(_=> load(), BTN1);
-
-if (!settings.fullscreen) {
-  Bangle.loadWidgets();
-  Bangle.drawWidgets();
-}
-
-var apps = s
-  .list(/\.info$/)
-  .map((app) => {
-    var a = s.readJSON(app, 1);
-    return (
-      a && {
-        name: a.name,
-        type: a.type,
-        icon: a.icon,
-        sortorder: a.sortorder,
-        src: a.src,
+  console.log(settings);
+  if (!settings.fullscreen) {
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+  }
+  let launchCache = s.readJSON("iconlaunch.cache.json", true)||{};
+  let launchHash = s.hash(/\.info/);
+  if (launchCache.hash!=launchHash) {
+  launchCache = {
+    hash : launchHash,
+    apps : s.list(/\.info$/)
+      .map(app=>{let a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};})
+      .filter(app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || !app.type))
+      .sort((a,b)=>{
+        let n=(0|a.sortorder)-(0|b.sortorder);
+        if (n) return n; // do sortorder first
+        if (a.name<b.name) return -1;
+        if (a.name>b.name) return 1;
+        return 0;
+      }) };
+    s.writeJSON("iconlaunch.cache.json", launchCache);
+  }
+  let scroll = 0;
+  let selectedItem = -1;
+  const R = Bangle.appRect;
+  const iconSize = 48;
+  const appsN = Math.floor(R.w / iconSize);
+  const whitespace = (R.w - appsN * iconSize) / (appsN + 1);
+  const itemSize = iconSize + whitespace;
+  let drawItem = function(itemI, r) {
+    g.clearRect(r.x, r.y, r.x + r.w - 1, r.y + r.h - 1);
+    let x = 0;
+    for (let i = itemI * appsN; i < appsN * (itemI + 1); i++) {
+      if (!launchCache.apps[i]) break;
+      x += whitespace;
+      if (!launchCache.apps[i].icon) {
+        g.setFontAlign(0, 0, 0).setFont("12x20:2").drawString("?", x + r.x + iconSize / 2, r.y + iconSize / 2);
+      } else {
+        if (!launchCache.apps[i].icondata) launchCache.apps[i].icondata = s.read(launchCache.apps[i].icon);
+        g.drawImage(launchCache.apps[i].icondata, x + r.x, r.y);
       }
-    );
-  })
-  .filter(
-    (app) =>
-    app &&
-    (app.type == "app" ||
-      (app.type == "clock" && settings.showClocks) ||
-      !app.type)
-  );
-apps.sort((a, b) => {
-  var n = (0 | a.sortorder) - (0 | b.sortorder);
-  if (n) return n; // do sortorder first
-  if (a.name < b.name) return -1;
-  if (a.name > b.name) return 1;
-  return 0;
-});
-apps.forEach((app) => {
-  if (app.icon) app.icon = s.read(app.icon); // should just be a link to a memory area
-});
-
-let scroll = 0;
-let selectedItem = -1;
-const R = Bangle.appRect;
-
-const iconSize = 48;
-
-const appsN = Math.floor(R.w / iconSize);
-const whitespace = (R.w - appsN * iconSize) / (appsN + 1);
-
-const itemSize = iconSize + whitespace;
-
-function drawItem(itemI, r) {
-  g.clearRect(r.x, r.y, r.x + r.w - 1, r.y + r.h - 1);
-  let x = 0;
-  for (let i = itemI * appsN; i < appsN * (itemI + 1); i++) {
-    if (!apps[i]) break;
-    x += whitespace;
-    if (!apps[i].icon) {
-      g.setFontAlign(0,0,0).setFont("12x20:2").drawString("?", x + r.x+iconSize/2, r.y + iconSize/2);
-    } else {
-      g.drawImage(apps[i].icon, x + r.x, r.y);
+      if (selectedItem == i) {
+        g.drawRect(
+          x + r.x - 1,
+          r.y - 1,
+          x + r.x + iconSize + 1,
+          r.y + iconSize + 1
+        );
+      }
+      x += iconSize;
     }
-    if (selectedItem == i) {
-      g.drawRect(
-        x + r.x - 1,
-        r.y - 1,
-        x + r.x + iconSize + 1,
-        r.y + iconSize + 1
-      );
-    }
-    x += iconSize;
-  }
-  drawText(itemI);
-}
-
-function drawItemAuto(i) {
-  var y = idxToY(i);
-  g.reset().setClipRect(R.x, y, R.x2, y + itemSize);
-  drawItem(i, {
-    x: R.x,
-    y: y,
-    w: R.w,
-    h: itemSize
-  });
-  g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
-}
-
-let lastIsDown = false;
-
-function drawText(i) {
-  const selectedApp = apps[selectedItem];
-  const idy = (selectedItem - (selectedItem % 3)) / 3;
-  if (!selectedApp || i != idy) return;
-  const appY = idxToY(idy) + iconSize / 2;
-  g.setFontAlign(0, 0, 0);
-  g.setFont("12x20");
-  const rect = g.stringMetrics(selectedApp.name);
-  g.clearRect(
-    R.w / 2 - rect.width / 2,
-    appY - rect.height / 2,
-    R.w / 2 + rect.width / 2,
-    appY + rect.height / 2
-  );
-  g.drawString(selectedApp.name, R.w / 2, appY);
-}
-
-function selectItem(id, e) {
-  const iconN = E.clip(Math.floor((e.x - R.x) / itemSize), 0, appsN - 1);
-  const appId = id * appsN + iconN;
-  if( settings.direct && apps[appId])
-  {
-    load(apps[appId].src);
-    return;
-  }
-  if (appId == selectedItem && apps[appId]) {
-    const app = apps[appId];
-    if (!app.src || s.read(app.src) === undefined) {
-      E.showMessage( /*LANG*/ "App Source\nNot found");
-    } else {
-      load(app.src);
-    }
-  }
-  selectedItem = appId;
-  drawItems();
-}
-
-function idxToY(i) {
-  return i * itemSize + R.y - (scroll & ~1);
-}
-
-function YtoIdx(y) {
-  return Math.floor((y + (scroll & ~1) - R.y) / itemSize);
-}
-
-function drawItems() {
-  g.reset().clearRect(R.x, R.y, R.x2, R.y2);
-  g.setClipRect(R.x, R.y, R.x2, R.y2);
-  var a = YtoIdx(R.y);
-  var b = Math.min(YtoIdx(R.y2), 99);
-  for (var i = a; i <= b; i++)
+    drawText(itemI);
+  };
+  let drawItemAuto = function(i) {
+    let y = idxToY(i);
+    g.reset().setClipRect(R.x, y, R.x2, y + itemSize);
     drawItem(i, {
+      x: R.x,
+      y: y,
+      w: R.w,
+      h: itemSize
+    });
+    g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
+  };
+  let lastIsDown = false;
+  let drawText = function(i) {
+    const selectedApp = launchCache.apps[selectedItem];
+    const idy = (selectedItem - (selectedItem % 3)) / 3;
+    if (!selectedApp || i != idy) return;
+    const appY = idxToY(idy) + iconSize / 2;
+    g.setFontAlign(0, 0, 0);
+    g.setFont("12x20");
+    const rect = g.stringMetrics(selectedApp.name);
+    g.clearRect(
+      R.w / 2 - rect.width / 2,
+      appY - rect.height / 2,
+      R.w / 2 + rect.width / 2,
+      appY + rect.height / 2
+    );
+    g.drawString(selectedApp.name, R.w / 2, appY);
+  };
+  let selectItem = function(id, e) {
+    const iconN = E.clip(Math.floor((e.x - R.x) / itemSize), 0, appsN - 1);
+    const appId = id * appsN + iconN;
+    if( settings.direct && launchCache.apps[appId])
+    {
+      load(launchCache.apps[appId].src);
+      return;
+    }
+    if (appId == selectedItem && launchCache.apps[appId]) {
+      const app = launchCache.apps[appId];
+      if (!app.src || s.read(app.src) === undefined) {
+        E.showMessage( /*LANG*/ "App Source\nNot found");
+      } else {
+        load(app.src);
+      }
+    }
+    selectedItem = appId;
+    drawItems();
+  };
+  let idxToY = function(i) {
+    return i * itemSize + R.y - (scroll & ~1);
+  };
+  let YtoIdx = function(y) {
+    return Math.floor((y + (scroll & ~1) - R.y) / itemSize);
+  };
+  let drawItems = function() {
+    g.reset().clearRect(R.x, R.y, R.x2, R.y2);
+    g.setClipRect(R.x, R.y, R.x2, R.y2);
+    let a = YtoIdx(R.y);
+    let b = Math.min(YtoIdx(R.y2), 99);
+    for (let i = a; i <= b; i++)
+      drawItem(i, {
       x: R.x,
       y: idxToY(i),
       w: R.w,
       h: itemSize,
     });
-  g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
-}
-
-drawItems();
-g.flip();
-
-const itemsN = Math.ceil(apps.length / appsN);
-
-Bangle.setUI({
-  mode: "custom",
-  drag: (e) => {
+    g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
+  };
+  drawItems();
+  g.flip();
+  const itemsN = Math.ceil(launchCache.apps.length / appsN);
+  let onDrag = function(e) {
     g.setColor(g.theme.fg);
     g.setBgColor(g.theme.bg);
     let dy = e.dy;
@@ -186,7 +161,6 @@ Bangle.setUI({
         y += itemSize;
       }
     } else {
-      // d>0
       g.setClipRect(R.x, R.y, R.x2, R.y + dy);
       let i = YtoIdx(R.y + dy);
       let y = idxToY(i);
@@ -202,10 +176,42 @@ Bangle.setUI({
       }
     }
     g.setClipRect(0, 0, g.getWidth() - 1, g.getHeight() - 1);
-  },
-  touch: (_, e) => {
-    if (e.y < R.y - 4) return;
-    var i = YtoIdx(e.y);
-    selectItem(i, e);
-  },
-});
+  };
+  let mode = {
+    mode: "custom",
+    drag: onDrag,
+    touch: (_, e) => {
+      if (e.y < R.y - 4) return;
+      let i = YtoIdx(e.y);
+      selectItem(i, e);
+    },
+    swipe: (h,_) => { if(settings.swipeExit && h==1) { returnToClock(); } },
+  };
+
+  const returnToClock = function() {
+    Bangle.setUI();
+    delete launchCache;
+    delete launchHash;
+    delete drawItemAuto;
+    delete drawText;
+    delete selectItem;
+    delete onDrag;
+    delete drawItems;
+    delete drawItem;
+    delete returnToClock;
+    delete idxToY;
+    delete YtoIdx;
+    delete settings;
+    setTimeout(eval, 0, s.read(".bootcde"));
+  };
+
+  
+  if (settings.oneClickExit) mode.btn = returnToClock;
+  if (settings.timeOut!="Off"){
+      let time=parseInt(settings.timeOut);  //the "s" will be trimmed by the parseInt
+      setTimeout(returnToClock,time*1000);  
+  }
+  
+
+  Bangle.setUI(mode);
+}
diff --git a/apps/iconlaunch/metadata.json b/apps/iconlaunch/metadata.json
index 2e8b285ad..13e7aee08 100644
--- a/apps/iconlaunch/metadata.json
+++ b/apps/iconlaunch/metadata.json
@@ -2,7 +2,7 @@
 	"id": "iconlaunch",
 	"name": "Icon Launcher",
 	"shortName" : "Icon launcher",
-	"version": "0.03",
+	"version": "0.10",
 	"icon": "app.png",
 	"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",
 	"tags": "tool,system,launcher",
@@ -12,7 +12,7 @@
 		{ "name": "iconlaunch.app.js", "url": "app.js" },
 		{ "name": "iconlaunch.settings.js", "url": "settings.js" }
 	],
+	"data": [{"name":"iconlaunch.json"},{"name":"iconlaunch.cache.json"}],
 	"screenshots": [{ "url": "screenshot1.png" }, { "url": "screenshot2.png" }],
-	"readme": "README.md",
-	"sortorder": -10
+	"readme": "README.md"
 }
diff --git a/apps/iconlaunch/settings.js b/apps/iconlaunch/settings.js
index bd1a4a597..f4c0599f7 100644
--- a/apps/iconlaunch/settings.js
+++ b/apps/iconlaunch/settings.js
@@ -1,21 +1,29 @@
 // make sure to enclose the function in parentheses
 (function(back) {
+  const s = require("Storage");
   let settings = Object.assign({
     showClocks: true,
-    fullscreen: false
-  }, require("Storage").readJSON("launch.json", true) || {});
+    fullscreen: false,
+    direct: false,
+    oneClickExit: false,
+    swipeExit: false,
+    timeOut:"Off"
+  }, s.readJSON("iconlaunch.json", true) || {});
 
-  let fonts = g.getFonts();
   function save(key, value) {
     settings[key] = value;
-    require("Storage").write("launch.json",settings);
+    s.write("iconlaunch.json",settings);
   }
+  const timeOutChoices = [/*LANG*/"Off", "10s", "15s", "20s", "30s"];
   const appMenu = {
     "": { "title": /*LANG*/"Launcher" },
     /*LANG*/"< Back": back,
     /*LANG*/"Show Clocks": {
       value: settings.showClocks == true,
-      onchange: (m) => { save("showClocks", m) }
+      onchange: (m) => { 
+        save("showClocks", m);
+        s.erase("iconlaunch.cache.json"); //delete the cache app list
+     }
     },
     /*LANG*/"Fullscreen": {
       value: settings.fullscreen == true,
@@ -28,7 +36,19 @@
     /*LANG*/"One click exit": {
       value: settings.oneClickExit == true,
       onchange: (m) => { save("oneClickExit", m) }
-    }
+    },
+    /*LANG*/"Swipe exit": {
+      value: settings.swipeExit == true,
+      onchange: m => { save("swipeExit", m) }
+    },
+    /*LANG*/'Time Out': {
+      value: timeOutChoices.indexOf(settings.timeOut),
+      min: 0, max: timeOutChoices.length-1,
+      format: v => timeOutChoices[v],
+      onchange: m => {
+        save("timeOut", timeOutChoices[m]);
+      }
+    },
   };
   E.showMenu(appMenu);
 });
diff --git a/apps/imageclock/ChangeLog b/apps/imageclock/ChangeLog
index af1b97b3d..f81bbf185 100644
--- a/apps/imageclock/ChangeLog
+++ b/apps/imageclock/ChangeLog
@@ -8,3 +8,7 @@
 0.07: Allow wrapping drawing in timeouts to get faster reactions
       Show/Hide widgets with swipe up or down
 0.08: Use default Bangle formatter for booleans
+0.09: Support new fast app switching
+0.10: Fix clock not correctly refreshing when drawing in timeouts option is not on
+0.11: Additional option in customizer to force drawing directly
+      Fix some problems in handling timeouts
diff --git a/apps/imageclock/app.js b/apps/imageclock/app.js
index 7b933b710..ff3f5a62d 100644
--- a/apps/imageclock/app.js
+++ b/apps/imageclock/app.js
@@ -1,717 +1,777 @@
-var watchface = require("Storage").readJSON("imageclock.face.json");
-var watchfaceResources = require("Storage").readJSON("imageclock.resources.json");
-var precompiledJs = eval(require("Storage").read("imageclock.draw.js"));
-var settings = require('Storage').readJSON("imageclock.json", true) || {};
+let unlockedDrawInterval = [];
+let lockedDrawInterval = [];
+let showWidgets = false;
+let firstDraw = true;
 
-var performanceLog = {};
+{
+  let x = g.getWidth()/2;
+  let y = g.getHeight()/2;
+  g.setColor(g.theme.bg);
+  g.fillRect(x-49, y-19, x+49, y+19);
+  g.setColor(g.theme.fg);
+  g.drawRect(x-50, y-20, x+50, y+20);
+  y -= 4;
+  x -= 4*6;
+  g.setFont("6x8");
+  g.setFontAlign(-1,-1);
+  g.drawString("Loading...", x, y);
 
-var startPerfLog = () => {};
-var endPerfLog = () => {};
-var printPerfLog = () => print("Deactivated");
-var resetPerfLog = () => {performanceLog = {};};
+  let watchface = require("Storage").readJSON("imageclock.face.json");
+  let watchfaceResources = require("Storage").readJSON("imageclock.resources.json");
+  let precompiledJs = eval(require("Storage").read("imageclock.draw.js"));
+  let settings = require('Storage').readJSON("imageclock.json", true) || {};
 
-var colormap={
-"#000":0,
-"#00f":1,
-"#0f0":2,
-"#0ff":3,
-"#f00":4,
-"#f0f":5,
-"#ff0":6,
-"#fff":7
-};
+  let performanceLog = {};
 
-var palette = new Uint16Array([
-0x0000, //black #000
-0x001f, //blue #00f
-0x07e0, //green #0f0
-0x07ff, //cyan #0ff
-0xf800, //red #f00
-0xf81f, //magenta #f0f
-0xffe0, //yellow #ff0
-0xffff, //white #fff
-0xffff, //white
-0xffff, //white
-0xffff, //white
-0xffff, //white
-0xffff, //white
-0xffff, //white
-0xffff, //white
-0xffff, //white
-])
+  let startPerfLog = () => {};
+  let endPerfLog = () => {};
+  Bangle.printPerfLog = () => {print("Deactivated");};
+  Bangle.resetPerfLog = () => {performanceLog = {};};
 
-var p0 = g;
-var p1;
-
-if (settings.perflog){
-  startPerfLog = function(name){
-    var time = getTime();
-    if (!performanceLog.start) performanceLog.start={};
-    performanceLog.start[name] = time;
-  };
-  endPerfLog = function (name){
-    var time = getTime();
-    if (!performanceLog.last) performanceLog.last={};
-    var duration = time - performanceLog.start[name];
-    performanceLog.last[name] = duration;
-    if (!performanceLog.cum) performanceLog.cum={};
-    if (!performanceLog.cum[name]) performanceLog.cum[name] = 0;
-    performanceLog.cum[name] += duration;
-    if (!performanceLog.count) performanceLog.count={};
-    if (!performanceLog.count[name]) performanceLog.count[name] = 0;
-    performanceLog.count[name]++;
+  let colormap={
+    "#000":0,
+    "#00f":1,
+    "#0f0":2,
+    "#0ff":3,
+    "#f00":4,
+    "#f0f":5,
+    "#ff0":6,
+    "#fff":7
   };
 
-  printPerfLog = function(){
-    var result = "";
-    var keys = [];
-    for (var c in performanceLog.cum){
-      keys.push(c);
-    }
-    keys.sort();
-    for (var k of keys){
-      print(k, "last:", (performanceLog.last[k] * 1000).toFixed(0), "average:", (performanceLog.cum[k]/performanceLog.count[k]*1000).toFixed(0), "count:", performanceLog.count[k], "total:", (performanceLog.cum[k] * 1000).toFixed(0));
-    }
-  };
-}
+  let palette = new Uint16Array([
+    0x0000, //black #000
+    0x001f, //blue #00f
+    0x07e0, //green #0f0
+    0x07ff, //cyan #0ff
+    0xf800, //red #f00
+    0xf81f, //magenta #f0f
+    0xffe0, //yellow #ff0
+    0xffff, //white #fff
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+    0xffff, //white
+  ]);
 
-function delay(t) {
-    return new Promise(function (resolve) {
-        setTimeout(resolve, t);
-    });
-}
+  let p0 = g;
+  let p1;
 
-function prepareImg(resource){
-  startPerfLog("prepareImg");
-  //print("prepareImg: ", resource);
-
-  if (resource.dataOffset !== undefined){
-    resource.buffer = E.toArrayBuffer(require("Storage").read("imageclock.resources.data", resource.dataOffset, resource.dataLength));
-    delete resource.dataOffset;
-    delete resource.dataLength;
-    if (resource.paletteData){
-      result.palette = new Uint16Array(resource.paletteData);
-      delete resource.paletteData;
-    }
-  }
-  endPerfLog("prepareImg");
-  return resource;
-}
-
-function getByPath(object, path, lastElem){
-  startPerfLog("getByPath");
-  //print("getByPath", path,lastElem);
-  var current = object;
-  if (path.length) {
-    for (var c of path){
-      if (!current[c]) return undefined;
-      current = current[c];
-    }
-  }
-  if (lastElem!==undefined){
-    if (!current["" + lastElem]) return undefined;
-    //print("Found by lastElem", lastElem);
-    current = current["" + lastElem];
-  }
-  endPerfLog("getByPath");
-  if (typeof current == "function"){
-    //print("current was function");
-    return undefined;
-  }
-  return current;
-}
-
-function splitNumberToDigits(num){
-  return String(num).split('').map(item => Number(item));
-}
-
-function isChangedNumber(element){
-  return element.lastDrawnValue != getValue(element.Value);
-}
-
-function isChangedMultistate(element){
-  return element.lastDrawnValue != getMultistate(element.Value);
-}
-
-function drawNumber(graphics, resources, element){
-  startPerfLog("drawNumber");
-  var number = getValue(element.Value);
-  var spacing = element.Spacing ? element.Spacing : 0;
-  var unit = element.Unit;
-  
-  var imageIndexMinus = element.ImageIndexMinus;
-  var imageIndexUnit = element.ImageIndexUnit;
-  var numberOfDigits = element.Digits;
-  
-  
-  //print("drawNumber: ", number, element);
-  if (number) number = number.toFixed(0);
-
-  var isNegative;
-  var digits;
-  if (number == undefined){
-    isNegative = true;
-    digits = [];
-    numberOfDigits = 0;
-  } else {
-    isNegative = number < 0;
-    if (isNegative) number *= -1;
-    digits = splitNumberToDigits(number);
-  }
-
-  //print("digits: ", digits);
-  if (!numberOfDigits) numberOfDigits = digits.length;
-  var firstDigitX = element.X;
-  var firstDigitY = element.Y;
-  var imageIndex = element.ImageIndex ? element.ImageIndex : 0;
-
-  var firstImage;
-  if (imageIndex){
-    firstImage = getByPath(resources, [], "" + (0 + imageIndex));
-  } else {
-    firstImage = getByPath(resources, element.ImagePath, 0);
-  }
-
-  var minusImage;
-  if (imageIndexMinus){
-    minusImage = getByPath(resources, [], "" + (0 + imageIndexMinus));
-  } else {
-    minusImage = getByPath(resources, element.ImagePath, "minus");
-  }
-
-  var unitImage;
-  //print("Get image for unit", imageIndexUnit);
-  if (imageIndexUnit !== undefined){
-    unitImage = getByPath(resources, [], "" + (0 + imageIndexUnit));
-    //print("Unit image is", unitImage);
-  } else if (element.Unit){
-    unitImage = getByPath(resources, element.ImagePath, getMultistate(element.Unit, "unknown"));
-  }
-
-  var numberWidth = (numberOfDigits * firstImage.width) + (Math.max((numberOfDigits - 1),0) * spacing);
-  if (isNegative && minusImage){
-    //print("Adding to width", minusImage);
-    numberWidth += minusImage.width + spacing;
-  }
-  if (unitImage){
-    //print("Adding to width", unitImage);
-    numberWidth += unitImage.width + spacing;
-  }
-  //print("numberWidth:", numberWidth);
-
-  if (element.Alignment == "Center") {
-    firstDigitX = Math.round(element.X - (numberWidth/2)) + 1;
-    firstDigitY = Math.round(element.Y - (firstImage.height/2)) + 1;
-  } else if (element.Alignment == "BottomRight"){
-    firstDigitX = element.X - numberWidth + 1;
-    firstDigitY = element.Y - firstImage.height + 1;
-  } else if (element.Alignment == "TopRight") {
-    firstDigitX = element.X - numberWidth + 1;
-    firstDigitY = element.Y;
-  } else if (element.Alignment == "BottomLeft") {
-    firstDigitX = element.X;
-    firstDigitY = element.Y - firstImage.height + 1;
-  }
-
-  var currentX = firstDigitX;
-  if (isNegative && minusImage){
-    //print("Draw minus at", currentX);
-    if (imageIndexMinus){
-      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexMinus));
-    } else {
-      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "minus");
-    }
-    currentX += minusImage.width + spacing;
-  }
-  for (var d = 0; d < numberOfDigits; d++){
-    var currentDigit;
-    var difference = numberOfDigits - digits.length;
-    if (d >= difference){
-      currentDigit = digits[d-difference];
-    } else {
-      currentDigit = 0;
-    }
-    //print("Digit " + currentDigit + " " + currentX);
-    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, currentDigit + imageIndex);
-    currentX += firstImage.width + spacing;
-  }
-  if (imageIndexUnit){
-    //print("Draw unit at", currentX);
-    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexUnit));
-  } else if (element.Unit){
-    drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, getMultistate(element.Unit,"unknown"));
-  }
-  element.lastDrawnValue = number;
-
-  endPerfLog("drawNumber");
-}
-
-function drawElement(graphics, resources, pos, element, lastElem){
-  startPerfLog("drawElement");
-  var cacheKey = "_"+(lastElem?lastElem:"nole");
-  if (!element.cachedImage) element.cachedImage={};
-  if (!element.cachedImage[cacheKey]){
-    var resource = getByPath(resources, element.ImagePath, lastElem);
-    if (resource){
-      prepareImg(resource);
-      //print("lastElem", typeof resource)
-      if (resource) {
-        element.cachedImage[cacheKey] = resource;
-        //print("cache res ",typeof element.cachedImage[cacheKey]);
-      } else {
-        element.cachedImage[cacheKey] = null;
-        //print("cache null",typeof element.cachedImage[cacheKey]);
-        //print("Could not create image from", resource);
-      }
-    } else {
-      //print("Could not get resource from", element, lastElem);
-    }
-  }
-  
-  //print("cache ",typeof element.cachedImage[cacheKey], element.ImagePath, lastElem);
-  if(element.cachedImage[cacheKey]){
-    //print("drawElement ",pos, path, lastElem);
-    //print("resource ", resource,pos, path, lastElem);
-    //print("drawImage from drawElement", image, pos);
-    var options={};
-    if (element.RotationValue){
-      options.rotate = radians(element);
-    }
-    if (element.Scale){
-      options.scale = element.ScaleValue;
-    }
-    //print("options", options);
-    //print("Memory before drawing", process.memory(false));
-    startPerfLog("drawElement_g.drawImage");
-    try{
-    graphics.drawImage(element.cachedImage[cacheKey] ,(pos.X ? pos.X : 0), (pos.Y ? pos.Y : 0), options);} catch (e) {
-      //print("Error", e, element.cachedImage[cacheKey]);
-    }
-    endPerfLog("drawElement_g.drawImage");
-  }
-  endPerfLog("drawElement");
-}
-
-function getValue(value, defaultValue){
-  if (typeof value == "string"){
-    return numbers[value]();
-  }
-  if (value == undefined) return defaultValue;
-  return value;
-}
-
-function getMultistate(name, defaultValue){
-  if (typeof name == "string"){
-    return multistates[name]();
-  } else {
-    if (name == undefined) return defaultValue;
-  }
-  return undefined;
-}
-
-function drawScale(graphics, resources, scale){
-  startPerfLog("drawScale");
-  //print("drawScale", scale);
-  var segments = scale.Segments;
-  var imageIndex = scale.ImageIndex !== undefined ? scale.ImageIndex : 0;
-
-  var value = scaledown(scale.Value, scale.MinValue, scale.MaxValue);
-
-  //print("Value is ", value, "(", maxValue, ",", minValue, ")");
-
-  var segmentsToDraw = Math.ceil(value * segments.length);
-
-  for (var i = 0; i < segmentsToDraw; i++){
-    drawElement(graphics, resources, segments[i], scale, imageIndex + i);
-  }
-  scale.lastDrawnValue = segmentsToDraw;
-
-  endPerfLog("drawScale");
-}
-
-function drawImage(graphics, resources, image, name){
-  startPerfLog("drawImage");
-  //print("drawImage", image.X, image.Y, name);
-  if (image.Value && image.Steps){
-    var steps = Math.floor(scaledown(image.Value, image.MinValue, image.MaxValue) * (image.Steps - 1));
-    //print("Step", steps, "of", image.Steps);
-    drawElement(graphics, resources, image, image, "" + steps);
-  } else if (image.ImageIndex !== undefined) {
-    drawElement(graphics, resources, image, image, image.ImageIndex);
-  } else {
-    drawElement(graphics, resources, image, image, name ? "" + name: undefined);
-  }
-  
-  endPerfLog("drawImage");
-}
-
-function drawCodedImage(graphics, resources, image){
-  startPerfLog("drawCodedImage");
-  var code = getValue(image.Value);
-  //print("drawCodedImage", image, code);
-
-  if (image.ImagePath) {
-    var factor = 1;
-    var currentCode = code;
-    while (code / factor > 1){
-      currentCode = Math.floor(currentCode/factor)*factor;
-      //print("currentCode", currentCode);
-      if (getByPath(resources, image.ImagePath, currentCode)){
-        break;
-      }
-      factor *= 10;
-    }
-    if (code / factor > 1){
-      //print("found match");
-      drawImage(graphics, resources, image, currentCode);
-    } else {
-      //print("fallback");
-      drawImage(graphics, resources, image, "fallback");
-    }
-  }
-  image.lastDrawnValue = code;
-
-  startPerfLog("drawCodedImage");
-}
-
-function getWeatherCode(){
-  var jsonWeather = require("Storage").readJSON('weather.json');
-  var weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
-
-  if (weather && weather.code){
-    return weather.code;
-  }
-  return undefined;
-}
-
-function getWeatherTemperature(){
-  var jsonWeather = require("Storage").readJSON('weather.json');
-  var weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
-
-  var result = { unit: "unknown"};
-  if (weather && weather.temp){
-    //print("Weather is", weather);
-    var temp = require('locale').temp(weather.temp-273.15);
-    result.value = Number(temp.match(/[\d\-]*/)[0]);
-    var unit;
-    if (temp.includes("C")){
-      result.unit = "celsius";
-    } else if (temp.includes("F")){
-      result.unit = "fahrenheit";
-    }
-  }
-  return result;
-}
-
-function scaledown(value, min, max){
-  //print("scaledown", value, min, max);
-  var scaled = E.clip(getValue(value),getValue(min,0),getValue(max,1));
-  scaled -= getValue(min,0);
-  scaled /= getValue(max,1);
-  return scaled;
-}
-
-function radians(rotation){
-  var value = scaledown(rotation.RotationValue, rotation.MinRotationValue, rotation.MaxRotationValue);
-  value -= rotation.RotationOffset ? rotation.RotationOffset : 0;
-  value *= 360;
-  value *= Math.PI / 180;
-  return value;
-}
-
-function drawPoly(graphics, resources, element){
-    startPerfLog("drawPoly");
-    var vertices = [];
-
-    startPerfLog("drawPoly_transform");
-    for (var c of element.Vertices){
-      vertices.push(c.X);
-      vertices.push(c.Y);
-    }
-    var transform = { x: element.X ? element.X : 0,
-      y: element.Y ? element.Y : 0
+  if (settings.perflog){
+    startPerfLog = function(name){
+      let time = getTime();
+      if (!performanceLog.start) performanceLog.start={};
+      performanceLog.start[name] = time;
+    };
+    endPerfLog = function (name){
+      let time = getTime();
+      if (!performanceLog.last) performanceLog.last={};
+      let duration = time - performanceLog.start[name];
+      performanceLog.last[name] = duration;
+      if (!performanceLog.cum) performanceLog.cum={};
+      if (!performanceLog.cum[name]) performanceLog.cum[name] = 0;
+      performanceLog.cum[name] += duration;
+      if (!performanceLog.count) performanceLog.count={};
+      if (!performanceLog.count[name]) performanceLog.count[name] = 0;
+      performanceLog.count[name]++;
     };
-    if (element.RotationValue){
-      transform.rotate = radians(element);
-    }
-    vertices = graphics.transformVertices(vertices, transform);
 
-    endPerfLog("drawPoly_transform");
-
-    if (element.Filled){
-      startPerfLog("drawPoly_g.fillPoly");
-      graphics.fillPoly(vertices,true);
-      endPerfLog("drawPoly_g.fillPoly");
-    } else {
-      startPerfLog("drawPoly_g.drawPoly");
-      graphics.drawPoly(vertices,true);
-      endPerfLog("drawPoly_g.drawPoly");
-    }
-
-    endPerfLog("drawPoly");
-}
-
-function drawRect(graphics, resources, element){
-    startPerfLog("drawRect");
-    var vertices = [];
-
-    if (element.Filled){
-      startPerfLog("drawRect_g.fillRect");
-      graphics.fillRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
-      endPerfLog("drawRect_g.fillRect");
-    } else {
-      startPerfLog("drawRect_g.fillRect");
-      graphics.drawRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
-      endPerfLog("drawRect_g.fillRect");
-    }
-    endPerfLog("drawRect");
-}
-
-function drawCircle(graphics, resources, element){
-    startPerfLog("drawCircle");
-
-    if (element.Filled){
-      startPerfLog("drawCircle_g.fillCircle");
-      graphics.fillCircle(element.X, element.Y, element.Radius);
-      endPerfLog("drawCircle_g.fillCircle");
-    } else {
-      startPerfLog("drawCircle_g.drawCircle");
-      graphics.drawCircle(element.X, element.Y, element.Radius);
-      endPerfLog("drawCircle_g.drawCircle");
-    }
-    endPerfLog("drawCircle");
-}
-
-var numbers = {};
-numbers.Hour = () => { return new Date().getHours(); };
-numbers.HourTens = () => { return Math.floor(new Date().getHours()/10); };
-numbers.HourOnes = () => { return Math.floor(new Date().getHours()%10); };
-numbers.Hour12 = () => { return new Date().getHours()%12; };
-numbers.Hour12Analog = () => { var date = new Date(); return date.getHours()%12 + (date.getMinutes()/59); };
-numbers.Hour12Tens = () => { return Math.floor((new Date().getHours()%12)/10); };
-numbers.Hour12Ones = () => { return Math.floor((new Date().getHours()%12)%10); };
-numbers.Minute = () => { return new Date().getMinutes(); };
-numbers.MinuteAnalog = () => { var date = new Date(); return date.getMinutes() + (date.getSeconds()/59); };
-numbers.MinuteTens = () => { return Math.floor(new Date().getMinutes()/10); };
-numbers.MinuteOnes = () => { return Math.floor(new Date().getMinutes()%10); };
-numbers.Second = () => { return new Date().getSeconds(); };
-numbers.SecondAnalog = () => { var date = new Date(); return date.getSeconds() + (date.getMilliseconds()/999); };
-numbers.SecondTens = () => { return Math.floor(new Date().getSeconds()/10); };
-numbers.SecondOnes = () => { return Math.floor(new Date().getSeconds()%10); };
-numbers.WeekDay = () => { return new Date().getDay(); };
-numbers.WeekDayMondayFirst = () => {  var day = (new Date().getDay() - 1); if (day < 0) day = 7 + day; return day; };
-numbers.Day = () => { return new Date().getDate(); };
-numbers.DayTens = () => { return Math.floor(new Date().getDate()/10); };
-numbers.DayOnes = () => { return Math.floor(new Date().getDate()%10); };
-numbers.Month = () => { return new Date().getMonth() + 1; };
-numbers.MonthTens = () => { return Math.floor((new Date().getMonth() + 1)/10); };
-numbers.MonthOnes = () => { return Math.floor((new Date().getMonth() + 1)%10); };
-numbers.Pulse = () => { return pulse; };
-numbers.Steps = () => { return Bangle.getHealthStatus ? Bangle.getHealthStatus("day").steps : undefined; };
-numbers.StepsGoal = () => { return settings.stepsgoal || 10000; };
-numbers.Temperature = () => { return temp; };
-numbers.Pressure = () => { return press; };
-numbers.Altitude = () => { return alt; };
-numbers.BatteryPercentage = E.getBattery;
-numbers.BatteryVoltage = NRF.getBattery;
-numbers.WeatherCode = getWeatherCode;
-numbers.WeatherTemperature = () => { return getWeatherTemperature().value; };
-
-var multistates = {};
-multistates.Lock = () => { return Bangle.isLocked() ? "on" : "off"; };
-multistates.Charge = () => { return Bangle.isCharging() ? "on" : "off"; };
-multistates.Notifications = () => { return ((require("Storage").readJSON("setting.json", 1) || {}).quiet|0) ? "off" : "vibrate"; };
-multistates.Alarm = () => { return (require('Storage').readJSON('alarm.json',1)||[]).some(alarm=>alarm.on) ? "on" : "off"; };
-multistates.Bluetooth = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
-//TODO: Implement peripheral connection status
-multistates.BluetoothPeripheral = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
-multistates.HRM = () => { return Bangle.isHRMOn ? "on" : "off"; };
-multistates.Barometer = () => { return Bangle.isBarometerOn() ? "on" : "off"; };
-multistates.Compass = () => { return Bangle.isCompassOn() ? "on" : "off"; };
-multistates.GPS = () => { return Bangle.isGPSOn() ? "on" : "off"; };
-multistates.WeatherTemperatureNegative = () => { return getWeatherTemperature().value ? getWeatherTemperature().value : 0 < 0; };
-multistates.WeatherTemperatureUnit = () => { return getWeatherTemperature().unit; };
-multistates.StepsGoal = () => { return (numbers.Steps() >= (settings.stepsgoal || 10000)) ? "on": "off"; };
-
-function drawMultiState(graphics, resources, element){
-  startPerfLog("drawMultiState");
-  //print("drawMultiState", element);
-  var value = multistates[element.Value]();
-  //print("drawImage from drawMultiState", element, value);
-  drawImage(graphics, resources, element, value);
-  element.lastDrawnValue = value;
-  endPerfLog("drawMultiState");
-}
-
-var pulse,alt,temp,press;
-
-
-var requestedDraws = 0;
-var isDrawing = false;
-
-var drawingTime;
-
-var start;
-
-function initialDraw(resources, face){
-  //print("Free memory", process.memory(false).free);
-  requestedDraws++;
-  if (!isDrawing){
-    //print(new Date().toISOString(), "Can draw,", requestedDraws, "draws requested so far");
-    isDrawing = true;
-    resetPerfLog();
-    requestedDraws = 0;
-    //print(new Date().toISOString(), "Drawing start");
-    startPerfLog("initialDraw");
-    //start = Date.now();
-    drawingTime = 0;
-    //print("Precompiled");
-    var promise = precompiledJs(watchfaceResources, watchface);
-
-    promise.then(()=>{
-      var currentDrawingTime = Date.now();
-      if (showWidgets){
-        //print("Draw widgets");
-        Bangle.drawWidgets();
-        g.setColor(g.theme.fg);
-        g.drawLine(0,24,g.getWidth(),24);
+    Bangle.printPerfLog = function(){
+      let result = "";
+      let keys = [];
+      for (let c in performanceLog.cum){
+        keys.push(c);
       }
-      lastDrawTime = Date.now() - start;
-      drawingTime += Date.now() - currentDrawingTime;
-      //print(new Date().toISOString(), "Drawing done in", lastDrawTime.toFixed(0), "active:", drawingTime.toFixed(0));
-      isDrawing=false;
-      firstDraw=false;
-      requestRefresh = false;
-      endPerfLog("initialDraw");
-    }).catch((e)=>{
-      print("Error during drawing", e);
-    });
+      keys.sort();
+      for (let k of keys){
+        print(k, "last:", (performanceLog.last[k] * 1000).toFixed(0), "average:", (performanceLog.cum[k]/performanceLog.count[k]*1000).toFixed(0), "count:", performanceLog.count[k], "total:", (performanceLog.cum[k] * 1000).toFixed(0));
+      }
+    };
+  }
 
-    if (requestedDraws > 0){
-      //print(new Date().toISOString(), "Had deferred drawing left, drawing again");
+  startPerfLog("loadFunctions");
+
+  let delayTimeouts = {};
+  let timeoutCount = 0;
+
+  let delay = function(t) {
+      return new Promise(function (resolve) {
+        const i = timeoutCount++;
+        let timeout = setTimeout(()=>{
+          resolve();
+          delete delayTimeouts[i];
+        }, t);
+        delayTimeouts[i] = timeout;
+        //print("Add delay timeout", delayTimeouts);
+      });
+  };
+
+  let cleanupDelays = function(){
+    //print("Cleanup delays", delayTimeouts);
+    for (let t of delayTimeouts){
+      clearTimeout(t);
+    }
+    delayTimeouts = {};
+  };
+  
+  let prepareImg = function(resource){
+    startPerfLog("prepareImg");
+    //print("prepareImg: ", resource);
+
+    if (resource.dataOffset !== undefined){
+      resource.buffer = E.toArrayBuffer(require("Storage").read("imageclock.resources.data", resource.dataOffset, resource.dataLength));
+      delete resource.dataOffset;
+      delete resource.dataLength;
+      if (resource.paletteData){
+        resource.palette = new Uint16Array(resource.paletteData);
+        delete resource.paletteData;
+      }
+    }
+    endPerfLog("prepareImg");
+    return resource;
+  };
+
+  let getByPath = function(object, path, lastElem){
+    startPerfLog("getByPath");
+    //print("getByPath", path,lastElem);
+    let current = object;
+    if (path.length) {
+      for (let c of path){
+        if (!current[c]) return undefined;
+        current = current[c];
+      }
+    }
+    if (lastElem!==undefined){
+      if (!current["" + lastElem]) return undefined;
+      //print("Found by lastElem", lastElem);
+      current = current["" + lastElem];
+    }
+    endPerfLog("getByPath");
+    if (typeof current == "function"){
+      //print("current was function");
+      return undefined;
+    }
+    return current;
+  };
+
+  let splitNumberToDigits = function(num){
+    return String(num).split('').map(item => Number(item));
+  };
+
+  let isChangedNumber = function(element){
+    return element.lastDrawnValue != getValue(element.Value);
+  };
+
+  let isChangedMultistate = function(element){
+    return element.lastDrawnValue != getMultistate(element.Value);
+  };
+
+  let drawNumber = function(graphics, resources, element){
+    startPerfLog("drawNumber");
+    let number = getValue(element.Value);
+    //print("drawNumber: ", number, element);
+    let spacing = element.Spacing ? element.Spacing : 0;
+    let unit = element.Unit;
+
+    let imageIndexMinus = element.ImageIndexMinus;
+    let imageIndexUnit = element.ImageIndexUnit;
+    let numberOfDigits = element.Digits;
+
+
+    if (number) number = number.toFixed(0);
+
+    let isNegative;
+    let digits;
+    if (number == undefined){
+      isNegative = true;
+      digits = [];
+      numberOfDigits = 0;
+    } else {
+      isNegative = number < 0;
+      if (isNegative) number *= -1;
+      digits = splitNumberToDigits(number);
+    }
+
+    //print("digits: ", digits);
+    if (!numberOfDigits) numberOfDigits = digits.length;
+    let firstDigitX = element.X;
+    let firstDigitY = element.Y;
+    let imageIndex = element.ImageIndex ? element.ImageIndex : 0;
+
+    let firstImage;
+    if (imageIndex){
+      firstImage = getByPath(resources, [], "" + (0 + imageIndex));
+    } else {
+      firstImage = getByPath(resources, element.ImagePath, 0);
+    }
+
+    let minusImage;
+    if (imageIndexMinus){
+      minusImage = getByPath(resources, [], "" + (0 + imageIndexMinus));
+    } else {
+      minusImage = getByPath(resources, element.ImagePath, "minus");
+    }
+
+    let unitImage;
+    //print("Get image for unit", imageIndexUnit);
+    if (imageIndexUnit !== undefined){
+      unitImage = getByPath(resources, [], "" + (0 + imageIndexUnit));
+      //print("Unit image is", unitImage);
+    } else if (element.Unit){
+      unitImage = getByPath(resources, element.ImagePath, getMultistate(element.Unit, "unknown"));
+    }
+
+    let numberWidth = (numberOfDigits * firstImage.width) + (Math.max((numberOfDigits - 1),0) * spacing);
+    if (isNegative && minusImage){
+      //print("Adding to width", minusImage);
+      numberWidth += minusImage.width + spacing;
+    }
+    if (unitImage){
+      //print("Adding to width", unitImage);
+      numberWidth += unitImage.width + spacing;
+    }
+    //print("numberWidth:", numberWidth);
+
+    if (element.Alignment == "Center") {
+      firstDigitX = Math.round(element.X - (numberWidth/2)) + 1;
+      firstDigitY = Math.round(element.Y - (firstImage.height/2)) + 1;
+    } else if (element.Alignment == "BottomRight"){
+      firstDigitX = element.X - numberWidth + 1;
+      firstDigitY = element.Y - firstImage.height + 1;
+    } else if (element.Alignment == "TopRight") {
+      firstDigitX = element.X - numberWidth + 1;
+      firstDigitY = element.Y;
+    } else if (element.Alignment == "BottomLeft") {
+      firstDigitX = element.X;
+      firstDigitY = element.Y - firstImage.height + 1;
+    }
+
+    let currentX = firstDigitX;
+    if (isNegative && minusImage){
+      //print("Draw minus at", currentX);
+      if (imageIndexMinus){
+        drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexMinus));
+      } else {
+        drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "minus");
+      }
+      currentX += minusImage.width + spacing;
+    }
+    for (let d = 0; d < numberOfDigits; d++){
+      let currentDigit;
+      let difference = numberOfDigits - digits.length;
+      if (d >= difference){
+        currentDigit = digits[d-difference];
+      } else {
+        currentDigit = 0;
+      }
+      //print("Digit", currentDigit, currentX);
+      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, currentDigit + imageIndex);
+      currentX += firstImage.width + spacing;
+    }
+    if (imageIndexUnit){
+      //print("Draw unit at", currentX);
+      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, "" + (0 + imageIndexUnit));
+    } else if (element.Unit){
+      drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, getMultistate(element.Unit,"unknown"));
+    }
+    element.lastDrawnValue = number;
+
+    endPerfLog("drawNumber");
+  };
+
+  let drawElement = function(graphics, resources, pos, element, lastElem){
+    startPerfLog("drawElement");
+    let cacheKey = "_"+(lastElem?lastElem:"nole");
+    if (!element.cachedImage) element.cachedImage={};
+    if (!element.cachedImage[cacheKey]){
+      let resource = getByPath(resources, element.ImagePath, lastElem);
+      if (resource){
+        prepareImg(resource);
+        //print("lastElem", typeof resource)
+        if (resource) {
+          element.cachedImage[cacheKey] = resource;
+          //print("cache res ",typeof element.cachedImage[cacheKey]);
+        } else {
+          element.cachedImage[cacheKey] = null;
+          //print("cache null",typeof element.cachedImage[cacheKey]);
+          //print("Could not create image from", resource);
+        }
+      } else {
+        //print("Could not get resource from", element, lastElem);
+      }
+    }
+
+    //print("cache ", typeof element.cachedImage[cacheKey], element.ImagePath, lastElem);
+    if(element.cachedImage[cacheKey]){
+      //print("drawElement ", pos, element, lastElem);
+      let options={};
+      if (element.RotationValue){
+        options.rotate = radians(element);
+      }
+      if (element.Scale){
+        options.scale = element.ScaleValue;
+      }
+      //print("options", options);
+      //print("Memory before drawing", process.memory(false));
+      startPerfLog("drawElement_g.drawImage");
+      try{
+      graphics.drawImage(element.cachedImage[cacheKey] ,(pos.X ? pos.X : 0), (pos.Y ? pos.Y : 0), options);} catch (e) {
+        //print("Error", e, element.cachedImage[cacheKey]);
+      }
+      endPerfLog("drawElement_g.drawImage");
+    }
+    endPerfLog("drawElement");
+  };
+
+  let getValue = function(value, defaultValue){
+    startPerfLog("getValue");
+    if (typeof value == "string"){
+      return numbers[value]();
+    }
+    if (value == undefined) return defaultValue;
+    endPerfLog("getValue");
+    return value;
+  };
+
+  let getMultistate = function(name, defaultValue){
+    startPerfLog("getMultistate");
+    if (typeof name == "string"){
+      return multistates[name]();
+    } else {
+      if (name == undefined) return defaultValue;
+    }
+    endPerfLog("getMultistate");
+    return undefined;
+  };
+
+  let drawScale = function(graphics, resources, scale){
+    startPerfLog("drawScale");
+    //print("drawScale", scale);
+    let segments = scale.Segments;
+    let imageIndex = scale.ImageIndex !== undefined ? scale.ImageIndex : 0;
+
+    let value = scaledown(scale.Value, scale.MinValue, scale.MaxValue);
+    let segmentsToDraw = Math.ceil(value * segments.length);
+
+    for (let i = 0; i < segmentsToDraw; i++){
+      drawElement(graphics, resources, segments[i], scale, imageIndex + i);
+    }
+    scale.lastDrawnValue = segmentsToDraw;
+
+    endPerfLog("drawScale");
+  };
+
+  let drawImage = function(graphics, resources, image, name){
+    startPerfLog("drawImage");
+    //print("drawImage", image.X, image.Y, name);
+    if (image.Value && image.Steps){
+      let steps = Math.floor(scaledown(image.Value, image.MinValue, image.MaxValue) * (image.Steps - 1));
+      //print("Step", steps, "of", image.Steps);
+      drawElement(graphics, resources, image, image, "" + steps);
+    } else if (image.ImageIndex !== undefined) {
+      drawElement(graphics, resources, image, image, image.ImageIndex);
+    } else {
+      drawElement(graphics, resources, image, image, name ? "" + name: undefined);
+    }
+
+    endPerfLog("drawImage");
+  };
+
+  let drawCodedImage = function(graphics, resources, image){
+    startPerfLog("drawCodedImage");
+    let code = getValue(image.Value);
+    //print("drawCodedImage", image, code);
+
+    if (image.ImagePath) {
+      let factor = 1;
+      let currentCode = code;
+      while (code / factor > 1){
+        currentCode = Math.floor(currentCode/factor)*factor;
+        //print("currentCode", currentCode);
+        if (getByPath(resources, image.ImagePath, currentCode)){
+          break;
+        }
+        factor *= 10;
+      }
+      if (code / factor > 1){
+        //print("found match");
+        drawImage(graphics, resources, image, currentCode);
+      } else {
+        //print("fallback");
+        drawImage(graphics, resources, image, "fallback");
+      }
+    }
+    image.lastDrawnValue = code;
+
+    startPerfLog("drawCodedImage");
+  };
+
+  let getWeatherCode = function(){
+    let jsonWeather = require("Storage").readJSON('weather.json');
+    let weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
+
+    if (weather && weather.code){
+      return weather.code;
+    }
+    return undefined;
+  };
+
+  let getWeatherTemperature = function(){
+    let jsonWeather = require("Storage").readJSON('weather.json');
+    let weather = (jsonWeather && jsonWeather.weather) ? jsonWeather.weather : undefined;
+
+    let result = { unit: "unknown"};
+    if (weather && weather.temp){
+      //print("Weather is", weather);
+      let temp = require('locale').temp(weather.temp-273.15);
+      result.value = Number(temp.match(/[\d\-]*/)[0]);
+      let unit;
+      if (temp.includes("C")){
+        result.unit = "celsius";
+      } else if (temp.includes("F")){
+        result.unit = "fahrenheit";
+      }
+    }
+    return result;
+  };
+
+  let scaledown = function(value, min, max){
+    //print("scaledown", value, min, max);
+    let scaled = E.clip(getValue(value),getValue(min,0),getValue(max,1));
+    scaled -= getValue(min,0);
+    scaled /= getValue(max,1);
+    return scaled;
+  };
+
+  let radians = function(rotation){
+    let value = scaledown(rotation.RotationValue, rotation.MinRotationValue, rotation.MaxRotationValue);
+    value -= rotation.RotationOffset ? rotation.RotationOffset : 0;
+    value *= 360;
+    value *= Math.PI / 180;
+    return value;
+  };
+
+  let drawPoly = function(graphics, resources, element){
+      startPerfLog("drawPoly");
+      let vertices = [];
+
+      startPerfLog("drawPoly_transform");
+      for (let c of element.Vertices){
+        vertices.push(c.X);
+        vertices.push(c.Y);
+      }
+      let transform = { x: element.X ? element.X : 0,
+        y: element.Y ? element.Y : 0
+      };
+      if (element.RotationValue){
+        transform.rotate = radians(element);
+      }
+      vertices = graphics.transformVertices(vertices, transform);
+
+      endPerfLog("drawPoly_transform");
+
+      if (element.Filled){
+        startPerfLog("drawPoly_g.fillPoly");
+        graphics.fillPoly(vertices,true);
+        endPerfLog("drawPoly_g.fillPoly");
+      } else {
+        startPerfLog("drawPoly_g.drawPoly");
+        graphics.drawPoly(vertices,true);
+        endPerfLog("drawPoly_g.drawPoly");
+      }
+
+      endPerfLog("drawPoly");
+  };
+
+  let drawRect = function(graphics, resources, element){
+      startPerfLog("drawRect");
+      let vertices = [];
+
+      if (element.Filled){
+        startPerfLog("drawRect_g.fillRect");
+        graphics.fillRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
+        endPerfLog("drawRect_g.fillRect");
+      } else {
+        startPerfLog("drawRect_g.fillRect");
+        graphics.drawRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
+        endPerfLog("drawRect_g.fillRect");
+      }
+      endPerfLog("drawRect");
+  };
+
+  let drawCircle = function(graphics, resources, element){
+      startPerfLog("drawCircle");
+
+      if (element.Filled){
+        startPerfLog("drawCircle_g.fillCircle");
+        graphics.fillCircle(element.X, element.Y, element.Radius);
+        endPerfLog("drawCircle_g.fillCircle");
+      } else {
+        startPerfLog("drawCircle_g.drawCircle");
+        graphics.drawCircle(element.X, element.Y, element.Radius);
+        endPerfLog("drawCircle_g.drawCircle");
+      }
+      endPerfLog("drawCircle");
+  };
+
+  let numbers = {};
+  numbers.Hour = () => { return new Date().getHours(); };
+  numbers.HourTens = () => { return Math.floor(new Date().getHours()/10); };
+  numbers.HourOnes = () => { return Math.floor(new Date().getHours()%10); };
+  numbers.Hour12 = () => { return new Date().getHours()%12; };
+  numbers.Hour12Analog = () => { let date = new Date(); return date.getHours()%12 + (date.getMinutes()/59); };
+  numbers.Hour12Tens = () => { return Math.floor((new Date().getHours()%12)/10); };
+  numbers.Hour12Ones = () => { return Math.floor((new Date().getHours()%12)%10); };
+  numbers.Minute = () => { return new Date().getMinutes(); };
+  numbers.MinuteAnalog = () => { let date = new Date(); return date.getMinutes() + (date.getSeconds()/59); };
+  numbers.MinuteTens = () => { return Math.floor(new Date().getMinutes()/10); };
+  numbers.MinuteOnes = () => { return Math.floor(new Date().getMinutes()%10); };
+  numbers.Second = () => { return new Date().getSeconds(); };
+  numbers.SecondAnalog = () => { let date = new Date(); return date.getSeconds() + (date.getMilliseconds()/999); };
+  numbers.SecondTens = () => { return Math.floor(new Date().getSeconds()/10); };
+  numbers.SecondOnes = () => { return Math.floor(new Date().getSeconds()%10); };
+  numbers.WeekDay = () => { return new Date().getDay(); };
+  numbers.WeekDayMondayFirst = () => {  let day = (new Date().getDay() - 1); if (day < 0) day = 7 + day; return day; };
+  numbers.Day = () => { return new Date().getDate(); };
+  numbers.DayTens = () => { return Math.floor(new Date().getDate()/10); };
+  numbers.DayOnes = () => { return Math.floor(new Date().getDate()%10); };
+  numbers.Month = () => { return new Date().getMonth() + 1; };
+  numbers.MonthTens = () => { return Math.floor((new Date().getMonth() + 1)/10); };
+  numbers.MonthOnes = () => { return Math.floor((new Date().getMonth() + 1)%10); };
+  numbers.Pulse = () => { return pulse; };
+  numbers.Steps = () => { return Bangle.getHealthStatus ? Bangle.getHealthStatus("day").steps : undefined; };
+  numbers.StepsGoal = () => { return settings.stepsgoal || 10000; };
+  numbers.Temperature = () => { return temp; };
+  numbers.Pressure = () => { return press; };
+  numbers.Altitude = () => { return alt; };
+  numbers.BatteryPercentage = E.getBattery;
+  numbers.BatteryVoltage = NRF.getBattery;
+  numbers.WeatherCode = getWeatherCode;
+  numbers.WeatherTemperature = () => { return getWeatherTemperature().value; };
+
+  let multistates = {};
+  multistates.Lock = () => { return Bangle.isLocked() ? "on" : "off"; };
+  multistates.Charge = () => { return Bangle.isCharging() ? "on" : "off"; };
+  multistates.Notifications = () => { return ((require("Storage").readJSON("setting.json", 1) || {}).quiet|0) ? "off" : "vibrate"; };
+  multistates.Alarm = () => { return (require('Storage').readJSON('alarm.json',1)||[]).some(alarm=>alarm.on) ? "on" : "off"; };
+  multistates.Bluetooth = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
+  //TODO: Implement peripheral connection status
+  multistates.BluetoothPeripheral = () => { return NRF.getSecurityStatus().connected ? "on" : "off"; };
+  multistates.HRM = () => { return Bangle.isHRMOn ? "on" : "off"; };
+  multistates.Barometer = () => { return Bangle.isBarometerOn() ? "on" : "off"; };
+  multistates.Compass = () => { return Bangle.isCompassOn() ? "on" : "off"; };
+  multistates.GPS = () => { return Bangle.isGPSOn() ? "on" : "off"; };
+  multistates.WeatherTemperatureNegative = () => { return getWeatherTemperature().value ? getWeatherTemperature().value : 0 < 0; };
+  multistates.WeatherTemperatureUnit = () => { return getWeatherTemperature().unit; };
+  multistates.StepsGoal = () => { return (numbers.Steps() >= (settings.stepsgoal || 10000)) ? "on": "off"; };
+
+  let drawMultiState = function(graphics, resources, element){
+    startPerfLog("drawMultiState");
+    //print("drawMultiState", element);
+    let value = multistates[element.Value]();
+    //print("drawImage from drawMultiState", element, value);
+    drawImage(graphics, resources, element, value);
+    element.lastDrawnValue = value;
+    endPerfLog("drawMultiState");
+  };
+
+  let pulse,alt,temp,press;
+
+
+  let requestedDraws = 0;
+  let isDrawing = false;
+
+  let start;
+  
+  let deferredTimout;
+
+  let initialDraw = function(resources, face){
+    //print("Free memory", process.memory(false).free);
+    requestedDraws++;
+    if (!isDrawing){
+      cleanupDelays();
+      //print(new Date().toISOString(), "Can draw,", requestedDraws, "draws requested so far");
+      isDrawing = true;
       requestedDraws = 0;
-      setTimeout(()=>{initialDraw(resources, face);}, 10);
-    }
-  } //else {
-    //print("queued draw");
-  //}
-}
+      //print(new Date().toISOString(), "Drawing start");
+      startPerfLog("initialDraw");
+      //print("Precompiled");
+      let promise = precompiledJs(watchfaceResources, watchface);
 
-function handleHrm(e){
-  if (e.confidence > 70){
-    pulse = e.bpm;
-    if (!redrawEvents || redrawEvents.includes("HRM") && !Bangle.isLocked()){
-      //print("Redrawing on HRM");
+      promise.then(()=>{
+        let currentDrawingTime = Date.now();
+        if (showWidgets && global.WIDGETS){
+          //print("Draw widgets");
+          restoreWidgetDraw();
+          Bangle.drawWidgets();
+          g.setColor(g.theme.fg);
+          g.drawLine(0,24,g.getWidth(),24);
+        }
+        lastDrawTime = Date.now() - start;
+        isDrawing=false;
+        firstDraw=false;
+        requestRefresh = false;
+        endPerfLog("initialDraw");
+      }).catch((e)=>{
+        print("Error during drawing", e);
+      });
+
+      if (requestedDraws > 0){
+        //print(new Date().toISOString(), "Had deferred drawing left, drawing again");
+        requestedDraws = 0;
+        //print("Clear deferred timeout", deferredTimout);
+        clearTimeout(deferredTimeout);
+        deferredTimout = setTimeout(()=>{initialDraw(resources, face);}, 10);
+      }
+    } //else {
+      //print("queued draw");
+    //}
+  };
+
+  let handleHrm = function(e){
+    if (e.confidence > 70){
+      pulse = e.bpm;
+      if (!redrawEvents || redrawEvents.includes("HRM") && !Bangle.isLocked()){
+        //print("Redrawing on HRM");
+        initialDraw(watchfaceResources, watchface);
+      }
+    }
+  };
+
+  let handlePressure = function(e){
+    alt = e.altitude;
+    temp = e.temperature;
+    press = e.pressure;
+    if (!redrawEvents || redrawEvents.includes("pressure") && !Bangle.isLocked()){
+      //print("Redrawing on pressure");
       initialDraw(watchfaceResources, watchface);
     }
-  }
-}
+  };
 
-function handlePressure(e){
-  alt = e.altitude;
-  temp = e.temperature;
-  press = e.pressure;
-  if (!redrawEvents || redrawEvents.includes("pressure") && !Bangle.isLocked()){
-    //print("Redrawing on pressure");
-    initialDraw(watchfaceResources, watchface);
-  }
-}
-
-function handleCharging(e){
-  if (!redrawEvents || redrawEvents.includes("charging") && !Bangle.isLocked()){
-    //print("Redrawing on charging");
-    initialDraw(watchfaceResources, watchface);
-  }
-}
-
-
-function getMatchedWaitingTime(time){
-  var result = time - (Date.now() % time);
-  //print("Matched timeout", time, result);
-  return result;
-}
-
-
-
-function setMatchedInterval(callable, time, intervalHandler, delay){
-  //print("Setting matched interval for", time);
-  var matchedTime = getMatchedWaitingTime(time + delay);
-  setTimeout(()=>{
-    var interval = setInterval(callable, time);
-    if (intervalHandler) intervalHandler(interval);
-    callable();
-  }, matchedTime);
-}
-
-var unlockedDrawInterval;
-var lockedDrawInterval;
-
-var lastDrawTime = 0;
-var firstDraw = true;
-
-var lockedRedraw = getByPath(watchface, ["Properties","Redraw","Locked"]) || 60000;
-var unlockedRedraw = getByPath(watchface, ["Properties","Redraw","Unlocked"]) || 1000;
-var defaultRedraw = getByPath(watchface, ["Properties","Redraw","Default"]) || "Always";
-var redrawEvents = getByPath(watchface, ["Properties","Redraw","Events"]);
-var clearOnRedraw = getByPath(watchface, ["Properties","Redraw","Clear"]);
-var events = getByPath(watchface, ["Properties","Events"]);
-
-//print("events", events);
-//print("redrawEvents", redrawEvents);
-
-function handleLock(isLocked, forceRedraw){
-  //print("isLocked", Bangle.isLocked());
-  if (lockedDrawInterval) clearInterval(lockedDrawInterval);
-  if (unlockedDrawInterval) clearInterval(unlockedDrawInterval);
-  if (!isLocked){
-    if (forceRedraw || !redrawEvents || (redrawEvents.includes("unlock"))){
-      //print("Redrawing on unlock", isLocked);
+  let handleCharging = function(e){
+    if (!redrawEvents || redrawEvents.includes("charging") && !Bangle.isLocked()){
+      //print("Redrawing on charging");
       initialDraw(watchfaceResources, watchface);
     }
-    setMatchedInterval(()=>{
-      //print("Redrawing on unlocked interval");
-      initialDraw(watchfaceResources, watchface);
-    },unlockedRedraw, (v)=>{
-      unlockedDrawInterval = v;
-    }, lastDrawTime);
-    if (!events || events.includes("HRM")) Bangle.setHRMPower(1, "imageclock");
-    if (!events || events.includes("pressure")) Bangle.setBarometerPower(1, 'imageclock');
-  } else {
-    if (forceRedraw || !redrawEvents || (redrawEvents.includes("lock"))){
-      //print("Redrawing on lock", isLocked);
-      initialDraw(watchfaceResources, watchface);
+  };
+
+
+  let getMatchedWaitingTime = function(time){
+    let result = time - (Date.now() % time);
+    //print("Matched wating time", time, result);
+    return result;
+  };
+
+  let setMatchedInterval = function(callable, time, intervalHandler, delay){
+    //print("Setting matched interval for", time, intervalHandler);
+    if (!delay) delay = 0;
+    let matchedTime = getMatchedWaitingTime(time + delay);
+    return setTimeout(()=>{
+      let interval = setInterval(callable, time);
+      //print("setMatchedInterval", interval);
+      if (intervalHandler) intervalHandler(interval);
+      callable();
+    }, matchedTime);
+  };
+
+  endPerfLog("loadFunctions");
+
+  let lastDrawTime = 0;
+
+  startPerfLog("loadProperties");
+  let lockedRedraw = getByPath(watchface, ["Properties","Redraw","Locked"]) || 60000;
+  let unlockedRedraw = getByPath(watchface, ["Properties","Redraw","Unlocked"]) || 1000;
+  let defaultRedraw = getByPath(watchface, ["Properties","Redraw","Default"]) || "Always";
+  let redrawEvents = getByPath(watchface, ["Properties","Redraw","Events"]);
+  let clearOnRedraw = getByPath(watchface, ["Properties","Redraw","Clear"]);
+  let events = getByPath(watchface, ["Properties","Events"]);
+  endPerfLog("loadProperties");
+
+  //print("events", events);
+  //print("redrawEvents", redrawEvents);
+
+  let initialDrawTimeoutUnlocked;
+  let initialDrawTimeoutLocked;
+  
+  let handleLock = function(isLocked, forceRedraw){
+    //print("isLocked", Bangle.isLocked());
+    for (let i of unlockedDrawInterval){
+      //print("Clearing unlocked", i);
+      clearInterval(i);
     }
-    setMatchedInterval(()=>{
-      //print("Redrawing on locked interval");
-      initialDraw(watchfaceResources, watchface);
-    },lockedRedraw, (v)=>{
-      lockedDrawInterval = v;
-    }, lastDrawTime);
-    Bangle.setHRMPower(0, "imageclock");
-    Bangle.setBarometerPower(0, 'imageclock');
-  }
-}
+    for (let i of lockedDrawInterval){
+      //print("Clearing locked", i);
+      clearInterval(i);
+    }
+    unlockedDrawInterval = [];
+    lockedDrawInterval = [];
+
+    if (!isLocked){
+      if (forceRedraw || !redrawEvents || (redrawEvents.includes("unlock"))){
+        //print("Redrawing on unlock", isLocked);
+        initialDraw(watchfaceResources, watchface);
+      }
+      if (initialDrawTimeoutUnlocked){
+        //print("clear initialDrawTimeUnlocked timet", initialDrawTimeoutUnlocked);
+        clearTimeout(initialDrawTimeoutUnlocked);
+      }
+      initialDrawTimeoutUnlocked = setMatchedInterval(()=>{
+        //print("Redrawing on unlocked interval");
+        initialDraw(watchfaceResources, watchface);
+      },unlockedRedraw, (v)=>{
+        //print("New matched unlocked interval", v);
+        unlockedDrawInterval.push(v);
+      }, lastDrawTime);
+      if (!events || events.includes("HRM")) Bangle.setHRMPower(1, "imageclock");
+      if (!events || events.includes("pressure")) Bangle.setBarometerPower(1, 'imageclock');
+    } else {
+      if (forceRedraw || !redrawEvents || (redrawEvents.includes("lock"))){
+        //print("Redrawing on lock", isLocked);
+        initialDraw(watchfaceResources, watchface);
+      }
+      if (initialDrawTimeoutLocked){
+        clearTimeout(initialDrawTimeoutLocked);
+        //print("clear initialDrawTimeLocked timet", initialDrawTimeoutLocked);
+      }
+      initialDrawTimeoutLocked = setMatchedInterval(()=>{
+        //print("Redrawing on locked interval");
+        initialDraw(watchfaceResources, watchface);
+      },lockedRedraw, (v)=>{
+        //print("New matched locked interval", v);
+        lockedDrawInterval.push(v);
+      }, lastDrawTime);
+      Bangle.setHRMPower(0, "imageclock");
+      Bangle.setBarometerPower(0, 'imageclock');
+    }
+  };
 
 
-var showWidgets = false;
-var showWidgetsChanged = false;
-var currentDragDistance = 0;
+  let showWidgetsChanged = false;
+  let currentDragDistance = 0;
 
-Bangle.setUI("clock");
-Bangle.on('drag', (e)=>{
+  let restoreWidgetDraw = function(){
+    if (global.WIDGETS) {
+      for (let w in global.WIDGETS) {
+        let wd = global.WIDGETS[w];
+        wd.draw = originalWidgetDraw[w];
+        wd.area = originalWidgetArea[w];
+      }
+    }
+  };
+  
+  let handleDrag = function(e){
+    //print("handleDrag");
     currentDragDistance += e.dy;
     if (Math.abs(currentDragDistance) < 10) return;
     dragDown = currentDragDistance > 0;
     currentDragDistance = 0;
     if (!showWidgets && dragDown){
       //print("Enable widgets");
-      if (WIDGETS && typeof WIDGETS === "object") {
-        for (let w in WIDGETS) {
-          var wd = WIDGETS[w];
-          wd.draw = originalWidgetDraw[w];
-          wd.area = originalWidgetArea[w];
-        }
-      }
+      restoreWidgetDraw();
       showWidgetsChanged = true;
     }
     if (showWidgets && !dragDown){
@@ -726,49 +786,91 @@ Bangle.on('drag', (e)=>{
       showWidgets = dragDown;
       initialDraw();
     }
-  }
-);
+  };
 
-if (!events || events.includes("pressure")){
-  Bangle.on('pressure', handlePressure);
-  try{
-    Bangle.setBarometerPower(1, 'imageclock');
-  } catch (e){
-    print("Error during barometer power up", e);
-  }
-}
-if (!events || events.includes("HRM")) {
-  Bangle.on('HRM', handleHrm);
-  Bangle.setHRMPower(1, "imageclock");
-}
-if (!events || events.includes("lock")) {
-  Bangle.on('lock', handleLock);
-}
-if (!events || events.includes("charging")) {
-  Bangle.on('charging', handleCharging);
-}
+  Bangle.on('drag', handleDrag);
 
-var originalWidgetDraw = {};
-var originalWidgetArea = {};
-
-function clearWidgetsDraw(){
-  //print("Clear widget draw calls");
-  if (WIDGETS && typeof WIDGETS === "object") {
-    originalWidgetDraw = {};
-    originalWidgetArea = {};
-    for (let w in WIDGETS) {
-      var wd = WIDGETS[w];
-      originalWidgetDraw[w] = wd.draw;
-      originalWidgetArea[w] = wd.area;
-      wd.draw = () => {};
-      wd.area = "";
+  if (!events || events.includes("pressure")){
+    Bangle.on('pressure', handlePressure);
+    try{
+      Bangle.setBarometerPower(1, 'imageclock');
+    } catch (e){
+      //print("Error during barometer power up", e);
     }
   }
-}
+  if (!events || events.includes("HRM")) {
+    Bangle.on('HRM', handleHrm);
+    Bangle.setHRMPower(1, "imageclock");
+  }
+  if (!events || events.includes("lock")) {
+    Bangle.on('lock', handleLock);
+  }
+  if (!events || events.includes("charging")) {
+    Bangle.on('charging', handleCharging);
+  }
+
+  let originalWidgetDraw = {};
+  let originalWidgetArea = {};
+
+  let clearWidgetsDraw = function(){
+    //print("Clear widget draw calls");
+    if (global.WIDGETS) {
+      originalWidgetDraw = {};
+      originalWidgetArea = {};
+      for (let w in global.WIDGETS) {
+        let wd = global.WIDGETS[w];
+        originalWidgetDraw[w] = wd.draw;
+        originalWidgetArea[w] = wd.area;
+        wd.draw = () => {};
+        wd.area = "";
+      }
+    }
+  }
+  
+  handleLock(Bangle.isLocked(), true);
+
+  Bangle.setUI({ 
+    mode : "clock",
+    remove : function() {
+      //print("remove calls");
+      // Called to unload all of the clock app
+      Bangle.setHRMPower(0, "imageclock");
+      Bangle.setBarometerPower(0, 'imageclock');
+
+      Bangle.removeListener('drag', handleDrag);
+      Bangle.removeListener('lock', handleLock);
+      Bangle.removeListener('charging', handleCharging);
+      Bangle.removeListener('HRM', handleHrm);
+      Bangle.removeListener('pressure', handlePressure);
+
+      if (deferredTimout) clearTimeout(deferredTimout);
+      if (initialDrawTimeoutUnlocked) clearTimeout(initialDrawTimeoutUnlocked);
+      if (initialDrawTimeoutLocked) clearTimeout(initialDrawTimeoutLocked);
+
+      for (let i of unlockedDrawInterval){
+        //print("Clearing unlocked", i);
+        clearInterval(i);
+      }
+      delete unlockedDrawInterval;
+      for (let i of lockedDrawInterval){
+        //print("Clearing locked", i);
+        clearInterval(i);
+      }
+      delete lockedDrawInterval;
+      delete showWidgets;
+      delete firstDraw;
+
+      delete Bangle.printPerfLog;
+      if (settings.perflog){
+        delete Bangle.resetPerfLog;
+        delete performanceLog;
+      }
+
+      cleanupDelays();
+      restoreWidgetDraw();
+    }
+  });
 
-setTimeout(()=>{
   Bangle.loadWidgets();
   clearWidgetsDraw();
-}, 0);
-
-handleLock(Bangle.isLocked());
+}
diff --git a/apps/imageclock/custom.html b/apps/imageclock/custom.html
index af7a1835f..e595b51ca 100644
--- a/apps/imageclock/custom.html
+++ b/apps/imageclock/custom.html
@@ -23,6 +23,8 @@
       Options:</br>
       <input type="checkbox" id="timeoutwrap" name="mode"/>
       <label for="timeoutwrap">Wrap draw calls in timeouts (Slower, more RAM use, better interactivity)</label></br>
+      <input type="checkbox" id="forceOrigPlane" name="mode" disabled="true"/>
+      <label for="forceOrigPlane">Force use of direct drawing (Even faster, but will produce visible artifacts on not optimized watch faces)</label></br>
       <input type="checkbox" id="debugprints" name="mode"/>
       <label for="debugprints">Add debug prints to generated code</label></br>
     </p>
@@ -579,11 +581,8 @@
         return result;
       }
       
-      function convertToCode(elements, properties, wrapInTimeouts){        
+      function convertToCode(elements, properties, wrapInTimeouts, forceUseOrigPlane){        
         var code = "(function (wr, wf) {\n";
-        if (!wrapInTimeouts){
-          code += "var ct=Date.now();\n";
-        }
         code += "var lc;\n";
         code += "var p = Promise.resolve();\n";  
         
@@ -595,7 +594,7 @@
           var c = elements[i].value;
           console.log("Check element", c);
           var name = c.Layer;
-          var plane = wrapInTimeouts ? 1 : 0;
+          var plane = (wrapInTimeouts && !forceUseOrigPlane) ? 1 : 0;
           if (typeof c.Plane == "number"){
             plane = c.Plane;
           }
@@ -610,8 +609,6 @@
         
         console.log("Found planes", planes, "with numbers", planeNumbers)
         
-        if (wrapInTimeouts && planes == 0) planes = 1;
-        
         code += "p0 = g;\n";
         
         for (var planeIndex = 0; planeIndex < planeNumbers.length; planeIndex++){
@@ -624,32 +621,25 @@
           if (plane != 0) code += "if (!p" + plane + ") p" + plane + " = Graphics.createArrayBuffer(g.getWidth(),g.getHeight(),4,{msb:true});\n";
           
           if (properties.Redraw && properties.Redraw.Clear){
-            if (wrapInTimeouts && plane != 0){
+            if (wrapInTimeouts && (plane != 0 || forceUseOrigPlane)){
               code += "p = p.then(()=>delay(0)).then(()=>{\n";
             } else {
               code += "p = p.then(()=>{\n";
             }
-            code += "var ct=Date.now();\n"
             if (addDebug()) code += 'print("Clear for redraw of plane ' + p + '");'+"\n";
             code += 'startPerfLog("initialDraw_g.clear");'+"\n";
             code += "p" + plane + ".clear(true);\n";
             code += 'endPerfLog("initialDraw_g.clear");'+ "\n";
-  
-            code += "drawingTime += Date.now() - ct;\n";
             code += "});\n";
           }
           
           var previousPlane = plane + 1;
           if (previousPlane < planeNumbers.length){
             code += "p = p.then(()=>{\n";
-            code += "var ct=Date.now();\n";
             
             if (addDebug()) code += 'print("Copying of plane ' + previousPlane + ' to display");'+"\n";
             //code += "g.drawImage(p" + i + ".asImage());";
             code += "p0.drawImage({width: p" + previousPlane + ".getWidth(), height: p" + previousPlane + ".getHeight(), bpp: p" + previousPlane + ".getBPP(), buffer: p" + previousPlane + ".buffer, palette: palette});\n";
-            
-            
-            code += "drawingTime += Date.now() - ct;\n";
             code += "});\n";
           }
           
@@ -660,12 +650,6 @@
             console.log("Layer elements", layername, layerElements);
             //code for whole layer
             
-            if (wrapInTimeouts && plane != 0){
-              code += "p = p.then(()=>delay(0)).then(()=>{\n";
-            } else {
-              code += "p = p.then(()=>{\n";
-            }
-            code += "var ct=Date.now();\n";
             if (addDebug()) code += 'print("Starting layer ' + layername + '");' + "\n";
             
             var checkForLayerChange = false;
@@ -732,14 +716,17 @@
               if (addDebug()) code += 'print("Element condition is ' + condition + '");' + "\n";
               code += "" + colorsetting;
               code += (condition.length > 0 ? "if (" + condition + "){\n" : "");
+                if (wrapInTimeouts && (plane != 0 || forceUseOrigPlane)){
+                  code += "p = p.then(()=>delay(0)).then(()=>{\n";
+                } else {
+                  code += "p = p.then(()=>{\n";
+                }            
               if (addDebug()) code += 'print("Drawing element ' + elementIndex + ' with type ' + c.type + ' on plane ' + planeName + '");' + "\n";
               code += "draw" + c.type + "(" + planeName + ", wr, wf.Collapsed[" + elementIndex + "].value);\n";
 
+              code += "});\n";
               code += (condition.length > 0 ? "}\n" : "");
             }
-            
-            code += "drawingTime += Date.now() - ct;\n";
-            code += "});\n";
           }
           console.log("Current plane is", plane);
           
@@ -759,7 +746,7 @@
         var properties = faceJson.Properties;        
         faceJson = { Properties: properties, Collapsed: collapseTree(faceJson,{X:0,Y:0})};
         console.log("After collapsing", faceJson);
-        precompiledJs = convertToCode(faceJson.Collapsed, properties, document.getElementById('timeoutwrap').checked);
+        precompiledJs = convertToCode(faceJson.Collapsed, properties, document.getElementById('timeoutwrap').checked, document.getElementById('forceOrigPlane').checked);
         console.log("After precompiling", precompiledJs);
       }
       
@@ -1011,6 +998,10 @@
         }
       }
      
+      document.getElementById("timeoutwrap").addEventListener("click", function() {
+        document.getElementById("forceOrigPlane").disabled = !document.getElementById("timeoutwrap").checked;
+      });
+     
       document.getElementById("btnSave").addEventListener("click", function() {
         var h = document.createElement('a');
         h.href = 'data:text/json;charset=utf-8,' + encodeURI(JSON.stringify(resultJson));    
diff --git a/apps/imageclock/metadata.json b/apps/imageclock/metadata.json
index c3ece0184..e068b9fa7 100644
--- a/apps/imageclock/metadata.json
+++ b/apps/imageclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "imageclock",
   "name": "Imageclock",
   "shortName": "Imageclock",
-  "version": "0.08",
+  "version": "0.11",
   "type": "clock",
   "description": "BETA!!! File formats still subject to change --- This app is a highly customizable watchface. To use it, you need to select a watchface. You can build the watchfaces yourself without programming anything. All you need to do is write some json and create image files.",
   "icon": "app.png",
diff --git a/apps/imgclock/ChangeLog b/apps/imgclock/ChangeLog
index 01a6a4248..0895bb66d 100644
--- a/apps/imgclock/ChangeLog
+++ b/apps/imgclock/ChangeLog
@@ -7,3 +7,5 @@
 0.06: Support 12 hour time
 0.07: Don't cut off wide date formats
 0.08: Use Bangle.setUI for button/launcher handling
+0.09: Bangle.js 2 compatibility
+0.10: Tell clock widgets to hide.
diff --git a/apps/imgclock/app.js b/apps/imgclock/app.js
index 0e4435638..7d74bee82 100644
--- a/apps/imgclock/app.js
+++ b/apps/imgclock/app.js
@@ -10,8 +10,8 @@ var IX = inf.x, IY = inf.y, IBPP = inf.bpp;
 var IW = 174, IH = 45, OY = 24;
 var bgwidth = img.charCodeAt(0);
 var bgoptions;
-if (bgwidth<240)
-  bgoptions = { scale : 240/bgwidth };
+if (bgwidth<g.getWidth())
+  bgoptions = { scale : g.getWidth()/bgwidth };
 
 require("Font7x11Numeric7Seg").add(Graphics);
 var cg = Graphics.createArrayBuffer(IW,IH,IBPP,{msb:true});
@@ -26,7 +26,7 @@ function createBgImg() {
   require("Storage").write("imgclock.face.bg", cg.buffer);
   bgimg = require("Storage").read("imgclock.face.bg");
 }
-if (!bgimg || !bgimg.length) createBgImg();
+if (!bgimg || bgimg.length<10) createBgImg();
 
 function draw() {
   var t = new Date();
@@ -72,6 +72,8 @@ g.drawImage(img, 0,OY,bgoptions);
 // draw clock itself and do it every second
 draw();
 var secondInterval = setInterval(draw,1000);
+// Show launcher when button pressed
+Bangle.setUI("clock");
 // load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -84,5 +86,4 @@ Bangle.on('lcdPower',on=>{
     draw();
   }
 });
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/imgclock/b2_122240.png b/apps/imgclock/b2_122240.png
new file mode 100644
index 000000000..1a3f4daaa
Binary files /dev/null and b/apps/imgclock/b2_122240.png differ
diff --git a/apps/imgclock/b2_122271.png b/apps/imgclock/b2_122271.png
new file mode 100644
index 000000000..31733fb2c
Binary files /dev/null and b/apps/imgclock/b2_122271.png differ
diff --git a/apps/imgclock/b2_explode.png b/apps/imgclock/b2_explode.png
new file mode 100644
index 000000000..5252bbcd2
Binary files /dev/null and b/apps/imgclock/b2_explode.png differ
diff --git a/apps/imgclock/b2_thisisfine.png b/apps/imgclock/b2_thisisfine.png
new file mode 100644
index 000000000..1b7daaf60
Binary files /dev/null and b/apps/imgclock/b2_thisisfine.png differ
diff --git a/apps/imgclock/custom.html b/apps/imgclock/custom.html
index 2511f8a54..1d8e06c07 100644
--- a/apps/imgclock/custom.html
+++ b/apps/imgclock/custom.html
@@ -5,6 +5,7 @@
   <body>
     <div class="container">
       <div class="columns">
+        Please wait...
       </div>
     </div>
 
@@ -12,13 +13,51 @@
     <script src="../../core/lib/imageconverter.js"></script>
 
     <script>
-      var faces = [
+      var faces = [];
+      const FACES_BANGLE1 = [
         { img:"122240.png", bpp : 8, x:56, y:20, align: 1, col:"#FFFFFF", name:"Cityscape", attrib:"getwallpapers.com", attribLink:"http://getwallpapers.com/collection/8-bit-wallpaper", description:"" },
         { img:"122271.png", bpp : 8, x:10, y:125, align: -1, col:"#FFFFFF", name:"Sunset", attrib:"getwallpapers.com", attribLink:"http://getwallpapers.com/collection/8-bit-wallpaper", description:"" },
         { img:"thisisfine.png", bpp : 8, x:53, y:5, align: 0, col:"#000000", name:"This is fine.", attrib:"Gunshow #648", attribLink:"https://knowyourmeme.com/memes/this-is-fine", description:"" },
         { img:"explode.png", bpp : 8, x:0, y:145, align: 0, col:"#FFFFFF", name:"Boom.", attrib:"", attribLink:"", description:"" },
       ];
+      const FACES_BANGLE2 = [
+        { img:"b2_122240.png", bpp : 8, x:2, y:5, align: 1, col:"#FFFFFF", name:"Cityscape", attrib:"getwallpapers.com", attribLink:"http://getwallpapers.com/collection/8-bit-wallpaper", description:"" },
+        { img:"b2_122271.png", bpp : 8, x:2, y:115, align: -1, col:"#FFFFFF", name:"Sunset", attrib:"getwallpapers.com", attribLink:"http://getwallpapers.com/collection/8-bit-wallpaper", description:"" },
+        { img:"b2_thisisfine.png", bpp : 8, x:10, y:0, align: 0, col:"#000000", name:"This is fine.", attrib:"Gunshow #648", attribLink:"https://knowyourmeme.com/memes/this-is-fine", description:"" },
+        { img:"b2_explode.png", bpp : 8, x:2, y:115, align: 0, col:"#FFFFFF", name:"Boom.", attrib:"", attribLink:"", description:"" },
+      ];
 
+      var recommendedUploadStyle = "...";
+      var defaultBPP = 8;
+      var defaultImageMode = "...";
+      var defaultPositions = {};
+
+      function onInit(device) {
+        if (device && device.id=="BANGLEJS2") {
+          faces = FACES_BANGLE2;
+          recommendedUploadStyle = "176x152 3 bits per pixel (8 color)";
+          defaultBPP = 8;
+          defaultImageMode = "web";
+          defaultPositions = {
+            "2,5,-1":"Top",
+            "2,115,-1":"Bottom",
+          };
+        } else {
+          faces = FACES_BANGLE1;
+          recommendedUploadStyle = "240x192 or 240x216 8 bit web palette";
+          defaultBPP = 8;
+          defaultImageMode = "web";
+          defaultPositions = {
+            "16,16,-1":"Top Left",
+            "50,16,1":"Top Right",
+            "16,131,-1":"Bottom Left",
+            "50,131,1":"Bottom Right"
+          };
+        }
+        updateFaces();
+      }
+
+      function updateFaces() {
       document.querySelector(".columns").innerHTML = faces.map((face,facenumber)=>`
 <div class="column col-6 col-xs-12">
   <div class="card">
@@ -42,7 +81,7 @@
     </div>
     <div class="card-header">
       <div class="card-title h5">Custom</div>
-      <div class="card-subtitle text-gray">(240x192 or 240x216 8 bit web palette)</div>
+      <div class="card-subtitle text-gray">(${recommendedUploadStyle})</div>
     </div>
     <div class="card-body">
     <div class="form-group">
@@ -69,10 +108,7 @@
     <div class="form-group">
       <label class="form-label" for="customlocation">Clock location</label>
       <select class="form-select" id="customlocation">
-        <option value="16,16,-1">Top Left</option>
-        <option value="50,16,1">Top Right</option>
-        <option value="16,131,-1">Bottom Left</option>
-        <option value="50,131,1">Bottom Right</option>
+        ${Object.keys(defaultPositions).map(k=>`<option value="${k}">${defaultPositions[k]}</option>`).join("")}
       </select>
     </div>
     </div>
@@ -99,7 +135,7 @@
               x : pos[0],
               y : pos[1],
               align: pos[2],
-              bpp : document.getElementById('cusom16bit').checked ? 16 : 8,
+              bpp : document.getElementById('cusom16bit').checked ? 16 : defaultBPP,
               col : col
             };
           } else {
@@ -112,7 +148,7 @@
             align : face.align,
             col : face.col
           };
-          var imgMode = faceInfo.bpp==16 ? "rgb565" : "web";
+          var imgMode = faceInfo.bpp==16 ? "rgb565" : defaultImageMode;
           var img = document.querySelector(`img[face='${facenumber}']`);
           var imgString = imageconverter.imagetoString(img, {mode:imgMode, output:"raw", compression:false});
           // send finished app
@@ -136,6 +172,7 @@
           fr.readAsDataURL(files[0]);
         }
     }
+  }
 
     </script>
   </body>
diff --git a/apps/imgclock/metadata.json b/apps/imgclock/metadata.json
index 799d11acc..94dff5f17 100644
--- a/apps/imgclock/metadata.json
+++ b/apps/imgclock/metadata.json
@@ -2,18 +2,19 @@
   "id": "imgclock",
   "name": "Image background clock",
   "shortName": "Image Clock",
-  "version": "0.08",
+  "version": "0.10",
   "description": "A clock with an image as a background",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "custom": "custom.html",
+  "customConnect": true,
   "storage": [
     {"name":"imgclock.app.js","url":"app.js"},
     {"name":"imgclock.img","url":"app-icon.js","evaluate":true},
     {"name":"imgclock.face.img"},
     {"name":"imgclock.face.json"},
-    {"name":"imgclock.face.bg","content":""}
+    {"name":"imgclock.face.bg","content":"X"}
   ]
 }
diff --git a/apps/impwclock/ChangeLog b/apps/impwclock/ChangeLog
index 6555fcc8f..0af7c99d6 100644
--- a/apps/impwclock/ChangeLog
+++ b/apps/impwclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Move to Bangle.setUI to launcher support
 0.04: Tweaks for compatibility with BangleJS2
 0.05: Time-word now readable on Bangle.js 2
+0.06: Tell clock widgets to hide.
diff --git a/apps/impwclock/clock-impword.js b/apps/impwclock/clock-impword.js
index c42dbda44..04421017b 100644
--- a/apps/impwclock/clock-impword.js
+++ b/apps/impwclock/clock-impword.js
@@ -154,6 +154,9 @@ Bangle.on('lcdPower', function(on) {
   if (on) drawWordClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -172,5 +175,4 @@ Bangle.on('touch',e=>{
   }
 });
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/impwclock/metadata.json b/apps/impwclock/metadata.json
index 733dbb957..1b92ea3ae 100644
--- a/apps/impwclock/metadata.json
+++ b/apps/impwclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "impwclock",
   "name": "Imprecise Word Clock",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.",
   "icon": "clock-impword.png",
   "type": "clock",
diff --git a/apps/isoclock/ChangeLog b/apps/isoclock/ChangeLog
index 809091ce4..7b57ecfa9 100644
--- a/apps/isoclock/ChangeLog
+++ b/apps/isoclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Created app based on digiclock with some small tweaks.
 0.02: Swap to Bangle.setUI for launcher/buttons
+0.03: Tell clock widgets to hide.
diff --git a/apps/isoclock/checkout b/apps/isoclock/checkout
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/isoclock/isoclock.js b/apps/isoclock/isoclock.js
index 59f28e66e..7526660b9 100644
--- a/apps/isoclock/isoclock.js
+++ b/apps/isoclock/isoclock.js
@@ -89,8 +89,8 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
-Bangle.loadWidgets();
-Bangle.drawWidgets();
-
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/isoclock/metadata.json b/apps/isoclock/metadata.json
index 313153dde..488afcb41 100644
--- a/apps/isoclock/metadata.json
+++ b/apps/isoclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "isoclock",
   "name": "ISO Compliant Clock Face",
   "shortName": "ISO Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Tweaked fork of digiclock for ISO date and time",
   "icon": "isoclock.png",
   "type": "clock",
diff --git a/apps/kanawatch/ChangeLog b/apps/kanawatch/ChangeLog
index ce7cac123..f2c991fd0 100644
--- a/apps/kanawatch/ChangeLog
+++ b/apps/kanawatch/ChangeLog
@@ -1,3 +1,5 @@
 0.01: First release
 0.02: Improve battery life, sprite resolution, fix launcher issue and unaligned text bug
 0.03: Reduce code size, refresh once a minute and faster refresh
+0.04: Show a random kana every minute to improve learning
+0.05: Tell clock widgets to hide.
diff --git a/apps/kanawatch/README.md b/apps/kanawatch/README.md
index 1fdf1927c..e213949dc 100644
--- a/apps/kanawatch/README.md
+++ b/apps/kanawatch/README.md
@@ -3,10 +3,17 @@
 A simple watchface design with hiragana and katakana
 cards for learning.
 
+## Changelog
+
+0.01: First release
+0.02: Improve battery life, sprite resolution, fix launcher issue and unaligned text bug
+0.03: Reduce code size, refresh once a minute and faster refresh
+0.04: Show a random kana every minute to improve learning
+
 ## Author
 
 Written by pancake in 2022, powered by insomnia
 
 ## Screenshots
 
-![hiragana and katakana](screenshot.jpg)
+![hiragana and katakana](screenshot.png)
diff --git a/apps/kanawatch/app.js b/apps/kanawatch/app.js
index d08b644a0..088dab785 100644
--- a/apps/kanawatch/app.js
+++ b/apps/kanawatch/app.js
@@ -127,6 +127,18 @@ function next () {
   updateWatch(ohhmm);
 }
 
+function randKana() {
+  try {
+    const keys = Object.keys(katakana);
+    const total = keys.length;
+    let index = 0 | (Math.random() * total);
+    curkana = keys[index];
+    kana = hiramode ? hiragana[curkana] : katakana[curkana];
+  } catch (e) {
+    randKana();
+  }
+}
+
 function prev () {
   let oldk = '';
   let count = 0;
@@ -233,6 +245,7 @@ function tickWatch () {
   }
   const hhmm = zpad(now.getHours()) + ':' + zpad(now.getMinutes());
   if (hhmm !== ohhmm) {
+    randKana();
     updateWatch(hhmm);
     ohhmm = hhmm;
   }
@@ -251,9 +264,10 @@ Bangle.on('touch', function (tap, top) {
 });
 
 g.clear(true);
+// show launcher when button pressed
+Bangle.setUI('clock');
 Bangle.loadWidgets();
 tickWatch();
 setInterval(tickWatch, 1000 * 60);
 
-// show launcher when button pressed
-Bangle.setUI('clock');
+
diff --git a/apps/kanawatch/metadata.json b/apps/kanawatch/metadata.json
index 8593c8f82..b14703979 100644
--- a/apps/kanawatch/metadata.json
+++ b/apps/kanawatch/metadata.json
@@ -2,7 +2,7 @@
   "id": "kanawatch",
   "name": "Kanawatch",
   "shortName": "Kanawatch",
-  "version": "0.03",
+  "version": "0.05",
   "type": "clock",
   "description": "Learn Hiragana and Katakana",
   "icon": "app.png",
diff --git a/apps/kbmorse/ChangeLog b/apps/kbmorse/ChangeLog
index f62348ec8..c85361374 100644
--- a/apps/kbmorse/ChangeLog
+++ b/apps/kbmorse/ChangeLog
@@ -1 +1,2 @@
-0.01: New Keyboard!
\ No newline at end of file
+0.01: New Keyboard!
+0.02: Temporarily fix because of firmware bug.
diff --git a/apps/kbmorse/lib.js b/apps/kbmorse/lib.js
index 8bc177a46..997f2cb16 100644
--- a/apps/kbmorse/lib.js
+++ b/apps/kbmorse/lib.js
@@ -82,6 +82,36 @@ exports.input = function(options) {
   }
 
   return new Promise((resolve, reject) => {
+    const Layout = require("Layout");
+    let layout = new Layout({
+      type: "h", c: [
+        {
+          type: "v", width: Bangle.appRect.w-8, bgCol: g.theme.bg, c: [
+            {id: "dots", type: "txt", font: "6x8:2", label: "", fillx: 1, bgCol: g.theme.bg},
+            {filly: 1, bgCol: g.theme.bg},
+            {
+              type: "h", fillx: 1, c: [
+                {id: "del", type: "txt", font: "6x8", label: "<X"},
+                {width: 5, bgCol: g.theme.bg},
+                {id: "text", type: "txt", font: "6x8:2", col: g.theme.fg2, bgCol: g.theme.bg2},
+                {fillx: 1, bgCol: g.theme.bg},
+                {id: "code", type: "txt", font: "6x8", label: "", bgCol: g.theme.bg},
+                {width: 5, bgCol: g.theme.bg},
+                {id: "pick", type: "txt", font: "6x8:3", label: "", col: g.theme.fgH, bgCol: g.theme.bgH},
+              ],
+            },
+            {filly: 1, bgCol: g.theme.bg},
+            {id: "dashes", type: "txt", font: "6x8:2", label: "", fillx: 1, bgCol: g.theme.bg},
+          ]
+        },
+        // button labels (rotated 90 degrees)
+        {
+          type: "v", pad: 1, filly: 1, c: ["<.", "^", "|"].map(l =>
+            ({type: "txt", font: "6x8", height: Math.floor(Bangle.appRect.h/3), r: 1, label: l})
+          )
+        }
+      ]
+    });
 
     function update() {
       let dots = [], dashes = [];
@@ -157,36 +187,6 @@ exports.input = function(options) {
       }
     }
 
-    const Layout = require("Layout");
-    let layout = new Layout({
-      type: "h", c: [
-        {
-          type: "v", width: Bangle.appRect.w-8, bgCol: g.theme.bg, c: [
-            {id: "dots", type: "txt", font: "6x8:2", label: "", fillx: 1, bgCol: g.theme.bg},
-            {filly: 1, bgCol: g.theme.bg},
-            {
-              type: "h", fillx: 1, c: [
-                {id: "del", type: "txt", font: "6x8", label: "<X"},
-                {width: 5, bgCol: g.theme.bg},
-                {id: "text", type: "txt", font: "6x8:2", col: g.theme.fg2, bgCol: g.theme.bg2},
-                {fillx: 1, bgCol: g.theme.bg},
-                {id: "code", type: "txt", font: "6x8", label: "", bgCol: g.theme.bg},
-                {width: 5, bgCol: g.theme.bg},
-                {id: "pick", type: "txt", font: "6x8:3", label: "", col: g.theme.fgH, bgCol: g.theme.bgH},
-              ],
-            },
-            {filly: 1, bgCol: g.theme.bg},
-            {id: "dashes", type: "txt", font: "6x8:2", label: "", fillx: 1, bgCol: g.theme.bg},
-          ]
-        },
-        // button labels (rotated 90 degrees)
-        {
-          type: "v", pad: 1, filly: 1, c: ["<.", "^", "|"].map(l =>
-            ({type: "txt", font: "6x8", height: Math.floor(Bangle.appRect.h/3), r: 1, label: l})
-          )
-        }
-      ]
-    });
     g.reset().clear();
     update();
 
@@ -244,4 +244,4 @@ exports.input = function(options) {
     };
     Bangle.on("swipe", Bangle.swipeHandler);
   });
-};
\ No newline at end of file
+};
diff --git a/apps/kbmorse/metadata.json b/apps/kbmorse/metadata.json
index f9c5354f1..9111d514d 100644
--- a/apps/kbmorse/metadata.json
+++ b/apps/kbmorse/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "kbmorse",
   "name": "Morse keyboard",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A library for text input as morse code",
   "icon": "app.png",
   "type": "textinput",
diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog
index 19739fa64..4ef8f7bda 100644
--- a/apps/kbmulti/ChangeLog
+++ b/apps/kbmulti/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Introduce setting "Show help button?". Make setting firstLaunch invisible by removing corresponding code from settings.js. Add marker that shows when character selection timeout has run out. Display opened text on launch when editing existing text string. Perfect horizontal alignment of buttons. Tweak help message letter casing.
 0.03: Use default Bangle formatter for booleans
 0.04: Allow moving the cursor
+0.05: Switch swipe directions for Caps Lock and moving cursor.
diff --git a/apps/kbmulti/README.md b/apps/kbmulti/README.md
index 80b2b077a..b6754711d 100644
--- a/apps/kbmulti/README.md
+++ b/apps/kbmulti/README.md
@@ -2,7 +2,7 @@
 
 A library that provides the ability to input text in a style familiar to anyone who had a mobile phone before they went all touchscreen.
 
-Swipe right for Space, left for Backspace, down for cursor moving mode, and up for Caps lock. Swipe left and right to move the cursor in moving mode. Tap the '?' button in the app if you need a reminder!
+Swipe right for Space, left for Backspace, down for Caps lock switch, and up for cursor moving mode. Swipe left and right to move the cursor in moving mode. Tap the '?' button in the app if you need a reminder!
 
 At time of writing, only the [Noteify app](http://microco.sm/out/Ffe9i) uses a keyboard.
 
diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js
index aa54dab9c..9b642a132 100644
--- a/apps/kbmulti/lib.js
+++ b/apps/kbmulti/lib.js
@@ -17,7 +17,7 @@ exports.input = function(options) {
     "4":"GHI4","5":"JKL5","6":"MNO6",
     "7":"PQRS7","8":"TUV80","9":"WXYZ9",
   };
-  var helpMessage = 'Swipe:\nRight: Space\nLeft:Backspace\nUp: Caps lock\nDown:Move mode';
+  var helpMessage = 'Swipe:\nRight: Space\nLeft:Backspace\nUp: Move mode\nDown:Caps lock';
 
   var charTimeout; // timeout after a key is pressed
   var charCurrent; // current character (index in letters)
@@ -122,10 +122,10 @@ exports.input = function(options) {
 
   function onSwipe(dirLeftRight, dirUpDown) {
     if (dirUpDown == -1) {
-      setCaps();
-    } else if (dirUpDown == 1) {
       moveMode = !moveMode;
       displayText(false);
+    } else if (dirUpDown == 1) {
+      setCaps();
     } else if (dirLeftRight == 1) {
       if (!moveMode){
         text = text.slice(0, textIndex + 1) + " " + text.slice(++textIndex);
diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json
index a1f6ffa81..510454f79 100644
--- a/apps/kbmulti/metadata.json
+++ b/apps/kbmulti/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbmulti",
   "name": "Multitap keyboard",
-  "version":"0.04",
+  "version":"0.05",
   "description": "A library for text input via multitap/T9 style keypad",
   "icon": "app.png",
   "type":"textinput",
diff --git a/apps/kbtouch/metadata.json b/apps/kbtouch/metadata.json
index f6d6d5228..89d121d63 100644
--- a/apps/kbtouch/metadata.json
+++ b/apps/kbtouch/metadata.json
@@ -6,10 +6,11 @@
   "type":"textinput",
   "tags": "keyboard",
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"screenshot.png"}],    
+  "screenshots": [{"url":"screenshot.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"textinput","url":"lib.js"},
     {"name":"kbtouch.settings.js","url":"settings.js"}
-  ]
+  ],
+  "sortorder":-1
 }
diff --git a/apps/kitchen/ChangeLog b/apps/kitchen/ChangeLog
index 3767a9548..4e8c49c50 100644
--- a/apps/kitchen/ChangeLog
+++ b/apps/kitchen/ChangeLog
@@ -11,3 +11,4 @@
 0.11: Detect when waypoints.json is not present, error E-WPT
 0.12: Added stepo2 as a replacement for stepo and digi
 0.13: Added long press BTN2 toggle gpsrec status in GPS clock
+0.14: Move waypoints.json (and editor) to 'waypoints' app
diff --git a/apps/kitchen/README.md b/apps/kitchen/README.md
index 102881d15..3049d9c6d 100644
--- a/apps/kitchen/README.md
+++ b/apps/kitchen/README.md
@@ -60,7 +60,7 @@ The following buttons depend on which face is currently in use
 ![](screenshot_stepo.jpg)
 
 - now replaced by Stepo2 but still available if you install manually
-- Requires one of the pedominter widgets to be installed 
+- Requires one of the pedominter widgets to be installed
 - Displays the time in large font
 - Display current step count in a doughnut gauge
 - Show step count in the middle of the doughnut gauge
@@ -208,14 +208,8 @@ which will obviously limit this.
 
 ### Waypoint Editor
 
-Clicking on the download icon of gpsnav in the app loader invokes the
-waypoint editor.  The editor downloads and displays the current
-`waypoints.json` file. Clicking the `Edit` button beside an entry
-causes the entry to be deleted from the list and displayed in the
-edit boxes. It can be restored - by clicking the `Add waypoint`
-button. A new markable entry is created by using the `Add name`
-button. The edited `waypoints.json` file is uploaded to the Bangle by
-clicking the `Upload` button.
+Clicking on the download icon of `Waypoints` in the app loader invokes the
+waypoint editor. See the `Waypoints` app for more information.
 
 
 ### Calibration of the Compass
diff --git a/apps/kitchen/kitchen.app.js b/apps/kitchen/kitchen.app.js
index 5564b2807..2c2cebaef 100644
--- a/apps/kitchen/kitchen.app.js
+++ b/apps/kitchen/kitchen.app.js
@@ -23,7 +23,7 @@ function nextFace(){
   iface += 1
   iface = iface % FACES.length;
   face = FACES[iface]();
-  
+
   g.clear();
   g.reset();
   face.init(gpsObj, swObj, hrmObj, tripObject);
@@ -64,7 +64,7 @@ function buttonReleased(btn) {
     clearInterval(pressTimer);
     pressTimer = undefined;
   }
-  
+
   if ( dur >= 1.5 ) {
     switch(btn) {
     case 1:
@@ -165,11 +165,11 @@ GPS.prototype.getLastFix = function() {
 GPS.prototype.determineGPSState = function() {
   this.log_debug("determineGPSState");
   gpsPowerState = Bangle.isGPSOn();
-  
+
   //this.log_debug("last_fix.fix " + this.last_fix.fix);
   //this.log_debug("gpsPowerState " + this.gpsPowerState);
   //this.log_debug("last_fix.satellites " + this.last_fix.satellites);
-  
+
   if (!gpsPowerState) {
     this.gpsState = this.GPS_OFF;
     this.resetLastFix();
@@ -178,9 +178,9 @@ GPS.prototype.determineGPSState = function() {
   } else {
     this.gpsState = this.GPS_SATS;
   }
-  
+
   this.log_debug("gpsState=" + this.gpsState);
-  
+
   if (this.gpsState !== this.GPS_OFF) {
     if (this.listenerCount === 0) {
       Bangle.on('GPS', processFix);
@@ -196,9 +196,9 @@ GPS.prototype.determineGPSState = function() {
   }
 };
 
-GPS.prototype.getGPSTime = function() {  
+GPS.prototype.getGPSTime = function() {
   var time;
-  
+
   if (this.last_fix !== undefined && this.last_fix.time !== undefined && this.last_fix.time.toUTCString !== undefined &&
       (this.gpsState == this.GPS_SATS || this.gpsState == this.GPS_RUNNING)) {
     time = this.last_fix.time.toUTCString().split(" ");
@@ -216,7 +216,7 @@ GPS.prototype.toggleGPSPower = function() {
   this.gpsPowerState = Bangle.isGPSOn();
   this.gpsPowerState = !this.gpsPowerState;
   Bangle.setGPSPower((this.gpsPowerState ? 1 : 0), 'kitchen');
-  
+
   this.resetLastFix();
   this.determineGPSState();
 
@@ -247,11 +247,11 @@ GPS.prototype.processFix = function(fix) {
   //this.log_debug("GPS:processFix()");
   //this.log_debug(fix);
   this.last_fix.time = fix.time;
-  
+
   if (this.gpsState == this.GPS_TIME) {
     this.gpsState = this.GPS_SATS;
   }
-  
+
   if (fix.fix) {
     //this.log_debug("Got fix - setting state to GPS_RUNNING");
     this.gpsState = this.GPS_RUNNING;
@@ -271,10 +271,10 @@ GPS.prototype.formatTime = function(now) {
 GPS.prototype.timeSince = function(t) {
   var hms = t.split(":");
   var now = new Date();
-  
+
   var sn = 3600*(now.getHours()) + 60*(now.getMinutes()) + 1*(now.getSeconds());
   var st = 3600*(hms[0]) + 60*(hms[1]) + 1*(hms[2]);
-  
+
   return (sn - st);
 };
 
@@ -313,7 +313,7 @@ GPS.prototype.getWPdistance = function() {
 GPS.prototype.getWPbearing = function() {
   //log_debug(this.last_fix);
   //log_debug(this.wp_current);
-  
+
   if (this.wp_current.name === "E-WPT" || this.wp_current.name === "NONE" || this.wp_current.lat === undefined || this.wp_current.lat === 0)
     return 0;
   else
@@ -321,7 +321,7 @@ GPS.prototype.getWPbearing = function() {
 }
 
 GPS.prototype.loadFirstWaypoint = function() {
-  var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"E-WPT"}];
+  var waypoints = require("waypoints").load();
   this.wp_index = 0;
   this.wp_current = waypoints[this.wp_index];
   log_debug(this.wp_current);
@@ -345,10 +345,10 @@ GPS.prototype.markWaypoint = function() {
     return;
 
   log_debug("GPS::markWaypoint()");
-  
-  var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"E-WPT"}];
+
+  var waypoints = require("waypoints").load();
   this.wp_current = waypoints[this.wp_index];
-  
+
   if (this.waypointHasLocation()) {
      waypoints[this.wp_index] = {name:this.wp_current.name, lat:0, lon:0};
   } else {
@@ -356,12 +356,12 @@ GPS.prototype.markWaypoint = function() {
   }
 
   this.wp_current = waypoints[this.wp_index];
-  require("Storage").writeJSON("waypoints.json", waypoints);
+  require("waypoints").save(waypoints);
   log_debug("GPS::markWaypoint() written");
 }
 
 GPS.prototype.nextWaypoint = function(inc) {
-  var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"E-WPT"}];
+  var waypoints = require("waypoints").load();
   this.wp_index+=inc;
   if (this.wp_index>=waypoints.length) this.wp_index=0;
   if (this.wp_index<0) this.wp_index = waypoints.length-1;
@@ -520,7 +520,7 @@ function STOPWATCH() {
   this.redrawLaps = true;
   this.redrawTime = true;
 }
-  
+
 STOPWATCH.prototype.log_debug = function(o) {
   //console.log(o);
 }
@@ -531,7 +531,7 @@ STOPWATCH.prototype.timeToText = function(t) {
   let secs = Math.floor(t/1000)%60;
   let text;
 
-  if (hrs === 0) 
+  if (hrs === 0)
     text = ("0"+mins).substr(-2) + ":" + ("0"+secs).substr(-2);
   else
     text = (""+hrs) + ":" + ("0"+mins).substr(-2) + ":" + ("0"+secs).substr(-2);
@@ -551,7 +551,7 @@ STOPWATCH.prototype.stopStart = function() {
 
   if (this.running)
     this.tStart = Date.now() + this.tStart - this.tCurrent;
-  
+
   this.tTotal = Date.now() + this.tTotal - this.tCurrent;
   this.tCurrent = Date.now();
   this.redrawButtons = true;
@@ -623,7 +623,7 @@ STOPWATCH.prototype.drawLaptimes = function() {
   g.setFont("Vector",24);
   g.setFontAlign(-1,-1);
   g.clearRect(4, 205, 239, 229); // clear the last line of the lap times
-  
+
   let laps = 0;
   for (let i in this.lapTimes) {
     g.drawString(this.lapTimes.length-i + ": " + this.timeToText(this.lapTimes[i]), 4, this.timeY + 40 + i*24);
@@ -645,7 +645,7 @@ STOPWATCH.prototype.drawTime = function() {
   g.setFont("Vector",38);
   g.setFontAlign(0,0);
   g.clearRect(0, this.timeY-21, 200, this.timeY+21);
-  g.setColor(0xFFC0); 
+  g.setColor(0xFFC0);
   g.drawString(txtTotal, xTotal, this.timeY);
 
   // current lap time
@@ -691,7 +691,7 @@ function HRM() {
   this.bpm = 0;
   this.confidence = 0;
 }
-  
+
 HRM.prototype.log_debug = function(o) {
   //console.log(o);
 }
@@ -782,7 +782,7 @@ Debug Object
 function DEBUG() {
   this.logfile = require("Storage").open("debug.log","a");
 }
-  
+
 DEBUG.prototype.log = function(msg) {
   let timestamp = new Date().toString().split(" ")[4];
   let line = timestamp + ", " + msg + "\n";
diff --git a/apps/kitchen/metadata.json b/apps/kitchen/metadata.json
index ab2e7183c..9c9f7b2ec 100644
--- a/apps/kitchen/metadata.json
+++ b/apps/kitchen/metadata.json
@@ -1,14 +1,14 @@
 {
   "id": "kitchen",
   "name": "Kitchen Combo",
-  "version": "0.13",
+  "version": "0.14",
   "description": "Combination of the Stepo, Walkersclock, Arrow and Waypointer apps into a multiclock format. 'Everything but the kitchen sink'",
   "icon": "kitchen.png",
   "type": "clock",
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
-  "interface": "waypoints.html",
+  "dependencies" : { "waypoints":"type" },
   "storage": [
     {"name":"kitchen.app.js","url":"kitchen.app.js"},
     {"name":"stepo2.kit.js","url":"stepo2.kit.js"},
@@ -16,6 +16,5 @@
     {"name":"gps.kit.js","url":"gps.kit.js"},
     {"name":"compass.kit.js","url":"compass.kit.js"},
     {"name":"kitchen.img","url":"kitchen.icon.js","evaluate":true}
-  ],
-  "data": [{"name":"waypoints.json","url":"waypoints.json"}]
+  ]
 }
diff --git a/apps/kitchen/waypoints.html b/apps/kitchen/waypoints.html
deleted file mode 100644
index d02260732..000000000
--- a/apps/kitchen/waypoints.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="../../css/spectre.min.css">
-    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
-  </head>
-  <body>
-
-    <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">
-        </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>
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_longtitude" placeholder="Long">
-        </div>
-      </div>
-      <div class="columns">
-        <div class="column col-3 col-xs-8">
-          <button id="add_name_button" class="btn btn-primary btn-sm">Add Name Only</button>
-        </div>
-        <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>
-    
-    <script src="../../core/lib/interface.js"></script>
-
-    <script>
-
-      var waypoints = []
-
-      var $name = document.getElementById('add_waypoint_name')
-      var $form = document.getElementById('add_waypoint_form')
-      var $button = document.getElementById('add_waypoint_button')
-      var $name_button = document.getElementById('add_name_button')
-      var $latitude = document.getElementById('add_latitude')
-      var $longtitude = document.getElementById('add_longtitude')
-      var $list = document.getElementById('waypoints')
-
-      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;
-        }
-
-      $button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-        var lat = parseFloat($latitude.value).toPrecision(5);
-        var lon = parseFloat($longtitude.value).toPrecision(5);
-
-        waypoints.push({
-          name, lat,lon,
-        });
-        
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = (0).toPrecision(5);
-        $longtitude.value = (0).toPrecision(5);
-      });
-
-      $name_button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-
-        waypoints.push({
-          name
-        });
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = 0.0000
-        $longtitude.value = 0.0000
-      });
-
-
-      function removeWaypoint(index){
-        $name.value = waypoints[index].name
-        $latitude.value = waypoints[index].lat
-        $longtitude.value = waypoints[index].lon
-        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()    
-      }
-
-      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);
-        });
-      }
-
-      function uploadFile(fileid, contents) {      
-        Puck.write(`\x10(function() {
-          require("Storage").write("${fileid}",'${contents}');
-          Bluetooth.print("OK");
-         })()\n`,ret=>{
-            console.log("uploadFile",ret);
-        });
-      }
-
-      function gotStored(pts){
-          waypoints = pts;
-          renderWaypoints();
-      }
-
-      function onInit() {
-         downloadJSONfile("waypoints.json", gotStored);
-      }
-
-      document.getElementById("Download").addEventListener("click", function() {
-        downloadJSONfile("waypoints.json", gotStored);
-      });
-
-      document.getElementById("Upload").addEventListener("click", function() {
-        var data =  JSON.stringify(waypoints);
-        uploadFile("waypoints.json",data); 
-      });
-    </script>
-  </body>
-</html>
diff --git a/apps/kitchen/waypoints.json b/apps/kitchen/waypoints.json
deleted file mode 100644
index 98a670c0d..000000000
--- a/apps/kitchen/waypoints.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-  "name":"NONE"
-  },
-  {
-  "name":"No10",
-  "lat":51.5032,
-  "lon":-0.1269
-  },
-  {
-  "name":"Stone",
-  "lat":51.1788,
-  "lon":-1.8260
-  },
-  { "name":"WP0" },
-  { "name":"WP1" },
-  { "name":"WP2" },
-  { "name":"WP3" },
-  { "name":"WP4" }
-]
\ No newline at end of file
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index 44866b9f3..955061e19 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -14,3 +14,7 @@
       Add /*LANG*/ tags for internationalisation
 0.13: Add fullscreen mode
 0.14: Use default Bangle formatter for booleans
+0.15: Support for unload and quick return to the clock on 2v16
+0.16: Use a cache of app.info files to speed up loading the launcher
+0.17: Don't display 'Loading...' now the watch has its own loading screen
+0.18: Add 'back' icon in top-left to go back to clock
diff --git a/apps/launch/app.js b/apps/launch/app.js
index 556e61bfd..e9f99d8f5 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -1,61 +1,69 @@
-var s = require("Storage");
-var scaleval = 1;
-var vectorval = 20;
-var font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+let s = require("Storage");
+// handle customised launcher
+let scaleval = 1;
+let vectorval = 20;
+let font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
 let settings = Object.assign({
   showClocks: true,
   fullscreen: false
 }, s.readJSON("launch.json", true) || {});
-
-if ("vectorsize" in settings) {
-    vectorval = parseInt(settings.vectorsize);
-}
+if ("vectorsize" in settings)
+  vectorval = parseInt(settings.vectorsize);
 if ("font" in settings){
-    if(settings.font == "Vector"){
-        scaleval = vectorval/20;
-        font = "Vector"+(vectorval).toString();
-    }
-    else{
-        font = settings.font;
-        scaleval = (font.split("x")[1])/20;
-    }
+  if(settings.font == "Vector"){
+    scaleval = vectorval/20;
+    font = "Vector"+(vectorval).toString();
+  } else{
+    font = settings.font;
+    scaleval = (font.split("x")[1])/20;
+  }
 }
-var apps = s.list(/\.info$/).map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || !app.type));
-apps.sort((a,b)=>{
-  var n=(0|a.sortorder)-(0|b.sortorder);
-  if (n) return n; // do sortorder first
-  if (a.name<b.name) return -1;
-  if (a.name>b.name) return 1;
-  return 0;
-});
-apps.forEach(app=>{
-  if (app.icon)
-    app.icon = s.read(app.icon); // should just be a link to a memory area
-});
-// FIXME: check not needed after 2v11
-if (g.wrapString) {
-  g.setFont(font);
-  apps.forEach(app=>app.name = g.wrapString(app.name, g.getWidth()-64).join("\n"));
+// cache app list so launcher loads more quickly
+let launchCache = s.readJSON("launch.cache.json", true)||{};
+let launchHash = require("Storage").hash(/\.info/);
+if (launchCache.hash!=launchHash) {
+  launchCache = {
+    hash : launchHash,
+    apps : s.list(/\.info$/)
+            .map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};})
+            .filter(app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || !app.type))
+            .sort((a,b)=>{
+              var n=(0|a.sortorder)-(0|b.sortorder);
+              if (n) return n; // do sortorder first
+              if (a.name<b.name) return -1;
+              if (a.name>b.name) return 1;
+              return 0;
+            }) };
+  s.writeJSON("launch.cache.json", launchCache);
 }
-
-function drawApp(i, r) {
-  var app = apps[i];
-  if (!app) return;
-  g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
-  g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
-  if (app.icon) try {g.drawImage(app.icon,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
-}
-
-g.clear();
-
-if (!settings.fullscreen) {
+let apps = launchCache.apps;
+// Now apps list is loaded - render
+if (!settings.fullscreen)
   Bangle.loadWidgets();
-  Bangle.drawWidgets();
+
+let returnToClock = function() {
+  // unload everything manually
+  // ... or we could just call `load();` but it will be slower
+  Bangle.setUI(); // remove scroller's handling
+  if (lockTimeout) clearTimeout(lockTimeout);
+  Bangle.removeListener("lock", lockHandler);
+  // now load the default clock - just call .bootcde as this has the code already
+  setTimeout(eval,0,s.read(".bootcde"));
 }
 
 E.showScroller({
   h : 64*scaleval, c : apps.length,
-  draw : drawApp,
+  draw : (i, r) => {
+    var app = apps[i];
+    if (!app) return;
+    g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
+    g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
+    if (app.icon) {
+      if (!app.img) app.img = s.read(app.icon); // load icon if it wasn't loaded
+      try {g.drawImage(app.img,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
+    }
+  },
   select : i => {
     var app = apps[i];
     if (!app) return;
@@ -63,24 +71,31 @@ E.showScroller({
       E.showMessage(/*LANG*/"App Source\nNot found");
       setTimeout(drawMenu, 2000);
     } else {
-      E.showMessage(/*LANG*/"Loading...");
       load(app.src);
     }
-  }
+  },
+  back : returnToClock
 });
+g.flip(); // force a render before widgets have finished drawing
+
+
 
 // on bangle.js 2, the screen is used for navigating, so the single button goes back
 // on bangle.js 1, the buttons are used for navigating
 if (process.env.HWVERSION==2) {
-  setWatch(_=>load(), BTN1, {edge:"falling"});
+  setWatch(returnToClock, BTN1, {edge:"falling"});
 }
 
 // 10s of inactivity goes back to clock
 Bangle.setLocked(false); // unlock initially
-var lockTimeout;
-Bangle.on("lock", locked => {
+let lockTimeout;
+let lockHandler = function(locked) {
   if (lockTimeout) clearTimeout(lockTimeout);
   lockTimeout = undefined;
   if (locked)
-    lockTimeout = setTimeout(_=>load(), 10000);
-});
+    lockTimeout = setTimeout(returnToClock, 10000);
+}
+Bangle.on("lock", lockHandler);
+if (!settings.fullscreen) // finally draw widgets
+  Bangle.drawWidgets();
+}
diff --git a/apps/launch/metadata.json b/apps/launch/metadata.json
index 19ca74e73..d6770524c 100644
--- a/apps/launch/metadata.json
+++ b/apps/launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "launch",
   "name": "Launcher",
   "shortName": "Launcher",
-  "version": "0.14",
+  "version": "0.18",
   "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
   "readme": "README.md",
   "icon": "app.png",
@@ -13,6 +13,6 @@
     {"name":"launch.app.js","url":"app.js"},
     {"name":"launch.settings.js","url":"settings.js"}
   ],
-  "data": [{"name":"launch.json"}],
+  "data": [{"name":"launch.json"},{"name":"launch.cache.json"}],
   "sortorder": -10
 }
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index 9a8ac4008..f97ddf540 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -21,3 +21,4 @@
 0.21: Add custom theming.
 0.22: Fix alarm and add build in function for step counting.
 0.23: Add warning for low flash memory
+0.24: Add ability to disable alarm functionality
\ No newline at end of file
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index e81c0d6f3..06a89a957 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -12,6 +12,7 @@ let settings = {
   themeColor1BG: "#FF9900",
   themeColor2BG: "#FF00DC",
   themeColor3BG: "#0094FF",
+  disableAlarms: false,
 };
 let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
 for (const key in saved_settings) {
@@ -722,12 +723,12 @@ Bangle.on('touch', function(btn, e){
   }
 
   if(lcarsViewPos == 0){
-    if(is_upper){
+    if(is_upper && !settings.disableAlarms){
       feedback();
       increaseAlarm();
       drawState();
       return;
-    } if(is_lower){
+    } if(is_lower && !settings.disableAlarms){
       feedback();
       decreaseAlarm();
       drawState();
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index b64feb30e..e4b9b0a78 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -13,6 +13,7 @@
     themeColor1BG: "#FF9900",
     themeColor2BG: "#FF00DC",
     themeColor3BG: "#0094FF",
+    disableAlarms: false,
   };
   let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
   for (const key in saved_settings) {
@@ -102,6 +103,14 @@
         settings.themeColor3BG = bg_code[v];
         save();
       },
-    }
+    },
+    'Disable alarm functionality': {
+      value: settings.disableAlarms,
+      format: () => (settings.disableAlarms ? 'Yes' : 'No'),
+      onchange: () => {
+        settings.disableAlarms = !settings.disableAlarms;
+        save();
+      },
+    },
   });
 })
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 62a1c67db..6533ddd52 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,7 +3,7 @@
   "name": "LCARS Clock",
   "shortName":"LCARS",
   "icon": "lcars.png",
-  "version":"0.23",
+  "version":"0.24",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/limelight/ChangeLog b/apps/limelight/ChangeLog
index 9db0e26c5..8fe3a0b2c 100644
--- a/apps/limelight/ChangeLog
+++ b/apps/limelight/ChangeLog
@@ -1 +1,2 @@
 0.01: first release
+0.02: Tell clock widgets to hide.
diff --git a/apps/limelight/limelight.app.js b/apps/limelight/limelight.app.js
index 20d79deeb..84ded1039 100644
--- a/apps/limelight/limelight.app.js
+++ b/apps/limelight/limelight.app.js
@@ -10,6 +10,8 @@
  *
  */
 
+Bangle.setUI('clock');
+
 g.clear();
 
 const SETTINGS_FILE = "limelight.json";
@@ -259,5 +261,4 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
-Bangle.setUI('clock');
 draw();
diff --git a/apps/limelight/metadata.json b/apps/limelight/metadata.json
index 7c3736e1a..e484a2825 100644
--- a/apps/limelight/metadata.json
+++ b/apps/limelight/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "limelight",
   "name": "Limelight",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Simple analogue clock (with configurable fonts) based on the work of @Andreas_Rozek (Simple_Clock)",
   "icon": "limelight.png",
   "readme":"README.md",
diff --git a/apps/linuxclock/ChangeLog b/apps/linuxclock/ChangeLog
new file mode 100644
index 000000000..3f1ef5c55
--- /dev/null
+++ b/apps/linuxclock/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App.
+0.02: Performance improvements.
\ No newline at end of file
diff --git a/apps/linuxclock/README.md b/apps/linuxclock/README.md
new file mode 100644
index 000000000..934ed2902
--- /dev/null
+++ b/apps/linuxclock/README.md
@@ -0,0 +1,13 @@
+# A Linux inspired clock
+
+
+A linux inspired clock which also loads and shows clock_infos .
+Simply click left/right to execute another command ;)
+With up/down you can select an individual entry and with a click at the
+center of the screen you can trigger an action if its supported (e.g. HomeAssistant).
+
+# Thanks
+Icons from <a href="https://www.flaticon.com/free-icons" title="icons">by Freepik - Flaticon</a>
+
+## Creator
+- [David Peer](https://github.com/peerdavid).
\ No newline at end of file
diff --git a/apps/linuxclock/app-icon.js b/apps/linuxclock/app-icon.js
new file mode 100644
index 000000000..8a767a209
--- /dev/null
+++ b/apps/linuxclock/app-icon.js
@@ -0,0 +1 @@
+atob("JiaEAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAAAAD/////AAAAAAAAAAAAAAAAAAAA//////AAAAAAAAAAAAAAAAAAD///////AAAAAAAAAAAAAAAAAA///////wAAAAAAAAAAAAAAAAAPD/8AD/8AAAAAAAAAAAAAAAAADwD/AA//AAAAAAAAAAAAAAAAAADw/w8P/wAAAAAAAAAAAAAAAAAP////D/8AAAAAAAAAAAAAAAAAD/8AD///8AAAAAAAAAAAAAAAAA/wAAD///AAAAAAAAAAAAAAAAAP8AAP///wAAAAAAAAAAAAAAAADw8P8AD/8AAAAAAAAAAAAAAAAP8AAAAA//8AAAAAAAAAAAAAAADwAAAAAA//AAAAAAAAAAAAAAAP8AAAAAAP//AAAAAAAAAAAAAA/wAAAAAAAP//AAAAAAAAAAAAAP8AAAAAAAD///AAAAAAAAAAAA/wAAAAAAAA///wAAAAAAAAAAAP8AAAAAAAAA///wAAAAAAAAAA/wAAAAAAAAAP//8AAAAAAAAAAP8AAAAAAAAAD///8AAAAAAAAAD/AAAAAAAAAAD///AAAAAAAAAP8AAAAAAAAAAA///wAAAAAAAAD/AAAAAAAAAAAP//8AAAAAAAAA//AAAAAAAAAA////AAAAAAAAAP/wAAAAAAAAD////wAAAAAAAA8A/wAAAAAAAA////8AAAAAAA/wAA/wAAAAAAAPD///8AAAAA/wAAAP/wAAAAAADw//APAAAAAPAAAAAP/wAAAAAA8AAAD/AAAADwAAAAD/8AAAAAD/AAAAD/AAAA8AAAAAD/AAAAAP/wAAAADwAAAPAAAAAADwAAAP//AAAAD/AAAAD/AAAAAA///////wAAD/8AAAAAD///AAAP//////8AAP8AAAAAAAAAD//w/wAAAAAP8P8AAAAAAAAAAAAAD/AAAAAAAP/wAAAAAA")
\ No newline at end of file
diff --git a/apps/linuxclock/app.js b/apps/linuxclock/app.js
new file mode 100644
index 000000000..02676310e
--- /dev/null
+++ b/apps/linuxclock/app.js
@@ -0,0 +1,386 @@
+
+/************************************************
+ * Includes
+ */
+ const clock_info = require("clock_info");
+ const storage = require('Storage');
+ const locale = require('locale');
+
+/*
+ * Some vars
+ */
+var W = g.getWidth();
+var H = g.getHeight();
+
+ /************************************************
+  * Settings
+  */
+ const SETTINGS_FILE = "linuxclock.setting.json";
+ let settings = {
+   menuPosX: 0,
+   menuPosY: 0,
+ };
+
+ let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
+ for (const key in saved_settings) {
+   settings[key] = saved_settings[key]
+ }
+
+
+ /************************************************
+  * Assets
+  */
+  Graphics.prototype.setFontUbuntuMono = function(scale) {
+   // Actual height 24 (27 - 4)
+   this.setFontCustom(
+     atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+A4AP/ngA/+eAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAA/gAAD+AAAAAAAAAAAAD+AAAP4AAA8AAAAAAAAAAAAAAAAAAAAAAAMGAAAwfgAD/+AB//gAP/YAA/BgAAMH4AA3/gAP/8AD/+AAPwYAADBgAAAAAAAAAAAAAEAAfA4AD+DgAf4GABxwYA+HB8D4OHwBg4YAGDzgAcH8AAgPwAAAcAAAAAAA8AAAH8BgA9wOADBjwAOccAA/3gAA94AAAPeAAD3+AAcc4AHhhgA4H+ADAfwAAAeAAAAAAAAPgADx/AAf/eAD/wYAMHBgAw+GADneYAP4/AAfB8AAA/4AADzgAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAB//AAP//AD4A+AeAA8DwAB4OAADwQAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAYOAABw8AAeB4ADwD4A+AD//wAH/8AAD/AAAAAAAAAAAAAAAAAAAAAAAAAA4AAABiAAAHcAAAPwAAP8AAA/wAAAPwAAB3AAAGIAAAYAAAAAAAAAAAAAAAAAABgAAAGAAAAYAAABgAAAGAAAP/wAA//AAAGAAAAYAAABgAAAGAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAABOAAAewAAB/AAAH4AAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAYAAABgAAAGAAAAYAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAB4AAAHgAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB8AAA/wAAf4AAP8AAH+AAD/AAB/gAAPwAAA4AAAAAAAAAAAAAAAAAAB/AAA//gAH//AA8AeADhg4AMPBgAw8GADhg4APAHgAf/8AA//gAAfwAAAAAAAAAAAAAAAAGAAAAYAYADgBgAcAGAB//4AP//gA//+AAAAYAAABgAAAGAAAAIAAAAAAAAAAAAAAAGADgA4A+ADgH4AMA9gAwHGADA4YAOHBgA/4GAB/AYAD4BgAAAGAAAAAAAAAAAAAAABgA4AOADgA4AGADBgYAMGBgAw4GADjw4AP/ngAfv8AA8fgAAAYAAAAAAAAAAAAA4AAAPgAAD+AAAeYAADhgAA8GAAHgYAA8BgAD//4AP//gAABgAAAGAAAAAAAAAAAAAAAAAADgA/4OAD/gYAP+BgAw4GADDgYAMGDgAweeADA/wAMB+AAABgAAAAAAAAAAAAPAAAH/gAB//AAP4eABzA4AGMBgA4wGADjgYAMOHgAwf8ADA/gAAB4AAAAAAAAAAAAAAAAwAAADAAAAMADgAwB+ADA/4AMP8AAz8AADfAAAPwAAA8AAADgAAAAAAAAAAAAAAHAAD5/AAf38AD344AMHBgAwYGADBwYAOHBgA9+OAB/fwAD5/AAABwAAAAAAAAAAAHgAAA/gYAH+BgA4cGADAw4AMDDgAwMcADgzwAPD+AAf/wAA/+AAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADweAAPB4AA8HgADweAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAADgA8HMADwfwAPB+AA8HwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAA8AAADwAAAPgAAB+AAAGYAAA5wAADDAAAcOAABw4AAGBgAAYGAAAAAAAAAAAAMYAAAxgAADGAAAMYAAAxgAADGAAAMYAAAxgAADGAAAMYAAAxgAADGAAAAAAAAAAAAGBgAAYHAABwYAAHDgAAMMAAA5wAABmAAAH4AAAfgAAA8AAADwAAAGAAAAAAAAAAAAAAAAAAAAAOAAAAwAMADAZ4AMHngAw8eADngAAP8AAAfgAAAYAAAAAAAAAAAAAAAAAAP+AAH/+AA//+AHgB8A4PhwDD/jgMP/GAxwcYDmAxgPYDGAf/8YA//wAAAAAAAAGAAAD4AAD/gAB/wAA/+AAP4YAA8BgADwGAAP8YAAP/gAAH/gAAD/gAAA+AAAAYAAAAAA//+AD//4AP//gAwYGADBgYAMGBgAwYGADjw4AP/DgAfv8AA8fgAAA8AAAAAAAAAAAAfwAAH/wAA//gAHgPAA8AOADgA4AMABgAwAGADAAYAOABgA4AOABAAwAAAAAAAAAAD//4AP//gA//+ADAAYAMABgAwAGADgA4AOADgAcAcAA//gAB/8AAB/AAAAAAAAAAAAAAAAD//4AP//gA//+ADBgYAMGBgAwYGADBgYAMGBgAwYGADBgYAIABgAAAAAAAAAAAAAAA//+AD//4AP//gAwYAADBgAAMGAAAwYAADBgAAMGAAAwYAADAAAAAAAAAAAAAAH8AAB/8AAP/4AB4DwAPADgA4AOADAAYAMABgAwAGADgf4AOD/gAQP+AAAAAAAAAAA//+AD//4AP//gAAYAAABgAAAGAAAAYAAABgAAAGAAA//+AD//4AP//gAAAAAAAAAAAAAAAwAGADAAYAMABgAwAGAD//4AP//gAwAGADAAYAMABgAwAGAAAAAAAAAAAAAAAAAAQAAADAAwAOADAAYAMABgAwAGADAAYAMADgA//8AD//wAP/8AAAAAAAAAAAAAAAAAAAAD//4AP//gAAcAAADwAAAfgAAHvAAA8eAAHg+AA8A8ADgB4AIADgAAACAAAAAAAAAAA//+AD//4AP//gAAAGAAAAYAAABgAAAGAAAAYAAABgAAAGAAAAYAAAAAAAAAAAP/4AP//gA/+AAD+AAAB/AAAA+AAAD4AAB/AAA/gAAD/4AAP//gAH/+AAAAAAAAAAA//+AD//4AP//gAfAAAA+AAAA+AAAA/AAAA/AAAA/AA//+AD//4AP//gAAAAAAAAAAB/8AAP/4AB+PwAOADgA4AOADAAYAMABgA4AOADgA4AH4/AAP/4AAf/AAAAAAAAAAAAAAAAP//gA//+AD//4AMBgAAwGAADAYAAODgAA4OAAB/wAAD+AAAHwAAAAAAAAAAAAD/wAA//wAH4fgA4APADgAcAMAA8AwAD4DgAfgPAD3Afh+MA//wwA/8CAAAAAAAAAAP//gA//+AD//4AMDAAAwMAADAwAAMDgAA4fgAD/vgAH+PgAPwOAAAAYAAAAAAAAAAAAAQAD4DAAfwOAD/AYAOOBgAwYGADBwYAMDDgA4OOADgfwAEB/AAABwAAAAAAAAAAAwAAADAAAAMAAAAwAAADAAAAP//gA//+ADAAAAMAAAAwAAADAAAAMAAAAAAAAAAAAAP/8AA//4AD//wAAADgAAAGAAAAYAAABgAAAGAAAA4AP//AA//4AD//AAAAAAAwAAAD4AAAP8AAAP/AAAD/gAAB/gAAAeAAAB4AAA/gAA/4AA/8AAP+AAA+AAADAAAAAAAAA//wAD//4AAf/gAAD+AAB/AAAPgAAA+AAAB/AAAA/gAB/+AD//4AP/4AAAAAAAAAAAIABgA4AeAD4H4AH5+AAH/gAAH4AAAfgAAH/gAB+fgAPgfgA4AeACAAYAAAAAAgAAADgAAAPgAAAfgAAAfgAAAfgAAAf+AAB/4AAfgAAH4AAB+AAAPgAAA4AAACAAAAAAAAAAAGADAB4AMAfgAwD+ADA+YAMHhgAx8GADPAYAP4BgA+AGADwAYAMABgAAAAAAAAAAAAAAAAAAAAAAAA////D///8MAAAwwAADDAAAMMAAAwwAADAAAAAAAAAAAAAAAAAAAAAAAA4AAAD8AAAH+AAAH/AAAD/gAAB/wAAAf4AAAP8AAAHwAAADAAAAAAAAAAAAAAAAAAAAAAAAwAADDAAAMMAAAwwAADDAAAMP///w////AAAAAAAAAAAAAAAAAAAAAAAAAGAAAA4AAAPgAAD4AAA+AAADwAAAPAAAA+AAAA+AAAA+AAAA4AAABgAAAAAAAAAAMAAAAwAAADAAAAMAAAAwAAADAAAAMAAAAwAAADAAAAMAAAAwAAADAAAAMAAAAwAAAAAAAAAAAAAAAAAAAAAAAOAAAA8AAAB4AAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAD8AAMPwAAxzgADGGAAMYYAAxhgADmGAAPYYAAf/gAA/+AAAAAAAAAAAAAAAAAAAA///gD//+AP//4AA4BgADAGAAMAYAA4DgADgeAAH/wAAP+AAAfwAAAAAAAAAAAAPgAAD/gAAf/AABwcAAOA4AA4DgADAGAAMAYAAwBgADAGAAOA4AAABgAAAAAAAAAAAH8AAA/4AAH/wAA4HgADgOAAMAYAAwBgADgGAH//4A///gD//+AAAAAAAAAAAAAAAAA/AAAP+AAB/8AAOZ4AA5jgADGGAAMYYAAxhgADmGAAH44AAfjgAAeAAAAAAAAAAAAAAAAAMAAAAwAAAf/+AH//4A///gDjAAAMMAAAwwAADDAAAMMAAA4AAABAAAAAAAAAAH8AAA/4cAH/xwA8DjADgOMAMAYwAwBjADAOcAP//wA//+AD//wAAAAAAAAAAAAAAAAAAA///gD//+AP//4AAwAAADAAAAMAAAA4AAAD4AAAH/4AAP/gAAAAAAAAAAAAAAADAAAAMAAAAwAADjAAAPP/gA8//ABj/+AAAA4AAABgAAAGAAAA4AAABAAAAAAAAAAAAAAAAAAAcAMABwAwADADAAMAMAAw8wAHDz//8PP//gY//8AAAAAAAAAAAAAAAAAAAAAAAA///gD//+AP//4AADwAAAfgAADvAAAeeAADw8AAOB4AAwDgACAGAAAAAAAAAADAAAAMAAAAwAAADAAAAP//gA///AD//+AAAA4AAABgAAAGAAAA4AAABAAAAAAAAAAAA//gAD/+AAOAAAAwAAADgAAAP8AAA/wAADAAAAMAAAA4AAAD/+AAH/4AAAAAAAAAAAAAAAA//gAD/+AAP/4AAwAAADAAAAMAAAA4AAAD4AAAH/4AAP/gAAAAAAAAAAAAAAAAfwAAD/gAAf/AADweAAOA4AAwBgADAGAAOA4AA8HgAB/8AAD/gAAH8AAAAAAAAAAAAAAAAD//8AP//wA///ADAOAAMAYAAwBgADgOAAPB4AAf/AAA/4AAB/AAAAAAAAAAAAB/AAAP+AAB/8AAPB4AA4DgADAGAAMAYAAwDgAD//8AP//wA///AAAAAAAAAAAAAAAAAAAAAAAAAf/gAD/+AAP/4AAwAAADAAAAMAAAAwAAADAAAAMAAAAAAAAAAAAAAAAAAAAAAA4OAAHw4AA/hgADOGAAMcYAAxxgADDGAAMO4AA4fAABB8AAAAAAAAAAAAAAAAAAAAAwAAADAAAD//AAP//AA//+AAMA4AAwBgADAGAAMAYAAwDgADAEAAAAAAAAAAAAAAAAP/gAA//AAAA+AAAA4AAABgAAAGAAAAYAA//gAD/+AAP/4AAAAAAAAAAAAAAAA4AAAD8AAAP8AAAH+AAAD+AAAB4AAAHgAAD8AAB/AAA/wAAD8AAAOAAAAAAAADAAAAP+AAA//gAAH+AAAD4AAB+AAAfAAAB8AAAD+AAAB+AAAP4AA//gAD/AAAMAAAAAAAACAGAAMA4AA8HgAB54AAD/AAAH4AAAPgAAD/AAAeeAADw+AAMA4AAgBgAAAAAAAAAAAgADAD4AMAP4AwAf8DAAH8cAAD/gAAD8AAB/AAB/wAA/4AAD8AAAMAAAAAAAAAAAAAAAAAAwDgADAeAAMH4AAw9gADPmAAN4YAA/BgAD4GAAPAYAAwBgAAAAAAAAAAAAAAAAAAAAAYAAABgAAAPAAD///Af/f+D/wf8MAAAwwAADDAAAMMAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///w////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAADDAAAMMAAAwwAADD/w/8H/3/gP//8AAPAAAAYAAABgAAAAAAAAAAAAAAAAADAAAA8AAADgAAAMAAAA4AAADgAAAHAAAAcAAAAwAAAHAAAA8AAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
+     32,
+     atob("Dg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4c"),
+     28+(scale<<8)+(1<<16)
+   );
+   return this;
+ }
+
+
+
+ /************************************************
+  * Menu
+  */
+ var dateMenu = {
+   name: "date",
+   img: null,
+   items: [
+     { name: "time",
+     get: () => ({ text: getTime(), img: null}),
+     show: function() { dateMenu.items[0].emit("redraw"); },
+     hide: function () {}
+   },
+   { name: "day",
+    get: () => ({ text: getDay(), img: null}),
+    show: function() { dateMenu.items[2].emit("redraw"); },
+    hide: function () {}
+   },
+   { name: "date",
+     get: () => ({ text: getDate(), img: null}),
+     show: function() { dateMenu.items[1].emit("redraw"); },
+     hide: function () {}
+   },
+   { name: "week",
+     get: () => ({ text: weekOfYear(), img: null}),
+     show: function() { dateMenu.items[3].emit("redraw"); },
+     hide: function () {}
+   },
+   ]
+ };
+
+ var menu = clock_info.load();
+ menu = menu.concat(dateMenu);
+
+ // Set draw functions for each item
+ menu.forEach((menuItm, x) => {
+   menuItm.items.forEach((item, y) => {
+     function drawItem() {
+       item.hide();
+
+       var info = item.get();
+       drawText(item.name, info.text, (y%4)+1);
+     }
+
+     item.on('redraw', drawItem);
+   })
+ });
+
+
+ // Ensure that our settings are still in range (e.g. app uninstall). Otherwise reset the position it.
+ if(settings.menuPosX >= menu.length || settings.menuPosY > menu[settings.menuPosX].items.length ){
+   settings.menuPosX = 0;
+   settings.menuPosY = 0;
+ }
+
+function canRunMenuItem(){
+  var menuEntry = menu[settings.menuPosX];
+  var item = menuEntry.items[settings.menuPosY];
+  return item.run !== undefined;
+}
+
+
+function runMenuItem(){
+  var menuEntry = menu[settings.menuPosX];
+  var item = menuEntry.items[settings.menuPosY];
+  try{
+    var ret = item.run();
+    if(ret){
+      Bangle.buzz(300, 0.6);
+    }
+  } catch (ex) {
+    // Simply ignore it...
+  }
+}
+
+/************************************************
+* Helper
+*/
+function getTime(){
+  var date = new Date();
+  return twoD(date.getHours())+ ":" + twoD(date.getMinutes());
+}
+
+function getDate(){
+  var date = new Date();
+  return twoD(date.getDate()) + "." + twoD(date.getMonth());
+}
+
+function getDay(){
+  var date = new Date();
+  return locale.dow(date, true);
+}
+
+function weekOfYear() {
+  var date = new Date();
+  date.setHours(0, 0, 0, 0);
+  // Thursday in current week decides the year.
+  date.setDate(date.getDate() + 3 - (date.getDay() + 6) % 7);
+  // January 4 is always in week 1.
+  var week1 = new Date(date.getFullYear(), 0, 4);
+  // Adjust to Thursday in week 1 and count number of weeks from date to week1.
+  return 1 + Math.round(((date.getTime() - week1.getTime()) / 86400000
+                        - 3 + (week1.getDay() + 6) % 7) / 7);
+}
+
+
+
+/************************************************
+* Draw
+*/
+function draw() {
+  queueDraw();
+
+  g.setFontUbuntuMono();
+  g.setFontAlign(-1, -1);
+
+  g.clearRect(0,24,W,H);
+
+  drawMainScreen();
+}
+
+
+
+function drawMainScreen(){
+  // Get menu item based on x
+  var menuItem = menu[settings.menuPosX];
+  var cmd = menuItem.name.slice(0,5).toLowerCase();
+  drawCmd(cmd);
+
+  // Draw menu items depending on our y value
+  drawMenuItems(menuItem);
+
+  // And draw the cursor
+  drawCursor();
+}
+
+function drawMenuItems(menuItem) {
+  var start = parseInt(settings.menuPosY / 4) * 4;
+  for (var i = start; i < start + 4; i++) {
+    if (i >= menuItem.items.length) {
+      continue;
+    }
+    lock_input++;
+    menuItem.items[i].show();
+  }
+}
+
+function drawCursor(){
+  g.setFontUbuntuMono();
+  g.setFontAlign(-1, -1);
+  g.setColor(g.theme.fg);
+
+  g.clearRect(0, 27 + 28, 15, H);
+  if(!Bangle.isLocked()){
+    g.drawString(">", -2, ((settings.menuPosY % 4) + 1) * 27 + 28);
+  }
+}
+
+function drawText(key, value, line){
+  var x = 15;
+  var y = line * 27 + 28;
+
+  g.setFontUbuntuMono();
+  g.setFontAlign(-1, -1);
+  g.setColor(g.theme.fg);
+
+  if(key){
+    key = (key.toLowerCase() + "    ").slice(0, 4) + "|";
+  } else {
+    key = ""
+  }
+
+  value = String(value).replace("\n", " ");
+  g.drawString(key + value, x, y);
+
+  lock_input -= 1;
+}
+
+
+function drawCmd(cmd){
+  var c = 0;
+  var x = 10;
+  var y = 28;
+
+  g.setColor("#0f0");
+  g.drawString("bjs", x+c, y);
+  c += g.stringWidth("bjs");
+
+  g.setColor(g.theme.fg);
+  g.drawString(":", x+c, y);
+  c += g.stringWidth(":");
+
+  g.setColor("#0ff");
+  g.drawString("$ ", x+c, y);
+  c += g.stringWidth("$ ");
+
+  g.setColor(g.theme.fg);
+  g.drawString(cmd, x+c, y);
+}
+
+function twoD(str){
+  return ("0" + str).slice(-2)
+}
+
+
+/************************************************
+* Listener
+*/
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+
+Bangle.on('lock', function(isLocked) {
+  drawCursor();
+});
+
+
+Bangle.on('charging',function(charging) {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = undefined;
+
+  settings.menuPosX=0;
+  settings.menuPosY=0;
+
+  draw();
+});
+
+var lock_input = 0;
+
+Bangle.on('touch', function(btn, e){
+  if(lock_input > 0){
+    return;
+  }
+  lock_input = 0;
+
+  var left = parseInt(g.getWidth() * 0.22);
+  var right = g.getWidth() - left;
+  var upper = parseInt(g.getHeight() * 0.22) + 20;
+  var lower = g.getHeight() - upper;
+
+  var is_upper = e.y < upper;
+  var is_lower = e.y > lower;
+  var is_left = e.x < left && !is_upper && !is_lower;
+  var is_right = e.x > right && !is_upper && !is_lower;
+  var is_center = !is_upper && !is_lower && !is_left && !is_right;
+
+  var oldYScreen = parseInt(settings.menuPosY/4);
+  if(is_lower){
+    if(settings.menuPosY >= menu[settings.menuPosX].items.length-1){
+    return;
+    }
+
+    Bangle.buzz(40, 0.6);
+    settings.menuPosY++;
+    if(parseInt(settings.menuPosY/4) == oldYScreen){
+    drawCursor();
+    return;
+    }
+  }
+
+  if(is_upper){
+    if(e.y < 20){ // Reserved for widget clicks
+      return;
+    }
+
+    if(settings.menuPosY <= 0){
+    return;
+    }
+    Bangle.buzz(40, 0.6);
+    settings.menuPosY--;
+    settings.menuPosY = settings.menuPosY < 0 ? 0 : settings.menuPosY;
+
+    if(parseInt(settings.menuPosY/4) == oldYScreen){
+    drawCursor();
+    return;
+    }
+  }
+
+  if(is_right){
+    Bangle.buzz(40, 0.6);
+    settings.menuPosX = (settings.menuPosX+1) % menu.length;
+    settings.menuPosY = 0;
+  }
+
+  if(is_left){
+    Bangle.buzz(40, 0.6);
+    settings.menuPosY = 0;
+    settings.menuPosX  = settings.menuPosX-1;
+    settings.menuPosX = settings.menuPosX < 0 ? menu.length-1 : settings.menuPosX;
+  }
+
+  if(is_center){
+  if(!canRunMenuItem()){
+    return;
+  }
+  runMenuItem();
+  }
+
+  draw();
+});
+
+E.on("kill", function(){
+  try{
+    storage.write(SETTINGS_FILE, settings);
+  } catch(ex){
+    // If this fails, we still kill the app...
+  }
+});
+
+
+/************************************************
+* Startup Clock
+*/
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
+// Load and draw widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// Draw first time
+draw();
diff --git a/apps/linuxclock/app.png b/apps/linuxclock/app.png
new file mode 100644
index 000000000..3a09cd575
Binary files /dev/null and b/apps/linuxclock/app.png differ
diff --git a/apps/linuxclock/metadata.json b/apps/linuxclock/metadata.json
new file mode 100644
index 000000000..dfb17a315
--- /dev/null
+++ b/apps/linuxclock/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "linuxclock",
+  "name": "Linux Clock",
+  "version": "0.02",
+  "description": "A Linux inspired clock.",
+  "readme": "README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot_2.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"linuxclock.app.js","url":"app.js"},
+    {"name":"linuxclock.img","url":"app-icon.js","evaluate":true},
+    {"name":"linuxclock.settings.js","url":"settings.js"}
+  ]
+}
diff --git a/apps/linuxclock/screenshot.png b/apps/linuxclock/screenshot.png
new file mode 100644
index 000000000..4bc7f9967
Binary files /dev/null and b/apps/linuxclock/screenshot.png differ
diff --git a/apps/linuxclock/screenshot_2.png b/apps/linuxclock/screenshot_2.png
new file mode 100644
index 000000000..abeba7a92
Binary files /dev/null and b/apps/linuxclock/screenshot_2.png differ
diff --git a/apps/linuxclock/settings.js b/apps/linuxclock/settings.js
new file mode 100644
index 000000000..116253fda
--- /dev/null
+++ b/apps/linuxclock/settings.js
@@ -0,0 +1,50 @@
+(function(back) {
+    const SETTINGS_FILE = "bwclk.setting.json";
+
+    // initialize with default settings...
+    const storage = require('Storage')
+    let settings = {
+      screen: "Normal",
+      showLock: true,
+      hideColon: false,
+    };
+    let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
+    for (const key in saved_settings) {
+      settings[key] = saved_settings[key]
+    }
+
+    function save() {
+      storage.write(SETTINGS_FILE, settings)
+    }
+
+    var screenOptions = ["Normal", "Dynamic", "Full"];
+    E.showMenu({
+      '': { 'title': 'BW Clock' },
+      '< Back': back,
+      'Screen': {
+        value: 0 | screenOptions.indexOf(settings.screen),
+        min: 0, max: 2,
+        format: v => screenOptions[v],
+        onchange: v => {
+          settings.screen = screenOptions[v];
+          save();
+        },
+      },
+      'Show Lock': {
+        value: settings.showLock,
+        format: () => (settings.showLock ? 'Yes' : 'No'),
+        onchange: () => {
+          settings.showLock = !settings.showLock;
+          save();
+        },
+      },
+      'Hide Colon': {
+        value: settings.hideColon,
+        format: () => (settings.hideColon ? 'Yes' : 'No'),
+        onchange: () => {
+          settings.hideColon = !settings.hideColon;
+          save();
+        },
+      }
+    });
+  })
diff --git a/apps/macwatch2/ChangeLog b/apps/macwatch2/ChangeLog
index a60193ba7..5eafe64d2 100644
--- a/apps/macwatch2/ChangeLog
+++ b/apps/macwatch2/ChangeLog
@@ -1,3 +1,5 @@
 0.01: Created first version of the app with numeric date, only works in light mode
 0.02: New icon, shimmied date right a bit
 0.03: Incorporated improvements from Peer David for accuracy, fix dark mode, widgets run in background
+0.04: Changed clock to use 12/24 hour format based on locale
+0.05: Tell clock widgets to hide.
diff --git a/apps/macwatch2/app.js b/apps/macwatch2/app.js
index 3b78d5baf..4556e06ac 100644
--- a/apps/macwatch2/app.js
+++ b/apps/macwatch2/app.js
@@ -30,15 +30,15 @@ function draw() {
   g.setFontAlign(0, -1, 0);
   g.setColor(0,0,0);
   var d = new Date();
-  var da = d.toString().split(" ");
-  hh = da[4].substr(0,2);
-  mi = da[4].substr(3,2);
+  var dt = require("locale").time(d, 1);
+  var hh = dt.split(":")[0];
+  var mm = dt.split(":")[1];
+  g.drawString(hh, 52, 65, true);
+  g.drawString(mm, 132, 65, true);
+  g.drawString(':', 93,65);
   dd = ("0"+(new Date()).getDate()).substr(-2);
   mo = ("0"+((new Date()).getMonth()+1)).substr(-2);
   yy = ("0"+((new Date()).getFullYear())).substr(-2);
-  g.drawString(hh, 52, 65, true);
-  g.drawString(mi, 132, 65, true);
-  g.drawString(':', 93,65);
   g.setFontCustom(font, 48, 8, 521);
   g.drawString(dd + ':' + mo + ':' + yy, 88, 120, true);
   
@@ -57,8 +57,8 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
+Bangle.setUI("clock");
 
 // Load widgets but hide them
 Bangle.loadWidgets();
 draw();
-Bangle.setUI("clock");
diff --git a/apps/macwatch2/metadata.json b/apps/macwatch2/metadata.json
index 09ec01e06..14c48c749 100644
--- a/apps/macwatch2/metadata.json
+++ b/apps/macwatch2/metadata.json
@@ -2,7 +2,7 @@
   "name": "MacWatch2",
   "shortName":"MacWatch2",
   "icon": "app.png",
-  "version":"0.03",
+  "version":"0.05",
   "description": "Classic Mac Finder clock",
   "type": "clock",
   "tags": "clock",
diff --git a/apps/matrixclock/ChangeLog b/apps/matrixclock/ChangeLog
index 5d88618bd..02f7d109b 100644
--- a/apps/matrixclock/ChangeLog
+++ b/apps/matrixclock/ChangeLog
@@ -3,3 +3,5 @@
 0.03: Keep the date from being overwritten, use correct colour from theme for clearing
 0.04: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up".
 0.05: Added support to other color themes (other then black)
+0.06: Added support for 24 hour clock enabled from settings
+0.07: Tell clock widgets to hide.
diff --git a/apps/matrixclock/README.md b/apps/matrixclock/README.md
index a2add957a..01aef6544 100644
--- a/apps/matrixclock/README.md
+++ b/apps/matrixclock/README.md
@@ -5,10 +5,11 @@
 ## Settings
 Please use the setting->App->Matrix Clock Menu to change the settings
 
-| Setting   | Description                                                                                                        |
-|-----------|--------------------------------------------------------------------------------------------------------------------|
-| Color     | by default set to **'theme'** to follow the theme colors. Selector also offers a selection of other colour schemes |
-| Intensity | Changes the number of matrix streams that are falling                                                              |
+| Setting     | Description                                                                                                        |
+|-------------|--------------------------------------------------------------------------------------------------------------------|
+| Color       | By default set to **'theme'** to follow the theme colors. Selector also offers a selection of other colour schemes |
+| Time Format | Choose between 12 hour and 24 hour time format                                                                     |
+| Intensity   | Changes the number of matrix streams that are falling                                                              |
 
 ## Colour Themes
 
diff --git a/apps/matrixclock/matrixclock.js b/apps/matrixclock/matrixclock.js
index 5477f64fb..9618c3a47 100644
--- a/apps/matrixclock/matrixclock.js
+++ b/apps/matrixclock/matrixclock.js
@@ -10,9 +10,16 @@
 const Locale = require('locale');
 
 const PREFERENCE_FILE = "matrixclock.settings.json";
-const settings = Object.assign({color: "theme", intensity: 'light'},
+const settings = Object.assign({color: "theme", time_format: '12 hour', intensity: 'light'},
     require('Storage').readJSON(PREFERENCE_FILE, true) || {});
 
+var format_time;
+if(settings.time_format == '24 hour'){
+  format_time = (t) => format_time_24_hour(t);
+} else {
+  format_time = (t) => format_time_12_hour(t);
+}
+
 const colors = {
   'gray' :[0.5,0.5,0.5],
   'green': [0,1.0,0],
@@ -247,8 +254,14 @@ function format_date(now){
   return Locale.dow(now,1) + " " + format00(now.getDate());
 }
 
+function format_time_24_hour(now){
+  var time = new Date(now.getTime());
+  var hours = time.getHours() ;
 
-function format_time(now){
+  return format00(hours) + ":" + format00(time.getMinutes());
+}
+
+function format_time_12_hour(now){
   var time = new Date(now.getTime());
   var hours = time.getHours() % 12;
   if(hours < 1){
@@ -315,11 +328,9 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+Bangle.setUI("clock");
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
 startTimers();
-Bangle.setUI("clock");
-
-
diff --git a/apps/matrixclock/matrixclock.settings.js b/apps/matrixclock/matrixclock.settings.js
index 0f625df4d..1f22a045f 100644
--- a/apps/matrixclock/matrixclock.settings.js
+++ b/apps/matrixclock/matrixclock.settings.js
@@ -1,6 +1,6 @@
 (function(back) {
     const PREFERENCE_FILE = "matrixclock.settings.json";
-    var settings = Object.assign({color : "theme", intensity: "light"},
+    var settings = Object.assign({color : "theme", time_format: '12 hour', intensity: "light"},
         require('Storage').readJSON(PREFERENCE_FILE, true) || {});
 
     console.log("loaded:" + JSON.stringify(settings));
@@ -44,6 +44,7 @@
             'white on red',
             'white on blue'
         ]),
+        "Time Format": stringInSettings("time_format", ['12 hour','24 hour']),
         "Intensity": stringInSettings("intensity", ['light',
             'medium',
             'high'])
diff --git a/apps/matrixclock/metadata.json b/apps/matrixclock/metadata.json
index 1312210dd..718b878e5 100644
--- a/apps/matrixclock/metadata.json
+++ b/apps/matrixclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "matrixclock",
   "name": "Matrix Clock",
-  "version": "0.05",
+  "version": "0.07",
   "description": "inspired by The Matrix, a clock of the same style",
   "icon": "matrixclock.png",
   "screenshots": [{"url":"matrix_green_on_black.jpg"}],
diff --git a/apps/mclock/ChangeLog b/apps/mclock/ChangeLog
index 05b422406..e3b164942 100644
--- a/apps/mclock/ChangeLog
+++ b/apps/mclock/ChangeLog
@@ -5,3 +5,4 @@
       Fix issue where first digit could get stuck going from "2x:xx" to " x:xx" (fix #365)
 0.06: Support 12 hour time
 0.07: Use Bangle.setUI for button/launcher handling
+0.08: Tell clock widgets to hide.
diff --git a/apps/mclock/clock-morphing.js b/apps/mclock/clock-morphing.js
index f1254860b..bd133206e 100644
--- a/apps/mclock/clock-morphing.js
+++ b/apps/mclock/clock-morphing.js
@@ -209,6 +209,9 @@ Bangle.on('lcdPower',function(on) {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -216,5 +219,3 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/mclock/metadata.json b/apps/mclock/metadata.json
index 513f823a1..a7d56f752 100644
--- a/apps/mclock/metadata.json
+++ b/apps/mclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "mclock",
   "name": "Morphing Clock",
-  "version": "0.07",
+  "version": "0.08",
   "description": "7 segment clock that morphs between minutes and hours",
   "icon": "clock-morphing.png",
   "type": "clock",
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index c3d63a199..166ff64ae 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -58,3 +58,18 @@
 0.43: Add new Icons (Airbnb, warnwetter)
 0.44: Separate buzz pattern for incoming calls
 0.45: Added new app colors and icons
+0.46: Add 'Vibrate Timer' option to set how long to vibrate for, and fix Repeat:off
+      Fix message removal from widget bar (previously caused exception as .hide has been removed)
+0.47: Add new Icons (Nextbike, Mattermost, etc.)
+0.48: When getting new message from the clock, only buzz once the messages app is loaded
+0.49: Change messages icon (to fit within 24px) and ensure widget renders icons centrally
+0.50: Add `getMessages` and `status` functions to library
+      Option to disable auto-open of messages
+      Option to make message icons monochrome (not colored)
+      messages widget buzz now returns a promise
+0.51: Emit "message events"
+      Setting to hide widget
+      Add custom event handlers to prevent default app form loading
+      Move WIDGETS.messages.buzz() to require("messages").buzz()
+0.52: Fix require("messages").buzz() regression
+      Fix background color in messages list after one unread message is shown
diff --git a/apps/messages/README.md b/apps/messages/README.md
index aadd1c304..72a989146 100644
--- a/apps/messages/README.md
+++ b/apps/messages/README.md
@@ -14,7 +14,9 @@ and `Messages`:
 * `Vibrate` - This is the pattern of buzzes that should be made when a new message is received
 * `Vibrate for calls` - This is the pattern of buzzes that should be made when an incoming call is received
 * `Repeat` - How often should buzzes repeat - the default of 4 means the Bangle will buzz every 4 seconds
-* `Unread Timer` - When a new message is received we go into the Messages app.
+* `Vibrate Timer` - When a new message is received when in a non-clock app, we display the message icon and
+buzz every `Repeat` seconds. This is how long we continue to do that.
+* `Unread Timer` - When a new message is received when showing the clock we go into the Messages app.
 If there is no user input for this amount of time then the app will exit and return
 to the clock where a ringing bell will be shown in the Widget bar.
 * `Min Font` - The minimum font size used when displaying messages on the screen. A bigger font
@@ -23,7 +25,7 @@ it starts getting clipped.
 * `Auto-Open Music` - Should the app automatically open when the phone starts playing music?
 * `Unlock Watch` - Should the app unlock the watch when a new message arrives, so you can touch the buttons at the bottom of the app?
 * `Flash Icon` - Toggle flashing of the widget icon.
-* `Widget messages` - The maximum amount of message icons to show on the widget.
+* `Widget messages` - The maximum amount of message icons to show on the widget, or `Hide` the widget completely.
 
 ## New Messages
 
@@ -54,6 +56,24 @@ _2. What the notify icon looks like (it's touchable on Bangle.js2!)_
 ![](screenshot-notify.gif)
 
 
+## Events (for app/widget developers)
+
+When a new message arrives, a `"message"` event is emitted, you can listen for
+it like this:
+
+```js
+myMessageListener = Bangle.on("message", (type, message)=>{
+  if (message.handled) return; // another app already handled this message
+  // <type> is one of "text", "call", "alarm", "map", "music", or "clearAll"
+  if (type === "clearAll") return; // not a message
+  // see `messages/lib.js` for possible <message> formats
+  // message.t could be "add", "modify" or "remove"
+  E.showMessage(`${message.title}\n${message.body}`, `${message.t} ${type} message`);
+  // You can prevent the default `message` app from loading by setting `message.handled = true`:
+  message.handled = true;
+});
+```
+
 
 ## Requests
 
diff --git a/apps/messages/app-newmessage.js b/apps/messages/app-newmessage.js
new file mode 100644
index 000000000..328927c70
--- /dev/null
+++ b/apps/messages/app-newmessage.js
@@ -0,0 +1,5 @@
+/* Called when we have a new message when we're in the clock...
+BUZZ_ON_NEW_MESSAGE is set so when messages.app.js loads it knows
+that it should buzz */
+global.BUZZ_ON_NEW_MESSAGE = true;
+eval(require("Storage").read("messages.app.js"));
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 6b61740aa..f6226d178 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -48,14 +48,13 @@ we should start a timeout for settings.unreadTimeout to return
 to the clock. */
 var unreadTimeout;
 /// List of all our messages
-var MESSAGES = require("Storage").readJSON("messages.json",1)||[];
+var MESSAGES = require("messages").getMessages();
 if (!Array.isArray(MESSAGES)) MESSAGES=[];
 var onMessagesModified = function(msg) {
   // TODO: if new, show this new one
   if (msg && msg.id!=="music" && msg.new && active!="map" &&
       !((require('Storage').readJSON('setting.json', 1) || {}).quiet)) {
-    if (WIDGETS["messages"]) WIDGETS["messages"].buzz(msg.src);
-    else Bangle.buzz();
+    require("messages").buzz(msg.src);
   }
   if (msg && msg.id=="music") {
     if (msg.state && msg.state!="play") openMusic = false; // no longer playing music to go back to
@@ -69,8 +68,7 @@ function saveMessages() {
 
 function showMapMessage(msg) {
   active = "map";
-  var m;
-  var distance, street, target, eta;
+  var m, distance, street, target, eta;
   m=msg.title.match(/(.*) - (.*)/);
   if (m) {
     distance = m[1];
@@ -286,6 +284,7 @@ function showMessage(msgid) {
     }
   }
   function goBack() {
+    layout = undefined;
     msg.new = false; saveMessages(); // read mail
     cancelReloadTimeout(); // don't auto-reload to clock now
     checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic});
@@ -353,8 +352,18 @@ function checkMessages(options) {
   // we have >0 messages
   var newMessages = MESSAGES.filter(m=>m.new&&m.id!="music");
   // If we have a new message, show it
-  if (options.showMsgIfUnread && newMessages.length)
-    return showMessage(newMessages[0].id);
+  if (options.showMsgIfUnread && newMessages.length) {
+    showMessage(newMessages[0].id);
+    // buzz after showMessage, so being busy during layout doesn't affect the buzz pattern
+    if (global.BUZZ_ON_NEW_MESSAGE) {
+      // this is set if we entered the messages app by loading `messages.new.js`
+      // ... but only buzz the first time we view a new message
+      global.BUZZ_ON_NEW_MESSAGE = false;
+      // messages.buzz respects quiet mode - no need to check here
+      require("messages").buzz(newMessages[0].src);
+    }
+    return;
+  }
   // no new messages: show playing music? (only if we have playing music to show)
   if (options.openMusic && MESSAGES.some(m=>m.id=="music" && m.track && m.state=="play"))
     return showMessage('music');
@@ -369,7 +378,7 @@ function checkMessages(options) {
     draw : function(idx, r) {"ram"
       var msg = MESSAGES[idx];
       if (msg && msg.new) g.setBgColor(g.theme.bgH).setColor(g.theme.fgH);
-      else g.setColor(g.theme.fg);
+      else g.setBgColor(g.theme.bg).setColor(g.theme.fg);
       g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
       if (!msg) return;
       var x = r.x+2, title = msg.title, body = msg.body;
diff --git a/apps/messages/lib.js b/apps/messages/lib.js
index 50df70ea8..0188342ee 100644
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@@ -8,15 +8,11 @@ function openMusic() {
 /* Push a new message onto messages queue, event is:
   {t:"add",id:int, src,title,subject,body,sender,tel, important:bool, new:bool}
   {t:"add",id:int, id:"music", state, artist, track, etc} // add new
-  {t:"remove-",id:int} // remove
+  {t:"remove",id:int} // remove
   {t:"modify",id:int, title:string} // modified
 */
 exports.pushMessage = function(event) {
-  var messages, inApp = "undefined"!=typeof MESSAGES;
-  if (inApp)
-    messages = MESSAGES; // we're in an app that has already loaded messages
-  else   // no app - load messages
-    messages = require("Storage").readJSON("messages.json",1)||[];
+  var messages = exports.getMessages();
   // now modify/delete as appropriate
   var mIdx = messages.findIndex(m=>m.id==event.id);
   if (event.t=="remove") {
@@ -35,99 +31,173 @@ exports.pushMessage = function(event) {
     else Object.assign(messages[mIdx], event);
     if (event.id=="music" && messages[mIdx].state=="play") {
       messages[mIdx].new = true; // new track, or playback (re)started
+      type = 'music';
     }
   }
   require("Storage").writeJSON("messages.json",messages);
+  var message = mIdx<0 ? {id:event.id, t:'remove'} : messages[mIdx];
   // if in app, process immediately
-  if (inApp) return onMessagesModified(mIdx<0 ? {id:event.id} : messages[mIdx]);
-  // if we've removed the last new message, hide the widget
-  if (event.t=="remove" && !messages.some(m=>m.new)) {
-    if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.hide();
+  if ("undefined"!=typeof MESSAGES) return onMessagesModified(message);
+  // emit message event
+  var type = 'text';
+  if (["call", "music", "map"].includes(message.id)) type = message.id;
+  if (message.src && message.src.toLowerCase().startsWith("alarm")) type = "alarm";
+  Bangle.emit("message", type, message);
+  // update the widget icons shown
+  if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.update(messages,true);
+  var handleMessage = () => {
     // if no new messages now, make sure we don't load the messages app
-    if (exports.messageTimeout && !messages.some(m=>m.new))
+    if (event.t=="remove" && exports.messageTimeout && !messages.some(m => m.new)) {
       clearTimeout(exports.messageTimeout);
-  }
-  // ok, saved now
-  if (event.id=="music" && Bangle.CLOCK && messages[mIdx].new && openMusic()) {
-    // just load the app to display music: no buzzing
-    load("messages.app.js");
-  } else if (event.t!="add") {
-    // we only care if it's new
-    return;
-  } else if(event.new == false) {
-    return;
-  }
-  // otherwise load messages/show widget
-  var loadMessages = Bangle.CLOCK || event.important;
-  var quiet       = (require('Storage').readJSON('setting.json',1)||{}).quiet;
-  var appSettings = require('Storage').readJSON('messages.settings.json',1)||{};
-  var unlockWatch = appSettings.unlockWatch;
-  var quietNoAutOpn = appSettings.quietNoAutOpn;
-  delete appSettings;
-  // don't auto-open messages in quiet mode if quietNoAutOpn is true
-  if(quiet && quietNoAutOpn) {
-      loadMessages = false;
-  }
-  // first, buzz
-  if (!quiet && loadMessages && global.WIDGETS && WIDGETS.messages){
-      WIDGETS.messages.buzz(event.src);
-      if(unlockWatch != false){
-        Bangle.setLocked(false);
-        Bangle.setLCDPower(1); // turn screen on
-      }
-  }
-  // after a delay load the app, to ensure we have all the messages
-  if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
-  exports.messageTimeout = setTimeout(function() {
-    exports.messageTimeout = undefined;
-    // if we're in a clock or it's important, go straight to messages app
-    if (loadMessages){
-      return load("messages.app.js");
+      delete exports.messageTimeout;
     }
-    if (!quiet && (!global.WIDGETS || !WIDGETS.messages)) return Bangle.buzz(); // no widgets - just buzz to let someone know
-    if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.update(messages);
-  }, 500);
+    // ok, saved now
+    if (event.id=="music" && Bangle.CLOCK && messages[mIdx].new && openMusic()) {
+      // just load the app to display music: no buzzing
+      load("messages.app.js");
+    } else if (event.t!="add") {
+      // we only care if it's new
+      return;
+    } else if (event.new==false) {
+      return;
+    }
+    // otherwise load messages/show widget
+    var loadMessages = Bangle.CLOCK || event.important;
+    var quiet = (require('Storage').readJSON('setting.json', 1) || {}).quiet;
+    var appSettings = require('Storage').readJSON('messages.settings.json', 1) || {};
+    var unlockWatch = appSettings.unlockWatch;
+    // don't auto-open messages in quiet mode if quietNoAutOpn is true
+    if ((quiet && appSettings.quietNoAutOpn) || appSettings.noAutOpn)
+      loadMessages = false;
+    delete appSettings;
+    // after a delay load the app, to ensure we have all the messages
+    if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
+    exports.messageTimeout = setTimeout(function() {
+      exports.messageTimeout = undefined;
+      // if we're in a clock or it's important, go straight to messages app
+      if (loadMessages) {
+        if (!quiet && unlockWatch) {
+          Bangle.setLocked(false);
+          Bangle.setLCDPower(1); // turn screen on
+        }
+        // we will buzz when we enter the messages app
+        return load("messages.new.js");
+      }
+      if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.update(messages);
+      exports.buzz(message.src);
+    }, 500);
+  };
+  setTimeout(()=>{
+    if (!message.handled) handleMessage();
+  },0);
 }
 /// Remove all messages
-exports.clearAll = function(event) {
-  var messages, inApp = "undefined"!=typeof MESSAGES;
-  if (inApp) {
+exports.clearAll = function() {
+  if ("undefined"!= typeof MESSAGES) { // we're in a messages app, clear that as well
     MESSAGES = [];
-    messages = MESSAGES; // we're in an app that has already loaded messages
-  } else   // no app - empty messages
-    messages = [];
-  // Save all messages
-  require("Storage").writeJSON("messages.json",messages);
-  // update app if in app
-  if (inApp) return onMessagesModified();
+  }
+  // Clear all messages
+  require("Storage").writeJSON("messages.json", []);
   // if we have a widget, update it
   if (global.WIDGETS && WIDGETS.messages)
-    WIDGETS.messages.update(messages);
+    WIDGETS.messages.update([]);
+  // let message listeners know
+  Bangle.emit("message", "clearAll", {}); // guarantee listeners an object as `message`
+  // clearAll cannot be marked as "handled"
+  // update app if in app
+  if ("function"== typeof onMessagesModified) onMessagesModified();
 }
 
+/**
+ * @returns {array} All messages
+ */
+exports.getMessages = function() {
+  if ("undefined"!=typeof MESSAGES) return MESSAGES; // loaded/managed by app
+  return require("Storage").readJSON("messages.json",1)||[];
+}
+
+/**
+ * Check if there are any messages
+ * @returns {string} "new"/"old"/"none"
+ */
+ exports.status = function() {
+  try {
+    let status= "none";
+    for(const m of exports.getMessages()) {
+      if (["music", "map"].includes(m.id)) continue;
+      if (m.new) return "new";
+      status = "old";
+    }
+    return status;
+  } catch(e) {
+    return "none"; // don't bother e.g. the widget with errors
+  }
+};
+
+/**
+ * Start buzzing for new message
+ * @param {string} msgSrc Message src to buzz for
+ * @return {Promise} Resolves when initial buzz finishes (there might be repeat buzzes later)
+ */
+exports.buzz = function(msgSrc) {
+  exports.stopBuzz(); // cancel any previous buzz timeouts
+  if ((require('Storage').readJSON('setting.json',1)||{}).quiet) return Promise.resolve(); // never buzz during Quiet Mode
+
+  var pattern;
+  if (msgSrc && msgSrc.toLowerCase() === "phone") {
+    // special vibration pattern for incoming calls
+    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrateCalls;
+  } else {
+    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate;
+  }
+  if (pattern === undefined) { pattern = ":"; } // pattern may be "", so we can't use || ":" here
+  if (!pattern) return Promise.resolve();
+
+  var repeat = (require('Storage').readJSON("messages.settings.json", true) || {}).repeat;
+  if (repeat===undefined) repeat=4; // repeat may be zero
+  if (repeat) {
+    exports.buzzTimeout = setTimeout(()=>require("buzz").pattern(pattern), repeat*1000);
+    var vibrateTimeout = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrateTimeout;
+    if (vibrateTimeout===undefined) vibrateTimeout=60;
+    if (vibrateTimeout && !exports.stopTimeout) exports.stopTimeout = setTimeout(exports.stopBuzz, vibrateTimeout*1000);
+  }
+  return require("buzz").pattern(pattern);
+};
+/**
+ * Stop buzzing
+ */
+exports.stopBuzz = function() {
+  if (exports.buzzTimeout) clearTimeout(exports.buzzTimeout);
+  delete exports.buzzTimeout;
+  if (exports.stopTimeout) clearTimeout(exports.stopTimeout);
+  delete exports.stopTimeout;
+};
+
 exports.getMessageImage = function(msg) {
   /*
-  * icons should be 24x24px with 1bpp colors and 'Transparency to Color'
+  * icons should be 24x24px or less with 1bpp colors and 'Transparency to Color'
   * http://www.espruino.com/Image+Converter
   */
   if (msg.img) return atob(msg.img);
-  var s = (msg.src||"").toLowerCase();
+  const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   if (s=="airbnb") return atob("GBgBAAAAAAAAAAAAADwAAH4AAGYAAMMAAIEAAYGAAYGAAzzAA2bABmZgBmZgDGYwDDwwCDwQCBgQDDwwB+fgA8PAAAAAAAAAAAAA");
   if (s=="alarm" || s =="alarmclockreceiver") return atob("GBjBAP////8AAAAAAAACAEAHAOAefng5/5wTgcgHAOAOGHAMGDAYGBgYGBgYGBgYGBgYDhgYBxgMATAOAHAHAOADgcAB/4AAfgAAAAAAAAA=");
   if (s=="bibel") return atob("GBgBAAAAA//wD//4D//4H//4H/f4H/f4H+P4H4D4H4D4H/f4H/f4H/f4H/f4H/f4H//4H//4H//4GAAAEAAAEAAACAAAB//4AAAA");
   if (s=="bring") return atob("GBgBAAAAAAAAAAAAAAAAAHwAAFoAAf+AA/+AA/+AA/+AA/eAA+eAA0+AAx+AA7+AA/+AA//AA/+AAf8AAAIAAAAAAAAAAAAAAAAA");
-  if (s=="calendar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
+  if (s=="calendar" || s=="etar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
   if (s=="corona-warn") return atob("GBgBAAAAABwAAP+AAf/gA//wB/PwD/PgDzvAHzuAP8EAP8AAPAAAPMAAP8AAH8AAHzsADzuAB/PAB/PgA//wAP/gAH+AAAwAAAAA");
   if (s=="discord") return atob("GBgBAAAAAAAAAAAAAIEABwDgDP8wH//4H//4P//8P//8P//8Pjx8fhh+fzz+f//+f//+e//ePH48HwD4AgBAAAAAAAAAAAAAAAAA");
   if (s=="facebook" || s=="messenger") return atob("GBiBAAAAAAAAAAAYAAD/AAP/wAf/4A/48A/g8B/g+B/j+B/n+D/n/D8A/B8A+B+B+B/n+A/n8A/n8Afn4APnwADnAAAAAAAAAAAAAA==");
   if (s=="gmx") return atob("GBgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEJmfmd8Zuc85v847/88Z9s8fttmHIHiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-  if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA==");
-  if (s=="hangouts") return atob("FBaBAAH4AH/gD/8B//g//8P//H5n58Y+fGPnxj5+d+fmfj//4//8H//B//gH/4A/8AA+AAHAABgAAAA=");
+  if (s=="google") return atob("GBiBAAAAAAD/AAP/wAf/4A/D4B8AwDwAADwAAHgAAHgAAHAAAHAH/nAH/nAH/ngH/ngAHjwAPDwAfB8A+A/D8Af/4AP/wAD/AAAAAA==");
+  if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA=="); // 2 bit unpaletted
   if (s=="home assistant") return atob("FhaBAAAAAADAAAeAAD8AAf4AD/3AfP8D7fwft/D/P8ec572zbzbNsOEhw+AfD8D8P4fw/z/D/P8P8/w/z/AAAAA=");
   if (s=="instagram") return atob("GBiBAAAAAAAAAAAAAAAAAAP/wAYAYAwAMAgAkAh+EAjDEAiBEAiBEAiBEAiBEAjDEAh+EAgAEAwAMAYAYAP/wAAAAAAAAAAAAAAAAA==");
   if (s=="kalender") return atob("GBgBBgBgBQCgff++RQCiRgBiQAACf//+QAACQAACR//iRJkiRIEiR//iRNsiRIEiRJkiR//iRIEiRIEiR//iQAACQAACf//+AAAA");
   if (s=="lieferando") return atob("GBgBABgAAH5wAP9wAf/4A//4B//4D//4H//4P/88fV8+fV4//V4//Vw/HVw4HVw4HBg4HBg4HBg4HDg4Hjw4Hj84Hj44Hj44Hj44");
+  if (s=="mattermost") return atob("GBgBAAAAAPAAA+EAB4MADgcYHAcYOA8MOB8OeD8GcD8GcH8GcD8HcD8HeBwHeAAOfAAOfgAePwA8P8D8H//4D//wB//gAf/AAH4A");
   if (s=="n26") return atob("GBgBAAAAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAOIAAOIAAPIAANoAANoAAM4AAMYAAMYAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAAAA");
+  if (s=="nextbike") return atob("GBgBAAAAAAAAAAAAAAAAAAAAAACAfgDAPwDAP4HAH4N4H8f8D82GMd8CMDsDMGMDMGGGGMHOD4D8AAAAAAAAAAAAAAAAAAAAAAAA");
   if (s=="nina") return atob("GBgBAAAABAAQCAAICAAIEAAEEgAkJAgSJBwSKRxKSj4pUn8lVP+VVP+VUgAlSgApKQBKJAASJAASEgAkEAAECAAICAAIBAAQAAAA");
   if (s=="outlook mail") return atob("HBwBAAAAAAAAAAAIAAAfwAAP/gAB/+AAP/5/A//v/D/+/8P/7/g+Pv8Dye/gPd74w5znHDnOB8Oc4Pw8nv/Dwe/8Pj7/w//v/D/+/8P/7/gf/gAA/+AAAfwAAACAAAAAAAAAAAA=");
   if (s=="paypal") return atob("GBgBAAAAAAAAAAAAAf+AAf/AAf/gA//gA//gA//wA//wA//wA//wB//wB//wB//gB/+AB/gAB/gAB/gAAPgAAPgAAAAAAAAAAAAA");
@@ -141,23 +211,27 @@ exports.getMessageImage = function(msg) {
   if (s=="teams") return atob("GBgBAAAAAAAAAAQAAB4AAD8IAA8cP/M+f/scf/gIeDgAfvvefvvffvvffvvffvvff/vff/veP/PeAA/cAH/AAD+AAD8AAAQAAAAA");
   if (s=="telegram" || s=="telegram foss") return atob("GBiBAAAAAAAAAAAAAAAAAwAAHwAA/wAD/wAf3gD/Pgf+fh/4/v/z/P/H/D8P/Acf/AM//AF/+AF/+AH/+ADz+ADh+ADAcAAAMAAAAA==");
   if (s=="threema") return atob("GBjB/4Yx//8AAAAAAAAAAAAAfgAB/4AD/8AH/+AH/+AP//AP2/APw/APw/AHw+AH/+AH/8AH/4AH/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=");
-  if (s=="to do") return atob("GBgBAAAAAAAAAAAwAAB4AAD8AAH+AAP/DAf/Hg//Px/+f7/8///4///wf//gP//AH/+AD/8AB/4AA/wAAfgAAPAAAGAAAAAAAAAA");
+  if (s=="to do" || s=="opentasks") return atob("GBgBAAAAAAAAAAAwAAB4AAD8AAH+AAP/DAf/Hg//Px/+f7/8///4///wf//gP//AH/+AD/8AB/4AA/wAAfgAAPAAAGAAAAAAAAAA");
   if (s=="twitch") return atob("GBgBH//+P//+P//+eAAGeAAGeAAGeDGGeDOGeDOGeDOGeDOGeDOGeDOGeAAOeAAOeAAcf4/4f5/wf7/gf//Af/+AA/AAA+AAAcAA");
   if (s=="twitter") return atob("GhYBAABgAAB+JgA/8cAf/ngH/5+B/8P8f+D///h///4f//+D///g///wD//8B//+AP//gD//wAP/8AB/+AB/+AH//AAf/AAAYAAA");
   if (s=="warnapp") return atob("GBgBAAAAAAAAAAAAAH4AAP8AA//AA//AD//gP//gf//4f//+/+P+/8H//8n//4n/fxh/fzg+Pj88Dn44AA4AAAwAAAwAAAgAAAAA");
   if (s=="whatsapp") return atob("GBiBAAB+AAP/wAf/4A//8B//+D///H9//n5//nw//vw///x///5///4///8e//+EP3/APn/wPn/+/j///H//+H//8H//4H//wMB+AA==");
   if (s=="wordfeud") return atob("GBgCWqqqqqqlf//////9v//////+v/////++v/////++v8///Lu+v8///L++v8///P/+v8v//P/+v9v//P/+v+fx/P/+v+Pk+P/+v/PN+f/+v/POuv/+v/Ofdv/+v/NvM//+v/I/Y//+v/k/k//+v/i/w//+v/7/6//+v//////+v//////+f//////9Wqqqqqql");
-  if (s=="youtube") return atob("GBgBAAAAAAAAAAAAAAAAAf8AH//4P//4P//8P//8P5/8P4/8f4P8f4P8P4/8P5/8P//8P//8P//4H//4Af8AAAAAAAAAAAAAAAAA");
+  if (s=="youtube" || s=="newpipe") return atob("GBgBAAAAAAAAAAAAAAAAAf8AH//4P//4P//8P//8P5/8P4/8f4P8f4P8P4/8P5/8P//8P//8P//4H//4Af8AAAAAAAAAAAAAAAAA");
   if (msg.id=="music") return atob("FhaBAH//+/////////////h/+AH/4Af/gB/+H3/7/f/v9/+/3/7+f/vB/w8H+Dwf4PD/x/////////////3//+A=");
   // if (s=="sms message" || s=="mail" || s=="gmail") // .. default icon (below)
-  return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A==");
+  return atob("FhKBAH//+P//yf/+c//z5/+fz/z/n+f/Pz/+ef/8D///////////////////////f//4///A");
 };
 
 exports.getMessageImageCol = function(msg,def) {
+  let iconColorMode = (require('Storage').readJSON("messages.settings.json", 1) || {}).iconColorMode;
+  if (iconColorMode == 'mono')
+    return g.theme.fg;
+  const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   return {
     // generic colors, using B2-safe colors
+    // DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used
     "airbnb": "#f00",
-    "alarm": "#fff",
     "mail": "#ff0",
     "music": "#f0f",
     "phone": "#0f0",
@@ -167,17 +241,22 @@ exports.getMessageImageCol = function(msg,def) {
     "bibel": "#54342c",
     "bring": "#455a64",
     "discord": "#738adb",
+    "etar": "#36a18b",
     "facebook": "#4267b2",
     "gmail": "#ea4335",
     "gmx": "#1c449b",
+    "google": "#4285F4",
     "google home": "#fbbc05",
-    "hangouts": "#1ba261",
-    "home assistant": "#fff", // ha-blue is #41bdf5, but that's the background
+// "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
     "instagram": "#dd2a7b",
     "lieferando": "#ee5c00",
     "messenger": "#0078ff",
+    "mattermost": "#00f",
     "n26": "#36a18b",
+    "nextbike": "#00f",
+    "newpipe": "#f00",
     "nina": "#e57004",
+    "opentasks": "#409f8f",
     "outlook mail": "#0072c6",
     "paypal": "#003087",
     "post & dhl": "#f2c101",
@@ -189,12 +268,11 @@ exports.getMessageImageCol = function(msg,def) {
     "teams": "#464eb8",
     "telegram": "#0088cc",
     "telegram foss": "#0088cc",
-    "threema": "#000",
     "to do": "#3999e5",
     "twitch": "#6441A4",
     "twitter": "#1da1f2",
     "whatsapp": "#4fce5d",
     "wordfeud": "#e7d3c7",
     "youtube": "#f00",
-  }[(msg.src||"").toLowerCase()]||(def !== undefined?def:g.theme.fg);
+  }[s]||(def !== undefined?def:g.theme.fg);
 };
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index c514e5256..a31c21e03 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.45",
+  "version": "0.52",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
@@ -10,6 +10,7 @@
   "readme": "README.md",
   "storage": [
     {"name":"messages.app.js","url":"app.js"},
+    {"name":"messages.new.js","url":"app-newmessage.js"},
     {"name":"messages.settings.js","url":"settings.js"},
     {"name":"messages.img","url":"app-icon.js","evaluate":true},
     {"name":"messages.wid.js","url":"widget.js"},
diff --git a/apps/messages/settings.js b/apps/messages/settings.js
index bcd227ece..09c9db455 100644
--- a/apps/messages/settings.js
+++ b/apps/messages/settings.js
@@ -1,11 +1,15 @@
 (function(back) {
+  const iconColorModes = ['color', 'mono'];
+
   function settings() {
     let settings = require('Storage').readJSON("messages.settings.json", true) || {};
     if (settings.vibrate===undefined) settings.vibrate=":";
     if (settings.vibrateCalls===undefined) settings.vibrateCalls=":";
     if (settings.repeat===undefined) settings.repeat=4;
+    if (settings.vibrateTimeout===undefined) settings.vibrateTimeout=60;
     if (settings.unreadTimeout===undefined) settings.unreadTimeout=60;
     if (settings.maxMessages===undefined) settings.maxMessages=3;
+    if (settings.iconColorMode === undefined) settings.iconColorMode = iconColorModes[0];
     settings.unlockWatch=!!settings.unlockWatch;
     settings.openMusic=!!settings.openMusic;
     settings.maxUnreadTimeout=240;
@@ -29,6 +33,12 @@
       format: v => v?v+"s":/*LANG*/"Off",
       onchange: v => updateSetting("repeat", v)
     },
+    /*LANG*/'Vibrate timer': {
+      value: settings().vibrateTimeout,
+      min: 0, max: settings().maxUnreadTimeout, step : 10,
+      format: v => v?v+"s":/*LANG*/"Off",
+      onchange: v => updateSetting("vibrateTimeout", v)
+    },
     /*LANG*/'Unread timer': {
       value: settings().unreadTimeout,
       min: 0, max: settings().maxUnreadTimeout, step : 10,
@@ -57,10 +67,21 @@
       value: !!settings().quietNoAutOpn,
       onchange: v => updateSetting("quietNoAutOpn", v)
     },
+    /*LANG*/'Disable auto-open': {
+      value: !!settings().noAutOpn,
+      onchange: v => updateSetting("noAutOpn", v)
+    },
     /*LANG*/'Widget messages': {
       value:0|settings().maxMessages,
-      min: 1, max: 5,
+      min: 0, max: 5,
+      format: v => v ? v :/*LANG*/"Hide",
       onchange: v => updateSetting("maxMessages", v)
+    },
+    /*LANG*/'Icon color mode': {
+      value: Math.max(0,iconColorModes.indexOf(settings().iconColorMode)),
+      min: 0, max: iconColorModes.length - 1,
+      format: v => iconColorModes[v],
+      onchange: v => updateSetting("iconColorMode", iconColorModes[v])
     }
   };
   E.showMenu(mainmenu);
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index c8ae8d570..c8d132f82 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -1,17 +1,13 @@
 (() => {
-
-function getMessages() {
-  if ("undefined"!=typeof MESSAGES) return MESSAGES;
-  return require("Storage").readJSON("messages.json",1)||[];
-}
+if ((require('Storage').readJSON("messages.settings.json", true) || {}).maxMessages===0) return;
 
 function filterMessages(msgs) {
   return msgs.filter(msg => msg.new && msg.id != "music")
+    .map(m => m.src) // we only need this for icon/color
     .filter((msg, i, arr) => arr.findIndex(nmsg => msg.src == nmsg.src) == i);
 }
 
-WIDGETS["messages"]={area:"tl", width:0, iconwidth:24,
-draw:function(recall) {
+WIDGETS["messages"]={area:"tl", width:0, draw:function(recall) {
   // If we had a setTimeout queued from the last time we were called, remove it
   if (WIDGETS["messages"].i) {
     clearTimeout(WIDGETS["messages"].i);
@@ -19,16 +15,14 @@ draw:function(recall) {
   }
   Bangle.removeListener('touch', this.touch);
   if (!this.width) return;
-  var c = (Date.now()-this.t)/1000;
-  let settings = require('Storage').readJSON("messages.settings.json", true) || {};
-  if (settings.flash===undefined) settings.flash = true;
+    let settings = Object.assign({flash:true, maxMessages:3},require('Storage').readJSON("messages.settings.json", true) || {});
   if (recall !== true || settings.flash) {
     var msgsShown = E.clip(this.msgs.length, 0, settings.maxMessages);
     g.reset().clearRect(this.x, this.y, this.x+this.width, this.y+23);
     for(let i = 0;i < msgsShown;i++) {
       const msg = this.msgs[i];
       const colors = [g.theme.bg, g.setColor(require("messages").getMessageImageCol(msg)).getColor()];
-      if (settings.flash && (c&1)) {
+      if (settings.flash && ((Date.now()/1000)&1)) {
         if (colors[1] == g.theme.fg) {
           colors.reverse();
         } else {
@@ -36,51 +30,26 @@ draw:function(recall) {
         }
       }
       g.setColor(colors[1]).setBgColor(colors[0]);
-      g.drawImage(i == (settings.maxMessages - 1) && msgs.length > settings.maxMessages ? atob("GBgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4H4H4H4H4H4H4H4H4H4H4H4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") : require("messages").getMessageImage(msg), this.x + i * this.iconwidth, this.y - 1);
+      // draw the icon, or '...' if too many messages
+      g.drawImage(i == (settings.maxMessages - 1) && this.msgs.length > settings.maxMessages ? atob("EASBAGGG88/zz2GG") : require("messages").getMessageImage(msg),
+                  this.x + 12 + i * 24, this.y + 12, {rotate:0/*force centering*/});
     }
   }
-  if (settings.repeat===undefined) settings.repeat = 4;
-  if (c<120 && (Date.now()-this.l)>settings.repeat*1000) {
-    this.l = Date.now();
-    WIDGETS["messages"].buzz(); // buzz every 4 seconds
-  }
   WIDGETS["messages"].i=setTimeout(()=>WIDGETS["messages"].draw(true), 1000);
   if (process.env.HWVERSION>1) Bangle.on('touch', this.touch);
-},update:function(rawMsgs, quiet) {
-  const settings = require('Storage').readJSON("messages.settings.json", true) || {};
-  msgs = filterMessages(rawMsgs);
-  if (msgs.length === 0) {
-    delete WIDGETS["messages"].t;
-    delete WIDGETS["messages"].l;
-  } else {
-    WIDGETS["messages"].t=Date.now(); // first time
-    WIDGETS["messages"].l=Date.now()-10000; // last buzz
-    if (quiet) WIDGETS["messages"].t -= 500000; // if quiet, set last time in the past so there is no buzzing
-  }
-  WIDGETS["messages"].width=this.iconwidth * E.clip(msgs.length, 0, settings.maxMessages);
-  WIDGETS["messages"].msgs = msgs;
+},update:function(rawMsgs) {
+  const settings =  Object.assign({maxMessages:3},require('Storage').readJSON("messages.settings.json", true) || {});
+  this.msgs = filterMessages(rawMsgs);
+  this.width = 24 * E.clip(this.msgs.length, 0, settings.maxMessages);
   Bangle.drawWidgets();
-},buzz:function(msgSrc) { 
-  if ((require('Storage').readJSON('setting.json',1)||{}).quiet) return; // never buzz during Quiet Mode
-  var pattern;
-  if (msgSrc != undefined && msgSrc.toLowerCase() == "phone") {
-    // special vibration pattern for incoming calls
-    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrateCalls;
-  } else {
-    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate;
-  }
-  if (pattern === undefined) { pattern = ":"; } // pattern may be "", so we can't use || ":" here
-  require("buzz").pattern(pattern);
 },touch:function(b,c) {
   var w=WIDGETS["messages"];
-  if (!w||!w.width||c.x<w.x||c.x>w.x+w.width||c.y<w.y||c.y>w.y+w.iconwidth) return;
+  if (!w||!w.width||c.x<w.x||c.x>w.x+w.width||c.y<w.y||c.y>w.y+24) return;
   load("messages.app.js");
 }};
 
 /* We might have returned here if we were in the Messages app for a
-message but then the watch was never viewed. In that case we don't
-want to buzz but should still show that there are unread messages. */
+message but then the watch was never viewed. */
 if (global.MESSAGES===undefined)
-  WIDGETS["messages"].update(getMessages(), true);
-
+  WIDGETS["messages"].update(require("messages").getMessages());
 })();
diff --git a/apps/miclock/ChangeLog b/apps/miclock/ChangeLog
index e92bad2e3..d1ac3e388 100644
--- a/apps/miclock/ChangeLog
+++ b/apps/miclock/ChangeLog
@@ -2,3 +2,4 @@
 0.03: Localization
 0.04: move jshint to the top
 0.05: Use Bangle.setUI for button/launcher handling
+0.06: Tell clock widgets to hide.
diff --git a/apps/miclock/clock-mixed.js b/apps/miclock/clock-mixed.js
index b3d6bea8d..cb3235406 100644
--- a/apps/miclock/clock-mixed.js
+++ b/apps/miclock/clock-mixed.js
@@ -77,11 +77,13 @@ Bangle.on('lcdPower', function(on) {
     drawMixedClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(drawMixedClock, 5E3);
 drawMixedClock();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/miclock/metadata.json b/apps/miclock/metadata.json
index 6eece46b0..2c216dc33 100644
--- a/apps/miclock/metadata.json
+++ b/apps/miclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "miclock",
   "name": "Mixed Clock",
-  "version": "0.05",
+  "version": "0.06",
   "description": "A mix of analog and digital Clock",
   "icon": "clock-mixed.png",
   "type": "clock",
diff --git a/apps/minimal_clock/ChangeLog b/apps/minimal_clock/ChangeLog
index c72634017..54ee389e3 100644
--- a/apps/minimal_clock/ChangeLog
+++ b/apps/minimal_clock/ChangeLog
@@ -1,2 +1,3 @@
 ...
 0.03: First update with ChangeLog Added
+0.04: Tell clock widgets to hide.
diff --git a/apps/minimal_clock/app.js b/apps/minimal_clock/app.js
index d78790347..47eca3c66 100644
--- a/apps/minimal_clock/app.js
+++ b/apps/minimal_clock/app.js
@@ -3,6 +3,7 @@
 
   let outerRadius = Math.min(CenterX,CenterY) * 0.9;
 
+  Bangle.setUI('clock');
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -225,6 +226,5 @@
     }
   });
 
-  Bangle.loadWidgets();
 
-  Bangle.setUI('clock');
+  Bangle.loadWidgets();
diff --git a/apps/minimal_clock/metadata.json b/apps/minimal_clock/metadata.json
index 1702d97a9..3089780ce 100644
--- a/apps/minimal_clock/metadata.json
+++ b/apps/minimal_clock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "minimal_clock",
   "name": "Minimal Analog Clock",
   "shortName":"Minimal Clock",
-  "version":"0.03",
+  "version":"0.04",
   "description": "a minimal analog clock - just with some hands and no clock face",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
index a8b6efc81..5949a786d 100644
--- a/apps/minionclk/ChangeLog
+++ b/apps/minionclk/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Fixed rendering for Espruino v2.06
 0.04: Fixed overlapped rendering of dates
 0.05: Use Bangle.setUI for button/launcher handling
+0.06: Tell clock widgets to hide.
diff --git a/apps/minionclk/app b/apps/minionclk/app
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
index 9648e3d89..c61f8d3bf 100644
--- a/apps/minionclk/app.js
+++ b/apps/minionclk/app.js
@@ -78,8 +78,10 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 startDrawing();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+
diff --git a/apps/minionclk/metadata.json b/apps/minionclk/metadata.json
index 44fc2a82d..4df2ddc6b 100644
--- a/apps/minionclk/metadata.json
+++ b/apps/minionclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "minionclk",
   "name": "Minion clock",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Minion themed clock.",
   "icon": "minionclk.png",
   "type": "clock",
diff --git a/apps/mysticclock/ChangeLog b/apps/mysticclock/ChangeLog
index b486a29a1..cd91abe00 100644
--- a/apps/mysticclock/ChangeLog
+++ b/apps/mysticclock/ChangeLog
@@ -1,2 +1,3 @@
 1.00: First published version.
 1.01: Use Bangle.setUI for Launcher/buttons
+1.02: Tell clock widgets to hide.
diff --git a/apps/mysticclock/metadata.json b/apps/mysticclock/metadata.json
index 571a55ecd..bd2df2f8d 100644
--- a/apps/mysticclock/metadata.json
+++ b/apps/mysticclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "mysticclock",
   "name": "Mystic Clock",
-  "version": "1.01",
+  "version": "1.02",
   "description": "A retro-inspired watchface featuring time, date, and an interactive data display line.",
   "icon": "mystic-clock.png",
   "type": "clock",
diff --git a/apps/mysticclock/mystic-clock-app.js b/apps/mysticclock/mystic-clock-app.js
index 2d95633fe..d7f4ab1c3 100644
--- a/apps/mysticclock/mystic-clock-app.js
+++ b/apps/mysticclock/mystic-clock-app.js
@@ -189,6 +189,13 @@ Bangle.on('touch', (button) => {
   if (button === 3 && Bangle.isLCDOn()) Bangle.setLCDPower(false);
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn<0) prevInfo();
+  if (btn>0) nextInfo();
+  drawAll();
+});
+
 // clean app screen
 g.clear();
 Bangle.loadWidgets();
@@ -200,9 +207,3 @@ if (Bangle.isLCDOn()) {
   drawAll(); // draw immediately
 }
 
-// Show launcher when button pressed
-Bangle.setUI("clockupdown", btn=>{
-  if (btn<0) prevInfo();
-  if (btn>0) nextInfo();
-  drawAll();
-});
diff --git a/apps/ncfrun/metadata.json b/apps/ncfrun/metadata.json
deleted file mode 100644
index 831ae3d4e..000000000
--- a/apps/ncfrun/metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "ncfrun",
-  "name": "NCEU 5K Fun Run",
-  "version": "0.01",
-  "description": "Display a map of the NodeConf EU 2019 5K Fun Run route and your location on it",
-  "icon": "nceu-funrun.png",
-  "tags": "health",
-  "supports": ["BANGLEJS"],
-  "storage": [
-    {"name":"ncfrun.app.js","url":"nceu-funrun.js"},
-    {"name":"ncfrun.img","url":"nceu-funrun-icon.js","evaluate":true}
-  ]
-}
diff --git a/apps/ncfrun/nceu-funrun-icon.js b/apps/ncfrun/nceu-funrun-icon.js
deleted file mode 100644
index a13452a8b..000000000
--- a/apps/ncfrun/nceu-funrun-icon.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("mEwwgurglEC6tDmYYUgkzAANAFygXKKYIADBwgXDkg8LBwwXMoQXEH4hHNC4s0O6BfECAKhDHYKnOghCB3cga6dEnYYBaScC2cznewC6W7OQU7BYyIFAAhFBAAYwGC5RFBC5QAJlY0FSIQAMkUjGgrTJRYoXFPQIXGLg8iAAJFDDgIXGgYXJGAWweQJHOC4jtBC6cidgQXUUQQXBogACDYR3HmQXHAAYzKU4IACC48kJBwFBgg7EMZYwDJAReDoh5PC4QARJAoARJAYXTJChtDoSgNAAaeEAAU0C5wqCC4q5LOYYvWgjOEaJ4AGoZGQPY6OPFw0yF34uFRlYXCFykAoQuVeIQWUAB4A="))
diff --git a/apps/ncfrun/nceu-funrun.js b/apps/ncfrun/nceu-funrun.js
deleted file mode 100644
index 30e587188..000000000
--- a/apps/ncfrun/nceu-funrun.js
+++ /dev/null
@@ -1,140 +0,0 @@
-var coordScale = 0.6068;
-var coords = new Int32Array([-807016,6918514,-807057,6918544,-807135,6918582,-807238,6918630,-807289,6918646,-807308,6918663,-807376,6918755,-807413,6918852,-807454,6919002,-807482,6919080,-807509,6919158,-807523,6919221,-807538,6919256,-807578,6919336,-807628,6919447,-807634,6919485,-807640,6919505,-807671,6919531,-807703,6919558,-807760,6919613,-807752,6919623,-807772,6919643,-807802,6919665,-807807,6919670,-807811,6919685,-807919,6919656,-807919,6919645,-807890,6919584,-807858,6919533,-807897,6919503,-807951,6919463,-807929,6919430,-807916,6919412,-807907,6919382,-807901,6919347,-807893,6919322,-807878,6919292,-807858,6919274,-807890,6919232,-807909,6919217,-807938,6919206,-807988,6919180,-807940,6919127,-807921,6919100,-807908,6919072,-807903,6919039,-807899,6919006,-807911,6918947,-807907,6918936,-807898,6918905,-807881,6918911,-807874,6918843,-807870,6918821,-807854,6918775,-807811,6918684,-807768,6918593,-807767,6918593,-807729,6918516,-807726,6918505,-807726,6918498,-807739,6918481,-807718,6918465,-807697,6918443,-807616,6918355,-807518,6918263,-807459,6918191,-807492,6918162,-807494,6918147,-807499,6918142,-807500,6918142,-807622,6918041,-807558,6917962,-807520,6917901,-807475,6917933,-807402,6917995,-807381,6918024,-807361,6918068,-807323,6918028,-807262,6918061,-807263,6918061,-807159,6918116,-807148,6918056,-807028,6918063,-807030,6918063,-806979,6918068,-806892,6918090,-806760,6918115,-806628,6918140,-806556,6918162,-806545,6918175,-806531,6918173,-806477,6918169,-806424,6918180,-806425,6918180,-806367,6918195,-806339,6918197,-806309,6918191,-806282,6918182,-806248,6918160,-806225,6918136,-806204,6918107,-806190,6918076,-806169,6917968,-806167,6917953,-806157,6917925,-806140,6917896,-806087,6917839,-806071,6917824,-805969,6917904,-805867,6917983,-805765,6918063,-805659,6918096,-805677,6918131,-805676,6918131,-805717,6918212,-805757,6918294,-805798,6918397,-805827,6918459,-805877,6918557,-805930,6918608,-805965,6918619,-806037,6918646,-806149,6918676,-806196,6918685,-806324,6918703,-806480,6918735,-806528,6918738,-806644,6918712,-806792,6918667,-806846,6918659,-806914,6918654,-806945,6918661,-806971,6918676,-806993,6918689,-806992,6918692,-807065,6918753,-807086,6918786,-807094,6918788,-807102,6918795,-807104,6918793,-807107,6918799,-807102,6918802,-807112,6918812,-807106,6918815,-807115,6918826,-807120,6918823,-807132,6918841,-807141,6918850,-807151,6918841,-807170,6918832,-807193,6918813,-807222,6918775,-807246,6918718,-807250,6918694,-807264,6918637,-807238,6918630,-807148,6918587,-807057,6918544,-806948,6918463]);
-
-var min = {"x":-807988,"y":6917824};
-var max = {"x":-805659,"y":6919685};
-var gcoords = new Uint8Array(coords.length);
-var coordDistance = new Uint16Array(coords.length/2);
-
-var PT_DISTANCE = 30; // distance to a point before we consider it complete
-
-function toScr(p) {
-  return {
-    x : 10 + (p.x-min.x)*100/(max.x-min.x),
-    y : 230 - (p.y-min.y)*100/(max.y-min.y)
-  };
-}
-
-var last;
-var totalDistance = 0;
-for (var i=0;i<coords.length;i+=2) {
-  var c = {x:coords[i],y:coords[i+1]};
-  var s = toScr(c);
-  gcoords[i  ] = s.x;
-  gcoords[i+1] = s.y;
-  if (last) {
-    var dx = c.x-last.x;
-    var dy = c.y-last.y;
-    totalDistance += Math.sqrt(dx*dx+dy*dy)*coordScale;
-    coordDistance[i/2] = totalDistance;
-  }
-  last = c;
-}
-var fix, lastFix;
-var nextPtIdx = 0; // 2x the number of points
-var nextPt = {x:coords[nextPtIdx], y:coords[nextPtIdx+1]};
-var nextAngle = 0;
-var nextDist = 0;
-var currentDist = 0;
-
-
-
-function drawMap() {
-  g.clearRect(0,0,239,120);
-  g.setFontAlign(0,0);
-  g.setColor(1,0,0);
-  g.setFontVector(40);
-  g.drawString((currentDist===undefined)?"?":(Math.round(currentDist)+"m"), 160, 30);
-  g.setColor(1,1,1);
-  g.setFont("6x8",2);
-  g.drawString(Math.round(totalDistance)+"m", 160, 70);
-  g.drawString((nextPtIdx/2)+"/"+coordDistance.length, 50, 20);
-  if (!fix.fix) {
-    g.setColor(1,0,0);
-    g.drawString("No GPS", 50, 50);
-    g.setFont("6x8",1);
-    g.drawString(fix.satellites+" Sats", 50, 70);
-  }
-
-  if (lastFix && lastFix.fix) {
-    g.setColor(0,0,0);
-    g.drawCircle(lastFix.s.x,lastFix.s.y,10);
-  }
-  for (var i=0;i<gcoords.length;i+=2) {
-    g.setColor((i<=nextPtIdx) ? 63488 : 46486); // red/grey
-    g.fillRect(gcoords[i]-2,gcoords[i+1]-2,gcoords[i]+2,gcoords[i+1]+2);
-  }
-  g.setColor(1,0,0); // first part of path
-  g.drawPoly(new Uint8Array(gcoords.buffer, 0, nextPtIdx+2));
-  g.setColor(1,1,1); // remaining part of path
-  g.drawPoly(new Uint8Array(gcoords.buffer, nextPtIdx));
-
-  if (fix && fix.fix) {
-    g.setColor(1,0,0);
-    g.drawCircle(fix.s.x,fix.s.y,10);
-  }
-  lastFix = fix;
-}
-
-function getNextPtInfo() {
-  var dx = nextPt.x - fix.p.x;
-  var dy = nextPt.y - fix.p.y;
-  nextAngle = Math.atan2(dx,dy)*180/Math.PI;
-  nextDist = Math.sqrt(dx*dx+dy*dy)*coordScale;
-}
-
-function onGPS(f) {
-  fix = f;
-  fix.p = Bangle.project(fix);
-  fix.s = toScr(fix.p);
-  getNextPtInfo();
-  if ((nextDist < PT_DISTANCE) &&
-      (nextPtIdx < coords.length)) {
-    nextPtIdx+=2;
-    nextPt = {x:coords[nextPtIdx], y:coords[nextPtIdx+1]};
-    getNextPtInfo();
-  }
-  // work out how far we are (based on distance to next point)
-  if (!fix.fix) {
-    currentDist = undefined
-  } else if (nextPtIdx+2 < coordDistance.length) {
-    currentDist = coordDistance[1+(nextPtIdx/2)] - nextDist;
-  } else if (nextPtIdx+2 == coordDistance.length) {
-    currentDist = totalDistance - nextDist;
-  } else {
-    currentDist = totalDistance;
-  }
-
-  if (!Bangle.isLCDOn()) return;
-  drawMap();
-}
-
-function arrow(r,c) {
-  r=r*Math.PI/180;
-  var p = Math.PI*3/4;
-  g.setColor(c);
-  g.fillPoly([
-    180+40*Math.sin(r), 180-40*Math.cos(r),
-    180+20*Math.sin(r+p), 180-20*Math.cos(r+p),
-    180-10*Math.sin(r), 180+10*Math.cos(r),
-    180+20*Math.sin(r+-p), 180-20*Math.cos(r-p),
-  ]);
-}
-
-function onCompass(m) {
-  if (!Bangle.isLCDOn()) return;
-
-  arrow(oldHeading,0);
-  var heading = m.heading + nextAngle;
-  arrow(heading,0xF800);
-  oldHeading = heading;
-}
-
-
-// draw the heading
-var oldHeading = 0;
-Bangle.on('GPS', onGPS);
-Bangle.on('mag', onCompass);
-Bangle.setGPSPower(1);
-Bangle.setCompassPower(1);
-g.clear();
diff --git a/apps/ncfrun/nceu-funrun.png b/apps/ncfrun/nceu-funrun.png
deleted file mode 100644
index f98fca5a1..000000000
Binary files a/apps/ncfrun/nceu-funrun.png and /dev/null differ
diff --git a/apps/ncrclk/ChangeLog b/apps/ncrclk/ChangeLog
index 31e5d42c8..0c326161a 100644
--- a/apps/ncrclk/ChangeLog
+++ b/apps/ncrclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: A copy of the analogimgclk to work for NodeConf Remote
 0.02: Use Bangle.setUI for button/launcher handling
+0.03: Tell clock widgets to hide.
diff --git a/apps/ncrclk/app.js b/apps/ncrclk/app.js
index 16724fa5e..805ac1b95 100644
--- a/apps/ncrclk/app.js
+++ b/apps/ncrclk/app.js
@@ -120,10 +120,10 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 drawHands(true);
-
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/ncrclk/metadata.json b/apps/ncrclk/metadata.json
index b50b554e1..fdab77450 100644
--- a/apps/ncrclk/metadata.json
+++ b/apps/ncrclk/metadata.json
@@ -2,7 +2,7 @@
   "id": "ncrclk",
   "name": "NCR Clock",
   "shortName": "NCR Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "NodeConf Remote clock",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/ncstart/ChangeLog b/apps/ncstart/ChangeLog
deleted file mode 100644
index 152fdc9d1..000000000
--- a/apps/ncstart/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-0.02: Modified for use with new bootloader and firmware
-      Renamed as nodeconf-specific
-0.03: Move configuration into App/widget settings
-      Move loader into welcome.boot.js
-0.04: Run again when updated
-      Don't run again when settings app is updated (or absent)
-      Add "Run Now" option to settings
-0.05: Don't overwrite existing settings on app update
-0.06: Allow welcome to run after a fresh install
diff --git a/apps/ncstart/boot.js b/apps/ncstart/boot.js
deleted file mode 100644
index 62ac962f6..000000000
--- a/apps/ncstart/boot.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function() {
-  let s = require('Storage').readJSON('ncstart.json', 1) || {};
-  if (!s.welcomed) {
-    setTimeout(() => {
-      require('Storage').write('ncstart.json', {welcomed: true})
-      load('ncstart.app.js')
-    })
-  }
-})()
diff --git a/apps/ncstart/metadata.json b/apps/ncstart/metadata.json
deleted file mode 100644
index d2b3e2196..000000000
--- a/apps/ncstart/metadata.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "id": "ncstart",
-  "name": "NCEU Startup",
-  "version": "0.06",
-  "description": "NodeConfEU 2019 'First Start' Sequence",
-  "icon": "start.png",
-  "tags": "start,welcome",
-  "supports": ["BANGLEJS"],
-  "storage": [
-    {"name":"ncstart.app.js","url":"start.js"},
-    {"name":"ncstart.boot.js","url":"boot.js"},
-    {"name":"ncstart.settings.js","url":"settings.js"},
-    {"name":"ncstart.img","url":"start-icon.js","evaluate":true},
-    {"name":"nc-bangle.img","url":"start-bangle.js","evaluate":true},
-    {"name":"nc-nceu.img","url":"start-nceu.js","evaluate":true},
-    {"name":"nc-nfr.img","url":"start-nfr.js","evaluate":true},
-    {"name":"nc-nodew.img","url":"start-nodew.js","evaluate":true},
-    {"name":"nc-tf.img","url":"start-tf.js","evaluate":true}
-  ],
-  "data": [{"name":"ncstart.json"}]
-}
diff --git a/apps/ncstart/settings.js b/apps/ncstart/settings.js
deleted file mode 100644
index 560fad8ba..000000000
--- a/apps/ncstart/settings.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function(back) {
-  let settings = require('Storage').readJSON('ncstart.json', 1)
-    || require('Storage').readJSON('setting.json', 1) || {}
-  E.showMenu({
-    '': { 'title': 'NCEU Startup' },
-    'Run on Next Boot': {
-      value: !settings.welcomed,
-      format: v => v ? 'OK' : 'No',
-      onchange: v => require('Storage').write('ncstart.json', {welcomed: !v}),
-    },
-    'Run Now': () => load('ncstart.app.js'),
-    '< Back': back,
-  })
-})
diff --git a/apps/ncstart/start-bangle.js b/apps/ncstart/start-bangle.js
deleted file mode 100644
index 26f38ae14..000000000
--- a/apps/ncstart/start-bangle.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("s8wxH+AH4AQ/4AJJX5mmM/5m/AH5m/M34A/M35l/M35mqM/5m/AH5m/M34A/MqQKQJm5laOh7kNM35MGbiQxLM9osWIiZnGDI5m/VTBm/MsrOGM35maB4xm/MsoZFORZm/Fq5mDAAwUKBhAHBDJYLGAY4rOPShmRF44TIIoqlJCIxmKEZLMSBxY1GE5RTIJpwYSP5hmQZxodKLBKpIDBQZHMxS4MM1IKCMzKNQHJJmtFwbbUMy4AIM35mcJR5mbLCo1GZrxLOLZ6BMH5wOHMyAYRSRLOWGRY+MAxRmODCZeNMyLNMAA4TIBgpmPFA4YMHBZnPFIp/cADa0cC9Zm2J5YkKMtgsIGjZRTCYLMsFow0dDqJluGAgzhEJwxiAGpYLMn70hAA5N/M34A/M35mzJn5m/AH5nNJf5m/AH5m/M34A/M35m/MpgA="))
diff --git a/apps/ncstart/start-icon.js b/apps/ncstart/start-icon.js
deleted file mode 100644
index 0302cadbc..000000000
--- a/apps/ncstart/start-icon.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("mEwxH+AHMPADQv/F+YxZYtb1wFto7SEbwwQBIsen0/ADU+jxfOjwtbAAYwDWZVWF79WfBAvEq4vfq4vIGQgviR44AEFz4vEGRQvnGA4v/F79YX9IHEq4aKh//jwvRrBcHG4ovL/4ABB5gAFRAwvVGIQveoAAIF4oABq0/CZIACF8BiBrAvTGIoaKF5AABIpVXd44AFJBQvKh4vOGBIvVL54vdX5iPhqztLoFYFpYvSh8/FxgABFpYvQRRgveoEP/8eFqAvbACi/CeA4IDP6IvUGIYGEF+EMADwvJR4ovmdoovnFoowDF8QsIF4dZF79ZF5RpCj1AFztAjy7JAAgwdFwbAFFwwAmF/4vhGFrxLFkoAvA="))
diff --git a/apps/ncstart/start-nceu.js b/apps/ncstart/start-nceu.js
deleted file mode 100644
index 89a9850cc..000000000
--- a/apps/ncstart/start-nceu.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("o9HxH+AEOAwAkiIkIADIv5CEI/4/IJHbNLbPA4Iv1+JHREIwkmk2EJBBE2IoUnIwJHBCx5GoBA2DIgQACBw5G3aQQADwRG+wEmagQCBvxGufoQpDFxOCI4YNIDgxNeD4gDHCY+EwgMKBQIjGJDJlHA4YlKvzRHDRZHZDJQkMBZojVECb+OHJgkOZ6w6KCJAHJCgY1dK5wPDCg4GICYjDZBY9+vxGMArItLeRgWDwOEwmBJA5Ggv2GlMMwJGTwRFBI5JGfv2HlIACwRGRwBFDAAIUGIz+FIYMMI4R0CIxzSCRwhaMIBy2FAAaMBhmHI4QjIRqwUFIxxFJOgLTDlMGRqJHFwF+CpAWDIxgwJBgN+aoSMEIyAGBweDXBg6FABIWLAgOCw+GMhRGKByI9IIxYtQIywaJC5YTTIzwRGOyQqTIzLGNCTJGgXqIRTIzILIIzQvUI5a4EBgh6TDI7dKZJo7IAwQLFIzAjKIhwQGChBvMEhojLIqIjGBaZGPEbppOEerrLBYpGVEZrVOBpJjJIzCHNcpoqPI6gaUIywfSCLJGgXBYSZIzwRFCxoSGFSJGYCA4XLCRArQIywOJYxDPLFqA3OwFPp4HCy4lKHogAIM5uulukMIxGNy1MAAWW2JENFBJIMv8B0ksAAQQDIx2AptMpoCCChZGQGROYIocslsBIyGVIQNOp5HByhaMIxj9IAAWMIYUtRwiNPaIKNCpgUGIB4FNAAMXRq/+yhDBAAOUtJGlgKOCAAOvCJRGH2OVp1OypFGI0BHB0jUBzCMCIyAABtJEHI0RICIgYRMJBBGMCg4GICYgnPCBhHPBwQSIA5IUDGpxWOJBwgLfpgkOIhwVOEBj9WIipsKA4YiKgMBERojIIqphHAgYjKy+n1VpTJYjIADZlGEpOVlwABhTJKRL4oHFxIIEIgUKlula44/hShwIG1RFB02lJQJVII2zTC0iNBhVpI24vGgOmlpIBl2WagwWIJGFp1UKhRFGImI0FGouAaIoPIJGQMWJG5E7H5BE/I4pF/JA4kiA"))
diff --git a/apps/ncstart/start-nfr.js b/apps/ncstart/start-nfr.js
deleted file mode 100644
index 2a0ad70ea..000000000
--- a/apps/ncstart/start-nfr.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("5EuxH+AAkPABIQFABIaKDiIA/AH6qaVpwbbAH4A/YzysMDbYA/AH7GfVhbHgChrr0MT5FoTDobOQijH/Y/6aYcqzH/Y/5EeZDLHmFxTH/Y/4TVY84uJY/7H7TibHuC4rH5XmiHRZC7HpDAjSQF5QpJCgYGJY6Y8MFR4bJBSrITY9RNJb6LFNY5ALFP6CsVY55PQTzDH6MhrGPY7opYY7IZFAgqfRY9xzIWx7GQY6QsYFTTHQZDLHlL44ONDxIfJdKS3PA54qSCRL1MWpDIRY8yLNCg5FICB7ZMHZwrKaB4bQEpTHZH5bHgRhiZNbCTZSY5qBNHiDHZZCbHsOZjHPRSTHYOZbHyZDLH/Y8pQRY+zIYY8xPLG6bHsDJjHuUiTbQdTjHfQBjHYVaLHyUqbHoKJC2KCBgRDBA7HeThbHvZETHdVxKKPTkzISfJLHpZELHeOZLGOY9g8OY+TIgY74OJLqDHqFZIMJY/7HuFxRcPYJbHeXi7HUKAqGYCSgdRAH4A/XC7IdY/4A/Y9rIZY/4A/Y/7H/AH7H2ZDDH/AH7HvZC7H/SMrH/Io7IZDCoVIBgwNFBSA7JBRoZOJ5jboY6IOBY9oWKDpYLFApZkNH6YIHJ5BMNY97IZY6yvTTJCGRBwQRIExYVKB4zH+ZDDHpBQ7HgH5Q+QY/7IYY9KDJY6QeKY6xDOY/7H7BhRiPCRQGHA4SsRCJDH4ZDJqUfpQiIBR6UNDRISQOJ52TY9DIYNSyvSIZLfOAxoaIY/7HVZC4SQQBSJUC57HTDIw9QGZzH/Y7xmINyTHTAAwfKHyzH/OBTH3CRg1LYxAUFD5Y+QY9RXLLxQaWY6yIYY6g5SH57kHY9StRcbZPQQJivRC6AKJEBpGHBxrH/DcbHUEpQKQBojSPH5gpIXx7HjVp4caJkbjRGv4AkA=="))
diff --git a/apps/ncstart/start-nodew.js b/apps/ncstart/start-nodew.js
deleted file mode 100644
index 287d49a1b..000000000
--- a/apps/ncstart/start-nodew.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("5E1xH+AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A6hEICD4A/AH7FlY6TJ/AH7G1Y6bI/AH7FyY6rJ/AH7GyY6zI/AH7H/Y/4A/Y3DHXg5g/AH4Ak5jH/AH4A/Y9VXq5l/AH4Ag47HjZAJm/AH7GgY5S9KZBjHDZH4A/Y9S5KBxrH/AH7GkY5DGOCIrHJZA4pGBiQAPKpAQLHKQmPADRSQY6LFQCZLHPQJjIeQqwKVHTLHoEpDISY4rIGJRbH/IjBYXC67GCY5LGRY7CCaY8hEPV87Ha4zHEYyoXGY6SOKY9IQJIhRDUY+YdEY64YCAgTIBY6CDPMBxRIDpAvMIaZALV5z/NFRrHH5glGYyqOFY4LIJDJoHKaZolPMZIRMUZAyLHxotLLJzHJ4zGBY8TICY6KXJO6wdQWiJCHGRp+QJaTINYoRbQY6bICZINRY8RJQDhowPY8RMYY5YABgR9US6MHgIwGJ5QMLE44GIURY4NBSoyKIZQRObhrIMg7HkgQvIJBapSBzrBPCBhdJY5w+NeBgAFzO93rIFY8AFBxmGwydKFxSFOMJR6JFZhXLIKbHVPhbHPZALJBZA7HcAgLFBY5qFYY+KsLY/DICY4rIWC4kC/2MY6CGJOZjWPRBy8KY95MHY62ZAoLICY64/G/zGIMRxcQdB7HWBZqeQEZxcIY7e9Y4ZMHY/AwJIByrOY7JzLCJAbNY8jITCozHVURqDRDrY/MGSDHWPhTHOZAbHFZCgxHY4gxGIJbrLT6AQIDiRLQOp7ITGBbHcZB4wKY5o+IOxwWLBoQdUY54zMCJTTQBQ6GSZAjHGZCJCLY5IA/AH4AWY5L7LBpzHDNH4A/ZEDHIXQoALaZLH/AH7HsZB4WHgTHCM34A/AELHjY34A/AErHhAH4A/AEzH/AH4A/Y8xe/AH7IwCsgA/AH7IiCkYA/AH7IjCcQA/AH7JkCMAA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AHIA="))
diff --git a/apps/ncstart/start-tf.js b/apps/ncstart/start-tf.js
deleted file mode 100644
index d09185caf..000000000
--- a/apps/ncstart/start-tf.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("4M7ghC/AH4A/AEcBiMQAgY+3iIACIAQhcAgYjdTzZgfYH5giYHo5BIIQGDAQYLHgMQBoZZFYAoYENGREDGgI6BAYYMDBYrXDA4RTDAobnFLgbNEYF5LFVAIGCAghsEBQYMFYAoMEC4TAxAAg5DLoqiCZQZ2CAQa2DYAiGFA4bAvXYj6DAIZkEVYizHLYhyDNoaGCL9zAEHw5aGOIwHJYAqBFL96zCHxJsEKwcBYAx5GYA4SCFobAuMohoDAQ4UCKgYCEYBR7FYGqsDIIwLFYAzUFYAhbEL+IyGIojAFBYbAEKYZYHCgghEYGoGFWoQGFJIYHBgRZDbQpsFYGiNuIP4AedooA/L/4A5gJf/AH4A/AH4A/AH4A/AH4A/AH4A/ACsN7oAJG+oJC6AoaL5QmbG7PQTLrA/YH7A/YH7AhFgxbrYA4JQFkTArWwzAlEQhnCA4bPDBQwLDHwwJH5oGBEAydNAwQHDEgggDcaJBDEY4JDJoYSEH5A7GBAbAPHg5aHCQoiSEYpNHBIxpIBIQHGTpwzGGQJlMESZCIFowTNCQLAVSZAXFGQnNL5AiNBJAeBBIYsDNJIJHTpwyMCQhGEQQwsFYo7kGAoQJDEQQyDS5ChDCgxRJGRJ4DUIpAFYBQiFJgwUGBIr3IIAy5EaJgyNcgoTGcZZCFWwxMLboxqLYBoUJGw5GIYBaSGFoo3GLApAOYCAUJQYycLYBCSHDIoUJYBfdYDwKDEwQFCBAbAfIwwHEFA6rKTpLAPEoQCDYEBgIFgzAMHwzAOXpDAkMIxALYD4wEAozAOaA7AKMIxAJVZjAWApLAOBxasGEYYZCIAyrOYCQlBYC4jGhpHCYBBpJAYSrSTp4FELQZmFYBoRDBQjAMGwvcHQYiEdBDANHgpTFApbALaYgWERpISGHYoJFYCo8JVBKAHFg5COAoY2JBI65IYBofHOYZmIYBxgGNIr4KSxJJHYCQfGCQhmIYBwjFPZDVKQg53IYCI8IBIgFIERgjEPZLVJEhHcAwUMYCo8IYBIfGAH4A/AHw"))
diff --git a/apps/ncstart/start.js b/apps/ncstart/start.js
deleted file mode 100644
index d2d713cb2..000000000
--- a/apps/ncstart/start.js
+++ /dev/null
@@ -1,120 +0,0 @@
-g.setFontAlign(1, 1, 0);
-const d = g.getWidth() - 18;
-function c(a) {
-  return {
-    width: 8,
-    height: a.length,
-    bpp: 1,
-    buffer: (new Uint8Array(a)).buffer
-  };
-}
-
-function welcome() {
-  var welcomes = [
-    'Welcome',
-    'Failte',
-    'Bienvenue',
-    'Willkommen',
-    'Bienvenido'
-  ];
-  function next() {
-    var n = welcomes.shift();
-    E.showMessage(n);
-    g.drawImage(c([0,8,12,14,255,14,12,8]),d,116);
-    welcomes.push(n);
-  }
-  return new Promise((res) => {
-    next();
-    var i = setInterval(next, 2000);
-    setWatch(() => {
-      clearInterval(i);
-      clearWatch();
-      E.showMessage('Loading...');
-      res();
-    }, BTN2, {repeat:false});
-  });
-}
-
-function logos() {
-  var logos = [
-    ['nfr', 20, 90, ()=>{}],
-    ['nceu', 20, 90, ()=>{
-      g.setFont("6x8", 2);
-      g.setColor(0,0,1);
-      g.drawString('Welcome To', 160, 110);
-      g.drawString('NodeConfEU', 160, 130);
-      g.drawString('2019', 200, 150);
-    }],
-    ['bangle', 70, 90, ()=>{}],
-    ['nodew', 20, 90, ()=>{}],
-    ['tf', 24, 90, ()=>{}],
-  ];
-  function next() {
-    var n = logos.shift();
-    var img = require("Storage").read("nc-"+n[0]+".img");
-    g.clear();
-    g.drawImage(img, n[1], n[2]);
-    n[3]();
-    g.drawImage(c([0,8,12,14,255,14,12,8]),d,116);
-    logos.push(n);
-  }
-  return new Promise((res) => {
-    next();
-    var i = setInterval(next, 2000);
-    setWatch(() => {
-      clearInterval(i);
-      clearWatch();
-      res();
-    }, BTN2, {repeat:false});
-  });
-}
-
-function info() {
-  var slides = [
-    () => E.showMessage('Visit\nnodewatch.dev\nfor info'),
-    () => E.showMessage('Visit\nbanglejs.com/apps\nfor apps'),
-    () => E.showMessage('Remember\nto charge\nyour watch!'),
-    () => {
-      g.clear();
-      g.setFont('6x8',2);
-      g.setColor(1,1,1);
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,40);
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,194);
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,116);
-      g.drawString('Menu Up', d - 50, 42);
-      g.drawString('Select', d - 40, 118);
-      g.drawString('Menu Down', d - 60, 196);
-    },
-    () => {
-      g.clear();
-      E.showMessage('Hold\nto return\nto clock');
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,194);
-    },
-    () => {
-      g.clear();
-      E.showMessage('Hold both\nto reboot');
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,40);
-      g.drawImage(c([0,8,12,14,255,14,12,8]),d,116);
-    },
-    () => E.showMessage('Open Settings\nto enable\nBluetooth')
-  ];
-  function next() {
-    var n = slides.shift();
-    n();
-    slides.push(n);
-  }
-  return new Promise((res) => {
-    next();
-    var i = setInterval(next, 2000);
-    setWatch(()=>{
-      clearInterval(i);
-      clearWatch();
-      res();
-    }, BTN2, {repeat:false});
-  });
-}
-
-welcome()
-  .then(logos)
-  .then(info)
-  .then(load);
diff --git a/apps/ncstart/start.png b/apps/ncstart/start.png
deleted file mode 100644
index 9df0974c8..000000000
Binary files a/apps/ncstart/start.png and /dev/null differ
diff --git a/apps/noteify/README.md b/apps/noteify/README.md
index c846709de..dbdceb399 100644
--- a/apps/noteify/README.md
+++ b/apps/noteify/README.md
@@ -1,6 +1,6 @@
 # WARNING
 
-This app uses the [Scheduler library](https://banglejs.com/apps/?id=sched) and requires a keyboard such as [Swipe keyboard](https://banglejs.com/apps/?id=kbswipe).
+This app uses the [Scheduler library](https://banglejs.com/apps/?id=sched) and requires a [keyboard library](https://banglejs.com/apps/?c=textinput#).
 
 ## Usage
 
diff --git a/apps/noteify/metadata.json b/apps/noteify/metadata.json
index eb6dc695a..fbd5a88f1 100644
--- a/apps/noteify/metadata.json
+++ b/apps/noteify/metadata.json
@@ -5,7 +5,7 @@
   "description": "Write notes using an onscreen keyboard and use them as custom messages for alarms or timers.",
   "icon": "app.png",
   "tags": "tool,alarm",
-  "supports": ["BANGLEJS2"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"noteify.app.js","url":"app.js"},
diff --git a/apps/novaclock/ChangeLog b/apps/novaclock/ChangeLog
index b9a5425d1..8b05ff9ec 100644
--- a/apps/novaclock/ChangeLog
+++ b/apps/novaclock/ChangeLog
@@ -1,2 +1,3 @@
 ...
 0.10: First update with ChangeLog Added
+0.11: Tell clock widgets to hide.
diff --git a/apps/novaclock/app.js b/apps/novaclock/app.js
index e5bd37b06..52bee0dbd 100644
--- a/apps/novaclock/app.js
+++ b/apps/novaclock/app.js
@@ -249,13 +249,13 @@ var open = false;
 var timemode = true;
 var clockmode;
 var novaYPos = -7;
+Bangle.setUI("clock");
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 g.drawImage(nova(), -10, -10, {
   scale: 2.2
 });
-Bangle.setUI("clock");
 
 g.drawImage(star(), 5, -5, {scale:0.8});
 g.drawImage(star(), -10, 120, {scale:0.8});
diff --git a/apps/novaclock/metadata.json b/apps/novaclock/metadata.json
index a8a2c0af1..69b7627f8 100644
--- a/apps/novaclock/metadata.json
+++ b/apps/novaclock/metadata.json
@@ -3,7 +3,7 @@
   "shortName":"Nova Clock",
   "icon": "app.png",
   "type": "clock",
-  "version":"0.10",
+  "version":"0.11",
   "description": "A clock inspired by the Kirby series",
   "tags": "clock",
   "supports": ["BANGLEJS2"],
diff --git a/apps/numberchaser/app-icon.js b/apps/numberchaser/app-icon.js
new file mode 100644
index 000000000..a4bb5054d
--- /dev/null
+++ b/apps/numberchaser/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkA/4AC+c/AoYAR+QTTj4DBkYXS+YUB+cSl4YS+P/mUiL4RLQ+chiUziPyAAIXPmJEC+Ui+UhO6QABj8iVKocEACUTC60j+YXWPoZHTkcyC6sibYaPpC63ziXzkYXUkXyO6nykMykIXUl8xmcykQ2BSZ4XBkTXB+LdBMgPyDRnzj8vmf/AIMyDgMjAoIALiQSCVYI0CD4QAL+MTIILFCI4TJOmMRkUzn40CGQRLBMRipBiIABkR2DTAIAQmURF4KcBZScxn5qBACgWWbwUhMCT7CmU/WQQAR+awBF6jdBVggXSPCwXXVAPyJCkimUieKinBI6sxAQIvUeAMyMQIXT+MjI6iNC+RIT+bAB+cSYiZdBMQMzSCkf+ZIUGAMiYKsjkTbVkMSl4A=="))
diff --git a/apps/numberchaser/app.js b/apps/numberchaser/app.js
new file mode 100644
index 000000000..f68119fb2
--- /dev/null
+++ b/apps/numberchaser/app.js
@@ -0,0 +1,104 @@
+var randomNumber;
+var guessNumber = 1;
+
+function mathRandomInt(a, b) {
+  if (a > b) {
+    // Swap a and b to ensure a is smaller.
+    var c = a;
+    a = b;
+    b = c;
+  }
+  return Math.floor(Math.random() * (b - a + 1) + a);
+}
+
+/**
+ * Describe this function...
+ */
+function game() {
+
+  g.drawString('',0,20,true);
+  E.showMenu(numMenu);
+  console.log(randomNumber);
+}
+
+var numMenu = {
+   "" : {
+    "title" : "Number Chaser",
+  },
+  "Guess Number" : {
+    value : guessNumber,
+    min:1,max:100,step:1,
+    onchange : v => { guessNumber=v; }
+  },
+  "OK" : function () {
+    g.clear();
+    if (guessNumber == randomNumber) {
+      //if guess is correct
+      g.setFont("Vector",13);g.setFontAlign(-1,-1);
+      status = "You won! ";
+      gameOver();
+    } else {
+      //if guess is incorrect
+      g.setFont("Vector",13);g.setFontAlign(-1,-1);
+      if (guessNumber > randomNumber) {
+        //Decreases number if guess is greater
+        randomNumber = randomNumber - 1;
+        status = "Too high!";
+      } else if (guessNumber < randomNumber) {
+        //Increases number if guess is lower
+        status = "Too low!";
+        randomNumber = randomNumber + 1;
+      }
+      if (randomNumber < 0 || randomNumber > 100) {
+        //You lose when the number is out of the 1 to 100 range
+        g.setFont("Vector",13);g.setFontAlign(-1,-1);
+        g.drawString('You have lost\nNumber is out\nof range.',10,10,true);
+        status = "You lost!";
+      } else {
+        g.drawString(status+"\nTry again!",10,10);
+        Bangle.on('tap', function() {
+          delay(3000).then(() => game());
+        }
+       );
+      }
+    }
+  }   
+};
+
+function gameOver() 
+{
+  E.showPrompt(status+'Play again?',{title:""+'Number Chaser'}).then(function(a)   {
+      if (a) { 
+        randomNumber = mathRandomInt(1, 100);
+        game();
+      } else {
+        load(); 
+      }
+    }
+  );
+}
+
+function delay(time) {
+  return new Promise(resolve => setTimeout(resolve, time));
+}
+
+function instructions()
+{
+  g.setFont("Vector",13);g.setFontAlign(-1,-1);
+  g.drawString('Guess the number\nbetween 1 and 100.\nGuess too high, it\ndecreases by 1.\nToo low, it increases\nby 1.\nIf the number\ngoes below 0 or\nabove 100, it\nis out of range\nand you have\nlost.',10,10,true);
+  randomNumber = mathRandomInt(1, 100); 
+  delay(10000).then(() => game());
+}
+
+
+g.clear();
+E.showPrompt('Do you need instructions?',{title:""+'Number Chaser'}).then(function(a) 
+  { if (a) {
+    instructions(); 
+  } else 
+  {   
+     randomNumber = mathRandomInt(1, 100);
+     game(); 
+   }
+  }
+);
diff --git a/apps/numberchaser/metadata.json b/apps/numberchaser/metadata.json
new file mode 100644
index 000000000..f9b6ff4b2
--- /dev/null
+++ b/apps/numberchaser/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "numberchaser",
+  "name": "Number Chaser",
+  "shortName":"Number Chaser",
+  "version":"0.01",
+  "description": "A number guessing game, but the number goes up or down based on if you're guessing too high or too low.",
+  "icon": "numberchaser.png",
+  "tags": "game,fun",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"numberchaser.app.js","url":"app.js"},
+    {"name":"numberchaser.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/numberchaser/numberchaser.png b/apps/numberchaser/numberchaser.png
new file mode 100644
index 000000000..2042cc22b
Binary files /dev/null and b/apps/numberchaser/numberchaser.png differ
diff --git a/apps/openstmap/ChangeLog b/apps/openstmap/ChangeLog
index 6cb9d061e..2a6c15a09 100644
--- a/apps/openstmap/ChangeLog
+++ b/apps/openstmap/ChangeLog
@@ -10,3 +10,5 @@
 0.10: Improve scale factor calculation to fix scaling issues (#984)
 0.11: Add slight offset to OSM data to align it properly (fix #984)
       Fix alignment of satellite info text
+0.12: switch to using normal OpenStreetMap tiles (opentopomap was too slow)
+0.13: Use a single image file with 'frames' of data (drastically reduces file count, possibility of >1 map on device)
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 6e79a6e9a..3bba997e7 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -64,21 +64,22 @@ TODO:
       var OSMTILECOUNT = 3; // how many tiles do we download in each direction (Math.floor(MAPSIZE / OSMTILESIZE)+1)
       /* Can see possible tiles on http://leaflet-extras.github.io/leaflet-providers/preview/
       However some don't allow cross-origin use */
-      var TILELAYER = 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; // simple, high contrast
-      var PREVIEWTILELAYER = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+      //var TILELAYER = 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; // simple, high contrast, TOO SLOW
       //var TILELAYER = 'http://a.tile.stamen.com/toner/{z}/{x}/{y}.png'; // black and white
+      var TILELAYER = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+      var PREVIEWTILELAYER = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
 
       // Create map and try and set the location to where the browser thinks we are
       var map = L.map('map').locate({setView: true, maxZoom: 16, enableHighAccuracy:true});
       // Tiles used for Bangle.js itself
       var bangleTileLayer = L.tileLayer(TILELAYER, {
         maxZoom: 18,
-        attribution: 'Map data &copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors</a>'
+        attribution: 'Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors</a>'
       });
       // Tiles used for the may the user sees (faster)
       var previewTileLayer = L.tileLayer(PREVIEWTILELAYER, {
         maxZoom: 18,
-        attribution: 'Map data &copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors</a>'
+        attribution: 'Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors</a>'
       });
       // Could optionally overlay trails: https://wiki.openstreetmap.org/wiki/Tiles
 
@@ -128,7 +129,7 @@ TODO:
              var min = Math.min(rgba[i+0],rgba[i+1],rgba[i+2]);
              var max = Math.max(rgba[i+0],rgba[i+1],rgba[i+2]);
              var d = max-min;
-             if (max<120) { // black
+             if (max<120 || (d<8 && max<215)) { // black, or a darker grey
                rgba[i+0]=0;
                rgba[i+1]=0;
                rgba[i+2]=0;
@@ -147,7 +148,7 @@ TODO:
         console.log("Compression options", options);
         var w = Math.round(width / TILESIZE);
         var h = Math.round(height / TILESIZE);
-        var tiles = [];
+        var tiledImage;
         for (var y=0;y<h;y++) {
           for (var x=0;x<w;x++) {
             var imageData = ctx.getImageData(x*TILESIZE, y*TILESIZE, TILESIZE, TILESIZE);
@@ -160,13 +161,14 @@ TODO:
             /*var compress = 'require("heatshrink").decompress('
             if (!imgstr.startsWith(compress)) throw "Data in wrong format";
             imgstr = imgstr.slice(compress.length,-1);*/
-            tiles.push({
-              name:"openstmap-"+x+"-"+y+".img",
-              content:imgstr
-            });
+            if (tiledImage) tiledImage += imgstr.substr(3); // skip header
+            else tiledImage = imgstr; // for first image, keep the header
           }
         }
-        return tiles;
+        return [{
+          name:"openstmap.0.img",
+          content:tiledImage
+        }];
       }
 
       document.getElementById("getmap").addEventListener("click", function() {
@@ -241,13 +243,16 @@ TODO:
         Promise.all(tileGetters).then(() => {
           document.getElementById("uploadbuttons").style.display="";
           mapFiles = tilesLoaded(ctx, canvas.width, canvas.height);
-          mapFiles.unshift({name:"openstmap.json",content:JSON.stringify({
+          mapFiles.unshift({name:"openstmap.0.json",content:JSON.stringify({
             imgx : canvas.width,
             imgy : canvas.height,
             tilesize : TILESIZE,
             scale : scale, // how much of Bangle.project(latlon) does one pixel equate to?
             lat : centerlatlon.lat,
-            lon : centerlatlon.lng
+            lon : centerlatlon.lng,
+            w : Math.round(canvas.width / TILESIZE), // width in tiles
+            h : Math.round(canvas.height / TILESIZE), // height in tiles
+            fn : "openstmap.0.img"
           })});
           console.log(mapFiles);
         });
diff --git a/apps/openstmap/metadata.json b/apps/openstmap/metadata.json
index 2dc9bd427..32093f70e 100644
--- a/apps/openstmap/metadata.json
+++ b/apps/openstmap/metadata.json
@@ -2,7 +2,7 @@
   "id": "openstmap",
   "name": "OpenStreetMap",
   "shortName": "OpenStMap",
-  "version": "0.11",
+  "version": "0.13",
   "description": "Loads map tiles from OpenStreetMap onto your Bangle.js and displays a map of where you are. Once installed this also adds map functionality to `GPS Recorder` and `Recorder` apps",
   "icon": "app.png",
   "tags": "outdoors,gps,osm",
diff --git a/apps/openstmap/openstmap.js b/apps/openstmap/openstmap.js
index d995aca25..2bd7d2e2e 100644
--- a/apps/openstmap/openstmap.js
+++ b/apps/openstmap/openstmap.js
@@ -22,7 +22,7 @@ function center() {
 
 */
 
-var map = require("Storage").readJSON("openstmap.json");
+var map = require("Storage").readJSON("openstmap.0.json");
 map.center = Bangle.project({lat:map.lat,lon:map.lon});
 exports.map = map;
 exports.lat = map.lat; // actual position of middle of screen
@@ -30,7 +30,7 @@ exports.lon = map.lon;  // actual position of middle of screen
 var m = exports;
 
 exports.draw = function() {
-  var s = require("Storage");
+  var img = require("Storage").read(map.fn);
   var cx = g.getWidth()/2;
   var cy = g.getHeight()/2;
   var p = Bangle.project({lat:m.lat,lon:m.lon});
@@ -41,13 +41,11 @@ exports.draw = function() {
   var ty = 0|(iy/map.tilesize);
   var ox = (tx*map.tilesize)-ix;
   var oy = (ty*map.tilesize)-iy;
-  for (var x=ox,ttx=tx;x<g.getWidth();x+=map.tilesize,ttx++) {
+  for (var x=ox,ttx=tx;x<g.getWidth();x+=map.tilesize,ttx++)
     for (var y=oy,tty=ty;y<g.getHeight();y+=map.tilesize,tty++) {
-      var img = s.read("openstmap-"+ttx+"-"+tty+".img");
-      if (img) g.drawImage(img,x,y);
+      if (ttx>=0 && ttx<map.w && tty>=0 && tty<map.h) g.drawImage(img,x,y,{frame:ttx+(tty*map.w)});
       else g.clearRect(x,y,x+map.tilesize-1,y+map.tilesize-1).drawLine(x,y,x+map.tilesize-1,y+map.tilesize-1).drawLine(x,y+map.tilesize-1,x+map.tilesize-1,y);
     }
-  }
 };
 
 /// Convert lat/lon to pixels on the screen
diff --git a/apps/osmpoi/ChangeLog b/apps/osmpoi/ChangeLog
index 1c066f451..4e66dd684 100644
--- a/apps/osmpoi/ChangeLog
+++ b/apps/osmpoi/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Change img when no fix
 0.03: Add HTML class for Spectre.CSS
+0.04: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/osmpoi/custom.html b/apps/osmpoi/custom.html
index 6e61b68ee..1625acabe 100644
--- a/apps/osmpoi/custom.html
+++ b/apps/osmpoi/custom.html
@@ -187,7 +187,7 @@ Bangle.on('GPS', function(f) {
 
 Bangle.on('mag', function(m) {
   if (!Bangle.isLCDOn()) return;
-  var headingrad = m.heading*Math.PI/180; // in radians
+  var headingrad = (360-m.heading)*Math.PI/180; // in radians
   if (!isFinite(headingrad)) headingrad=0;
   if (nearest)
     g.drawImage(img_fix,120,120,{
diff --git a/apps/osmpoi/metadata.json b/apps/osmpoi/metadata.json
index 4abb07548..ad576e839 100644
--- a/apps/osmpoi/metadata.json
+++ b/apps/osmpoi/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "osmpoi",
   "name": "POI Compass",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Uploads all the points of interest in an area onto your watch, same as Beer Compass with more p.o.i.",
   "icon": "app.png",
   "tags": "tool,outdoors,gps",
diff --git a/apps/owmweather/ChangeLog b/apps/owmweather/ChangeLog
index 5560f00bc..dba6a755a 100644
--- a/apps/owmweather/ChangeLog
+++ b/apps/owmweather/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Do first update request 5s after boot to boot up faster
diff --git a/apps/owmweather/boot.js b/apps/owmweather/boot.js
index 64d2df3e9..737413940 100644
--- a/apps/owmweather/boot.js
+++ b/apps/owmweather/boot.js
@@ -1,22 +1,25 @@
-(function() {
+{
   let waiting = false;
   let settings = require("Storage").readJSON("owmweather.json", 1) || {
     enabled: false
   };
   
-  function completion(){
+  let completion = function(){
     waiting = false;
   }
-  
+
   if (settings.enabled) {    
     let weather = require("Storage").readJSON('weather.json') || {};
     let lastUpdate;
     if (weather && weather.weather && weather.weather.time) lastUpdate = weather.weather.time;
+
     if (!lastUpdate || lastUpdate + settings.refresh * 1000 * 60 < Date.now()){
-      if (!waiting){
-        waiting = true;
-        require("owmweather").pull(completion);
-      }
+      setTimeout(() => {
+        if (!waiting){
+          waiting = true;
+          require("owmweather").pull(completion);
+        }
+      }, 5000);
     }
     setInterval(() => {
       if (!waiting && NRF.getSecurityStatus().connected){
@@ -25,4 +28,4 @@
       }
     }, settings.refresh * 1000 * 60);
   }
-})();
+}
diff --git a/apps/owmweather/metadata.json b/apps/owmweather/metadata.json
index 013d345a5..56f9afca7 100644
--- a/apps/owmweather/metadata.json
+++ b/apps/owmweather/metadata.json
@@ -1,7 +1,7 @@
 { "id": "owmweather",
   "name": "OpenWeatherMap weather provider",
   "shortName":"OWM Weather",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/palikkainen/ChangeLog b/apps/palikkainen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/palikkainen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/palikkainen/README.md b/apps/palikkainen/README.md
new file mode 100644
index 000000000..81d857209
--- /dev/null
+++ b/apps/palikkainen/README.md
@@ -0,0 +1,7 @@
+# Palikkainen
+
+By Jukio Kallio
+
+A minimal watch face consisting of blocks. Minutes fills the blocks, and after 12 hours it starts to empty them.
+
+![](screenshot1.png) 
diff --git a/apps/palikkainen/app-icon.js b/apps/palikkainen/app-icon.js
new file mode 100644
index 000000000..a99602121
--- /dev/null
+++ b/apps/palikkainen/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkBiIA0/4AKCpMfCxYAB+ItTGJQuOGBAWPGAwuQGAwXvCyJgFC+PwgAAEh4X/C/6//A4gX/C/6//A4QX/C/6/vC6sfCyPxC+ZgSCwgwRFwowRCwwwPFw4xOCpIArA"))
diff --git a/apps/palikkainen/app.js b/apps/palikkainen/app.js
new file mode 100644
index 000000000..42013af69
--- /dev/null
+++ b/apps/palikkainen/app.js
@@ -0,0 +1,184 @@
+// Palikkainen
+//
+// Bangle.js 2 watch face
+// by Jukio Kallio
+// www.jukiokallio.com
+
+require("Font6x8").add(Graphics);
+
+// settings
+const watch = {  
+  x:0, y:0, w:0, h:0, 
+  bgcolor:g.theme.bg, 
+  fgcolor:g.theme.fg, 
+  font: "6x8", fontsize: 1,
+  finland:true, // change if you want Finnish style date, or US style
+};
+
+// set some additional settings
+watch.w = g.getWidth(); // size of the background
+watch.h = g.getHeight();
+watch.x = watch.w * 0.5; // position of the circles
+watch.y = watch.h * 0.45;
+
+const dateWeekday = { 0: "SUN", 1: "MON", 2: "TUE", 3: "WED", 4:"THU", 5:"FRI", 6:"SAT" }; // weekdays
+
+var wait = 60000; // wait time, normally a minute
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+
+// main function
+function draw() {
+  // make date object
+  var date = new Date();
+  
+  // work out the date string
+  var dateDay = date.getDate();
+  var dateMonth = date.getMonth() + 1;
+  var dateYear = date.getFullYear();
+  var dateStr = dateWeekday[date.getDay()] + " " + dateMonth + "." + dateDay + "." + dateYear;
+  if (watch.finland) dateStr = dateWeekday[date.getDay()] + " " + dateDay + "." + dateMonth + "." + dateYear; // the true way of showing date
+
+  // Reset the state of the graphics library
+  g.reset();
+  
+  // Clear the area where we want to draw the time
+  g.setColor(watch.bgcolor);
+  g.fillRect(0, 0, watch.w, watch.h);
+  
+  // setup watch face
+  const block = {
+    w: watch.w / 2 - 6,
+    h: 18,
+    pad: 4,
+  };
+  
+  // get hours and minutes
+  var hour = date.getHours();
+  var minute = date.getMinutes();
+  
+  // calculate size of the block face
+  var facew = block.w * 2 + block.pad;
+  var faceh = (block.h + block.pad) * 6;
+  
+  
+  // loop through first 12 hours and draw blocks accordingly
+  g.setColor(watch.fgcolor); // set foreground color
+  
+  for (var i = 0; i < 12; i++) {
+    // where to draw
+    var x = watch.x - facew / 2; // starting position
+    var y = watch.y + faceh / 2 - block.h - block.pad / 2; // draw blocks from bottom up
+    if (i > 5) { 
+      // second column
+      x += block.w + block.pad;
+      y -= (block.h + block.pad) * (i - 6);
+    } else { 
+      // first column
+      x += 0;
+      y -= (block.h + block.pad) * i;
+    }
+    
+    if (i < hour) {
+      // draw full hour block
+      g.fillRect(x, y, x + block.w, y + block.h);
+    } else if (i == hour) {
+      // draw minutes
+      g.fillRect(x, y, x + block.w * (minute / 60), y + block.h);
+      
+      // minute reading help
+      for (var m = 1; m < 12; m++) {
+        // set color
+        if (m * 5 < minute) g.setColor(watch.bgcolor); else g.setColor(watch.fgcolor);
+
+        var mlineh = 1; // minute line height
+        if (m == 3 || m == 6 || m == 9) mlineh = 3; // minute line height at 15, 30 and 45 minutes
+
+        g.drawLine(x + (block.w / 12 * m), y + block.h / 2 - mlineh, x + (block.w / 12 * m), y + block.h / 2 + mlineh);
+      }
+    }
+  }
+  
+  
+  // loop through second 12 hours and draw blocks accordingly
+  if (hour >= 12) {
+    g.setColor(watch.bgcolor); // set foreground color
+    
+    for (var i2 = 0; i2 < 12; i2++) {
+      // where to draw
+      var x2 = watch.x - facew / 2; // starting position
+      var y2 = watch.y + faceh / 2 - block.h - block.pad / 2; // draw blocks from bottom up
+      if (i2 > 5) { 
+        // second column
+        x2 += block.w + block.pad;
+        y2 -= (block.h + block.pad) * (i2 - 6);
+      } else { 
+        // first column
+        x2 += 0;
+        y2 -= (block.h + block.pad) * i2;
+      }
+
+      if (i2 < hour % 12) {
+        // draw full hour block
+        g.fillRect(x2, y2, x2 + block.w, y2 + block.h);
+      } else if (i2 == hour % 12) {
+        // draw minutes
+        g.fillRect(x2, y2, x2 + block.w * (minute / 60), y2 + block.h);
+        
+        // minute reading help
+        for (var m2 = 1; m2 < 12; m2++) {
+          // set color
+          if (m2 * 5 < minute) g.setColor(watch.fgcolor); else g.setColor(watch.bgcolor);
+          
+          var mlineh2 = 1; // minute line height
+          if (m2 == 3 || m2 == 6 || m2 == 9) mlineh2 = 3; // minute line height at 15, 30 and 45 minutes
+          
+          g.drawLine(x2 + (block.w / 12 * m2), y2 + block.h / 2 - mlineh2, x2 + (block.w / 12 * m2), y2 + block.h / 2 + mlineh2);
+        }
+      }
+    }
+  }
+  
+  
+  // draw date
+  var datey = 11;
+  g.setFontAlign(0,-1).setFont(watch.font, watch.fontsize).setColor(watch.fgcolor);
+  g.drawString(dateStr, watch.x, watch.y + faceh / 2 + datey);
+  
+  
+  // queue draw
+  queueDraw();
+}
+
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
diff --git a/apps/palikkainen/app.png b/apps/palikkainen/app.png
new file mode 100644
index 000000000..142d429e9
Binary files /dev/null and b/apps/palikkainen/app.png differ
diff --git a/apps/palikkainen/metadata.json b/apps/palikkainen/metadata.json
new file mode 100644
index 000000000..4ed8be817
--- /dev/null
+++ b/apps/palikkainen/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "palikkainen",
+  "name": "Palikkainen - A blocky watch face",
+  "shortName":"Palikkainen",
+  "version":"0.01",
+  "description": "A minimal watch face consisting of blocks.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot1.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS","BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"palikkainen.app.js","url":"app.js"},
+    {"name":"palikkainen.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/palikkainen/screenshot1.png b/apps/palikkainen/screenshot1.png
new file mode 100644
index 000000000..43a630d59
Binary files /dev/null and b/apps/palikkainen/screenshot1.png differ
diff --git a/apps/pastel/ChangeLog b/apps/pastel/ChangeLog
index f4640426b..28dcc0c28 100644
--- a/apps/pastel/ChangeLog
+++ b/apps/pastel/ChangeLog
@@ -18,3 +18,4 @@
       added setting to enable/disable idle timer warning
 0.16: make check_idle boolean setting work properly with new B2 menu
 0.17: Use default Bangle formatter for booleans
+0.18: fix idle option always getting defaulted to true
diff --git a/apps/pastel/metadata.json b/apps/pastel/metadata.json
index 1fe176d5f..860ed833b 100644
--- a/apps/pastel/metadata.json
+++ b/apps/pastel/metadata.json
@@ -2,7 +2,7 @@
   "id": "pastel",
   "name": "Pastel Clock",
   "shortName": "Pastel",
-  "version": "0.17",
+  "version": "0.18",
   "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"},
diff --git a/apps/pastel/pastel.app.js b/apps/pastel/pastel.app.js
index 605b78ad0..05c0e2367 100644
--- a/apps/pastel/pastel.app.js
+++ b/apps/pastel/pastel.app.js
@@ -34,7 +34,7 @@ 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;
+  settings.idle_check = (settings.idle_check === undefined ? true : settings.idle_check);
 }
 
 // requires the myLocation app
diff --git a/apps/pebble/ChangeLog b/apps/pebble/ChangeLog
index 274c34a34..ac894fc00 100644
--- a/apps/pebble/ChangeLog
+++ b/apps/pebble/ChangeLog
@@ -8,3 +8,4 @@
 0.08: Add theme options and optional lock symbol
 0.09: Add support for internationalization (LANG placeholders + "locale" module)
       Get steps from built-in step counter (widpedom no more needed, fix #1697)
+0.10: Tell clock widgets to hide.
diff --git a/apps/pebble/metadata.json b/apps/pebble/metadata.json
index f3c1fcc12..c5faa8857 100644
--- a/apps/pebble/metadata.json
+++ b/apps/pebble/metadata.json
@@ -2,7 +2,7 @@
   "id": "pebble",
   "name": "Pebble Clock",
   "shortName": "Pebble",
-  "version": "0.09",
+  "version": "0.10",
   "description": "A pebble style clock to keep the rebellion going",
   "readme": "README.md",
   "icon": "pebble.png",
diff --git a/apps/pebble/pebble.app.js b/apps/pebble/pebble.app.js
index 774b24c3f..729d0a896 100644
--- a/apps/pebble/pebble.app.js
+++ b/apps/pebble/pebble.app.js
@@ -133,6 +133,8 @@ Bangle.on('lock', function(on) {
   drawLock();
 });
 
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 
@@ -149,4 +151,3 @@ loadThemeColors();
 setInterval(draw, 15000); // refresh every 15s
 draw();
 
-Bangle.setUI("clock");
diff --git a/apps/pebbled/ChangeLog b/apps/pebbled/ChangeLog
index 9db0e26c5..8fe3a0b2c 100644
--- a/apps/pebbled/ChangeLog
+++ b/apps/pebbled/ChangeLog
@@ -1 +1,2 @@
 0.01: first release
+0.02: Tell clock widgets to hide.
diff --git a/apps/pebbled/metadata.json b/apps/pebbled/metadata.json
index c16025f6f..70820f2c8 100644
--- a/apps/pebbled/metadata.json
+++ b/apps/pebbled/metadata.json
@@ -2,7 +2,7 @@
   "id": "pebbled",
   "name": "Pebble Clock with distance",
   "shortName": "Pebble + distance",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Fork of Pebble Clock with distance in KM. Both step count and the distance are on the main screen. Default step length = 0.75m (can be changed in settings).",
   "readme": "README.md",
   "icon": "pebbled.png",
diff --git a/apps/pebbled/pebbled.app.js b/apps/pebbled/pebbled.app.js
index bbe98823f..472ac8fff 100644
--- a/apps/pebbled/pebbled.app.js
+++ b/apps/pebbled/pebbled.app.js
@@ -115,6 +115,7 @@ function getSteps() {
   return '0';
 }
 
+Bangle.setUI("clock");
 g.clear();
 Bangle.loadWidgets();
 /*
@@ -126,4 +127,3 @@ for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
 loadSettings();
 setInterval(draw, 15000); // refresh every 15s
 draw();
-Bangle.setUI("clock");
diff --git a/apps/pisteinen/ChangeLog b/apps/pisteinen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/pisteinen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/pisteinen/README.md b/apps/pisteinen/README.md
new file mode 100644
index 000000000..20e8bf9a1
--- /dev/null
+++ b/apps/pisteinen/README.md
@@ -0,0 +1,7 @@
+# Pisteinen
+
+By Jukio Kallio
+
+A Minimal digital watch face consisting of dots. Big dots for hours, small dots for minutes.
+
+![](screenshot1.png) 
diff --git a/apps/pisteinen/app-icon.js b/apps/pisteinen/app-icon.js
new file mode 100644
index 000000000..d8ad05c50
--- /dev/null
+++ b/apps/pisteinen/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkDmYA0/4AKCpM/CxYAB+YtTGJQuOGBAWPGAwuQGAwXvCyJgFC+UhiQDNC43ygEAl4DLC4/xBYMfAZYXfI653XX/6//X/6//O5gBKU5gGBAZAXfI66//C7s/CyPzC+ZgSCwgwRFwowRCwwwPFw4xOCpIArA=="))
diff --git a/apps/pisteinen/app.js b/apps/pisteinen/app.js
new file mode 100644
index 000000000..a455875ec
--- /dev/null
+++ b/apps/pisteinen/app.js
@@ -0,0 +1,121 @@
+// Pisteinen
+//
+// Bangle.js 2 watch face
+// by Jukio Kallio
+// www.jukiokallio.com
+
+
+// settings
+const watch = {  
+  x:0, y:0, w:0, h:0, 
+  bgcolor:g.theme.bg, 
+  fgcolor:g.theme.fg, 
+};
+
+// set some additional settings
+watch.w = g.getWidth(); // size of the background
+watch.h = g.getHeight();
+watch.x = watch.w * 0.5; // position of the circles
+watch.y = watch.h * 0.5;
+
+var wait = 60000; // wait time, normally a minute
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+
+// main function
+function draw() {
+  // make date object
+  var date = new Date();
+
+  // Reset the state of the graphics library
+  g.reset();
+  
+  // Clear the area where we want to draw the time
+  g.setColor(watch.bgcolor);
+  g.fillRect(0, 0, watch.w, watch.h);
+  
+  // setup watch face
+  const hball = {
+    size: 9,
+    pad: 9,
+  };
+  const mball = {
+    size: 3,
+    pad: 4,
+    pad2: 2, 
+  };
+  
+  // get hours and minutes
+  var hour = date.getHours();
+  var minute = date.getMinutes();
+  
+  // calculate size of the hour face
+  var hfacew = (hball.size * 2 + hball.pad) * 6 - hball.pad;
+  var hfaceh = (hball.size * 2 + hball.pad) * 4 - hball.pad;
+  var mfacew = (mball.size * 2 + mball.pad) * 15 - mball.pad + mball.pad2 * 2;
+  var mfaceh = (mball.size * 2 + mball.pad) * 4 - mball.pad;
+  var faceh = hfaceh + mfaceh + hball.pad + mball.pad;
+  
+  g.setColor(watch.fgcolor); // set foreground color
+  
+  // draw hour balls
+  for (var i = 0; i < 24; i++) {
+    var x = ((hball.size * 2 + hball.pad) * (i % 6)) + (watch.x - hfacew / 2) + hball.size;
+    var y = watch.y - faceh / 2 + hball.size;
+    if (i >= 6) y += hball.size * 2 + hball.pad;
+    if (i >= 12) y += hball.size * 2 + hball.pad;
+    if (i >= 18) y += hball.size * 2 + hball.pad;
+    
+    if (i < hour) g.fillCircle(x, y, hball.size); else g.drawCircle(x, y, hball.size);
+  }
+  
+  // draw minute balls
+  for (var j = 0; j < 60; j++) {
+    var x2 = ((mball.size * 2 + mball.pad) * (j % 15)) + (watch.x - mfacew / 2) + mball.size;
+    if (j % 15 >= 5) x2 += mball.pad2;
+    if (j % 15 >= 10) x2 += mball.pad2;
+    var y2 = watch.y - faceh / 2 + hfaceh + mball.size + hball.pad + mball.pad;
+    if (j >= 15) y2 += mball.size * 2 + mball.pad;
+    if (j >= 30) y2 += mball.size * 2 + mball.pad;
+    if (j >= 45) y2 += mball.size * 2 + mball.pad;
+    
+    if (j < minute) g.fillCircle(x2, y2, mball.size); else g.drawCircle(x2, y2, mball.size);
+  }
+  
+  
+  // queue draw
+  queueDraw();
+}
+
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
diff --git a/apps/pisteinen/app.png b/apps/pisteinen/app.png
new file mode 100644
index 000000000..a6c441423
Binary files /dev/null and b/apps/pisteinen/app.png differ
diff --git a/apps/pisteinen/metadata.json b/apps/pisteinen/metadata.json
new file mode 100644
index 000000000..f1137e589
--- /dev/null
+++ b/apps/pisteinen/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "pisteinen",
+  "name": "Pisteinen - Dotted watch face",
+  "shortName":"Pisteinen",
+  "version":"0.01",
+  "description": "A minimal digital watch face made with dots.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot1.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS","BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"pisteinen.app.js","url":"app.js"},
+    {"name":"pisteinen.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/pisteinen/screenshot1.png b/apps/pisteinen/screenshot1.png
new file mode 100644
index 000000000..556c004c0
Binary files /dev/null and b/apps/pisteinen/screenshot1.png differ
diff --git a/apps/podadrem/ChangeLog b/apps/podadrem/ChangeLog
new file mode 100644
index 000000000..c26e40c0e
--- /dev/null
+++ b/apps/podadrem/ChangeLog
@@ -0,0 +1,6 @@
+0.01: Inital release.
+0.02: Misc fixes. Add Search and play.
+0.03: Simplify "Search and play" function after some bugfixes to Podcast
+Addict.
+0.04: New layout.
+0.05: Add widget field, tweak layout.
diff --git a/apps/podadrem/README.md b/apps/podadrem/README.md
new file mode 100644
index 000000000..3760e6b5b
--- /dev/null
+++ b/apps/podadrem/README.md
@@ -0,0 +1,21 @@
+Requires Gadgetbridge 71.0 or later. Allow intents in Gadgetbridge in order for this app to work.
+
+Touch input:
+
+Press the different ui elements to control Podcast Addict and open menus.
+Press left or right arrow to move backward/forward in current playlist.
+
+Swipe input:
+
+Swipe left/right to jump backward/forward within the current podcast episode.
+Swipe up/down to change the volume.
+
+It's possible to start a podcast by searching with the remote. It's also possible to change the playback speed.
+
+The swipe logic was inspired by the implementation in [rigrig](https://git.tubul.net/rigrig/)'s Scrolling Messages.
+
+Podcast Addict Remote was created by [thyttan](https://github.com/thyttan/).
+
+Podcast Addict is developed by [Xavier Guillemane](https://twitter.com/xguillem) and can be installed via the [Google Play Store](https://play.google.com/store/apps/details?id=com.bambuna.podcastaddict&hl=en_US&gl=US).
+
+The Podcast Addict icon is used with permission.
diff --git a/apps/podadrem/app-icon.js b/apps/podadrem/app-icon.js
new file mode 100644
index 000000000..fc4406666
--- /dev/null
+++ b/apps/podadrem/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwgHEhvdABnQDwwVNAAYtTGI4WSGAgWTGAYXUGAJGUGAQXXCyoXKmf/AAPznogQn4WCAAQYP6YWFDB4WFJQhFSA4gwMIYogEGBffLg0zKAYwKRgwTDBQP9Ix09n7DCpowBJBKNEBwIXBAQIsBMwgXKIQReCDoRgJOwYQDLQU/poMBC5B2DIAUzLwIKBnoXBPBAXEIQQVDA4IXNCIQXaWAgXNI4kzNQoXLO4wXLU4a+CU4gXR7ovBcIoXIBobMFPAgXILQKPDmgxCR5omDc4QAHC5ITCC6hgCC6hICC6owBC6phBC6zcFAAMzeogALdQjdBC6AZCeYfTmczAwfQhocOAAwXYgAXVgAXVFwMAJCgXCDCYWDJKYWEGKAtEA=="))
diff --git a/apps/podadrem/app.js b/apps/podadrem/app.js
new file mode 100644
index 000000000..b04d80b17
--- /dev/null
+++ b/apps/podadrem/app.js
@@ -0,0 +1,375 @@
+/*
+Bluetooth.println(JSON.stringify({t:"intent", action:"", flags:["flag1", "flag2",...], categories:["category1","category2",...], mimetype:"", data:"",  package:"", class:"", target:"", extra:{someKey:"someValueOrString"}}));
+
+Podcast Addict is developed by Xavier Guillemane and can be downloaded on Google Play Store: https://play.google.com/store/apps/details?id=com.bambuna.podcastaddict&hl=en_US&gl=US
+
+Podcast Addict can be controlled through the sending of remote commands called 'Intents'.
+Some 3rd parties apps specialized in task automation will then allow you to control Podcast Addict. For example, you will be able to wake up to the sound of your playlist or to start automatically playing when some NFC tag has been detected.
+In Tasker, you just need to copy/paste one of the following intent in the task Action field ("Misc" action type then select "Send Itent") .
+If you prefer Automate It, you can use the Podcast Addict plugin that will save you some configuration time (https://play.google.com/store/apps/details?id=com.smarterapps.podcastaddictplugin )
+Before using an intent make sure to set the following:
+Package: com.bambuna.podcastaddict
+Class (UPDATE intent only): com.bambuna.podcastaddict.receiver.PodcastAddictBroadcastReceiver
+Class (every other intent): com.bambuna.podcastaddict.receiver.PodcastAddictPlayerReceiver
+Here are the supported commands (Intents) :
+com.bambuna.podcastaddict.service.player.toggle – Toggle the playlist
+com.bambuna.podcastaddict.service.player.stop – Stop the player and release its resources
+com.bambuna.podcastaddict.service.player.play – Start playing the playlist
+com.bambuna.podcastaddict.service.player.pause – Pause the playlist
+com.bambuna.podcastaddict.service.player.nexttrack – Start playing next track
+com.bambuna.podcastaddict.service.player.previoustrack – Start playing previous track
+com.bambuna.podcastaddict.service.player.jumpforward – Jump 30s forward
+com.bambuna.podcastaddict.service.player.jumpbackward – Jump 15s backward
+com.bambuna.podcastaddict.service.player.1xspeed - Disable the variable playback speed
+com.bambuna.podcastaddict.service.player.1.5xspeed – Force the playback speed at 1.5x
+com.bambuna.podcastaddict.service.player.2xspeed – Force the playback speed at 2.0x
+com.bambuna.podcastaddict.service.player.stoptimer – Disable the timer
+com.bambuna.podcastaddict.service.player.15mntimer – Set the timer at 15 minutes
+com.bambuna.podcastaddict.service.player.30mntimer – Set the timer at 30 minutes
+com.bambuna.podcastaddict.service.player.60mntimer – Set the timer at 1 hour
+com.bambuna.podcastaddict.service.update – Trigger podcasts update
+com.bambuna.podcastaddict.openmainscreen – Open the app on the Main screen
+com.bambuna.podcastaddict.openplaylist – Open the app on the Playlist screen
+com.bambuna.podcastaddict.openplayer – Open the app on the Player screen
+com.bambuna.podcastaddict.opennewepisodes – Open the app on the New episodes screen
+com.bambuna.podcastaddict.opendownloadedepisodes – Open the app on the Downloaded episodes screen
+com.bambuna.podcastaddict.service.player.playfirstepisode – Start playing the first episode in the playlist
+com.bambuna.podcastaddict.service.player.customspeed – Select playback speed
+In order to use this intent you need to pass a float argument called "arg1". Valid values are within [0.1, 5.0]
+com.bambuna.podcastaddict.service.player.customtimer – Start a custom timer
+In order to use this intent you need to pass an int argument called "arg1" containing the number of minutes. Valid values are within [1, 1440]
+com.bambuna.podcastaddict.service.player.deletecurrentskipnexttrack – Delete the current episode and skip to the next one. It behaves the same way as long pressing on the player >| button, but doesn't display any confirmation popup.
+com.bambuna.podcastaddict.service.player.deletecurrentskipprevioustrack – Delete the current episode and skip to the previous one. It behaves the same way as long pressing on the player |< button, but doesn't display any confirmation popup.
+com.bambuna.podcastaddict.service.player.boostVolume – Toggle the Volume Boost audio effect
+You can pass a, optional boolean argument called "arg1" in order to create a ON or OFF button for the volume boost. Without this parameter the app will just toggle the current value
+com.bambuna.podcastaddict.service.player.quickBookmark – Creates a bookmark at the current playback position so you can easily retrieve it later.
+com.bambuna.podcastaddict.service.download.pause – Pause downloads
+com.bambuna.podcastaddict.service.download.resume – Resume downloads
+com.bambuna.podcastaddict.service. download.toggle – Toggle downloads
+com.bambuna.podcastaddict.service.player.favorite – Mark the current episode playing as favorite.
+com.bambuna.podcastaddict.openplaylist – Open the app on the Playlist screen
+You can pass an optional string argument called "arg1" in order to select the playlist to open. Without this parameter the app will open the current playlist
+Here's how it works:
+##AUDIO## will open the Audio playlist screen
+##VIDEO## will open the Video playlist screen
+##RADIO## will open the Radio screen
+Any other argument will be used as a CATEGORY name. The app will then open this category under the playlist CUSTOM tab
+You can pass an optional boolean argument called "arg2" in order to select if the app UI should be opened. Without this parameter the playlist will be displayed
+You can pass an optional boolean argument called "arg3" in order to select if the app should start playing the selected playlist. Without this parameter the playback won't start
+Since v2020.3
+com.bambuna.podcastaddict.service.full_backup – Trigger a full backup of the app data (relies on the app automatic backup settings for the folder and the # of backup to keep)
+This task takes a lot of resources and might take up to a minute to complete, so please avoid using the app at the same time
+Since v2020.15
+com.bambuna.podcastaddict.service.player.toggletimer – This will toggle the Sleep Timer using the last duration and parameter used in the app.
+Since v2020.16
+com.bambuna.podcastaddict.service.player.togglespeed – This will toggle the Playback speed for the episode currently playing (alternate between selected speed and 1.0x).
+*/
+
+var R;
+var backToMenu = false;
+var dark = g.theme.dark; // bool
+
+// The main layout of the app
+function gfx() {
+  //Bangle.drawWidgets();
+  R = Bangle.appRect;
+  marigin = 8;
+  // g.drawString(str, x, y, solid)
+  g.clearRect(R);
+  g.reset();
+  
+  if (dark) {g.setColor(0xFD20);} else {g.setColor(0xF800);} // Orange on dark theme, RED on light theme.
+  g.setFont("4x6:2");
+  g.setFontAlign(1, 0, 0);
+  g.drawString("->", R.x2 - marigin, R.y + R.h/2);
+
+  g.setFontAlign(-1, 0, 0);
+  g.drawString("<-", R.x + marigin, R.y + R.h/2);
+
+  g.setFontAlign(-1, 0, 1);
+  g.drawString("<-", R.x + R.w/2, R.y + marigin);
+
+  g.setFontAlign(1, 0, 1);
+  g.drawString("->", R.x + R.w/2, R.y2 - marigin);
+
+  g.setFontAlign(0, 0, 0);
+  g.drawString("Play\nPause", R.x + R.w/2, R.y + R.h/2);
+
+  g.setFontAlign(-1, -1, 0);
+  g.drawString("Menu", R.x + 2*marigin, R.y + 2*marigin);
+
+  g.setFontAlign(-1, 1, 0);
+  g.drawString("Wake", R.x + 2*marigin, R.y + R.h - 2*marigin);
+
+  g.setFontAlign(1, -1, 0);
+  g.drawString("Srch", R.x + R.w - 2*marigin, R.y + 2*marigin);
+
+  g.setFontAlign(1, 1, 0);
+  g.drawString("Speed", R.x + R.w - 2*marigin, R.y + R.h - 2*marigin);
+}
+
+// Touch handler for main layout
+function touchHandler(_, xy) {
+  x = xy.x;
+  y = xy.y;
+  len = (R.w<R.h+1)?(R.w/3):(R.h/3);
+  
+  // doing a<b+1 seemed faster than a<=b, also using a>b-1 instead of a>b.
+  if ((R.x-1<x && x<R.x+len) && (R.y-1<y && y<R.y+len)) {
+    //Menu
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    backToMenu = true;
+    E.showMenu(paMenu);
+  } else if ((R.x-1<x && x<R.x+len) && (R.y2-len<y && y<R.y2+1)) {
+    //Wake 
+    gadgetbridgeWake();
+    gadgetbridgeWake();
+  } else if ((R.x2-len<x && x<R.x2+1) && (R.y-1<y && y<R.y+len)) {
+    //Srch
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    E.showMenu(searchMenu);
+  } else if ((R.x2-len<x && x<R.x2+1) && (R.y2-len<y && y<R.y2+1)) {
+    //Speed 
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    E.showMenu(speedMenu);
+  } else if ((R.x-1<x && x<R.x+len) && (R.y+R.h/2-len/2<y && y<R.y+R.h/2+len/2)) {
+    //Previous 
+    btMsg("service", standardCls, "player.previoustrack");
+  } else if ((R.x2-len+1<x && x<R.x2+1) && (R.y+R.h/2-len/2<y && y<R.y+R.h/2+len/2)) {
+    //Next
+    btMsg("service", standardCls, "player.nexttrack");
+  } else if ((R.x-1<x && x<R.x2+1) && (R.y-1<y && y<R.y2+1)){
+    //play/pause
+    btMsg("service", standardCls, "player.toggle");
+  }
+}
+
+// Swipe handler for main layout, used to jump backward and forward within a podcast episode.
+function swipeHandler(LR, _) {
+  if (LR==-1) {
+    btMsg("service", standardCls, "player.jumpforward");
+  }
+  if (LR==1) {
+    btMsg("service", standardCls, "player.jumpbackward");
+  }
+}
+
+// Navigation input on the main layout
+function setUI() {
+  // Bangle.setUI code from rigrig's smessages app for volume control: https://git.tubul.net/rigrig/BangleApps/src/branch/personal/apps/smessages/app.js
+  Bangle.setUI(
+    {mode : "updown", back : load}, 
+    ud => {
+      if (ud) Bangle.musicControl(ud>0 ? "volumedown" : "volumeup");
+    }
+  );
+  Bangle.on("touch", touchHandler);
+  Bangle.on("swipe", swipeHandler);
+}
+
+/*
+The functions for interacting with Android and the Podcast Addict app
+*/
+
+pkg = "com.bambuna.podcastaddict";
+standardCls = pkg + ".receiver.PodcastAddictPlayerReceiver";
+updateCls = pkg + ".receiver.PodcastAddictBroadcastReceiver";
+speed = 1.0;
+
+simpleSearch = "";
+
+function simpleSearchTerm() { // input a simple search term without tags, overrides search with tags (artist and track)
+  require("textinput").input({
+    text: simpleSearch
+  }).then(result => {
+    simpleSearch = result;
+  }).then(() => {
+    E.showMenu(searchMenu);
+  });
+}
+
+function searchPlayWOTags() { //make a search and play using entered terms
+  searchString = simpleSearch;
+  Bluetooth.println(JSON.stringify({
+    t: "intent",
+    action: "android.media.action.MEDIA_PLAY_FROM_SEARCH",
+    package: pkg,
+    target: "activity",
+    extra: {
+      query: searchString
+    },
+    flags: ["FLAG_ACTIVITY_NEW_TASK"]
+  }));
+}
+
+function gadgetbridgeWake() {
+  Bluetooth.println(JSON.stringify({
+    t: "intent",
+    target: "activity",
+    flags: ["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_CLEAR_TASK", "FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS", "FLAG_ACTIVITY_NO_ANIMATION"],
+    package: "gadgetbridge",
+    class: "nodomain.freeyourgadget.gadgetbridge.activities.WakeActivity"
+  }));
+}
+
+// For stringing together the action for Podcast Addict to perform
+function actFn(actName, activOrServ) {
+  return "com.bambuna.podcastaddict." + (activOrServ == "service" ? "service." : "") + actName;
+}
+
+// Send the intent message to Gadgetbridge
+function btMsg(activOrServ, cls, actName, xtra) {
+
+  Bluetooth.println(JSON.stringify({
+    t: "intent",
+    action: actFn(actName, activOrServ),
+    package: pkg,
+    class: cls,
+    target: "broadcastreceiver",
+    extra: xtra
+  }));
+}
+
+// Get back to the main layout
+function backToGfx() {
+  E.showMenu();
+  g.clear();
+  g.reset();
+  Bangle.removeAllListeners("touch");
+  Bangle.removeAllListeners("swipe");
+  setUI();
+  gfx();
+  backToMenu = false;
+}
+
+// Podcast Addict Menu
+var paMenu = {
+  "": {
+    title: " ",
+    back: backToGfx
+  },
+  "Controls": () => {
+    E.showMenu(controlMenu);
+  },
+  "Speed Controls": () => {
+    E.showMenu(speedMenu);
+  },
+  "Search and play": () => {
+    E.showMenu(searchMenu);
+  },
+  "Navigate and play": () => {
+    E.showMenu(navigationMenu);
+  },
+  "Wake the android": () => {
+    gadgetbridgeWake();
+    gadgetbridgeWake();
+  },
+  "Exit PA Remote": ()=>{load();}
+};
+
+
+var controlMenu = {
+  "": {
+    title: " ",
+    back: () => {if (backToMenu) E.showMenu(paMenu);
+                 if (!backToMenu) backToGfx();
+                }
+  },
+  "Toggle Play/Pause": () => {
+    btMsg("service", standardCls, "player.toggle");
+  },
+  "Jump Backward": () => {
+    btMsg("service", standardCls, "player.jumpbackward");
+  },
+  "Jump Forward": () => {
+    btMsg("service", standardCls, "player.jumpforward");
+  },
+  "Previous": () => {
+    btMsg("service", standardCls, "player.previoustrack");
+  },
+  "Next": () => {
+    btMsg("service", standardCls, "player.nexttrack");
+  },
+  "Play": () => {
+    btMsg("service", standardCls, "player.play");
+  },
+  "Pause": () => {
+    btMsg("service", standardCls, "player.pause");
+  },
+  "Stop": () => {
+    btMsg("service", standardCls, "player.stop");
+  },
+  "Update": () => {
+    btMsg("service", updateCls, "update");
+  },
+  "Messages Music Controls": () => {
+    load("messagesmusic.app.js");
+  },
+};
+
+var speedMenu = {
+  "": {
+    title: " ",
+    back: () => {if (backToMenu) E.showMenu(paMenu);
+                 if (!backToMenu) backToGfx();
+                }
+  },
+  "Regular Speed": () => {
+    speed = 1.0;
+    btMsg("service", standardCls, "player.1xspeed");
+  },
+  "1.5x Regular Speed": () => {
+    speed = 1.5;
+    btMsg("service", standardCls, "player.1.5xspeed");
+  },
+  "2x Regular Speed": () => {
+    speed = 2.0;
+    btMsg("service", standardCls, "player.2xspeed");
+  },
+  //"Faster" : ()=>{speed+=0.1; speed=((speed>5.0)?5.0:speed); btMsg("service",standardCls,"player.customspeed",{arg1:speed});},
+  //"Slower" : ()=>{speed-=0.1; speed=((speed<0.1)?0.1:speed); btMsg("service",standardCls,"player.customspeed",{arg1:speed});},
+};
+
+var searchMenu = {
+  "": {
+    title: " ",
+
+    back: () => {if (backToMenu) E.showMenu(paMenu);
+                 if (!backToMenu) backToGfx();}
+
+  },
+  "Search term": () => {
+    simpleSearchTerm();
+  },
+  "Execute search and play": () => {
+    btMsg("service", standardCls, "player.play");
+    setTimeout(() => {
+      searchPlayWOTags();
+      setTimeout(() => {
+        btMsg("service", standardCls, "player.play");
+      }, 200);
+    }, 1500);
+  },
+  "Simpler search and play" : searchPlayWOTags,
+};
+
+var navigationMenu = {
+  "": {
+    title: " ",
+    back: () => {if (backToMenu) E.showMenu(paMenu);
+                 if (!backToMenu) backToGfx();}
+  },
+  "Open Main Screen": () => {
+    btMsg("activity", standardCls, "openmainscreen");
+  },
+  "Open Player Screen": () => {
+    btMsg("activity", standardCls, "openplayer");
+  },
+};
+
+Bangle.loadWidgets();
+setUI();
+gfx();
diff --git a/apps/podadrem/app.png b/apps/podadrem/app.png
new file mode 100644
index 000000000..b9cdf4fed
Binary files /dev/null and b/apps/podadrem/app.png differ
diff --git a/apps/podadrem/metadata.json b/apps/podadrem/metadata.json
new file mode 100644
index 000000000..929269762
--- /dev/null
+++ b/apps/podadrem/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "podadrem",
+  "name": "Podcast Addict Remote",
+  "shortName": "PA Remote",
+  "version": "0.05",
+  "description": "Control Podcast Addict on your android device.",
+  "readme": "README.md",
+  "type": "app",
+  "tags": "remote,podcast,podcasts,radio,player,intent,intents,gadgetbridge,podadrem,pa remote", 
+  "icon": "app.png",
+  "screenshots" : [ {"url":"screenshot1.png"}, {"url":"screenshot2.png"} ],
+  "supports": ["BANGLEJS2"],
+  "dependencies": { "textinput":"type"},
+  "storage": [
+    {"name":"podadrem.app.js","url":"app.js"},
+    {"name":"podadrem.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/podadrem/screenshot1.png b/apps/podadrem/screenshot1.png
new file mode 100644
index 000000000..50f3f17f1
Binary files /dev/null and b/apps/podadrem/screenshot1.png differ
diff --git a/apps/podadrem/screenshot2.png b/apps/podadrem/screenshot2.png
new file mode 100644
index 000000000..e20c808a2
Binary files /dev/null and b/apps/podadrem/screenshot2.png differ
diff --git a/apps/poikkipuinen/ChangeLog b/apps/poikkipuinen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/poikkipuinen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/poikkipuinen/README.md b/apps/poikkipuinen/README.md
new file mode 100644
index 000000000..12f8d5d7e
--- /dev/null
+++ b/apps/poikkipuinen/README.md
@@ -0,0 +1,7 @@
+# Poikkipuinen
+
+By Jukio Kallio
+
+A Minimal digital watch face. Follows the theme colors.
+
+![](screenshot1.png) 
diff --git a/apps/poikkipuinen/app-icon.js b/apps/poikkipuinen/app-icon.js
new file mode 100644
index 000000000..d7ddba399
--- /dev/null
+++ b/apps/poikkipuinen/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEogA0/4AKCpNPCxYAB+gtTGJQuOGBAWPGAwuQGAwXamQULkYXGBQUgn4WJ+cCMAwXNiQXV+MBC6swh4XU+cAn4XU+IUBC6kgj4XUIwKnV+EDC6sQl4XU+UBd6q8BC6q8BC6i8CC6i8CC6a8DC6a8DC6a8DC6S8EC6S8EC6S8EC6K8FC6K8FC6C8BIwwXOXgwXQXgwXQkIWHd6IXPp4GBmQWJAAMjAQP0C4wAPC7hgDABwWEGCIuFGCIWGGB4uHGJwVJAFY="))
diff --git a/apps/poikkipuinen/app.js b/apps/poikkipuinen/app.js
new file mode 100644
index 000000000..0bf09c5e5
--- /dev/null
+++ b/apps/poikkipuinen/app.js
@@ -0,0 +1,158 @@
+// Poikkipuinen
+//
+// Bangle.js 2 watch face
+// by Jukio Kallio
+// www.jukiokallio.com
+
+require("Font5x9Numeric7Seg").add(Graphics);
+require("FontSinclair").add(Graphics);
+
+// settings
+const watch = {  
+  x:0, y:0, w:0, h:0, 
+  bgcolor:g.theme.bg, 
+  fgcolor:g.theme.fg, 
+  font: "5x9Numeric7Seg", fontsize: 1,
+  font2: "Sinclair", font2size: 1, 
+  finland:true, // change if you want Finnish style date, or US style
+};
+
+
+// set some additional settings
+watch.w = g.getWidth(); // size of the background
+watch.h = g.getHeight();
+watch.x = watch.w * 0.5; // position of the circles
+watch.y = watch.h * 0.41;
+
+const dateWeekday = { 0: "SUN", 1: "MON", 2: "TUE", 3: "WED", 4:"THU", 5:"FRI", 6:"SAT" }; // weekdays
+
+var wait = 60000; // wait time, normally a minute
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+
+// main function
+function draw() {
+  // make date object
+  var date = new Date();
+  
+  // work out the date string
+  var dateDay = date.getDate();
+  var dateMonth = date.getMonth() + 1;
+  var dateYear = date.getFullYear();
+  var dateStr = dateMonth + "." + dateDay + "." + dateYear;
+  if (watch.finland) dateStr = dateDay + "." + dateMonth + "." + dateYear; // the true way of showing date
+  var dateStr2 = dateWeekday[date.getDay()];
+
+  // Reset the state of the graphics library
+  g.reset();
+  
+  // Clear the area where we want to draw the time
+  g.setColor(watch.bgcolor);
+  g.fillRect(0, 0, watch.w, watch.h);
+  
+  // set foreground color
+  g.setColor(watch.fgcolor);
+  g.setFontAlign(1,-1).setFont(watch.font, watch.fontsize);
+  
+  // watch face size
+  var facew, faceh; // halves of the size for easier calculation
+  facew = 50;
+  faceh = 59;
+  
+  // save hour and minute y positions
+  var houry, minutey;
+  
+  // draw hour meter
+  g.drawLine(watch.x - facew, watch.y - faceh, watch.x - facew, watch.y + faceh);
+  var lines = 13;
+  var lineh = faceh * 2 / (lines - 2);
+  for (var i = 1; i < lines; i++) {
+    var w = 3;
+    var y = faceh - lineh * (i - 1);
+    
+    if (i % 3 == 0) {
+      // longer line and numbers every 3
+      w = 5;
+      g.drawString(i, watch.x - facew - 2, y + watch.y);
+    }
+    
+    g.drawLine(watch.x - facew, y + watch.y, watch.x - facew + w, y + watch.y);
+    
+    // get hour y position
+    var hour = date.getHours() % 12; // modulate away the 24h
+    if (hour == 0) hour = 12; // fix a problem with 0-23 hours
+    //var hourMin = date.getMinutes() / 60; // move hour line by minutes
+    var hourMin = Math.floor(date.getMinutes() / 15) / 4; // move hour line by 15-minutes
+    if (hour == 12) hourMin = 0; // don't do minute moving if 12 (line ends there)
+    if (i == hour) houry = y - (lineh * hourMin);
+  }
+  
+  // draw minute meter
+  g.drawLine(watch.x + facew, watch.y - faceh, watch.x + facew, watch.y + faceh);
+  g.setFontAlign(-1,-1);
+  lines = 60;
+  lineh = faceh * 2 / (lines - 1);
+  for (i = 0; i < lines; i++) {
+    var mw = 3;
+    var my = faceh - lineh * i;
+    
+    if (i % 15 == 0 && i != 0) {
+      // longer line and numbers every 3
+      mw = 5;
+      g.drawString(i, watch.x + facew + 4, my + watch.y);
+    }
+    
+    //if (i % 2 == 0 || i == 15 || i == 45) 
+    g.drawLine(watch.x + facew, my + watch.y, watch.x + facew - mw, my + watch.y);
+    
+    // get minute y position
+    if (i == date.getMinutes()) minutey = my;
+  }
+  
+  // draw the time
+  var timexpad = 8;
+  g.drawLine(watch.x - facew + timexpad, watch.y + houry, watch.x + facew - timexpad, watch.y + minutey);
+  
+  // draw date
+  var datey = 14;
+  g.setFontAlign(0,-1);
+  g.drawString(dateStr, watch.x, watch.y + faceh + datey);
+  g.setFontAlign(0,-1).setFont(watch.font2, watch.font2size);
+  g.drawString(dateStr2, watch.x, watch.y + faceh + datey*2);
+  
+  // queue draw
+  queueDraw();
+}
+
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
diff --git a/apps/poikkipuinen/app.png b/apps/poikkipuinen/app.png
new file mode 100644
index 000000000..fa506c886
Binary files /dev/null and b/apps/poikkipuinen/app.png differ
diff --git a/apps/poikkipuinen/metadata.json b/apps/poikkipuinen/metadata.json
new file mode 100644
index 000000000..ec95ab7ce
--- /dev/null
+++ b/apps/poikkipuinen/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "poikkipuinen",
+  "name": "Poikkipuinen - Minimal watch face",
+  "shortName":"Poikkipuinen",
+  "version":"0.01",
+  "description": "A minimal digital watch face.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot1.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS","BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"poikkipuinen.app.js","url":"app.js"},
+    {"name":"poikkipuinen.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/poikkipuinen/screenshot1.png b/apps/poikkipuinen/screenshot1.png
new file mode 100644
index 000000000..23fcc348c
Binary files /dev/null and b/apps/poikkipuinen/screenshot1.png differ
diff --git a/apps/pokeclk/ChangeLog b/apps/pokeclk/ChangeLog
index 8e506ce50..5838e596d 100644
--- a/apps/pokeclk/ChangeLog
+++ b/apps/pokeclk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New face :)
 0.02: Color image compressed
+0.03: Improved clock
diff --git a/apps/pokeclk/app.js b/apps/pokeclk/app.js
index 17a487bc0..7e495f7d2 100644
--- a/apps/pokeclk/app.js
+++ b/apps/pokeclk/app.js
@@ -5,7 +5,7 @@ const width = g.getWidth();
 const height = g.getHeight();
 const font = "Vector:12";
 
-const locale = require("locale");
+var drawTimeout;
 
 var img = {
   width : 176, height : 149, bpp : 4,
@@ -20,34 +20,12 @@ var night= {
   buffer : (atob("ERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERABEREREREREAEREREREREREREREREREREREREREREREREREREREREREREREQABERERERHwABEREREREREREREREREREREREREREREREREREREREREREREREQ/xERERER/wERERERERERERERERERERERERERERERERERERERERERERERERH//xERERH//xERERERERERERERERERERERERERERERERERERERERERERERERH//xEREf/xERERERERERERERERERERERERERERERERERERERERERERERERERH///////ERERERERERERERERERERERERERERERERERERERERERERERERERER////////8RERERERERERERERERERERERERERERERERERERERERERERERERH/////////ERERERERERERERERERERERERERERERERERERERERERERERERER////D///DxERERERERERERERERERERERERERERERERERERERERERERERERH////w///w8RERERERERERERERERERERERERERERERERERERERER//ERERER//AA///w/w8REREREREREREREREREREREREREREREREREREREREf////EREf/wAP/wAA8PERERERERERERERERERERERERERERERERERERERERH////xERH/8AD/////DxERERERERERERERERERERERERERERERERERERERER////8REf//////////ERERERERERERERERERERERERERERERERERERERERERERH/8R/////////xERERERERERERERERERERERERERERERERERERERER////////Ef////////////////////////////////////////////////////////////////////////////////////////////////////////////8RERERH////////////xERERERERERERERERERERERERERERERERERERERERERERERH///////////EREREREREREREREREREREREREREREREREREREREREf/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////w=="))
 };
 
-var time= "10:20";
-
-function time() { //numbers
-  // work out how to display the current time
-  const d = new Date();
-  const h = d.getHours(),
-    m = d.getMinutes();
-  const time = h + ":" + ("0" + m).substr(-2);
-  const day = Date.now();
-  const mo = d.getMonth()+1;
-  const damo = d.getDate();
-  
-  var dayMonth = mo+"-"+damo;
-  
-  // time
-  require("Font4x5").add(Graphics);
-  isDark();
-  g.setFontAlign(0,0);
-  //g.setFont("6x8:4x5");
-  g.setFont("4x5",7);
-  g.drawString(time, width/2, height/2);  
-  // date  
-  require("Font4x5").add(Graphics);
-  g.setFontAlign(1,1);
-  //g.setFont("4x6",2);
-  g.setFont("4x5",3);
-  g.drawString(dayMonth, width/2+60, height/2+40);
-  
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
 }
 
 function isDark(){
@@ -59,6 +37,22 @@ function isDark(){
   }
 }
 
+function time() {
+  var d = new Date();
+  var day = d.getDate();
+  var time = require("locale").time(d,1);
+  var date = require("locale").date(d);
+  var mo = require("date_utils").month(d.getMonth()+1,1);
+  
+  require("Font4x5").add(Graphics); // time
+  isDark();
+  g.setFontAlign(0,0);
+  g.setFont("4x5",7.5).drawString(time, width/2, height/2);  
+
+  g.setFontAlign(1,1);
+  g.setFont("4x5",3).drawString(mo+" "+day, width-15, height-35);  
+}
+
 function draw() { //poketch background  
   if (g.theme.dark==true){
     g.drawImage(night, 0, 25, {scale:2}); //poketch is life  
@@ -67,20 +61,13 @@ function draw() { //poketch background
     g.drawImage(img, 0, 25); //poketch is life  
   }  
   time();
+  queueDraw();
 }
 
 //program start
 g.clear();
 draw();
-var secondInterval = setInterval(draw, 1000); // Stop updates when LCD is off, restart when on
-Bangle.on('lcdPower',on=>{
-  if (secondInterval) clearInterval(secondInterval);
-  secondInterval = undefined;
-  if (on) {
-    secondInterval = setInterval(draw, 1000);
-    draw(); // draw immediately
-  }
-});
+
 // Show launcher when middle button pressed
 Bangle.setUI("clock");
 // Load widgets
diff --git a/apps/pokeclk/metadata.json b/apps/pokeclk/metadata.json
index 433077efe..c022868ec 100644
--- a/apps/pokeclk/metadata.json
+++ b/apps/pokeclk/metadata.json
@@ -2,7 +2,7 @@
     "id": "pokeclk",
     "name": "Poketch Clock",
     "shortName":"Poketch Clock",
-    "version": "0.02",
+    "version": "0.03",
     "description": "A clock based on the Poketch electronic device found in Sinnoh",
     "icon": "app.png",
     "type": "clock",
diff --git a/apps/pooqroman/ChangeLog b/apps/pooqroman/ChangeLog
index c4f3171d3..b21b34b58 100644
--- a/apps/pooqroman/ChangeLog
+++ b/apps/pooqroman/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Initial check-in.
 0.02: Make internal menu time out + small fixes.
 0.03: Autolight feature.
+0.04: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/pooqroman/app.js b/apps/pooqroman/app.js
index fcb2437e1..7bd749ac4 100644
--- a/apps/pooqroman/app.js
+++ b/apps/pooqroman/app.js
@@ -70,7 +70,7 @@ class Options {
             delay
         );
     }
-    
+
     bless(k) {
         Object.defineProperty(this, k, {
             get: () => this.backing[k],
@@ -103,7 +103,7 @@ class Options {
         if (this.bored) clearTimeout(this.bored);
         this.bored = setTimeout(_ => this.showMenu(), 15000);
     }
-    
+
     reset() {
         this.backing = {__proto__: this.constructor.defaults};
         this.writeBack(0);
@@ -145,7 +145,7 @@ class RomanOptions extends Options {
             Defaults: _ => {this.reset(); this.interact();}
         };
     }
-        
+
     interact() {this.showMenu(this.menu);}
 }
 
@@ -337,7 +337,7 @@ const events = {
     //            colour: colour, dramatic?: bool, event?: any}
     fixed: [{time: Number.POSITIVE_INFINITY}], // indexed by ms absolute
     wall: [{time: Number.POSITIVE_INFINITY}], // indexed by nominal ms + TZ ms
-    
+
     clean: function(now, l) {
         let o = now.getTimezoneOffset() * 60000;
         let tf = now.getTime() + l, tw = tf - o;
@@ -345,7 +345,7 @@ const events = {
         while (this.wall[0].time <= tw) this.wall.shift();
         while (this.fixed[0].time <= tf) this.fixed.shift();
     },
-    
+
     scan: function(now, from, to, f) {
         result = Infinity;
         let o = now.getTimezoneOffset() * 60000;
@@ -482,7 +482,7 @@ class Sidebar {
                 compassI,
                 this.x + 4 + imageWidth(compassI) / 2,
                 this.y + 4 + imageHeight(compassI) / 2,
-                a ? {rotate: c.heading / 180 * Math.PI} : undefined
+                a ? {rotate: (360-c.heading) / 180 * Math.PI} : undefined
             );
             this.y += 4 + imageHeight(compassI);
         }
@@ -535,13 +535,13 @@ class Roman {
     static pos(p, r) {
         let h = r * rectW / 2;
         let v = r * rectH / 2;
-        p = (p + 1) % 12;  
+        p = (p + 1) % 12;
         return p <= 2 ? [faceCX + h * (p - 1), faceCY - v]
             : p < 6 ? [faceCX + h, faceCY + v / 2 * (p - 4)]
             : p <= 8 ? [faceCX - h * (p - 7), faceCY + v]
             : [faceCX - h, faceCY - v / 2 * (p - 10)];
     }
-    
+
     alert(e, date, now, past) {
         const g = this.g;
         g.setColor(e.colour);
@@ -564,7 +564,7 @@ class Roman {
         }
         return Infinity;
     }
-    
+
     render(d, rate) {
         const g = this.g;
         const state = this.state || (g.clear(true), this.state = {});
@@ -625,7 +625,7 @@ class Roman {
             for (let h = keyHour; h < keyHour + 12; h++) {
                 g.drawString(
                     numeral(h % 24, options),
-                    faceX + layout[h % 12 * 2], 
+                    faceX + layout[h % 12 * 2],
                     faceY + layout[h % 12 * 2 + 1]
                 );
             }
@@ -643,7 +643,7 @@ class Roman {
             (e, t, p) => this.alert(e, t, d, p)
         );
         if (rate > requestedRate) rate = requestedRate;
-        
+
         // Hands
         // Here we are using incremental hands for hours and minutes.
         // If we quantised, we could use hand-crafted bitmaps, though.
@@ -668,7 +668,7 @@ class Clock {
         this.rates = {};
 
         this.options.on('done', () => this.start());
-        
+
         this.listeners = {
             charging: _ => {face.doIcons('charging'); this.active();},
             lock: _ => {face.doIcons('locked'); this.active();},
@@ -723,7 +723,7 @@ class Clock {
         this.face.reset(); // Cancel any ongoing background rendering
         return this;
     }
-    
+
     active() {
         const prev = this.rate;
         const now = Date.now();
diff --git a/apps/pooqroman/metadata.json b/apps/pooqroman/metadata.json
index 8cdbea728..0294e22a0 100644
--- a/apps/pooqroman/metadata.json
+++ b/apps/pooqroman/metadata.json
@@ -1,7 +1,7 @@
 { "id": "pooqroman",
   "name": "pooq Roman watch face",
   "shortName":"pooq Roman",
-  "version":"0.03",
+  "version":"0.04",
   "description": "A classic watch face with a certain dynamicity. Most amusing in 24h mode. Slide up to show more hands, down for less(!). By design does not support standard widgets, sorry!",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/powersave/ChangeLog b/apps/powersave/ChangeLog
new file mode 100644
index 000000000..28d913cc8
--- /dev/null
+++ b/apps/powersave/ChangeLog
@@ -0,0 +1,3 @@
+0.01: Initial release
+0.02: Removed accelerometer poll interval adjustment, fixed a few issues with detecting the current app
+0.03: Fix a couple of silly mistakes
\ No newline at end of file
diff --git a/apps/powersave/README.md b/apps/powersave/README.md
new file mode 100644
index 000000000..51ba044e1
--- /dev/null
+++ b/apps/powersave/README.md
@@ -0,0 +1,25 @@
+# Power Saver
+
+Save your watch's battery power by halting foreground app execution while the screen is off.
+
+## Features
+- Stops foreground app processes
+- Background processes still run
+- Clears screen
+- Foreground app is returned to when screen is turned back on (app state is not preserved)
+
+## Controls
+- Automatically activates when screen times out, timing can be adjusted using normal timeout settings
+- Deactivates when screen is turned back on
+
+## Warnings
+- This is not compatible with apps that need to run in the foreground even while the screen is off, such as most stopwatch apps and some health trackers.
+- If you check your watch super often (like multiple times per minute), this may end of costing you more power than it saves since the app you are using will have to restart everytime you check it.
+
+## Requests
+
+[Contact information is on my website](https://kyleplo.com/#contact)
+
+## Creator
+
+[kyleplo](https://kyleplo.com)
\ No newline at end of file
diff --git a/apps/powersave/boot.js b/apps/powersave/boot.js
new file mode 100644
index 000000000..f37fbc536
--- /dev/null
+++ b/apps/powersave/boot.js
@@ -0,0 +1,20 @@
+var Storage = Storage || require("Storage");
+Bangle.on("lock", locked => {
+  if(locked){
+    load("powersave.screen.js");
+  }else{
+    const data = JSON.parse(Storage.read("powersave.json") || Storage.read("setting.json"));
+    load(data.app || data.clock);
+  }
+});
+E.on("init", () => {
+  if("__FILE__" in global && __FILE__ !== "powersave.screen.js"){
+    Storage.write("powersave.json", {
+      app: __FILE__
+    });
+  }else if(!("__FILE__" in global)){
+    Storage.write("powersave.json", {
+      app: null
+    });
+  }
+});
\ No newline at end of file
diff --git a/apps/powersave/metadata.json b/apps/powersave/metadata.json
new file mode 100644
index 000000000..705384058
--- /dev/null
+++ b/apps/powersave/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "powersave",
+  "name": "Power Save",
+  "version": "0.03",
+  "description": "Halts foreground app execution while screen is off while still allowing background processes.",
+  "readme": "README.md",
+  "icon": "powersave.png",
+  "type": "bootloader",
+  "tags": "tool",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"powersave.boot.js","url":"boot.js"},
+    {"name":"powersave.screen.js","url":"screen.js"}
+  ],
+  "data": [
+    {"name": "powersave.json"}
+  ]
+}
\ No newline at end of file
diff --git a/apps/powersave/powersave.png b/apps/powersave/powersave.png
new file mode 100644
index 000000000..fa0399b73
Binary files /dev/null and b/apps/powersave/powersave.png differ
diff --git a/apps/powersave/screen.js b/apps/powersave/screen.js
new file mode 100644
index 000000000..c920b205d
--- /dev/null
+++ b/apps/powersave/screen.js
@@ -0,0 +1,7 @@
+g.clear();
+Bangle.setLCDBrightness(0);
+if(!Bangle.isLocked()){
+  var Storage = Storage || require("Storage");
+  const data = JSON.parse(Storage.read("powersave.json") || Storage.read("setting.json"));
+  load(data.app || data.clock);
+}
\ No newline at end of file
diff --git a/apps/presentation_timer/ChangeLog b/apps/presentation_timer/ChangeLog
index 9db0e26c5..2ed460931 100644
--- a/apps/presentation_timer/ChangeLog
+++ b/apps/presentation_timer/ChangeLog
@@ -1 +1,2 @@
 0.01: first release
+0.02: added interface for configuration from app loader
diff --git a/apps/presentation_timer/README.md b/apps/presentation_timer/README.md
index b24426672..4539fc2f9 100644
--- a/apps/presentation_timer/README.md
+++ b/apps/presentation_timer/README.md
@@ -12,11 +12,10 @@ when the time for the last slide is approaching,
 the button becomes red, when it passed,
 the time will go on for another half a minute and stop automatically.
 
-The only way to upload personalized timings is
-by uploading a CSV to the bangle (i.e. from the IDE),
-in the future I'll possibly figure out a better way.
+You can set personalized timings from the web interface
+by uploading a CSV to the bangle (floppy disk button in the app loader).
 
-Each line in the file (which must be called `presentation_timer.csv`)
+Each line in the file (`presentation_timer.csv`)
 contains the time in minutes at which the slide
 is supposed to finish and the slide number,
 separated by a semicolon.
@@ -25,8 +24,7 @@ is lasting until 1 minutes 30 seconds (yes it's decimal),
 after another slide will start.
 The only requirement is that timings are increasing,
 so slides number don't have to be consecutive,
-some can be skipped and they can even be short texts
-(be careful with that, I didn't test it).
+some can be skipped and they can even be short texts.
 
 At the moment the app is just quick and dirty
 but it should do its job.
diff --git a/apps/presentation_timer/interface.html b/apps/presentation_timer/interface.html
new file mode 100644
index 000000000..137ea8475
--- /dev/null
+++ b/apps/presentation_timer/interface.html
@@ -0,0 +1,136 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css" />
+
+    <style type="text/css">
+      .alert {
+        padding: 20px;
+        background-color: #f44336; /* Red */
+        color: white;
+        margin-bottom: 15px;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="info"></div>
+
+    <button id="btnReload" class="btn btn-primary">Reload from watch</button>
+    <button id="btnUpload" class="btn btn-primary">Upload to watch</button>
+    <button id="btnDownload" class="btn btn-primary">Download</button>
+
+    <pre id="presentation_timer" contenteditable></pre>
+
+    <script src="../../core/lib/interface.js"></script>
+    <script>
+      const filePresentationTimer = "presentation_timer.csv";
+      const defaultValue="1.5;1\n2;2\n2.5;3\n3;4\n"
+
+      function errorFormat() {
+        var date = new Date();
+        var error =
+          '<p class="alert">' +
+          date.toUTCString() +
+          " : Wrong format, it should be CSV, refer to the README" +
+          "</p>";
+        return error;
+      }
+
+      function getEditableContent() {
+        //transform any tag in an EOL (should be <br> or <div>), ignore ending tags
+        return document.getElementById("presentation_timer")
+                .innerHTML.replace(/<[^>]*>/g,"\n").replace(/\n\n+/g, '\n').replace(/^\n|\n$/g, '');
+      }
+
+      const re = new RegExp("^([0-9]*[.])?[0-9]+;[A-z0-9]+$");
+      function isCorrectCsvString(str) {
+        let wronglines = str.split("\n").filter(e=>e && !e.match(re));
+        //TODO check for increasing numbers
+        if(wronglines.length) {
+          console.log(wronglines.join("\n"));
+          return false;
+        }
+        return true;
+      }
+
+      function uploadFile(fileid, contents) {
+        Puck.write(
+          `\x10(function() {
+          require("Storage").write("${fileid}",\`${contents}\`);
+          Bluetooth.print("OK");
+         })()\n`,
+          (ret) => {
+            console.log("uploadFile", ret);
+          }
+        );
+      }
+
+      /* Load settings CSV file from the watch.
+       */
+      function loadTimes() {
+        document.getElementById("info").innerHTML = "";
+        Util.showModal("Loading...");
+        Puck.eval(`require('Storage').read("${filePresentationTimer}")`, (data) => {
+          document.getElementById("presentation_timer").innerHTML = data;
+          Util.hideModal();
+          if(!data) {
+            document.getElementById("presentation_timer").innerHTML = defaultValue;
+          }
+        });
+      }
+      /* Save settings as a CSV file on the watch.
+       */
+      function uploadTimes() {
+        document.getElementById("info").innerHTML = "";
+        Util.showModal("Uploading...");
+        let csvTimes = getEditableContent();
+        if (isCorrectCsvString(csvTimes)) {
+          uploadFile(filePresentationTimer, csvTimes);
+        } else {
+          document.getElementById("info").innerHTML = errorFormat();
+        }
+        Util.hideModal();
+      }
+
+      function downloadTimes() {
+        document.getElementById("info").innerHTML = "";
+        Util.showModal("Downloading...");
+        let csvTimes = getEditableContent();
+        if (isCorrectCsvString(csvTimes)) {
+          var a = document.createElement("a"),
+            file = new Blob([csvTimes], { type: "text/csv" });
+          var url = URL.createObjectURL(file);
+          a.href = url;
+          a.download = filePresentationTimer;
+          document.body.appendChild(a);
+          a.click();
+          setTimeout(function () {
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(url);
+          }, 0);
+        } else {
+          document.getElementById("info").innerHTML = errorFormat();
+        }
+        Util.hideModal();
+      }
+
+      document
+        .getElementById("btnUpload")
+        .addEventListener("click", function () {
+          uploadTimes();
+        });
+      document
+        .getElementById("btnDownload")
+        .addEventListener("click", function () {
+          downloadTimes();
+        });
+      document
+        .getElementById("btnReload")
+        .addEventListener("click", function () {
+          loadTimes();
+        });
+      function onInit() {
+        loadTimes();
+      }
+    </script>
+  </body>
+</html>
diff --git a/apps/presentation_timer/metadata.json b/apps/presentation_timer/metadata.json
index 7a61ffbf0..8790d6208 100644
--- a/apps/presentation_timer/metadata.json
+++ b/apps/presentation_timer/metadata.json
@@ -1,15 +1,17 @@
 {
   "id": "presentation_timer",
   "name": "Presentation Timer",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A touch based presentation timer for Bangle JS 2",
   "icon": "presentation_timer.png",
   "screenshots": [{"url":"screenshot1.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"},{"url":"screenshot4.png"}],
   "tags": "tools,app",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
+  "interface": "interface.html",
   "storage": [
     {"name":"presentation_timer.app.js","url":"presentation_timer.app.js"},
     {"name":"presentation_timer.img","url":"presentation_timer.icon.js","evaluate":true}
-  ]
+  ],
+  "data": [{ "name": "presentation_timer.csv" }]
 }
diff --git a/apps/presentation_timer/presentation_timer.app.js b/apps/presentation_timer/presentation_timer.app.js
index af2b35dd5..1d0e5945d 100644
--- a/apps/presentation_timer/presentation_timer.app.js
+++ b/apps/presentation_timer/presentation_timer.app.js
@@ -19,10 +19,10 @@ const margin = 0.5; //half a minute tolerance
 
 //dummy default values
 var slides = [
-  [0.3, 1],
-  [0.5, 2],
-  [0.7, 3],
-  [1,4]
+  [1.5, 1],
+  [2, 2],
+  [2.5, 3],
+  [3,4]
 ];
 
 function log_debug(o) {
@@ -267,6 +267,6 @@ g.fillRect(0,0,w,h);
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+readSlides();
 draw();
 setWatch(() => load(), BTN, { repeat: false, edge: "falling" });
-readSlides();
diff --git a/apps/primetime/README.md b/apps/primetime/README.md
new file mode 100644
index 000000000..a07c19f52
--- /dev/null
+++ b/apps/primetime/README.md
@@ -0,0 +1,10 @@
+# App Name
+
+Watchface that displays time and the prime factors of the "military time" (i.e. 21:05 => 2105, shows prime factors of 2105 which are 5 & 421). Displays "Prime Time!" if prime. 
+
+![image](https://user-images.githubusercontent.com/115424919/194777279-7f5e4d2a-f475-4099-beaf-38db5b460714.png)
+
+
+## Creator
+
+Adapted from simplestclock by [Eve Bury](https://www.github.com/eveeeon)
diff --git a/apps/primetime/app.png b/apps/primetime/app.png
new file mode 100644
index 000000000..5024727fb
Binary files /dev/null and b/apps/primetime/app.png differ
diff --git a/apps/primetime/metadata.json b/apps/primetime/metadata.json
new file mode 100644
index 000000000..d796d290c
--- /dev/null
+++ b/apps/primetime/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "primetime",
+  "name": "Prime Time Clock",
+  "version": "0.01",  
+  "type": "clock",
+  "description": "A clock that tells you the primes of the time",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],  
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"primetime.app.js","url":"primetime.js"},
+    {"name":"primetime.img","url":"primetime-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/primetime/primetime-icon.js b/apps/primetime/primetime-icon.js
new file mode 100644
index 000000000..57969a68b
--- /dev/null
+++ b/apps/primetime/primetime-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgVVABVADJMBBf4L/Bf4LMgtQgIHCitAqoHBoEv+EHwALBv/S//4BYO//svwELoP//X/+gLB2E93+Ah9B9f+//QBYMVvv3C4XvvwLDl/0q+AgsB998qt4F4XgHYIXB/1+6ALC//93/4F4I7CI4QLBAIMLoF/6ABBBYNVqgBBgprCAIKz0qkAooLHgP8gXvvALH/EL7e4BY+tz/+vovH3PR1++L9YL/BYdVABQ="))
diff --git a/apps/primetime/primetime.js b/apps/primetime/primetime.js
new file mode 100644
index 000000000..bba63bc48
--- /dev/null
+++ b/apps/primetime/primetime.js
@@ -0,0 +1,89 @@
+const h = g.getHeight();
+const w = g.getWidth();
+
+
+
+// creates a list of prime factors of n and outputs them as a string, if n is prime outputs "Prime Time!"
+function primeFactors(n) {
+  const factors = [];
+  let divisor = 2;
+
+  while (n >= 2) {
+    if (n % divisor == 0) {
+      factors.push(divisor);
+      n = n / divisor;
+    } else {
+      divisor++;
+    }
+  }
+  if (factors.length === 1) {
+    return "Prime Time!";
+  }
+  else
+    return factors.toString();
+}
+
+
+// converts time HR:MIN to integer HRMIN e.g. 15:35 => 1535
+function timeToInt(t) {
+    var arr = t.split(':');
+    var intTime = parseInt(arr[0])*100+parseInt(arr[1]);
+
+    return intTime;
+}
+
+
+
+function draw() {
+  var date = new Date();
+  var timeStr = require("locale").time(date,1);
+  var primeStr = primeFactors(timeToInt(timeStr));
+
+  g.reset();
+  g.setColor(0,0,0);
+  g.fillRect(Bangle.appRect);
+
+  g.setFont("6x8", w/30);
+  g.setFontAlign(0, 0);
+  g.setColor(100,100,100);
+  g.drawString(timeStr, w/2, h/2);
+  g.setFont("6x8", w/60);
+  g.drawString(primeStr, w/2, 3*h/4);
+  queueDraw();
+}
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+g.clear();
+
+// Show launcher when middle button pressed
+// Bangle.setUI("clock");
+// use  clockupdown as it tests for issue #1249
+Bangle.setUI("clockupdown", btn=> {
+  draw();
+});
+
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+draw();
diff --git a/apps/primetime/screenshot.png b/apps/primetime/screenshot.png
new file mode 100644
index 000000000..cb625a9b6
Binary files /dev/null and b/apps/primetime/screenshot.png differ
diff --git a/apps/ptlaunch/ChangeLog b/apps/ptlaunch/ChangeLog
index eec3610ed..5871b1fdc 100644
--- a/apps/ptlaunch/ChangeLog
+++ b/apps/ptlaunch/ChangeLog
@@ -6,3 +6,4 @@
 0.12: Improve pattern detection code readability by PaddeK http://forum.espruino.com/profiles/117930/
 0.13: Improve pattern rendering by HughB http://forum.espruino.com/profiles/167235/
 0.14: Update setUI to work with new Bangle.js 2v13 menu style
+0.15: Update to support clocks in custom setUI mode
diff --git a/apps/ptlaunch/boot.js b/apps/ptlaunch/boot.js
index 748d564f3..885962761 100644
--- a/apps/ptlaunch/boot.js
+++ b/apps/ptlaunch/boot.js
@@ -76,13 +76,8 @@
   var sui = Bangle.setUI;
   Bangle.setUI = function (mode, cb) {
     sui(mode, cb);
-    if ("object"==typeof mode) mode = mode.mode;
-    if (!mode) {
-      Bangle.removeListener("drag", dragHandler);
-      storedPatterns = {};
-      return;
-    }
-    if (!mode.startsWith("clock")) {
+    if (typeof mode === "object") mode = (mode.clock ? "clock" : "") + mode.mode;
+    if (!mode || !mode.startsWith("clock")) {
       storedPatterns = {};
       Bangle.removeListener("drag", dragHandler);
       return;
diff --git a/apps/ptlaunch/metadata.json b/apps/ptlaunch/metadata.json
index 0b6dce3d1..6f8a9e16f 100644
--- a/apps/ptlaunch/metadata.json
+++ b/apps/ptlaunch/metadata.json
@@ -2,7 +2,7 @@
   "id": "ptlaunch",
   "name": "Pattern Launcher",
   "shortName": "Pattern Launcher",
-  "version": "0.14",
+  "version": "0.15",
   "description": "Directly launch apps from the clock screen with custom patterns.",
   "icon": "app.png",
   "screenshots": [{"url":"manage_patterns_light.png"}],
diff --git a/apps/quicklaunch/ChangeLog b/apps/quicklaunch/ChangeLog
index ae1d4a848..0ab99632a 100644
--- a/apps/quicklaunch/ChangeLog
+++ b/apps/quicklaunch/ChangeLog
@@ -1,2 +1,4 @@
 0.01: Initial version
 0.02: Moved settings from launcher to settings->apps menu
+0.03: Better performance by not scanning on every boot
+0.04: Better performace by not scanning on boot at all
diff --git a/apps/quicklaunch/boot.js b/apps/quicklaunch/boot.js
index 3670c4776..4ab238293 100644
--- a/apps/quicklaunch/boot.js
+++ b/apps/quicklaunch/boot.js
@@ -1,67 +1,24 @@
-(function() {
-  var settings = Object.assign(require("Storage").readJSON("quicklaunch.json", true) || {});
+{
+  let settings = require("Storage").readJSON("quicklaunch.json", true) || {};
+  const storage = require("Storage");
 
-  //list all sources
-  var apps = require("Storage").list(/\.info$/).map(app=>{var a=require("Storage").readJSON(app,1);return a&&{src:a.src};});
-  
-  //populate empty app list
-      
-  if (!settings.leftapp) {
-    settings["leftapp"] = {"name":"(none)"};
-    require("Storage").write("quicklaunch.json",settings);
-  }
-  if (!settings.rightapp) {
-    settings["rightapp"] = {"name":"(none)"};
-    require("Storage").write("quicklaunch.json",settings);
-  }
-    if (!settings.upapp) {
-    settings["upapp"] = {"name":"(none)"};
-    require("Storage").write("quicklaunch.json",settings);
-  }
-    if (!settings.downapp) {
-    settings["downapp"] = {"name":"(none)"};
-    require("Storage").write("quicklaunch.json",settings);
-  }
-    if (!settings.tapapp) {
-    settings["tapapp"] = {"name":"(none)"};
-    require("Storage").write("quicklaunch.json",settings);
-  }
+  let reset = function(name){
+    if (!settings[name]) settings[name] = {"name":"(none)"};
+    if (!require("Storage").read(settings[name].src)) settings[name] = {"name":"(none)"};
+    storage.write("quicklaunch.json", settings);
+  };
 
-  //activate on clock faces
-  var sui = Bangle.setUI;
-  Bangle.setUI = function(mode, cb) {
-    sui(mode,cb);
-    if(!mode) return;
-    if ("object"==typeof mode) mode = mode.mode;
-    if (!mode.startsWith("clock")) return;
-
-  function tap() {
-    //tap, check if source exists, launch
-    if ((settings.tapapp.src) && apps.some(e => e.src === settings.tapapp.src)) load (settings.tapapp.src);
-  }
-    
-  let drag;
-  let e;
-  
-  Bangle.on("touch",tap);
-  Bangle.on("drag", e => {
-    if (!drag) { // start dragging
-      drag = {x: e.x, y: e.y};
-    } else if (!e.b) { // released
-      const dx = e.x-drag.x, dy = e.y-drag.y;
-      drag = null;
-      //horizontal swipes, check if source exists, launch
-      if (Math.abs(dx)>Math.abs(dy)+10) {
-        if ((settings.leftapp.src) && apps.some(e => e.src === settings.leftapp.src) && dx<0) load(settings.leftapp.src);
-        if ((settings.rightapp.src) && apps.some(e => e.src === settings.rightapp.src) && dx>0) load(settings.rightapp.src);
-      } 
-      //vertical swipes, check if source exists, launch
-      else if (Math.abs(dy)>Math.abs(dx)+10) {
-        if ((settings.upapp.src) && apps.some(e => e.src === settings.upapp.src) && dy<0) load(settings.upapp.src);
-        if ((settings.downapp.src) && apps.some(e => e.src === settings.downapp.src) && dy>0) load(settings.downapp.src);
-      }
-    }
+  Bangle.on("touch", () => {
+    if (!Bangle.CLOCK) return;
+    if (settings.tapapp.src){ if (!storage.read(settings.tapapp.src)) reset("tapapp"); else load(settings.tapapp.src); }
   });
 
-  };
-})();
+  Bangle.on("swipe", (lr,ud) => {
+    if (!Bangle.CLOCK) return;
+
+    if (lr == -1 && settings.leftapp && settings.leftapp.src){ if (!storage.read(settings.leftapp.src)) reset("leftapp"); else load(settings.leftapp.src); }
+    if (lr == 1 && settings.rightapp && settings.rightapp.src){ if (!storage.read(settings.rightapp.src)) reset("rightapp"); else load(settings.rightapp.src); }
+    if (ud == -1 && settings.upapp && settings.upapp.src){ if (!storage.read(settings.upapp.src)) reset("upapp"); else load(settings.upapp.src); }
+    if (ud == 1 && settings.downapp && settings.downapp.src){ if (!storage.read(settings.downapp.src)) reset("downapp"); else load(settings.downapp.src); }
+  });
+}
diff --git a/apps/quicklaunch/metadata.json b/apps/quicklaunch/metadata.json
index 49eafdd35..ccad02c96 100644
--- a/apps/quicklaunch/metadata.json
+++ b/apps/quicklaunch/metadata.json
@@ -2,7 +2,7 @@
   "id": "quicklaunch",
   "name": "Quick Launch",
   "icon": "app.png",
-  "version":"0.02",
+  "version":"0.04",
   "description": "Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. Configurations can be accessed through Settings->Apps.",
   "type": "bootloader",
   "tags": "tools, system",
diff --git a/apps/quicklaunch/settings.js b/apps/quicklaunch/settings.js
index ac4cc5805..7aac60a94 100644
--- a/apps/quicklaunch/settings.js
+++ b/apps/quicklaunch/settings.js
@@ -1,6 +1,10 @@
 (function(back) {
 var settings = Object.assign(require("Storage").readJSON("quicklaunch.json", true) || {});
 
+for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){
+  if (!settings[c]) settings[c] = {"name":"(none)"};
+}
+
 var apps = require("Storage").list(/\.info$/).map(app=>{var a=require("Storage").readJSON(app,1);return a&&{name:a.name,type:a.type,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="launch" || app.type=="clock" || !app.type));
 
 apps.sort((a,b)=>{
@@ -29,11 +33,11 @@ function showMainMenu() {
   mainmenu["Up: "+settings.upapp.name] = function() { E.showMenu(upmenu); };
   mainmenu["Down: "+settings.downapp.name] = function() { E.showMenu(downmenu); };
   mainmenu["Tap: "+settings.tapapp.name] = function() { E.showMenu(tapmenu); };
-  
+
   return E.showMenu(mainmenu);
 }
-  
-//Left swipe menu  
+
+//Left swipe menu
 var leftmenu = {
   "" : { "title" : "Left Swipe" },
   "< Back" : showMainMenu
@@ -119,4 +123,4 @@ apps.forEach((a)=>{
 });
 
 showMainMenu();
-});
\ No newline at end of file
+})
diff --git a/apps/ratchet_launch/metadata.json b/apps/ratchet_launch/metadata.json
index 14ffec34a..45057b0b9 100644
--- a/apps/ratchet_launch/metadata.json
+++ b/apps/ratchet_launch/metadata.json
@@ -11,6 +11,5 @@
   "storage": [
     {"name":"ratchet_launch.app.js","url":"app.js"}
   ],
-  "sortorder": -10,
   "readme":"README.md"
 }
diff --git a/apps/rclock/ChangeLog b/apps/rclock/ChangeLog
index 915fbc5d7..0a86ee3e3 100644
--- a/apps/rclock/ChangeLog
+++ b/apps/rclock/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Changes which circle show minutes and seconds
 0.06: Avoid function wrapper, use setUI for launcher
       Clock face smaller so no longer breaks widgets
+0.07: Tell clock widgets to hide.
diff --git a/apps/rclock/metadata.json b/apps/rclock/metadata.json
index 77a036481..e5478aa6a 100644
--- a/apps/rclock/metadata.json
+++ b/apps/rclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "rclock",
   "name": "Round clock with seconds,  minutes and date",
   "shortName": "Round Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Designed round clock with ticks for minutes and seconds and heart rate indication",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/rclock/rclock.app.js b/apps/rclock/rclock.app.js
index 9c219ab3d..2d6f84dc4 100644
--- a/apps/rclock/rclock.app.js
+++ b/apps/rclock/rclock.app.js
@@ -196,6 +196,9 @@ const drawHR = function () {
   }
 };
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 // clean app screen
 g.clear();
 Bangle.loadWidgets();
@@ -222,5 +225,3 @@ Bangle.on('HRM', function (d) {
 // draw now
 drawClock();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/rebble/ChangeLog b/apps/rebble/ChangeLog
index 4e2e76484..21dd44e77 100644
--- a/apps/rebble/ChangeLog
+++ b/apps/rebble/ChangeLog
@@ -6,4 +6,7 @@
 0.06: Add 12h support and autocycle control
 0.07: added localization, removed deprecated code
 0.08: removed unused font, fix autocycle,  imported suncalc and trimmed, removed pedometer dependency, "tap to cycle" setting
-0.09: fix battery icon size
\ No newline at end of file
+0.09: fix battery icon size
+0.10: Tell clock widgets to hide.
+0.11: fix issue https://github.com/espruino/BangleApps/issues/2128 (#2128) ( settings undefined )
+0.12: implemented widget_utils 
\ No newline at end of file
diff --git a/apps/rebble/metadata.json b/apps/rebble/metadata.json
index ec7650f53..dfc0703c0 100644
--- a/apps/rebble/metadata.json
+++ b/apps/rebble/metadata.json
@@ -2,7 +2,7 @@
   "id": "rebble",
   "name": "Rebble Clock",
   "shortName": "Rebble",
-  "version": "0.09",
+  "version": "0.12",
   "description": "A Pebble style clock, with configurable background, three sidebars including steps, day, date, sunrise, sunset, long live the rebellion",
   "readme": "README.md",
   "icon": "rebble.png",
diff --git a/apps/rebble/rebble.app.js b/apps/rebble/rebble.app.js
index fc91fe0ac..82e4a62d7 100644
--- a/apps/rebble/rebble.app.js
+++ b/apps/rebble/rebble.app.js
@@ -292,19 +292,10 @@ function queueDraw() {
 
 
 log_debug("starting..");
-g.clear();
-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="";}
 loadSettings();
 loadLocation();
 
 
-
 if(settings.autoCycle || settings.sideTap==0)
 {
   Bangle.setUI("clockupdown", btn=> {
@@ -318,6 +309,9 @@ else{
 }
 
 
+Bangle.loadWidgets();
+require("widget_utils").hide();
+
 
 
 draw();  // queues the next draw for a minutes time
@@ -331,4 +325,4 @@ Bangle.on('charging', function(charging) {
       drawSideBar2();
       break;
   }
-});
\ No newline at end of file
+});
diff --git a/apps/recorder/interface.html b/apps/recorder/interface.html
index 8cf339e85..cc9762d20 100644
--- a/apps/recorder/interface.html
+++ b/apps/recorder/interface.html
@@ -12,9 +12,22 @@
     <script>
 var domTracks = document.getElementById("tracks");
 
-function saveKML(track,title) {
+function filterGPSCoordinates(track) {
   // only include data points with GPS values
-  track=track.filter(pt=>pt.Latitude!="" && pt.Longitude!="");
+  var allowNoGPS = localStorage.getItem("recorder-allow-no-gps")=="true";
+  if (!allowNoGPS)
+    return track.filter(pt=>pt.Latitude!="" && pt.Longitude!="");
+  return track.map(pt => {
+    if (!isFinite(parseFloat(pt.Latitude))) pt.Latitude=0;
+    if (!isFinite(parseFloat(pt.Longitude))) pt.Longitude=0;
+    if (!isFinite(parseFloat(pt.Altitude))) pt.Altitude=0;
+    return pt;
+  })
+}
+
+function saveKML(track,title) {
+  // filter out coords with no GPS (or allow, but force to 0)
+  track = filterGPSCoordinates(track);
   // Now output KML
   var kml = `<?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
@@ -81,7 +94,9 @@ function saveGPX(track, title) {
     showToast("Error in trackfile.", "error");
     return;
   }
-
+  // filter out coords with no GPS (or allow, but force to 0)
+  track = filterGPSCoordinates(track);
+  // Output GPX
   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>
@@ -91,7 +106,7 @@ function saveGPX(track, title) {
     <name>${title}</name>
     <trkseg>`;
   track.forEach(pt=>{
-    if (pt.Latitude!="" && pt.Longitude!="") gpx += `
+    gpx += `
       <trkpt lat="${pt.Latitude}" lon="${pt.Longitude}">
         <ele>${pt.Altitude}</ele>
         <time>${pt.Time.toISOString()}</time>
@@ -199,7 +214,9 @@ function getTrackList() {
     // ================================================
     // When 'promise' completes we now have all the info in trackList
     promise.then(() => {
-      var html = `<div class="container">
+      var html = `
+      <div class="container">
+      <h2>Tracks</h2>
       <div class="columns">\n`;
       trackList.forEach(track => {
         console.log("track", track);
@@ -221,10 +238,8 @@ ${trackData.Latitude ? `
              </iframe>
            </div><div class="card-body"></div>` : `<div class="card-body">No GPS info</div>`}
            <div class="card-footer">
-${trackData.Latitude ? `
              <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadkml">Download KML</button>
              <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadgpx">Download GPX</button>
-` : ``}
              <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadcsv">Download CSV</button>
              <button class="btn btn-default" filename="${track.filename}" trackid="${track.number}" task="delete">Delete</button>
            </div>
@@ -242,9 +257,20 @@ ${trackData.Latitude ? `
          `;
         }
         html += `
+        </div><!-- columns -->
+        <h2>Settings</h2>
+        <div class="form-group">
+          <label class="form-switch">
+            <input type="checkbox" id="settings-allow-no-gps" ${(localStorage.getItem("recorder-allow-no-gps")=="true")?"checked":""}>
+            <i class="form-icon"></i> Include GPX/KML entries even when there's no GPS info
+          </label>
         </div>
         </div>`;
         domTracks.innerHTML = html;
+        document.getElementById("settings-allow-no-gps").addEventListener("change",event=>{
+          var allowNoGPS = event.target.checked;
+          localStorage.setItem("recorder-allow-no-gps", allowNoGPS);
+        });
         Util.hideModal();
         var buttons = domTracks.querySelectorAll("button");
         for (var i=0;i<buttons.length;i++) {
diff --git a/apps/rinkulainen/ChangeLog b/apps/rinkulainen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/rinkulainen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/rinkulainen/README.md b/apps/rinkulainen/README.md
new file mode 100644
index 000000000..4b32ada0a
--- /dev/null
+++ b/apps/rinkulainen/README.md
@@ -0,0 +1,14 @@
+# Rinkulainen
+
+By Jukio Kallio
+
+A Minimal & stylish watch face, with rings or disks for hours and minutes. Date underneath. With easy to mod source code for making your own themes. Some example themes included.
+
+![](screenshot2.png) 
+Default Colorful theme
+
+![](screenshot1.png) 
+Grayscale theme
+
+![](screenshot3.png) 
+Maze theme
diff --git a/apps/rinkulainen/app-icon.js b/apps/rinkulainen/app-icon.js
new file mode 100644
index 000000000..0618f7891
--- /dev/null
+++ b/apps/rinkulainen/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEogA0/4AKCpNPCxYAB+gtTGJQuOGBAWPGAwuQGAwXG+chiMRiU/C6HyiDpDgMvC5ItFCoYADGIoXIFoIqDGgUBC5nxB4IoE+YYBj4XLBwJxGJ4IwEC4wuBiYEBmUhiUjAoMxGAgXGmAuCDYIACCYIwBgYXJBYSQGD4IjBC5HyE4QOBgU/+cgEAQ3BTAQXFBQImBN4p/BHARgCC4swCYIaBT4gGDiBgCC4syQ4JVENIsggTvKBgYHG+BRCC5KdDWIYXOiEPC4oUCC8hHUmTJBO44XMCgSnH+SnLa5IABfILXJCgINBgA9CAAnzEIYXF+QKCJAMCn/zkQXCEgJtBR479CEwIADCQRpEC4wLBJAInBAAQ3BD4KxDC4wTBiatCkMSkYFBmKAEa48QGAR1GP4gXHGAMBDAnzEAKvEC44wCgJzC+QGCBwgXIRwoACJ4oXDp4JEFQQACGgYAC+gXJGIMhiMRiR9GC5YALC4hgFABgWEGCIuFGCIWGGB4uHGJwVJAFY"))
diff --git a/apps/rinkulainen/app.js b/apps/rinkulainen/app.js
new file mode 100644
index 000000000..b487c9a0d
--- /dev/null
+++ b/apps/rinkulainen/app.js
@@ -0,0 +1,146 @@
+// Rinkulainen
+//
+// Bangle.js 2 watch face
+// by Jukio Kallio
+// www.jukiokallio.com
+
+// settings
+const watch = { 
+  theme: "default", 
+  x:0, y:0, w:0, h:0, 
+  color:"#000000", // change background color
+  finland:true, // change if you want Finnish style date, or US style
+  
+    // default theme "colorful"
+    hour: { size:60, weight:8, color:"#00FFFF", cursor:10 },
+    minute: { size:40, weight:16, color:"#FFFF00", cursor:6 },
+    second: { on: false, cursor:2 }, // if on, uses a lot more battery
+    date: { font:"6x8", size:1, y:15, color:"#FFFF00" }
+};
+
+// more themes
+if (watch.theme == "grayscale") {
+  watch.hour = { size:60, weight:20, color:"#999999", cursor:8 };
+  watch.minute = { size:40, weight:20, color:"#dddddd", cursor:8 };
+  watch.second = { on: false, cursor:2 }; // if on, uses a lot more battery
+  watch.date = { font:"6x8", size:1, y:15, color:"#ffffff" };
+} else if (watch.theme == "maze") {
+  watch.hour = { size:50, weight:7, color:"#ffffff", cursor:6 };
+  watch.minute = { size:30, weight:7, color:"#ffffff", cursor:6 };
+  watch.second = { on: false, cursor:2 }; // if on, uses a lot more battery
+  watch.date = { font:"6x8", size:1, y:15, color:"#ffffff" };
+} else if (watch.theme == "disks") {
+  watch.hour = { size:72, weight:30, color:"#00ff66", cursor:4 };
+  watch.minute = { size:36, weight:32, color:"#0066ff", cursor:4 };
+  watch.second = { on: false, cursor:2 }; // if on, uses a lot more battery
+  watch.date = { font:"6x8", size:1, y:10, color:"#ffffff" };
+}
+
+// set some additional settings
+watch.w = g.getWidth(); // size of the background
+watch.h = g.getHeight();
+watch.x = watch.w * 0.5; // position of the circles
+watch.y = watch.h * 0.46;
+watch.date.y = watch.date.y + watch.y + watch.hour.size; // final position of the date
+
+const dateWeekday = { 0: "Sunday", 1: "Monday", 2: "Tuesday", 3: "Wednesday", 4:"Thursday", 5:"Friday", 6:"Saturday" }; // weekdays
+
+var wait = 60000; // wait time, normally a minute
+if (watch.second.on) wait = 1000; // a second if seconds are used
+
+
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, wait - (Date.now() % wait));
+}
+
+
+// main function
+function draw() {
+  // make date object
+  var date = new Date();
+  
+  // work out the date string
+  var dateDay = date.getDate();
+  var dateMonth = date.getMonth() + 1;
+  var dateYear = date.getFullYear();
+  var dateStr = dateWeekday[date.getDay()] + " " + dateMonth + "." + dateDay + "." + dateYear;
+  if (watch.finland) dateStr = dateWeekday[date.getDay()] + " " + dateDay + "." + dateMonth + "." + dateYear; // the true way of showing date
+
+  // Reset the state of the graphics library
+  g.reset();
+  
+  // Clear the area where we want to draw the time
+  g.setColor(watch.color);
+  g.fillRect(0, 0, watch.w, watch.h);
+  
+  // variables for vertex transformation
+  var tver, tobj, tran;
+  
+  // draw hour circle
+  g.setColor(watch.hour.color).fillCircle(watch.x, watch.y, watch.hour.size);
+  g.setColor(watch.color).fillCircle(watch.x, watch.y, watch.hour.size - watch.hour.weight);
+  // draw hour line
+  g.setColor(watch.color);
+  var thour = (date.getHours() / 12) * (Math.PI * 2);
+  tver = [-watch.hour.cursor, 0, watch.hour.cursor, 0, watch.hour.cursor, -watch.hour.size*1.05, -watch.hour.cursor, -watch.hour.size*1.05];
+  tobj = { x:watch.x, y:watch.y, scale:1, rotate:thour };
+  tran = g.transformVertices(tver, tobj);
+  g.fillPoly(tran);
+  
+  // draw minute circle
+  g.setColor(watch.minute.color).fillCircle(watch.x, watch.y, watch.minute.size);
+  g.setColor(watch.color).fillCircle(watch.x, watch.y, watch.minute.size - watch.minute.weight);
+  // draw minute line
+  g.setColor(watch.color);
+  var tmin = (date.getMinutes() / 60) * (Math.PI * 2);
+  tver = [-watch.minute.cursor, 0, watch.minute.cursor, 0, watch.minute.cursor, -watch.minute.size*1.05, -watch.minute.cursor, -watch.minute.size*1.05];
+  tobj = { x:watch.x, y:watch.y, scale:1, rotate:tmin };
+  tran = g.transformVertices(tver, tobj);
+  g.fillPoly(tran);
+  
+  // draw seconds line, if the feature is on
+  if (watch.second.on) {
+    g.setColor(watch.color);
+    var tsec = (date.getSeconds() / 60) * (Math.PI * 2);
+    tver = [-watch.second.cursor, 0, watch.second.cursor, 0, watch.second.cursor, -watch.second.size*1.045, -watch.second.cursor, -watch.second.size*1.045];
+    tobj = { x:watch.x, y:watch.y, scale:1, rotate:tsec };
+    tran = g.transformVertices(tver, tobj);
+    g.fillPoly(tran);
+  }
+  
+  // draw date
+  g.setFontAlign(0,0).setFont(watch.date.font, 1).setColor(watch.date.color);
+  g.drawString(dateStr, watch.x, watch.date.y + watch.date.size + 2);
+  
+  // queue draw
+  queueDraw();
+}
+
+
+// Clear the screen once, at startup
+g.clear();
+// draw immediately at first
+draw();
+
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
diff --git a/apps/rinkulainen/app.png b/apps/rinkulainen/app.png
new file mode 100644
index 000000000..50782c48d
Binary files /dev/null and b/apps/rinkulainen/app.png differ
diff --git a/apps/rinkulainen/metadata.json b/apps/rinkulainen/metadata.json
new file mode 100644
index 000000000..f0a51af87
--- /dev/null
+++ b/apps/rinkulainen/metadata.json
@@ -0,0 +1,16 @@
+{ "id": "rinkulainen",
+  "name": "Rinkulainen - Minimal & Stylish watch face",
+  "shortName":"Rinkulainen",
+  "version":"0.01",
+  "description": "A minimal watch face, with rings/disks for hours and minutes. Date underneath. With easy to mod source code for making your own themes. Some example themes included.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot2.png"}, {"url":"screenshot1.png"}, {"url":"screenshot3.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS","BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"rinkulainen.app.js","url":"app.js"},
+    {"name":"rinkulainen.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/rinkulainen/screenshot1.png b/apps/rinkulainen/screenshot1.png
new file mode 100644
index 000000000..f897c5a4e
Binary files /dev/null and b/apps/rinkulainen/screenshot1.png differ
diff --git a/apps/rinkulainen/screenshot2.png b/apps/rinkulainen/screenshot2.png
new file mode 100644
index 000000000..354618167
Binary files /dev/null and b/apps/rinkulainen/screenshot2.png differ
diff --git a/apps/rinkulainen/screenshot3.png b/apps/rinkulainen/screenshot3.png
new file mode 100644
index 000000000..ef1385288
Binary files /dev/null and b/apps/rinkulainen/screenshot3.png differ
diff --git a/apps/rolex/ChangeLog b/apps/rolex/ChangeLog
index a1e2cee0a..447b084f6 100644
--- a/apps/rolex/ChangeLog
+++ b/apps/rolex/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Minor tweaks for light theme
 0.03: Made images 2 bit and fixed theme honoring
 0.04: Fixed date font alignment and changed date font to match a real Rolex
+0.05: Tell clock widget to hide.
diff --git a/apps/rolex/app.js b/apps/rolex/app.js
index 124cb6fee..fe9e534d6 100644
--- a/apps/rolex/app.js
+++ b/apps/rolex/app.js
@@ -44,7 +44,9 @@ let cx = W/2;
 let cy = H/2;
 let Timeout;
 
-Bangle.loadWidgets();
+Bangle.setUI("clock");
+// load widgets after 'setUI' so they're aware there is a clock active
+Bangle.loadWidgets(); 
 
 /* Custom version of Bangle.drawWidgets (does not clear the widget areas) Thanks to rozek */
 
@@ -142,8 +144,4 @@ Bangle.on('lcdPower', (on) => {
     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
+displayRefresh();
diff --git a/apps/rolex/metadata.json b/apps/rolex/metadata.json
index f307e60c4..e8627246c 100644
--- a/apps/rolex/metadata.json
+++ b/apps/rolex/metadata.json
@@ -3,7 +3,7 @@
     "shortName":"rolex",
     "icon": "rolex.png",
     "screenshots": [{"url":"screenshot1.png"}],
-    "version":"0.04",
+    "version":"0.05",
     "description": "A rolex like watch face",
     "tags": "clock",
     "type": "clock",
diff --git a/apps/route/ChangeLog b/apps/route/ChangeLog
index f8c97a57b..2c66bf30a 100644
--- a/apps/route/ChangeLog
+++ b/apps/route/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Change color from red->yellow to ease readability (fix #710)
 0.03: Color/positioning change to allow it to work with Bangle.js 1 (although not pretty)
+0.04: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/route/custom.html b/apps/route/custom.html
index fd3148e2b..9e721a95b 100644
--- a/apps/route/custom.html
+++ b/apps/route/custom.html
@@ -231,7 +231,7 @@ document.getElementById("upload").addEventListener("click", function() {
     if (!Bangle.isLCDOn()) return;
 
     arrow(oldHeading,g.theme.bg);
-    var heading = m.heading + nextAngle;
+    var heading = (360-m.heading) + nextAngle;
     arrow(heading,"#f00");
     oldHeading = heading;
   }
diff --git a/apps/route/metadata.json b/apps/route/metadata.json
index dc980dada..0738f682f 100644
--- a/apps/route/metadata.json
+++ b/apps/route/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "route",
   "name": "Route Viewer",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Upload a KML file of a route, and have your watch display a map with how far around it you are",
   "icon": "app.png",
   "tags": "",
diff --git a/apps/saclock/app-icon.js b/apps/saclock/app-icon.js
new file mode 100644
index 000000000..0a8a06644
--- /dev/null
+++ b/apps/saclock/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwIFCn/8AgUB///wAFBh4FB8AFBj4FB/AFBv4FBDAX/4ED/wcB/0DwH/gED/EH4E/wEH+AFBj/Ah/gAoMH8EPAYIeB+EfCYPAgPwn8AAoX4nwFCgAFFvl8ApN+Aok+KoIFOjwFEj4FCOwIFD+AFEOwIFCgZwBAoR/BwAjCRYPAF4QPBAogwBnxNBSQOAAoYABvl+AohxBAAX8QYIAC/CPBDwQFETYKhBGASrBagSxBX4JCDgLUCv4bBK4LxBBAS8BboMAn7vEfYR+BOwTxBIgX/CwRqDAYIA=="))
\ No newline at end of file
diff --git a/apps/saclock/app-icon.png b/apps/saclock/app-icon.png
new file mode 100644
index 000000000..d55dcf598
Binary files /dev/null and b/apps/saclock/app-icon.png differ
diff --git a/apps/saclock/app.js b/apps/saclock/app.js
new file mode 100644
index 000000000..3bac66211
--- /dev/null
+++ b/apps/saclock/app.js
@@ -0,0 +1,88 @@
+Math.TAU = Math.PI*2; // the real circle constant
+
+/**
+ * Rotate points around origin
+ *
+ * @param points List of coordinates: [x1,y1, x2,y2, ...]
+ * @param radians Angle by which to rotate
+ */
+function rotate(points, radians) {
+  for(let i = 0; i<points.length; i += 2) {
+    const x = points[i], y = points[i+1];
+    points[i] = x*Math.cos(radians)-y*Math.sin(radians);
+    points[i+1] = y*Math.cos(radians)+x*Math.sin(radians);
+  }
+}
+/**
+ * Move points
+ *
+ * @param points List of coordinates: [x1,y1, x2,y2, ...]
+ * @param x Horizontal offset
+ * @param y Vertical offset
+ */
+function move(points, x, y) {
+  for(let i = 0; i<points.length; i += 2) {
+    points[i] = points[i]+x;
+    points[i+1] = points[i+1]+y;
+  }
+}
+
+let clock = new (require("ClockFace"))({
+  settingsFile: "saclock.settings.json",
+  init: function() {
+    // create a graphics buffer, and pre-draw the outer ring
+    const bs = Math.min(Bangle.appRect.w, Bangle.appRect.h); // buffer size
+    this.r = Math.min(Bangle.appRect.w, Bangle.appRect.h)/2; // outer radius
+    this.buffer = Graphics.createArrayBuffer(bs, bs, 1, {msb: true});
+    let buf = this.buffer;
+    buf.fillCircle(this.r, this.r, this.r); // only fill this once: we only draw inside the inner ring
+  },
+  update: function(time) {
+    // clear the inner circle, and draw
+    const
+      r = this.r, // outer radius
+      c = r, // Center of buffer: the buffer is 2r x 2r, so the center is at (r,r)
+      r2 = 0.8*r, // inner radius
+      hw = (r-r2)/2, // *half* the hand width (we never use the full width)
+      hl = 0.5*r2, // hour hand length
+      hr = ((time.getHours()%12)+(time.getMinutes()/60))/12*Math.TAU, // hour hand rotation
+      ml = 0.8*r2, // minute hand length
+      mr = time.getMinutes()/60*Math.TAU, // minute hand rotation
+      x = Math.floor((Bangle.appRect.x+Bangle.appRect.x2)/2), // "real" clock center, only
+      y = Math.floor((Bangle.appRect.y+Bangle.appRect.y2)/2); // used for drawing buffer
+    let buf = this.buffer;
+
+    function drawHand(length, radians) {
+      let hand = [ // just a rectangle
+        0-hw, 0,
+        0-hw, 0-length,
+        0, 0-length, // extra point at the middle of the line: draw the tip here
+        hw, 0-length,
+        hw, 0,
+      ];
+      rotate(hand, radians);
+      move(hand, c, c);
+      buf.fillPolyAA(hand);
+      buf.fillCircle(hand[4], hand[5], hw); // the tip
+    }
+
+    buf.setColor(g.theme.bg).fillCircle(c, c, r2); // clear inside
+    buf.setColor(g.theme.fg);
+    drawHand(hl, hr); // hour hand
+    drawHand(ml, mr); // minute hand
+    buf.fillCircle(c, c, Math.floor(hw)); // hands joiner
+    g.drawImage({
+      width: buf.getWidth(), height: buf.getHeight(),
+      buffer: buf.buffer
+    }, x, y, {rotate: 0}); // setting `rotate` centers the image on x,y
+  },
+});
+clock.start();
+
+// for debugging/screenshots
+clock.test = function(hours, minutes) {
+  this.draw({
+    getHours: () => hours,
+    getMinutes: () => minutes,
+  });
+};
diff --git a/apps/saclock/icon.png b/apps/saclock/icon.png
new file mode 100644
index 000000000..664a40bfb
Binary files /dev/null and b/apps/saclock/icon.png differ
diff --git a/apps/saclock/metadata.json b/apps/saclock/metadata.json
new file mode 100644
index 000000000..558e28066
--- /dev/null
+++ b/apps/saclock/metadata.json
@@ -0,0 +1,20 @@
+{ "id": "saclock",
+  "name": "Simple analog clock",
+  "shortName":"Analog clock",
+  "version":"0.01",
+  "description": "A very basic analog clock",
+  "screenshots": [{"url":"screenshot.png"}],
+  "icon": "icon.png",
+  "type": "clock",
+  "tags": "clock,analog",
+  "supports" : ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator":true,
+  "storage": [
+    {"name":"saclock.app.js","url":"app.js"},
+    {"name":"saclock.settings.js","url":"settings.js"},
+    {"name":"saclock.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [
+    {"name": "saclock.settings.json"}
+  ]
+}
diff --git a/apps/saclock/screenshot.png b/apps/saclock/screenshot.png
new file mode 100644
index 000000000..595b032dd
Binary files /dev/null and b/apps/saclock/screenshot.png differ
diff --git a/apps/saclock/settings.js b/apps/saclock/settings.js
new file mode 100644
index 000000000..3b98f6a13
--- /dev/null
+++ b/apps/saclock/settings.js
@@ -0,0 +1,10 @@
+(function(back) {
+  let menu = {
+    "": {"title": /*LANG*/"Analog Clock"},
+    /*LANG*/"< Back": back,
+  };
+  require("ClockFace_menu").addSettingsFile(menu, "saclock.settings.json", [
+    "loadWidgets"
+  ]);
+  E.showMenu(menu);
+});
diff --git a/apps/sched/README.md b/apps/sched/README.md
index 8a7d1fc21..c874b5577 100644
--- a/apps/sched/README.md
+++ b/apps/sched/README.md
@@ -70,11 +70,21 @@ let alarm = require("sched").newDefaultAlarm();
 // Get a new timer with default values
 let timer = require("sched").newDefaultTimer();
 
-// Add/update an existing alarm
-require("sched").setAlarm("mytimer", {
+// Add/update an existing alarm (using fields from the object shown above)
+require("sched").setAlarm("mytimer", { // as a timer
   msg : "Wake up",
   timer : 10 * 60 * 1000 // 10 minutes
 });
+require("sched").setAlarm("myalarm", { // as an alarm
+  msg : "Wake up",
+  t : 9 * 3600000 // 9 o'clock (in ms)
+});
+require("sched").setAlarm("mydayalarm", { // as an alarm on a date
+  msg : "Wake up",
+  date : "2022-04-04",
+  t : 9 * 3600000 // 9 o'clock (in ms)
+});
+
 // Ensure the widget and alarm timer updates to schedule the new alarm properly
 require("sched").reload();
 
diff --git a/apps/seiko-5actus/ChangeLog b/apps/seiko-5actus/ChangeLog
index 978e5d6ea..7d8a35194 100644
--- a/apps/seiko-5actus/ChangeLog
+++ b/apps/seiko-5actus/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial Release
 0.02: Shrink hand images to save memory
+0.03: Tell clock widgets to hide.
diff --git a/apps/seiko-5actus/app.js b/apps/seiko-5actus/app.js
index 078b6e5c2..7d5e34f7c 100644
--- a/apps/seiko-5actus/app.js
+++ b/apps/seiko-5actus/app.js
@@ -52,7 +52,9 @@ let cx = W/2;
 let cy = H/2;
 let Timeout;
 
-Bangle.loadWidgets();
+Bangle.setUI("clock");
+// load widgets after 'setUI' so they're aware there is a clock active
+Bangle.loadWidgets(); 
 
 /* Custom version of Bangle.drawWidgets (does not clear the widget areas) Thanks to rozek */
 
@@ -175,7 +177,4 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
-Bangle.setUI("clock");
-// load widgets after 'setUI' so they're aware there is a clock active
-Bangle.loadWidgets(); 
 displayRefresh();
diff --git a/apps/seiko-5actus/metadata.json b/apps/seiko-5actus/metadata.json
index 33de8213b..addd8cb70 100644
--- a/apps/seiko-5actus/metadata.json
+++ b/apps/seiko-5actus/metadata.json
@@ -3,7 +3,7 @@
     "shortName":"5actus",
     "icon": "seiko-5actus.png",
     "screenshots": [{"url":"screenshot.png"}],
-    "version":"0.02",
+    "version":"0.03",
     "description": "A watch designed after then Seiko 5actus from the 1970's",
     "tags": "clock",
     "type": "clock",
diff --git a/apps/sensortools/ChangeLog b/apps/sensortools/ChangeLog
new file mode 100644
index 000000000..eb1ab5cbc
--- /dev/null
+++ b/apps/sensortools/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Less time used during boot if disabled
diff --git a/apps/sensortools/README.md b/apps/sensortools/README.md
new file mode 100644
index 000000000..8b89add7c
--- /dev/null
+++ b/apps/sensortools/README.md
@@ -0,0 +1,44 @@
+# Sensor tools
+
+This allows to simulate sensor behaviour for development purposes
+
+
+## Per Sensor settings:
+
+enabled:
+  true or false
+mode:
+  emulate: Completely craft events for this sensor
+  modify: Take existing events from real sensor and modify their data
+name:
+  name of the emulation or modification mode
+power:
+  emulate: Simulate Bangle._PWR changes, but do not call real power function
+  nop: Do nothing, ignore all power calls for this sensor but return true
+  passthrough: Just pass all power calls unmodified
+  on: Do not allow switching the sensor off, all calls are switching the real sensor on
+
+### HRM
+
+Modes: modify, emulate
+Modification:
+  bpmtrippled: Multiply the bpm value of the original HRM values with 3
+Emulation:
+  sin: Calculate bpm changes by using sin
+
+### GPS
+
+Modes: emulate
+Emulation:
+  staticfix: static complete fix with all values
+  route: A square route starting in the SW corner and moving SW->NW->NO->SW...
+  routeFuzzy: Roughly the same square as route, but with 100m seqments with some variaton in course
+  nofix: All values NaN but time,sattelites,fix and fix == 0
+  changingfix: A fix with randomly changing values
+
+### Compass
+
+Modes: emulate
+Emulation:
+  static: All values but heading are 1, heading == 0
+  rotate: All values but heading are 1, heading rotates 360°
diff --git a/apps/sensortools/boot.js b/apps/sensortools/boot.js
new file mode 100644
index 000000000..fa210f1a0
--- /dev/null
+++ b/apps/sensortools/boot.js
@@ -0,0 +1 @@
+if ((require('Storage').readJSON("sensortools.json", true) || {}).enabled) require("sensortools").enable();
diff --git a/apps/sensortools/default.json b/apps/sensortools/default.json
new file mode 100644
index 000000000..a85e1ddeb
--- /dev/null
+++ b/apps/sensortools/default.json
@@ -0,0 +1,18 @@
+{
+  "enabled": false,
+  "mag": {
+    "enabled": false,
+    "mode": "emulate",
+    "name": "static"
+  },
+  "hrm": {
+    "enabled": false,
+    "mode": "modify",
+    "name": "bpmtrippled"
+  },
+  "gps": {
+    "enabled": false,
+    "mode": "emulate",
+    "name": "changingfix"
+  }
+}
diff --git a/apps/sensortools/icon.png b/apps/sensortools/icon.png
new file mode 100644
index 000000000..b7b5ec9ea
Binary files /dev/null and b/apps/sensortools/icon.png differ
diff --git a/apps/sensortools/lib.js b/apps/sensortools/lib.js
new file mode 100644
index 000000000..460245c2f
--- /dev/null
+++ b/apps/sensortools/lib.js
@@ -0,0 +1,348 @@
+exports.enable = () => {
+  let settings = Object.assign(
+    require('Storage').readJSON("sensortools.default.json", true) || {},
+    require('Storage').readJSON("sensortools.json", true) || {}
+  );
+
+  let log = function(text, param) {
+    let logline = new Date().toISOString() + " - " + "Sensortools - " + text;
+    if (param) logline += ": " + JSON.stringify(param);
+    print(logline);
+  };
+  
+  log("Enabled");
+  const POWER_DELAY = 10000;
+
+  let onEvents = [];
+
+  Bangle.sensortoolsOrigOn = Bangle.on;
+  Bangle.sensortoolsOrigEmit = Bangle.emit;
+  Bangle.sensortoolsOrigRemoveListener = Bangle.removeListener;
+
+  Bangle.on = function(name, callback) {
+    if (onEvents[name]) {
+      log("Redirecting listener for", name, "to", name + "_mod");
+      Bangle.sensortoolsOrigOn(name + "_mod", callback);
+      Bangle.sensortoolsOrigOn(name, (e) => {
+        log("Redirected event for", name, "to", name + "_mod");
+        Bangle.sensortoolsOrigEmit(name + "_mod", onEvents[name](e));
+      });
+    } else {
+      log("Pass through on call for", name, callback);
+      Bangle.sensortoolsOrigOn(name, callback);
+    }
+  };
+
+  Bangle.removeListener = function(name, callback) {
+    if (onEvents[name]) {
+      log("Removing augmented listener for", name, onEvents[name]);
+      Bangle.sensortoolsOrigRemoveListener(name + "_mod", callback);
+    } else {
+      log("Pass through remove listener for", name);
+      Bangle.sensortoolsOrigRemoveListener(name, callback);
+    }
+  };
+
+  Bangle.emit = function(name, event) {
+    if (onEvents[name]) {
+      log("Augmenting emit call for", name, onEvents[name]);
+      Bangle.sensortoolsOrigEmit(name + "_mod", event);
+    } else {
+      log("Pass through emit call for", name);
+      Bangle.sensortoolsOrigEmit(name, event);
+    }
+  };
+
+  let createPowerFunction = function(type, name, origPower) {
+    return function(isOn, app) {
+      if (type == "nop") {
+        return true;
+      }else if (type == "delay") {
+        setTimeout(() => {
+          origPower(isOn, app);
+        }, POWER_DELAY);
+      } else if (type == "on") {
+        origPower(1, "sensortools_force_on");
+      } else if (type == "passthrough"){
+        origPower(isOn, "app");
+      } else if (type == "emulate"){
+        if (!Bangle._PWR) Bangle._PWR={};
+        if (!Bangle._PWR[name]) Bangle._PWR[name] = [];
+        if (!app) app="?";
+        if (isOn) {
+          Bangle._PWR[name].push(app);
+          return true;
+        } else {
+          Bangle._PWR[name] = Bangle._PWR[name].filter((v)=>{return v == app;});
+          return false;
+        }
+      }
+    };
+  };
+
+  if (settings.hrm && settings.hrm.enabled) {
+    log("HRM", settings.hrm);
+    if (settings.hrm.power) {
+      log("HRM power");
+      Bangle.sensortoolsOrigSetHRMPower = Bangle.setHRMPower;
+      Bangle.setHRMPower = createPowerFunction(settings.hrm.power, "HRM", Bangle.sensortoolsOrigSetHRMPower);
+    }
+    if (settings.hrm.mode == "modify") {
+      if (settings.hrm.name == "bpmtrippled") {
+        onEvents.HRM = (e) => {
+          return {
+            bpm: e.bpm * 3
+          };
+        };
+      }
+    } else if (settings.hrm.mode == "emulate") {
+      if (settings.hrm.name == "sin") {
+        setInterval(() => {
+          Bangle.sensortoolsOrigEmit(60 + 3 * Math.sin(Date.now() / 10000));
+        }, 1000);
+      }
+    }
+  }
+  if (settings.gps && settings.gps.enabled) {
+    log("GPS", settings.gps);
+    let modGps = function(dataProvider) {
+      Bangle.getGPSFix = dataProvider;
+      setInterval(() => {
+        Bangle.sensortoolsOrigEmit("GPS", dataProvider());
+      }, 1000);
+    };
+    if (settings.gps.power) {
+      Bangle.sensortoolsOrigSetGPSPower = Bangle.setGPSPower;
+      Bangle.setGPSPower = createPowerFunction(settings.gps.power, "GPS", Bangle.sensortoolsOrigSetGPSPower);
+    }
+    if (settings.gps.mode == "emulate") {
+          function radians(a) {
+            return a*Math.PI/180;
+          }
+
+          function degrees(a) {
+            let d = a*180/Math.PI;
+            return (d+360)%360;
+          }
+
+          function bearing(a,b){
+            if (!a || !b || !a.lon || !a.lat || !b.lon || !b.lat) return Infinity;
+            let delta = radians(b.lon-a.lon);
+            let alat = radians(a.lat);
+            let blat = radians(b.lat);
+            let y = Math.sin(delta) * Math.cos(blat);
+            let x = Math.cos(alat)*Math.sin(blat) -
+                  Math.sin(alat)*Math.cos(blat)*Math.cos(delta);
+            return Math.round(degrees(Math.atan2(y, x)));
+          }
+      
+          function interpolate(a,b,progress){
+            return {
+              lat: a.lat * progress + b.lat * (1-progress),
+              lon: a.lon * progress + b.lon * (1-progress),
+              ele: a.ele * progress + b.ele * (1-progress)
+            }
+          }
+          
+          function getSquareRoute(){
+            return [
+              {lat:"47.2577411",lon:"11.9927442",ele:2273},
+              {lat:"47.266761",lon:"11.9926673",ele:2166},
+              {lat:"47.2667605",lon:"12.0059511",ele:2245},
+              {lat:"47.2577516",lon:"12.0059925",ele:1994}
+            ];
+          }
+          function getSquareRouteFuzzy(){
+            return [
+              {lat:"47.2578455",lon:"11.9929891",ele:2265},
+              {lat:"47.258592",lon:"11.9923341",ele:2256},
+              {lat:"47.2594506",lon:"11.9927412",ele:2230},
+              {lat:"47.2603323",lon:"11.9924949",ele:2219},
+              {lat:"47.2612056",lon:"11.9928175",ele:2199},
+              {lat:"47.2621002",lon:"11.9929817",ele:2182},
+              {lat:"47.2629025",lon:"11.9923915",ele:2189},
+              {lat:"47.2637828",lon:"11.9926486",ele:2180},
+              {lat:"47.2646733",lon:"11.9928167",ele:2191},
+              {lat:"47.2655617",lon:"11.9930357",ele:2185},
+              {lat:"47.2662862",lon:"11.992252",ele:2186},
+              {lat:"47.2669305",lon:"11.993173",ele:2166},
+              {lat:"47.266666",lon:"11.9944419",ele:2171},
+              {lat:"47.2667579",lon:"11.99576",ele:2194},
+              {lat:"47.2669409",lon:"11.9970579",ele:2207},
+              {lat:"47.2666562",lon:"11.9983128",ele:2212},
+              {lat:"47.2666027",lon:"11.9996335",ele:2262},
+              {lat:"47.2667245",lon:"12.0009395",ele:2278},
+              {lat:"47.2668457",lon:"12.002256",ele:2297},
+              {lat:"47.2666126",lon:"12.0035373",ele:2303},
+              {lat:"47.2664554",lon:"12.004841",ele:2251},
+              {lat:"47.2669461",lon:"12.005948",ele:2245},
+              {lat:"47.2660877",lon:"12.006323",ele:2195},
+              {lat:"47.2652729",lon:"12.0057552",ele:2163},
+              {lat:"47.2643926",lon:"12.0060123",ele:2131},
+              {lat:"47.2634978",lon:"12.0058302",ele:2095},
+              {lat:"47.2626129",lon:"12.0060759",ele:2066},
+              {lat:"47.2617325",lon:"12.0058188",ele:2037},
+              {lat:"47.2608668",lon:"12.0061784",ele:1993},
+              {lat:"47.2600155",lon:"12.0057392",ele:1967},
+              {lat:"47.2591203",lon:"12.0058233",ele:1949},
+              {lat:"47.2582307",lon:"12.0059718",ele:1972},
+              {lat:"47.2578014",lon:"12.004804",ele:2011},
+              {lat:"47.2577232",lon:"12.0034834",ele:2044},
+              {lat:"47.257745",lon:"12.0021656",ele:2061},
+              {lat:"47.2578682",lon:"12.0008597",ele:2065},
+              {lat:"47.2577082",lon:"11.9995526",ele:2071},
+              {lat:"47.2575917",lon:"11.9982348",ele:2102},
+              {lat:"47.2577401",lon:"11.996924",ele:2147},
+              {lat:"47.257715",lon:"11.9956061",ele:2197},
+              {lat:"47.2578996",lon:"11.9943081",ele:2228}
+            ];
+          }
+      
+      if (settings.gps.name == "staticfix") {
+        modGps(() => { return {
+          "lat": 52,
+          "lon": 8,
+          "alt": 100,
+          "speed": 10,
+          "course": 12,
+          "time": Date.now(),
+          "satellites": 7,
+          "fix": 1,
+          "hdop": 1
+        };});
+      } else if (settings.gps.name.includes("route")) {
+        let route;
+        let interpSteps;
+        if (settings.gps.name == "routeFuzzy"){
+          route = getSquareRouteFuzzy();
+          interpSteps = 5;
+        } else {
+          route = getSquareRoute();
+          interpSteps = 50;
+        }
+
+        let step = 0;
+        let routeIndex = 0;
+        modGps(() => {
+          let newIndex = (routeIndex + 1)%route.length;
+          
+          let result = {
+            "speed": Math.random() * 3 + 2,
+            "time": Date.now(),
+            "satellites": Math.floor(Math.random()*5)+3,
+            "fix": 1,
+            "hdop": Math.floor(Math.random(30)+1)
+          };
+          
+          let oldPos = route[routeIndex];
+          if (step != 0){
+            oldPos = interpolate(route[routeIndex], route[newIndex], E.clip(0,1,step/interpSteps));
+          }
+          let newPos = route[newIndex];
+          if (step < interpSteps - 1){
+            newPos = interpolate(route[routeIndex], route[newIndex], E.clip(0,1,(step+1)%interpSteps/interpSteps));
+          }
+
+          if (step == interpSteps - 1){
+            let followingIndex = (routeIndex + 2)%route.length;
+            newPos = interpolate(route[newIndex], route[followingIndex], E.clip(0,1,1/interpSteps));
+          }
+          
+          result.lat = oldPos.lat;
+          result.lon = oldPos.lon;
+          result.alt = oldPos.ele;
+          
+          result.course = bearing(oldPos,newPos);
+          
+          step++;
+          if (step == interpSteps){
+            routeIndex = (routeIndex + 1) % route.length;
+            step = 0;
+          }
+          return result;
+        });
+      } else if (settings.gps.name == "nofix") {
+        modGps(() => { return {
+          "lat": NaN,
+          "lon": NaN,
+          "alt": NaN,
+          "speed": NaN,
+          "course": NaN,
+          "time": Date.now(),
+          "satellites": 2,
+          "fix": 0,
+          "hdop": NaN
+        };});
+      } else if (settings.gps.name == "changingfix") {
+        let currentSpeed=1;
+        let currentLat=20;
+        let currentLon=10;
+        let currentCourse=10;
+        let currentAlt=-100;
+        let currentSats=5;
+        modGps(() => {
+          currentLat += 0.1;
+          if (currentLat > 50) currentLat = 20;
+          currentLon += 0.1;
+          if (currentLon > 20) currentLon = 10;
+          currentSpeed *= 10;
+          if (currentSpeed > 1000) currentSpeed = 1;
+          currentCourse += 12;
+          if (currentCourse > 360) currentCourse -= 360;
+          currentSats += 1;
+          if (currentSats > 10) currentSats = 5;
+          currentAlt *= 10;
+          if (currentAlt > 1000) currentAlt = -100;
+          return {
+          "lat": currentLat,
+          "lon": currentLon,
+          "alt": currentAlt,
+          "speed": currentSpeed,
+          "course": currentCourse,
+          "time": Date.now(),
+          "satellites": currentSats,
+          "fix": 1,
+          "hdop": 1
+        };});
+      }
+    }
+  }
+
+  if (settings.mag && settings.mag.enabled) {
+    log("MAG", settings.mag);
+    let modMag = function(data) {
+      setInterval(() => {
+        Bangle.getCompass = data;
+        Bangle.sensortoolsOrigEmit("mag", data());
+      }, 100);
+    };
+    if (settings.mag.power) {
+      Bangle.sensortoolsOrigSetCompassPower = Bangle.setCompassPower;
+      Bangle.setCompassPower = createPowerFunction(settings.mag.power, "Compass", Bangle.sensortoolsOrigSetCompassPower);
+    }
+    if (settings.mag.mode == "emulate") {
+      if (settings.mag.name == "static") {
+        modMag(()=>{return {
+          x: 1,
+          y: 1,
+          z: 1,
+          dx: 1,
+          dy: 1,
+          dz: 1,
+          heading: 0
+        };});
+      } else if (settings.mag.name == "rotate"){
+        let last = 0;
+        modMag(()=>{return {
+          x: 1,
+          y: 1,
+          z: 1,
+          dx: 1,
+          dy: 1,
+          dz: 1,
+          heading: last = (last+1)%360,
+        };});
+      }
+    }
+  }
+};
diff --git a/apps/sensortools/metadata.json b/apps/sensortools/metadata.json
new file mode 100644
index 000000000..59a129ec1
--- /dev/null
+++ b/apps/sensortools/metadata.json
@@ -0,0 +1,18 @@
+{
+  "id": "sensortools",
+  "name": "Sensor tools",
+  "shortName": "Sensor tools",
+  "version": "0.02",
+  "description": "Tools for testing and debugging apps that use sensor input",
+  "icon": "icon.png",
+  "type": "bootloader",
+  "tags": "tool,boot,debug",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"sensortools.0.boot.js","url":"boot.js"},
+    {"name":"sensortools.settings.js","url":"settings.js"},
+    {"name":"sensortools","url":"lib.js"},
+    {"name":"sensortools.default.json","url":"default.json"}
+  ]
+}
diff --git a/apps/sensortools/settings.js b/apps/sensortools/settings.js
new file mode 100644
index 000000000..231ab8467
--- /dev/null
+++ b/apps/sensortools/settings.js
@@ -0,0 +1,99 @@
+(function(back) {
+  function writeSettings(key, value) {
+    var s = require('Storage').readJSON(FILE, true) || {};
+    s[key] = value;
+    require('Storage').writeJSON(FILE, s);
+    readSettings();
+  }
+
+  function writeSettingsParent(parent, key, value) {
+    var s = require('Storage').readJSON(FILE, true) || {};
+    if (!s[parent]) s[parent] = {};
+    s[parent][key] = value;
+    require('Storage').writeJSON(FILE, s);
+    readSettings();
+  }
+
+  function readSettings(){
+    settings = Object.assign(
+      require('Storage').readJSON("sensortools.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {}
+    );
+  }
+
+  var FILE="sensortools.json";
+  var settings;
+  readSettings();
+
+
+  let modes = ["nop", "emulate", "modify"];
+  let modesPower = ["nop", "emulate", "passthrough", "delay", "on"];
+
+  function showSubMenu(name,key,typesEmulate,typesModify){
+    var menu = {
+      '': { 'title': name,
+          back: ()=>{E.showMenu(buildMainMenu());}},
+      'Enabled': {
+        value: !!settings[key].enabled,
+        onchange: v => {
+          writeSettingsParent(key, "enabled",v);
+        }
+      },
+      'Mode': {
+        value: modes.indexOf(settings[key].mode||"nop"),
+        min: 0, max: modes.length-1,
+        format: v => { return modes[v]; },
+        onchange: v => {
+          writeSettingsParent(key,"mode",modes[v]);
+          showSubMenu(name,key,typesEmulate,typesModify);
+        }
+      },
+      'Name': {},
+      'Power': {
+        value: modesPower.indexOf(settings[key].power||"nop"),
+        min: 0, max: modesPower.length-1,
+        format: v => { return modesPower[v]; },
+        onchange: v => {
+          writeSettingsParent(key,"power",modesPower[v]);
+        }
+      },
+    };
+    
+    if (settings[key].mode != "nop"){
+      let types = typesEmulate;
+      if (settings[key].mode == "modify") types = typesModify;
+      menu.Name = {
+        value: types.indexOf(settings[key].name||"static"),
+        min: 0, max: types.length-1,
+        format: v => { return types[v]; },
+        onchange: v => {
+          writeSettingsParent(key,"name",types[v]);
+        }
+      };
+    } else {
+      delete menu.Name;
+    }
+    
+    E.showMenu(menu);
+  }
+
+
+  function buildMainMenu(){
+    var mainmenu = {
+      '': { 'title': 'Sensor tools' },
+      '< Back': back,
+      'Enabled': {
+        value: !!settings.enabled,
+        onchange: v => {
+          writeSettings("enabled",v);
+        },
+      },
+      'GPS': ()=>{showSubMenu("GPS","gps",["nop", "staticfix", "nofix", "changingfix", "route", "routeFuzzy"],[]);},
+      'Compass': ()=>{showSubMenu("Compass","mag",["nop", "static", "rotate"],[]);},
+      'HRM': ()=>{showSubMenu("HRM","hrm",["nop", "static"],["bpmtrippled"],["sin"]);}
+    };
+    return mainmenu;
+  }
+
+  E.showMenu(buildMainMenu());
+});
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 1513194fe..55b61c46a 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -53,3 +53,9 @@
 0.47: Allow colors to be translated
       Improve "Turn Off" user experience
 0.48: Allow reading custom themes from files
+0.49: Now reloads settings properly after 'Calibrate Battery'
+0.50: Add Bangle.js 2 touchscreen calibration - for 2v16 or 2v15 cutting edge builds
+0.51: Add setting for configuring a launcher
+0.52: Add option for left-handed users
+0.53: Ensure that when clock is set, clockHasWidgets is set correctly too
+0.54: If setting.json is corrupt, ensure it gets re-written
diff --git a/apps/setting/README.md b/apps/setting/README.md
index 657b96f71..e5ea2b43d 100644
--- a/apps/setting/README.md
+++ b/apps/setting/README.md
@@ -29,10 +29,12 @@ This is Bangle.js's settings menu
 
 * **LCD Brightness** set how bright the LCD is. Due to hardware limitations in the LCD backlight, you may notice flicker if the LCD is not at 100% brightness.
 * **LCD Timeout** how long should the LCD stay on for if no activity is detected. 0=stay on forever
+* **Rotation** allows you to rotate (or mirror) what's displayed on the screen, eg. for left-handed wearers (needs 2v16 or 2v15 cutting edge firmware to work reliably)
 * **Wake on X** should the given activity wake up the Bangle.js LCD?
   * On Bangle.js 2 when locked the touchscreen is turned off to save power. Because of this,
     `Wake on Touch` actually uses the accelerometer, and you need to actually tap the display to wake Bangle.js.
 * **Twist X** these options adjust the sensitivity of `Wake on Twist` to ensure Bangle.js wakes up with just the right amount of wrist movement.
+* **Calibrate** on Bangle.js 2, pop up a screen allowing you to calibrate the touchscreen (calibration only works on 2v16 or 2v15 cutting edge builds)
 
 ## Locale
 
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 17519730e..08544cff6 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.48",
+  "version": "0.54",
   "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 3bb9b4e22..2350a8965 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -25,15 +25,7 @@ function updateOptions() {
   Bangle.setOptions(o)
 }
 
-function gToInternal(g) {
-  // converts g to Espruino internal unit
-  return g * 8192;
-}
 
-function internalToG(u) {
-  // converts Espruino internal unit to g
-  return u / 8192
-}
 
 function resetSettings() {
   settings = {
@@ -47,6 +39,7 @@ function resetSettings() {
     timezone: 0,                    // Set the timezone for the device
     HID: false,                     // BLE HID mode, off by default
     clock: null,                    // a string for the default clock's name
+    // clockHasWidgets: false,      // Does the clock in 'clock' contain the string 'Bangle.loadWidgets'
     "12hour" : false,               // 12 or 24 hour clock?
     firstDayOfWeek: 0,              // 0 -> Sunday (default), 1 -> Monday
     brightness: 1,                  // LCD brightness from 0 to 1
@@ -67,7 +60,9 @@ function resetSettings() {
 }
 
 settings = storage.readJSON('setting.json', 1);
-if (!settings) resetSettings();
+if (("object" != typeof settings) ||
+    ("object" != typeof settings.options))
+  resetSettings();
 
 const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";
 
@@ -95,6 +90,7 @@ function showSystemMenu() {
     /*LANG*/'LCD': ()=>showLCDMenu(),
     /*LANG*/'Locale': ()=>showLocaleMenu(),
     /*LANG*/'Select Clock': ()=>showClockMenu(),
+    /*LANG*/'Select Launcher': ()=>showLauncherMenu(),
     /*LANG*/'Date & Time': ()=>showSetTimeMenu()
   };
 
@@ -243,9 +239,9 @@ function showThemeMenu() {
     }
   };
 
-  require("Storage").list(/^.*\.theme$/).forEach(
+  storage.list(/^.*\.theme$/).forEach(
     n => {
-      let newTheme = require("Storage").readJSON(n);
+      let newTheme = storage.readJSON(n);
       themesMenu[newTheme.name ? newTheme.name : n] = () => {
         upd({
         fg:cl(newTheme.fg), bg:cl(newTheme.bg),
@@ -386,6 +382,13 @@ function showWhitelistMenu() {
 }
 
 function showLCDMenu() {
+  // converts g to Espruino internal unit
+  function gToInternal(g) { return g * 8192; }
+  // converts Espruino internal unit to g
+  function internalToG(u) { return u / 8192; }
+
+  var rotNames = [/*LANG*/"No",/*LANG*/"Rotate CW",/*LANG*/"Left Handed",/*LANG*/"Rotate CCW",/*LANG*/"Mirror"];
+
   const lcdMenu = {
     '': { 'title': 'LCD' },
     '< Back': ()=>showSystemMenu(),
@@ -411,6 +414,18 @@ function showLCDMenu() {
         Bangle.setLCDTimeout(settings.timeout);
       }
     },
+    /*LANG*/'Rotate': {
+      value: 0|settings.rotate,
+      min: 0,
+      max: rotNames.length-1,
+      format: v=> rotNames[v],
+      onchange: v => {
+        settings.rotate = 0 | v;
+        updateSettings();
+        g.setRotation(settings.rotate&3,settings.rotate>>2).clear();
+        Bangle.drawWidgets();
+      }
+    },
     /*LANG*/'Wake on BTN1': {
       value: settings.options.wakeOnBTN1,
       format: boolFormat,
@@ -494,6 +509,10 @@ function showLCDMenu() {
       }
     }
   });
+  if (BANGLEJS2)
+    Object.assign(lcdMenu, {
+    /*LANG*/'Calibrate': () => showTouchscreenCalibration()
+    });
   return E.showMenu(lcdMenu)
 }
 
@@ -550,11 +569,11 @@ function showUtilMenu() {
     },
     /*LANG*/'Compact Storage': () => {
       E.showMessage(/*LANG*/"Compacting...\nTakes approx\n1 minute",{title:/*LANG*/"Storage"});
-      require("Storage").compact();
+      storage.compact();
       showUtilMenu();
     },
     /*LANG*/'Rewrite Settings': () => {
-      require("Storage").write(".boot0","eval(require('Storage').read('bootupdate.js'));");
+      storage.write(".boot0","eval(require('Storage').read('bootupdate.js'));");
       load("setting.app.js");
     },
     /*LANG*/'Flatten Battery': () => {
@@ -575,10 +594,10 @@ function showUtilMenu() {
     menu[/*LANG*/'Calibrate Battery'] = () => {
       E.showPrompt(/*LANG*/"Is the battery fully charged?",{title:/*LANG*/"Calibrate"}).then(ok => {
         if (ok) {
-          var s=require("Storage").readJSON("setting.json");
+          var s=storage.readJSON("setting.json");
           s.batFullVoltage = (analogRead(D3)+analogRead(D3)+analogRead(D3)+analogRead(D3))/4;
-          require("Storage").writeJSON("setting.json",s);
-          E.showAlert(/*LANG*/"Calibrated!").then(() => load("settings.app.js"));
+          storage.writeJSON("setting.json",s);
+          E.showAlert(/*LANG*/"Calibrated!").then(() => load("setting.app.js"));
         } else {
           E.showAlert(/*LANG*/"Please charge Bangle.js for 3 hours and try again").then(() => load("settings.app.js"));
         }
@@ -642,7 +661,7 @@ function makeConnectable() {
   });
 }
 function showClockMenu() {
-  var clockApps = require("Storage").list(/\.info$/)
+  var clockApps = storage.list(/\.info$/)
     .map(app => {var a=storage.readJSON(app, 1);return (a&&a.type == "clock")?a:undefined})
     .filter(app => app) // filter out any undefined apps
     .sort((a, b) => a.sortorder - b.sortorder);
@@ -658,11 +677,10 @@ function showClockMenu() {
       label = "* " + label;
     }
     clockMenu[label] = () => {
-      if (settings.clock !== app.src) {
-        settings.clock = app.src;
-        updateSettings();
-        showMainMenu();
-      }
+      settings.clock = app.src;
+      settings.clockHasWidgets = storage.read(app.src).includes("Bangle.loadWidgets");
+      updateSettings();
+      showMainMenu();
     };
   });
   if (clockApps.length === 0) {
@@ -670,6 +688,33 @@ function showClockMenu() {
   }
   return E.showMenu(clockMenu);
 }
+function showLauncherMenu() {
+  var launcherApps = storage.list(/\.info$/)
+    .map(app => {var a=storage.readJSON(app, 1);return (a&&a.type == "launch")?a:undefined})
+    .filter(app => app) // filter out any undefined apps
+    .sort((a, b) => a.sortorder - b.sortorder);
+  const launcherMenu = {
+    '': {
+      'title': /*LANG*/'Select Launcher',
+    },
+    '< Back': ()=>showSystemMenu(),
+  };
+  launcherApps.forEach((app, index) => {
+    var label = app.name;
+    if ((!settings.launcher && index === 0) || (settings.launcher === app.src)) {
+      label = "* " + label;
+    }
+    launcherMenu[label] = () => {
+      settings.launcher = app.src;
+      updateSettings();
+      showMainMenu();
+    };
+  });
+  if (launcherApps.length === 0) {
+    launcherMenu[/*LANG*/"No Launchers Found"] = () => { };
+  }
+  return E.showMenu(launcherMenu);
+}
 
 function showSetTimeMenu() {
   d = new Date();
@@ -777,4 +822,85 @@ function showAppSettings(app) {
   }
 }
 
+function showTouchscreenCalibration() {
+  Bangle.setUI();
+  // disable touchscreen calibration (passed coords right through)
+  Bangle.setOptions({touchX1: 0, touchY1: 0, touchX2: g.getWidth(), touchY2: g.getHeight() });
+
+  var P = 32;
+  var corners = [
+    [P,P],
+    [g.getWidth()-P,P],
+    [g.getWidth()-P,g.getHeight()-P],
+    [P,g.getHeight()-P],
+  ];
+  var currentCorner = 0;
+  var currentTry = 0;
+  var pt = {
+    x1 : 0, y1 : 0, x2 : 0, y2 : 0
+  };
+
+  function showTapSpot() {
+    var spot = corners[currentCorner];
+    g.clear(1);
+    g.drawLine(spot[0]-32,spot[1],spot[0]+32,spot[1]);
+    g.drawLine(spot[0],spot[1]-32,spot[0],spot[1]+32);
+    g.drawCircle(spot[0],spot[1], 16);
+    var tapsLeft = (1-currentTry)*4+(4-currentCorner);
+    g.setFont("6x8:2").setFontAlign(0,0).drawString(tapsLeft+" taps\nto go", g.getWidth()/2, g.getHeight()/2);
+  }
+
+  function calcCalibration() {
+    g.clear(1);
+    // we should now have 4 of each tap in 'pt'
+    pt.x1 /= 4;
+    pt.y1 /= 4;
+    pt.x2 /= 4;
+    pt.y2 /= 4;
+    // work out final values
+    var calib = {
+      x1 : Math.round(pt.x1 - (pt.x2-pt.x1)*P/(g.getWidth()-P*2)),
+      y1 : Math.round(pt.y1 - (pt.y2-pt.y1)*P/(g.getHeight()-P*2)),
+      x2 : Math.round(pt.x2 + (pt.x2-pt.x1)*P/(g.getWidth()-P*2)),
+      y2 : Math.round(pt.y2 + (pt.y2-pt.y1)*P/(g.getHeight()-P*2))
+    };
+    Bangle.setOptions({
+      touchX1: calib.x1, touchY1: calib.y1, touchX2: calib.x2, touchY2: calib.y2
+    });
+    var s = storage.readJSON("setting.json",1)||{};
+    s.touch = calib;
+    storage.writeJSON("setting.json",s);
+    g.setFont("6x8:2").setFontAlign(0,0).drawString("Calibrated!", g.getWidth()/2, g.getHeight()/2);
+    // now load the main menu again
+    setTimeout(showLCDMenu, 500);
+  }
+
+  function touchHandler(_,e) {
+    var spot = corners[currentCorner];
+    // store averages
+    if (spot[0]*2 < g.getWidth())
+      pt.x1 += e.x;
+    else
+      pt.x2 += e.x;
+    if (spot[1]*2 < g.getHeight())
+      pt.y1 += e.y;
+    else
+      pt.y2 += e.y;
+    // go to next corner
+    currentCorner++;
+    if (currentCorner>=corners.length) {
+      currentCorner = 0;
+      currentTry++;
+      if (currentTry==2) {
+        Bangle.removeListener('touch', touchHandler);
+        return calcCalibration();
+      }
+    }
+    showTapSpot();
+  }
+  Bangle.on('touch', touchHandler);
+
+  showTapSpot();
+}
+
 showMainMenu();
diff --git a/apps/shownearby/ChangeLog b/apps/shownearby/ChangeLog
new file mode 100644
index 000000000..b98baa1c0
--- /dev/null
+++ b/apps/shownearby/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Ensure we reset advertising after exiting so the watch can be connected to!
diff --git a/apps/shownearby/app-icon.js b/apps/shownearby/app-icon.js
new file mode 100644
index 000000000..c5b3cdffe
--- /dev/null
+++ b/apps/shownearby/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4UA///rkcr+W8H5Ie8/4AKIgf//gLIh5XBERILBEhAuBGA0BqtUEIMP+ALEqoABBY8FqtlBZEV0ulBYPABYkBq2WBYN/+A7Egtqq2lyt/KYsF1VaBZEWBYdfO4pRCAANXR4oLKgNq1Nq0upKgP0BYuq0uqBY4JBBYV/6hSEBYZIBqoLJrQLJQoILEKYgACBZ4jGsoLJyoLKAAJrIAIOUQZGWBYtaTYQLCqizIAANQBZ7jDAQOpoALDfYYCCBQYLBtVWa4NaIwZICq2WBYNpFwgABitlOgOVFwipDsuVUoYAEKI4xEqp0EAHg="))
diff --git a/apps/shownearby/app.js b/apps/shownearby/app.js
new file mode 100644
index 000000000..56ae27cb6
--- /dev/null
+++ b/apps/shownearby/app.js
@@ -0,0 +1,93 @@
+var m = require("openstmap");
+var HASWIDGETS = true;
+var y1,y2;
+var fix = {};
+
+function redraw() {
+  g.setClipRect(0,y1,g.getWidth()-1,y2);
+  m.draw();
+  if (fix.fix) drawMarker(fix,"#f00");
+  if (WIDGETS["gpsrec"] && WIDGETS["gpsrec"].plotTrack) {
+    g.flip(); // force immediate draw on double-buffered screens - track will update later
+    g.setColor(0.75,0.2,0);
+    WIDGETS["gpsrec"].plotTrack(m);
+  }
+  g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+}
+
+function drawMarker(pt, col) {
+  var p = m.latLonToXY(pt.lat, pt.lon);
+  g.setColor(col).fillRect(p.x-3, p.y-3, p.x+3, p.y+3);
+}
+
+var fix;
+Bangle.on('GPS',function(f) {
+  fix=f;
+  g.reset().clearRect(0,y1,g.getWidth()-1,y1+8).setFont("6x8").setFontAlign(0,0);
+  var txt = fix.satellites+" satellites";
+  if (!fix.fix)
+    txt += " - NO FIX";
+  g.drawString(txt,g.getWidth()/2,y1 + 4);
+  if (fix.fix) drawMarker(fix,"#f00");
+  if (fix.fix) {
+    var fdata = new Float32Array([f.lat,f.lon]);
+    NRF.setAdvertising({},{
+      phy:"coded",
+      connectable:false,
+      scannable:false,
+      showName:false,
+      manufacturer:0x0590,
+      manufacturerData:fdata.buffer
+    });
+  }
+});
+Bangle.setGPSPower(1, "app");
+
+if (HASWIDGETS) {
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  y1 = 24;
+  var hasBottomRow = Object.keys(WIDGETS).some(w=>WIDGETS[w].area[0]=="b");
+  y2 = g.getHeight() - (hasBottomRow ? 24 : 1);
+} else {
+  y1=0;
+  y2=g.getHeight()-1;
+}
+
+redraw();
+
+function recenter() {
+  if (!fix.fix) return;
+  m.lat = fix.lat;
+  m.lon = fix.lon;
+  redraw();
+}
+
+setWatch(recenter, global.BTN2?BTN2:BTN1, {repeat:true});
+
+var hasScrolled = false;
+Bangle.on('drag',e=>{
+  if (e.b) {
+    g.setClipRect(0,y1,g.getWidth()-1,y2);
+    g.scroll(e.dx,e.dy);
+    m.scroll(e.dx,e.dy);
+    g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+    hasScrolled = true;
+  } else if (hasScrolled) {
+    hasScrolled = false;
+    redraw();
+  }
+});
+
+// Start scanning
+NRF.setScan(function(d) {
+  var latLon = new Float32Array(d.manufacturerData);
+  drawMarker({lat:latLon[0], lon:latLon[1]},"#0f0");
+},{phy:"coded",filters: [{ manufacturerData:{0x0590:{}} }]});
+// Set transmit power to max
+NRF.setTxPower(8);
+
+// when leaving the app, reset the advertising to default so we can reconnect!
+Bangle.on('kill', function() {
+  NRF.setAdvertising({},{});
+});
diff --git a/apps/shownearby/app.png b/apps/shownearby/app.png
new file mode 100644
index 000000000..5c2ed44cc
Binary files /dev/null and b/apps/shownearby/app.png differ
diff --git a/apps/shownearby/metadata.json b/apps/shownearby/metadata.json
new file mode 100644
index 000000000..ef0c4f5e9
--- /dev/null
+++ b/apps/shownearby/metadata.json
@@ -0,0 +1,14 @@
+{
+  "id": "shownearby",
+  "name": "Show Nearby",
+  "version": "0.02",
+  "description": "Uses BLE long range advertising, advertises current location and shows the position of other watches running the app (Needs firmware 2v14.63 or later and Open Street Map installed). Make sure you disconnect from your phone first!",
+  "icon": "app.png",
+  "tags": "outdoors,gps",
+  "supports": ["BANGLEJS2"],
+  "dependencies" : { "openstmap":"app" },
+  "storage": [
+    {"name":"shownearby.app.js","url":"app.js"},
+    {"name":"shownearby.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/simple_clock/ChangeLog b/apps/simple_clock/ChangeLog
index 84e7affed..9d55c1a91 100644
--- a/apps/simple_clock/ChangeLog
+++ b/apps/simple_clock/ChangeLog
@@ -1,2 +1,3 @@
 ...
 0.02: First update with ChangeLog Added
+0.03: Tell clock widgets to hide.
diff --git a/apps/simple_clock/app.js b/apps/simple_clock/app.js
index 3c1843cb0..8ac51ed40 100644
--- a/apps/simple_clock/app.js
+++ b/apps/simple_clock/app.js
@@ -3,6 +3,8 @@
 
   let outerRadius = Math.min(CenterX,CenterY) * 0.9;
 
+  Bangle.setUI('clock');
+
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -225,6 +227,3 @@
     }
   });
 
-  Bangle.loadWidgets();
-
-  Bangle.setUI('clock');
diff --git a/apps/simple_clock/metadata.json b/apps/simple_clock/metadata.json
index ccec0bfbc..512bcd674 100644
--- a/apps/simple_clock/metadata.json
+++ b/apps/simple_clock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "simple_clock",
   "name": "Simple Analog Clock",
   "shortName":"Simple Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "a simple, yet stylish, analog clock",
   "icon": "app-icon.png",
   "type": "clock",
diff --git a/apps/slash/ChangeLog b/apps/slash/ChangeLog
index f3fae1785..734df26dd 100644
--- a/apps/slash/ChangeLog
+++ b/apps/slash/ChangeLog
@@ -1 +1,2 @@
 0.01: First version for upload
+0.02: Fix for leftover date artifacts on display.
diff --git a/apps/slash/app.js b/apps/slash/app.js
index f548bcaf7..c594e5916 100644
--- a/apps/slash/app.js
+++ b/apps/slash/app.js
@@ -57,6 +57,10 @@ function draw() {
   var minutes = ("0"+m).substr(-2);
   g.reset();
   
+  // If midnight clear display to remove day / date artifacts
+  if (h == 0 && m == 0)
+    g.clear();
+  
   // Convert to 12hr time mode
   if (is12Hour && h > 12) {
     h = h - 12;
diff --git a/apps/slash/metadata.json b/apps/slash/metadata.json
index 6bdb4cd53..b08aa7c44 100644
--- a/apps/slash/metadata.json
+++ b/apps/slash/metadata.json
@@ -4,7 +4,7 @@
   "shortName":"Slash",
   "icon": "slash.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.01",
+  "version":"0.02",
   "description": "Slash Watch based on Pebble watch face by Nikki.",
   "tags": "clock",
   "type": "clock",
diff --git a/apps/sleeplog/ChangeLog b/apps/sleeplog/ChangeLog
index 8a3da6362..a0698d471 100644
--- a/apps/sleeplog/ChangeLog
+++ b/apps/sleeplog/ChangeLog
@@ -4,3 +4,6 @@
 0.04: Fix #1445, display loading info, add icons to display service states
 0.05: Fix LOW_MEMORY,MEMORY error on to big log size
 0.06: Reduced log size further to 750 entries
+0.10: Complete rework off this app!
+0.10beta: Add interface.html to view saved log data, add "View log" function for debugging log, send data for gadgetbridge, change caching for global getStats
+0.11: Prevent module not found error
diff --git a/apps/sleeplog/README.md b/apps/sleeplog/README.md
index ebbcdde54..45aeb316b 100644
--- a/apps/sleeplog/README.md
+++ b/apps/sleeplog/README.md
@@ -1,176 +1,175 @@
 # Sleep Log
 
-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
-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_.
+This app logs and displays the following states:  
+- sleepling status: _unknown, not worn, awake, light sleep, deep sleep_
+- consecutive sleep status: _unknown, not consecutive, consecutive_
+
+It is using the built in movement calculation to decide your sleeping state. While charging it is assumed that you are not wearing the watch and if the status changes to _deep sleep_ the internal heartrate sensor is used to detect if you are wearing the watch.
+
+Logfiles are not removed on un-/reinstall to prevent data loss.
+
+| Filename (* _example_)       | Content         | Removeable in     |
+|------------------------------|-----------------|-------------------|
+| `sleeplog.log (StorageFile)` | recent logfile  | App Web Interface |
+| `sleeplog_1234.log`*         | old logfiles    | App Web Interface |
+| `sleeplog_123456.csv`*       | debugging files | Web IDE           |
 
-#### 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 (__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 (__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. 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.  
-  To prevent a LOW_MEMORY,MEMORY error the log size is limited to 750 entries, older entries will be overwritten.
 
 ---
-### Control
+### App Usage
 ---
-* __Swipe__  
-  Swipe left/right to display the previous/following day.
-* __Touch__ / __BTN__  
-  Touch the screen to open the settings menu to exit or change settings.
+
+#### On the main app screen:
+  - __swipe left & right__  
+    to change the displayed day
+  - __touch the "title"__ (e.g. `Night to Fri 20/05/2022`)  
+    to enter day selection prompt
+  - __touch the info area__  
+    to change the displayed information  
+    (by default: consecutive & true sleeping)
+  - __touch the wrench__ (upper right corner)  
+    to enter the settings
+  - __use back button widget__ (upper left corner)  
+    exit the app
+
+#### Inside the settings:
+  - __Thresholds__ submenu  
+    Changes take effect from now on, not retrospective!
+    - __Max Awake__ | maximal awake duration  
+      _10min_ / _20min_ / ... / __60min__ / ... / _120min_
+    - __Min Consecutive__ | minimal consecutive sleep duration  
+      _10min_ / _20min_ / ... / __30min__ / ... / _120min_
+    - __Deep Sleep__ | deep sleep threshold  
+      _30_ / _31_ / ... / __100__ / ... / _200_
+    - __Light Sleep__ | light sleep threshold  
+      _100_ / _110_ / ... / __200__ / ... / _400_  
+    - __Reset to Default__ | reset to bold values above
+  - __BreakToD__ | time of day to break view  
+    _0:00_ / _1:00_ / ... / __12:00__ / ... / _23:00_
+  - __App Timeout__ | app specific lock timeout  
+    __0s__ / _10s_ / ... / _120s_
+  - __Enabled__ | completely en-/disables the background service  
+    __on__ / _off_
+  - __Debugging__ submenu  
+    - __View log__ | display logfile data  
+      Select the logfile by its starting time.  
+      Thresholds are shown as line with its value.  
+      - __swipe left & right__  
+        to change displayed duration
+      - __swipe up & down__  
+        to change displayed value range
+      - __touch the graph__  
+        to change between light & dark colors
+      - __use back button widget__ (upper left corner)  
+        to go back to the logfile selection
+    - __Enabled__ | en-/disables debugging  
+      _on_ / __off__
+    - __write File__ | toggles if a logfile is written  
+      _on_ / __off__
+    - __Duration__ | duration for writing into logfile  
+      _1h_ / _2h_ / ... / __12h__ / _96_  
+    - The following data is logged to a csv-file:    
+      _timestamp_ (in days since 1900-01-01 00:00 UTC used by office software) _, movement, status, consecutive, asleepSince, awakeSince, bpm, bpmConfidence_
+
 
 ---
-### Settings
+### Web Interface Usage
 ---
-* __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. 
-* __Max Awake__ | maximal awake duration  
-  _15min_ / _20min_ / _..._ / __60min__ / _..._ / _120min_  
-  Adjust the maximal awake duration upon the exceeding of which aborts the consecutive sleep period.
-* __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.
-* __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_.
-* __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.
-* __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 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_.  
-  In app icon showing that logging is disabled: ![](nolog.png)
+
+Available through the App Loader when your watch is connected.
+
+- __view data__  
+  Display the data to each timestamp in a table.
+- __save csv-file__  
+  Download a csv-file with the data to each timestamp.  
+  The time format is chooseable beneath the file list. 
+- __delete file__  
+  Deletes the logfile from the watch. __Please backup your data first!__
+
+---
+### Timestamps and files
+---
+
+1. externally visible/usable timestamps (in `global.sleeplog`) are formatted as Bangle timestamps:  
+  seconds since 1970-01-01 00:00 UTC
+2. internally used and logged (to `sleeplog.log (StorageFile)`) is within the highest available resolution:  
+  10 minutes since 1970-01-01 00:00 UTC (`Bangle / (10 * 60 * 1000)`)
+3. debug .csv file ID (`sleeplog_123456.csv`) has a hourly resolution:
+  hours since 1970-01-01 00:00 UTC (`Bangle / (60 * 60 * 1000)`)
+4. logged timestamps inside the debug .csv file are formatted for office calculation software:  
+  days since 1900-01-01 00:00 UTC (`Bangle / (24 * 60 * 60 * 1000) + 25569`)
+5. every 14 days the `sleeplog.log (StorageFile)` is reduced and old entries are moved into separat files for each fortnight (`sleeplog_1234.log`) but still accessible though the app:  
+  fortnights since 1970-01-04 12:00 UTC (converted with `require("sleeplog").msToFn(Bangle)` and `require("sleeplog").fnToMs(fortnight)`)
+
+- __Logfiles from before 0.10:__  
+  timestamps and sleeping status of old logfiles are automatically converted on your first consecutive sleep or manually by `require("sleeplog").convertOldLog()`
+
+- __View logged data:__  
+  if you'd like to view your logged data in the IDE, you can access it with `require("sleeplog").printLog(since, until)` or `require("sleeplog").readLog(since, until)` to view the raw data  
+  since & until in Bangle timestamp, e.g. `require("sleeplog").printLog(Date()-24*60*60*1000, Date())` for the last 24h
+
+
+---
+### Access statistics (developer information)
+---
+- Last Asleep Time [Date]:  
+  `Date(sleeplog.awakeSince)`
+- Last Awake Duration [ms]:  
+  `Date() - sleeplog.awakeSince`
+- Last Statistics [object]:  
+  ```
+  // get stats of the last night (period as displayed inside the app)
+  //  as this might be the mostly used function the data is cached inside the global object 
+  sleeplog.getStats();
+
+  // get stats of the last 24h
+  require("sleeplog").getStats(0, 24*60*60*1000);
+  // same as
+  require("sleeplog").getStats(Date.now(), 24*60*60*1000);
+  // output as object, timestamps as UNIX timestamp, durations in minutes
+  ={ calculatedAt: 1653123553810, deepSleep: 250, lightSleep: 150, awakeSleep: 10,
+    consecSleep: 320, awakeTime: 1030, notWornTime: 0, unknownTime: 0, logDuration: 1440,
+    firstDate: 1653036600000, lastDate: 1653111600000 }
   
----
-### Global Object and Module Functions
----
-For easy access from the console or other apps the following parameters, values and functions are noteworthy:
-```
->global.sleeplog
-={
-  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:
-    / 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
-  ...
- }
+  // to get the start of a period defined by "Break TOD" of any date
+  var startOfBreak = require("sleeplog").getLastBreak();
+  // same as
+  var startOfBreak = require("sleeplog").getLastBreak(Date.now());
+  // output as date
+  =Date: Sat May 21 2022 12:00:00 GMT+0200
+  
+  // get stats of this period as displayed inside the app
+  require("sleeplog").getStats(require("sleeplog").getLastBreak(), 24*60*60*1000);
+  // or any other day
+  require("sleeplog").getStats(require("sleeplog").getLastBreak(Date(2022,4,10)), 24*60*60*1000);
+  ```
+- Total Statistics [object]:  
+  ```
+  // use with caution, may take a long time !
+  require("sleeplog").getStats(0, 0, require("sleeplog").readLog());
+  ```
 
->require("sleeplog")
-={
-  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
-    // * (powersaving) / bool / new power saving status, default: false
-    // returns: true or undefined
-    // - true      = service restart executed
-    // - undefined = no global.sleeplog found
-  readLog: function (logfile, since, until) { ... },
-    // read the raw log data for a specific time 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 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
-    // * (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 / see readLog(..)
-    // returns: int / number of changes that were made
-  reinterpretTemp: function (logfile, tempthresh) { ... }
-    // reinterpret worn status based on given 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
- }
-```
 
 ---
 ### Worth Mentioning
 ---
 #### 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.
+- Check translations.
+- Add more functionallities to interface.html.
+- Enable recieving data on the Gadgetbridge side + testing.  
+  __Help appreciated!__
 
 #### 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).
+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)).
 
 #### Creator
 Storm64 ([Mail](mailto:banglejs@storm64.de), [github](https://github.com/storm64))
 
 #### Contributors
-nxdefiant ([github](https://github.com/nxdefiant))
+myxor ([github](https://github.com/myxor))
 
 #### Attributions
-* ESS calculation based on nxdefiant interpretation of the following publication by:  
-  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](https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en),  
-  ICHI 2014, Verona, Italy, IEEE Press, 2014.
-* Icons used in this app are from [https://icons8.com](https://icons8.com).
+The app icon is downloaded from [https://icons8.com](https://icons8.com).
 
 #### License
 [MIT License](LICENSE)
diff --git a/apps/sleeplog/app.js b/apps/sleeplog/app.js
index 8077b4d62..c75bf1e4c 100644
--- a/apps/sleeplog/app.js
+++ b/apps/sleeplog/app.js
@@ -1,234 +1,354 @@
-// set storage and define settings
-var storage = require("Storage");
-var breaktod, maxawake, minconsec;
-
-// read required settings from storage
-function readSettings(settings) {
-  breaktod = settings.breaktod || (settings.breaktod === 0 ? 0 : 10); // time of day when to start/end graphs
-  maxawake = settings.maxawake || 36E5; // 60min in ms
-  minconsec = settings.minconsec || 18E5; // 30min in ms
-}
-
-// define draw log function
-function drawLog(topY, viewUntil) {
-  // set default view time
-  viewUntil = viewUntil || Date();
-
-  // define parameters
-  var statusValue = [0, 0.4, 0.6, 1]; // unknown, not worn, awake, sleeping, consecutive sleep
-  var statusColor = [0, 63488, 2016, 32799, 31]; // black, red, green, violet, blue
-  var period = 432E5; // 12h
-  var graphHeight = 18;
-  var labelHeight = 12;
-  var width = g.getWidth();
-  var timestamp0 = viewUntil.valueOf() - period;
-  var y = topY + graphHeight;
-
-  // read 12h wide log
-  var log = require("sleeplog").readLog(0, timestamp0, viewUntil.valueOf());
-
-  // format log array if not empty
-  if (log.length) {
-    // if the period goes into the future add unknown status at the beginning
-    if (viewUntil > Date()) log.unshift([Date().valueOf(), 0]);
-
-    // check if the period goes earlier than logged data
-    if (log[log.length - 1][0] < timestamp0) {
-      // set time of last entry according to period
-      log[log.length - 1][0] = timestamp0;
-    } else {
-      // add entry with unknown status at the end
-      log.push([timestamp0, 0]);
-    }
-
-    // remap each element to [status, relative beginning, relative end, duration]
-    log = log.map((element, index) => [
-      element[1],
-      element[0] - timestamp0,
-      (log[index - 1] || [viewUntil.valueOf()])[0] - timestamp0,
-      (log[index - 1] || [viewUntil.valueOf()])[0] - element[0]
-    ]);
-
-    // start with the oldest entry to build graph left to right
-    log.reverse();
-  }
-
-  // clear area
-  g.reset().clearRect(0, topY, width, y + labelHeight);
-  // draw x axis
-  g.drawLine(0, y + 1, width, y + 1);
-  // draw x label
-  var hours = period / 36E5;
-  var stepwidth = width / hours;
-  var startHour = 24 + viewUntil.getHours() - hours;
-  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 + 1, y + 6);
-  }
-
-  // define variables for sleep calculation
-  var consecutive = 0;
-  var output = [0, 0]; // [estimated, true]
-  var i, nosleepduration;
-
-  // draw graph
-  log.forEach((element, index) => {
-    // set bar color depending on type
-    g.setColor(statusColor[consecutive ? 4 : element[0]]);
-
-    // check for sleeping status
-    if (element[0] === 3) {
-      // count true sleeping hours
-      output[1] += element[3];
-      // count duration of subsequent non sleeping periods
-      i = index + 1;
-      nosleepduration = 0;
-      while (log[i] !== undefined && log[i][0] < 3 && nosleepduration < maxawake) {
-        nosleepduration += log[i++][3];
-      }
-      // check if counted duration lower than threshold to start/stop counting
-      if (log[i] !== undefined && nosleepduration < maxawake) {
-        // start counting consecutive sleeping hours
-        consecutive += element[3];
-        // correct color to match consecutive sleeping
-        g.setColor(statusColor[4]);
-      } else {
-        // check if counted consecutive sleeping greater then threshold
-        if (consecutive >= minconsec) {
-          // write verified consecutive sleeping hours to output
-          output[0] += consecutive + element[3];
+// touch listener for specific areas
+function touchListener(b, c) {
+  // check if inside any area
+  for (var i = 0; i < aaa.length; i++) {
+    if (!(c.x < aaa[i].x0 || c.x > aaa[i].x1 || c.y < aaa[i].y0 || c.y > aaa[i].y1)) {
+      // check if drawing ongoing
+      if (drawingID > 0) {
+        // check if interrupt is set
+        if (aaa[i].interrupt) {
+          // stop ongoing drawing
+          drawingID++;
+          if (ATID) ATID = clearTimeout(ATID);
         } else {
-          // correct color to display a canceled consecutive sleeping period
-          g.setColor(statusColor[3]);
+          // do nothing
+          return;
         }
-        // stop counting consecutive sleeping hours
-        consecutive = 0;
       }
-    } else {
-      // count durations of non sleeping periods for consecutive sleeping
-      if (consecutive) consecutive += element[3];
+      // give feedback
+      Bangle.buzz(25);
+      // execute action
+      aaa[i].funct();
     }
-
-    // calculate points
-    var x1 = Math.ceil(element[1] / period * width);
-    var x2 = Math.floor(element[2] / period * width);
-    var y2 = y - graphHeight * statusValue[element[0]];
-    // draw bar
-    g.clearRect(x1, topY, x2, y);
-    g.fillRect(x1, y, x2, y2).reset();
-    if (y !== y2) g.fillRect(x1, y2, x2, y2);
-  });
-
-  // clear variables
-  log = undefined;
-
-  // return convert output into minutes
-  return output.map(value => value /= 6E4);
-}
-
-// define function to draw the analysis
-function drawAnalysis(toDate) {
-  //var t0 = Date.now();
-
-  // get width
-  var width = g.getWidth();
-
-  // define variable for sleep calculation
-  var outputs = [0, 0]; // [estimated, true]
-
-  // 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
-  g.setFont("6x8").setFontAlign(-1, -1);
-  g.drawString("consecutive\nsleeping", 10, 70);
-  g.drawString("true\nsleeping", 10, 90);
-  g.setFont("12x20").setFontAlign(1, -1);
-  g.drawString(Math.floor(outputs[0] / 60) + "h " +
-    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() {
-  readSettings(storage.readJSON("sleeplog.json", true) || {});
-  drawNightTo(prevDays);
-  Bangle.setUI("leftright", (cb) => {
-    if (!cb) {
-      eval(storage.read("sleeplog.settings.js"))(startApp);
-    } else if (prevDays + cb >= -1) {
-      drawNightTo((prevDays += cb));
+// swipe listener for switching the displayed day
+function swipeListener(h, v) {
+  // give feedback
+  Bangle.buzz(25);
+  // set previous or next day
+  prevDays += h;
+  if (prevDays < -1) prevDays = -1;
+  // redraw
+  draw();
+}
+
+// day selection
+function daySelection() {
+  var date = Date(startDate - prevDays * 864E5).toString().split(" ");
+  E.showPrompt(date.slice(0, 3).join(" ") + "\n" + date[3] + "\n" +
+    prevDays + /*LANG*/" days before today", {
+      title: /*LANG*/"Select Day",
+      buttons: {
+        "<<7": 7,
+        "<1": 1,
+        "Ok": 0,
+        "1>": -1,
+        "7>>": -7
+      }
+    }).then(function(v) {
+    if (v) {
+      prevDays += v;
+      if (prevDays < -1) prevDays = -1;
+      daySelection();
+    } else {
+      fromMenu();
     }
   });
 }
 
-// define day to display and analysis timeout id
-var prevDays = 0;
-var ATID;
+// open settings menu
+function openSettings() {
+  // disable back behaviour to prevent bouncing on return
+  backListener = () => {};
+  // open settings menu
+  eval(require("Storage").read("sleeplog.settings.js"))(fromMenu);
+}
 
-// setup app
-g.clear();
+// draw progress as bar, increment on undefined percentage
+function drawProgress(progress) {
+  g.fillRect(19, 147, 136 * progress + 19, 149);
+}
+
+// (re)draw info data
+function drawInfo() {
+  // set active info type
+  var info = infoData[infoType % infoData.length];
+  // draw info
+  g.clearRect(0, 69, 175, 105).reset()
+    .setFont("6x8").setFontAlign(-1, -1)
+    .drawString(info[0][0], 10, 70)
+    .drawString(info[1][0], 10, 90)
+    .setFont("12x20").setFontAlign(1, -1)
+    .drawString((info[0][1] / 60 | 0) + "h " + (info[0][1] % 60) + "min", 166, 70)
+    .drawString((info[1][1] / 60 | 0) + "h " + (info[1][1] % 60) + "min", 166, 90);
+  // free ram
+  info = undefined;
+}
+
+
+// draw graph for log segment
+function drawGraph(log, date, pos) {
+  // set y position
+  var y = pos ? 144 : 110;
+  // clear area
+  g.reset().clearRect(0, y, width, y + 33);
+  // draw x axis
+  g.drawLine(0, y + 19, width, y + 19);
+  // draw x label
+  var stepWidth = width / 12;
+  var startHour = date.getHours() + (pos ? 0 : 12);
+  for (var x = 0; x < 12; x++) {
+    g.fillRect(x * stepWidth, y + 20, x * stepWidth, y + 22);
+    g.setFontAlign(-1, -1).setFont("6x8")
+      .drawString((startHour + x) % 24, x * stepWidth + 1, y + 24);
+  }
+
+  // set height and color values:
+  // status: unknown, not worn, awake, light sleep, deep sleep, consecutive
+  // color:  black,   red,      green, cyan,        blue,       violet
+  var heights = [0, 0.4, 0.6, 0.8, 1];
+  var colors = [0, 63488, 2016, 2047, 31, 32799];
+
+  // cycle through log
+  log.forEach((entry, index, log) => {
+    // calculate positions
+    var x1 = Math.ceil((entry[0] - log[0][0]) / 72 * width);
+    var x2 = Math.floor(((log[index + 1] || [date / 6E5])[0] - log[0][0]) / 72 * width);
+    // calculate y2 position
+    var y2 = y + 18 * (1 - heights[entry[1]]);
+    // set color depending on status and consecutive sleep
+    g.setColor(colors[entry[2] === 2 ? 5 : entry[1]]);
+    // clear area, draw bar and top line
+    g.clearRect(x1, y, x2, y + 18);
+    g.fillRect(x1, y + 18, x2, y2).reset();
+    if (y + 18 !== y2) g.fillRect(x1, y2, x2, y2);
+  });
+}
+
+// draw information in an interruptable cycle
+function drawingCycle(calcDate, thisID, cycle, log) {
+  // reset analysis timeout ID
+  ATID = undefined;
+
+  // check drawing ID to continue
+  if (thisID !== drawingID) return;
+
+  // check cycle
+  if (!cycle) {
+    /* read log on first cycle */
+    // set initial cycle
+    cycle = 1;
+
+    // read log
+    log = slMod.readLog(calcDate - 864E5, calcDate);
+
+    // draw progress
+    drawProgress(0.6);
+  } else if (cycle === 2) {
+    /* draw stats on second cycle */
+
+    // read stats and process into info data
+    infoData = slMod.getStats(calcDate, 0, log);
+    infoData = [
+      [
+        [ /*LANG*/"consecutive\nsleeping", infoData.consecSleep],
+        [ /*LANG*/"true\nsleeping", infoData.deepSleep + infoData.lightSleep]
+      ],
+      [
+        [ /*LANG*/"deep\nsleep", infoData.deepSleep],
+        [ /*LANG*/"light\nsleep", infoData.lightSleep]
+      ],
+      [
+        [ /*LANG*/"awake", infoData.awakeTime],
+        [ /*LANG*/"not worn", infoData.notWornTime]
+      ]
+    ];
+    // draw info
+    drawInfo();
+
+    // draw progress
+    drawProgress(0.9);
+  } else if (cycle === 3) {
+    /* segment log on third cycle */
+    // calculate segmentation date in 10min steps and index of the segmentation
+    var segmDate = calcDate / 6E5 - 72;
+    var segmIndex = log.findIndex(entry => entry[0] >= segmDate);
+
+    // check if segmentation neccessary
+    if (segmIndex > 0) {
+      // split log
+      log = [log.slice(segmIndex), log.slice(0, segmIndex)];
+      // add entry at segmentation point
+      if (log[0][0] !== segmDate)
+        log[0].unshift([segmDate, log[1][segmIndex - 1][1], log[1][segmIndex - 1][2]]);
+    } else if (segmIndex < 0) {
+      // set log as second log entry
+      log = [
+        [], log
+      ];
+    } else {
+      // add entry at segmentation point
+      if (log[0] !== segmDate) log.unshift([segmDate, 0, 0]);
+      // set log as first log entry
+      log = [log, []];
+    }
+
+    // draw progress
+    drawProgress(1);
+  } else if (cycle === 4) {
+    /* draw upper graph on fourth cycle */
+    drawGraph(log[0], calcDate, 0);
+  } else if (cycle === 5) {
+    /* draw upper graph on fifth cycle */
+    drawGraph(log[1], calcDate, 1);
+  } else {
+    /* stop cycle and set drawing finished */
+    drawingID = 0;
+    // give feedback
+    Bangle.buzz(25);
+  }
+
+  // initiate next cycle if defined
+  if (thisID === drawingID) ATID = setTimeout(drawingCycle, 10, calcDate, drawingID, ++cycle, log);
+}
+
+// return from a menu
+function fromMenu() {
+  // reset UI to custom mode
+  Bangle.setUI(customUI);
+  // enable back behaviour delayed to prevent bouncing
+  setTimeout(() => backListener = load, 500);
+  // redraw app
+  draw();
+}
+
+// draw app
+function draw() {
+  // stop ongoing drawing
+  drawingID++;
+  if (ATID) ATID = clearTimeout(ATID);
+
+  // clear app area
+  g.reset().clearRect(0, 24, width, width);
+
+  // set date to calculate data for
+  var calcDate = new Date(startDate - prevDays * 864E5);
+
+  // draw title
+  g.setFont("12x20").setFontAlign(0, -1)
+    .drawString( /*LANG*/"Night to " + require('locale').dow(calcDate, 1) + "\n" +
+      require('locale').date(calcDate, 1), 87, 28);
+
+  // reset graphics and define image string
+  g.reset();
+  var imgStr = "";
+  // check which icon to set
+  if (!global.sleeplog || sleeplog.conf.enabled !== true) {
+    // set color and disabled service icon
+    g.setColor(1, 0, 0);
+    imgStr = "FBSBAOAAfwAP+AH3wD4+B8Hw+A+fAH/gA/wAH4AB+AA/wAf+APnwHw+D4Hx8A++AH/AA/gAH";
+  } else if (sleeplog.debug) {
+    // set debugging icon
+    imgStr = typeof sleeplog.debug === "object" ?
+      "FBSBAB/4AQDAF+4BfvAX74F+CBf+gX/oFJKBf+gUkoF/6BSSgX/oFJ6Bf+gX/oF/6BAAgf/4" : // file
+      "FBSBAP//+f/V///4AAGAABkAAZgAGcABjgAYcAGDgBhwAY4AGcABmH+ZB/mAABgAAYAAH///"; // console
+  }
+  // draw service and settings icon
+  if (imgStr) g.drawImage(atob(imgStr), 2, 36);
+  g.reset().drawImage(atob("FBSBAAAeAAPgAHwAB4AA8AAPAwDwcA+PAP/wH/4D/8B/8A/gAfwAP4AH8AD+AA/AAPgABwAA"), width - 22, 36);
+
+  // show loading info with progresss bar
+  g.reset().drawRect(7, 117, width - 8, 157)
+    .setFont("6x8").setFontAlign(0, 0)
+    .drawString( /*LANG*/ "calculating data ...\nplease be patient :)", 87, 133)
+    .drawRect(17, 145, 157, 151);
+
+  // draw first progress
+  drawProgress(0.1);
+
+  // initiate drawing cycle
+  ATID = setTimeout(drawingCycle, 10, calcDate, drawingID, 0);
+}
+
+// define sleeplog module
+var slMod = require("sleeplog");
+
+// read app timeout from settings
+var appTimeout = (require("Storage").readJSON("sleeplog.json", true) || {}).appTimeout;
+
+// set listener for back button
+var backListener = load;
+// define custom UI mode
+var customUI = {
+  mode: "custom",
+  back: backListener,
+  touch: touchListener,
+  swipe: swipeListener
+};
+
+// define start values
+var startDate = slMod.getLastBreak(); // date to start from
+var prevDays = 0; //  number of previous days to display
+var infoType = 0; //  type of info data to display
+var infoData; //      storage for info data
+var ATID; //          analysis timeout ID
+var drawingID = 0; // drawing ID for ongoing process
+// get screen width and center (zero based)
+var width = g.getWidth() - 1;
+var center = width / 2 - 1;
+
+// set areas and actions array
+var aaa = [
+  // day selection
+  {
+    x0: 26,
+    x1: width - 26,
+    y0: 24,
+    y1: 68,
+    interrupt: true,
+    funct: () => daySelection()
+  },
+  // open settings
+  {
+    x0: width - 26,
+    x1: width,
+    y0: 24,
+    y1: 68,
+    interrupt: true,
+    funct: () => openSettings()
+  },
+  // change info type
+  {
+    x0: 0,
+    x1: width,
+    y0: 69,
+    y1: 105,
+    funct: () => {
+      // change info type
+      infoType++;
+      // redraw info
+      drawInfo();
+    }
+  }
+];
+
+// clear and reset screen
+g.clear(true);
+
+// load and draw widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
-// start app
-startApp();
+// set UI in custom mode
+Bangle.setUI(customUI);
+
+// set app timeout if defined
+if (appTimeout) Bangle.setOptions({
+  lockTimeout: appTimeout,
+  backlightTimeout: appTimeout
+});
+
+// draw app
+draw();
diff --git a/apps/sleeplog/boot.js b/apps/sleeplog/boot.js
index f989e2835..c1f8a2d2d 100644
--- a/apps/sleeplog/boot.js
+++ b/apps/sleeplog/boot.js
@@ -1,169 +1,330 @@
-// Sleep/Wake detection with Estimation of Stationary Sleep-segments (ESS):
-// 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:
+// undefined = service stopped,  0 = unknown, 1 = not worn, 2 = awake, 3 = light sleep, 4 = deep sleep
+// sleeplog.consecutive values:
+// undefined = service stopped,  0 = unknown, 1 = no consecutive sleep, 2 = consecutive sleep
 
-// 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 sleeplog[property]);
-
-// check if service enabled
-if (sleeplog.enabled) {
-
-  // add always used values and functions to global object
-  sleeplog = Object.assign(sleeplog, {
-    // set cached values
-    resting: undefined,
-    status: undefined,
-
-    // 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 function to remove the kill listener and stop the service
-    // https://github.com/espruino/BangleApps/issues/1445
-    stop: function() {
-      E.removeListener('kill', sleeplog.stopHandler);
-      sleeplog.stopHandler();
-    },
+// create global object with settings
+global.sleeplog = {
+  conf: Object.assign({
+    // main settings
+    enabled: true, //   en-/disable completely
+    // threshold settings
+    maxAwake: 36E5, //  [ms] maximal awake time to count for consecutive sleep
+    minConsec: 18E5, // [ms] minimal time to count for consecutive sleep
+    deepTh: 100, //     threshold for deep sleep
+    lightTh: 200, //    threshold for light sleep
+  }, require("Storage").readJSON("sleeplog.json", true) || {})
+};
 
+// check if service is enabled
+if (sleeplog.conf.enabled) {
+  // assign functions to global object
+  global.sleeplog = Object.assign({
     // define function to initialy start or restart the service
     start: function() {
-      // add kill listener
-      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]);
+      // add kill and health listener
+      E.on('kill', sleeplog.saveStatus);
+      Bangle.on('health', sleeplog.health);
+
+      // restore saved status
+      this.restoreStatus();
+    },
+
+    // define function to stop the service, it will be restarted on reload if enabled
+    stop: function() {
+      // remove all listeners
+      Bangle.removeListener('health', sleeplog.health);
+      E.removeListener('kill', sleeplog.saveStatus);
+
+      // save active values
+      this.saveStatus();
+      // reset active values
+      this.status = undefined;
+      this.consecutive = undefined;
+    },
+
+    // define function to restore active values on a restart or reload
+    restoreStatus: function() {
+      // define restore objects with default values
+      var restore = {
+        status: 0,
+        consecutive: 0,
+        info: {}
+      };
+
+      // open log file
+      var file = require("Storage").open("sleeplog.log", "r");
+      // read last 55 chars from log
+      file.read(file.getLength() - 52);
+      file = file.read(52);
+
+      // check if the log contains data
+      if (file) {
+        // remove unneeded data
+        file = file.trim().split("\n").reverse().filter((e, i) => i < 2);
+        // convert file into accessable array
+        file = file.map(e => e.split(",").map(e => parseInt(e)));
+
+        // add default data if no previous status is available
+        if (file.length < 2 || file[1].length !== 3) file.push([0, 0, 0]);
+
+        // check if data to restore has been saved
+        if (file[0].length > 3) {
+          // read data into restore object
+          restore = {
+            status: file[1][1],
+            consecutive: file[1][2],
+            info: {
+              lastChange: file[1][0] * 6E5,
+              lastCheck: file[0][1] * 6E5,
+              awakeSince: file[0][2] * 6E5,
+              asleepSince: file[0][3] * 6E5
+            }
+          };
+
+          // add debug if set
+          if (file[0].length === 6)
+            restore = Object.assign(restore, {
+              debug: file[0][4] ? {
+                writeUntil: file[0][4] * 6E5,
+                fileid: file[0][5]
+              } : true
+            });
+
+          // calculate timestamp in 10min steps, corrected to 10min ago
+          var timestamp = (Date.now() / 6E5 | 0) - 1;
+
+          // check if restored status not unknown and lastCheck was 20min before timestamp
+          if (restore.status && restore.info.lastCheck + 12E5 < timestamp) {
+            // set status and consecutive to unknown
+            restore.status = 0;
+            restore.consecutive = 0;
+            restore.info.lastChange = restore.info.lastCheck + 6E5;
+            restore.info.lastCheck = timestamp;
+            // write undefined status 10min after restored lastCheck
+            this.appendStatus(restore.info.lastChange, 0, 0);
+          } else {
+            // set saveUpToDate
+            restore.info.saveUpToDate = true;
+          }
+        }
+      }
+
+      // write restored values into global object
+      global.sleeplog = Object.assign(this, restore);
+    },
+
+    // define function to save active values on a stop or kill event
+    // - called by event listener: "this"-reference points to global
+    saveStatus: function(force) {
+      // check if global variable accessable
+      if (!global.sleeplog) return new Error("sleeplog: Can't save status, global object missing!");
+
+      // check saveUpToDate is not set or forced
+      if (!sleeplog.info.saveUpToDate || force) {
+        // save status, consecutive status and info timestamps to restore on reload
+        var save = [sleeplog.info.lastCheck, sleeplog.info.awakeSince, sleeplog.info.asleepSince];
+        // add debuging status if active 
+        if (sleeplog.debug) save.push(sleeplog.debug.writeUntil, sleeplog.debug.fileid);
+
+        // stringify entries
+        save = "," + save.map((entry, index) => {
+          if (index < 4) entry /= 6E5; // store in 10min steps
+          return entry | 0; // sanitize
+        }).join(",") + "\n";
+
+        // add present status if forced
+        if (force) save = (sleeplog.info.lastChange / 6E5) + "," +
+          sleeplog.status + "," + sleeplog.consecutive + "\n" + save;
+
+        // append saved data to StorageFile
+        require("Storage").open("sleeplog.log", "a").write(save);
+
+        // clear save string to free ram
+        save = undefined;
+      }
+    },
+
+    // define health listener function
+    // - called by event listener: "this"-reference points to global
+    health: function(data) {
+      // check if global variable accessable
+      if (!global.sleeplog) return new Error("sleeplog: Can't process health event, global object missing!");
+
+      // check if movement is available
+      if (!data.movement) return;
+
+      // add timestamp rounded to 10min, corrected to 10min ago
+      data.timestamp = data.timestamp || ((Date.now() / 6E5 | 0) - 1) * 6E5;
+
+      // add preliminary status depending on charging and movement thresholds
+      data.status = Bangle.isCharging() ? 1 :
+        data.movement <= sleeplog.conf.deepTh ? 4 :
+        data.movement <= sleeplog.conf.lightTh ? 3 : 2;
+
+      // check if changing to deep sleep from non sleepling
+      if (data.status === 4 && sleeplog.status <= 2) {
+        // check wearing status
+        sleeplog.checkIsWearing((isWearing, data) => {
+          // correct status
+          if (!isWearing) data.status = 1;
+          // set status
+          sleeplog.setStatus(data);
+        }, data);
+      } else {
+        // set status
+        sleeplog.setStatus(data);
+      }
+    },
+
+    // define function to check if the bangle is worn by using the hrm
+    checkIsWearing: function(returnFn, data) {
+      // create a temporary object to store data and functions
+      global.tmpWearingCheck = {
+        // define temporary hrm listener function to read the wearing status
+        hrmListener: hrm => tmpWearingCheck.isWearing = hrm.isWearing,
+        // set default wearing status
+        isWearing: false,
+      };
+
+      // enable HRM
+      Bangle.setHRMPower(true, "wearingCheck");
+      // wait until HRM is initialised
+      setTimeout((returnFn, data) => {
+        // add HRM listener
+        Bangle.on('HRM-raw', tmpWearingCheck.hrmListener);
+        // wait for two cycles (HRM working on 60Hz)
+        setTimeout((returnFn, data) => {
+          // remove listener and disable HRM
+          Bangle.removeListener('HRM-raw', tmpWearingCheck.hrmListener);
+          Bangle.setHRMPower(false, "wearingCheck");
+          // cache wearing status
+          var isWearing = tmpWearingCheck.isWearing;
+          // clear temporary object
+          delete global.tmpWearingCheck;
+          // call return function with status
+          returnFn(isWearing, data);
+        }, 34, returnFn, data);
+      }, 2500, returnFn, data);
+    },
+
+    // define function to set the status
+    setStatus: function(data) {
+      // update lastCheck
+      this.info.lastCheck = data.timestamp;
+
+      // correct light sleep status to awake if
+      //  previous status not deep sleep and not too long awake (asleepSince unset)
+      if (data.status === 3 && this.status !== 4 && !this.info.asleepSince) {
+        data.status = 2;
+      }
+
+      // cache consecutive status to check for changes later on
+      data.consecutive = this.consecutive;
+
+      // check if changing to deep sleep from non sleepling
+      if (data.status === 4 && this.status <= 2) {
+        // set asleepSince if undefined
+        this.info.asleepSince = this.info.asleepSince || data.timestamp;
+        // reset consecutive status
+        data.consecutive = 0;
+        // check if changing to awake
+      } else if (data.status === 2 && this.status > 2) {
+        // set awakeSince if undefined
+        this.info.awakeSince = this.info.awakeSince || data.timestamp;
+        // reset consecutive status
+        data.consecutive = 0;
+      }
+      // check if consecutive unknown
+      if (!this.consecutive) {
+        // check if long enough asleep or too long awake
+        if (data.status === 4 && this.info.asleepSince &&
+          this.info.asleepSince + this.conf.minConsec <= data.timestamp) {
+          // set consecutive sleep
+          data.consecutive = 2;
+          // reset awakeSince
+          this.info.awakeSince = 0;
+        } else if (data.status <= 2 && this.info.awakeSince &&
+          this.info.awakeSince + this.conf.maxAwake <= data.timestamp) {
+          // set non consecutive sleep
+          data.consecutive = 1;
+          // reset asleepSince
+          this.info.asleepSince = 0;
+        }
+      }
+
+      // cache change into a known consecutive state
+      var changeIntoConsec = data.consecutive;
+
+      // check if the status has changed
+      if (data.status !== this.status || data.consecutive !== this.consecutive) {
+        // append status
+        this.appendStatus(data.timestamp, data.status, data.consecutive);
+
+        // set new states and update lastChange
+        this.status = data.status;
+        this.consecutive = data.consecutive;
+        this.info.lastChange = data.timestamp;
+        // reset saveUpToDate status
+        delete this.info.saveUpToDate;
+      }
+      
+      // send status to gadgetbridge
+      var gb_kinds = "unknown,not_worn,activity,light_sleep,deep_sleep";
+      Bluetooth.println(JSON.stringify({
+        t: "act",
+        act: gb_kinds.split(",")[data.status],
+        ts: data.timestamp
+      }));
+
+      // call debugging function if set
+      if (this.debug) require("sleeplog").debug(data);
+
+      // check if changed into known consecutive state
+      if (changeIntoConsec) {
+        // check if change is to consecutive sleep or not
+        if (changeIntoConsec === 2) {
+          // call move log function
+          require("sleeplog").moveLog();
+        } else {
+          // update stats cache if available
+          if (this.statsCache) this.statsCache = require("sleeplog").getStats();
+        }
+        // remove module from cache if cached
+        if (Modules.getCached().includes("sleeplog")) Modules.removeCached("sleeplog");
+      }
+    },
+
+    // define function to append the status to the StorageFile log
+    appendStatus: function(timestamp, status, consecutive) {
+      // exit on missing timestamp
+      if (!timestamp) return;
+      // reduce timestamp to 10min step
+      timestamp = timestamp / 6E5 | 0;
+      // append to StorageFile
+      require("Storage").open("sleeplog.log", "a").write(
+        [timestamp, status || 0, consecutive || 0].join(",") + "\n"
+      );
+    },
+
+    // define function to access stats of the last night
+    getStats: function() {
+      // check if stats cache is not defined or older than 12h
+      //  if stats cache is set it will be updated on every change to non consecutive sleep
+      if (this.statsCache === undefined || this.statsCache.calculatedAt + 432E5 < Date.now()) {
+        // read stats of the last night into cache and remove module from cache
+        this.statsCache = require("sleeplog").getStats();
+        // remove module from cache if cached
+        if (Modules.getCached().includes("sleeplog")) Modules.removeCached("sleeplog");
+      }
+      // return stats cache
+      return this.statsCache;
     }
-  });
-
-  // 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]);
-          }
-        }
-      }
-    });
-  }
+  }, sleeplog);
 
   // initial starting
   global.sleeplog.start();
+} else {
+  // clear global object from ram
+  delete global.sleeplog;
 }
diff --git a/apps/sleeplog/conf_20x20.png b/apps/sleeplog/conf_20x20.png
new file mode 100644
index 000000000..4de9e9184
Binary files /dev/null and b/apps/sleeplog/conf_20x20.png differ
diff --git a/apps/sleeplog/debug_20x20.png b/apps/sleeplog/debug_20x20.png
new file mode 100644
index 000000000..f98ca0a88
Binary files /dev/null and b/apps/sleeplog/debug_20x20.png differ
diff --git a/apps/sleeplog/disabled.png b/apps/sleeplog/disabled.png
deleted file mode 100644
index 8e7d9fb2c..000000000
Binary files a/apps/sleeplog/disabled.png and /dev/null differ
diff --git a/apps/sleeplog/file_20x20.png b/apps/sleeplog/file_20x20.png
new file mode 100644
index 000000000..e38399bc6
Binary files /dev/null and b/apps/sleeplog/file_20x20.png differ
diff --git a/apps/sleeplog/interface.html b/apps/sleeplog/interface.html
new file mode 100644
index 000000000..d59515275
--- /dev/null
+++ b/apps/sleeplog/interface.html
@@ -0,0 +1,185 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+  </head>
+  <body>
+    <div id="table"></div>
+    <div id="view"></div>
+    <script src="../../core/lib/interface.js"></script>
+    <script>
+var domTable = document.getElementById("table");
+var domView = document.getElementById("view");
+
+function viewLog(logData, filename) {
+  domView.innerHTML = "";
+  var html = `
+    <div class="container">
+      <h4><b>Viewing data of:</b> ` + filename + `</h4>
+    </div>
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Date</th>
+          <th>Time</th>
+          <th>Duration</th>
+          <th>Status</th>
+          <th>Sleep</th>
+        </tr>
+      </thead>
+      <tbody>`;
+  logData.forEach((entry, index, log) => {
+    var duration = ((log[index + 1] || [Math.floor(Date.now() / 6E5)])[0] - entry[0]) * 10;
+    html += `
+        <tr style="text-align: center">
+          <td style="text-align: right">` +
+            new Date(entry[0] * 6E5).toLocaleDateString(undefined) + `
+          </td>
+          <td>` +
+            new Date(entry[0] * 6E5).toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'}) + `
+          </td>
+          <td style="text-align: right"><div class="container"` + 
+            (duration >= 60 ? ` style="background-color: hsl(192, 50%, ` +
+              (duration > 480 ? 50 : 100 - Math.floor(duration / 60) * 50 / 8) +
+              `%)">` : `>`) +
+            duration + ` min
+          </td>
+          <td><div class="container" style="background-color: ` +
+            ["orange", "lightcoral", "lightgreen", "lightcyan", "lightskyblue"][entry[1]] + `">` +
+            ["unknown", "not worn", "awake", "light sleep", "deep sleep"][entry[1]] + `
+          </div></td>
+          <td><div class="container" style="background-color: ` +
+            ["orange", "lightgreen", "lightskyblue"][entry[2]] + `">` +
+            ["unknown", "non consecutive", "consecutive"][entry[2]] + `
+          </div></td>
+        </tr>`
+    });
+  html += `
+      </tbody>
+    </table>`;
+  domView.innerHTML = html;
+}
+
+function saveCSV(logData, date0, date1) {
+  var csvTime = document.getElementById("csvTime").selectedIndex;
+  var filename = "sleeplog_" +
+    new Date(date0).toISOString().substr(0, 10) + "_" +
+    new Date(date1).toISOString().substr(5, 5);
+  logData = logData.map(entry => {
+    entry[0] *= 6E5;
+    if (csvTime === 1) entry[0] /= 1E3;
+    if (csvTime === 2) entry[0] = entry[0] / 864E5 + 25569;
+    return entry.join(",");
+  }).join("\n");
+  Util.saveCSV(filename, "time,sleep,consecutive\n" + logData);
+}
+
+function readLog(date, callback) {
+  Util.showModal("Downloading logged data...");
+  Puck.eval(`require("sleeplog").readLog(` + date + `, ` + date + ` + 12096E5)`, logData => {
+    Util.hideModal();
+    callback(logData);
+  });
+}
+
+function deleteFile(filename, callback) {
+  if (window.confirm("Do you really want to remove " + filename)) {
+    Util.showModal("Deleting...");
+    if (filename.endsWith(" (StorageFile)")) {
+      Util.eraseStorageFile(filename, () => {
+        Util.hideModal();
+        callback();
+      });
+    } else {
+      Util.eraseStorage(filename, () => {
+        Util.hideModal();
+        callback();
+      });
+    }
+  }
+}
+
+function viewFiles() {
+  Util.showModal("Loading...");
+  domTable.innerHTML = "";
+  Puck.eval(`require("Storage").list(/^sleeplog_\\d\\d\\d\\d\\.log$/)`, files => {
+    // add active log
+    files.push("" + Math.floor(Date.now() / 12096E5 - 0.25));
+    files = files.map(file => { return {
+      filename: file.length === 4 ? "sleeplog.log (StorageFile)" : file,
+      date: (parseInt(file.match(/\d{4}/)[0]) + 0.25) * 12096E5
+    }});
+    files = files.sort((a, b) => a.date - b.date);
+    var html = `
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>File</th>
+          <th>from</th>
+          <th>to</th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+      <tbody>`;
+    files.forEach(file => { html += `
+        <tr>
+          <td>${file.filename}</td>
+          <td>${new Date(file.date).toLocaleDateString(undefined)}</td>
+          <td>${new Date(file.date + 12096E5).toLocaleDateString(undefined)}</td>
+          <td>
+            <button class="btn btn-sm tooltip" data-tooltip="view data" task="view" filename="${file.filename}" date="${file.date}">
+              <i class="icon icon-caret"></i>
+            </button>
+            <button class="btn btn-sm tooltip btn-primary" data-tooltip="save csv-file" task="csv" filename="${file.filename}" date="${file.date}">
+              <i class="icon icon-download"></i>
+            </button>
+            <button class="btn btn-sm tooltip btn-error" data-tooltip="delete file" task="del" filename="${file.filename}" date="${file.date}">
+              <i class="icon icon-delete"></i>
+            </button>`;
+      html += `
+          </td>
+        </tr>`;
+    });
+    html += `
+      </tbody>
+    </table>
+    <div class="container">
+      <form class="form-horizontal">
+        <div class="form-group">
+          <div class="col-3 col-sm-12">
+            <label class="form-label"><b>csv time format</b></label>
+          </div>
+          <div class="col-9 col-sm-12">
+            <select class="form-select" id="csvTime">
+              <option>JavaScript (milliseconds since 1970)</option>
+              <option>UNIX (seconds since 1970)</option>
+              <option>Office (days since 1900)</option>
+            </select>
+          </div>
+        </div>
+      </form>
+    </div>`;
+    domTable.innerHTML = html;
+    Util.hideModal();
+    var buttons = domTable.querySelectorAll("button");
+    for (var i = 0; i < buttons.length; i++) {
+      buttons[i].addEventListener("click", event => {
+        var button = event.currentTarget;
+        var task = button.getAttribute("task");
+        var filename = button.getAttribute("filename");
+        var date = button.getAttribute("date") - 0;
+        if (!task || !filename || !date) return;
+        if (task === "view") readLog(date, logData => viewLog(logData, filename));
+        else if (task === "csv") readLog(date, logData => saveCSV(logData, date, date + 12096E5));
+        else if (task === "del") deleteFile(filename, () => viewFiles());
+      });
+    }
+  });
+}
+
+function onInit() {
+  viewFiles();
+}
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/apps/sleeplog/lib.js b/apps/sleeplog/lib.js
index 752139e27..1919e7483 100644
--- a/apps/sleeplog/lib.js
+++ b/apps/sleeplog/lib.js
@@ -1,199 +1,465 @@
+// define accessable functions
 exports = {
   // 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
-    if ((typeof logfile !== "string" || !logfile.endsWith(".log")) &&
-      logfile !== false) logfile = "sleeplog.log";
-
+  setEnabled: function(enable) {
     // stop if enabled
-    if (global.sleeplog.enabled) global.sleeplog.stop();
+    if (global.sleeplog && sleeplog.enabled) sleeplog.stop();
 
-    // define storage and filename
-    var storage = require("Storage");
-    var filename = "sleeplog.json";
+    // define settings filename
+    var settings = "sleeplog.json";
 
     // change enabled value in settings
-    storage.writeJSON(filename, Object.assign(storage.readJSON(filename, true) || {}, {
-      enabled: enable,
-      logfile: logfile,
-      powersaving: powersaving || false
-    }));
+    require("Storage").writeJSON(settings, Object.assign(
+      require("Storage").readJSON(settings, true) || {}, {
+        enabled: enable
+      }
+    ));
 
     // force changes to take effect by executing the boot script
-    eval(storage.read("sleeplog.boot.js"));
+    eval(require("Storage").read("sleeplog.boot.js"));
 
-    // clear variables
-    storage = undefined;
-    filename = undefined;
     return true;
   },
 
-  // define read log function
-  // sorting: latest first, format:
-  // [[number, int, float, string], [...], ... ]
-  // - number // timestamp in ms
-  // - int    // status: 0 = unknown, 1 = not worn, 2 = awake, 3 = sleeping
-  // - float  // internal temperature
-  // - string // additional information
-  readLog: function(logfile, since, until) {
-    // check/set logfile
-    if (typeof logfile !== "string" || !logfile.endsWith(".log")) {
-      logfile = (global.sleeplog || {}).logfile || "sleeplog.log";
+  // define read log function, returns log array
+  // sorting: ascending (latest first), format:
+  // [[number, int, int], [...], ... ]
+  // - number // timestamp in 10min
+  // - int    // status: 0 = unknown, 1 = not worn, 2 = awake, 3 = light sleep, 4 = deep sleep
+  // - int    // consecutive: 0 = unknown, 1 = no consecutive sleep, 2 = consecutive sleep
+  readLog: function(since, until) {
+    // set now and check if now is before since
+    var now = Date.now();
+    if (now < since) return [];
+
+    // set defaults and convert since, until and now to 10min steps
+    since = Math.floor((since || 0) / 6E5);
+    until = Math.ceil((until || now) / 6E5);
+    now = Math.ceil(now / 6E5);
+
+    // define output log
+    var log = [];
+
+    // open StorageFile
+    var file = require("Storage").open("sleeplog.log", "r");
+    // cache StorageFile size
+    var storageFileSize = file.getLength();
+    // check if a Storage File needs to be read
+    if (storageFileSize) {
+      // define previous line cache
+      var prevLine;
+      // loop through StorageFile entries
+      while (true) {
+        // cache new line
+        var line = file.readLine();
+        // exit loop if all lines are read
+        if (!line) break;
+        // skip lines starting with ","
+        if (line.startsWith(",")) continue;
+        // parse line
+        line = line.trim().split(",").map(e => parseInt(e));
+        // exit loop if new line timestamp is not before until
+        if (line[0] >= until) break;
+        // check if new line timestamp is 24h before since or not after since
+        if (line[0] + 144 < since) {
+          // skip roughly the next 10 lines
+          file.read(118);
+          file.readLine();
+        } else if (line[0] <= since) {
+          // cache line for next cycle
+          prevLine = line;
+        } else {
+          // add previous line if it was cached
+          if (prevLine) log.push(prevLine);
+          // add new line at the end of log
+          log.push(line);
+          // clear previous line cache
+          prevLine = undefined;
+        }
+      }
+      // add previous line if it was cached
+      if (prevLine) log.push(prevLine);
+      // set unknown consecutive statuses
+      log = log.reverse().map((entry, index) => {
+        if (entry[2] === 0) entry[2] = (log[index - 1] || [])[2] || 0;
+        return entry;
+      }).reverse();
+      // remove duplicates
+      log = log.filter((entry, index) =>
+        !(index > 0 && entry[1] === log[index - 1][1] && entry[2] === log[index - 1][2])
+      );
     }
 
-    // check if since is in the future
-    if (since > Date()) return [];
+    // check if log empty or first entry is after since
+    if (!log[0] || log[0][0] > since) {
+      // look for all needed storage files
+      var files = require("Storage").list(/^sleeplog_\d\d\d\d\.log$/, {
+        sf: false
+      });
 
-    // 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) || [];
+      // check if any file available
+      if (files.length) {
+        // generate start and end times in 10min steps
+        files = files.map(file => {
+          var start = this.fnToMs(parseInt(file.substr(9, 4))) / 6E5;
+          return {
+            name: file,
+            start: start,
+            end: start + 2016
+          };
+        }).sort((a, b) => b.start - a.start);
 
-    // 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)));
+        // read all neccessary files
+        var filesLog = [];
+        files.some(file => {
+          // exit loop if since after end
+          if (since >= file.end) return true;
+          // read file if until after start and since before end
+          if (until > file.start || since < file.end) {
+            var thisLog = require("Storage").readJSON(file.name, 1) || [];
+            if (thisLog.length) filesLog = thisLog.concat(filesLog);
+          }
+        });
+        // free ram
+        files = undefined;
+
+        // check if log from files is available 
+        if (filesLog.length) {
+          // remove unwanted entries
+          filesLog = filesLog.filter((entry, index, filesLog) => (
+            (filesLog[index + 1] || [now])[0] >= since && entry[0] <= until
+          ));
+          // add to log as previous entries
+          log = filesLog.concat(log);
+        }
+        // free ram
+        filesLog = undefined;
+      }
     }
 
-    // output log
+    // define last index
+    var lastIndex = log.length - 1;
+    // set timestamp of first entry to since if first entry before since
+    if (log[0] && log[0][0] < since) log[0][0] = since;
+    // add timestamp at now with unknown status if until after now
+    if (until > now) log.push([now, 0, 0]);
+
     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";
+  // define move log function, move StorageFile content into files seperated by fortnights
+  moveLog: function(force) {
+    /** convert old logfile (< v0.10) if present **/
+    if (require("Storage").list("sleeplog.log", {
+        sf: false
+      }).length) {
+      convertOldLog();
     }
+    /** may be removed in later versions **/
 
-    // check if input is an array
-    if (typeof input !== "object" || typeof input.length !== "number") return;
+    // first day of this fortnight period
+    var thisFirstDay = this.fnToMs(this.msToFn(Date.now()));
 
-    // check for entry plausibility
-    if (input.length > 1 && input[0] * 1 > 9E11) {
-      // read log
-      var log = this.readLog(logfile);
+    // read timestamp of the first StorageFile entry
+    var firstDay = (require("Storage").open("sleeplog.log", "r").read(47) || "").match(/\n\d*/);
+    // calculate the first day of the fortnight period
+    if (firstDay) firstDay = this.fnToMs(this.msToFn(parseInt(firstDay[0].trim()) * 6E5));
 
-      // 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();
+    // check if moving is neccessary or forced
+    if (force || firstDay && firstDay < thisFirstDay) {
+      // read log for each fortnight period
+      while (firstDay) {
+        // calculate last day
+        var lastDay = firstDay + 12096E5;
+        // read log of the fortnight period
+        var log = require("sleeplog").readLog(firstDay, lastDay);
 
-      // 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);
+        // check if before this fortnight period
+        if (firstDay < thisFirstDay) {
+          // write log in seperate file
+          require("Storage").writeJSON("sleeplog_" + this.msToFn(firstDay) + ".log", log);
+          // set last day as first
+          firstDay = lastDay;
+        } else {
+          // rewrite StorageFile
+          require("Storage").open("sleeplog.log", "w").write(log.map(e => e.join(",")).join("\n"));
+          // clear first day to exit loop
+          firstDay = undefined;
+        }
 
-      // map log as input
-      input = log;
-    }
-
-    // check and if neccessary reduce logsize to prevent low mem
-    if (input.length > 750) input = input.slice(-750);
-
-    // 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, logfile) {
-    // read log and check
-    var log = this.readLog(logfile, since, until);
-    if (!log.length) return;
-    // reverse array to set last timestamp to the end
-    log.reverse();
-
-    // define status description and log string
-    var statusText = ["unknown ", "not worn", "awake   ", "sleeping"];
-    var logString = [];
-
-    // rewrite each entry
-    log.forEach((element, index) => {
-      logString[index] = "" +
-        Date(element[0] - Date().getTimezoneOffset() * 6E4).toISOString().substr(0, 19).replace("T", " ") + " - " +
-        statusText[element[1]] +
-        (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");
-
-    // if set print and return string
-    if (printLog) {
-      print(logString);
-      print("- first", Date(log[0][0]));
-      print("-  last", Date(log[log.length - 1][0]));
-      var period = log[log.length - 1][0] - log[0][0];
-      print("-     period= " + Math.floor(period / 864E5) + "d " + Math.floor(period % 864E5 / 36E5) + "h " + Math.floor(period % 36E5 / 6E4) + "min");
-    }
-    return logString;
-  },
-
-  // define function to eliminate some errors inside the log
-  restoreLog: function(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;
-
-    // remove non decremental entries
-    log = log.filter((element, index) => log[index][0] >= (log[index + 1] || [0])[0]);
-
-    // write log
-    this.writeLog(logfile, log);
-
-    // return difference in length
-    return output - log.length;
-  },
-
-  // define function to reinterpret worn status based on given temperature threshold
-  reinterpretTemp: function(logfile, tempthresh) {
-    // read log and check
-    var log = this.readLog(logfile);
-    if (!log.length) return;
-
-    // set default tempthresh
-    tempthresh = tempthresh || (global.sleeplog ? sleeplog.tempthresh : 27);
-
-    // define output variable to show number of changes
-    var output = 0;
-
-    // remove non decremental entries
-    log = log.map(element => {
-      if (element[2]) {
-        var tmp = element[1];
-        element[1] = element[2] > tempthresh ? 3 : 1;
-        if (tmp !== element[1]) output++;
+        // free ram
+        log = undefined;
       }
-      return element;
+    }
+  },
+
+  // define function to return stats from the last date [ms] for a specific duration [ms] or for the complete log
+  getStats: function(until, duration, log) {
+    // define stats variable
+    var stats = {
+      calculatedAt: //   [date] timestamp of the calculation
+        Math.round(Date.now()),
+      deepSleep: 0, //   [min] deep sleep duration
+      lightSleep: 0, //  [min] light sleep duration
+      awakeSleep: 0, //  [min] awake duration inside consecutive sleep
+      consecSleep: 0, // [min] consecutive sleep duration
+      awakeTime: 0, //   [min] awake duration outside consecutive sleep
+      notWornTime: 0, // [min] duration of not worn status
+      unknownTime: 0, // [min] duration of unknown status
+      logDuration: 0, // [min] duration of all entries taken into account
+      firstDate: undefined, // [date] first entry taken into account
+      lastDate: undefined // [date] last entry taken into account
+    };
+
+    // set default inputs
+    until = until || stats.calculatedAt;
+    if (!duration) duration = 864E5;
+
+    // read log for the specified duration or complete log if not handed over
+    if (!log) log = this.readLog(duration ? until - duration : 0, until);
+
+    // check if log not empty or corrupted
+    if (log && log.length && log[0] && log[0].length === 3) {
+      // calculate and set first log date from 10min steps
+      stats.firstDate = log[0][0] * 6E5;
+      stats.lastDate = log[log.length - 1][0] * 6E5;
+
+      // cycle through log to calculate sums til end or duration is exceeded
+      log.forEach((entry, index, log) => {
+        // calculate duration of this entry from 10min steps to minutes
+        var duration = ((log[index + 1] || [until / 6E5 | 0])[0] - entry[0]) * 10;
+
+        // check if duration greater 0
+        if (duration) {
+          // calculate sums
+          if (entry[1] === 4) stats.deepSleep += duration;
+          else if (entry[1] === 3) stats.lightSleep += duration;
+          else if (entry[1] === 2) {
+            if (entry[2] === 2) stats.awakeSleep += duration;
+            else if (entry[2] === 1) stats.awakeTime += duration;
+          }
+          if (entry[2] === 2) stats.consecSleep += duration;
+          if (entry[1] === 1) stats.notWornTime += duration;
+          if (entry[1] === 0) stats.unknownTime += duration;
+          stats.logDuration += duration;
+        }
+      });
+    }
+
+    // free ram
+    log = undefined;
+
+    // return stats of the last day
+    return stats;
+  },
+
+  // define function to return last break time of day from date or now (default: 12 o'clock)
+  getLastBreak: function(date, ToD) {
+    // set default date or correct date type if needed
+    if (!date || !date.getDay) date = date ? new Date(date) : new Date();
+    // set default ToD as set in sleeplog.conf or settings if available
+    if (ToD === undefined) ToD = (global.sleeplog && sleeplog.conf ? sleeplog.conf.breakToD :
+      (require("Storage").readJSON("sleeplog.json", true) || {}).breakToD) || 12;
+    // calculate last break time and return
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate(), ToD);
+  },
+
+  // define functions to convert ms to the number of fortnights since the first Sunday at noon: 1970-01-04T12:00
+  fnToMs: function(no) {
+    return (no + 0.25) * 12096E5;
+  },
+  msToFn: function(ms) {
+    return (ms / 12096E5 - 0.25) | 0;
+  },
+
+  // define set debug function, options:
+  //  enable as boolean, start/stop debugging
+  //  duration in hours, generate csv log if set, max: 96h
+  setDebug: function(enable, duration) {
+    // check if global variable accessable
+    if (!global.sleeplog) return new Error("sleeplog: Can't set debugging, global object missing!");
+
+    // check if nothing has to be changed
+    if (!duration &&
+      (enable && sleeplog.debug === true) ||
+      (!enable && !sleeplog.debug)) return;
+
+    // check if en- or disable debugging
+    if (enable) {
+      // define debug object
+      sleeplog.debug = {};
+
+      // check if a file should be generated
+      if (typeof duration === "number") {
+        // check duration boundaries, 0 => 8
+        duration = duration > 96 ? 96 : duration || 12;
+        // calculate and set writeUntil in 10min steps
+        sleeplog.debug.writeUntil = ((Date.now() / 6E5 | 0) + duration * 6) * 6E5;
+        // set fileid to "{hours since 1970}"
+        sleeplog.debug.fileid = Date.now() / 36E5 | 0;
+        // write csv header on empty file
+        var file = require("Storage").open("sleeplog_" + sleeplog.debug.fileid + ".csv", "a");
+        if (!file.getLength()) file.write(
+          "timestamp,movement,status,consecutive,asleepSince,awakeSince,bpm,bpmConfidence\n"
+        );
+        // free ram
+        file = undefined;
+      } else {
+        // set debug as active
+        sleeplog.debug = true;
+      }
+    } else {
+      // disable debugging
+      delete sleeplog.debug;
+    }
+
+    // save status forced
+    sleeplog.saveStatus(true);
+  },
+
+  // define debugging function, called after logging if debug is set
+  debug: function(data) {
+    // check if global variable accessable and debug active
+    if (!global.sleeplog || !sleeplog.debug) return;
+
+    // set functions to convert timestamps
+    function localTime(timestamp) {
+      return timestamp ? Date(timestamp).toString().split(" ")[4].substr(0, 5) : "- - -";
+    }
+    function officeTime(timestamp) {
+      // days since 30.12.1899
+      return timestamp / 864E5 + 25569;
+    }
+
+    // generate console output
+    var console = "sleeplog: " +
+      localTime(data.timestamp) + " > " +
+      "movement: " + ("" + data.movement).padStart(4) + ", " +
+      "unknown    ,non consec.,consecutive".split(",")[sleeplog.consecutive] + " " +
+      "unknown,not worn,awake,light sleep,deep sleep".split(",")[data.status].padEnd(12) + ", " +
+      "asleep since: " + localTime(sleeplog.info.asleepSince) + ", " +
+      "awake since: " + localTime(sleeplog.info.awakeSince);
+    // add bpm if set
+    if (data.bpm) console += ", " +
+      "bpm: " + ("" + data.bpm).padStart(3) + ", " +
+      "confidence: " + data.bpmConfidence;
+    // output to console
+    print(console);
+
+    // check if debug is set as object with a file id and it is not past writeUntil
+    if (typeof sleeplog.debug === "object" && sleeplog.debug.fileid &&
+      Date.now() < sleeplog.debug.writeUntil) {
+      // generate next csv line
+      var csv = [
+        officeTime(data.timestamp),
+        data.movement,
+        data.status,
+        sleeplog.consecutive,
+        sleeplog.info.asleepSince ? officeTime(sleeplog.info.asleepSince) : "",
+        sleeplog.info.awakeSince ? officeTime(sleeplog.info.awakeSince) : "",
+        data.bpm || "",
+        data.bpmConfidence || ""
+      ].join(",");
+      // write next line to log if set
+      require("Storage").open("sleeplog_" + sleeplog.debug.fileid + ".csv", "a").write(csv + "\n");
+    } else {
+      // clear file setting in debug
+      sleeplog.debug = true;
+    }
+
+  },
+
+  // print log as humanreadable output similar to debug output
+  printLog: function(since, until) {
+    // set default until
+    until = until || Date.now();
+    // print each entry inside log
+    this.readLog(since, until).forEach((entry, index, log) => {
+      // calculate duration of this entry from 10min steps to minutes
+      var duration = ((log[index + 1] || [until / 6E5 | 0])[0] - entry[0]) * 10;
+      // print this entry
+      print((index + ")").padStart(4) + " " +
+        Date(entry[0] * 6E5).toString().substr(0, 21) + " > " +
+        "unknown    ,non consec.,consecutive".split(",")[entry[2]] + " " +
+        "unknown,not worn,awake,light sleep,deep sleep".split(",")[entry[1]].padEnd(12) +
+        "for" + (duration + "min").padStart(8));
     });
+  },
 
-    // write log
-    this.writeLog(logfile, log);
+  /** convert old (< v0.10) to new logfile data **/
+  convertOldLog: function() {
+    // read old logfile
+    var oldLog = require("Storage").read("sleeplog.log") || "";
+    // decode data if needed 
+    if (!oldLog.startsWith("[")) oldLog = atob(oldLog);
+    // delete old logfile and return if it is empty or corrupted
+    if (!oldLog.startsWith("[[") || !oldLog.endsWith("]]")) {
+      require("Storage").erase("sleeplog.log");
+      return;
+    }
 
-    // return output
-    return output;
+    // transform into StorageFile and clear oldLog to have more free ram accessable
+    require("Storage").open("sleeplog_old.log", "w").write(JSON.parse(oldLog).reverse().join("\n"));
+    oldLog = undefined;
+
+    // calculate fortnight from now
+    var fnOfNow = this.msToFn(Date.now());
+
+    // open StorageFile with old log data
+    var file = require("Storage").open("sleeplog_old.log", "r");
+    // define active fortnight and file cache
+    var activeFn = true;
+    var fileCache = [];
+    // loop through StorageFile entries
+    while (activeFn) {
+      // define fortnight for this entry
+      var thisFn = false;
+      // cache new line
+      var line = file.readLine();
+      // check if line is filled
+      if (line) {
+        // parse line
+        line = line.substr(0, 15).split(",").map(e => parseInt(e));
+        // calculate fortnight for this entry
+        thisFn = this.msToFn(line[0]);
+        // convert timestamp into 10min steps
+        line[0] = line[0] / 6E5 | 0;
+        // set consecutive to unknown
+        line.push(0);
+      }
+      // check if active fortnight and file cache is set, fortnight has changed and
+      //  active fortnight is not fortnight from now
+      if (activeFn && fileCache.length && activeFn !== thisFn && activeFn !== fnOfNow) {
+        // write file cache into new file according to fortnight
+        require("Storage").writeJSON("sleeplog_" + activeFn + ".log", fileCache);
+        // clear file cache
+        fileCache = [];
+      }
+      // add line to file cache if it is filled
+      if (line) fileCache.push(line);
+      // set active fortnight
+      activeFn = thisFn;
+    }
+    // check if entries are leftover
+    if (fileCache.length) {
+      // format fileCache entries into a string
+      fileCache = fileCache.map(e => e.join(",")).join("\n");
+      // read complete new log StorageFile as string
+      file = require("Storage").open("sleeplog.log", "r");
+      var newLogString = file.read(file.getLength());
+      // add entries at the beginning of the new log string
+      newLogString = fileCache + "\n" + newLogString;
+      // rewrite new log StorageFile
+      require("Storage").open("sleeplog.log", "w").write(newLogString);
+    }
+
+    // free ram
+    file = undefined;
+    fileCache = undefined;
+
+    // clean up old files
+    require("Storage").erase("sleeplog.log");
+    require("Storage").open("sleeplog_old.log", "w").erase();
   }
-
+  /** may be removed in later versions **/
 };
diff --git a/apps/sleeplog/metadata.json b/apps/sleeplog/metadata.json
index c4dbe8631..f6ce661e8 100644
--- a/apps/sleeplog/metadata.json
+++ b/apps/sleeplog/metadata.json
@@ -2,27 +2,32 @@
   "id":"sleeplog",
   "name":"Sleep Log",
   "shortName": "SleepLog",
-  "version": "0.06",
-  "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.",
+  "version": "0.11",
+  "description": "Log and view your sleeping habits. This app is using the built in movement calculation.",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,boot",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
+  "interface": "interface.html",
   "storage": [
     {"name": "sleeplog.app.js", "url": "app.js"},
-    {"name": "sleeplog.img", "url": "app-icon.js", "evaluate":true},
+    {"name": "sleeplog.img", "url": "app-icon.js", "evaluate": true},
     {"name": "sleeplog.boot.js", "url": "boot.js"},
     {"name": "sleeplog", "url": "lib.js"},
     {"name": "sleeplog.settings.js", "url": "settings.js"}
   ],
   "data": [
-    {"name": "sleeplog.json"},
-    {"name": "sleeplog.log"}
+    {"name": "sleeplog.json"}
   ],
   "screenshots": [
-    {"url": "screenshot1.png"},
-    {"url": "screenshot2.png"},
-    {"url": "screenshot3.png"}
-   ]
+    {"url": "screenshot-1_app_light.png"},
+    {"url": "screenshot-2_day_light.png"},
+    {"url": "screenshot-3_graph_light.png"},
+    {"url": "screenshot-4_graph2_light.png"},
+    {"url": "screenshot-5_app_dark.png"},
+    {"url": "screenshot-6_day_dark.png"},
+    {"url": "screenshot-7_graph_dark.png"},
+    {"url": "screenshot-8_graph2_dark.png"}
+  ]
 }
diff --git a/apps/sleeplog/nolog.png b/apps/sleeplog/nolog.png
deleted file mode 100644
index b153b5769..000000000
Binary files a/apps/sleeplog/nolog.png and /dev/null differ
diff --git a/apps/sleeplog/off_20x20.png b/apps/sleeplog/off_20x20.png
new file mode 100644
index 000000000..abf3d3bfc
Binary files /dev/null and b/apps/sleeplog/off_20x20.png differ
diff --git a/apps/sleeplog/powersaving.png b/apps/sleeplog/powersaving.png
deleted file mode 100644
index ea487b48c..000000000
Binary files a/apps/sleeplog/powersaving.png and /dev/null differ
diff --git a/apps/sleeplog/screenshot-1_app_light.png b/apps/sleeplog/screenshot-1_app_light.png
new file mode 100644
index 000000000..f4c01773c
Binary files /dev/null and b/apps/sleeplog/screenshot-1_app_light.png differ
diff --git a/apps/sleeplog/screenshot-2_day_light.png b/apps/sleeplog/screenshot-2_day_light.png
new file mode 100644
index 000000000..61e0a60f6
Binary files /dev/null and b/apps/sleeplog/screenshot-2_day_light.png differ
diff --git a/apps/sleeplog/screenshot-3_graph_light.png b/apps/sleeplog/screenshot-3_graph_light.png
new file mode 100644
index 000000000..4b74afd25
Binary files /dev/null and b/apps/sleeplog/screenshot-3_graph_light.png differ
diff --git a/apps/sleeplog/screenshot-4_graph2_light.png b/apps/sleeplog/screenshot-4_graph2_light.png
new file mode 100644
index 000000000..300be5d05
Binary files /dev/null and b/apps/sleeplog/screenshot-4_graph2_light.png differ
diff --git a/apps/sleeplog/screenshot-5_app_dark.png b/apps/sleeplog/screenshot-5_app_dark.png
new file mode 100644
index 000000000..82e1f8c2f
Binary files /dev/null and b/apps/sleeplog/screenshot-5_app_dark.png differ
diff --git a/apps/sleeplog/screenshot-6_day_dark.png b/apps/sleeplog/screenshot-6_day_dark.png
new file mode 100644
index 000000000..a727f73e0
Binary files /dev/null and b/apps/sleeplog/screenshot-6_day_dark.png differ
diff --git a/apps/sleeplog/screenshot-7_graph_dark.png b/apps/sleeplog/screenshot-7_graph_dark.png
new file mode 100644
index 000000000..71612fa8e
Binary files /dev/null and b/apps/sleeplog/screenshot-7_graph_dark.png differ
diff --git a/apps/sleeplog/screenshot-8_graph2_dark.png b/apps/sleeplog/screenshot-8_graph2_dark.png
new file mode 100644
index 000000000..09c19e95c
Binary files /dev/null and b/apps/sleeplog/screenshot-8_graph2_dark.png differ
diff --git a/apps/sleeplog/screenshot1.png b/apps/sleeplog/screenshot1.png
deleted file mode 100644
index 200a305c4..000000000
Binary files a/apps/sleeplog/screenshot1.png and /dev/null differ
diff --git a/apps/sleeplog/screenshot2.png b/apps/sleeplog/screenshot2.png
deleted file mode 100644
index 61f580336..000000000
Binary files a/apps/sleeplog/screenshot2.png and /dev/null differ
diff --git a/apps/sleeplog/screenshot3.png b/apps/sleeplog/screenshot3.png
deleted file mode 100644
index 4a29b5008..000000000
Binary files a/apps/sleeplog/screenshot3.png and /dev/null differ
diff --git a/apps/sleeplog/settings.js b/apps/sleeplog/settings.js
index 11c7c0adb..9bf37ed69 100644
--- a/apps/sleeplog/settings.js
+++ b/apps/sleeplog/settings.js
@@ -1,144 +1,431 @@
 (function(back) {
+  // define settings filename
   var filename = "sleeplog.json";
+  // define logging prompt display status
+  var thresholdsPrompt = true;
 
-  // set storage and load settings
-  var storage = require("Storage");
-  var settings = Object.assign({
-    breaktod: 10, // time of day when to start/end graphs
-    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
-    enabled: true, // en-/disable completely
-    logfile: "sleeplog.log", // logfile
-  }, storage.readJSON(filename, true) || {});
+  // define default vaules
+  var defaults = {
+    // main settings
+    enabled: true, //   en-/disable completely
+    // threshold settings
+    maxAwake: 36E5, //  [ms] maximal awake time to count for consecutive sleep
+    minConsec: 18E5, // [ms] minimal time to count for consecutive sleep
+    deepTh: 100, //     threshold for deep sleep
+    lightTh: 200, //    threshold for light sleep
+    // app settings
+    breakToD: 12, //    [h] time of day when to start/end graphs
+    appTimeout: 0 //   lock and backlight timeouts for the app
+  };
 
-  // write change to global.sleeplog and storage
-  function writeSetting(key, value) {
-    // change key in global.sleeplog
-    if (typeof global.sleeplog === "object") global.sleeplog[key] = value;
-    // reread settings to only change key
-    settings = Object.assign(settings, storage.readJSON(filename, true) || {});
-    // change the value of key
-    settings[key] = value;
-    // write to storage
-    storage.writeJSON(filename, settings);
+  // assign loaded settings to default values
+  var settings = Object.assign(defaults, require("Storage").readJSON(filename, true) || {});
+
+  // write change to storage
+  function writeSetting() {
+    require("Storage").writeJSON(filename, settings);
   }
 
-  // define function to change values that need a restart of the service
-  function changeRestart() {
-    require("sleeplog").setEnabled(settings.enabled, settings.logfile, settings.powersaving);
+  // plot a debug file
+  function plotDebug(filename) {    
+    // handle swipe events
+    function swipeHandler(x, y) {
+      if (x) {
+        start -= x;
+        if (start < 0 || maxStart && start > maxStart) {
+          start = start < 0 ? 0 : maxStart;
+        } else {
+          drawGraph();
+        }
+      } else {
+        minMove += y * 10;
+        if (minMove < 0 || minMove > 300) {
+          minMove = minMove < 0 ? 0 : 300;
+        } else {
+          drawGraph();
+        }
+      }
+    }
+    // handle touch events
+    function touchHandler() {
+      invert = !invert;
+      drawGraph();
+    }
+
+    // read required entries
+    function readEntries(count) {
+      // extract usabble data from line
+      function extract(line) {
+        if (!line) return;
+        line = line.trim().split(",");
+        return [Math.round((parseFloat(line[0]) - 25569) * 144), parseInt(line[1])];
+      }
+
+      // open debug file
+      var file = require("Storage").open(filename, "r");
+      // skip title
+      file.readLine();
+      // skip past entries
+      for (var i = 0; i < start * count; i++) { file.readLine(); }
+      // define data with first entry
+      var data = [extract(file.readLine())];
+      // get start time in 10min steps
+      var start10min = data[0][0];
+      // read first required entry
+      var line = extract(file.readLine());
+      
+      // read next count entries from file
+      while (data.length < count) {
+        // check if line is immediately after the last entry
+        if (line[0] === start10min + data.length) {
+          // add line to data
+          data.push(line);
+          // read new line
+          line = extract(file.readLine());
+          // stop if no more data available
+          if (!line) break;
+        } else {
+          // add line with unknown movement
+          data.push([start10min + data.length, 0]);
+        }
+      }
+
+      // free ram
+      file = undefined
+      // set this start as max, if less entries than expected
+      if (data.length < count) maxStart = start;
+      return data;
+    }
+
+    // draw graph at starting point
+    function drawGraph() {
+      // set correct or inverted drawing
+      function rect(fill, x0, y0, x1, y1) {
+        if (fill ^ invert) {
+          g.fillRect(x0, y0, x1, y1);
+        } else {
+          g.clearRect(x0, y0, x1, y1);
+        }
+      }
+
+      // set witdh
+      var width = g.getWidth();
+      // calculate entries to display (+ set width zero based)
+      var count = (width--) / 4;
+      // read required entries
+      var data = readEntries(count);
+
+      // clear app area
+      g.reset().clearRect(0, width - 13, width, width);
+      rect(false, 0, 24, width, width - 14);
+      // draw x axis
+      g.drawLine(0, width - 13, width, width - 13);
+      // draw x label
+      data.forEach((e, i) => {
+        var startTime = new Date(e[0] * 6E5);
+        if (startTime.getMinutes() === 0) {
+          g.fillRect(4 * i, width - 12, 4 * i, width - 9);
+          g.setFontAlign(-1, -1).setFont("6x8")
+            .drawString(startTime.getHours(), 4 * i + 1, width - 8);
+        } else if (startTime.getMinutes() === 30) {
+          g.fillRect(4 * i, width - 12, 4 * i, width - 11);
+        }
+      });
+
+      // calculate max height
+      var height = width - 38;
+      // cycle through entries
+      data.forEach((e, i) => {
+        // check if movement available 
+        if (e[1]) {
+          // set color depending on recognised status
+          var color = e[1] < deepTh ? 31 : e[1] < lightTh ? 2047 : 2016;
+          // correct according to min movement
+          e[1] -= minMove;
+          // keep movement in bounderies
+          e[1] = e[1] < 0 ? 0 : e[1] > height ? height : e[1];
+          // draw line and rectangle
+          g.reset();
+          rect(true, 4 * i, width - 14, 4 * i, width - 14 - e[1]);
+          g.setColor(color).fillRect(4 * i + 1, width - 14, 4 * i + 3, width - 14 - e[1]);
+        } else {
+          // draw error in red
+          g.setColor(63488).fillRect(4 * i, width - 14, 4 * i, width - 14 - height);
+        }
+      });
+      // draw threshold lines
+      [deepTh, lightTh].forEach(th => {
+        th -= minMove;
+        if (th > 0 && th < height) {
+          // draw line
+          g.reset();
+          rect(true, 0, width - 14 - th, width, width - 14 - th);
+          // draw value above or below line
+          var yAlign = th < height / 2 ? -1 : 1;
+          if (invert) g.setColor(1);
+          g.setFontAlign(1, yAlign).setFont("6x8")
+            .drawString(th + minMove, width - 2, width - 13 - th + 10 * yAlign);
+        }
+      });
+
+      // free ram
+      data = undefined;
+    }
+
+    // get thresholds
+    var deepTh = global.sleeplog ? sleeplog.conf.deepTh : defaults.deepTh;
+    var lightTh = global.sleeplog ? sleeplog.conf.lightTh : defaults.lightTh;
+    // set lowest movement displayed
+    var minMove = deepTh - 20;
+    // set start point
+    var start = 0;
+    // define max start point value
+    var maxStart = 0;
+    // define inverted color status
+    var invert = false;
+
+    // setup UI
+    Bangle.setUI({
+      mode: "custom",
+      back: selectDebug,
+      touch: touchHandler,
+      swipe: swipeHandler
+    });
+
+    // first draw
+    drawGraph(start);
   }
 
-  // calculate sleepthresh factor
-  var stFactor = settings.winwidth / 12.5 / 60;
+  // select a debug logfile
+  function selectDebug() {
+    // load debug files
+    var files = require("Storage").list(/^sleeplog_\d\d\d\d\d\d\.csv$/, {sf:true});
+
+    // check if no files found
+    if (!files.length) {
+      // show prompt
+      E.showPrompt( /*LANG*/"No debug files found.", {
+        title: /*LANG*/"Debug log",
+        buttons: {
+          /*LANG*/"Back": 0
+        }
+      }).then(showDebug);
+    } else {
+      // prepare scroller
+      const H = 40;
+      var menuIcon = "\0\f\f\x81\0\xFF\xFF\xFF\0\0\0\0\x0F\xFF\xFF\xF0\0\0\0\0\xFF\xFF\xFF";
+      // show scroller
+      E.showScroller({
+        h: H, c: files.length,
+        back: showDebug,
+        scrollMin : -24, scroll : -24, // title is 24px, rendered at -1
+          draw : (idx, r) => {
+            if (idx < 0) {
+              return g.setFont("12x20").setFontAlign(-1,0).drawString(menuIcon + " Select file", r.x + 12, r.y + H - 12);
+            } else {
+              g.setColor(g.theme.bg2).fillRect({x: r.x + 4, y: r.y + 2, w: r.w - 8, h: r.h - 4, r: 5});
+              var name = new Date(parseInt(files[idx].match(/\d\d\d\d\d\d/)[0]) * 36E5);
+              name = name.toString().slice(0, -12).split(" ").filter((e, i) => i !== 3).join(" ");
+              g.setColor(g.theme.fg2).setFont("12x20").setFontAlign(-1, 0).drawString(name, r.x + 12, r.y + H / 2);
+            }
+          },
+        select: (idx) => plotDebug(files[idx])
+      });
+    }
+  }
+
+  // show menu or promt to change debugging
+  function showDebug() {
+    // check if sleeplog is available
+    if (global.sleeplog) {
+      // get debug status, file and duration
+      var enabled = !!sleeplog.debug;
+      var file = typeof sleeplog.debug === "object";
+      var duration = 0;
+      // setup debugging menu
+      var debugMenu = {
+        "": {
+          title: /*LANG*/"Debugging"
+        },
+        /*LANG*/"< Back": () => {
+          // check if some value has changed
+          if (enabled !== !!sleeplog.debug || file !== (typeof sleeplog.debug === "object") || duration)
+            require("sleeplog").setDebug(enabled, file ? duration || 12 : undefined);
+          // redraw main menu
+          showMain(7);
+        },
+        /*LANG*/"View log": () => selectDebug(),
+        /*LANG*/"Enable": {
+          value: enabled,
+          onchange: v => enabled = v
+        },
+        /*LANG*/"write File": {
+          value: file,
+          onchange: v => file = v
+        },
+        /*LANG*/"Duration": {
+          value: file ? (sleeplog.debug.writeUntil - Date.now()) / 36E5 | 0 : 12,
+          min: 1,
+          max: 96,
+          wrap: true,
+          format: v => v + /*LANG*/ "h",
+          onchange: v => duration = v
+        },
+        /*LANG*/"Cancel": () => showMain(7),
+      };
+      // show menu
+      var menu = E.showMenu(debugMenu);
+    } else {
+      // show error prompt
+      E.showPrompt("Sleeplog" + /*LANG*/"not enabled!", {
+        title: /*LANG*/"Debugging",
+        buttons: {
+          /*LANG*/"Back": 7
+        }
+      }).then(showMain);
+    }
+  }
+
+  // show menu to change thresholds
+  function showThresholds() {
+    // setup logging menu
+    var menu;
+    var thresholdsMenu = {
+      "": {
+        title: /*LANG*/"Thresholds"
+      },
+      /*LANG*/"< Back": () => showMain(2),
+      /*LANG*/"Max Awake": {
+        value: settings.maxAwake / 6E4,
+        step: 10,
+        min: 10,
+        max: 120,
+        wrap: true,
+        noList: true,
+        format: v => v + /*LANG*/"min",
+        onchange: v => {
+          settings.maxAwake = v * 6E4;
+          writeSetting();
+        }
+      },
+      /*LANG*/"Min Consecutive": {
+        value: settings.minConsec / 6E4,
+        step: 10,
+        min: 10,
+        max: 120,
+        wrap: true,
+        noList: true,
+        format: v => v + /*LANG*/"min",
+        onchange: v => {
+          settings.minConsec = v * 6E4;
+          writeSetting();
+        }
+      },
+      /*LANG*/"Deep Sleep": {
+        value: settings.deepTh,
+        step: 1,
+        min: 30,
+        max: 200,
+        wrap: true,
+        noList: true,
+        onchange: v => {
+          settings.deepTh = v;
+          writeSetting();
+        }
+      },
+      /*LANG*/"Light Sleep": {
+        value: settings.lightTh,
+        step: 10,
+        min: 100,
+        max: 400,
+        wrap: true,
+        noList: true,
+        onchange: v => {
+          settings.lightTh = v;
+          writeSetting();
+        }
+      },
+      /*LANG*/"Reset to Default": () => {
+        settings.maxAwake = defaults.maxAwake;
+        settings.minConsec = defaults.minConsec;
+        settings.deepTh = defaults.deepTh;
+        settings.lightTh = defaults.lightTh;
+        writeSetting();
+        showThresholds();
+      }
+    };
+
+    // display info/warning prompt or menu
+    if (thresholdsPrompt) {
+      thresholdsPrompt = false;
+      E.showPrompt("Changes take effect from now on, not retrospective", {
+        title: /*LANG*/"Thresholds",
+        buttons: {
+          /*LANG*/"Ok": 0
+        }
+      }).then(() => menu = E.showMenu(thresholdsMenu));
+    } else {
+      menu = E.showMenu(thresholdsMenu);
+    }
+  }
 
   // show main menu
   function showMain(selected) {
+    // set debug image
+    var debugImg = !global.sleeplog ?
+      "FBSBAOAAfwAP+AH3wD4+B8Hw+A+fAH/gA/wAH4AB+AA/wAf+APnwHw+D4Hx8A++AH/AA/gAH" : // X
+      typeof sleeplog.debug === "object" ?
+      "FBSBAB/4AQDAF+4BfvAX74F+CBf+gX/oFJKBf+gUkoF/6BSSgX/oFJ6Bf+gX/oF/6BAAgf/4" : // file
+      sleeplog.debug ?
+      "FBSBAP//+f/V///4AAGAABkAAZgAGcABjgAYcAGDgBhwAY4AGcABmH+ZB/mAABgAAYAAH///" : // console
+      0; // off
+    debugImg = debugImg ? "\0" + atob(debugImg) : false;
+    // set menu
     var mainMenu = {
       "": {
         title: "Sleep Log",
         selected: selected
       },
-      "Exit": () => load(),
-      "< Back": () => back(),
-      "Break Tod": {
-        value: settings.breaktod,
+      /*LANG*/"< Back": () => back(),
+      /*LANG*/"Thresholds": () => showThresholds(),
+      /*LANG*/"Break ToD": {
+        value: settings.breakToD,
         step: 1,
         min: 0,
         max: 23,
         wrap: true,
-        onchange: v => writeSetting("breaktod", v),
-      },
-      "Max Awake": {
-        value: settings.maxawake / 6E4,
-        step: 5,
-        min: 15,
-        max: 120,
-        wrap: true,
-        format: v => v + "min",
-        onchange: v => writeSetting("maxawake", v * 6E4),
-      },
-      "Min Consec": {
-        value: settings.minconsec / 6E4,
-        step: 5,
-        min: 15,
-        max: 120,
-        wrap: true,
-        format: v => v + "min",
-        onchange: v => writeSetting("minconsec", v * 6E4),
-      },
-      "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) {
-          settings.powersaving = v;
-          changeRestart();
-          // redraw menu with changed entries subsequent to onchange
-          // https://github.com/espruino/Espruino/issues/2149
-          setTimeout(showMain, 1, 6);
+        noList: true,
+        format: v => v + ":00",
+        onchange: v => {
+          settings.breakToD = v;
+          writeSetting();
         }
       },
-      "Max Move": {
-        value: settings.maxmove,
-        step: 1,
-        min: 50,
-        max: 200,
+      /*LANG*/"App Timeout": {
+        value: settings.appTimeout / 1E3,
+        step: 10,
+        min: 0,
+        max: 120,
         wrap: true,
-        onchange: v => writeSetting("maxmove", v),
+        noList: true,
+        format: v => v ? v + "s" : "-",
+        onchange: v => {
+          settings.appTimeout = v * 1E3;
+          writeSetting();
+        }
       },
-      "NoMo Thresh": {
-        value: settings.nomothresh,
-        step: 0.001,
-        min: 0.006,
-        max: 0.02,
-        wrap: true,
-        format: v => ("" + v).padEnd(5, "0"),
-        onchange: v => writeSetting("nomothresh", v),
-      },
-      "Min Duration": {
-        value: Math.floor(settings.sleepthresh * stFactor),
-        step: 1,
-        min: 5,
-        max: 15,
-        wrap: true,
-        format: v => v + "min",
-        onchange: v => writeSetting("sleepthresh", Math.ceil(v / stFactor)),
-      },
-      "Enabled": {
+      /*LANG*/"Enabled": {
         value: settings.enabled,
-        format: v => v ? "on" : "off",
-        onchange: function(v) {
+        onchange: v => {
           settings.enabled = v;
-          changeRestart();
+          require("sleeplog").setEnabled(v);
         }
       },
-      "Logfile ": {
-        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") {
-            settings.logfile = v ? "sleeplog.log" : false;
-            changeRestart();
-          }
-        }
+      /*LANG*/"Debugging": {
+        value: debugImg,
+        onchange: () => setTimeout(showDebug, 10)
       }
     };
-    // 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);
   }
 
diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index 6bf296342..9f2b07d49 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -10,4 +10,4 @@
 0.09: Vibrate with configured pattern
       Add setting to defer start of algorithm
       Add setting to disable scheduler alarm
-
+0.10: Fix: Do not wake when falling asleep
diff --git a/apps/sleepphasealarm/README.md b/apps/sleepphasealarm/README.md
index ecb3feb06..574e84e1e 100644
--- a/apps/sleepphasealarm/README.md
+++ b/apps/sleepphasealarm/README.md
@@ -9,6 +9,8 @@ The display shows:
 - Time difference between current time and alarm time (ETA).
 - Current state of the ESS algorithm, "Sleep" or "Awake", useful for debugging. State can also be "Deferred", see the "Run before alarm"-option.
 
+Replacing the watch strap with a more comfortable one (e.g. made of nylon) is recommended.
+
 ## Settings
 
 * **Keep alarm enabled**
@@ -16,7 +18,7 @@ The display shows:
   - No: No action at configured alarm time from scheduler.
 * **Run before alarm**
   - disabled: (default) The ESS algorithm starts immediately when the application starts.
-  - 1..23: The ESS algorithm starts the configured time before the alarm. E.g. when set to 1h for an alarm at 7:00 the ESS algorithm will start at 6:00. This improves battery life.
+  - 1..23: The ESS algorithm starts the configured time before the alarm. E.g. when set to 1h for an alarm at 7:00 the ESS algorithm will start at 6:00. This increases battery life.
 
 ## Logging
 
diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index b19799c4b..b3aacc80d 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -168,7 +168,7 @@ if (nextAlarmDate !== undefined) {
         // The alarm widget should handle this one
         addLog(now, "alarm");
         setTimeout(load, 1000);
-      } else if (measure && now >= minAlarm && swest_last === false) {
+      } else if (measure && now >= minAlarm && swest === false) {
         addLog(now, "alarm");
         buzz();
         measure = false;
diff --git a/apps/sleepphasealarm/interface.html b/apps/sleepphasealarm/interface.html
index f45c183e1..8c8cea990 100644
--- a/apps/sleepphasealarm/interface.html
+++ b/apps/sleepphasealarm/interface.html
@@ -30,7 +30,7 @@ function getData() {
     // remove window
     Util.hideModal();
 
-    logs = logs.filter(log => log != null);
+    logs = logs.filter(log => log != null && log.filter(entry => entry.type === "alarm").length > 0);
     logs.sort(function(a, b) {return new Date(b?.filter(entry => entry.type === "alarm")[0]?.time) - new Date(a?.filter(entry => entry.type === "alarm")[0]?.time)}); // sort by alarm date desc
     logs.forEach((log, i) => {
       const timeStr = log.filter(entry => entry.type === "alarm")[0]?.time;
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index 6ec5f4180..35eea7466 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.",
   "icon": "app.png",
   "tags": "alarm",
diff --git a/apps/slidingtext/ChangeLog b/apps/slidingtext/ChangeLog
index b3cf16ac7..5c4a9fa75 100644
--- a/apps/slidingtext/ChangeLog
+++ b/apps/slidingtext/ChangeLog
@@ -7,3 +7,5 @@
 0.07: Support for Bangle.js 2 and themes
 0.08: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up".
 0.09: Added button control toggle and other live controls to new settings screen.
+0.10: Tell clock widgets to hide.
+0.11: Added new styling and watch faces
diff --git a/apps/slidingtext/README.md b/apps/slidingtext/README.md
index d5a561634..dde2b62af 100644
--- a/apps/slidingtext/README.md
+++ b/apps/slidingtext/README.md
@@ -1,54 +1,81 @@
 # Sliding Text Clock - See the time in different languages
 
-Inspired by the Pebble sliding clock, old times are scrolled off the screen and new times on. You are also able to change language on the fly so you can see the time written in other languages using button 1. Please use the upload page to choose which languages you want loaded.
+Inspired by the Pebble sliding clock, previous times are scrolled off the screen and new times scrolled on. There are a variety of colours schemes, clock faces and languages available through the settings menu 
 
 ![](app.png)
 
-## Usage
+## Settings
 
-### Bangle 2
+Please go to the sliding text clock menu under the settings menu to customise clock. Settings -> Apps -> Sliding Clock
 
-The Bangle 2 has Live Controls switched **off** by default so the colour and language have to be changed from the setting Menu.
-Please locate the Sliding Text clock under the setting->apps menu.
 
-With the Live Controls switched on:
-#### Bottom right hand corner press
-press the bottom right hand corner of the screen to change the colour
 
-| White                | Black                | Gray                 | Red                  |
-|----------------------|----------------------|----------------------|----------------------|
-| ![](b2_color-01.jpg) | ![](b2_color-02.jpg) | ![](b2_color-03.jpg) | ![](b2_color-04.jpg) |
+## Colour
 
-#### Top right hand corner press
-press the top right hand corner of the screen to change the language
+The colour selection allows to select between different colour schemes. Colour schemes that are currently available are:
 
-### Bangle 1
+- White background  with black lettering
+- Black background with red and white lettering
+- Red background with yellow and white lettering.
+- Grey background with black and white lettering
+- Purple with yellow and white lettering
+- Blue with yellow and white lettering
 
-By Default the Live Controls (The side buttons) are switched on, which means the clock face can be controlled dynamically using the 2 side buttons on the right hand side
+## Live Control
 
-#### Button 1
+Live control allows you to change the colour scheme of the clock by pressing 
 
-Use Button 1 (the top right button) to change the language
+- The bottom right hand corner of the screen for a bangle 2
+- Button 3 on on a bangle 1
 
-|   English   |  English (Traditional)    |  French    | Japanese (Romanji) |
-| ---- | ---- | ---- | ---- |
-|   ![](format-01.jpg)   | ![](format-02.jpg)     |  ![](format-03.jpg) |![](format-04.jpg)    |
-|   **German**   |  **Spanish**    |      |  |
-|   ![](format-05.jpg)   | ![](format-06.jpg)     | |    |
+When select the watch will move to the next colour in the scheme. The selected colour will not be saved so it will will revert to the last colour select in the menu when the clock is restarted. This option is included to help select the preferred colour with having to continuously go back to the settings menu.
 
-#### Button 3
-Button 3 (bottom right button) is used to change the colour
+The Live Control is turned off by default on a bangle 2, but is on by default for a bangle 1
 
-|  Black   |  Red    |  Gray    |  Purple    |
-| ---- | ---- | ---- | ---- |
-|   ![](b1_color-01.jpg) | ![](b1_color-02.jpg) |  ![](b1_color-03.jpg)   | ![](b1_color-04.jpg)   |
+## Style
 
-#### Settings
+Style controls the clock face.
+
+
+
+### English
+
+| Style  | English 1                                       | English 1 Alternative                                        | English 2                                | English 2 Alternative                                  | English Hybrid                                            |
+| ------ | ----------------------------------------------- | ------------------------------------------------------------ | ---------------------------------------- | ------------------------------------------------------ | --------------------------------------------------------- |
+| Screen | ![](slidingtext-screenshot.english.png)         | ![](slidingtext-screenshot.english_alt.png)                  | ![](slidingtext-screenshot.english2.png) | ![](slidingtext-screenshot.english2_alt.png)           | ![](slidingtext-screenshot.hybrid.png)                    |
+| Notes  | Straight 12 hour English time and Date in words | Straight 12 hour English time and Date in words in alternative style | Traditional English Time                 | Traditional English Time and Date in alternative style | 24 Hour clock  in numbers with minutes  and date in words |
+
+### French
+| Style  | French         |
+| ------ | -------------- |
+| Screen | ![](slidingtext-screenshot.french.png) |
+
+### Spanish
+| Style  | Spanish         |
+| ------ | -------------- |
+| Screen | ![](slidingtext-screenshot.spanish.png) |
+
+### German 
+
+| Style  | German 12 Hour | German 24 Hour |
+| ------ | -------------- | -------------- |
+| Screen | ![](slidingtext-screenshot.german.png) |![](slidingtext-screenshot.german24.png) |
+| Notes  | 12 Hour German clock in words | 24 Hour German clock in words |
+
+### Japanese
+
+| Style  | Japanese                                 |
+| ------ | ---------------------------------------- |
+| Screen | ![](slidingtext-screenshot.japanese.png) |
+| Notes  | Simplified Romanji Japanese Clock.       |
+
+### Digital
+
+| Style  | Digits                                  |
+| ------ | --------------------------------------- |
+| Screen | ![](slidingtext-screenshot.digital.png) |
+| Notes  | Sliding version of a digital clock      |
 
-To turn off the Live Controls and change the settings statically please visit the settings menu. The settings menu will allow you to:
-- Colour Scheme
-- Language
-- Live Controls (On or Off)
 
 ## Further Details
 
@@ -56,7 +83,7 @@ For further details of design and working please visit [The Project Page](https:
 
 ## Requests
 
-Reach out to adrian@adriankirk.com if you have feature requests or notice bugs.
+Thank you so much for the feedback so far. Please reach out to adrian@adriankirk.com if you have feature requests or notice bugs.
 
 ## Creator
 
diff --git a/apps/slidingtext/b1_color-01.jpg b/apps/slidingtext/b1_color-01.jpg
deleted file mode 100644
index 49efb0481..000000000
Binary files a/apps/slidingtext/b1_color-01.jpg and /dev/null differ
diff --git a/apps/slidingtext/b1_color-02.jpg b/apps/slidingtext/b1_color-02.jpg
deleted file mode 100644
index 446491cc4..000000000
Binary files a/apps/slidingtext/b1_color-02.jpg and /dev/null differ
diff --git a/apps/slidingtext/b1_color-03.jpg b/apps/slidingtext/b1_color-03.jpg
deleted file mode 100644
index 0b26419a5..000000000
Binary files a/apps/slidingtext/b1_color-03.jpg and /dev/null differ
diff --git a/apps/slidingtext/b1_color-04.jpg b/apps/slidingtext/b1_color-04.jpg
deleted file mode 100644
index 385c42a90..000000000
Binary files a/apps/slidingtext/b1_color-04.jpg and /dev/null differ
diff --git a/apps/slidingtext/b2_color-01.jpg b/apps/slidingtext/b2_color-01.jpg
deleted file mode 100644
index 7428f7623..000000000
Binary files a/apps/slidingtext/b2_color-01.jpg and /dev/null differ
diff --git a/apps/slidingtext/b2_color-02.jpg b/apps/slidingtext/b2_color-02.jpg
deleted file mode 100644
index 7e3b8666f..000000000
Binary files a/apps/slidingtext/b2_color-02.jpg and /dev/null differ
diff --git a/apps/slidingtext/b2_color-03.jpg b/apps/slidingtext/b2_color-03.jpg
deleted file mode 100644
index 96c8655cf..000000000
Binary files a/apps/slidingtext/b2_color-03.jpg and /dev/null differ
diff --git a/apps/slidingtext/b2_color-04.jpg b/apps/slidingtext/b2_color-04.jpg
deleted file mode 100644
index dac36365a..000000000
Binary files a/apps/slidingtext/b2_color-04.jpg and /dev/null differ
diff --git a/apps/slidingtext/custom.html b/apps/slidingtext/custom.html
deleted file mode 100644
index 5e89e230b..000000000
--- a/apps/slidingtext/custom.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="../../css/spectre.min.css">
-  </head>
-  <body>
-      
-      <p>Please select watch languages (Max 3, only the first 3 selected will be loaded)</p>
-      
-      <table id="language_selection">
-          <tr>
-          <th>Enabled</th>
-          <th>Name</th>
-          </tr>
-      </table>
-
-    <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
-
-    <script src="../../core/lib/customize.js"></script>
-
-    <script>
-        
-      var slidingtext_languages=[
-              {name:"English", shortname:"en"},
-              {name:"English(Traditional)",shortname:"en2"},
-              {name:"French",shortname:"fr"},
-              {name:"Japanese",shortname:"jp"},
-              {name:"Spanish",shortname:"es"},
-              {name:"German",shortname:"de"}
-      ];
-      var selected_languages = ["en","es","jp"];
-      try{
-          var stored = localStorage.getItem('slidingtext_stored')
-          if(stored) selected_languages = JSON.parse(stored);
-      } catch(e){
-          console.log("failed to load languages:" + e);
-      }
-      console.log("selected languages:" + selected_languages);
-      var tbl=document.getElementById("language_selection");
-      for (var i=0; i<slidingtext_languages.length; i++) {
-          var curr_language = slidingtext_languages[i];
-          var  language_selected = selected_languages.includes(curr_language["shortname"])
-          var $offset = document.createElement('tr')
-        $offset.innerHTML = `
-            <td><input type="checkbox" id="enabled_${i}" ${language_selected? "checked" : ""}></td>
-            <td>${curr_language['name']}</td>`
-        tbl.append($offset);
-      }
-          
-      // When the 'upload' button is clicked...
-      document.getElementById("upload").addEventListener("click", function() {
-          var new_selected_languages=[];
-          for (var i=0; i<slidingtext_languages.length; i++) {
-              var curr_language = slidingtext_languages[i];
-              var checked=document.getElementById("enabled_"+i).checked;
-              if (checked && new_selected_languages.length < 3 ) {
-                  new_selected_languages.push(curr_language.shortname);
-              }
-          }
-          console.log("new selected languages:" + new_selected_languages);
-          localStorage.setItem('slidingtext_stored',JSON.stringify(new_selected_languages));
-          // send finished app (in addition to contents of app.json)
-          sendCustomizedApp({
-            storage:[
-                {name:"slidingtext.languages.json", content:JSON.stringify(new_selected_languages)},
-            ]
-          });
-      });
-
-    </script>
-  </body>
-</html>
diff --git a/apps/slidingtext/format-01.jpg b/apps/slidingtext/format-01.jpg
deleted file mode 100644
index b8bc4552e..000000000
Binary files a/apps/slidingtext/format-01.jpg and /dev/null differ
diff --git a/apps/slidingtext/format-02.jpg b/apps/slidingtext/format-02.jpg
deleted file mode 100644
index c8b7a5e60..000000000
Binary files a/apps/slidingtext/format-02.jpg and /dev/null differ
diff --git a/apps/slidingtext/format-03.jpg b/apps/slidingtext/format-03.jpg
deleted file mode 100644
index 5dfdd8b23..000000000
Binary files a/apps/slidingtext/format-03.jpg and /dev/null differ
diff --git a/apps/slidingtext/format-04.jpg b/apps/slidingtext/format-04.jpg
deleted file mode 100644
index 19b01fd64..000000000
Binary files a/apps/slidingtext/format-04.jpg and /dev/null differ
diff --git a/apps/slidingtext/format-05.jpg b/apps/slidingtext/format-05.jpg
deleted file mode 100644
index d6bd2b9aa..000000000
Binary files a/apps/slidingtext/format-05.jpg and /dev/null differ
diff --git a/apps/slidingtext/format-06.jpg b/apps/slidingtext/format-06.jpg
deleted file mode 100644
index 493777d23..000000000
Binary files a/apps/slidingtext/format-06.jpg and /dev/null differ
diff --git a/apps/slidingtext/metadata.json b/apps/slidingtext/metadata.json
index 15707c1ad..098fdb747 100644
--- a/apps/slidingtext/metadata.json
+++ b/apps/slidingtext/metadata.json
@@ -1,15 +1,15 @@
 {
   "id": "slidingtext",
   "name": "Sliding Clock",
-  "version": "0.09",
+  "version": "0.11",
   "description": "Inspired by the Pebble sliding clock, old times are scrolled off the screen and new times on. You are also able to change language on the fly so you can see the time written in other languages using button 1. Currently English, French, Japanese, Spanish and German are supported",
   "icon": "slidingtext.png",
+  "screenshots": [{"url":"slidingtext-screenshot.english.png"},{"url":"slidingtext-screenshot.english2.png"},{"url":"slidingtext-screenshot.hybrid.png"}],
   "type": "clock",
   "tags": "clock",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
-  "custom": "custom.html",
-  "allow_emulator": false,
+  "allow_emulator": true,
   "storage": [
     {"name":"slidingtext.app.js","url":"slidingtext.js"},
     {"name":"slidingtext.settings.js","url":"slidingtext.settings.js"},
@@ -20,7 +20,11 @@
     {"name":"slidingtext.locale.es.js","url":"slidingtext.locale.es.js"},
     {"name":"slidingtext.locale.fr.js","url":"slidingtext.locale.fr.js"},
     {"name":"slidingtext.locale.jp.js","url":"slidingtext.locale.jp.js"},
+    {"name":"slidingtext.utils.de.js","url":"slidingtext.utils.de.js"},
     {"name":"slidingtext.locale.de.js","url":"slidingtext.locale.de.js"},
+    {"name":"slidingtext.locale.de2.js","url":"slidingtext.locale.de2.js"},
+    {"name":"slidingtext.locale.dgt.js","url":"slidingtext.locale.dgt.js"},
+    {"name":"slidingtext.locale.hyb.js","url":"slidingtext.locale.hyb.js"},
     {"name":"slidingtext.dtfmt.js","url":"slidingtext.dtfmt.js"}
   ],
   "data": [{"name": "slidingtext.settings.json"}]
diff --git a/apps/slidingtext/slidingtext-screenshot.digital.png b/apps/slidingtext/slidingtext-screenshot.digital.png
new file mode 100644
index 000000000..b06d2ef18
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.digital.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.english.png b/apps/slidingtext/slidingtext-screenshot.english.png
new file mode 100644
index 000000000..14c91ba43
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.english.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.english2.png b/apps/slidingtext/slidingtext-screenshot.english2.png
new file mode 100644
index 000000000..3005d19ee
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.english2.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.english2_alt.png b/apps/slidingtext/slidingtext-screenshot.english2_alt.png
new file mode 100644
index 000000000..88131afa4
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.english2_alt.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.english_alt.png b/apps/slidingtext/slidingtext-screenshot.english_alt.png
new file mode 100644
index 000000000..2ce813710
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.english_alt.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.french.png b/apps/slidingtext/slidingtext-screenshot.french.png
new file mode 100644
index 000000000..8f04fb8dc
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.french.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.german.png b/apps/slidingtext/slidingtext-screenshot.german.png
new file mode 100644
index 000000000..0726f575d
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.german.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.german24.png b/apps/slidingtext/slidingtext-screenshot.german24.png
new file mode 100644
index 000000000..99d93b475
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.german24.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.hybrid.png b/apps/slidingtext/slidingtext-screenshot.hybrid.png
new file mode 100644
index 000000000..2ae7721fa
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.hybrid.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.japanese.png b/apps/slidingtext/slidingtext-screenshot.japanese.png
new file mode 100644
index 000000000..80c9cdee9
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.japanese.png differ
diff --git a/apps/slidingtext/slidingtext-screenshot.spanish.png b/apps/slidingtext/slidingtext-screenshot.spanish.png
new file mode 100644
index 000000000..7160f29d6
Binary files /dev/null and b/apps/slidingtext/slidingtext-screenshot.spanish.png differ
diff --git a/apps/slidingtext/slidingtext.dtfmt.js b/apps/slidingtext/slidingtext.dtfmt.js
index 266ed0b35..2543610c1 100644
--- a/apps/slidingtext/slidingtext.dtfmt.js
+++ b/apps/slidingtext/slidingtext.dtfmt.js
@@ -3,14 +3,20 @@ class DateFormatter {
      * A pure virtual class which all the other date formatters will
      * inherit from.
      * The name will be used to declare the date format when selected
-     * and the date formatDate methid will return the time formated
+     * and the date formatDate method will return the time formated
      * to the lines of text on the screen
      */
-    name(){return "no name";}
-    shortName(){return "no short name"}
-    formatDate(date){
-        return ["no","date","defined"];
-    }
+    formatDate(date){ return ["no","date","defined"]; }
+
+    /**
+     * returns a map of the different row types
+     */
+    defaultRowTypes(){}
+
+    /**
+     * returns a list of row definitions (1 definition can cover m
+     */
+    defaultRowDefs(){ return [];}
 }
 
 module.exports = DateFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.js b/apps/slidingtext/slidingtext.js
index ae6571121..47a24ea6a 100644
--- a/apps/slidingtext/slidingtext.js
+++ b/apps/slidingtext/slidingtext.js
@@ -5,18 +5,18 @@
  */
 
 const color_schemes = [
+  {
+    name: "black",
+    background : [0.0,0.0,0.0],
+    main_bar: [1.0,0.0,0.0],
+    other_bars: [0.9,0.9,0.9],
+  },
   {
     name: "white",
     background : [1.0,1.0,1.0],
     main_bar: [0.0,0.0,0.0],
     other_bars: [0.1,0.1,0.1],
   },
-  {
-    name: "black",
-    background : [0.0,0.0,0.0],
-    main_bar: [1.0,1.0,1.0],
-    other_bars: [0.9,0.9,0.9],
-  },
   {
     name: "red",
     background : [1.0,0.0,0.0],
@@ -31,14 +31,14 @@ const color_schemes = [
   },
   {
     name: "purple",
-    background : [1.0,0.0,1.0],
+    background : [0.3,0.0,0.6],
     main_bar: [1.0,1.0,0.0],
     other_bars: [0.85,0.85,0.85]
   },
   {
     name: "blue",
-    background : [0.4,0.7,1.0],
-    main_bar: [1.0,1.0,1.0],
+    background : [0.1,0.2,1.0],
+    main_bar: [1.0,1.0,0.0],
     other_bars: [0.9,0.9,0.9]
   }
 ];
@@ -66,17 +66,12 @@ let command_stack_high_priority = [];
 let command_stack_low_priority = [];
 
 function next_command(){
-  command = command_stack_high_priority.pop();
+  var command = command_stack_high_priority.pop();
   if(command == null){
-    //console.log("Low priority command");
     command = command_stack_low_priority.pop();
-  } else {
-    //console.log("High priority command");
   }
   if(command != null){
     command.call();
-  } else {
-    //console.log("no command");
   }
 }
 
@@ -102,7 +97,9 @@ class ShiftText {
   constructor(x,y,txt,font_name,
               font_size,speed_x,speed_y,freq_millis,
               color,
-              bg_color){
+              bg_color,
+              row_context,
+              rotation){
     this.x = x;
     this.tgt_x = x;
     this.init_x = x;
@@ -118,17 +115,15 @@ class ShiftText {
     this.freq_millis = freq_millis;
     this.color = color;
     this.bg_color = bg_color;
+    this.row_context = row_context;
+    this.rotation = rotation;
     this.finished_callback=null;
     this.timeoutId = null;
   }
-  setColor(color){
-    this.color = color;
-  }
-  setBgColor(bg_color){
-    this.bg_color = bg_color;
-  }
+  getRowContext(){ return this.row_context;}
+  setColor(color){ this.color = color; }
+  setBgColor(bg_color){ this.bg_color = bg_color; }
   reset(hard_reset) {
-    //console.log("reset");
     this.hide();
     this.x = this.init_x;
     this.y = this.init_y;
@@ -141,13 +136,13 @@ class ShiftText {
     }
   }
   show() {
-    g.setFontAlign(-1,-1,0);
+    g.setFontAlign(-1,-1,this.rotation);
     g.setFont(this.font_name,this.font_size);
     g.setColor(this.color[0],this.color[1],this.color[2]);
     g.drawString(this.txt, this.x, this.y);
   }
   hide(){
-    g.setFontAlign(-1,-1,0);
+    g.setFontAlign(-1,-1,this.rotation);
     g.setFont(this.font_name,this.font_size);
     //console.log("bgcolor:" + this.bg_color);
     g.setColor(this.bg_color[0],this.bg_color[1],this.bg_color[2]);
@@ -188,6 +183,36 @@ class ShiftText {
     this.tgt_y = new_y;
     this._doMove();
   }
+  scrollInFromBottom(txt,to_y){
+    if(to_y == null)
+      to_y = this.init_y;
+
+    this.setTextPosition(txt, this.init_x, g.getHeight()*2);
+    this.moveTo(this.init_x,to_y);
+  }
+  scrollInFromLeft(txt,to_x){
+    if(to_x == null)
+      to_x = this.init_x;
+
+    this.setTextPosition(txt, -txt.length * this.font_size - this.font_size, this.init_y);
+    this.moveTo(to_x,this.init_y);
+  }
+  scrollInFromRight(txt,to_x){
+    if(to_x == null)
+      to_x = this.init_x;
+
+    this.setTextPosition(txt, g.getWidth() + this.font_size, this.init_y);
+    this.moveTo(to_x,this.init_y);
+  }
+  scrollOffToLeft(){
+    this.moveTo(-this.txt.length * this.font_size, this.init_y);
+  }
+  scrollOffToRight(){
+    this.moveTo(g.getWidth() + this.font_size, this.init_y);
+  }
+  scrollOffToBottom(){
+    this.moveTo(this.init_x,g.getHeight()*2);
+  }
   onFinished(finished_callback){
     this.finished_callback = finished_callback;
   }
@@ -230,135 +255,234 @@ class ShiftText {
     if(!finished){
       this.timeoutId = setTimeout(this._doMove.bind(this), this.freq_millis);
     } else if(this.finished_callback != null){
-      //console.log("finished - calling:" + this.finished_callback);
       this.finished_callback.call();
       this.finished_callback = null;
     }
   }
 }
 
-const CLOCK_TEXT_SPEED_X = 10;
-// a list of display rows
-let row_displays;
-function setRowDisplays(y, heights) {
-  var cols = [
-    main_color(), other_color(), other_color(), other_color(), main_color()
-  ];
-  row_displays = [];
-  for (var i=0;i<heights.length;i++) {
-    row_displays.push(new ShiftText(g.getWidth(),y,'',"Vector",heights[i],CLOCK_TEXT_SPEED_X,1,10,cols[i],bg_color()));
-    y += heights[i];
-  }
-}
-
 function bangleVersion(){
   return (g.getHeight()>200)? 1 : 2;
 }
 
-if (bangleVersion()<2)
-  setRowDisplays(50, [40,30,30,30,40]);
-else
-  setRowDisplays(34, [35,25,25,25,35]);
+let row_displays;
+function initDisplay(settings) {
+  if(row_displays != null){
+    return;
+  }
+  if(settings == null){
+    settings = {};
+  }
+  var row_types = {
+    large: {
+      color: 'major',
+      speed: 'medium',
+      angle_to_horizontal: 0,
+      scroll_off: ['left'],
+      scroll_in: ['right'],
+      size: 'large'
+    },
+    medium: {
+      color: 'minor',
+      speed: 'slow',
+      angle_to_horizontal: 0,
+      scroll_off: ['left'],
+      scroll_in: ['right'],
+      size: 'medium'
+    },
+    small: {
+      color: 'minor',
+      speed: 'superslow',
+      angle_to_horizontal: 0,
+      scroll_off: ['left'],
+      scroll_in: ['right'],
+      size: 'small'
+    }
+  };
+
+  function mergeMaps(map1,map2){
+    if(map2 == null){
+      return;
+    }
+    Object.keys(map2).forEach(key => {
+      if(map1.hasOwnProperty(key)){
+        map1[key] = mergeObjects(map1[key], map2[key]);
+      } else {
+        map1[key] = map2[key];
+      }
+    });
+  }
+
+  function mergeObjects(obj1, obj2){
+    const result = {};
+    Object.keys(obj1).forEach(key => result[key] = (obj2.hasOwnProperty(key))? obj2[key] : obj1[key]);
+    return result;
+  }
+
+  const row_type_overide = date_formatter.defaultRowTypes();
+  mergeMaps(row_types,row_type_overide);
+  mergeMaps(row_types,settings.row_types);
+  var row_defs = (settings.row_defs != null && settings.row_defs.length > 0)?
+      settings.row_defs : date_formatter.defaultRowDefs();
+
+  var heights = {
+    vvsmall: [15,13],
+    vsmall: [20,15],
+    ssmall: [22,17],
+    small: [25,20],
+    msmall: [29,22],
+    medium: [40,25],
+    mlarge: [45,35],
+    large: [50,40],
+    vlarge: [60,50],
+    slarge: [110,90]
+  };
+
+  var rotations = {
+    0: 0,
+    90: 3,
+    180: 2,
+    270: 1,
+  };
+
+  var speeds = {
+    fast: 20,
+    medium: 10,
+    slow: 5,
+    vslow: 2,
+    superslow: 1
+  };
+
+  function create_row_type(row_type, row_def){
+    const speed = speeds[row_type.speed];
+    const rotation = rotations[row_type.angle_to_horizontal];
+    const height = heights[row_type.size];
+    const scroll_ins = [];
+    if(row_type.scroll_in.includes('left')){
+      scroll_ins.push((row_display,txt)=> row_display.scrollInFromLeft(txt));
+    }
+    if(row_type.scroll_in.includes('right')){
+      scroll_ins.push((row_display,txt)=> row_display.scrollInFromRight(txt));
+    }
+    if(row_type.scroll_in.includes('up')){
+      scroll_ins.push((row_display,txt)=> row_display.scrollInFromBottom(txt));
+    }
+    var scroll_in;
+    if(scroll_ins.length === 0){
+      scroll_in = (row_display,txt)=> row_display.scrollInFromLeft(txt);
+    } else if(scroll_ins.length === 1){
+      scroll_in = scroll_ins[0];
+    } else {
+      scroll_in = (row_display,txt) =>{
+        const idx = (Math.random() * scroll_ins.length) | 0;
+        return scroll_ins[idx](row_display,txt);
+      };
+    }
+
+    const scroll_offs = [];
+    if(row_type.scroll_off.includes('left')){
+      scroll_offs.push((row_display)=> row_display.scrollOffToLeft());
+    }
+    if(row_type.scroll_off.includes('right')){
+      scroll_offs.push((row_display)=> row_display.scrollOffToRight());
+    }
+    if(row_type.scroll_off.includes('down')){
+      scroll_offs.push((row_display)=> row_display.scrollOffToBottom());
+    }
+    var scroll_off;
+    if(scroll_offs.length === 0){
+      scroll_off = (row_display)=> row_display.scrollOffToLeft();
+    } else if(scroll_offs.length === 1){
+      scroll_off = scroll_offs[0];
+    } else {
+      scroll_off = (row_display) =>{
+        var idx = (Math.random() * scroll_off.length) | 0;
+        return scroll_offs[idx](row_display);
+      };
+    }
+
+    var text_formatter = (txt)=>txt;
+    const SPACES = '                                                ';
+    if(row_def.hasOwnProperty("alignment")){
+      const alignment = row_def.alignment;
+      if(alignment.startsWith("centre")){
+        const padding = parseInt(alignment.split("-")[1]);
+        if(padding > 0){
+          text_formatter = (txt) => {
+            const front_spaces = (padding - txt.length)/2 | 0;
+            return front_spaces > 0? SPACES.substring(0,front_spaces + 1) + txt : txt;
+          };
+        }
+      }
+    }
+
+    const version = bangleVersion() - 1;
+    const Y_RESERVED = 20;
+    return {
+      row_speed: speed,
+      row_height: height[version],
+      row_rotation: rotation,
+      x: (row_no) => row_def.init_coords[0] * g.getWidth() + row_def.row_direction[0] * height[version] * row_no,
+      y: (row_no) => Y_RESERVED + row_def.init_coords[1] * (g.getHeight() - Y_RESERVED) + row_def.row_direction[1] * height[version] * row_no,
+      scroll_in: scroll_in,
+      scroll_off: scroll_off,
+      fg_color: () => (row_type.color === 'major')? main_color(): other_color(),
+      row_text_formatter : text_formatter
+    };
+  }
+  row_displays = [];
+  row_defs.forEach(row_def =>{
+    const row_type = create_row_type(row_types[row_def.type],row_def);
+    // we now create the number of rows specified of that type
+    for(var row_no=0; row_no<row_def.rows; row_no++){
+      row_displays.push(new ShiftText(row_type.x(row_no),
+          row_type.y(row_no),
+          '',
+          "Vector",
+          row_type.row_height,
+          row_type.row_speed,
+          row_type.row_speed,
+          10,
+          row_type.fg_color(),
+          bg_color(),
+          row_type,
+          row_type.row_rotation
+        )
+      );
+    }
+  });
+  // dereference the setup variables to release the memory
+  row_defs = null;
+  row_types = null;
+  heights = null;
+  rotations = null;
+  speeds = null;
+}
 
 function nextColorTheme(){
   color_scheme_index += 1;
-  if(color_scheme_index > row_displays.length){
+  if(color_scheme_index >= color_schemes.length){
     color_scheme_index = 0;
   }
-  setColorScheme(color_schemes[color_scheme_index]);
-  reset_clock(true);
-  draw_clock();
+  updateColorScheme();
+  resetClock(true);
+  drawClock();
 }
 
-function setColorScheme(color_scheme){
-  setColor(color_scheme.main_bar,
-      color_scheme.other_bars,
-      color_scheme.background);
-}
-
-function setColor(main_color,other_color,bg_color){
-  row_displays[0].setColor(main_color);
-  row_displays[0].setBgColor(bg_color);
-  for(var i=1; i<row_displays.length - 1; i++){
-    row_displays[i].setColor(other_color);
-    row_displays[i].setBgColor(bg_color);
+function updateColorScheme(){
+  const bgcolor = bg_color();
+  for(var i=0; i<row_displays.length; i++){
+    row_displays[i].setColor(row_displays[i].getRowContext().fg_color());
+    row_displays[i].setBgColor(bgcolor);
   }
-  row_displays[row_displays.length - 1].setColor(main_color);
-  row_displays[row_displays.length - 1].setBgColor(bg_color);
-  g.setColor(bg_color[0],bg_color[1],bg_color[2]);
-  g.fillRect(0,24, g.getWidth(), g.getHeight());
+  g.setColor(bgcolor[0],bgcolor[1],bgcolor[2]);
+  g.fillRect(0, 24, g.getWidth(), g.getHeight());
 }
 
-// load the date formats and laguages required
-LANGUAGES_FILE = "slidingtext.languages.json";
-var LANGUAGES_DEFAULT = ["en","en2"];
-var locales = null;
-try{
-  locales = require("Storage").readJSON(LANGUAGES_FILE);
-  if(locales != null){
-    console.log("loaded languages:" + JSON.stringify(locales));
-  } else {
-    console.log("no languages loaded");
-    locales = LANGUAGES_DEFAULT;
-  }
-} catch(e){
-  console.log("failed to load languages:" + e);
-}
-if(locales == null || locales.length == 0){
-  locales = LANGUAGES_DEFAULT;
-  console.log("defaulting languages to locale:" + locales);
-}
-
-let date_formatters = [];
-for(var i=0; i< locales.length; i++){
-  console.log("loading locale:" + locales[i]);
-  var Formatter = require("slidingtext.locale." + locales[i] + ".js");
-  date_formatters.push(new Formatter());
-}
-
-// current index of the date formatter to display
-let date_formatter_idx = 0;
-let date_formatter = date_formatters[date_formatter_idx];
-
-function changeFormatter(){
-  date_formatter_idx += 1;
-  if(date_formatter_idx >= date_formatters.length){
-    date_formatter_idx = 0;
-  }
-  console.log("changing to formatter " + date_formatter_idx);
-  date_formatter = date_formatters[date_formatter_idx];
-  reset_clock(true);
-  draw_clock();
-  command_stack_high_priority.unshift(
-      function() {
-        //console.log("move in new:" + txt);
-        // first select the top or bottom to display the formatter name
-        // We choose the first spare row without text
-        var format_name_display = row_displays[row_displays.length - 1];
-        if (format_name_display.txt != '') {
-          format_name_display = row_displays[0];
-        }
-        if (format_name_display.txt != ''){
-          return;
-        }
-        format_name_display.speed_x = 3;
-        format_name_display.onFinished(function(){
-          format_name_display.speed_x = CLOCK_TEXT_SPEED_X;
-          console.log("return speed to:" + format_name_display.speed_x)
-          next_command();
-        });
-        format_name_display.setTextXPosition(date_formatter.name(),220);
-        format_name_display.moveToX(-date_formatter.name().length * format_name_display.font_size);
-      }
-  );
-
-}
-
-var DISPLAY_TEXT_X = 20;
-function reset_clock(hard_reset){
+function resetClock(hard_reset){
   console.log("reset_clock hard_reset:" + hard_reset);
 
-  setColorScheme(color_schemes[color_scheme_index]);
+  updateColorScheme();
   if(!hard_reset && last_draw_time != null){
     // If its not a hard reset then we want to reset the
     // rows set to the last time. If the last time is too long
@@ -366,15 +490,14 @@ function reset_clock(hard_reset){
     // In this way the watch wakes by scrolling
     // off the last time and scroll on the new time
     var reset_time = last_draw_time;
-    var last_minute_millis = Date.now() - 60000;
+    const last_minute_millis = Date.now() - 60000;
     if(reset_time.getTime() < last_minute_millis){
       reset_time = display_time(new Date(last_minute_millis));
     }
-    var rows = date_formatter.formatDate(reset_time);
+    const rows = date_formatter.formatDate(reset_time);
     for (var i = 0; i < rows.length; i++) {
       row_displays[i].hide();
-      row_displays[i].speed_x = CLOCK_TEXT_SPEED_X;
-      row_displays[i].x = DISPLAY_TEXT_X;
+      row_displays[i].x = row_displays[i].init_x;
       row_displays[i].y = row_displays[i].init_y;
       if(row_displays[i].timeoutId != null){
         clearTimeout(row_displays[i].timeoutId);
@@ -384,12 +507,8 @@ function reset_clock(hard_reset){
     }
   } else {
     // do a hard reset and clear everything out
-    for (var i = 0; i < row_displays.length; i++) {
-      row_displays[i].speed_x = CLOCK_TEXT_SPEED_X;
-      row_displays[i].reset(hard_reset);
-    }
+    row_displays.forEach(row_display => row_display.reset(hard_reset));
   }
-
   reset_commands();
 }
 
@@ -405,13 +524,13 @@ function display_time(date){
   }
 }
 
-function draw_clock(){
+function drawClock(){
   var date = new Date();
 
   // we don't want the time to be displayed
   // and then immediately be trigger another time
   if(last_draw_time != null &&
-      Date.now() - last_draw_time.getTime() < next_minute_boundary_secs * 1000 &&
+      date.getTime() - last_draw_time.getTime() < next_minute_boundary_secs * 1000 &&
       has_commands() ){
     console.log("skipping draw clock");
     return;
@@ -420,65 +539,54 @@ function draw_clock(){
   }
   reset_commands();
   date = display_time(date);
-  console.log("draw_clock:" + last_draw_time.toISOString() + " display:" + date.toISOString());
+  const mem = process.memory(false);
+  console.log("draw_clock:" + last_draw_time.toISOString() + " display:" + date.toISOString() +
+      " memory:" + mem.usage / mem.total);
 
-  var rows = date_formatter.formatDate(date);
-  var display;
+  const rows = date_formatter.formatDate(date);
   for (var i = 0; i < rows.length; i++) {
-    display = row_displays[i];
-    var txt = rows[i];
-    //console.log(i + "->" + txt);
-    display_row(display,txt);
+    const display = row_displays[i];
+    if(display != null){
+      const txt = display.getRowContext().row_text_formatter(rows[i]);
+      display_row(display,txt);
+    }
   }
   // If the dateformatter has not returned enough
-  // rows then treat the reamining rows as empty
+  // rows then treat the remaining rows as empty
   for (var j = i; j < row_displays.length; j++) {
-    display = row_displays[j];
-    //console.log(i + "->''(empty)");
+    const display = row_displays[j];
     display_row(display,'');
   }
   next_command();
-  //console.log(date);
 }
 
 function display_row(display,txt){
   if(display == null) {
-    console.log("no display for text:" + txt)
     return;
   }
 
-  if(display.txt == null || display.txt == ''){
-    if(txt != '') {
-      command_stack_high_priority.unshift(
-          function () {
-            //console.log("move in new:" + txt);
+  if(display.txt == null || display.txt === ''){
+    if(txt !== '') {
+      command_stack_high_priority.unshift(()=>{
             display.onFinished(next_command);
-            display.setTextXPosition(txt, 240);
-            display.moveToX(DISPLAY_TEXT_X);
+            display.getRowContext().scroll_in(display,txt);
           }
       );
     }
-  } else if(txt != display.txt && display.txt != null){
-    command_stack_high_priority.push(
-        function(){
-          //console.log("move out:" + txt);
+  } else if(txt !== display.txt && display.txt != null){
+    command_stack_high_priority.push(()=>{
           display.onFinished(next_command);
-          display.moveToX(-display.txt.length * display.font_size);
+          display.getRowContext().scroll_off(display);
         }
     );
-    command_stack_low_priority.push(
-        function(){
-          //console.log("move in:" + txt);
+    command_stack_low_priority.push(() => {
           display.onFinished(next_command);
-          display.setTextXPosition(txt,240);
-          display.moveToX(DISPLAY_TEXT_X);
+          display.getRowContext().scroll_in(display,txt);
         }
     );
   } else {
-    command_stack_high_priority.push(
-        function(){
-          //console.log("move in2:" + txt);
-          display.setTextXPosition(txt,DISPLAY_TEXT_X);
+    command_stack_high_priority.push(() => {
+          display.setTextPosition(txt,display.init_x, display.init_y);
           next_command();
         }
     );
@@ -489,26 +597,92 @@ function display_row(display,txt){
  * called from load_settings on startup to
  * set the color scheme to named value
  */
-function set_colorscheme(colorscheme_name){
+function setColorScheme(colorscheme_name){
   console.log("setting color scheme:" + colorscheme_name);
   for (var i=0; i < color_schemes.length; i++) {
-    if(color_schemes[i].name == colorscheme_name){
+    if(color_schemes[i].name === colorscheme_name){
       color_scheme_index = i;
-      console.log("match");
-      setColorScheme(color_schemes[color_scheme_index]);
+      updateColorScheme();
       break;
     }
   }
 }
 
-function set_dateformat(dateformat_name){
-  console.log("setting date format:" + dateformat_name);
-  for (var i=0; i < date_formatters.length; i++) {
-    if(date_formatters[i].shortName() == dateformat_name){
-      date_formatter_idx = i;
-      date_formatter = date_formatters[date_formatter_idx];
-      console.log("match");
+var date_formatter;
+function setDateformat(shortname){
+  /**
+   * Demonstration Date formatter so that we can see the
+   * clock working in the emulator
+   */
+  class DigitDateTimeFormatter {
+    constructor() {}
+
+    format00(num){
+      const value = (num | 0);
+      if(value > 99 || value < 0)
+        throw "must be between in range 0-99";
+      if(value < 10)
+        return "0" + value.toString();
+      else
+        return value.toString();
     }
+
+    formatDate(now){
+      const hours = now.getHours() ;
+      const time_txt = this.format00(hours) + ":" + this.format00(now.getMinutes());
+      const date_txt = require('locale').dow(now,1) + " " + this.format00(now.getDate());
+      const month_txt = require('locale').month(now);
+      return [time_txt, date_txt, month_txt];
+    }
+
+    defaultRowTypes(){
+      return {
+        large: {
+          scroll_off: ['left', 'right', 'down'],
+          scroll_in: ['left', 'right', 'up'],
+          size: 'vlarge'
+        },
+        small: {
+          angle_to_horizontal: 90,
+          scroll_off: ['down'],
+          scroll_in: ['up'],
+          size: 'vvsmall'
+        }
+      };
+    }
+
+    defaultRowDefs() {
+      return [
+        {
+          type: 'large',
+          row_direction: [0.0,1.0],
+          init_coords: [0.1,0.35],
+          rows: 1
+        },
+        {
+          type: 'small',
+          row_direction: [1.0,0],
+          init_coords: [0.85,0.99],
+          rows: 2
+        }
+      ];
+    }
+  }
+  console.log("setting date format:" + shortname);
+  try {
+    if (date_formatter == null) {
+      if(shortname === "default"){
+        date_formatter = new DigitDateTimeFormatter();
+      } else {
+        const date_formatter_class = require("slidingtext.locale." + shortname + ".js");
+        date_formatter = new date_formatter_class();
+      }
+    }
+  } catch(e){
+    console.log("not loaded:" + shortname);
+  }
+  if(date_formatter == null){
+    date_formatter = new DigitDateTimeFormatter();
   }
 }
 
@@ -517,64 +691,44 @@ const PREFERENCE_FILE = "slidingtext.settings.json";
 /**
  * Called on startup to set the watch to the last preference settings
  */
-function load_settings(){
-  var setScheme = false;
-  try{
-    var settings = require("Storage").readJSON(PREFERENCE_FILE);
-    if(settings != null){
-      console.log("loaded:" + JSON.stringify(settings));
-      if(settings.color_scheme != null){
-        set_colorscheme(settings.color_scheme);
-        setScheme = true;
-      }
-      if(settings.date_format != null){
-        set_dateformat(settings.date_format);
-      }
-      if(settings.enable_live_controls == null){
-        settings.enable_live_controls = (bangleVersion() <= 1);
-      }
-      enable_live_controls = settings.enable_live_controls;
-    } else {
-      console.log("no settings to load");
-      enable_live_controls = (bangleVersion() <= 1);
+function loadSettings() {
+  try {
+    const settings = Object.assign({},
+        require('Storage').readJSON(PREFERENCE_FILE, true) || {});
+    if (settings.date_formatter == null) {
+        settings.date_formatter = "en";
     }
+    console.log("loaded settings:" + JSON.stringify(settings));
+    setDateformat(settings.date_formatter);
+    initDisplay(settings);
+    if (settings.color_scheme != null) {
+      setColorScheme(settings.color_scheme);
+    } else {
+      setColorScheme("black");
+    }
+    if (settings.enable_live_controls == null) {
+      settings.enable_live_controls = (bangleVersion() <= 1);
+    }
+    enable_live_controls = settings.enable_live_controls;
     console.log("enable_live_controls=" + enable_live_controls);
-  } catch(e){
+  } catch (e) {
     console.log("failed to load settings:" + e);
   }
   // just set up as default
-  if (!setScheme)
-    setColorScheme(color_schemes[color_scheme_index]);
-}
-
-/**
- * Called on button press to save down the last preference settings
- */
-function save_settings(){
-  var settings = {
-    date_format : date_formatter.shortName(),
-    color_scheme : color_schemes[color_scheme_index].name,
-    enable_live_controls: enable_live_controls
-  };
-  console.log("saving:" + JSON.stringify(settings));
-  require("Storage").writeJSON(PREFERENCE_FILE,settings);
-}
-
-function button1pressed() {
-  console.log("button1pressed");
-  if (enable_live_controls) {
-    changeFormatter();
-    save_settings();
+  if (row_displays === undefined) {
+    setDateformat("default");
+    initDisplay();
+    updateColorScheme();
   }
+  const mem = process.memory(true);
+  console.log("init complete memory:" + mem.usage / mem.total);
 }
 
 function button3pressed() {
-  console.log("button3pressed");
   if (enable_live_controls) {
     nextColorTheme();
-    reset_clock(true);
-    draw_clock();
-    save_settings();
+    resetClock(true);
+    drawClock();
   }
 }
 
@@ -589,12 +743,11 @@ function clearTimers(){
 }
 
 function startTimers(){
-  var date = new Date();
-  var secs = date.getSeconds();
-  var nextMinuteStart = 60 - secs;
-  //console.log("scheduling clock draw in " + nextMinuteStart + " seconds");
+  const date = new Date();
+  const secs = date.getSeconds();
+  const nextMinuteStart = 60 - secs;
   setTimeout(scheduleDrawClock,nextMinuteStart * 1000);
-  draw_clock();
+  drawClock();
 }
 
 /**
@@ -613,17 +766,17 @@ function scheduleDrawClock(){
   if (Bangle.isLCDOn()) {
     console.log("schedule draw of clock");
     intervalRef = setInterval(() => {
-        if (!shouldRedraw()) {
-          console.log("draw clock callback - skipped redraw");
-        } else {
-          console.log("draw clock callback");
-          draw_clock()
-        }
-      }, 60 * 1000
+      if (!shouldRedraw()) {
+        console.log("draw clock callback - skipped redraw");
+      } else {
+        console.log("draw clock callback");
+        drawClock();
+      }
+    }, 60 * 1000
     );
 
     if (shouldRedraw()) {
-      draw_clock();
+      drawClock();
     } else {
       console.log("scheduleDrawClock - skipped redraw");
     }
@@ -636,23 +789,23 @@ Bangle.on('lcdPower', (on) => {
   if (on) {
     console.log("lcdPower: on");
     Bangle.drawWidgets();
-    reset_clock(false);
+    resetClock(false);
     startTimers();
   } else {
     console.log("lcdPower: off");
-    reset_clock(false);
+    resetClock(false);
     clearTimers();
   }
 });
 
 g.clear();
-load_settings();
+loadSettings();
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", d=>{
+  if (d>0) button3pressed();
+});
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
 startTimers();
-// Show launcher when button pressed
-Bangle.setUI("clockupdown", d=>{
-  if (d<0) button1pressed();
-  if (d>0) button3pressed();
-});
+
diff --git a/apps/slidingtext/slidingtext.locale.de.js b/apps/slidingtext/slidingtext.locale.de.js
index da5c2f01d..7be61e965 100644
--- a/apps/slidingtext/slidingtext.locale.de.js
+++ b/apps/slidingtext/slidingtext.locale.de.js
@@ -1,95 +1,43 @@
-var DateFormatter = require("slidingtext.dtfmt.js");
-
-const germanNumberStr = [ ["NULL",""], // 0
-    ["EINS",""], // 1
-    ["ZWEI",""], //2
-    ["DREI",''], //3
-    ["VIER",''], //4
-    ["FÜNF",''], //5
-    ["SECHS",''], //6
-    ["SIEBEN",''], //7
-    ["ACHT",''], //8
-    ["NEUN",''], // 9,
-    ["ZEHN",''], // 10
-    ["ELF",''], // 11,
-    ["ZWÖLF",''], // 12
-    ["DREI",'ZEHN'], // 13
-    ["VIER",'ZEHN'], // 14
-    ["FÜNF",'ZEHN'], // 15
-    ["SECH",'ZEHN'], // 16
-    ["SIEB",'ZEHN'], // 17
-    ["ACHT",'ZEHN'], // 18
-    ["NEUN",'ZEHN'], // 19
-];
-
-const germanTensStr = ["NULL",//0
-    "ZEHN",//10
-    "ZWANZIG",//20
-    "DREIßIG",//30
-    "VIERZIG",//40
-    "FÜNFZIG",//50
-    "SECHZIG"//60
-]
-
-const germanUnit = ["",//0
-    "EINUND",//1
-    "ZWEIUND",//2
-    "DREIUND",//3
-    "VIERUND", //4
-    "FÜNFUND", //5
-    "SECHSUND", //6
-    "SIEBENUND", //7
-    "ACHTUND", //8
-    "NEUNUND" //9
-]
-
-function germanHoursToText(hours){
-    hours = hours % 12;
-    if(hours == 0){
-        hours = 12;
-    }
-    return germanNumberStr[hours][0];
-}
-
-function germanMinsToText(mins) {
-    if (mins < 20) {
-        return germanNumberStr[mins];
-    } else {
-        var tens = (mins / 10 | 0);
-        var word1 = germanTensStr[tens];
-        var remainder = mins - tens * 10;
-        var word2 = germanUnit[remainder];
-        return [word2, word1];
-    }
-}
+const DateFormatter = require("slidingtext.dtfmt.js");
+const germanHoursToText = require("slidingtext.utils.de.js").germanHoursToText;
+const germanMinsToText = require("slidingtext.utils.de.js").germanMinsToText;
 
+/**
+ * German 12 hour clock
+ */
 class GermanDateFormatter extends DateFormatter {
-    constructor() { super();}
-    name(){return "German";}
-    shortName(){return "de"}
+    constructor() {
+        super();
+    }
     formatDate(date){
-        var mins = date.getMinutes();
-        var hourOfDay = date.getHours();
-        var hours = germanHoursToText(hourOfDay);
-        //console.log('hourOfDay->' + hourOfDay + ' hours text->' + hours)
-        // Deal with the special times first
-        if(mins == 0){
-            var hours = germanHoursToText(hourOfDay);
+        const mins = date.getMinutes();
+        const hourOfDay = date.getHours();
+        const hours = germanHoursToText(hourOfDay);
+        if(mins === 0){
             return [hours,"UHR", "","",""];
-        } /*else if(mins == 30){
-            var hours = germanHoursToText(hourOfDay+1);
-            return ["", "", "HALB","", hours];
-        } else if(mins == 15){
-            var hours = germanHoursToText(hourOfDay);
-            return ["", "", "VIERTEL", "NACH",hours];
-        } else if(mins == 45) {
-            var hours = germanHoursToText(hourOfDay+1);
-            return ["", "", "VIERTEL", "VOR",hours];
-        } */ else {
-            var mins_txt = germanMinsToText(mins);
+        } else {
+            const mins_txt = germanMinsToText(mins);
             return [hours, "UHR", mins_txt[0],mins_txt[1]];
         }
     }
+    defaultRowTypes(){ return {};}
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.1],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'medium',
+                init_coords: [0.05,0.4],
+                row_direction: [0.0,1.0],
+                rows: 3
+            }
+        ];
+    }
 }
 
 module.exports = GermanDateFormatter;
diff --git a/apps/slidingtext/slidingtext.locale.de2.js b/apps/slidingtext/slidingtext.locale.de2.js
new file mode 100644
index 000000000..a4c8c2fa6
--- /dev/null
+++ b/apps/slidingtext/slidingtext.locale.de2.js
@@ -0,0 +1,49 @@
+const DateFormatter = require("slidingtext.dtfmt.js");
+const german24HoursToText = require("slidingtext.utils.de.js").german24HoursToText;
+const germanMinsToText = require("slidingtext.utils.de.js").germanMinsToText;
+
+/**
+ * German 24 hour clock
+ */
+class German24HourDateFormatter extends DateFormatter {
+    constructor() {
+        super();
+    }
+    formatDate(date){
+        const mins = date.getMinutes();
+        const hourOfDay = date.getHours();
+        const hours = german24HoursToText(hourOfDay);
+        const display_hours = (hours[1] === '')? ["", hours[0]] : hours;
+        if(mins === 0){
+            return [display_hours[0],display_hours[1],"UHR", "","",""];
+        } else {
+            const mins_txt = germanMinsToText(mins);
+
+            return [display_hours[0],display_hours[1], "UHR", mins_txt[0],mins_txt[1]];
+        }
+    }
+    defaultRowTypes(){ return {
+        large:{
+            size: 'mlarge'
+        }
+    };}
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.06],
+                row_direction: [0.0,1.0],
+                rows: 2
+            },
+            {
+                type: 'medium',
+                init_coords: [0.05,0.5],
+                row_direction: [0.0,1.0],
+                rows: 3
+            }
+        ];
+    }
+}
+
+module.exports = German24HourDateFormatter;
diff --git a/apps/slidingtext/slidingtext.locale.dgt.js b/apps/slidingtext/slidingtext.locale.dgt.js
new file mode 100644
index 000000000..446a4cd50
--- /dev/null
+++ b/apps/slidingtext/slidingtext.locale.dgt.js
@@ -0,0 +1,63 @@
+const Locale = require('locale');
+
+class DigitDateTimeFormatter {
+    constructor() {}
+
+    format00(num){
+        const value = (num | 0);
+        if(value > 99 || value < 0)
+            throw "must be between in range 0-99";
+        if(value < 10)
+            return "0" + value.toString();
+        else
+            return value.toString();
+    }
+
+    formatDate(now){
+        const hours = now.getHours() ;
+        const time_txt = this.format00(hours) + ":" + this.format00(now.getMinutes());
+        const date_txt = Locale.dow(now,1) + " " + this.format00(now.getDate());
+        return [time_txt[0], time_txt[1],time_txt[2], time_txt[3],time_txt[4],date_txt];
+    }
+
+    defaultRowTypes(){
+        return {
+            large: {
+                scroll_off: ['down'],
+                scroll_in: ['up'],
+                size: 'vlarge',
+                speed: 'medium'
+            },
+            small: {
+                angle_to_horizontal: 0,
+                scroll_off: ['left'],
+                scroll_in: ['right'],
+            }
+        };
+    }
+
+    defaultRowDefs() {
+        return [
+            {
+                type: 'large',
+                row_direction: [0.7,0.0],
+                init_coords: [0.1,0.35],
+                rows: 3
+            },
+            {
+                type: 'large',
+                row_direction: [0.7,0.0],
+                init_coords: [0.6,0.35],
+                rows: 2
+            },
+            {
+                type: 'small',
+                row_direction: [0.0,1.0],
+                init_coords: [0.1,0.05],
+                rows: 1
+            }
+        ];
+    }
+}
+
+module.exports = DigitDateTimeFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.locale.en.js b/apps/slidingtext/slidingtext.locale.en.js
index 6414ef7a9..545cc9f09 100644
--- a/apps/slidingtext/slidingtext.locale.en.js
+++ b/apps/slidingtext/slidingtext.locale.en.js
@@ -1,15 +1,55 @@
-var DateFormatter = require("slidingtext.dtfmt.js");
+const DateFormatter = require("slidingtext.dtfmt.js");
 const hoursToText = require("slidingtext.utils.en.js").hoursToText;
 const numberToText = require("slidingtext.utils.en.js").numberToText;
+const dayOfWeek = require("slidingtext.utils.en.js").dayOfWeek;
+const numberToDayNumberText = require("slidingtext.utils.en.js").numberToDayNumberText;
+const monthToText = require("slidingtext.utils.en.js").monthToText;
 
 class EnglishDateFormatter extends DateFormatter {
-    constructor() { super();}
-    name(){return "English";}
-    shortName(){return "en"}
+    constructor() {
+        super();
+    }
     formatDate(date){
-        var hours_txt = hoursToText(date.getHours());
-        var mins_txt = numberToText(date.getMinutes());
-        return [hours_txt,mins_txt[0],mins_txt[1]];
+        const hours_txt = hoursToText(date.getHours());
+        const mins_txt = numberToText(date.getMinutes());
+        const day_of_week = dayOfWeek(date);
+        const date_txt = numberToDayNumberText(date.getDate()).join(' ');
+        const month = monthToText(date);
+        return [hours_txt,mins_txt[0],mins_txt[1],day_of_week,date_txt,month];
+    }
+    defaultRowTypes() {
+        return {
+            small: {size: 'ssmall'}
+        };
+    }
+
+    defaultRowDefs(){
+        const row_defs = [
+            {
+                type: 'large',
+                init_coords: [0.05,0.07],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'medium',
+                init_coords: [0.05,0.31],
+                row_direction: [0.0,1.0],
+                rows: 2
+            }
+        ];
+        const bangleVersion = (g.getHeight()>200)? 1 : 2;
+        if(bangleVersion > 1){
+            row_defs.push(
+                {
+                    type: 'small',
+                    init_coords: [0.05,0.75],
+                    row_direction: [0.0,1.0],
+                    rows: 2
+                }
+            )
+        }
+        return row_defs;
     }
 }
 
diff --git a/apps/slidingtext/slidingtext.locale.en2.js b/apps/slidingtext/slidingtext.locale.en2.js
index d7d7ff6a8..ac2ae02ff 100644
--- a/apps/slidingtext/slidingtext.locale.en2.js
+++ b/apps/slidingtext/slidingtext.locale.en2.js
@@ -1,4 +1,6 @@
-var DateFormatter = require("slidingtext.dtfmt.js");
+const DateFormatter = require("slidingtext.dtfmt.js");
+const dayOfWeekShort = require("slidingtext.utils.en.js").dayOfWeekShort;
+const numberToDayNumberText = require("slidingtext.utils.en.js").numberToDayNumberText;
 const hoursToText = require("slidingtext.utils.en.js").hoursToText;
 const numberToText = require("slidingtext.utils.en.js").numberToText;
 
@@ -6,24 +8,24 @@ class EnglishTraditionalDateFormatter extends DateFormatter {
     constructor() {
         super();
     }
-    name(){return "English (Traditional)";}
-    shortName(){return "en2"}
     formatDate(date){
-        var mins = date.getMinutes();
+        const day_of_week = dayOfWeekShort(date);
+        const date_txt = numberToDayNumberText(date.getDate()).join(' ');
+        const mins = date.getMinutes();
         var hourOfDay = date.getHours();
         if(mins > 30){
             hourOfDay += 1;
         }
-        var hours = hoursToText(hourOfDay);
+        const hours = hoursToText(hourOfDay);
         // Deal with the special times first
-        if(mins == 0){
-            return [hours,"", "O'","CLOCK"];
-        } else if(mins == 30){
-            return ["","HALF", "PAST", "", hours];
-        } else if(mins == 15){
-            return ["","QUARTER", "PAST", "", hours];
-        } else if(mins == 45) {
-            return ["", "QUARTER", "TO", "", hours];
+        if(mins === 0){
+            return [hours,"", "O'","CLOCK","", day_of_week, date_txt];
+        } else if(mins === 30){
+            return ["","HALF", "PAST", "", hours, day_of_week, date_txt];
+        } else if(mins === 15){
+            return ["","QUARTER", "PAST", "", hours, day_of_week, date_txt];
+        } else if(mins === 45) {
+            return ["", "QUARTER", "TO", "", hours, day_of_week, date_txt];
         }
         var mins_txt;
         var from_to;
@@ -37,18 +39,57 @@ class EnglishTraditionalDateFormatter extends DateFormatter {
             from_to = "PAST";
             mins_txt = numberToText(mins_value);
         }
-        if(mins_txt[1] != '') {
-            return ['', mins_txt[0], mins_txt[1], from_to, hours];
+
+        if(mins_txt[1] !== '') {
+            return ['', mins_txt[0], mins_txt[1], from_to, hours, day_of_week, date_txt];
         } else {
-            if(mins_value % 5 == 0) {
-                return ['', mins_txt[0], from_to, '', hours];
-            } else if(mins_value == 1){
-                return ['', mins_txt[0], 'MINUTE', from_to, hours];
+            if(mins_value % 5 === 0) {
+                return ['', mins_txt[0], from_to, '', hours, day_of_week, date_txt];
+            } else if(mins_value === 1){
+                return ['', mins_txt[0], 'MINUTE', from_to, hours, day_of_week, date_txt];
             } else {
-                return ['', mins_txt[0], 'MINUTES', from_to, hours];
+                return ['', mins_txt[0], 'MINUTES', from_to, hours, day_of_week, date_txt];
             }
         }
     }
+    defaultRowTypes(){
+        return {
+            small: {
+                speed: 'medium',
+                scroll_off: ['left','right'],
+                scroll_in: ['left','right'],
+            },
+            large: {
+                speed: 'medium',
+                color: 'major',
+                scroll_off: ['left','right'],
+                scroll_in: ['left','right']
+            }
+        };
+    }
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.1],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'small',
+                init_coords: [0.05,0.35],
+                row_direction: [0.0,1.0],
+                rows: 3
+            },
+            {
+                type: 'large',
+                init_coords: [0.05,0.75],
+                row_direction: [0.0,1.0],
+                rows: 1
+            }
+        ];
+    }
 }
 
 module.exports = EnglishTraditionalDateFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.locale.es.js b/apps/slidingtext/slidingtext.locale.es.js
index 62c68b64d..041497e04 100644
--- a/apps/slidingtext/slidingtext.locale.es.js
+++ b/apps/slidingtext/slidingtext.locale.es.js
@@ -34,7 +34,7 @@ const spanishNumberStr = [ ["ZERO"], // 0
 
 function spanishHoursToText(hours){
     hours = hours % 12;
-    if(hours == 0){
+    if(hours === 0){
         hours = 12;
     }
     return spanishNumberStr[hours][0];
@@ -45,34 +45,52 @@ function spanishMinsToText(mins){
 }
 
 class SpanishDateFormatter extends DateFormatter {
-    constructor() { super();}
-    name(){return "Spanish";}
-    shortName(){return "es"}
+    constructor() {
+        super();
+    }
     formatDate(date){
-        var mins = date.getMinutes();
+        const mins = date.getMinutes();
         var hourOfDay = date.getHours();
         if(mins > 30){
             hourOfDay += 1;
         }
-        var hours = spanishHoursToText(hourOfDay);
+        const hours = spanishHoursToText(hourOfDay);
         //console.log('hourOfDay->' + hourOfDay + ' hours text->' + hours)
         // Deal with the special times first
-        if(mins == 0){
+        if(mins === 0){
             return [hours,"", "","",""];
-        } else if(mins == 30){
+        } else if(mins === 30){
             return [hours, "Y", "MEDIA",""];
-        } else if(mins == 15){
+        } else if(mins === 15){
             return [hours, "Y", "CUARTO",""];
-        } else if(mins == 45) {
+        } else if(mins === 45) {
             return [hours, "MENOS", "CUARTO",""];
         } else if(mins > 30){
-            var mins_txt = spanishMinsToText(60-mins);
+            const mins_txt = spanishMinsToText(60-mins);
             return [hours, "MENOS", mins_txt[0],mins_txt[1]];
         } else {
-            var mins_txt = spanishMinsToText(mins);
+            const mins_txt = spanishMinsToText(mins);
             return [hours, "Y", mins_txt[0],mins_txt[1]];
         }
     }
+    defaultRowTypes(){ return {};}
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.1],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'medium',
+                init_coords: [0.05,0.4],
+                row_direction: [0.0,1.0],
+                rows: 3
+            }
+        ];
+    }
 }
 
 module.exports = SpanishDateFormatter;
diff --git a/apps/slidingtext/slidingtext.locale.fr.js b/apps/slidingtext/slidingtext.locale.fr.js
index d4c1dc9d6..6da0e232d 100644
--- a/apps/slidingtext/slidingtext.locale.fr.js
+++ b/apps/slidingtext/slidingtext.locale.fr.js
@@ -14,14 +14,14 @@ const frenchNumberStr = [ "ZERO", "UNE", "DEUX", "TROIS", "QUATRE",
 
 function frenchHoursToText(hours){
     hours = hours % 12;
-    if(hours == 0){
+    if(hours === 0){
         hours = 12;
     }
     return frenchNumberStr[hours];
 }
 
 function frenchHeures(hours){
-    if(hours % 12 == 1){
+    if(hours % 12 === 1){
         return 'HEURE';
     } else {
         return 'HEURES';
@@ -29,33 +29,33 @@ function frenchHeures(hours){
 }
 
 class FrenchDateFormatter extends DateFormatter {
-    constructor() { super(); }
-    name(){return "French";}
-    shortName(){return "fr"}
+    constructor() {
+        super();
+    }
     formatDate(date){
         var hours = frenchHoursToText(date.getHours());
         var heures = frenchHeures(date.getHours());
-        var mins = date.getMinutes();
-        if(mins == 0){
-            if(hours == 0){
+        const mins = date.getMinutes();
+        if(mins === 0){
+            if(hours === 0){
                 return ["MINUIT", "",""];
-            } else if(hours == 12){
+            } else if(hours === 12){
                 return ["MIDI", "",""];
             } else {
                 return [hours, heures,""];
             }
-        } else if(mins == 30){
+        } else if(mins === 30){
             return [hours, heures,'ET DEMIE'];
-        } else if(mins == 15){
+        } else if(mins === 15){
             return [hours, heures,'ET QUART'];
-        } else if(mins == 45){
+        } else if(mins === 45){
             var next_hour = date.getHours()  + 1;
             hours = frenchHoursToText(next_hour);
             heures = frenchHeures(next_hour);
             return [hours, heures,"MOINS",'LET QUART'];
         }
         if(mins > 30){
-            var to_mins = 60-mins;
+            const to_mins = 60-mins;
             var mins_txt = frenchNumberStr[to_mins];
             next_hour = date.getHours()  + 1;
             hours = frenchHoursToText(next_hour);
@@ -66,6 +66,30 @@ class FrenchDateFormatter extends DateFormatter {
             return [ hours, heures , mins_txt ];
         }
     }
+    defaultRowTypes(){
+        return {
+            small: {
+                speed: 'vslow'
+            }
+        };
+    }
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.1],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'small',
+                init_coords: [0.05,0.4],
+                row_direction: [0.0,1.0],
+                rows: 3
+            }
+        ];
+    }
 }
 
 module.exports = FrenchDateFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.locale.hyb.js b/apps/slidingtext/slidingtext.locale.hyb.js
new file mode 100644
index 000000000..aa47b349f
--- /dev/null
+++ b/apps/slidingtext/slidingtext.locale.hyb.js
@@ -0,0 +1,80 @@
+const DateFormatter = require("slidingtext.dtfmt.js");
+const numberToText = require("slidingtext.utils.en.js").numberToText;
+const dayOfWeek = require("slidingtext.utils.en.js").dayOfWeekShort;
+
+class EnglishDateFormatter extends DateFormatter {
+    constructor() {
+        super();
+    }
+
+    format00(num){
+        const value = (num | 0);
+        if(value > 99 || value < 0)
+            throw "must be between in range 0-99";
+        if(value < 10)
+            return "0" + value.toString();
+        else
+            return value.toString();
+    }
+
+    formatDate(date){
+
+        const hours_txt = this.format00(date.getHours());
+        const mins_txt = numberToText(date.getMinutes());
+        const day_of_week = dayOfWeek(date);
+        const date_txt =  day_of_week + " " + this.format00(date.getDate());
+        return [hours_txt,mins_txt[0],mins_txt[1],date_txt];
+    }
+    defaultRowTypes() {
+        return {
+            large: {
+                size: 'slarge',
+                scroll_off: ['left','down'],
+                scroll_in: ['up','left'],
+            },
+            medium: {
+                size: 'msmall',
+                scroll_off: ['down'],
+                scroll_in: ['up'],
+                angle_to_horizontal: 90
+            },
+            small: {
+                size: 'ssmall',
+                scroll_off: ['left'],
+                scroll_in: ['left'],
+            }
+        };
+    }
+
+    defaultRowDefs(){
+        const row_defs = [
+            {
+                type: 'large',
+                init_coords: [0.05,0.35],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'medium',
+                init_coords: [0.68,0.95],
+                row_direction: [1.0,0.0],
+                angle_to_horizontal: 90,
+                rows: 2
+            }];
+
+        const bangleVersion = (g.getHeight()>200)? 1 : 2;
+        if(bangleVersion > 1){
+            row_defs.push(
+                {
+                    type: 'small',
+                    init_coords: [0.05, 0.1],
+                    row_direction: [0.0, 1.0],
+                    rows: 1
+                }
+            )
+        }
+        return row_defs;
+    }
+}
+
+module.exports = EnglishDateFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.locale.jp.js b/apps/slidingtext/slidingtext.locale.jp.js
index 0f6e46a21..b2f9106a2 100644
--- a/apps/slidingtext/slidingtext.locale.jp.js
+++ b/apps/slidingtext/slidingtext.locale.jp.js
@@ -1,4 +1,4 @@
-var DateFormatter = require("slidingtext.dtfmt.js");
+const DateFormatter = require("slidingtext.dtfmt.js");
 
 /**
  * Japanese date formatting
@@ -28,21 +28,21 @@ const japaneseMinuteStr = [ ["", "PUN"],
 
 function japaneseHoursToText(hours){
     hours = hours % 12;
-    if(hours == 0){
+    if(hours === 0){
         hours = 12;
     }
     return japaneseHourStr[hours];
 }
 
 function japaneseMinsToText(mins){
-    if(mins == 0){
+    if(mins === 0){
         return ["",""];
-    } else if(mins == 30)
+    } else if(mins === 30)
         return ["HAN",""];
     else {
-        var units = mins % 10;
-        var mins_txt = japaneseMinuteStr[units];
-        var tens = mins /10 | 0;
+        const units = mins % 10;
+        const mins_txt = japaneseMinuteStr[units];
+        const tens = mins /10 | 0;
         if(tens > 0){
             var tens_txt = tensPrefixStr[tens];
             var minutes_txt;
@@ -59,14 +59,32 @@ function japaneseMinsToText(mins){
 }
 
 class JapaneseDateFormatter extends DateFormatter {
-    constructor() { super(); }
-    name(){return "Japanese (Romanji)";}
-    shortName(){return "jp"}
+    constructor() {
+        super();
+    }
     formatDate(date){
-        var hours_txt = japaneseHoursToText(date.getHours());
-        var mins_txt = japaneseMinsToText(date.getMinutes());
+        const hours_txt = japaneseHoursToText(date.getHours());
+        const mins_txt = japaneseMinsToText(date.getMinutes());
         return [hours_txt,"JI", mins_txt[0], mins_txt[1] ];
     }
+    defaultRowTypes(){ return {}; }
+
+    defaultRowDefs(){
+        return [
+            {
+                type: 'large',
+                init_coords: [0.05,0.1],
+                row_direction: [0.0,1.0],
+                rows: 1
+            },
+            {
+                type: 'medium',
+                init_coords: [0.05,0.4],
+                row_direction: [0.0,1.0],
+                rows: 3
+            }
+        ];
+    }
 }
 
 module.exports = JapaneseDateFormatter;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.settings.js b/apps/slidingtext/slidingtext.settings.js
index d1006990e..e13c857fd 100644
--- a/apps/slidingtext/slidingtext.settings.js
+++ b/apps/slidingtext/slidingtext.settings.js
@@ -1,33 +1,151 @@
 (function(back) {
     const PREFERENCE_FILE = "slidingtext.settings.json";
-    var settings = Object.assign({},
+    const settings = Object.assign({},
         require('Storage').readJSON(PREFERENCE_FILE, true) || {});
+    const bangleVersion = (g.getHeight()>200)? 1 : 2;
     // the screen controls are defaulted on for a bangle 1 and off for a bangle 2
     if(settings.enable_live_controls == null){
-        settings.enable_live_controls = (g.getHeight()> 200);
+        settings.enable_live_controls = bangleVersion < 2;
     }
     console.log("loaded:" + JSON.stringify(settings));
+    const locale_mappings = (bangleVersion > 1)? {
+        'english' : { date_formatter: 'en' },
+        'english alt': {
+            date_formatter: 'en',
+            row_types: {
+                large:{
+                    size: 'mlarge',
+                    angle_to_horizontal: 90,
+                    scroll_off: ['down'],
+                    scroll_in: ['up'],
+                    speed: 'vslow'
+                },
+                medium: {
+                    size: 'msmall',
+                    scroll_off: ['right'],
+                    scroll_in: ['right'],
+                },
+                small: {
+                    scroll_off: ['right'],
+                    scroll_in: ['right'],
+                }
+            },
+            row_defs: [
+                {
+                    type: 'large',
+                    init_coords: [0.05,0.99],
+                    row_direction: [1.0,0.0],
+                    alignment: 'centre-6',
+                    rows: 1
+                },
+                {
+                    type: 'medium',
+                    init_coords: [0.26,0.1],
+                    row_direction: [0.0,1.0],
+                    rows: 2
+                },
+                {
+                    type: 'small',
+                    init_coords: [0.26,0.65],
+                    row_direction: [0.0,1.0],
+                    rows: 3
+                }
+            ]
+        },
+        'english2': { date_formatter: 'en2' },
+        'english2 alt': { date_formatter: 'en2',
+            row_types: {
+                vsmall: {
+                    color: 'minor',
+                    speed: 'superslow',
+                    angle_to_horizontal: 0,
+                    scroll_off: ['left'],
+                    scroll_in: ['left'],
+                    size: 'ssmall'
+                },
+                small: {
+                    scroll_off: ['left'],
+                    scroll_in: ['left']
+                },
+                large: {
+                    size: 'mlarge',
+                    angle_to_horizontal: 90,
+                    color: 'major',
+                    scroll_off: ['down'],
+                    scroll_in: ['up']
+                }
+            },
+            row_defs: [
+                {
+                    type: 'large',
+                    init_coords: [0.8,0.99],
+                    row_direction: [0.0,1.0],
+                    alignment: 'centre-6',
+                    rows: 1
+                },
+                {
+                    type: 'small',
+                    init_coords: [0.05,0.45],
+                    row_direction: [0.0,1.0],
+                    rows: 3
+                },
+                {
+                    type: 'large',
+                    init_coords: [0.8,0.99],
+                    row_direction: [0.0,1.0],
+                    alignment: 'centre-6',
+                    rows: 1
+                },
+                {
+                    type: 'vsmall',
+                    init_coords: [0.05,0.1],
+                    row_direction: [0.0,1.0],
+                    rows: 2
+                },
+            ]
+        },
+        'french': { date_formatter:'fr'},
+        'german': { date_formatter: 'de'},
+        'german 24h': { date_formatter: 'de2'},
+        'spanish': { date_formatter: 'es'},
+        'japanese': { date_formatter: 'jp'},
+        'hybrid': { date_formatter: 'hyb'},
+        'digits': { date_formatter: 'dgt'},
+    } : {
+        'english' : { date_formatter: 'en' },
+        'french': { date_formatter:'fr'},
+        'german': { date_formatter: 'de'},
+        'spanish': { date_formatter: 'es'},
+        'japanese': { date_formatter: 'jp'},
+        'hybrid': { date_formatter: 'hyb'},
+        'digits': { date_formatter: 'dgt'},
+    }
 
-    const LANGUAGES_FILE = "slidingtext.languages.json";
-    const LANGUAGES_DEFAULT = ["en","en2"];
-    var locales = null;
-    try {
-        locales = require("Storage").readJSON(LANGUAGES_FILE);
-    } catch(e) {
-        console.log("failed to load languages:" + e);
-    }
-    if(locales == null || locales.length == 0){
-        locales = LANGUAGES_DEFAULT;
-        console.log("defaulting languages to locale:" + locales);
-    }
+    const locales = Object.keys(locale_mappings);
 
     function writeSettings() {
+        if(settings.date_format == null){
+            settings.date_format = 'en';
+        }
+        const styling = locale_mappings[settings.date_format];
+        if(styling.date_formatter != null)
+            settings.date_formatter = styling.date_formatter;
+
+        settings.row_types = {};
+        if(styling.row_types != null)
+            settings.row_types = styling.row_types;
+
+        settings.row_defs = [];
+        if(styling.row_defs != null)
+            settings.row_defs = styling.row_defs;
+
         console.log("saving:" + JSON.stringify(settings));
+
         require('Storage').writeJSON(PREFERENCE_FILE, settings);
     }
 
     // Helper method which uses int-based menu item for set of string values
-    function stringItems(startvalue, writer, values) {
+    function stringItems(startvalue, writer, values, value_mapping) {
         return {
             value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
             format: v => values[v],
@@ -36,7 +154,8 @@
             wrap: true,
             step: 1,
             onchange: v => {
-                writer(values[v]);
+                const write_value = (value_mapping == null)? values[v] : value_mapping(values[v]);
+                writer(write_value);
                 writeSettings();
             }
         };
@@ -51,8 +170,8 @@
     E.showMenu({
         "" : { "title" : "Sliding Text" },
         "< Back" : () => back(),
-        "Colour": stringInSettings("color_scheme", ["white", "black", "red","grey","purple","blue"]),
-        "Languages": stringInSettings("date_format", locales),
+        "Colour": stringInSettings("color_scheme", ["black","white", "red","grey","purple","blue"]),
+        "Style": stringInSettings("date_format", locales, (l)=>locale_mappings[l] ),
         "Live Control": {
             value: (settings.enable_live_controls !== undefined ? settings.enable_live_controls : true),
             format: v => v ? "On" : "Off",
diff --git a/apps/slidingtext/slidingtext.utils.de.js b/apps/slidingtext/slidingtext.utils.de.js
new file mode 100644
index 000000000..a240f8dd8
--- /dev/null
+++ b/apps/slidingtext/slidingtext.utils.de.js
@@ -0,0 +1,86 @@
+const germanNumberStr = [ ["NULL",""], // 0
+    ["EINS",""], // 1
+    ["ZWEI",""], //2
+    ["DREI",""], //3
+    ["VIER",""], //4
+    ["FÜNF",""], //5
+    ["SECHS",""], //6
+    ["SIEBEN",""], //7
+    ["ACHT",""], //8
+    ["NEUN",""], // 9,
+    ["ZEHN",""], // 10
+    ["ELF",""], // 11,
+    ["ZWÖLF",""], // 12
+    ["DREI","ZEHN"], // 13
+    ["VIER","ZEHN"], // 14
+    ["FÜNF","ZEHN"], // 15
+    ["SECH","ZEHN"], // 16
+    ["SIEB","ZEHN"], // 17
+    ["ACHT","ZEHN"], // 18
+    ["NEUN","ZEHN"], // 19
+    ["ZWANZIG",""], // 20
+    ["EIN","UNDZWANZIG"], // 21
+    ["ZWEI","UNDZWANZIG"], //22
+    ["DREI","UNDZWANZIG"], // 23
+    ["VIER","UNDZWANZIG"] // 24
+];
+
+const germanTensStr = ["NULL",//0
+    "ZEHN",//10
+    "ZWANZIG",//20
+    "DREIßIG",//30
+    "VIERZIG",//40
+    "FÜNFZIG",//50
+    "SECHZIG"//60
+]
+
+const germanUnit = ["",//0
+    "EINUND",//1
+    "ZWEIUND",//2
+    "DREIUND",//3
+    "VIERUND", //4
+    "FÜNFUND", //5
+    "SECHSUND", //6
+    "SIEBENUND", //7
+    "ACHTUND", //8
+    "NEUNUND" //9
+]
+
+function germanHoursToText(hours){
+    hours = hours % 12;
+    if(hours === 0){
+        hours = 12;
+    }
+    if(hours === 1){
+        return "EIN"
+    } else {
+        return germanNumberStr[hours][0];
+    }
+}
+function german24HoursToText(hours){
+    hours = hours % 24;
+    if(hours === 0){
+        return hours[24] ;
+    } else if(hours === 1){
+        return ["EIN",""];
+    } else {
+        return germanNumberStr[hours];
+    }
+}
+
+
+function germanMinsToText(mins) {
+    if (mins < 20) {
+        return germanNumberStr[mins];
+    } else {
+        const tens = (mins / 10 | 0);
+        const word1 = germanTensStr[tens];
+        const remainder = mins - tens * 10;
+        const word2 = germanUnit[remainder];
+        return [word2, word1];
+    }
+}
+
+exports.germanMinsToText = germanMinsToText;
+exports.germanHoursToText = germanHoursToText;
+exports.german24HoursToText = german24HoursToText;
\ No newline at end of file
diff --git a/apps/slidingtext/slidingtext.utils.en.js b/apps/slidingtext/slidingtext.utils.en.js
index a91fcbd16..a66ae456c 100644
--- a/apps/slidingtext/slidingtext.utils.en.js
+++ b/apps/slidingtext/slidingtext.utils.en.js
@@ -3,12 +3,26 @@ const numberStr = ["ZERO","ONE", "TWO", "THREE", "FOUR", "FIVE",
     "ELEVEN", "TWELVE", "THIRTEEN", "FOURTEEN",
     "FIFTEEN", "SIXTEEN", "SEVENTEEN", "EIGHTEEN",
     "NINETEEN", "TWENTY"];
-const tensStr = ["ZERO", "TEN", "TWENTY", "THIRTY", "FOURTY",
-    "FIFTY"];
+const tensStr = ["ZERO", "TEN", "TWENTY", "THIRTY", "FORTY", "FIFTY"];
+const dayNames = ["SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY"];
+const monthStr = [
+    "JANUARY", "FEBRUARY", "MARCH", "APRIL", "MAY", "JULY",
+    "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER"
+]
+
+const dateNumberStr = ["ZEROTH", "FIRST", "SECOND", "THIRD", "FORTH", "FIFTH",
+    "SIXTH","SEVENTH","EIGHTH","NINTH","TENTH","ELEVENTH","TWELFTH","THIRTEENTH",
+    "FOURTEENTH", "FIFTEENTH", "SIXTEENTH", "SEVENTEENTH", "EIGHTEENTH", "NINETEENTH",
+    "TWENTIETH"
+]
+
+const dayOfWeek = (date) => dayNames[date.getDay()];
+const dayOfWeekShort = (date) => dayNames[date.getDay()].substring(0,3);
+const monthToText = (date)=>monthStr[date.getMonth()-1];
 
 const hoursToText = (hours)=>{
     hours = hours % 12;
-    if(hours == 0){
+    if(hours === 0){
         hours = 12;
     }
     return numberStr[hours];
@@ -18,9 +32,9 @@ const numberToText = (value)=> {
     var word1 = '';
     var word2 = '';
     if(value > 20){
-        var tens = (value / 10 | 0);
+        const tens = (value / 10 | 0);
         word1 = tensStr[tens];
-        var remainder = value - tens * 10;
+        const remainder = value - tens * 10;
         if(remainder > 0){
             word2 = numberStr[remainder];
         }
@@ -30,5 +44,27 @@ const numberToText = (value)=> {
     return [word1,word2];
 }
 
+const numberToDayNumberText = (value) => {
+    var word1 = '';
+    var word2 = '';
+    if(value === 30) {
+        word1 = "THIRTIETH";
+    } else if(value > 20){
+        const tens = (value / 10 | 0);
+        word1 = tensStr[tens];
+        const remainder = value - tens * 10;
+        if(remainder > 0){
+            word2 = dateNumberStr[remainder];
+        }
+    } else if(value > 0) {
+        word1 = dateNumberStr[value];
+    }
+    return [word1,word2];
+}
+
+exports.monthToText = monthToText;
 exports.hoursToText = hoursToText;
-exports.numberToText = numberToText;
\ No newline at end of file
+exports.numberToText = numberToText;
+exports.numberToDayNumberText = numberToDayNumberText;
+exports.dayOfWeek = dayOfWeek;
+exports.dayOfWeekShort = dayOfWeekShort;
\ No newline at end of file
diff --git a/apps/slopeclock/ChangeLog b/apps/slopeclock/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/slopeclock/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/slopeclock/app-icon.js b/apps/slopeclock/app-icon.js
new file mode 100644
index 000000000..528758a7a
--- /dev/null
+++ b/apps/slopeclock/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4X/AAMfBIWSyhL/ACkD1cAlWq1WABYk6BYnABQcO1QLa3//FwgLEHIoABlQLO3WsBZHqHYwLGEooLF0ALHnW/BZMDDII8DmoLDAAILDmtVBZHV+oLEmEA1Ws6vAgNVh5EB+Eq/2lq4cCqqPBIYMqytVoALCioLD6tVBYMDqALEr4KBqotBqkAgsP/9VvkMhoLBhoLCKwQrCIoQLCBQITBM4QPB+ALBFYYLBhpHDBY0BIoILFuEPBYNcBY1XP4fAmgLENIYDBI4JGCNIlXqp3CCof/F4UPIIILEI4wtEIQVwAYIzCO4oLCSgIXFqpfCIwjTBCQXAEQgA/AAoA="))
diff --git a/apps/slopeclock/app.js b/apps/slopeclock/app.js
new file mode 100644
index 000000000..dba455cff
--- /dev/null
+++ b/apps/slopeclock/app.js
@@ -0,0 +1,116 @@
+Graphics.prototype.setFontPaytoneOne = function(scale) {
+  // Actual height 81 (91 - 11)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AH8AgP/BpcD//gBpn4Bpn+Bpn/wANMHBRTB//wBphGLBoJGLv4OBBpU/KhkfBoPABpMPMRkHMRh+CMRRwC/hwmMQQNKMQTTNBpRGCRhSpCBpY4BFJY4BBpcAjgMLAHUwBpl4BhcBd5Z/Bd5abCBpa3BTZd/YpcBcIPgBpMHBoPwIhf//BEL/5wKIgP/OBJECAAJELAAJwIIgQABOBBECOBRECOBJEEOBBEEOBBEEOBBEEOBBEEOA5EFBo5EFFI5EFKY5EGN4woGTIpEpj5EMDYzeGG4xEFgEDWZhhFbo59FfI7QFIgynGIgxwGBg5wEIhBwE+ANIOAZEIOAhEIOAgMJOAREJOAZEJOAZEJOAZEKOAQMKOAJELOAJELAAJELAH0EBhaQBSJa6BZJbkCDhMDBof4XJIADBpvAKRIqKBov+Bo0fBogqHBozpGBoyAGBoxjGBo44FBo44FMIpxHBo5xFBo7HFU4pGHBpBGEBpB/EdohGIgINHIwgNJIwgWEn4EC8ANGQ4SNHv4VEQgRUEEgQxCHwRUEYgRNDEQQNKFQRUDAwQNDQoRUDTQQUDHASpDCgR3EHAJiDCgR3ELYJiEBow/BMQgiBbQ4iFSYg/CLYZwBGAg/COAwNGOAwiDJoRwUKggNBOAwGEBoJwEcIT2GaYw4DAoINEMQQ/CHwRbEMQQHCLQTaHI4QvCNIoHCAArMEJoQAFO4gkDBpJUCAAraHBpRUDAAihEIxANFIw4NFIw7EEIxANFRo4NGcQQNKHAwNGHAwNGHAwNHHAoNHf4YNJVQqLFFQ7DEFRDtEKpHgBpCADwANIDgRSHKwvABpQA/AFp7BZwkfXIyXFVoLVFv//bArxFBoLBDga6GfgK0DHwIiEH4TrEcgw/BJogwBa4g/BJogwBEQgNGOAxNBAAwUEJoQAFOAoNHOAoNHOApbBAAxwEBpBwENIIAGOAgNIOAh3BOBYNIOAi2BOBYNIOAgNJOAbEBOBbEIOAjEIOAoNIOAioIOAiaIOAiMIOH5wLAAw/BOAgAGH4JwEAAw/CBpQ/COAYAHWAJwDAA6wBOAYAHWAJwEAAywBODIA/ABsDUBYNBOwpwGZgIcEcIwNBDggNBcIraFBoQjEbQK+DBoThEBoIqDBoThEdAJNDBoThEBpBNEewJbDBoRwEewINGOAiFBNIYNCOAgNJO5INDOAaaBAwYNDOAgGEBoZwEBpBwEVAgNDOAiMBCgQNDOAiMBCgRnCOAqMEBohwDPwgNEOAZ+EBohwDPwQGBFwJwJAwINEOAxUBLAP/+5wHIwIDC/ZwHHAInC/JwHAAn4OBAAD/g/BOAwNEHYJwGBog/BOAgiBAAf+H4JwELwQNDH4JwEMQQNDH4JwEMQv+H4QNDKgoYBOApUGJoRwDKgxNCOAZUGJoRwEIwoGCOAhGFWARwEIwoUCOAhGEBIJwGRogXCOAriEBoRwGHAZBCOAxxDBoRwGFQZrCOAxADEgRwGCwZOCOA4A/AEMBXggAISQ0AjCZFZYgjBTQt/AwqgBBoraFfozgBbQgNBGIgNGEQIGEewJVECgIGEHwJGEAxr9BKggGBewImBfoRUEAwQ7CBIJUFgINCFoIJBO4oNCwAtBBIJ3JFoIJBFoJNEEQQfBBIJNDRgwJCJoaMGBIQ/DPwgNBFoJiHRgYtBMQ4+DFoJiHHwYfBMQbFDPwoJBXww+CFoZwGHwQtDOAz2CFoZwGUIQJCTwRwGGAIJBTwRwGEQICBKAIRDOAngAQJCBJoJwGAAfhD4ZwEAAxwGBpZiBAA4NDMQIAHPwZiCAAx+DMQQNKKhKMDKhKMDKhINEKgf7BoaaDIwn5BpCpD/A8DVAhGD/g8DBooJC/g8DBoqNC/A8DWwg4DIAINIe4k/BpA0BPAI4CBowmBWAI4CBo4uFKYoAFM4KLEAAxZBWogA/ADSMBRZaaCBpTlCwANMXYIAIaQXgBpioKBoTEKaILgLBoRwKn4NBOBQNDOBINDOBN/BoRwJBoZwJBgRwKBoZwJBoZwIgILCOBINDJAJwHfQX8OQJwHBoaqBOA4NC/DUBOA8HBoQDBOA4NC+AfBOA76C8BXBOA4NDQIQNJLwJwILoINCOBANCC4JwIfQQNBOBAbCMwZwGIoQAGJAZ9CAAxIDU4QAGJAbfCAAxIEBpBIEQ4IAGXIhwCAAq5EOAQAGOH5w/OH5wvBoYAELIInEAA4ZKLIiYDAA5ZBTAYAHLIKYDAA5ZBTAgAGZQKYEAAzKBTAhwjAH4A8U4LRCh7xGS4LRCcYwGBAATDBAwLjEBojDBeILVEAwIADwA7Baoj4BAAfAcYLVECgIADGgIRCfAgAD/EAn5UFBohUIv4OEKg4iBKghNBKghwEGgJNCOBJCBD4RwIIQI/BMQZwHH4JUDOArFDOgJwHBIJiGOAQtBBoJiGSYQNBC4JiGSYTPDH4RiDGAP4Z4jFFGAImBBoY/BYoYmDEoZwIRAhwIwDrDBoJwG4AXDJoJwHRAbMCOAzICZgZwGRAXADYRwGK4X4EQLhGOAYADPwZwFcopwHcopwHBpBwEAAaMEOAoACRgjhFBo7hFAAYNDOAZiFBoZwDKgqoDOAZUFBohwCW4QNHfQYNEWwZwDCIQNHGgINBIwgNEOAIDDBo8DLAoNGAAg4DBpJxDMIgAEXAYNJFQYMJXgTtEAA8HIhIA/ACp9BN5SZD8B7JBoX+YZjSJb4f//ANMYpF/BogqHBovwBowMEKpANF/+ABpiAGBoxjGBoyrGBoxxGBo5xFBo5xFPopGHBo5/FBo5GFYYpGHBpCNEj5UMBpCNEh4ICw//g5UGA4X8AYOAHwQNG/EDBoIGCcQYJBH4IDB4EBKgoGCBoQJBQoJUDBoYDBBIJbBVIgNGHAJiEEQIUBAQQtBMQhbBBoQXBGISMFBQN/C4RiFRgIKBD4IxDYoY+BBoIfBC4IRBOAZ+CBoQJBAYJwGwAtBBIIDBOA3AFoIJBOBHgNgY/DOAiMCHYLFCOAp+CFoZwGPwQRBAwINEGAb6CAAR+DGgYtBAAZ+DGgYmCBo5iCIQQACRgZiGAASMEKgYNJKgYtBAASaEYoZiEBohUIVAhUIBoomB/BUEBopUIBoipIBogmBDYJGEBogmBO4JmCBo8/V4QNJh7nCHAYNFgxYEMIxKGBpYqCU4oAFOoLtEAA8PBhYA/AB9///AQ5jFCABEfQ47MCYAbvBXQgiEUYKxFg4iEgbNGh4UEbgRNFCgoNBH4hpBOBYUBAwhwFHwJ3FOApaBNIpwFCYJpFOAovBNIpwFBgJbFOAgECKgwUDIgQABTYhwDJQIACKghwDKQRGGOAYfBAAZwHBghUEOASXCAAaiF/xSEKgprCIgibGAwO/BopUEKApwJAAyMEGoyoGSwhvHWQqLHOARgKbgpSHfAqYGOBJSEOBAMFOAyXEOBBEGOAyXEOBBEGOAyXEOA5EHOAqXFOA5EHOAqXGOAxEIOAgMIOAZEJOAaXHMQpEJAH4AOn6QJbIaDKQgYcKUATXJVxwNCZQ8fCwIND4C4H4ANDHAzUCBoY4GBAP+MIQEBBo//4IDCOIoXD+ANDewozDBoZGFBIZXBIw4NDAAZGFBo6NFEoYAERogNIKgk/Bo5UEBpBUEj5UMh5UMBpKpDg4KFAwRUDbgP4JARCBKgrEB/AsC/BNCAYINEfYQJBCQJiEBIQpDCQJiEv4JBHAT2DRggTBQIReBWAJiDBQJlDYIIgBYoY+BwBGCLwIVBOAYYBCYJUFOAYYBCYIzBHgIVBOAoTBKgYVBOA6NCwAVBOA6zEOAwlDSIhwF4ANCEAJKBOAvwcgYNCOAv/TQQYBGILhFAAn4DYJwDHwQAGBogUBAAx+ERIQAFPwiJCAAwNDL4YNJPYQAGRgZUJRgZUJBoiKC/wNETQZGEMwiaDIwhmEBohGDMwgNFEwS7EVAiNDLAgNFDARYDBowqBWAJGDBo0DH4JYDaQgAFDZKRGBpRxCBpQqCPooAFKoLDEAA8cBhYA/ACM/8AMKcQYAJaASXKWYTdDgwNI/+AawSyHAAJHCn64FBobeCHgwND/xLCeAoNDHAIFBCIINI8BnCKZA0BQYRGEBohxBv5YDBow0Bn5UFGIRGFSIYNG4AiBKgg/CKhQNFPYJUGBohUIBohUICgIADSYSpECgJiEKgwNCKAXAKg0fCgRCCLYWAYggNBCIJiHGAYDBBoJiFGAINBEwJwBMQowCOgQtFPwh0DH4TFEJgYYBOA4XBJgIYBaYRwEHwJMBBQLTDOAYlBJgIKBPwZwFHwIKB+ANCOA5KBD4INBOAwwBTQhwGGAN/BpBiBEQM/HYINBPwhiBS4X8GAR+EMQI4BBoJvCPwiFC/kPAIINGCof//oEDRgYxCAAwNDKgQAGTQZUCBpZUCAAqoDKgYNKKggADWwapDBpZGHBopGHBopGHBoqNHBoqNHBow4GBow4GBow4GBow4GTIgACfIYNJFQrREFRD7EKo/+Bg7HE/ANJDgQ2IeYZRHAH4AmgaYDn50HRgKLCv/8BpD6CZQINIC4QNBVgy2CBoYgCIojEDBoI4GBoRQBn7yHgLuDBoJGGBoQlBj7zIBAIlBh4uDAAhBBEoJYCKgwzCwBKCHgIAEGYY8EAAgzEHgaMHGYI8DPw5wEwBwTEoJwLUgatEMQ4uDPwzhNC4RPBEAKMGC4QNBEAINHC4INBEAIpGKAQgDBo8AnASDRYoAnA='))),
+    46,
+    atob("ITZOMzs7SDxHNUdGIQ=="),
+    113+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+let drawTimeout;
+
+let g2 = Graphics.createArrayBuffer(g.getWidth(),90,1,{msb:true});
+let g2img = {
+  width:g2.getWidth(), height:g2.getHeight(), bpp:1,
+  buffer:g2.buffer, transparent:0
+};
+const slope = 20;
+const offsy = 20; // offset of numbers from middle
+const fontBorder = 4; // offset from left/right
+const slopeBorder = 10, slopeBorderUpper = 4; // fudge-factor to move minutes down from slope
+let R,x,y; // middle of the clock face
+let dateStr = "";
+let bgColors = g.theme.dark ? ["#ff0","#0ff","#f0f"] : ["#f00","#0f0","#00f"];
+let bgColor = bgColors[(Math.random()*bgColors.length)|0];
+
+
+// Draw the hour, and the minute into an offscreen buffer
+let draw = function() {
+  R = Bangle.appRect;
+  x = R.w / 2;
+  y = R.y + R.h / 2 - 12; // 12 = room for date
+  var date = new Date();
+  var hourStr = date.getHours();
+  var minStr = date.getMinutes().toString().padStart(2,0);
+  dateStr = require("locale").dow(date, 1).toUpperCase()+ " "+
+            require("locale").date(date, 0).toUpperCase();
+
+  // Draw hour
+  g.reset().clearRect(R); // clear whole background (w/o widgets)
+  g.setFontAlign(-1, 0).setFont("PaytoneOne");
+  g.drawString(hourStr, fontBorder, y-offsy);
+  // add slope in background color
+  g.setColor(g.theme.bg).fillPoly([0,y+slope-slopeBorderUpper, R.w,y-slope-slopeBorderUpper,
+                                   R.w,y-slope, 0,y+slope]);
+  // Draw minute to offscreen buffer
+  g2.setColor(0).fillRect(0,0,g2.getWidth(),g2.getHeight()).setFontAlign(1, 0).setFont("PaytoneOne");
+  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2);
+  g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
+  // start the animation *in*
+  animate(true);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    animate(false, function() {
+      draw();
+    });
+  }, 60000 - (Date.now() % 60000));
+};
+
+let isAnimIn = true;
+let animInterval;
+// Draw *just* the minute image
+let drawMinute = function() {
+  var yo = slopeBorder + offsy + y - 2*slope*minuteX/R.w;
+  // draw over the slanty bit
+  g.setColor(bgColor).fillPoly([0,y+slope, R.w,y-slope, R.w,R.h+R.y, 0,R.h+R.y]);
+  // draw the minutes
+  g.setColor(g.theme.bg).drawImage(g2img, x+minuteX-(g2.getWidth()/2), yo-(g2.getHeight()/2));
+};
+let animate = function(isIn, callback) {
+  if (animInterval) clearInterval(animInterval);
+  isAnimIn = isIn;
+  minuteX = isAnimIn ? -g2.getWidth() : 0;
+  drawMinute();
+  animInterval = setInterval(function() {
+    minuteX += 8;
+    let stop = false;
+    if (isAnimIn && minuteX>=0) {
+      minuteX=0;
+      stop = true;
+    } else if (!isAnimIn && minuteX>=R.w)
+      stop = true;
+    drawMinute();
+    if (stop) {
+      clearInterval(animInterval);
+      animInterval=undefined;
+      if (isAnimIn) // draw the date
+        g.setColor(g.theme.bg).setFontAlign(0, 0).setFont("6x15").drawString(dateStr, R.x + R.w/2, R.y+R.h-9);
+      if (callback) callback();
+    }
+  }, 20);
+};
+
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    if (animInterval) clearInterval(animInterval);
+    animInterval = undefined;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    delete Graphics.prototype.setFontPaytoneOne;
+  }});
+// Load widgets
+Bangle.loadWidgets();
+draw();
+setTimeout(Bangle.drawWidgets,0);
+}
diff --git a/apps/slopeclock/app.png b/apps/slopeclock/app.png
new file mode 100644
index 000000000..d72b8faf9
Binary files /dev/null and b/apps/slopeclock/app.png differ
diff --git a/apps/slopeclock/metadata.json b/apps/slopeclock/metadata.json
new file mode 100644
index 000000000..d880a0cf6
--- /dev/null
+++ b/apps/slopeclock/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "slopeclock",
+  "name": "Slope Clock",
+  "version":"0.01",
+  "description": "A clock where hours and minutes are divided by a sloping line. When the minute changes, the numbers slide off the screen",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS2"],  
+  "storage": [
+    {"name":"slopeclock.app.js","url":"app.js"},
+    {"name":"slopeclock.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/slopeclock/screenshot.png b/apps/slopeclock/screenshot.png
new file mode 100644
index 000000000..4a59f5c4a
Binary files /dev/null and b/apps/slopeclock/screenshot.png differ
diff --git a/apps/slopeclockpp/ChangeLog b/apps/slopeclockpp/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/slopeclockpp/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/slopeclockpp/app-icon.js b/apps/slopeclockpp/app-icon.js
new file mode 100644
index 000000000..bd62b928d
--- /dev/null
+++ b/apps/slopeclockpp/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4P/AAMA/Ayq8EH8AEBgfgj4zCj/gn/8Aod//wFDvk/gEEAoP4AoMAEIP4j4FFwAFC/gFEv//ApM/74FDg4XBgZLCFIMzAoU4g8BK4dwgMP+Ewg+AgMfK4PhAoXwh+B/0Bj0B/4FBgYnB/8B/kDgf/+ED/kHn//HgIFBW4IFB/AFDgf4h4FB+EBFgLKCAoInBAAOAAoqkBAgPAWAIuBAoXAn+zCAMB4F/8YFBgYFB4YFBRgY7BYwIoCABX4zkY74FB/mMiALC/3mug6CAAgA=="))
diff --git a/apps/slopeclockpp/app.js b/apps/slopeclockpp/app.js
new file mode 100644
index 000000000..25fd307eb
--- /dev/null
+++ b/apps/slopeclockpp/app.js
@@ -0,0 +1,220 @@
+Graphics.prototype.setFontPaytoneOne = function(scale) {
+  // Actual height 81 (91 - 11)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('AH8AgP/BpcD//gBpn4Bpn+Bpn/wANMHBRTB//wBphGLBoJGLv4OBBpU/KhkfBoPABpMPMRkHMRh+CMRRwC/hwmMQQNKMQTTNBpRGCRhSpCBpY4BFJY4BBpcAjgMLAHUwBpl4BhcBd5Z/Bd5abCBpa3BTZd/YpcBcIPgBpMHBoPwIhf//BEL/5wKIgP/OBJECAAJELAAJwIIgQABOBBECOBRECOBJEEOBBEEOBBEEOBBEEOBBEEOA5EFBo5EFFI5EFKY5EGN4woGTIpEpj5EMDYzeGG4xEFgEDWZhhFbo59FfI7QFIgynGIgxwGBg5wEIhBwE+ANIOAZEIOAhEIOAgMJOAREJOAZEJOAZEJOAZEKOAQMKOAJELOAJELAAJELAH0EBhaQBSJa6BZJbkCDhMDBof4XJIADBpvAKRIqKBov+Bo0fBogqHBozpGBoyAGBoxjGBo44FBo44FMIpxHBo5xFBo7HFU4pGHBpBGEBpB/EdohGIgINHIwgNJIwgWEn4EC8ANGQ4SNHv4VEQgRUEEgQxCHwRUEYgRNDEQQNKFQRUDAwQNDQoRUDTQQUDHASpDCgR3EHAJiDCgR3ELYJiEBow/BMQgiBbQ4iFSYg/CLYZwBGAg/COAwNGOAwiDJoRwUKggNBOAwGEBoJwEcIT2GaYw4DAoINEMQQ/CHwRbEMQQHCLQTaHI4QvCNIoHCAArMEJoQAFO4gkDBpJUCAAraHBpRUDAAihEIxANFIw4NFIw7EEIxANFRo4NGcQQNKHAwNGHAwNGHAwNHHAoNHf4YNJVQqLFFQ7DEFRDtEKpHgBpCADwANIDgRSHKwvABpQA/AFp7BZwkfXIyXFVoLVFv//bArxFBoLBDga6GfgK0DHwIiEH4TrEcgw/BJogwBa4g/BJogwBEQgNGOAxNBAAwUEJoQAFOAoNHOAoNHOApbBAAxwEBpBwENIIAGOAgNIOAh3BOBYNIOAi2BOBYNIOAgNJOAbEBOBbEIOAjEIOAoNIOAioIOAiaIOAiMIOH5wLAAw/BOAgAGH4JwEAAw/CBpQ/COAYAHWAJwDAA6wBOAYAHWAJwEAAywBODIA/ABsDUBYNBOwpwGZgIcEcIwNBDggNBcIraFBoQjEbQK+DBoThEBoIqDBoThEdAJNDBoThEBpBNEewJbDBoRwEewINGOAiFBNIYNCOAgNJO5INDOAaaBAwYNDOAgGEBoZwEBpBwEVAgNDOAiMBCgQNDOAiMBCgRnCOAqMEBohwDPwgNEOAZ+EBohwDPwQGBFwJwJAwINEOAxUBLAP/+5wHIwIDC/ZwHHAInC/JwHAAn4OBAAD/g/BOAwNEHYJwGBog/BOAgiBAAf+H4JwELwQNDH4JwEMQQNDH4JwEMQv+H4QNDKgoYBOApUGJoRwDKgxNCOAZUGJoRwEIwoGCOAhGFWARwEIwoUCOAhGEBIJwGRogXCOAriEBoRwGHAZBCOAxxDBoRwGFQZrCOAxADEgRwGCwZOCOA4A/AEMBXggAISQ0AjCZFZYgjBTQt/AwqgBBoraFfozgBbQgNBGIgNGEQIGEewJVECgIGEHwJGEAxr9BKggGBewImBfoRUEAwQ7CBIJUFgINCFoIJBO4oNCwAtBBIJ3JFoIJBFoJNEEQQfBBIJNDRgwJCJoaMGBIQ/DPwgNBFoJiHRgYtBMQ4+DFoJiHHwYfBMQbFDPwoJBXww+CFoZwGHwQtDOAz2CFoZwGUIQJCTwRwGGAIJBTwRwGEQICBKAIRDOAngAQJCBJoJwGAAfhD4ZwEAAxwGBpZiBAA4NDMQIAHPwZiCAAx+DMQQNKKhKMDKhKMDKhINEKgf7BoaaDIwn5BpCpD/A8DVAhGD/g8DBooJC/g8DBoqNC/A8DWwg4DIAINIe4k/BpA0BPAI4CBowmBWAI4CBo4uFKYoAFM4KLEAAxZBWogA/ADSMBRZaaCBpTlCwANMXYIAIaQXgBpioKBoTEKaILgLBoRwKn4NBOBQNDOBINDOBN/BoRwJBoZwJBgRwKBoZwJBoZwIgILCOBINDJAJwHfQX8OQJwHBoaqBOA4NC/DUBOA8HBoQDBOA4NC+AfBOA76C8BXBOA4NDQIQNJLwJwILoINCOBANCC4JwIfQQNBOBAbCMwZwGIoQAGJAZ9CAAxIDU4QAGJAbfCAAxIEBpBIEQ4IAGXIhwCAAq5EOAQAGOH5w/OH5wvBoYAELIInEAA4ZKLIiYDAA5ZBTAYAHLIKYDAA5ZBTAgAGZQKYEAAzKBTAhwjAH4A8U4LRCh7xGS4LRCcYwGBAATDBAwLjEBojDBeILVEAwIADwA7Baoj4BAAfAcYLVECgIADGgIRCfAgAD/EAn5UFBohUIv4OEKg4iBKghNBKghwEGgJNCOBJCBD4RwIIQI/BMQZwHH4JUDOArFDOgJwHBIJiGOAQtBBoJiGSYQNBC4JiGSYTPDH4RiDGAP4Z4jFFGAImBBoY/BYoYmDEoZwIRAhwIwDrDBoJwG4AXDJoJwHRAbMCOAzICZgZwGRAXADYRwGK4X4EQLhGOAYADPwZwFcopwHcopwHBpBwEAAaMEOAoACRgjhFBo7hFAAYNDOAZiFBoZwDKgqoDOAZUFBohwCW4QNHfQYNEWwZwDCIQNHGgINBIwgNEOAIDDBo8DLAoNGAAg4DBpJxDMIgAEXAYNJFQYMJXgTtEAA8HIhIA/ACp9BN5SZD8B7JBoX+YZjSJb4f//ANMYpF/BogqHBovwBowMEKpANF/+ABpiAGBoxjGBoyrGBoxxGBo5xFBo5xFPopGHBo5/FBo5GFYYpGHBpCNEj5UMBpCNEh4ICw//g5UGA4X8AYOAHwQNG/EDBoIGCcQYJBH4IDB4EBKgoGCBoQJBQoJUDBoYDBBIJbBVIgNGHAJiEEQIUBAQQtBMQhbBBoQXBGISMFBQN/C4RiFRgIKBD4IxDYoY+BBoIfBC4IRBOAZ+CBoQJBAYJwGwAtBBIIDBOA3AFoIJBOBHgNgY/DOAiMCHYLFCOAp+CFoZwGPwQRBAwINEGAb6CAAR+DGgYtBAAZ+DGgYmCBo5iCIQQACRgZiGAASMEKgYNJKgYtBAASaEYoZiEBohUIVAhUIBoomB/BUEBopUIBoipIBogmBDYJGEBogmBO4JmCBo8/V4QNJh7nCHAYNFgxYEMIxKGBpYqCU4oAFOoLtEAA8PBhYA/AB9///AQ5jFCABEfQ47MCYAbvBXQgiEUYKxFg4iEgbNGh4UEbgRNFCgoNBH4hpBOBYUBAwhwFHwJ3FOApaBNIpwFCYJpFOAovBNIpwFBgJbFOAgECKgwUDIgQABTYhwDJQIACKghwDKQRGGOAYfBAAZwHBghUEOASXCAAaiF/xSEKgprCIgibGAwO/BopUEKApwJAAyMEGoyoGSwhvHWQqLHOARgKbgpSHfAqYGOBJSEOBAMFOAyXEOBBEGOAyXEOBBEGOAyXEOA5EHOAqXFOA5EHOAqXGOAxEIOAgMIOAZEJOAaXHMQpEJAH4AOn6QJbIaDKQgYcKUATXJVxwNCZQ8fCwIND4C4H4ANDHAzUCBoY4GBAP+MIQEBBo//4IDCOIoXD+ANDewozDBoZGFBIZXBIw4NDAAZGFBo6NFEoYAERogNIKgk/Bo5UEBpBUEj5UMh5UMBpKpDg4KFAwRUDbgP4JARCBKgrEB/AsC/BNCAYINEfYQJBCQJiEBIQpDCQJiEv4JBHAT2DRggTBQIReBWAJiDBQJlDYIIgBYoY+BwBGCLwIVBOAYYBCYJUFOAYYBCYIzBHgIVBOAoTBKgYVBOA6NCwAVBOA6zEOAwlDSIhwF4ANCEAJKBOAvwcgYNCOAv/TQQYBGILhFAAn4DYJwDHwQAGBogUBAAx+ERIQAFPwiJCAAwNDL4YNJPYQAGRgZUJRgZUJBoiKC/wNETQZGEMwiaDIwhmEBohGDMwgNFEwS7EVAiNDLAgNFDARYDBowqBWAJGDBo0DH4JYDaQgAFDZKRGBpRxCBpQqCPooAFKoLDEAA8cBhYA/ACM/8AMKcQYAJaASXKWYTdDgwNI/+AawSyHAAJHCn64FBobeCHgwND/xLCeAoNDHAIFBCIINI8BnCKZA0BQYRGEBohxBv5YDBow0Bn5UFGIRGFSIYNG4AiBKgg/CKhQNFPYJUGBohUIBohUICgIADSYSpECgJiEKgwNCKAXAKg0fCgRCCLYWAYggNBCIJiHGAYDBBoJiFGAINBEwJwBMQowCOgQtFPwh0DH4TFEJgYYBOA4XBJgIYBaYRwEHwJMBBQLTDOAYlBJgIKBPwZwFHwIKB+ANCOA5KBD4INBOAwwBTQhwGGAN/BpBiBEQM/HYINBPwhiBS4X8GAR+EMQI4BBoJvCPwiFC/kPAIINGCof//oEDRgYxCAAwNDKgQAGTQZUCBpZUCAAqoDKgYNKKggADWwapDBpZGHBopGHBopGHBoqNHBoqNHBow4GBow4GBow4GBow4GTIgACfIYNJFQrREFRD7EKo/+Bg7HE/ANJDgQ2IeYZRHAH4AmgaYDn50HRgKLCv/8BpD6CZQINIC4QNBVgy2CBoYgCIojEDBoI4GBoRQBn7yHgLuDBoJGGBoQlBj7zIBAIlBh4uDAAhBBEoJYCKgwzCwBKCHgIAEGYY8EAAgzEHgaMHGYI8DPw5wEwBwTEoJwLUgatEMQ4uDPwzhNC4RPBEAKMGC4QNBEAINHC4INBEAIpGKAQgDBo8AnASDRYoAnA='))),
+    46,
+    atob("ITZOMzs7SDxHNUdGIQ=="),
+    113+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+{ // must be inside our own scope here so that when we are unloaded everything disappears
+  // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
+let drawTimeout;
+
+let g2 = Graphics.createArrayBuffer(g.getWidth(),90,1,{msb:true});
+let g2img = {
+  width:g2.getWidth(), height:g2.getHeight(), bpp:1,
+  buffer:g2.buffer, transparent:0
+};
+const slope = 20;
+const offsy = 20; // offset of numbers from middle
+const fontBorder = 4; // offset from left/right
+const slopeBorder = 10, slopeBorderUpper = 4; // fudge-factor to move minutes down from slope
+let R,x,y; // middle of the clock face
+let dateStr = "";
+let bgColors = g.theme.dark ? ["#ff0","#0ff","#f0f"] : ["#f00","#0f0","#00f"];
+let bgColor = bgColors[(Math.random()*bgColors.length)|0];
+
+
+// Draw the hour, and the minute into an offscreen buffer
+let draw = function() {
+  R = Bangle.appRect;
+  x = R.w / 2;
+  y = R.y + R.h / 2 - 12; // 12 = room for date
+  var date = new Date();
+  var hourStr = date.getHours();
+  var minStr = date.getMinutes().toString().padStart(2,0);
+  dateStr = require("locale").dow(date, 1).toUpperCase()+ " "+
+            require("locale").date(date, 0).toUpperCase();
+
+  // Draw hour
+  g.reset().clearRect(R); // clear whole background (w/o widgets)
+  g.setFontAlign(-1, 0).setFont("PaytoneOne");
+  g.drawString(hourStr, fontBorder, y-offsy);
+  // add slope in background color
+  g.setColor(g.theme.bg).fillPoly([0,y+slope-slopeBorderUpper, R.w,y-slope-slopeBorderUpper,
+                                   R.w,y-slope, 0,y+slope]);
+
+  // Draw minute to offscreen buffer
+  g2.setColor(0).fillRect(0,0,g2.getWidth(),g2.getHeight()).setFontAlign(1, 0).setFont("PaytoneOne");
+  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2);
+  g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
+  // start the animation *in*
+  animate(true);
+
+  // queue next draw
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    animate(false, function() {
+      draw();
+    });
+  }, 60000 - (Date.now() % 60000));
+};
+
+let isAnimIn = true;
+let animInterval;
+// Draw *just* the minute image
+let drawMinute = function() {
+  var yo = slopeBorder + offsy + y - 2*slope*minuteX/R.w;
+  // draw over the slanty bit
+  g.setColor(bgColor).fillPoly([0,y+slope, R.w,y-slope, R.w,R.h+R.y, 0,R.h+R.y]);
+  // draw the minutes
+  g.setColor(g.theme.bg).drawImage(g2img, x+minuteX-(g2.getWidth()/2), yo-(g2.getHeight()/2));
+};
+let animate = function(isIn, callback) {
+  if (animInterval) clearInterval(animInterval);
+  isAnimIn = isIn;
+  minuteX = isAnimIn ? -g2.getWidth() : 0;
+  drawMinute();
+  animInterval = setInterval(function() {
+    minuteX += 8;
+    let stop = false;
+    if (isAnimIn && minuteX>=0) {
+      minuteX=0;
+      stop = true;
+    } else if (!isAnimIn && minuteX>=R.w)
+      stop = true;
+    drawMinute();
+    if (stop) {
+      clearInterval(animInterval);
+      animInterval=undefined;
+      if (isAnimIn) {
+        // draw the date
+        g.setColor(g.theme.bg).setFontAlign(0, 0).setFont("6x15").drawString(dateStr, R.x + R.w/2, R.y+R.h-9);
+
+        // draw steps to bottom left
+        const steps = getSteps();
+        if (steps > 0)
+           g.setFontAlign(-1, 0).drawString(shortValue(steps), 3, R.y+R.h-30);
+
+        // draw weather to top right
+        const weather = getWeather();
+        const tempString = weather ? require("locale").temp(weather.temp - 273.15) : undefined;
+        const code = weather ? weather.code : -1;
+        if (code > -1) {
+          g.setColor(g.theme.fg).setFontAlign(1, 0).drawString(tempString, R.w - 3, y-slope-slopeBorderUpper);
+          const icon = getWeatherIconByCode(code);
+          if (icon) g.drawImage(icon, R.w - 3 - 15, y-slope-slopeBorderUpper - 15 - 15);
+        }
+      }
+      if (callback) callback();
+    }
+  }, 20);
+};
+
+let getSteps = function() {
+  if (Bangle.getHealthStatus) {
+    return Bangle.getHealthStatus("day").steps;
+  }
+  if (WIDGETS && WIDGETS.wpedom !== undefined) {
+    return WIDGETS.wpedom.getSteps();
+  }
+  return 0;
+};
+
+let shortValue = function(v) {
+  if (isNaN(v)) return '-';
+  if (v <= 999) return v;
+  if (v >= 1000 && v < 10000) {
+    v = Math.floor(v / 100) * 100;
+    return (v / 1000).toFixed(1).replace(/\.0$/, '') + 'k';
+  }
+  if (v >= 10000) {
+    v = Math.floor(v / 1000) * 1000;
+    return (v / 1000).toFixed(1).replace(/\.0$/, '') + 'k';
+  }
+};
+
+let getWeather = function() {
+  let jsonWeather = require("Storage").readJSON('weather.json');
+  return jsonWeather && jsonWeather.weather ? jsonWeather.weather : undefined;
+};
+
+/*
+ * Choose weather icon to display based on weather conditition code
+ * https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2
+ */
+let getWeatherIconByCode = function(code) {
+  let codeGroup = Math.round(code / 100);
+
+  // weather icons:
+  let weatherCloudy = atob("EBCBAAAAAAAAAAfgD/Af8H/4//7///////9//z/+AAAAAAAA");
+  let weatherSunny = atob("EBCBAAAAAYAQCBAIA8AH4A/wb/YP8A/gB+ARiBAIAYABgAAA");
+  let weatherMoon = atob("EBCBAAAAAYAP8B/4P/w//D/8f/5//j/8P/w//B/4D/ABgAAA");
+  let weatherPartlyCloudy = atob("EBCBAAAAAAAYQAMAD8AIQBhoW+AOYBwwOBBgHGAGP/wf+AAA");
+  let weatherRainy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA");
+  let weatherPartlyRainy = atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA");
+  let weatherSnowy = atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA");
+  let weatherFoggy = atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA");
+  let weatherStormy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA");
+  let unknown = undefined;
+
+  switch (codeGroup) {
+    case 2:
+      return weatherStormy;
+    case 3:
+      return weatherCloudy;
+    case 5:
+      switch (code) {
+        case 511:
+          return weatherSnowy;
+        case 520:
+          return weatherPartlyRainy;
+        case 521:
+          return weatherPartlyRainy;
+        case 522:
+          return weatherPartlyRainy;
+        case 531:
+          return weatherPartlyRainy;
+        default:
+          return weatherRainy;
+      }
+      case 6:
+        return weatherSnowy;
+      case 7:
+        return weatherFoggy;
+      case 8:
+        switch (code) {
+          case 800:
+            return weatherSunny;
+          case 801:
+            return weatherPartlyCloudy;
+          case 802:
+            return weatherPartlyCloudy;
+          default:
+            return weatherCloudy;
+        }
+      default:
+        return unknown;
+  }
+}
+
+// Show launcher when middle button pressed
+Bangle.setUI({
+  mode : "clock",
+  remove : function() {
+    // Called to unload all of the clock app
+    if (animInterval) clearInterval(animInterval);
+    animInterval = undefined;
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+    delete Graphics.prototype.setFontPaytoneOne;
+  }});
+// Load widgets
+Bangle.loadWidgets();
+draw();
+setTimeout(Bangle.drawWidgets,0);
+}
diff --git a/apps/slopeclockpp/app.png b/apps/slopeclockpp/app.png
new file mode 100644
index 000000000..2f5912fcf
Binary files /dev/null and b/apps/slopeclockpp/app.png differ
diff --git a/apps/slopeclockpp/metadata.json b/apps/slopeclockpp/metadata.json
new file mode 100644
index 000000000..9e28424a8
--- /dev/null
+++ b/apps/slopeclockpp/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "slopeclockpp",
+  "name": "Slope Clock ++",
+  "version":"0.01",
+  "description": "A clock where hours and minutes are divided by a sloping line. When the minute changes, the numbers slide off the screen. This is a clone of the original Slope Clock which shows weather and steps.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports" : ["BANGLEJS2"],  
+  "storage": [
+    {"name":"slopeclockpp.app.js","url":"app.js"},
+    {"name":"slopeclockpp.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/slopeclockpp/screenshot.png b/apps/slopeclockpp/screenshot.png
new file mode 100644
index 000000000..93970956c
Binary files /dev/null and b/apps/slopeclockpp/screenshot.png differ
diff --git a/apps/smpltmr/ChangeLog b/apps/smpltmr/ChangeLog
index bf128e2fb..b09100f50 100644
--- a/apps/smpltmr/ChangeLog
+++ b/apps/smpltmr/ChangeLog
@@ -1,2 +1,4 @@
 0.01: Release
-0.02: Rewrite with new interface
\ No newline at end of file
+0.02: Rewrite with new interface
+0.03: Added clock infos to expose timer functionality to clocks.
+0.04: Improvements of clock infos.
\ No newline at end of file
diff --git a/apps/smpltmr/clkinfo.js b/apps/smpltmr/clkinfo.js
new file mode 100644
index 000000000..1a63a9b7e
--- /dev/null
+++ b/apps/smpltmr/clkinfo.js
@@ -0,0 +1,98 @@
+(function() {
+  const TIMER_IDX = "smpltmr";
+
+  function isAlarmEnabled(){
+    try{
+      var alarm = require('sched');
+      var alarmObj = alarm.getAlarm(TIMER_IDX);
+      if(alarmObj===undefined || !alarmObj.on){
+        return false;
+      }
+
+      return true;
+
+    } catch(ex){ }
+    return false;
+  }
+
+  function getAlarmMinutes(){
+    if(!isAlarmEnabled()){
+        return -1;
+    }
+
+    var alarm = require('sched');
+    var alarmObj =  alarm.getAlarm(TIMER_IDX);
+    return Math.round(alarm.getTimeToAlarm(alarmObj)/(60*1000));
+  }
+
+  function getAlarmMinutesText(){
+    var min = getAlarmMinutes();
+    if(min < 0){
+      return "OFF";
+    }
+
+    return "T-" + String(min);
+  }
+
+  function increaseAlarm(t){
+    try{
+        var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
+        var alarm = require('sched')
+        alarm.setAlarm(TIMER_IDX, {
+          timer : (minutes+t)*60*1000,
+        });
+        alarm.reload();
+    } catch(ex){ }
+  }
+
+  function decreaseAlarm(t){
+    try{
+        var minutes = getAlarmMinutes();
+        minutes -= t;
+
+        var alarm = require('sched')
+        alarm.setAlarm(TIMER_IDX, undefined);
+
+        if(minutes > 0){
+          alarm.setAlarm(TIMER_IDX, {
+              timer : minutes*60*1000,
+          });
+        }
+
+        alarm.reload();
+    } catch(ex){ }
+  }
+
+  var img = atob("GBiBAeAAB+AAB/v/3/v/3/v/3/v/3/v/n/n/H/z+P/48//85//+b//+b//8p//4E//yCP/kBH/oAn/oAX/oAX/oAX/oAX+AAB+AABw==")
+  var smpltmrItems = {
+    name: "Timer",
+    img: img,
+    items: [
+      {
+        name: null,
+        get: () => ({ text: getAlarmMinutesText() + (isAlarmEnabled() ? " min" : ""), img: null}),
+        show: function() { smpltmrItems.items[0].emit("redraw"); },
+        hide: function () {},
+        run: function() { }
+      },
+    ]
+  };
+
+  var offsets = [+5,-5];
+  offsets.forEach((o, i) => {
+    smpltmrItems.items = smpltmrItems.items.concat({
+      name: null,
+      get: () => ({ text: (o > 0 ? "+" : "") + o + " min.", img: null}),
+      show: function() { smpltmrItems.items[i+1].emit("redraw"); },
+      hide: function () {},
+      run: function() {
+        if(o > 0) increaseAlarm(o);
+        else decreaseAlarm(Math.abs(o));
+        this.show();
+        return true;
+      }
+    });
+  });
+
+  return smpltmrItems;
+})
\ No newline at end of file
diff --git a/apps/smpltmr/metadata.json b/apps/smpltmr/metadata.json
index cb1ef6eab..5f1329dfc 100644
--- a/apps/smpltmr/metadata.json
+++ b/apps/smpltmr/metadata.json
@@ -2,7 +2,7 @@
   "id": "smpltmr",
   "name": "Simple Timer",
   "shortName": "Simple Timer",
-  "version": "0.02",
+  "version": "0.04",
   "description": "A very simple app to start a timer.",
   "icon": "app.png",
   "tags": "tool,alarm,timer",
@@ -12,6 +12,7 @@
   "readme": "README.md",
   "storage": [
     {"name":"smpltmr.app.js","url":"app.js"},
+    {"name":"smpltmr.clkinfo.js","url":"clkinfo.js"},
     {"name":"smpltmr.img","url":"app-icon.js","evaluate":true}
   ]
 }
diff --git a/apps/speedalt/README.md b/apps/speedalt/README.md
index 6f0d4efe5..e629f94bb 100644
--- a/apps/speedalt/README.md
+++ b/apps/speedalt/README.md
@@ -2,7 +2,7 @@
 
 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.
 
-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. 
+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.
 
 The waypoints list is the same as that used with the [GPS Navigation](https://banglejs.com/apps/#gps%20navigation) app so the same set of waypoints can be used across both apps. Refer to that app for waypoint file information.
 
@@ -36,7 +36,7 @@ BTN4 : Left Display Tap : Swaps which figure is in the large display. You can ha
 
 ## App Settings
 
-Select the desired display units. Speed can be as per the default locale, kph, knots, mph or m/s. Distance can be km, miles or nautical miles. Altitude can be feet or metres. Select one of three colour schemes. Default (three colours), high contrast (all white on black) or night ( all red on black ). 
+Select the desired display units. Speed can be as per the default locale, kph, knots, mph or m/s. Distance can be km, miles or nautical miles. Altitude can be feet or metres. Select one of three colour schemes. Default (three colours), high contrast (all white on black) or night ( all red on black ).
 
 ## Kalman Filter
 
@@ -67,13 +67,11 @@ This app will work quite happily on its own but will use the [GPS Setup App](htt
 
 When using the GPS Setup App this app switches the GPS to SuperE (default) mode while the display is lit and showing fix information. This ensures that that fixes are updated every second or so. 10 seconds after the display is blanked by the watch this app will switch the GPS to PSMOO mode and will only attempt to get a fix every two minutes. This improves power saving while the display is off and the delay gives an opportunity to restore the display before the GPS power mode is switched.
 
-The MAX values continue to be collected with the display off so may appear a little odd after the intermittent fixes of the low power mode. 
+The MAX values continue to be collected with the display off so may appear a little odd after the intermittent fixes of the low power mode.
 
 ## Waypoints
 
-Waypoints are used in [D]istance mode. Create a file waypoints.json and write to storage on the Bangle.js using the IDE. The first 6 characters of the name are displayed in Speed+[D]istance mode.
-
-The [GPS Navigation](https://banglejs.com/apps/#gps%20navigation) app in the App Loader has a really nice waypoints file editor. (Must be connected to your Bangle.JS and then click on the Download icon.)
+Waypoints are used in Distance and VMG modes. See the `Waypoints` app for information on how to create/edit waypoints. The first 6 characters of the name are displayed in Speed+[D]istance mode.
 
 Sample waypoints.json (My sailing waypoints)
 
@@ -149,5 +147,3 @@ Developed for my use in sailing, cycling and motorcycling. If you find this soft
 Many thanks to Gordon Williams. Awesome job.
 
 Special thanks also to @jeffmer, for the [GPS Navigation](https://banglejs.com/apps/#gps%20navigation) app and @hughbarney for the Low power GPS code development and Wouter Bulten for the Kalman filter code.
-
-
diff --git a/apps/speedalt/app.js b/apps/speedalt/app.js
index 79db932db..4587252c2 100644
--- a/apps/speedalt/app.js
+++ b/apps/speedalt/app.js
@@ -209,7 +209,7 @@ function nxtWp(inc){
 }
 
 function loadWp() {
-  var w = require("Storage").readJSON('waypoints.json')||[{name:"NONE"}];
+  var w = require("waypoints").load();
   if (cfg.wp>=w.length) cfg.wp=0;
   if (cfg.wp<0) cfg.wp = w.length-1;
   savSettings();
diff --git a/apps/speedalt/metadata.json b/apps/speedalt/metadata.json
index b23d2692c..89bfd4a57 100644
--- a/apps/speedalt/metadata.json
+++ b/apps/speedalt/metadata.json
@@ -8,12 +8,12 @@
   "type": "app",
   "tags": "tool,outdoors",
   "supports": ["BANGLEJS","BANGLEJS2"],
+  "dependencies" : { "waypoints":"type" },
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [
     {"name":"speedalt.app.js","url":"app.js"},
     {"name":"speedalt.img","url":"app-icon.js","evaluate":true},
     {"name":"speedalt.settings.js","url":"settings.js"}
-  ],
-  "data": [{"name":"speedalt.json"}]
+  ]
 }
diff --git a/apps/speedalt2/ChangeLog b/apps/speedalt2/ChangeLog
index 0e54d5db3..ec76c6a16 100644
--- a/apps/speedalt2/ChangeLog
+++ b/apps/speedalt2/ChangeLog
@@ -15,3 +15,4 @@
 0.15: Droidscript mirroring prog automatically uses last connection address. Auto connects when run.
 0.16: Add configuration item Wpt File Suffix. A one character suffix to append to the waypoints.json file. A number of other apps also use this file name. Using the file name suffix allows the speedalt2 waypoints to be retained if one of these other apps is installed for a different use.
 0.17: Use default Bangle formatter for booleans
+0.18: Move waypoints.json to 'waypoints' app (with editor)
diff --git a/apps/speedalt2/README.md b/apps/speedalt2/README.md
index a86f787cf..d6a5e1d71 100644
--- a/apps/speedalt2/README.md
+++ b/apps/speedalt2/README.md
@@ -25,7 +25,7 @@ Touch functions as BTN1 short press.
 
 ## App Settings
 
-Select the desired display units. Speed can be as per the default locale, kph, knots, mph or m/s. Distance can be km, miles or nautical miles. Altitude can be feet or metres. Select one of three colour schemes. Default (three colours), high contrast (all white on black) or night ( all red on black ). 
+Select the desired display units. Speed can be as per the default locale, kph, knots, mph or m/s. Distance can be km, miles or nautical miles. Altitude can be feet or metres. Select one of three colour schemes. Default (three colours), high contrast (all white on black) or night ( all red on black ).
 
 ## Kalman Filter
 
@@ -43,7 +43,7 @@ This app will work quite happily on its own but will use the [GPS Setup App](htt
 
 When using the GPS Setup App this app switches the GPS to SuperE (default) mode while the display is lit and showing fix information. This ensures that that fixes are updated every second or so. 10 seconds after the display is blanked by the watch this app will switch the GPS to PSMOO mode and will only attempt to get a fix every two minutes. This improves power saving while the display is off and the delay gives an opportunity to restore the display before the GPS power mode is switched.
 
-The MAX values continue to be collected with the display off so may appear a little odd after the intermittent fixes of the low power mode. 
+The MAX values continue to be collected with the display off so may appear a little odd after the intermittent fixes of the low power mode.
 
 ## Velocity Made Good - VMG
 
@@ -63,9 +63,9 @@ The Droidscript script file is called : **GPS Adv Sports II.js**
 
 **Important Gotcha :** For the BLE comms to find and connect to the Bangle.js it must be paired with the Android device but **NOT** connected. The Bangle.js must have been set in the Bluetooth settings as connectable.
 
-Start/Stop buttons tell the Bangle.js to start or stop sending BLE data packets to the Android device. While stopped the Bangle.js reverts to full power saving mode when the screen is asleep. 
+Start/Stop buttons tell the Bangle.js to start or stop sending BLE data packets to the Android device. While stopped the Bangle.js reverts to full power saving mode when the screen is asleep.
 
-When running a blue 'led' will flash each time a data packet is recieved to refresh the android display. 
+When running a blue 'led' will flash each time a data packet is recieved to refresh the android display.
 
 An orange 'led' will flash for each reconnection attempt if no data is received for 30 seconds. It will keep trying to reconnect so you can restart the Bangle, run another Bangle app or temprarily turn off bluetooth. The android mirror display will automatically reconnect when the GPS Adv Sports II app is running on the Bangle again. ( Designed to leave the Android device running as the display mirror in a sealed case all day while retaining the ability to do other functions on the Bangle.js and returning to the GPS Speed Alt II app. )
 
@@ -74,14 +74,12 @@ Android Screen Mirroring:<br>
 
 ## Waypoints
 
-Waypoints are used in Distance and VMG modes. Create a file waypoints.json and write to storage on the Bangle.js using the IDE. The first 6 characters of the name are displayed in Speed+[D]istance mode.
-
-The [GPS Navigation](https://banglejs.com/apps/#gps%20navigation) app in the App Loader has a really nice waypoints file editor. (Must be connected to your Bangle.JS and then click on the Download icon.)
+Waypoints are used in Distance and VMG modes. See the `Waypoints` app for information on how to create/edit waypoints. The first 6 characters of the name are displayed in Speed+[D]istance mode.
 
 By default the waypoints file is called waypoints.json
 
-**Note** : The waypoints.json file is used by a number of different gps apps. The setting 'Wpt File Suffix' allows one of waypoints1.json, waypoints2.json or waypoints3.json to be used instead. This allows the other apps to be used with a different set of waypoints without losing the speedalt2 waypoint set. 
- 
+**Note** : The waypoints.json file is used by a number of different gps apps. The setting 'Wpt File Suffix' allows one of waypoints.1.json, waypoints.2.json or waypoints.3.json to be used instead. This allows the other apps to be used with a different set of waypoints without losing the speedalt2 waypoint set.
+
 Sample waypoints.json (My sailing waypoints)
 
 <pre>
@@ -156,4 +154,3 @@ Developed for my use in sailing, cycling and motorcycling. If you find this soft
 Many thanks to Gordon Williams. Awesome job.
 
 Special thanks also to @jeffmer, for the [GPS Navigation](https://banglejs.com/apps/#gps%20navigation) app and @hughbarney for the Low power GPS code development and Wouter Bulten for the Kalman filter code.
-
diff --git a/apps/speedalt2/app.js b/apps/speedalt2/app.js
index 4cdf71913..839ac63eb 100644
--- a/apps/speedalt2/app.js
+++ b/apps/speedalt2/app.js
@@ -185,7 +185,7 @@ let LED = // LED as minimal and only definition (as instance / singleton)
 , 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 
+}, LED1 = LED; // LED1 as 'synonym' for LED
 
 
 var lf = {fix:0,satellites:0};
@@ -210,7 +210,7 @@ function nxtWp(){
 }
 
 function loadWp() {
-  var w = require("Storage").readJSON('waypoints'+cfg.wptSfx+'.json')||[{name:"NONE"}];
+  var w = require("waypoints").load(cfg.wptSfx);
   if (cfg.wp>=w.length) cfg.wp=0;
   if (cfg.wp<0) cfg.wp = w.length-1;
   savSettings();
@@ -239,7 +239,7 @@ function bearing(a,b){
 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 metres
   var d = Math.sqrt(x*x + y*y) * 6371000;
   return d;
@@ -251,38 +251,38 @@ function drawScrn(dat) {
 
   buf.clear();
   buf.setBgColor(0);
-  
+
   var n;
   n = dat.val.toString();
-  
+
   var s=50;    // Font size
   var l=n.length;
-  
+
   if ( l <= 7 ) s=55;
   if ( l <= 6 ) s=60;
   if ( l <= 5 ) s=80;
   if ( l <= 4 ) s=100;
   if ( l <= 3 ) s=120;
-        
-  buf.setFontAlign(0,0); //Centre 
-  buf.setColor(1);  
+
+  buf.setFontAlign(0,0); //Centre
+  buf.setColor(1);
   buf.setFontVector(s);
   buf.drawString(n,126,52);
 
-  
+
   // Primary Units
   buf.setFontAlign(-1,1); //left, bottom
-  buf.setColor(2);  
+  buf.setColor(2);
   buf.setFontVector(35);
-  buf.drawString(dat.unit,5,164);  
-  
+  buf.drawString(dat.unit,5,164);
+
   drawMax(dat.max); // MAX display indicator
   drawWP(dat.wp);  // Waypoint name
   drawSats(dat.sats);
-   
+
   g.reset();
   g.drawImage(img,0,40);
-  
+
   LED1.write(!pwrSav);
 
 }
@@ -295,7 +295,7 @@ function drawPosn(dat) {
   var x, y;
   x=210;
   y=0;
-  buf.setFontAlign(1,-1); 
+  buf.setFontAlign(1,-1);
   buf.setFontVector(60);
   buf.setColor(1);
 
@@ -320,45 +320,45 @@ function drawPosn(dat) {
 
 function drawClock() {
   if (!canDraw) return;
-  
+
   buf.clear();
   buf.setBgColor(0);
-  
+
   var x, y;
   x=185;
   y=0;
-  buf.setFontAlign(1,-1); 
+  buf.setFontAlign(1,-1);
   buf.setFontVector(94);
   time = require("locale").time(new Date(),1);
-  
+
   buf.setColor(1);
-  
+
   buf.drawString(time.substring(0,2),x,y);
   buf.drawString(time.substring(3,5),x,y+80);
-  
+
   g.reset();
   g.drawImage(img,0,40);
-  
+
   LED1.write(!pwrSav);
 }
 
 function drawWP(wp) {
-  buf.setColor(3);  
+  buf.setColor(3);
   buf.setFontAlign(0,1); //left, bottom
   buf.setFontVector(40);
-  buf.drawString(wp,120,132);  
+  buf.drawString(wp,120,132);
 }
 
 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,240,160);
 }
 
 function drawMax(max) {
   buf.setFontVector(30);
-  buf.setColor(2); 
+  buf.setColor(2);
   buf.setFontAlign(0,1); //centre, bottom
   buf.drawString(max,120,164);
 }
@@ -369,7 +369,7 @@ if ( emulator ) {
     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();
@@ -378,7 +378,7 @@ if ( emulator ) {
 
   var m;
 
-  var sp = '---';        
+  var sp = '---';
   var al = sp;
   var di = sp;
   var brg = ''; // bearing
@@ -390,15 +390,15 @@ if ( emulator ) {
   var lon = '---.--';
   var sats = sp;
   var vmg = sp;
-  
-  
+
+
   // Waypoint name
   var wpName = wp.name;
   if ( wpName == undefined || wpName == 'NONE' ) wpName = '';
-  wpName = wpName.substring(0,8);  
+  wpName = wpName.substring(0,8);
 
   if (fix.fix) lf = fix;
-  
+
   if (lf.fix) {
 
     // Smooth data
@@ -408,10 +408,10 @@ if ( emulator ) {
       lf.smoothed = 1;
       if ( maxN <= 15 ) maxN++;
     }
-    
+
     // Bearing to waypoint
     brg = bearing(lf,wp);
-    
+
     // Current course
     crs = lf.course;
 
@@ -447,19 +447,19 @@ if ( emulator ) {
     if ( di >= 100 ) di = parseFloat(di).toFixed(1);
     if ( di >= 1000 ) di = parseFloat(di).toFixed(0);
     if (isNaN(di)) di = '------';
-    
+
     // Age of last fix (secs)
     age = Math.max(0,Math.round(getTime())-(lf.time.getTime()/1000));
 
     // Lat / Lon
     ns = 'N';
     if ( lf.lat < 0 ) ns = 'S';
-    lat = Math.abs(lf.lat.toFixed(2)); 
+    lat = Math.abs(lf.lat.toFixed(2));
 
     ew = 'E';
     if ( lf.lon < 0 ) ew = 'W';
-    lon = Math.abs(lf.lon.toFixed(2)); 
-    
+    lon = Math.abs(lf.lon.toFixed(2));
+
     // Sats
     if ( age > 10 ) {
       sats = 'Age:'+Math.round(age);
@@ -573,7 +573,7 @@ if ( emulator ) {
         ew:ew
       });
   }
-  
+
   if ( cfg.modeA == 5 )  {
     // Large clock
     drawClock();
@@ -585,14 +585,14 @@ function prevScrn() {
     cfg.modeA = cfg.modeA-1;
     if ( cfg.modeA < 0 ) cfg.modeA = 5;
     savSettings();
-    onGPS(lf); 
+    onGPS(lf);
 }
 
 function nextScrn() {
     cfg.modeA = cfg.modeA+1;
     if ( cfg.modeA > 5 ) cfg.modeA = 0;
     savSettings();
-    onGPS(lf); 
+    onGPS(lf);
 }
 
 // Next function on a screen
@@ -610,7 +610,7 @@ function nextFunc(dur) {
 function updateClock() {
   if (!canDraw) return;
   if ( cfg.modeA != 5 )  return;
-  drawClock(); 
+  drawClock();
   if ( emulator ) {maxSpd++;maxAlt++;}
 }
 
@@ -661,10 +661,10 @@ function setButtons(){
     var dur = e.time - e.lastTime;
     nextFunc(dur);
   }, BTN1, { edge:"falling",repeat:true});
-  
-  // Power saving on/off 
+
+  // Power saving on/off
   setWatch(function(e){
-    pwrSav=!pwrSav; 
+    pwrSav=!pwrSav;
     if ( pwrSav ) {
       var s = require('Storage').readJSON('setting.json',1)||{};
       var t = s.timeout||10;
@@ -676,7 +676,7 @@ function setButtons(){
     }
       LED1.write(!pwrSav);
   }, BTN2, {repeat:true,edge:"falling"});
-  
+
   // BTN3 - next screen
   setWatch(function(e){
     nextScrn();
@@ -685,7 +685,7 @@ function setButtons(){
 
 Bangle.on('lcdPower',function(on) {
   if (!SCREENACCESS.withApp) return;
-  if (on) startDraw(); 
+  if (on) startDraw();
   else stopDraw();
 });
 
@@ -702,7 +702,7 @@ Bangle.on('touch', function(button){
 
 // == Main Prog
 
-// Read settings. 
+// Read settings.
 let cfg = require('Storage').readJSON('speedalt2.json',1)||{};
 
 cfg.spd = cfg.spd||1;  // Multiplier for speed unit conversions. 0 = use the locale values for speed
@@ -713,13 +713,13 @@ 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=Speed 1=Alt 2=Dist 3 = vmg 4=Position 5=Clock 
+cfg.modeA = cfg.modeA||0;    // 0=Speed 1=Alt 2=Dist 3 = vmg 4=Position 5=Clock
 cfg.primSpd = cfg.primSpd||0;    // 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;
 cfg.touch = cfg.touch==undefined?true:cfg.touch;
-cfg.wptSfx = cfg.wptSfx==undefined?'':cfg.wptSfx; 
+cfg.wptSfx = cfg.wptSfx==undefined?'':cfg.wptSfx;
 
 if ( cfg.spdFilt ) var spdFilter = new KalmanFilter({R: 0.1 , Q: 1 });
 if ( cfg.altFilt ) var altFilter = new KalmanFilter({R: 0.01, Q: 2 });
@@ -749,7 +749,7 @@ var SCREENACCESS = {
       withApp:true,
       request:function(){this.withApp=false;stopDraw();},
       release:function(){this.withApp=true;startDraw();}
-}; 
+};
 
 var gpssetup;
 try {
diff --git a/apps/speedalt2/metadata.json b/apps/speedalt2/metadata.json
index ae513acd5..2c8d37f79 100644
--- a/apps/speedalt2/metadata.json
+++ b/apps/speedalt2/metadata.json
@@ -2,12 +2,13 @@
   "id": "speedalt2",
   "name": "GPS Adventure Sports II",
   "shortName":"GPS Adv Sport II",
-  "version":"0.17",
+  "version":"0.18",
   "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"],
+  "dependencies" : { "waypoints":"type" },
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [
@@ -16,10 +17,6 @@
     {"name":"speedalt2.settings.js","url":"settings.js"}
   ],
   "data": [
-    {"name":"speedalt2.json"},
-    {"name":"waypoints.json"},
-    {"name":"waypoints1.json"},
-    {"name":"waypoints2.json"},
-    {"name":"waypoints3.json"}
+    {"name":"speedalt2.json"}
   ]
 }
diff --git a/apps/spotrem/ChangeLog b/apps/spotrem/ChangeLog
new file mode 100644
index 000000000..8e3d8b652
--- /dev/null
+++ b/apps/spotrem/ChangeLog
@@ -0,0 +1,5 @@
+0.01: New app.
+0.02: Restructure menu.
+0.03: change handling of intent extras.
+0.04: New layout.
+0.05: Add widgets field. Tweak layout.
diff --git a/apps/spotrem/README.md b/apps/spotrem/README.md
new file mode 100644
index 000000000..346ec9eba
--- /dev/null
+++ b/apps/spotrem/README.md
@@ -0,0 +1,21 @@
+Requires Gadgetbridge 71.0 or later. Allow intents in Gadgetbridge in order for this app to work.
+
+Touch input:
+
+Press the different ui elements to control Podcast Addict and open menus. Press left or right arrow to go to previous/next track.
+
+Swipe input:
+
+Swipe left/right to go to previous/next track. Swipe up/down to change the volume.
+
+It's possible to start tracks by searching with the remote. Search term without tags will override search with tags.
+
+To start playing 'from cold' the command for previous/next track via touch or swipe can be used. Pressing just play/pause is not guaranteed to initiate spotify in all circumstances (this will probably change with subsequent releases).
+
+In order to search to play or start music from the 'Saved' menu the Android device must be awake and unlocked. The remote can wake and unlock the device if the Bangle.js has been added as a 'trusted device' under Android Settings->Security->Smart Lock->Trusted devices.
+
+The swipe logic was inspired by the implementation in [rigrig](https://git.tubul.net/rigrig/)'s Scrolling Messages.
+
+Spotify Remote was created by [thyttan](https://github.com/thyttan/).
+
+<a target="_blank" href="https://icons8.com/icon/63316/spotify">Spotify</a> icon by <a target="_blank" href="https://icons8.com">Icons8</a>
diff --git a/apps/spotrem/app-icon.js b/apps/spotrem/app-icon.js
new file mode 100644
index 000000000..8da55b9a5
--- /dev/null
+++ b/apps/spotrem/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AFV3AAQVVDKQWHDB0HC5NwCyoYMCxZJKFxgwKCxowJC6xGOJBAWPGA4MGogXOIwdCmf/AAczkhIKC4VzCogAD+YZEC49PC5AABmgXO+czJYoYDC4gfCuRYGoUjDAZ4GUJlyn4XNukjIwMzmVHBAU/+YXKoZ0GmQLCDgQXIU5IVDC5JVCIwIECDA5HIR4hkBDAX0C5YAHOoIXJa4QRDoUikiOEm7vKE4YADmZ1FC5N/R48nC5tzFQMiokimYYHC4h4KJwX3Ow6QMOwoXGSAoAKIwrBNFxIXZJBxGHGB4WIGBouJDBgWLJJYWMDBIWODIwVRAH4AXA="))
diff --git a/apps/spotrem/app.js b/apps/spotrem/app.js
new file mode 100644
index 000000000..7e76d84bc
--- /dev/null
+++ b/apps/spotrem/app.js
@@ -0,0 +1,281 @@
+/*
+Bluetooth.println(JSON.stringify({t:"intent", action:"", flags:["flag1", "flag2",...], categories:["category1","category2",...], mimetype:"", data:"",  package:"", class:"", target:"", extra:{someKey:"someValueOrString"}}));
+*/
+
+var R;
+var backToMenu = false;
+var isPaused = true;
+var dark = g.theme.dark; // bool
+
+// The main layout of the app
+function gfx() {
+  //Bangle.drawWidgets();
+  R = Bangle.appRect;
+  marigin = 8;
+  // g.drawString(str, x, y, solid)
+  g.clearRect(R);
+  g.reset();
+  
+  if (dark) {g.setColor(0x07E0);} else {g.setColor(0x03E0);} // Green on dark theme, DarkGreen on light theme.
+  g.setFont("4x6:2");
+  g.setFontAlign(1, 0, 0);
+  g.drawString("->", R.x2 - marigin, R.y + R.h/2);
+
+  g.setFontAlign(-1, 0, 0);
+  g.drawString("<-", R.x + marigin, R.y + R.h/2);
+
+  g.setFontAlign(-1, 0, 1);
+  g.drawString("<-", R.x + R.w/2, R.y + marigin);
+
+  g.setFontAlign(1, 0, 1);
+  g.drawString("->", R.x + R.w/2, R.y2 - marigin);
+
+  g.setFontAlign(0, 0, 0);
+  g.drawString("Play\nPause", R.x + R.w/2, R.y + R.h/2);
+
+  g.setFontAlign(-1, -1, 0);
+  g.drawString("Menu", R.x + 2*marigin, R.y + 2*marigin);
+
+  g.setFontAlign(-1, 1, 0);
+  g.drawString("Wake", R.x + 2*marigin, R.y + R.h - 2*marigin);
+
+  g.setFontAlign(1, -1, 0);
+  g.drawString("Srch", R.x + R.w - 2*marigin, R.y + 2*marigin);
+
+  g.setFontAlign(1, 1, 0);
+  g.drawString("Saved", R.x + R.w - 2*marigin, R.y + R.h - 2*marigin);
+}
+
+// Touch handler for main layout
+function touchHandler(_, xy) {
+  x = xy.x;
+  y = xy.y;
+  len = (R.w<R.h+1)?(R.w/3):(R.h/3);
+
+  // doing a<b+1 seemed faster than a<=b, also using a>b-1 instead of a>b.
+  if ((R.x-1<x && x<R.x+len) && (R.y-1<y && y<R.y+len)) {
+    //Menu
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    backToMenu = true;
+    E.showMenu(spotifyMenu);
+  } else if ((R.x-1<x && x<R.x+len) && (R.y2-len<y && y<R.y2+1)) {
+    //Wake 
+    gadgetbridgeWake();
+    gadgetbridgeWake();
+  } else if ((R.x2-len<x && x<R.x2+1) && (R.y-1<y && y<R.y+len)) {
+    //Srch
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    E.showMenu(searchMenu);
+  } else if ((R.x2-len<x && x<R.x2+1) && (R.y2-len<y && y<R.y2+1)) {
+    //Saved
+    Bangle.removeAllListeners("touch");
+    Bangle.removeAllListeners("swipe");
+    E.showMenu(savedMenu);
+  } else if ((R.x-1<x && x<R.x+len) && (R.y+R.h/2-len/2<y && y<R.y+R.h/2+len/2)) {
+    //Previous 
+    spotifyWidget("PREVIOUS");
+  } else if ((R.x2-len+1<x && x<R.x2+1) && (R.y+R.h/2-len/2<y && y<R.y+R.h/2+len/2)) {
+    //Next
+    spotifyWidget("NEXT");
+  } else if ((R.x-1<x && x<R.x2+1) && (R.y-1<y && y<R.y2+1)){
+    //play/pause
+    playPause = isPaused?"play":"pause";
+    Bangle.musicControl(playPause);
+    isPaused = !isPaused;
+  }
+}
+
+// Swipe handler for main layout, used to jump backward and forward within a podcast episode.
+function swipeHandler(LR, _) {
+  if (LR==-1) {
+    spotifyWidget("NEXT");
+  }
+  if (LR==1) {
+    spotifyWidget("PREVIOUS");
+  }
+}
+
+// Navigation input on the main layout
+function setUI() {
+  // Bangle.setUI code from rigrig's smessages app for volume control: https://git.tubul.net/rigrig/BangleApps/src/branch/personal/apps/smessages/app.js
+  Bangle.setUI(
+    {mode : "updown", back : load}, 
+    ud => {
+      if (ud) Bangle.musicControl(ud>0 ? "volumedown" : "volumeup");
+    }
+  );
+  Bangle.on("touch", touchHandler);
+  Bangle.on("swipe", swipeHandler);
+}
+
+
+
+// Get back to the main layout
+function backToGfx() {
+  E.showMenu();
+  g.clear();
+  g.reset();
+  Bangle.removeAllListeners("touch");
+  Bangle.removeAllListeners("swipe");
+  setUI();
+  gfx();
+  backToMenu = false;
+}
+
+/*
+The functions for interacting with Android and the Spotify app
+*/
+
+simpleSearch = "";
+function simpleSearchTerm() { // input a simple search term without tags, overrides search with tags (artist and track)
+  require("textinput").input({text:simpleSearch}).then(result => {simpleSearch = result;}).then(() => {E.showMenu(searchMenu);});
+}
+
+artist = "";
+function artistSearchTerm() { // input artist to search for
+  require("textinput").input({text:artist}).then(result => {artist = result;}).then(() => {E.showMenu(searchMenu);});
+}
+
+track = "";
+function trackSearchTerm() { // input track to search for
+  require("textinput").input({text:track}).then(result => {track = result;}).then(() => {E.showMenu(searchMenu);});
+}
+
+album = "";
+function albumSearchTerm() { // input album to search for
+  require("textinput").input({text:album}).then(result => {album = result;}).then(() => {E.showMenu(searchMenu);});
+}
+
+function searchPlayWOTags() {//make a spotify search and play using entered terms
+  searchString = simpleSearch;
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.media.action.MEDIA_PLAY_FROM_SEARCH", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", target:"activity", extra:{query:searchString}, flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function searchPlayWTags() {//make a spotify search and play using entered terms
+  searchString = (artist=="" ? "":("artist:\""+artist+"\"")) + ((artist!="" && track!="") ? " ":"") + (track=="" ? "":("track:\""+track+"\"")) + (((artist!="" && album!="") || (track!="" && album!="")) ? " ":"") + (album=="" ? "":(" album:\""+album+"\""));
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.media.action.MEDIA_PLAY_FROM_SEARCH", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", target:"activity", extra:{query:searchString}, flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function playVreden() {//Play the track "Vreden" by Sara Parkman via spotify uri-link
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:track:5QEFFJ5tAeRlVquCUNpAJY:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function playVredenAlternate() {//Play the track "Vreden" by Sara Parkman via spotify uri-link
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:track:5QEFFJ5tAeRlVquCUNpAJY:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function searchPlayVreden() {//Play the track "Vreden" by Sara Parkman via search and play
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.media.action.MEDIA_PLAY_FROM_SEARCH", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", target:"activity", extra:{query:'artist:"Sara Parkman" track:"Vreden"'}, flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function openAlbum() {//Play EP "The Blue Room" by Coldplay
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:album:3MVb2CWB36x7VwYo5sZmf2", target:"activity", flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function searchPlayAlbum() {//Play EP "The Blue Room" by Coldplay via search and play
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.media.action.MEDIA_PLAY_FROM_SEARCH", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", target:"activity", extra:{query:'album:"The blue room" artist:"Coldplay"', "android.intent.extra.focus":"vnd.android.cursor.item/album"}, flags:["FLAG_ACTIVITY_NEW_TASK"]}));
+}
+
+function spotifyWidget(action) {
+  Bluetooth.println(JSON.stringify({t:"intent", action:("com.spotify.mobile.android.ui.widget."+action), package:"com.spotify.music", target:"broadcastreceiver"}));
+}
+
+function gadgetbridgeWake() {
+  Bluetooth.println(JSON.stringify({t:"intent", target:"activity", flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_CLEAR_TASK", "FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS", "FLAG_ACTIVITY_NO_ANIMATION"], package:"gadgetbridge", class:"nodomain.freeyourgadget.gadgetbridge.activities.WakeActivity"}));
+}
+
+function spotifyPlaylistDW() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZEVXcRfaeEbxXIgb:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM1() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E365VyzxE0mxF:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM2() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E38LZHLFnrM61:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM3() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E36RU87qzgBFP:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM4() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E396gGyCXEBFh:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM5() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E37a0Tt6CKJLP:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDM6() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1E36UIQLQK79od:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistDD() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZF1EfWFiI7QfIAKq:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+function spotifyPlaylistRR() {
+  Bluetooth.println(JSON.stringify({t:"intent", action:"android.intent.action.VIEW", categories:["android.intent.category.DEFAULT"], package:"com.spotify.music", data:"spotify:user:spotify:playlist:37i9dQZEVXbs0XkE2V8sMO:play", target:"activity" , flags:["FLAG_ACTIVITY_NEW_TASK", "FLAG_ACTIVITY_NO_ANIMATION"/*,  "FLAG_ACTIVITY_CLEAR_TOP", "FLAG_ACTIVITY_PREVIOUS_IS_TOP"*/]}));
+}
+
+// Spotify Remote Menu
+var spotifyMenu = {
+  "" : { title : " ",
+        back: backToGfx },
+  "Controls" : ()=>{E.showMenu(controlMenu);},
+  "Search and play" : ()=>{E.showMenu(searchMenu);},
+  "Saved music" : ()=>{E.showMenu(savedMenu);},
+  "Wake the android" : function() {gadgetbridgeWake();gadgetbridgeWake();},
+  "Exit Spotify Remote" : ()=>{load();}
+};
+
+
+var controlMenu = {
+  "" : { title : " ",
+        back: () => {if (backToMenu) E.showMenu(spotifyMenu);
+                     if (!backToMenu) backToGfx();} },
+  "Play" : ()=>{Bangle.musicControl("play");},
+  "Pause" : ()=>{Bangle.musicControl("pause");},
+  "Previous" : ()=>{spotifyWidget("PREVIOUS");},
+  "Next" : ()=>{spotifyWidget("NEXT");},
+  "Play (widget, next then previous)" : ()=>{spotifyWidget("NEXT"); spotifyWidget("PREVIOUS");},
+  "Messages Music Controls" : ()=>{load("messagesmusic.app.js");},
+};
+
+var searchMenu = {
+  "" : { title : " ",
+        back: () => {if (backToMenu) E.showMenu(spotifyMenu);
+                     if (!backToMenu) backToGfx();} },
+  "Search term w/o tags" : ()=>{simpleSearchTerm();},
+  "Execute search and play w/o tags" : ()=>{searchPlayWOTags();},
+  "Search term w tag \"artist\"" : ()=>{artistSearchTerm();},
+  "Search term w tag \"track\"" : ()=>{trackSearchTerm();},
+  "Search term w tag \"album\"" : ()=>{albumSearchTerm();},
+  "Execute search and play with tags" : ()=>{searchPlayWTags();},
+};
+
+var savedMenu = {
+  "" : { title : " ",
+        back: () => {if (backToMenu) E.showMenu(spotifyMenu);
+                     if (!backToMenu) backToGfx();} },
+  "Play Discover Weekly" : ()=>{spotifyPlaylistDW();},
+  "Play Daily Mix 1" : ()=>{spotifyPlaylistDM1();},
+  "Play Daily Mix 2" : ()=>{spotifyPlaylistDM2();},
+  "Play Daily Mix 3" : ()=>{spotifyPlaylistDM3();},
+  "Play Daily Mix 4" : ()=>{spotifyPlaylistDM4();},
+  "Play Daily Mix 5" : ()=>{spotifyPlaylistDM5();},
+  "Play Daily Mix 6" : ()=>{spotifyPlaylistDM6();},
+  "Play Daily Drive" : ()=>{spotifyPlaylistDD();},
+  "Play Release Radar" : ()=>{spotifyPlaylistRR();},
+  "Play \"Vreden\" by Sara Parkman via uri-link" : ()=>{playVreden();},
+  "Open \"The Blue Room\" EP (no autoplay)" : ()=>{openAlbum();},
+  "Play \"The Blue Room\" EP via search&play" : ()=>{searchPlayAlbum();},
+};
+
+Bangle.loadWidgets();
+setUI();
+gfx();
diff --git a/apps/spotrem/app.png b/apps/spotrem/app.png
new file mode 100644
index 000000000..3c0d65eee
Binary files /dev/null and b/apps/spotrem/app.png differ
diff --git a/apps/spotrem/metadata.json b/apps/spotrem/metadata.json
new file mode 100644
index 000000000..a0261ba13
--- /dev/null
+++ b/apps/spotrem/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "spotrem",
+  "name": "Remote for Spotify",
+  "version": "0.05",
+  "description": "Control spotify on your android device.",
+  "readme": "README.md",
+  "type": "app",
+  "tags": "spotify,music,player,remote,control,intent,intents,gadgetbridge,spotrem",
+  "icon": "app.png",
+  "screenshots" : [ {"url":"screenshot1.png"}, {"url":"screenshot2.png"} ],
+  "supports": ["BANGLEJS2"],
+  "dependencies": { "textinput":"type"},
+  "storage": [
+    {"name":"spotrem.app.js","url":"app.js"},
+    {"name":"spotrem.img","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/spotrem/screenshot1.png b/apps/spotrem/screenshot1.png
new file mode 100644
index 000000000..730e98547
Binary files /dev/null and b/apps/spotrem/screenshot1.png differ
diff --git a/apps/spotrem/screenshot2.png b/apps/spotrem/screenshot2.png
new file mode 100644
index 000000000..7801a3034
Binary files /dev/null and b/apps/spotrem/screenshot2.png differ
diff --git a/apps/stardateclock/ChangeLog b/apps/stardateclock/ChangeLog
index 1b1719352..bb6430b65 100644
--- a/apps/stardateclock/ChangeLog
+++ b/apps/stardateclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial release on the app repository for Bangle.js 1 and 2
 0.02: Fixed let/const usage while using firmware version >=2v14
+0.03: Tell clock widgets to hide.
diff --git a/apps/stardateclock/app.js b/apps/stardateclock/app.js
index cdc730970..adf2c14c7 100644
--- a/apps/stardateclock/app.js
+++ b/apps/stardateclock/app.js
@@ -334,10 +334,10 @@ updateStardate();
 updateConventionalTime();
 // Make sure widgets can be shown.
 //g.setColor("#FF0000"); g.fillRect(0, 0, g.getWidth(), widgetsHeight); // debug
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 // Show launcher on button press as usual for a clock face
 Bangle.setUI("clock", Bangle.showLauncher);
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 // Stop updates when LCD is off, restart when on
 Bangle.on('lcdPower', on => {
   if (on) {
diff --git a/apps/stardateclock/metadata.json b/apps/stardateclock/metadata.json
index 9569d3a53..d27b14512 100644
--- a/apps/stardateclock/metadata.json
+++ b/apps/stardateclock/metadata.json
@@ -3,7 +3,7 @@
   "name":"Stardate Clock",
   "shortName":"Stardate Clock",
   "description": "A clock displaying a stardate along with a 'standard' digital/analog clock in LCARS design",
-  "version":"0.02",
+  "version":"0.03",
   "icon": "app.png",
   "type":"clock",
   "tags": "clock",
diff --git a/apps/swiperclocklaunch/ChangeLog b/apps/swiperclocklaunch/ChangeLog
index 244b602b5..e7ad4555c 100644
--- a/apps/swiperclocklaunch/ChangeLog
+++ b/apps/swiperclocklaunch/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Fix issue with mode being undefined
 0.03: Update setUI to work with new Bangle.js 2v13 menu style
+0.04: Update to work with new 'fast switch' clock->launcher functionality
diff --git a/apps/swiperclocklaunch/boot.js b/apps/swiperclocklaunch/boot.js
index bb285ea94..ea00a6735 100644
--- a/apps/swiperclocklaunch/boot.js
+++ b/apps/swiperclocklaunch/boot.js
@@ -1,19 +1,19 @@
-// clock -> launcher
 (function() {
-    var sui = Bangle.setUI;
-    Bangle.setUI = function(mode, cb) {
-        sui(mode,cb);
-        if(!mode) return;
-        if ("object"==typeof mode) mode = mode.mode;
-        if (!mode.startsWith("clock")) return;
-        Bangle.swipeHandler = dir => { if (dir<0) Bangle.showLauncher(); };
-        Bangle.on("swipe", Bangle.swipeHandler);
-    };
-})();
-// launcher -> clock
-setTimeout(function() {  
-    if (global.__FILE__ && __FILE__.endsWith(".app.js") && (require("Storage").readJSON(__FILE__.slice(0,-6)+"info",1)||{}).type=="launch") {
+  var sui = Bangle.setUI;
+  Bangle.setUI = function(mode, cb) {
+    sui(mode,cb);
+    if(!mode) return;
+    if ("object"==typeof mode) mode = mode.mode;
+    if (mode.startsWith("clock")) {
+      // clock -> launcher
+      Bangle.swipeHandler = dir => { if (dir<0) Bangle.showLauncher(); };
+      Bangle.on("swipe", Bangle.swipeHandler);
+    } else {
+      if (global.__FILE__ && __FILE__.endsWith(".app.js") && (require("Storage").readJSON(__FILE__.slice(0,-6)+"info",1)||{}).type=="launch") {
+        // launcher -> clock
         Bangle.swipeHandler = dir => { if (dir>0) load(); };
         Bangle.on("swipe", Bangle.swipeHandler);
+      }
     }
-}, 10);
+  };
+})();
diff --git a/apps/swiperclocklaunch/metadata.json b/apps/swiperclocklaunch/metadata.json
index 5e4a0d648..4f27da528 100644
--- a/apps/swiperclocklaunch/metadata.json
+++ b/apps/swiperclocklaunch/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "swiperclocklaunch",
   "name": "Swiper Clock Launch",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Navigate between clock and launcher with Swipe action",
   "icon": "swiperclocklaunch.png",
   "type": "bootloader",
diff --git a/apps/swscroll/ChangeLog b/apps/swscroll/ChangeLog
new file mode 100644
index 000000000..c650baf72
--- /dev/null
+++ b/apps/swscroll/ChangeLog
@@ -0,0 +1 @@
+0.01: Inital release.
diff --git a/apps/swscroll/README.md b/apps/swscroll/README.md
new file mode 100644
index 000000000..f97d59b71
--- /dev/null
+++ b/apps/swscroll/README.md
@@ -0,0 +1,9 @@
+This first release seems servicable in testing so far.
+
+To get the standard menu scrolling back, just remove this app from your Bangle.
+
+TODO:
+- Maybe have how much of "trailing space" there are after the last entry should be dynamic in size, now it's always 8 pixels which corresponds to if there are a widget field and a menu title present.
+- I want to change the size of menu entries to be a little bigger vertically. 
+
+<a target="_blank" href="https://icons8.com/icon/18714/drag-list-down">Drag List Down</a> icon by <a target="_blank" href="https://icons8.com">Icons8</a>
diff --git a/apps/swscroll/app.png b/apps/swscroll/app.png
new file mode 100644
index 000000000..7abd582c2
Binary files /dev/null and b/apps/swscroll/app.png differ
diff --git a/apps/swscroll/boot.js b/apps/swscroll/boot.js
new file mode 100644
index 000000000..fc5650cad
--- /dev/null
+++ b/apps/swscroll/boot.js
@@ -0,0 +1,100 @@
+E.showScroller = (function(options) {
+  /* options = {
+    h = height
+    c = # of items
+    scroll = initial scroll position
+    scrollMin = minimum scroll amount (can be negative)
+    draw = function(idx, rect)
+    select = function(idx)
+  }
+  
+  returns {
+    draw  = draw all
+    drawItem(idx) = draw specific item
+  }
+  */
+if (!options) return Bangle.setUI(); // remove existing handlers
+
+var menuShowing = false;
+var R = Bangle.appRect;
+var Y = Bangle.appRect.y;
+var n = Math.ceil(R.h/options.h);
+var menuScrollMin = 0|options.scrollMin;
+var menuScrollMax = options.h*options.c - R.h;
+if (menuScrollMax<menuScrollMin) menuScrollMax=menuScrollMin;
+
+function idxToY(i) {
+  return i*options.h + R.y - rScroll;
+}
+function YtoIdx(y) {
+  return Math.floor((y + rScroll - R.y)/options.h);
+}
+
+var s = {
+  scroll : E.clip(0|options.scroll,menuScrollMin,menuScrollMax),
+  draw : () => {
+  g.reset().clearRect(R.x,R.y,R.x2,R.y2);
+  g.setClipRect(R.x,R.y,R.x2,R.y2);
+  var a = YtoIdx(R.y);
+  var b = Math.min(YtoIdx(R.y2),options.c-1);
+  for (var i=a;i<=b;i++)
+    options.draw(i, {x:R.x,y:idxToY(i),w:R.w,h:options.h});
+  g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+}, drawItem : i => {
+  var y = idxToY(i);
+  g.reset().setClipRect(R.x,y,R.x2,y+options.h);
+  options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
+  g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+}};
+var rScroll = s.scroll&~1; // rendered menu scroll (we only shift by 2 because of dither)
+s.draw(); // draw the full scroller
+g.flip(); // force an update now to make this snappier
+Bangle.setUI({
+  mode : "custom",
+  back : options.back,
+  swipe : (hor,ver)=>{
+    pixels = 120;
+    var dy = ver*pixels;
+    if (s.scroll - dy > menuScrollMax)
+      dy = s.scroll - menuScrollMax-8; // Makes it so the last 'page' has the same position as previous pages. This should be done dynamically (change the static 8 to be a variable) so the offset is correct even when no widget field or title field is present.
+    if (s.scroll - dy < menuScrollMin)
+      dy = s.scroll - menuScrollMin;
+    s.scroll -= dy;
+    var oldScroll = rScroll;
+    rScroll = s.scroll &~1;
+    dy = oldScroll-rScroll;
+    if (!dy || options.c<=3) return; //options.c<=3 should maybe be dynamic, so 3 would be replaced by a variable dependent on R=Bangle.appRect. It's here so we don't try to scroll if all entries fit in the app rectangle.
+    g.reset().setClipRect(R.x,R.y,R.x2,R.y2);
+    g.scroll(0,dy);
+    var d = ver*pixels;
+    if (d < 0) {
+      g.setClipRect(R.x,R.y2-(1-d),R.x2,R.y2);
+      let i = YtoIdx(R.y2-(1-d));
+      let y = idxToY(i);
+      //print(i, options.c, options.c-i); //debugging info
+      while (y < R.y2 - (options.h*((options.c-i)<=0)) ) { //- (options.h*((options.c-i)<=0)) makes sure we don't go beyond the menu entries in the menu object "options". This has to do with "dy = s.scroll - menuScrollMax-8" above.
+        options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
+        i++;
+        y += options.h;
+      }
+    } else { // d>0
+      g.setClipRect(R.x,R.y,R.x2,R.y+d);
+      let i = YtoIdx(R.y+d);
+      let y = idxToY(i);
+      //print(i, options.c, options.c-i); //debugging info
+      while (y > R.y-options.h) {
+        options.draw(i, {x:R.x,y:y,w:R.w,h:options.h});
+        y -= options.h;
+        i--;
+      }
+    }
+    g.setClipRect(0,0,g.getWidth()-1,g.getHeight()-1);
+  }, touch : (_,e)=>{
+    if (e.y<R.y-4) return;
+    var i = YtoIdx(e.y);
+    if ((menuScrollMin<0 || i>=0) && i<options.c)
+      options.select(i);
+  }
+});
+return s;
+});
diff --git a/apps/swscroll/metadata.json b/apps/swscroll/metadata.json
new file mode 100644
index 000000000..cb345054e
--- /dev/null
+++ b/apps/swscroll/metadata.json
@@ -0,0 +1,14 @@
+{
+  "id": "swscroll",
+  "name": "Swipe menus",
+  "version": "0.01",
+  "description": "Replace built in E.showScroller to act on swipe instead of drag. Navigate menus in discrete steps instead of a continuous motion.",
+  "readme": "README.md",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "system",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"swscroll.boot.js","url":"boot.js"}
+  ]
+}
diff --git a/apps/thermom/ChangeLog b/apps/thermom/ChangeLog
index 6d3a966e3..0b8c325e5 100644
--- a/apps/thermom/ChangeLog
+++ b/apps/thermom/ChangeLog
@@ -4,3 +4,5 @@
 0.05: Use temperature from current locale
       Update every 10s, average last 5 readings
       Changes based on #1092
+0.06: Minor tweaks for stability. Update every 5 seconds
+0.07: Add back button
diff --git a/apps/thermom/app.js b/apps/thermom/app.js
index 0e45ed3e7..3aa99c015 100644
--- a/apps/thermom/app.js
+++ b/apps/thermom/app.js
@@ -24,7 +24,7 @@ function onTemperature(p) {
 // Gets the temperature in the most accurate way (pressure sensor or inbuilt thermistor)
 function drawTemperature() {
   if (Bangle.getPressure) {
-    Bangle.getPressure().then(onTemperature);
+    Bangle.getPressure().then(p =>{if (p) onTemperature(p);});
   } else {
     onTemperature({
       temperature : E.getTemperature()
@@ -34,8 +34,11 @@ function drawTemperature() {
 
 setInterval(function() {
   drawTemperature();
-}, 10000);
+}, 5000);
+Bangle.loadWidgets();
+Bangle.setUI({
+  mode : "custom",
+  back : function() {load();}
+});
 E.showMessage("Reading temperature...");
 drawTemperature();
-Bangle.loadWidgets();
-Bangle.drawWidgets();
diff --git a/apps/thermom/metadata.json b/apps/thermom/metadata.json
index 381f85e17..a215df624 100644
--- a/apps/thermom/metadata.json
+++ b/apps/thermom/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "thermom",
   "name": "Thermometer",
-  "version": "0.05",
+  "version": "0.07",
   "description": "Displays the current temperature in degree Celsius/Fahrenheit (depending on locale), updates every 10 seconds with average of last 5 readings.",
   "icon": "app.png",
   "tags": "tool",
diff --git a/apps/tinyVario/ChangeLog b/apps/tinyVario/ChangeLog
index 6c352f82b..a201ee465 100644
--- a/apps/tinyVario/ChangeLog
+++ b/apps/tinyVario/ChangeLog
@@ -1 +1,5 @@
 0.01: Initial Version
+0.02: Touch data fields to configure them.
+0.03: Changed menu layout, fixed automatic flight time detection.
+0.04: flight time detection should work without GPS now. New vario display available.
+0.05: some bugs fiexed, no new features.
diff --git a/apps/tinyVario/README.md b/apps/tinyVario/README.md
index e23f3af66..c375585c2 100644
--- a/apps/tinyVario/README.md
+++ b/apps/tinyVario/README.md
@@ -1,5 +1,7 @@
 # Turn your Bangle.js2 into a flight computer!
 
+All settings can be accessed by touching the corresponding data fields. I made all interface objects as big as possible to make it easier to use with gloves. 
+
 ## This is a work in progress. Working features so far:
 - Altimeter
 - Variometer
@@ -7,8 +9,9 @@
 - Ground speed
 - Flying time with automatic take-off detection
 
+
 ## Planned features:
-- Settings page to adjust QNH, change units 
+- glide slope display
 - final glide computer
 - waypoint navigation
 - flight log (possibly IGC file export)
diff --git a/apps/tinyVario/app.js b/apps/tinyVario/app.js
index cf7bc286d..b9a87c821 100644
--- a/apps/tinyVario/app.js
+++ b/apps/tinyVario/app.js
@@ -1,204 +1,465 @@
 /*
 To do:
-  -setup page
-  -different units
   -flight log
   -statistics page
-  -nav page
+  -navigation
 */
-Bangle.setBarometerPower(true, "tinyVario");
-Bangle.setGPSPower(true, "tinyVario");
+
+getAltitude = (p,baseP) => (44330 * (1.0 - Math.pow(p/baseP, 0.1903)));
+getFL = () => (44330 * (1.0 - Math.pow(pressure/1013.25, 0.1903))).toFixed(0);
+getTimeString = () => (settings.localTime) ? (require("locale").time(Date(),1)):(Date().toUTCString().slice(Date().toUTCString().length-12,Date().toUTCString().length-7));
+
+var fg=g.getColor();
+var bg=g.getBgColor();
+var red="#F00",green="#0F0";
 
 const unitsRoc=[
   {name:"m/s", factor:1, precision:1, layoutCode:{type:"v", halign:1, c: [
             {type:"txt", font:"12%", halign:0, filly:0, label:"m"},
-            {type:"", height:1,width:"20", bgCol:"#FFF"},
+            {type:"", height:1,width:"20", bgCol:fg},
             {type:"txt", font:"12%", halign:0, filly:0, label:"s"}]}},
   {name:"ft/m", factor:196.85039370078738, precision:0, layoutCode:{type:"v", halign:1, c: [
             {type:"txt", font:"12%", halign:0, filly:0, label:"ft"},
-            {type:"", height:1,width:"30", bgCol:"#FFF"},
+            {type:"", height:1,width:"30", bgCol:fg},
             {type:"txt", font:"12%", halign:0, filly:0, label:"min"}]}},
   {name:"kt", factor:1.9438444924406, precision:1, layoutCode:
             {type:"txt", font:"12%", halign:0, filly:0, label:"kt"}}
   ];
-
 const unitsGs=[
   {name:"km/h", factor:1, precision:1, layoutCode:{type:"v", halign:1, c: [
             {type:"txt", font:"12%", halign:0, filly:0, label:"km"},
-            {type:"", height:1,width:"30", bgCol:"#FFF"},
+            {type:"", height:1,width:"30", bgCol:fg},
             {type:"txt", font:"12%", halign:0, filly:0, label:"h"}]}},
-  {name:"kt", factor:196.85039370078738, precision:0, layoutCode:{type:"txt", font:"12%", halign:0, filly:0, label:"kt"}},
+  {name:"kt", factor:0.5399568, precision:0, layoutCode:{type:"txt", font:"12%", halign:0, filly:0, label:"kt"}},
   {name:"m/s", factor:0.2777777777777778, precision:1, layoutCode:{type:"v", halign:1, c: [
             {type:"txt", font:"12%", halign:0, filly:0, label:"m"},
-            {type:"", height:1,width:"20", bgCol:"#FFF"},
+            {type:"", height:1,width:"20", bgCol:fg},
             {type:"txt", font:"12%", halign:0, filly:0, label:"s"}]}}
   ];
-
 const unitsAlt=[
   {name:"m", factor:1, precision:0, layoutCode:{type:"txt", font:"12%", halign:0, filly:0, label:"m"}},
   {name:"ft", factor:3.280839895013123, precision:0, layoutCode:{type:"txt", font:"12%", halign:0, filly:0, label:"ft"}}
   ];
-
-var intTime=10,pressureInterval=100;
-var altH = [];
-var altRaw=-9999, altFast=0, altSlow=0;
-var fastGain=0.2, slowGain=0.168;
-var roc=0,rocAvg=0;
-var gs;
-var lastPressure = Date.now();
-var flying=false;
-var takeoffTime, flyingTime;
-var Layout = require("Layout");
-var speedUnit="km/h", speedFactor=1;
-var altUnit="m", altFactor=1;
-var rocUnit=unitsRoc[0];
-var altUnit=unitsAlt[0];
-var gsUnit=unitsGs[0];
-
-function drawVario() {
-  var p = pfd.vario;
-  g.reset();
-  g.clearRect(p.x,p.y,p.x+p.w-1,p.y+p.h-1);
-  if (roc>0.1) g.setColor(0,1,0);
-  if (roc<-1) g.setColor(1,0,0);
-  var y=p.y+p.h/2-roc*(p.h/2)/5;
-  g.fillRect(p.x,p.y+(p.h/2),p.x+p.w-1,Math.clip(y,p.y,p.y+p.h-1));
-}
-
-function updateText(t) {
-  if (t.halign==1) 
-    g.setFont(t.font).setFontAlign(1,0,0).drawString(t.label, t.x+t.w, t.y+(t.h>>1));
-  else if (t.halign==-1)
-    g.setFont(t.font).setFontAlign(-1,0,0).drawString(t.label, t.x, t.y+(t.h>>1));
-  else 
-    g.setFont(t.font).setFontAlign(0,0,0).drawString(t.label, t.x+(t.w>>1), t.y+(t.h>>1));
-}
-
-unitROC={type:"v", halign:1, c: [
+const unitROC={type:"v", halign:1, c: [
             {type:"txt", font:"12%", halign:0, filly:0, label:"m"},
-            {type:"", height:1,width:"20", bgCol:"#FFF"},
+            {type:"", height:1,width:"20", bgCol:fg},
             {type:"txt", font:"12%", halign:0, filly:0, label:"s"}
           ]};
 
-var pfd = new Layout(
-  {type:"v",c: [
-    {type:"h",c: [
-      {type:"", fillx:1, height:"1"}
-      ]},
-    {type:"h", c: [
-      /*{type:"v", c:[
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"},
-        {type:"", filly:1},
-        {type:"", width:"3", height:"3", bgCol:"#FFF"}
-      ]},*/
-      {type:"custom", width:"25", render:drawVario, id:"vario",filly:1 },
-      {type:"", filly:1, width:1, bgCol:"#FFF"},
-      {type:"v",fillx:1, c: [
-        {type:"h", halign:1, c:[
-          {type:"txt",font:"22%", halign:1, filly:1, label:"19999", id:"alt"},
-          altUnit.layoutCode 
-        ]},
-        {type:"", fillx:1, height:"1", bgCol:"#FFF"},
-        {type:"h", halign:1, c:[
-          {type:"txt", font:"25%", halign:1, filly:1, label:"-99.9", id:"avg" },
-          rocUnit.layoutCode
-        ]},
-        {type:"", fillx:1, height:"1", bgCol:"#FFF"},
-        {type:"h", halign:1, c:[
-          {type:"txt", font:"25%", halign:1, filly:1, label:"XXX", id:"gs" },
-          gsUnit.layoutCode
+const ground=0, flying=1, landed=2, maybeFlying=3, maybeLanded=4;
+
+var settings = Object.assign({
+  rocU: 0,
+  altU: 0,
+  gsU:0,
+  intTime:10,
+  localTime:true,
+  autoDetect:true,
+  bargraph:false
+}, require('Storage').readJSON("tinyVario.json", true) || {});
+
+var qnh=Math.floor(Bangle.getOptions().seaLevelPressure) || 1013;
+var pfdHandle;
+var rawP=0, samples=0;
+var altH = [];
+var altRaw=-9999, altFast=0, altSlow=0;
+var fastGain=0.5, slowGain=0.3;
+var roc=0,rocAvg=0, gs;
+var lastPressure = Date.now();
+var pressure = 1000;
+var state=ground;
+var takeoffTime=0, landingTime=0, flyingTime;
+var Layout = require("Layout");
+var oldSettings;
+
+//var delta=0;//TESTING
+
+
+function updateText(t) {
+  g.reset();
+  g.clearRect(t.x,t.y,t.x+t.w-1,t.y+t.h-1);
+  if (t.col) g.setColor(t.col);
+  else g.setColor(fg);
+  if (t.halign==1)
+    g.setFont(t.font).setFontAlign(1,0,0).drawString(t.label, t.x+t.w, t.y+(t.h>>1));
+  else if (t.halign==-1)
+    g.setFont(t.font).setFontAlign(-1,0,0).drawString(t.label, t.x, t.y+(t.h>>1));
+  else
+    g.setFont(t.font).setFontAlign(0,0,0).drawString(t.label, t.x+(t.w>>1), t.y+(t.h>>1));
+}
+
+function initPFD() {
+  Bangle.setUI();
+  var pfd = new Layout(
+    {type:"v",c: [
+      /*{type:"h",c: [
+        {type:"", fillx:1, height:"1"}
+        ]},*/
+      {type:"h",filly:1, c: [
+        {type:"custom", width:"25", render:()=>{
+          var p = pfd.vario;
+          if (roc>0.1) g.setColor(0,1,0);
+          if (roc<-1) g.setColor(1,0,0);
+          var y=p.y+p.h/2-roc*(p.h/2)/5;
+          if (settings.bargraph==false) {
+            g.clearRect(p.x,p.y,p.x+p.w-1,p.y+p.h-1);
+            g.fillRect(p.x,p.y+(p.h/2),p.x+p.w-1,Math.clip(y,p.y,p.y+p.h-1));
+          } else {
+            g.setClipRect(p.x,p.y,p.x+p.w-1,p.y+p.h-1);
+            g.scroll(-1,0);
+            g.drawLine(p.x+p.w-1,p.y+(p.h/2),p.x+p.w-1,Math.clip(y,p.y,p.y+p.h-1));
+          }
+          g.reset();
+        }, id:"vario",filly:1, cb:()=>initVarioMenu()},
+        {type:"", filly:1, width:1, bgCol:fg},
+        {type:"v",fillx:1, c: [
+          {type:"h", halign:1, c:[
+            {type:"txt", font:"22%", halign:1, filly:1, fillx:1, label:"9999", id:"alt", cb:()=>initAltMenu()},
+            unitsAlt[settings.altU].layoutCode
+          ]},
+          {type:"", fillx:1, height:"1", bgCol:fg},
+          {type:"h", halign:1, c:[
+            {type:"txt", font:"25%", halign:1, filly:1, fillx:1, label:"-9.9", id:"avg", cb:()=>initAvgMenu()},
+            unitsRoc[settings.rocU].layoutCode
+          ]},
+          {type:"", fillx:1, height:"1", bgCol:fg},
+          {type:"h", halign:1, c:[
+            {type:"txt", font:"25%", halign:1, filly:1, fillx:1, label:"XXX", id:"gs", cb:()=>initGsMenu()},
+            unitsGs[settings.gsU].layoutCode
+          ]}
         ]}
+      ]},
+      {type:"", fillx:1, height:"1", bgCol:fg},
+      {type:"h",c: [
+        {type:"txt",pad:0, halign:0, font:"15%",fillx:1, label:"99:99", id:"time", cb:()=>initTimeMenu()},
+        {type:"", width:1,height:g.getHeight()*0.15, bgCol:fg},
+        {type:"txt",pad:0, halign:0, font:"15%", fillx:1, label:"--:--", id:"flyingtime", cb:()=>initFlyingTimeMenu() }
       ]}
-    ]},
-    {type:"", fillx:1, height:"1", bgCol:"#FFF"},
-    {type:"h",c: [
-      {type:"txt",pad:"1", halign:0, font:"15%",fillx:"1", label:"99:99", id:"time"},
-      {type:"", width:"1", height:g.getHeight()*0.15+2, bgCol:"#FFF"},
-      {type:"txt",pad:"1", halign:0, font:"15%", fillx:"1", label:"99:99", id:"flyingtime" }
-    ]}
-  ]}//,{lazy:"true"}
-);
-pfd.update();
+    ]},{lazy:true}
+  );
+  g.clear();
+  pfd.render();
+  //-------testing------
+  //rawP=1000;
+  //samples=1;
+  //--------------------
+  pfdHandle = setInterval(function() {
+    t1=Date().getTime();
+    //process pressure readings
+    if (samples) {
+      pressure=rawP/samples;
+      samples=0;
+      rawP=0;
+      if (altRaw==-9999) {//first measurement)
+        altRaw=getAltitude(pressure,qnh);
+        altFast=altRaw;
+        altSlow=altRaw;
+        for (let i = 0; i < settings.intTime*4+1; i++) altH.push(altRaw);
+      }
+    }
+    //altRaw=altRaw+delta;getAltitude(pressure,qnh);//TESTING
+    altRaw=getAltitude(pressure,qnh);
+    altFast=altFast+(altRaw-altFast)*fastGain;
+    altSlow=altSlow+(altRaw-altSlow)*slowGain;
+    altH.push(altFast);
+    while (altH.length>settings.intTime*4) {
+      rocAvg=(altH[altH.length-1]-altH[0])/settings.intTime;
+      altH.shift();
+    }
+    roc=(altFast-altSlow)/((0.25/slowGain)-(0.25/fastGain));
+
+    if (settings.autoDetect==true) switch (state) {
+      case ground:
+        if ((gs>=5) || (roc>=1) || (roc<=-1)) {
+          state=maybeFlying;
+          takeoffTime=Date().getTime();
+        }
+        break;
+      case maybeFlying:
+        if (!(gs>=5) && (roc<1) && (roc>-1)) state=ground;
+        else if (Date().getTime()-takeoffTime>60000) state=flying;
+        break;
+      case flying:
+        if (!(gs>=5) && (roc<1) && (roc>-1)) {
+          state=maybeLanded;
+          landingTime=Date().getTime();
+        }
+        break;
+      case maybeLanded:
+        if ((gs>=5) || (roc>=1) || (roc<=-1)) state=flying;
+        else if (Date().getTime()-landingTime>60000) state=landed;
+        break;
+    }
+    if ((state==flying) || (state==maybeLanded)) {
+      flyingTime=Date().getTime()-takeoffTime;
+      pfd.flyingtime.label=(flyingTime / 3600000).toFixed(0)+":"+(flyingTime / 60000 % 60).toFixed(0).padStart(2,'0');
+      pfd.flyingtime.col=fg;
+    } else if (state==landed) {
+      flyingTime=landingTime-takeoffTime;
+      pfd.flyingtime.label=(flyingTime / 3600000).toFixed(0)+":"+(flyingTime / 60000 % 60).toFixed(0).padStart(2,'0');
+      pfd.flyingtime.col=green;
+    }
+
+    pfd.alt.label=(altRaw*unitsAlt[settings.altU].factor).toFixed(unitsAlt[settings.altU].precision);
+    pfd.avg.col=(rocAvg<-1) ? (red):((rocAvg>0.1) ? (green):(fg));
+    pfd.avg.label=(rocAvg*unitsRoc[settings.rocU].factor).toFixed(unitsRoc[settings.rocU].precision);
+
+    var gps = Bangle.getGPSFix();
+    if (gps!=undefined) {
+      pfd.gs.label=(gps.speed*unitsGs[settings.gsU].factor).toFixed(unitsGs[settings.gsU].precision);
+      updateText(pfd.gs);
+      gs=gps.speed;
+    } //else gs=0;
+    
+    pfd.time.label=getTimeString();
+    updateText(pfd.alt);
+    updateText(pfd.avg);
+    updateText(pfd.time);
+    updateText(pfd.flyingtime);
+
+    pfd.vario.render();
+    //print(Date().getTime()-t1);
+  }, 250);
+
+}
+
+function initAltMenu() {
+  var oldQnh=qnh;
+  function updateAltMenu() {
+    altMenu.clear();
+    altMenu.alt.label=
+      (getAltitude(pressure,qnh)*unitsAlt[settings.altU].factor).toFixed(unitsAlt[settings.altU].precision)
+      +unitsAlt[settings.altU].name;
+    altMenu.qnh.label=qnh;
+    altMenu.render();
+  }
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var altMenu = new Layout ({
+    type:"v", c: [{
+      type:"v", width:180, c: [
+        {type:"h", c: [
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label:"-", cb:l=>{qnh--; updateAltMenu();}},
+          {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label:"+", cb:l=>{qnh++; updateAltMenu();}}
+        ]},
+        {type:"v", c: [
+          {type:"h", c: [
+            {type:"txt", font:"13%", fillx:1, filly:1, label:"QNH: "},
+            {type:"txt", font:"13%", fillx:1, filly:1, id:"qnh", label:"    "},
+          ]},
+          {type:"h", c: [
+            {type:"txt", font:"13%", fillx:1, filly:1, label:"Alt: "},
+            {type:"txt", font:"13%", fillx:1, filly:1, id:"alt", label: "      "},
+          ]}
+        ]},
+        {type:"btn", font:"12%", id:"units", pad:2, fillx:1, filly:1, label:"Units: "+unitsAlt[settings.altU].name, cb:()=>{
+          settings.altU=(settings.altU+1)%unitsAlt.length;
+          altMenu.units.label="Units: "+unitsAlt[settings.altU].name;
+          altMenu.render();
+        }},
+      ]},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          print("old settings restored");
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          Bangle.setOptions({seaLevelPressure:qnh});
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  altMenu.render();
+  updateAltMenu();
+}
+
+function initAvgMenu() {
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var avgMenu = new Layout ({
+    type:"v", c: [{
+      type:"v", width:180, c: [
+        {type:"h", c: [
+          {type:"btn", font:"12%", pad:2, fillx:1, filly:1, label:"-", cb:l=>{
+            settings.intTime=Math.clip(settings.intTime-1,1,60);
+            avgMenu.clear();
+            avgMenu.interval.label="Interval: "+settings.intTime+"s";
+            avgMenu.render();
+          }},
+          {type:"btn", font:"12%", pad:1, fillx:1, filly:1, label:"+", cb:l=>{
+            settings.intTime=Math.clip(settings.intTime+1,1,60);
+            avgMenu.clear();
+            avgMenu.interval.label="Interval: "+settings.intTime+"s";
+            avgMenu.render();
+          }}
+        ]},
+        {type:"txt", id:"interval", font:"10%", pad:1, fillx:1, filly:1, label:"Interval: "+settings.intTime+"s"},
+        {type:"btn", font:"12%", id:"units", pad:1, fillx:1, filly:1, label:"Units: "+unitsRoc[settings.rocU].name, cb:()=>{
+          settings.rocU=(settings.rocU+1)%unitsRoc.length;
+          avgMenu.units.label="Units: "+unitsRoc[settings.rocU].name;
+          avgMenu.render();
+        }},
+      ]},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  avgMenu.render();
+}
+
+function initGsMenu() {
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var gsMenu = new Layout ({
+    type:"v", c: [
+      {type:"btn", font:"20%", id:"units", pad:1, fillx:1, filly:1, label:"Units:\n"+unitsGs[settings.gsU].name, cb:()=>{
+        settings.gsU=(settings.gsU+1)%unitsGs.length;
+        gsMenu.units.label="Units:\n"+unitsGs[settings.gsU].name;
+        gsMenu.render();
+      }},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          print("old settings restored");
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  gsMenu.render();
+}
+
+function initTimeMenu() {
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var timeMenu = new Layout ({
+    type:"v", c: [
+      {type:"btn", font:"20%", id:"format", pad:1, fillx:1, filly:1, label:"Time:\n"+((settings.localTime==true) ? ("LCL") : ("UTC")), cb:()=>{
+        settings.localTime=!settings.localTime;
+        timeMenu.format.label="Time:\n"+((settings.localTime==true) ? ("LCL") : ("UTC"));
+        timeMenu.render();
+      }},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  timeMenu.render();
+}
+
+function initVarioMenu() {
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var varioMenu = new Layout ({
+    type:"v", c: [
+      {type:"btn", font:"20%", id:"format", pad:1, fillx:1, filly:1, label:"Display:\n"+((settings.bargraph==true) ? ("graph") : ("simple")), cb:()=>{
+        settings.bargraph=!settings.bargraph;
+        varioMenu.format.label="Display:\n"+((settings.bargraph==true) ? ("graph") : ("simple"));
+        varioMenu.render();
+      }},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  varioMenu.render();
+}
+function initFlyingTimeMenu() {
+  oldSettings=Object.assign({},settings);
+  clearInterval(pfdHandle);
+  var ftMenu = new Layout (
+    {type:"v", c: [
+      {type:"v", c: [
+        {type:"h", c: [
+          {type:"btn", font:"12%", pad:1, fillx:1, filly:1, label:"Toggle\nAuto", cb:()=>{
+            settings.autoDetect=!settings.autoDetect;
+            ftMenu.manual.label= (settings.autoDetect==true)? 
+              ("AUTO"):((state==flying) ? ("LAND") : ("TAKE\nOFF"));
+            ftMenu.render();
+          }},
+          {type:"btn", font:"12%", id:"manual", pad:1, fillx:1, filly:1, label:(settings.autoDetect==true)? 
+            ("AUTO"):((state==flying) ? ("LAND") : ("TAKE\nOFF")), cb:()=>{
+              if (settings.autoDetect==false) {
+                if (state!=flying) {
+                  E.showPrompt("Take off now?").then((v)=> {
+                    if (v) {
+                      state=flying;
+                      takeoffTime=Date().getTime();
+                      initPFD();
+                    }
+                  });
+                } else {
+                  E.showPrompt("Land now?").then((v)=> {
+                    if (v) {
+                      state=landed;
+                      landingTime=Date().getTime();
+                      initPFD();
+                    }
+                  });
+                }
+              }
+            }
+          }
+        ]},
+        {type:"btn", font:"12%", pad:1, fillx:1, filly:1, label:"Reset", cb:()=>{
+          E.showPrompt("Reset Flight?").then((v)=> {
+            state=ground;
+            initPFD();
+          });
+        }}
+      ]},
+      {type:"h", c: [
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"BACK", cb: ()=>{
+          settings=Object.assign({},oldSettings);
+          initPFD();
+        }},
+        {type:"btn", font:"16%", pad:1, fillx:1, label:"SAVE", cb: ()=>{
+          require('Storage').writeJSON("tinyVario.json", settings);
+          initPFD();
+        }}
+      ]}
+    ], lazy:true});
+  g.clear();
+  ftMenu.render();
+}
+
+Bangle.setGPSPower(true, "tinyVario");
+Bangle.setBarometerPower(true, "tinyVario");
 
 Bangle.on('pressure', function(e) {
-  if (altRaw==-9999) {
-    altFast=e.altitude;
-    altSlow=e.altitude;
-    altRaw=e.altitude;
+  if (samples<10) { //no need to gather more samples when stuck in a menu
+    rawP+=e.pressure;
+    samples++;
   }
-  altRaw=altRaw+(e.altitude-altRaw)*0.2;
 });
 
-Bangle.on('GPS', function(fix) {
-  gs=fix.speed;
-});
-          
-/*setWatch(function() {
-  
-}, BTN1);*/
-
-setInterval(function () { 
-  altFast=altFast+(altRaw-altFast)*fastGain;
-  altSlow=altSlow+(altRaw-altSlow)*0.09093;
-  altH.push(altSlow);
-  if (altH.length>intTime*1000/pressureInterval) {
-    altH.shift();
-    rocAvg=(altH[altH.length-1]-altH[0])/intTime;
-  }
-}, pressureInterval);
-
-g.clear();
-pfd.render();
-
-setInterval(function() {
-  pfd.clear(pfd.alt);
-  pfd.clear(pfd.avg);
-  pfd.clear(pfd.time);
-  if ((!flying) && ((rocAvg>1) || (rocAvg<-1) || (gs>10))) { //take-off detected
-    takeoffTime=Date().getTime();
-    flying=true;
-  } 
-  if (flying) {
-    pfd.clear(pfd.flyingtime);
-    flyingTime=Date().getTime()-takeoffTime;
-    pfd.flyingtime.label=(flyingTime / 3600000).toFixed(0)+":"+(flyingTime / 60000 % 60).toFixed(0).padStart(2,'0');
-  } 
-  roc=(altFast-altSlow)/(pressureInterval/1000/slowGain)-(pressureInterval/1000/fastGain);
-  pfd.alt.label=(altSlow).toFixed(0);
-  if (rocAvg>0.1) pfd.avg.col="#0f0";
-    else if (rocAvg<-1) pfd.avg.col="#f00";
-    else pfd.avg.col="#fff";
-  pfd.avg.label=(rocAvg*rocUnit.factor).toFixed(rocUnit.precision);
-  if (!isNaN(gs)) {
-    pfd.gs.label=gs.toFixed(0);
-    pfd.clear(pfd.gs);
-  } 
-  pfd.time.label=require("locale").time(Date(),1);
-  updateText(pfd.alt);
-  updateText(pfd.avg);
-  updateText(pfd.gs);
-  updateText(pfd.time);
-  updateText(pfd.flyingtime);
-  drawVario();
- // pfd.debug(pfd.roc);
-  //pfd.render();  
-}, 250);
-
+initPFD();
diff --git a/apps/tinyVario/metadata.json b/apps/tinyVario/metadata.json
index c8bc3659e..f038e7515 100644
--- a/apps/tinyVario/metadata.json
+++ b/apps/tinyVario/metadata.json
@@ -1,7 +1,7 @@
 { "id": "tinyVario",
   "name": "Tiny Vario",
   "shortName" : "tinyVario",
-  "version":"0.01",
+  "version":"0.05",
   "icon": "app.png",
   "readme": "README.md",
   "description": "A very simple app for gliding / paragliding / hang gliding etc.",
@@ -10,5 +10,6 @@
   "storage": [
     {"name":"tinyVario.app.js","url":"app.js"},
     {"name":"tinyVario.img","url":"app-icon.js","evaluate":true}
-    ]
+    ],
+  "data": [{"name":"tinyVario.json"}]
 }
diff --git a/apps/torch/ChangeLog b/apps/torch/ChangeLog
index 4d8f47500..fd904b6e8 100644
--- a/apps/torch/ChangeLog
+++ b/apps/torch/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Change start sequence to BTN1/3/1/3 to avoid accidental turning on (fix #342)
 0.03: Add Color Changing Settings
 0.04: Add Support For Bangle.js 2
+0.05: Default full Brightness
diff --git a/apps/torch/app.js b/apps/torch/app.js
index 864efb883..2af35fdb6 100644
--- a/apps/torch/app.js
+++ b/apps/torch/app.js
@@ -7,6 +7,7 @@ function loadSettings() {
 
 loadSettings();
 
+Bangle.setLCDBrightness(1);
 Bangle.setLCDPower(1);
 Bangle.setLCDTimeout(0);
 g.reset();
diff --git a/apps/torch/metadata.json b/apps/torch/metadata.json
index 37e6f6b95..af85370ac 100644
--- a/apps/torch/metadata.json
+++ b/apps/torch/metadata.json
@@ -2,7 +2,7 @@
   "id": "torch",
   "name": "Torch",
   "shortName": "Torch",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Turns screen white to help you see in the dark. Select from the launcher or press BTN1,BTN3,BTN1,BTN3 quickly to start when in any app that shows widgets on Bangle.js 1. You can also set the color through the app's setting menu.",
   "icon": "app.png",
   "tags": "tool,torch",
diff --git a/apps/twenties/ChangeLog b/apps/twenties/ChangeLog
new file mode 100644
index 000000000..89eb9547f
--- /dev/null
+++ b/apps/twenties/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New Widget!
+0.02: Fix calling null on draw
+0.03: Only vibrate during work
+0.04: Convert to boot code
\ No newline at end of file
diff --git a/apps/twenties/README.md b/apps/twenties/README.md
new file mode 100644
index 000000000..8ee917b0e
--- /dev/null
+++ b/apps/twenties/README.md
@@ -0,0 +1,17 @@
+# Twenties
+
+Follow the [20-20-20 rule](https://www.aoa.org/AOA/Images/Patients/Eye%20Conditions/20-20-20-rule.pdf) with discrete reminders. Your Bangle will buzz every 20 minutes for you to look away from your screen, and then buzz 20 seconds later to look back. Additionally, alternate between standing and sitting every 20 minutes to be standing for [more than 30 minutes](https://uwaterloo.ca/kinesiology-health-sciences/how-long-should-you-stand-rather-sit-your-work-station) per hour.
+
+## Usage
+
+Download this app and it will automatically run in the background.
+
+## Features
+
+Vibrates to remind you to stand up and look away for healthy living.
+
+Only vibrates during work days and hours.
+
+## Creator
+
+[@splch](https://github.com/splch/)
diff --git a/apps/twenties/app.png b/apps/twenties/app.png
new file mode 100644
index 000000000..7c6b02055
Binary files /dev/null and b/apps/twenties/app.png differ
diff --git a/apps/twenties/boot.js b/apps/twenties/boot.js
new file mode 100644
index 000000000..722af43bc
--- /dev/null
+++ b/apps/twenties/boot.js
@@ -0,0 +1,19 @@
+(() => {
+  const move = 20 * 60 * 1000; // 20 minutes
+  const look = 20 * 1000;      // 20 seconds
+
+  const buzz = _ => {
+    const date = new Date();
+    const day = date.getDay();
+    const hour = date.getHours();
+    // buzz at work
+    if (day >= 1 && day <= 5 &&
+      hour >= 8 && hour <= 17) {
+      Bangle.buzz().then(_ => {
+        setTimeout(Bangle.buzz, look);
+      });
+    }
+  };
+
+  setInterval(buzz, move); // buzz to stand / sit
+})();
diff --git a/apps/twenties/metadata.json b/apps/twenties/metadata.json
new file mode 100644
index 000000000..b1dfe2134
--- /dev/null
+++ b/apps/twenties/metadata.json
@@ -0,0 +1,13 @@
+{
+  "id": "twenties",
+  "name": "Twenties",
+  "shortName": "twenties",
+  "version": "0.04",
+  "description": "Buzzes every 20m to stand / sit and look 20ft away for 20s.",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "alarm,tool",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [{ "name": "twenties.boot.js", "url": "boot.js" }]
+}
diff --git a/apps/verticalface/ChangeLog b/apps/verticalface/ChangeLog
index 99ab68ec4..dc6c11eab 100644
--- a/apps/verticalface/ChangeLog
+++ b/apps/verticalface/ChangeLog
@@ -4,3 +4,4 @@
 0.07: Added leading zero to hours and minutes
 0.08: Show step count by calling wpedom.getSteps() or activepedom.getSteps()
 0.09: Fix time when minutes<10 and hours>9 (fix #767)
+0.10: Tell clock widgets to hide.
diff --git a/apps/verticalface/app.js b/apps/verticalface/app.js
index 4fcae5642..178481047 100644
--- a/apps/verticalface/app.js
+++ b/apps/verticalface/app.js
@@ -97,6 +97,28 @@ function drawBattery() {
 // Clear the screen once, at startup
 g.clear();
 
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn!=0) return;
+  //HRM Controller.
+  if(!HRMstate){
+    //console.log("Toggled HRM");
+    //Turn on.
+    Bangle.buzz();
+    Bangle.setHRMPower(1);
+    currentHRM = "CALC";
+    HRMstate = true;
+  } else if(HRMstate){
+    //console.log("Toggled HRM");
+    //Turn off.
+    Bangle.buzz();
+    Bangle.setHRMPower(0);
+    HRMstate = false;
+    currentHRM = [];
+  }
+  drawBPM(HRMstate);
+});
+
 // Load and draw widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -128,28 +150,6 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
-// Show launcher when button pressed
-Bangle.setUI("clockupdown", btn=>{
-  if (btn!=0) return;
-  //HRM Controller.
-  if(!HRMstate){
-    //console.log("Toggled HRM");
-    //Turn on.
-    Bangle.buzz();
-    Bangle.setHRMPower(1);
-    currentHRM = "CALC";
-    HRMstate = true;
-  } else if(HRMstate){
-    //console.log("Toggled HRM");
-    //Turn off.
-    Bangle.buzz();
-    Bangle.setHRMPower(0);
-    HRMstate = false;
-    currentHRM = [];
-  }
-  drawBPM(HRMstate);
-});
-
 Bangle.on('touch', function(button) {
   if(button == 1 || button == 2){
     Bangle.showLauncher();
diff --git a/apps/verticalface/metadata.json b/apps/verticalface/metadata.json
index da41b3f0d..273070022 100644
--- a/apps/verticalface/metadata.json
+++ b/apps/verticalface/metadata.json
@@ -2,7 +2,7 @@
   "id": "verticalface",
   "name": "Vertical watch face",
   "shortName": "Vertical Face",
-  "version": "0.09",
+  "version": "0.10",
   "description": "A simple vertical watch face with the date. Heart rate monitor is toggled with BTN1",
   "icon": "app.png",
   "type": "clock",
diff --git a/apps/waypointer/ChangeLog b/apps/waypointer/ChangeLog
index 7ccad08ea..8613ef799 100644
--- a/apps/waypointer/ChangeLog
+++ b/apps/waypointer/ChangeLog
@@ -1,3 +1,7 @@
 0.01: New app!
 0.02: Make Bangle.js 2 compatible
 0.03: Silently use built in heading when no magnav calibration file is present
+0.04: Move waypoints.json (and editor) to 'waypoints' app
+0.05: Fix not displaying of wpindex = 0
+0.06: Added adjustment for Bangle.js magnetometer heading fix
+0.07: Add settings file with the option to disable the slow direction updates
diff --git a/apps/waypointer/README.md b/apps/waypointer/README.md
index c0b4c5125..241d70a65 100644
--- a/apps/waypointer/README.md
+++ b/apps/waypointer/README.md
@@ -61,58 +61,10 @@ The app indicates that WP2 is now marked by adding the prefix @ to
 it's name. The distance should be small as shown in the screen shot
 as you have just marked your current location.
 
-## Waypoint JSON file
-
-When the app is loaded from the app loader, a file named
-`waypoints.json` is loaded along with the javascript etc. The file
-has the following contents:
-
-
-```
-[
-  {
-  "name":"NONE"
-  },
-  {
-  "name":"No10",
-  "lat":51.5032,
-  "lon":-0.1269
-  },
-  {
-  "name":"Stone",
-  "lat":51.1788,
-  "lon":-1.8260
-  },
-  { "name":"WP0" },
-  { "name":"WP1" },
-  { "name":"WP2" },
-  { "name":"WP3" },
-  { "name":"WP4" }
-]
-```
-
-The file contains the initial NONE waypoint which is useful if you
-just want to display course and speed. The next two entries are
-waypoints to No 10 Downing Street and to Stone Henge - obtained from
-Google Maps. The last five entries are entries which can be *marked*.
-
-You add and delete entries using the Web IDE to load and then save
-the file from and to watch storage. The app itself does not limit the
-number of entries although it does load the entire file into RAM
-which will obviously limit this.
-
-
-## Waypoint Editor
-
-Clicking on the download icon of gpsnav in the app loader invokes the
-waypoint editor.  The editor downloads and displays the current
-`waypoints.json` file. Clicking the `Edit` button beside an entry
-causes the entry to be deleted from the list and displayed in the
-edit boxes. It can be restored - by clicking the `Add waypoint`
-button. A new markable entry is created by using the `Add name`
-button. The edited `waypoints.json` file is uploaded to the Bangle by
-clicking the `Upload` button.
+## Setting Waypoints
 
+Check out the documentation for the `Waypoints` app. This provides
+the ability to set waypoints from your browser.
 
 ## Calibration of the Compass
 
diff --git a/apps/waypointer/app.js b/apps/waypointer/app.js
index bdb6f6857..de6bfdcaa 100644
--- a/apps/waypointer/app.js
+++ b/apps/waypointer/app.js
@@ -8,6 +8,11 @@ var buf1 = Graphics.createArrayBuffer(160*scale,160*scale,1, {msb:true});
 var buf2 = Graphics.createArrayBuffer(g.getWidth()/3,40*scale,1, {msb:true});
 var arrow_img = require("heatshrink").decompress(atob("lEowIPMjAEDngEDvwED/4DCgP/wAEBgf/4AEBg//8AEBh//+AEBj///AEBn///gEBv///wmCAAImCAAIoBFggE/AkaaEABo="));
 
+var settings = Object.assign({
+  // default values
+  smoothDirection: true,
+}, require('Storage').readJSON("waypointer.json", true) || {});
+
 function flip1(x,y) {
   g.drawImage({width:160*scale,height:160*scale,bpp:1,buffer:buf1.buffer, palette:pal_by},x,y);
   buf1.clear();
@@ -50,7 +55,7 @@ function drawCompass(course) {
   if(!candraw) return;
   if (Math.abs(previous.course - course) < 9) return; // reduce number of draws due to compass jitter
   previous.course = course;
-  
+
   buf1.setColor(1);
   buf1.fillCircle(buf1.getWidth()/2,buf1.getHeight()/2,79*scale);
   buf1.setColor(0);
@@ -63,12 +68,17 @@ function drawCompass(course) {
 /***** COMPASS CODE ***********/
 
 var heading = 0;
-function newHeading(m,h){ 
+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>=180){s=360-s; delta = -delta;}
     if (s<2) return h;
-    var hd = h + delta*(1 + Math.round(s/5));
+    var hd;
+    if (settings.smoothDirection) {
+        hd = h + delta*(1 + Math.round(s/5));
+    } else {
+        hd = h + delta*s;
+    }
     if (hd<0) hd+=360;
     if (hd>360)hd-= 360;
     return hd;
@@ -80,7 +90,7 @@ function tiltfixread(O,S){
   var m = Bangle.getCompass();
   if (O === undefined || S === undefined) {
     // no valid calibration from magnav, use built in
-    return 360-m.heading;
+    return m.heading;
   }
   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;
@@ -147,9 +157,9 @@ function drawN(){
   var bs = wp_bearing.toString();
   bs = wp_bearing<10?"00"+bs : wp_bearing<100 ?"0"+bs : bs;
   var dst = loc.distance(dist);
-  
+
   // -1=left (default), 0=center, 1=right
-  
+
   // show distance on the left
   if (previous.dst !== dst) {
     previous.dst = dst;
@@ -159,7 +169,7 @@ function drawN(){
     buf2.drawString(dst,0,0);
     flip2_bw(0, g.getHeight()-40*scale);
   }
-  
+
   // bearing, place in middle at bottom of compass
   if (previous.bs !== bs) {
     previous.bs = bs;
@@ -192,7 +202,7 @@ function onGPS(fix) {
   if (fix!==undefined){
     satellites = fix.satellites;
   }
-  
+
   if (candraw) {
     if (fix!==undefined && fix.fix==1){
       dist = distance(fix,wp);
@@ -240,7 +250,7 @@ function setButtons(){
     else { doselect(); }
   });
 }
- 
+
 Bangle.on('lcdPower',function(on) {
   if (on) {
     clear_previous();
@@ -250,7 +260,7 @@ Bangle.on('lcdPower',function(on) {
   }
 });
 
-var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"NONE"}];
+var waypoints = require("waypoints").load();
 wp=waypoints[0];
 
 function nextwp(inc){
@@ -263,10 +273,10 @@ function nextwp(inc){
 }
 
 function doselect(){
-  if (selected && wpindex!=0 && waypoints[wpindex].lat===undefined && savedfix.fix) {
+  if (selected && wpindex>=0 && waypoints[wpindex].lat===undefined && savedfix.fix) {
      waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon};
      wp = waypoints[wpindex];
-     require("Storage").writeJSON("waypoints.json", waypoints);
+     require("waypoints").save(waypoints);
   }
   selected=!selected;
   drawN();
diff --git a/apps/waypointer/metadata.json b/apps/waypointer/metadata.json
index 707da94cf..0bbc42322 100644
--- a/apps/waypointer/metadata.json
+++ b/apps/waypointer/metadata.json
@@ -1,16 +1,17 @@
 {
   "id": "waypointer",
   "name": "Way Pointer",
-  "version": "0.03",
+  "version": "0.07",
   "description": "Navigate to a waypoint using the GPS for bearing and compass to point way, uses the same waypoint interface as GPS Navigation",
   "icon": "waypointer.png",
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS", "BANGLEJS2"],
+  "dependencies" : { "waypoints":"type" },
   "readme": "README.md",
-  "interface": "waypoints.html",
   "storage": [
     {"name":"waypointer.app.js","url":"app.js"},
+    {"name":"waypointer.settings.js","url":"settings.js"},
     {"name":"waypointer.img","url":"icon.js","evaluate":true}
   ],
-  "data": [{"name":"waypoints.json","url":"waypoints.json"}]
+  "data": [{"name":"waypointer.json"}]
 }
diff --git a/apps/waypointer/settings.js b/apps/waypointer/settings.js
new file mode 100644
index 000000000..c8b06b9f9
--- /dev/null
+++ b/apps/waypointer/settings.js
@@ -0,0 +1,25 @@
+(function(back) {
+  var FILE = "waypointer.json";
+  // Load settings
+  var settings = Object.assign({
+    smoothDirection: true,
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  // Show the menu
+  E.showMenu({
+    "" : { "title" : "Way Pointer" },
+    "< Back" : () => back(),
+    'Smooth arrow rot': {
+      value: !!settings.smoothDirection,
+      format: v => v?"Yes":"No",
+      onchange: v => {
+        settings.smoothDirection = v;
+        writeSettings();
+      }
+    },
+  });
+})
diff --git a/apps/waypointer/waypoints.html b/apps/waypointer/waypoints.html
deleted file mode 100644
index 7a65821a2..000000000
--- a/apps/waypointer/waypoints.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="../../css/spectre.min.css">
-    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
-  </head>
-  <body>
-
-    <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">
-        </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>
-        <div class="column col-3 col-xs-8">
-          <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_longtitude" placeholder="Long">
-        </div>
-      </div>
-      <div class="columns">
-        <div class="column col-3 col-xs-8">
-          <button id="add_name_button" class="btn btn-primary btn-sm">Add Name Only</button>
-        </div>
-        <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>
-    
-    <script src="../../core/lib/interface.js"></script>
-
-    <script>
-
-      var waypoints = []
-
-      var $name = document.getElementById('add_waypoint_name')
-      var $form = document.getElementById('add_waypoint_form')
-      var $button = document.getElementById('add_waypoint_button')
-      var $name_button = document.getElementById('add_name_button')
-      var $latitude = document.getElementById('add_latitude')
-      var $longtitude = document.getElementById('add_longtitude')
-      var $list = document.getElementById('waypoints')
-
-      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;
-        }
-
-      $button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-        var lat = parseFloat($latitude.value);
-        var lon = parseFloat($longtitude.value);
-
-        waypoints.push({
-          name, lat,lon,
-        });
-        
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = (0).toPrecision(5);
-        $longtitude.value = (0).toPrecision(5);
-      });
-
-      $name_button.addEventListener('click', event => {
-        event.preventDefault()       
-        var name = $name.value.trim()
-        if(!name) return;
-
-        waypoints.push({
-          name
-        });
-        waypoints.sort(compare);
-
-        renderWaypoints()
-        $name.value = ''
-        $latitude.value = 0.0000
-        $longtitude.value = 0.0000
-      });
-
-
-      function removeWaypoint(index){
-        $name.value = waypoints[index].name
-        $latitude.value = waypoints[index].lat
-        $longtitude.value = waypoints[index].lon
-        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()    
-      }
-
-      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);
-        });
-      }
-
-      function uploadFile(fileid, contents) {      
-        Puck.write(`\x10(function() {
-          require("Storage").write("${fileid}",'${contents}');
-          Bluetooth.print("OK");
-         })()\n`,ret=>{
-            console.log("uploadFile",ret);
-        });
-      }
-
-      function gotStored(pts){
-          waypoints = pts;
-          renderWaypoints();
-      }
-
-      function onInit() {
-         downloadJSONfile("waypoints.json", gotStored);
-      }
-
-      document.getElementById("Download").addEventListener("click", function() {
-        downloadJSONfile("waypoints.json", gotStored);
-      });
-
-      document.getElementById("Upload").addEventListener("click", function() {
-        var data =  JSON.stringify(waypoints);
-        uploadFile("waypoints.json",data); 
-      });
-    </script>
-  </body>
-</html>
diff --git a/apps/waypointer/waypoints.json b/apps/waypointer/waypoints.json
deleted file mode 100644
index 98a670c0d..000000000
--- a/apps/waypointer/waypoints.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-  "name":"NONE"
-  },
-  {
-  "name":"No10",
-  "lat":51.5032,
-  "lon":-0.1269
-  },
-  {
-  "name":"Stone",
-  "lat":51.1788,
-  "lon":-1.8260
-  },
-  { "name":"WP0" },
-  { "name":"WP1" },
-  { "name":"WP2" },
-  { "name":"WP3" },
-  { "name":"WP4" }
-]
\ No newline at end of file
diff --git a/apps/waypoints/ChangeLog b/apps/waypoints/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/waypoints/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/waypoints/README.md b/apps/waypoints/README.md
new file mode 100644
index 000000000..e252054f2
--- /dev/null
+++ b/apps/waypoints/README.md
@@ -0,0 +1,56 @@
+# Waypoints
+
+This app provides a common way to set up the `waypoints.json` file,
+which several other apps rely on for navigation.
+
+## Waypoint JSON file
+
+When the app is loaded from the app loader, a file named
+`waypoints.json` is loaded along with the javascript etc. The file
+has the following contents:
+
+
+```
+[
+  {
+  "name":"NONE"
+  },
+  {
+  "name":"No10",
+  "lat":51.5032,
+  "lon":-0.1269
+  },
+  {
+  "name":"Stone",
+  "lat":51.1788,
+  "lon":-1.8260
+  },
+  { "name":"WP0" },
+  { "name":"WP1" },
+  { "name":"WP2" },
+  { "name":"WP3" },
+  { "name":"WP4" }
+]
+```
+
+The file contains the initial NONE waypoint which is useful if you
+just want to display course and speed. The next two entries are
+waypoints to No 10 Downing Street and to Stone Henge - obtained from
+Google Maps. The last five entries are entries which can be *marked*.
+
+You add and delete entries using the Web IDE to load and then save
+the file from and to watch storage. The app itself does not limit the
+number of entries although it does load the entire file into RAM
+which will obviously limit this.
+
+
+## Waypoint Editor
+
+Clicking on the download icon of `Waypoints` in the app loader invokes the
+waypoint editor.  The editor downloads and displays the current
+`waypoints.json` file. Clicking the `Edit` button beside an entry
+causes the entry to be deleted from the list and displayed in the
+edit boxes. It can be restored - by clicking the `Add waypoint`
+button. A new markable entry is created by using the `Add name`
+button. The edited `waypoints.json` file is uploaded to the Bangle by
+clicking the `Upload` button.
diff --git a/apps/waypoints/app-icon.js b/apps/waypoints/app-icon.js
new file mode 100644
index 000000000..49232b838
--- /dev/null
+++ b/apps/waypoints/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
diff --git a/apps/waypoints/app.js b/apps/waypoints/app.js
new file mode 100644
index 000000000..06c254a36
--- /dev/null
+++ b/apps/waypoints/app.js
@@ -0,0 +1,34 @@
+// place your const, vars, functions or classes here
+
+// clear the screen
+g.clear();
+
+var n = 0;
+
+// redraw the screen
+function draw() {
+  g.reset().clearRect(Bangle.appRect);
+  g.setFont("6x8").setFontAlign(0,0).drawString("Up / Down",g.getWidth()/2,g.getHeight()/2 - 20);
+  g.setFont("Vector",60).setFontAlign(0,0).drawString(n,g.getWidth()/2,g.getHeight()/2 + 30);
+}
+
+// Respond to user input
+Bangle.setUI({mode: "updown"}, function(dir) {
+  if (dir<0) {
+    n--;
+    draw();
+  } else if (dir>0) {
+    n++;
+    draw();
+  } else {
+    n = 0;
+    draw();
+  }
+});
+
+// First draw...
+draw();
+
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/waypoints/app.png b/apps/waypoints/app.png
new file mode 100644
index 000000000..0b9344405
Binary files /dev/null and b/apps/waypoints/app.png differ
diff --git a/apps/wpmoto/wpmoto.html b/apps/waypoints/interface.html
similarity index 60%
rename from apps/wpmoto/wpmoto.html
rename to apps/waypoints/interface.html
index 9966f51f6..48e47df57 100644
--- a/apps/wpmoto/wpmoto.html
+++ b/apps/waypoints/interface.html
@@ -4,6 +4,7 @@
     <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="../../css/spectre-icons.min.css">
     <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">
 
@@ -11,6 +12,8 @@
         html, body { height: 100% }
         .flex-col { display:flex; flex-direction:column; height:100% }
         #map { width:100%; height:100% }
+        #tab-map { width:100%; height:100% }
+        #tab-list { width:100%; height:100% }
 
         /* https://stackoverflow.com/a/58686215 */
         .arrow-icon {
@@ -23,6 +26,7 @@
             transform-origin: center center;
             font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
         }
+
     </style>
 </head>
 <body>
@@ -32,8 +36,57 @@
             <span id="status"></span>
             <span id="routestatus"></span>
         </div>
+        <div>
+          <ul class="tab tab-block">
+            <li class="tab-item active"  id="tabitem-map">
+              <a href="#">Map</a>
+            </li>
+            <li class="tab-item" id="tabitem-list">
+              <a href="#">List</a>
+            </li>
+          </ul>
+        </div>
         <div style="flex: 1">
+          <div id="tab-map">
             <div id="map"></div>
+          </div>
+          <div id="tab-list" style="display:none">
+            <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">
+                </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>
+                <div class="column col-3 col-xs-8">
+                  <input class="form-input input-sm" value="0.0000" type="number" step="any" id="add_longtitude" placeholder="Long">
+                </div>
+              </div>
+              <div class="columns">
+                <div class="column col-3 col-xs-8">
+                  <button id="add_name_button" class="btn btn-primary btn-sm">Add Name Only</button>
+                </div>
+                <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>
+          </div>
         </div>
     </div>
 
@@ -44,8 +97,23 @@
     <script src="../../core/lib/interface.js"></script>
 
     <script>
-        var map;
         var waypoints = [];
+
+  // ========================================================================== tabs
+        document.getElementById('tabitem-map').addEventListener('click',function() {
+          document.getElementById('tabitem-map').classList.remove("active");
+          document.getElementById('tabitem-list').classList.add("active");
+          document.getElementById('tab-map').style.display="block";
+          document.getElementById('tab-list').style.display="none";
+        });
+        document.getElementById('tabitem-list').addEventListener('click',function() {
+          document.getElementById('tabitem-map').classList.add("active");
+          document.getElementById('tabitem-list').classList.remove("active");
+          document.getElementById('tab-map').style.display="none";
+          document.getElementById('tab-list').style.display="block";
+        });
+	// ========================================================================== MAP
+        var map;
         var mapmarkers = L.layerGroup();
         var searchresult = L.layerGroup();
         var dynamicarrow = L.layerGroup();
@@ -100,9 +168,6 @@
             L.featureGroup(getArrows(latlngs, 'black', 2, map)).addTo(dynamicarrow)
             map.addLayer(dynamicarrow);
         });
-        clean();
-        renderAllWaypoints();
-
         /*** status ***/
 
         function clean() {
@@ -152,11 +217,11 @@
             dirty();
         }
 
-        function renderWaypoints(wps, isroute, parentidx) {
+        function renderWaypointsMap(wps, isroute, parentidx) {
             var latlngs = [];
             for (var i = 0; i < wps.length; i++) {
                 if (wps[i].route) {
-                    renderWaypoints(wps[i].route, true, i);
+                    renderWaypointsMap(wps[i].route, true, i);
                     continue;
                 }
                 if (wps[i].lat == null || wps[i].lon == null)
@@ -182,7 +247,8 @@
 
         function renderAllWaypoints() {
             mapmarkers.clearLayers();
-            renderWaypoints(waypoints, false, 0);
+            renderWaypointsMap(waypoints, false, 0);
+            renderWaypointsList();
             map.addLayer(mapmarkers);
         }
 
@@ -234,51 +300,18 @@
 
         /*** 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 latlngs = waypoints.filter(p => isFinite(p.lat)&&isFinite(p.lon)).map(p => [p.lat, p.lon]);
             var poly = L.polygon(latlngs);
-            map.fitBounds(poly.getBounds());
+            var bounds = poly.getBounds();
+            if (bounds.isValid())
+              map.fitBounds(bounds);
 
             renderAllWaypoints();
         }
 
-        function onInit() {
-            downloadJSONfile("waypoints.json", gotStored);
-        }
-
-        $('#download').on('click', function() {
-            downloadJSONfile("waypoints.json", gotStored);
-        });
-
-        $('#upload').click(function() {
-            var data =  JSON.stringify(waypoints);
-            uploadFile("waypoints.json",data);
-        });
-
         $('#statusarea').click(closeRoute);
 
         /*** map arrows ***/
@@ -348,5 +381,136 @@
             this.x = (round ? Math.round(x) : x);
             this.y = (round ? Math.round(y) : y);
         }
+
+      // ========================================================================== LIST
+
+      var $name = document.getElementById('add_waypoint_name')
+      var $form = document.getElementById('add_waypoint_form')
+      var $button = document.getElementById('add_waypoint_button')
+      var $name_button = document.getElementById('add_name_button')
+      var $latitude = document.getElementById('add_latitude')
+      var $longtitude = document.getElementById('add_longtitude')
+      var $list = document.getElementById('waypoints')
+
+      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;
+        }
+
+      $button.addEventListener('click', event => {
+        event.preventDefault()
+        var name = $name.value.trim()
+        if(!name) return;
+        var lat = parseFloat($latitude.value);
+        var lon = parseFloat($longtitude.value);
+
+        waypoints.push({
+          name, lat,lon,
+        });
+
+        waypoints.sort(compare);
+
+        renderAllWaypoints()
+        $name.value = ''
+        $latitude.value = (0).toPrecision(5);
+        $longtitude.value = (0).toPrecision(5);
+      });
+
+      $name_button.addEventListener('click', event => {
+        event.preventDefault()
+        var name = $name.value.trim()
+        if(!name) return;
+
+        waypoints.push({
+          name
+        });
+        waypoints.sort(compare);
+
+        renderAllWaypoints()
+        $name.value = ''
+        $latitude.value = 0.0000
+        $longtitude.value = 0.0000
+      });
+
+
+      function removeWaypoint(index){
+        $name.value = waypoints[index].name
+        $latitude.value = waypoints[index].lat
+        $longtitude.value = waypoints[index].lon
+        waypoints = waypoints.filter((p,i) => i!==index)
+        renderAllWaypoints()
+      }
+
+      function renderWaypointsList(){
+        $list.innerHTML = ''
+        waypoints.forEach((waypoint,index) => {
+          var $waypoint = document.createElement('tr')
+          if (index==0){
+              $waypoint.innerHTML = `<td>${waypoint.name}</td><td></td><td></td>`
+          } else if(waypoint.lat==undefined){
+            $waypoint.innerHTML = `<td>${waypoint.name}</td><td>------</td><td>-----</td>`;
+          } else {
+            $waypoint.innerHTML = `<td>${waypoint.name}</td><td>${waypoint.lat.toFixed(6)}</td><td>${waypoint.lon.toFixed(6)}</td>`;
+          }
+          $waypoint.innerHTML += `<td><button class="btn btn-action btn-primary" onclick="removeWaypoint(${index})"><i class="icon icon-delete"></i></button></td>`;
+          $list.appendChild($waypoint)
+        })
+        $name.focus()
+      }
+
+      function renderWaypoints() {
+        renderWaypointsList();
+        renderWaypointsMap();
+      }
+
+      // ========================================================================== UPLOAD/DOWNLOAD
+
+      function downloadJSONfile(fileid, callback) {
+        // TODO: use interface.js-provided stuff?
+          Puck.write(`\x10(function() {
+              var pts = require("Storage").readJSON("${fileid}")||[{name:"NONE"}];
+              Bluetooth.print(JSON.stringify(pts));
+          })()\n`, contents => {
+              if (contents=='[{name:"NONE"}]') contents="[]";
+              var storedpts = JSON.parse(contents);
+              callback(storedpts);
+              clean();
+          });
+      }
+
+      function uploadFile(fileid, contents) {
+        // TODO: use interface.js-provided stuff?
+          Puck.write(`\x10(function() {
+              require("Storage").write("${fileid}",'${contents}');
+              Bluetooth.print("OK");
+          })()\n`, ret => {
+              console.log("uploadFile", ret);
+              if (ret == "OK")
+                  clean();
+          });
+      }
+
+      function onInit() {
+          downloadJSONfile("waypoints.json", gotStored);
+      }
+
+      $('#download').on('click', function() {
+          downloadJSONfile("waypoints.json", gotStored);
+      });
+
+      $('#upload').click(function() {
+          var data =  JSON.stringify(waypoints);
+          uploadFile("waypoints.json",data);
+      });
+
+      // ========================================================================== FINALLY...
+      clean();
+      renderAllWaypoints();
     </script>
-</body>
+  </body>
+</html>
diff --git a/apps/waypoints/lib.js b/apps/waypoints/lib.js
new file mode 100644
index 000000000..88b402a73
--- /dev/null
+++ b/apps/waypoints/lib.js
@@ -0,0 +1,7 @@
+exports.load = (num) => {
+  return require("Storage").readJSON(`waypoints${num?"."+num:""}.json`)||[{name:"NONE"}];
+};
+
+exports.save = (waypoints,num) => {
+  require("Storage").writeJSON(`waypoints${num?"."+num:""}.json`, waypoints);
+};
diff --git a/apps/waypoints/metadata.json b/apps/waypoints/metadata.json
new file mode 100644
index 000000000..d7fa00f7e
--- /dev/null
+++ b/apps/waypoints/metadata.json
@@ -0,0 +1,20 @@
+{ "id": "waypoints",
+  "name": "Waypoints",
+  "version":"0.01",
+  "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader with maps or a list",
+  "icon": "app.png",
+  "tags": "tool,outdoors,gps",
+  "type": "waypoints",
+  "supports" : ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "interface": "interface.html",
+  "storage": [
+    {"name":"waypoints","url":"lib.js"}
+  ],
+  "data": [
+    {"name":"waypoints.json","url":"waypoints.json"},
+    {"name":"waypoints.1.json"},
+    {"name":"waypoints.2.json"},
+    {"name":"waypoints.3.json"}
+  ]
+}
diff --git a/apps/waypoints/waypoints.json b/apps/waypoints/waypoints.json
new file mode 100644
index 000000000..066f05c10
--- /dev/null
+++ b/apps/waypoints/waypoints.json
@@ -0,0 +1,12 @@
+[
+  {
+  "name":"No10",
+  "lat":51.5032,
+  "lon":-0.1269
+  },
+  {
+  "name":"Stone",
+  "lat":51.1788,
+  "lon":-1.8260
+  }
+]
diff --git a/apps/wclock/ChangeLog b/apps/wclock/ChangeLog
index 9a2ebdd5f..e50ee6842 100644
--- a/apps/wclock/ChangeLog
+++ b/apps/wclock/ChangeLog
@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: setUI and support for different screens
+0.04: Tell clock widgets to hide.
diff --git a/apps/wclock/clock-word.js b/apps/wclock/clock-word.js
index aff134273..7ddb7bc35 100644
--- a/apps/wclock/clock-word.js
+++ b/apps/wclock/clock-word.js
@@ -122,11 +122,11 @@ Bangle.on('lcdPower', function(on) {
   if (on) drawWordClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(drawWordClock, 1E4);
 drawWordClock();
-
-// Show launcher when button pressed
-Bangle.setUI("clock");
diff --git a/apps/wclock/metadata.json b/apps/wclock/metadata.json
index f22b53dc1..820af7ac0 100644
--- a/apps/wclock/metadata.json
+++ b/apps/wclock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "wclock",
   "name": "Word Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Display Time as Text",
   "icon": "clock-word.png",
   "screenshots": [{"url":"screenshot_word.png"}],
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index 101da48e1..da28d8d5a 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -12,3 +12,5 @@
 0.13: Tweak Bangle.js 2 light theme colors
 0.14: Use weather condition code for icon selection
 0.15: Fix widget icon
+0.16: Don't mark app as clock
+0.17: Added clkinfo for clocks.
\ No newline at end of file
diff --git a/apps/weather/app.js b/apps/weather/app.js
index efd9b0209..f63b226b9 100644
--- a/apps/weather/app.js
+++ b/apps/weather/app.js
@@ -101,7 +101,11 @@ weather.on("update", update);
 
 update();
 
-// Show launcher when middle button pressed
+// We want this app to behave like a clock:
+// i.e. show launcher when middle button pressed
 Bangle.setUI("clock");
+// But the app is not actually a clock
+// This matters for widgets that hide themselves for clocks, like widclk or widclose
+delete Bangle.CLOCK;
 
 Bangle.drawWidgets();
diff --git a/apps/weather/clkinfo.js b/apps/weather/clkinfo.js
new file mode 100644
index 000000000..8e502b7fc
--- /dev/null
+++ b/apps/weather/clkinfo.js
@@ -0,0 +1,43 @@
+(function() {
+    var weather = {
+        temp: "?",
+        hum: "?",
+        wind: "?",
+    };
+
+    var weatherJson = storage.readJSON('weather.json');
+    if(weatherJson !== undefined && weatherJson.weather !== undefined){
+        weather = weatherJson.weather;
+        weather.temp = locale.temp(weather.temp-273.15);
+        weather.hum = weather.hum + "%";
+        weather.wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
+        weather.wind = Math.round(weather.wind[1]) + "kph";
+    }
+
+    var weatherItems = {
+        name: "Weather",
+        img: atob("GBiBAf+///u5//n7//8f/9wHP8gDf/gB//AB/7AH/5AcP/AQH/DwD/uAD84AD/4AA/wAAfAAAfAAAfAAAfgAA/////+bP/+zf/+zfw=="),
+        items: [
+            {
+                name: "temperature",
+                get: () => ({ text: weather.temp, img: atob("GBiBAf/D//+B//8Y//88//88//88//88//88//8k//8k//8k//8k//8k//8k//4kf/5mf/zDP/yBP/yBP/zDP/5mf/48f/8A///D/w==")}),
+                show: function() { weatherItems.items[0].emit("redraw"); },
+                hide: function () {}
+            },
+            {
+                name: "humidity",
+                get: () => ({ text: weather.hum, img: atob("GBiBAf/7///z///x///g///g///Af//Af/3Af/nA//jg//B/v/B/H+A/H8A+D8AeB8AcB4AYA8AYA8AYA+A4A/B4A//4A//8B///Dw==")}),
+                show: function() { weatherItems.items[1].emit("redraw"); },
+                hide: function () {}
+            },
+            {
+                name: "wind",
+                get: () => ({ text: weather.wind, img: atob("GBiBAf4f//wP//nn//Pn//Pzg//nAf/meIAOfAAefP///P//+fAAAfAAB////////wAAP4AAH///z///z//nz//nz//zj//wH//8Pw==")}),
+                show: function() { weatherItems.items[2].emit("redraw"); },
+                hide: function () {}
+            },
+        ]
+    };
+
+    return weatherItems;
+})
\ No newline at end of file
diff --git a/apps/weather/metadata.json b/apps/weather/metadata.json
index 1d0b6b469..125041ec4 100644
--- a/apps/weather/metadata.json
+++ b/apps/weather/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "weather",
   "name": "Weather",
-  "version": "0.15",
+  "version": "0.17",
   "description": "Show Gadgetbridge weather report",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot.png"}],
@@ -13,7 +13,8 @@
     {"name":"weather.wid.js","url":"widget.js"},
     {"name":"weather","url":"lib.js"},
     {"name":"weather.img","url":"icon.js","evaluate":true},
-    {"name":"weather.settings.js","url":"settings.js"}
+    {"name":"weather.settings.js","url":"settings.js"},
+    {"name":"weather.clkinfo.js","url":"clkinfo.js"}
   ],
   "data": [{"name":"weather.json"}]
 }
diff --git a/apps/weather/readme.md b/apps/weather/readme.md
index b37d0b38e..2187ef061 100644
--- a/apps/weather/readme.md
+++ b/apps/weather/readme.md
@@ -14,6 +14,34 @@ You can view the full report through the app:
 If using the `Bangle.js Gadgetbridge` app on your phone (as opposed to the standard F-Droid `Gadgetbridge`) you need to set the package name
 to `com.espruino.gadgetbridge.banglejs` in the settings of the weather app (`settings -> gadgetbridge support -> package name`).
 
+## Android Weather Apps
+
+There are two weather apps for Android that can connect with Gadgetbridge
+ * Tiny Weather Forecast Germany
+ ** F-Droid - https://f-droid.org/en/packages/de.kaffeemitkoffein.tinyweatherforecastgermany/
+ ** Source code - https://codeberg.org/Starfish/TinyWeatherForecastGermany
+ * QuickWeather
+ ** F-Droid - https://f-droid.org/en/packages/com.ominous.quickweather/
+ ** Google Play - https://play.google.com/store/apps/details?id=com.ominous.quickweather
+ ** Source code - https://github.com/TylerWilliamson/QuickWeather
+ 
+ ### Tiny Weather Forecast Germany
+ Even though Tiny Weather Forecast Germany is made for Germany, it can be used around the world. To do this:
+ 
+1. Tap on the three dots in the top right hand corner and go to settings
+2. Go down to Location and tap on the checkbox labeled "Use location services". You may also want to check on the "Check Location checkbox". Alternatively, you may select the "manual" checkbox and choose your location.
+3. Scroll down further to the "other" section and tap "Gadgetbridge support". Then tap on "Enable". You may also choose to tap on "Send current time". 
+4. If you're using the specific Gadgetbridge for Bangle.JS app, you'll want to tap on "Package name." In the dialog box that appears, you'll want to put in "com.espruino.gadgetbridge.banglejs" without the quotes. If you're using the original Gadgetbridge, leave this as the default.
+
+
+### QuickWeather
+QuickWeather requires an OpenWeatherMap API. You will need the "One Call By Call" plan, which is free if you're not making too many calls. Sign up or get more information at https://openweathermap.org/api
+
+1. When you first load QuickWeather, it will take you through the setup process. You will fill out all the required information as well as put your API key in. If you do not have the "One Call By Call", or commonly known as "One Call", API, you will need to sign up for that. QuickWeather will work automatically with both the main version of Gadgetbridge and Gadgetbridge for bangle.JS.
+
+### Weather Notification
+* Note - at one time, the Weather Notification app also worked with Gadgetbridge. However, many users are reporting it's no longer seeing the OpenWeatherMap API key as valid. The app has not received any updates since August of 2020, and may be unmaintained. 
+
 ## Settings
 
 * Expiration timespan can be set after which the local weather data is considered as invalid
diff --git a/apps/widagps/metadata.json b/apps/widagps/metadata.json
index 4607ddaa1..ee1eb9f08 100644
--- a/apps/widagps/metadata.json
+++ b/apps/widagps/metadata.json
@@ -1,10 +1,10 @@
 { "id": "widagps",
-  "name": "AGPS Widget",
+  "name": "AGPS Widget (automatic download)",
   "shortName":"AGPS Widget",
   "icon": "widget.png",
   "type": "widget",
   "version":"0.01",
-  "description": "Load AGPS data in the background",
+  "description": "Once installed, this widget allows your Bangle.js 2 to load AGPS data in the background **via Gadgetbridge on an Android phone** so it is always up to date. If you just want to upload the latest AGPS data from this app loader, please use the `Assisted GPS Update (AGPS)` app.",
   "readme": "README.md",
   "tags": "widget,agps,http",
   "supports": ["BANGLEJS2"],
diff --git a/apps/widalt/ChangeLog b/apps/widalt/ChangeLog
new file mode 100644
index 000000000..ec66c5568
--- /dev/null
+++ b/apps/widalt/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial version
diff --git a/apps/widalt/README.md b/apps/widalt/README.md
new file mode 100644
index 000000000..08ee4f83d
--- /dev/null
+++ b/apps/widalt/README.md
@@ -0,0 +1,2 @@
+# Altimeter widget
+Displays barometric altitude in the top right corner.
diff --git a/apps/widalt/metadata.json b/apps/widalt/metadata.json
new file mode 100644
index 000000000..309c5bf2c
--- /dev/null
+++ b/apps/widalt/metadata.json
@@ -0,0 +1,18 @@
+
+{
+    "id": "widalt",
+    "name": "Altimeter widget",
+    "version": "0.01",
+    "description": "Displays barometric altitude",
+    "readme": "README.md",
+    "icon": "widalt.png",
+    "type": "widget",
+    "tags": "widget",
+    "supports": ["BANGLEJS2"],
+    "allow_emulator":false,
+    "storage": [
+      {"name":"widalt.wid.js","url":"widalt.wid.js"},
+      {"name":"widalt.settings.js","url":"widalt.settings.js"}
+    ],
+    "data": [{"name":"widalt.json"}]
+  }
diff --git a/apps/widalt/widalt.png b/apps/widalt/widalt.png
new file mode 100644
index 000000000..43e5465bc
Binary files /dev/null and b/apps/widalt/widalt.png differ
diff --git a/apps/widalt/widalt.settings.js b/apps/widalt/widalt.settings.js
new file mode 100644
index 000000000..57993474e
--- /dev/null
+++ b/apps/widalt/widalt.settings.js
@@ -0,0 +1,27 @@
+(function(back) {
+  var settings = Object.assign({
+    interval: 5000,
+  }, require('Storage').readJSON("widalt.json", true) || {});
+  o=Bangle.getOptions();
+  Bangle.getPressure().then((p)=>{
+    E.showMenu({
+      "" : { "title" : "Altimeter Widget" },
+      "< Back" : () => back(),
+      'QNH': {
+        value: Math.floor(o.seaLevelPressure),
+        min: 100, max: 10000,
+        format: v=>(v+"hPa\nAlt: "+(44330 * (1.0 - Math.pow(p.pressure/v, 0.1903))).toFixed(0)+"m"),
+        onchange: v => {Bangle.setOptions({seaLevelPressure:v});}
+      },
+      'update Interval': {
+        value: settings.interval/1000,
+        min: 1, max: 60,
+        format: v=>(v+"s"),
+        onchange: v => {
+          settings.interval=v*1000;
+          require('Storage').writeJSON("widalt.json", settings);
+        }
+      }
+    });
+  });
+})
diff --git a/apps/widalt/widalt.wid.js b/apps/widalt/widalt.wid.js
new file mode 100644
index 000000000..dbd1a763e
--- /dev/null
+++ b/apps/widalt/widalt.wid.js
@@ -0,0 +1,38 @@
+(()=>{
+  var alt="";
+  var lastAlt=0;
+  var settings = Object.assign({
+    interval: 5000,
+  }, require('Storage').readJSON("widalt.json", true) || {});
+  Bangle.setBarometerPower(true,"widalt");
+  Bangle.on("pressure", (p)=>{
+    if (Math.floor(p.altitude)!=lastAlt) {
+      lastAlt=Math.floor(p.altitude);
+      alt=p.altitude.toFixed(0); 
+      var w = WIDGETS["widalt"].width;
+      WIDGETS["widalt"].width = 1 + (alt.length)*12+16;
+      if (w!=WIDGETS["widalt"].width) Bangle.drawWidgets();
+      else WIDGETS["widalt"].draw();
+    }
+    Bangle.setBarometerPower(false,"widalt")
+    setTimeout(()=>{Bangle.setBarometerPower(true,"widalt");},settings.interval);
+  });
+  
+  function draw() {
+    if (!Bangle.isLCDOn()) return; 
+    g.reset();
+    g.setColor(g.theme.bg);
+    g.fillRect(this.x, this.y, this.x + this.width, this.y + 23); 
+    g.setColor(g.theme.fg); 
+    g.drawImage(atob("EBCBAAAAAAAIAAwgFXAX0BCYIIggTD/EYPZADkACf/4AAAAA"), this.x, this.y+4);
+g.setFontCustom(atob("AAAAABwAAOAAAgAAHAADwAD4AB8AB8AA+AAeAADAAAAOAAP+AH/8B4DwMAGBgAwMAGBgAwOAOA//gD/4AD4AAAAAAAABgAAcAwDAGAwAwP/+B//wAAGAAAwAAGAAAAAAAAIAwHgOA4DwMA+BgOwMDmBg4wOeGA/gwDwGAAAAAAAAAGAHA8A4DwMAGBhAwMMGBjgwOcOA+/gDj4AAAAABgAAcAAHgADsAA5gAOMAHBgBwMAP/+B//wABgAAMAAAAAAAgD4OB/AwOYGBjAwMYGBjBwMe8Bh/AIHwAAAAAAAAAfAAP8AHxwB8GAdgwPMGBxgwMOOAB/gAH4AAAAAAABgAAMAABgAwMAeBgPgMHwBj4AN8AB+AAPAABAAAAAAAMfAH38B/xwMcGBhgwMMGBjgwP+OA+/gDj4AAAAAAAAOAAH4AA/gQMMGBgzwME8BhvAOPgA/4AD8AAEAAAAAAGAwA4OAHBwAAA="), 46, atob("BAgMDAwMDAwMDAwMBQ=="), 21+(1<<8)+(1<<16));
+    g.setFontAlign(-1, 0);
+    g.drawString(alt, this.x+16, this.y + 12); 
+  }
+  WIDGETS["widalt"] = {
+    area: "tr",
+    width: 6,
+    draw: draw
+  };
+
+})();
diff --git a/apps/widbt_notify/ChangeLog b/apps/widbt_notify/ChangeLog
index 8f1dab908..b9ecd7b7d 100644
--- a/apps/widbt_notify/ChangeLog
+++ b/apps/widbt_notify/ChangeLog
@@ -11,4 +11,5 @@
 0.12: Prevent repeated execution of `draw()` from the current app.
 0.13: Added "connection restored" notification. Fixed restoring of the watchface.
 0.14: Added configuration option
-0.15: Added option to hide widget when connected
\ No newline at end of file
+0.15: Added option to hide widget when connected
+0.16: Simplify code, add option to disable displaying a message
\ No newline at end of file
diff --git a/apps/widbt_notify/metadata.json b/apps/widbt_notify/metadata.json
index 566a51b57..626ffcb8b 100644
--- a/apps/widbt_notify/metadata.json
+++ b/apps/widbt_notify/metadata.json
@@ -1,8 +1,8 @@
 {
   "id": "widbt_notify",
   "name": "Bluetooth Widget with Notification",
-  "version": "0.15",
-  "description": "Show the current Bluetooth connection status in the top right of the clock and vibrate when disconnected.",
+  "version": "0.16",
+  "description": "Show the current Bluetooth connection status with some optional features: show message, buzz on connect/loss, hide always/if connected.",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,bluetooth",
diff --git a/apps/widbt_notify/settings.js b/apps/widbt_notify/settings.js
index 1e0d5036b..5c67fed7b 100644
--- a/apps/widbt_notify/settings.js
+++ b/apps/widbt_notify/settings.js
@@ -1,69 +1,57 @@
 (function(back) {
-  var FILE = "widbt_notify.json";
+
+  var filename = "widbt_notify.json";
+
+  // set Storage and load settings
+  var storage = require("Storage");
   var settings = Object.assign({
-    secondsOnUnlock: false,
-  }, require('Storage').readJSON(FILE, true) || {});
+    showWidget: true,
+    buzzOnConnect: true,
+    buzzOnLoss: true,
+    hideConnected: true,
+    showMessage: true,
+    nextBuzz: 30000
+  }, storage.readJSON(filename, true) || {});
 
-  function writeSettings() {
-    require('Storage').writeJSON(FILE, settings);
-  }
-
-  // Helper method which uses int-based menu item for set of string values
-  function stringItems(startvalue, writer, values) {
+  // setup boolean menu entries
+  function boolEntry(key) {
     return {
-      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
-      format: v => values[v],
-      min: 0,
-      max: values.length - 1,
-      wrap: true,
-      step: 1,
+      value: settings[key],
       onchange: v => {
-        writer(values[v]);
-        writeSettings();
+        // change the value of key
+        settings[key] = v;
+        // write to storage
+        storage.writeJSON(filename, settings);
       }
     };
   }
 
-  // Helper method which breaks string set settings down to local settings object
-  function stringInSettings(name, values) {
-    return stringItems(settings[name], v => settings[name] = v, values);
-  }
-
-  var mainmenu = {
+  // setup menu
+  var menu = {
     "": {
       "title": "Bluetooth Widget WN"
     },
     "< Back": () => back(),
-    "Show Widget": {
-      value: (settings.showWidget !== undefined ? settings.showWidget : true),
+    "Show Widget": boolEntry("showWidget"),
+    "Buzz on connect": boolEntry("buzzOnConnect"),
+    "Buzz on loss": boolEntry("buzzOnLoss"),
+    "Hide connected": boolEntry("hideConnected"),
+    "Show Message": boolEntry("showMessage"),
+    "Next Buzz": {
+      value: settings.nextBuzz,
+      step: 1000,
+      min: 1000,
+      max: 120000,
+      wrap: true,
+      format: v => (v / 1000) + "s",
       onchange: v => {
-        settings.showWidget = v;
-        writeSettings();
+        settings.nextBuzz = v;
+        storage.writeJSON(filename, settings);
       }
-    },
-    "Buzz on Connect": {
-      value: (settings.buzzOnConnect !== undefined ? settings.buzzOnConnect : true),
-      onchange: v => {
-        settings.buzzOnConnect = v;
-        writeSettings();
-      }
-    },
-    "Buzz on loss": {
-      value: (settings.buzzOnLoss !== undefined ? settings.buzzOnLoss : true),
-      onchange: v => {
-        settings.buzzOnLoss = v;
-        writeSettings();
-      }
-    },
-    "Hide connected": {
-      value: (settings.hideConnected !== undefined ? settings.hideConnected : false),
-      onchange: v => {
-        settings.hideConnected = v;
-        writeSettings();
-      }
-    }		
+    }
   };
 
-  E.showMenu(mainmenu);
+  // draw main menu
+  E.showMenu(menu);
 
-});
+})
\ No newline at end of file
diff --git a/apps/widbt_notify/widget.js b/apps/widbt_notify/widget.js
index de2baa3cf..1b192412a 100644
--- a/apps/widbt_notify/widget.js
+++ b/apps/widbt_notify/widget.js
@@ -1,110 +1,90 @@
-WIDGETS.bluetooth_notify = {
+(function() {
+  // load settings
+  var settings = Object.assign({
+    showWidget: true,
+    buzzOnConnect: true,
+    buzzOnLoss: true,
+    hideConnected: true,
+    showMessage: true,
+    nextBuzz: 30000
+  }, require("Storage").readJSON("widbt_notify.json", true) || {});
+
+  // setup widget with to hide if connected and option set
+  var widWidth = settings.hideConnected && NRF.getSecurityStatus().connected ? 0 : 15;
+
+  // write widget with loaded settings
+  WIDGETS.bluetooth_notify = Object.assign(settings, {
+
+    // set area and width
     area: "tr",
-    width: 15,
+    width: widWidth,
+
+    // setup warning status
     warningEnabled: 1,
 
-     // ------------ Settings -------- very lame - need to improve
-     readshowWidget: function() {
-        var showWidget;
-        const SETTINGSFILE = "widbt_notify.json";
-        function def (value, def) {return value !== undefined ? value : def;}
-        var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-        showWidget = def(settings.showWidget, true);
-        return showWidget;
-    },        
-    
-     readBuzzOnConnect: function() {
-        var buzzOnConnect;
-        const SETTINGSFILE = "widbt_notify.json";
-        function def (value, def) {return value !== undefined ? value : def;}
-        var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-        buzzOnConnect = def(settings.buzzOnConnect, true);
-        return buzzOnConnect;
-    },        
-
-     readBuzzOnLoss: function() {
-        var buzzOnLoss;
-        const SETTINGSFILE = "widbt_notify.json";
-        function def (value, def) {return value !== undefined ? value : def;}
-        var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-        buzzOnLoss = def(settings.buzzOnLoss, true);
-        return buzzOnLoss;
-    },            
-	
-     readHideConnected: function() {
-        var hideConnected;
-        const SETTINGSFILE = "widbt_notify.json";
-        function def (value, def) {return value !== undefined ? value : def;}
-        var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
-        hideConnected = def(settings.hideConnected, true);
-        return hideConnected;
-    },  	
-	
-	
-     // ------------ Settings --------
-
     draw: function() {
-        if (WIDGETS.bluetooth_notify.readshowWidget()){
-            g.reset();
-            if (NRF.getSecurityStatus().connected) {
-				if (!WIDGETS.bluetooth_notify.readHideConnected()) {
-                   g.setColor((g.getBPP() > 8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
-                   g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), 2 + this.x, 2 + this.y);
-                }
-            } else {
-                // g.setColor(g.theme.dark ? "#666" : "#999"); 
-                g.setColor("#f00"); // red is easier to distinguish from blue
-                g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), 2 + this.x, 2 + this.y);
-            }
+      if (this.showWidget) {
+        g.reset();
+        if (NRF.getSecurityStatus().connected) {
+          if (!this.hideConnected) {
+            g.setColor((g.getBPP() > 8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
+            g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), 2 + this.x, 2 + this.y);
+          }
+        } else {
+          // g.setColor(g.theme.dark ? "#666" : "#999"); 
+          g.setColor("#f00"); // red is easier to distinguish from blue
+          g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), 2 + this.x, 2 + this.y);
         }
+      }
     },
-    
-    redrawCurrentApp: function(){
-        if(typeof(draw)=='function'){
-            g.clear();
-            draw();
-            Bangle.loadWidgets();
-            Bangle.drawWidgets();
-        }else{
-            load(); // fallback. This might reset some variables
+
+    redrawCurrentApp: function() {
+      if (typeof(draw) == 'function') {
+        g.clear();
+        draw();
+        Bangle.loadWidgets();
+        Bangle.drawWidgets();
+      } else {
+        load(); // fallback. This might reset some variables
+      }
+    },
+
+    onNRF: function(connect) {
+      // setup widget with and reload widgets to show/hide if hideConnected is enabled
+      if (this.hideConnected) {
+        this.width = connect ? 0 : 15; // ensures correct redraw
+        Bangle.drawWidgets();
+      } else {
+        // redraw widget
+        this.draw();
+      }
+
+      if (this.warningEnabled) {
+        if (this.showMessage) {
+          E.showMessage( /*LANG*/ 'Connection\n' + (connect ? /*LANG*/ 'restored.' : /*LANG*/ 'lost.'), 'Bluetooth');
+          setTimeout(() => {
+            WIDGETS.bluetooth_notify.redrawCurrentApp();
+          }, 3000); // clear message - this will reload the widget, resetting 'warningEnabled'.
         }
-    },
-    
-    connect: function() {
 
-            if(WIDGETS.bluetooth_notify.warningEnabled == 1){
-                E.showMessage(/*LANG*/'Connection\nrestored.', 'Bluetooth');
-                setTimeout(()=>{WIDGETS.bluetooth_notify.redrawCurrentApp();}, 3000); // clear message - this will reload the widget, resetting 'warningEnabled'.
-                
-                WIDGETS.bluetooth_notify.warningEnabled = 0;
-                setTimeout('WIDGETS.bluetooth_notify.warningEnabled = 1;', 30000); // don't buzz for the next 30 seconds.
-                
-                var quiet       = (require('Storage').readJSON('setting.json',1)||{}).quiet;
-                if(!quiet && WIDGETS.bluetooth_notify.readBuzzOnConnect()){
-                    Bangle.buzz(700, 1); // buzz on connection resume
-                }
-            }        
-            WIDGETS.bluetooth_notify.draw();
+        this.warningEnabled = 0;
+        setTimeout('WIDGETS.bluetooth_notify.warningEnabled = 1;', this.nextBuzz); // don't buzz for the next X seconds.
 
-    },
-    
-    disconnect: function() {
-            if(WIDGETS.bluetooth_notify.warningEnabled == 1){
-                E.showMessage(/*LANG*/ 'Connection\nlost.', 'Bluetooth');
-                setTimeout(()=>{WIDGETS.bluetooth_notify.redrawCurrentApp();}, 3000); // clear message - this will reload the widget, resetting 'warningEnabled'.
-                
-                WIDGETS.bluetooth_notify.warningEnabled = 0;
-                setTimeout('WIDGETS.bluetooth_notify.warningEnabled = 1;', 30000); // don't buzz for the next 30 seconds.
-                
-                var quiet       = (require('Storage').readJSON('setting.json',1)||{}).quiet;
-                if(!quiet && WIDGETS.bluetooth_notify.readBuzzOnLoss()){
-                    Bangle.buzz(700, 1); // buzz on connection loss
-                }
-            }
-        
-        WIDGETS.bluetooth_notify.draw();
+        var quiet = (require('Storage').readJSON('setting.json', 1) || {}).quiet;
+        if (!quiet && (connect ? this.buzzOnConnect : this.buzzOnLoss)) {
+          Bangle.buzz(700, 1); // buzz on connection resume or loss
+        }
+      }
     }
-};
 
-NRF.on('connect', WIDGETS.bluetooth_notify.connect);
-NRF.on('disconnect', WIDGETS.bluetooth_notify.disconnect);
+  });
+
+  // clear variables
+  settings = undefined;
+  widWidth = undefined;
+
+  // setup bluetooth connection events
+  NRF.on('connect', (addr) => WIDGETS.bluetooth_notify.onNRF(addr));
+  NRF.on('disconnect', () => WIDGETS.bluetooth_notify.onNRF());
+
+})()
\ No newline at end of file
diff --git a/apps/widclk/ChangeLog b/apps/widclk/ChangeLog
index c74857ab4..1a89e2780 100644
--- a/apps/widclk/ChangeLog
+++ b/apps/widclk/ChangeLog
@@ -3,3 +3,4 @@
 0.04: Fix regression stopping correct widget updates
 0.05: Don't show clock widget if already showing clock app
 0.06: Use 7 segment font, update *on* the minute, use less memory
+0.07: allow turning on/off when quick-switching apps
diff --git a/apps/widclk/metadata.json b/apps/widclk/metadata.json
index 6996f4080..b7bc74e11 100644
--- a/apps/widclk/metadata.json
+++ b/apps/widclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widclk",
   "name": "Digital clock widget",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A simple digital clock widget",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widclk/widget.js b/apps/widclk/widget.js
index 9e035ca9a..7c281f761 100644
--- a/apps/widclk/widget.js
+++ b/apps/widclk/widget.js
@@ -1,10 +1,13 @@
 /* Simple clock that appears in the widget bar if no other clock
 is running. We update once per minute, but don't bother stopping
 if the */
-
-// don't show widget if we know we have a clock app running
-if (!Bangle.CLOCK) WIDGETS["wdclk"]={area:"tl",width:52/* g.stringWidth("00:00") */,draw:function() {
-  g.reset().setFontCustom(atob("AAAAAAAAAAIAAAQCAQAAAd0BgMBdwAAAAAAAdwAB0RiMRcAAAERiMRdwAcAQCAQdwAcERiMRBwAd0RiMRBwAAEAgEAdwAd0RiMRdwAcERiMRdwAFAAd0QiEQdwAdwRCIRBwAd0BgMBAAABwRCIRdwAd0RiMRAAAd0QiEQAAAAAAAAAA="), 32, atob("BgAAAAAAAAAAAAAAAAYCAAYGBgYGBgYGBgYCAAAAAAAABgYGBgYG"), 512+9);
+WIDGETS["wdclk"]={area:"tl",width:Bangle.CLOCK?0:52/* g.stringWidth("00:00") */,draw:function() {
+  if (!Bangle.CLOCK == !this.width) { // if we're the wrong size for if we have a clock or not...
+    this.width = Bangle.CLOCK?0:52;
+    return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw
+  }
+  if (!this.width) return; // if size not right, return
+g.reset().setFontCustom(atob("AAAAAAAAAAIAAAQCAQAAAd0BgMBdwAAAAAAAdwAB0RiMRcAAAERiMRdwAcAQCAQdwAcERiMRBwAd0RiMRBwAAEAgEAdwAd0RiMRdwAcERiMRdwAFAAd0QiEQdwAdwRCIRBwAd0BgMBAAABwRCIRdwAd0RiMRAAAd0QiEQAAAAAAAAAA="), 32, atob("BgAAAAAAAAAAAAAAAAYCAAYGBgYGBgYGBgYCAAAAAAAABgYGBgYG"), 512+9);
   var time = require("locale").time(new Date(),1);
   g.drawString(time, this.x, this.y+3, true); // 5 * 6*2 = 60
   // queue draw in one minute
diff --git a/apps/widclkbttm/ChangeLog b/apps/widclkbttm/ChangeLog
index 326169af5..9dc8f8d2c 100644
--- a/apps/widclkbttm/ChangeLog
+++ b/apps/widclkbttm/ChangeLog
@@ -1,4 +1,4 @@
 0.01: Fork of widclk v0.04 github.com/espruino/BangleApps/tree/master/apps/widclk
 0.02: Modification for bottom widget area and text color
 0.03: based in widclk v0.05 compatible at same time, bottom area and color
-
+0.04: refactored to use less memory, and allow turning on/off when quick-switching apps
diff --git a/apps/widclkbttm/metadata.json b/apps/widclkbttm/metadata.json
index 9e92f7c46..7c5fe4b63 100644
--- a/apps/widclkbttm/metadata.json
+++ b/apps/widclkbttm/metadata.json
@@ -2,8 +2,8 @@
   "id": "widclkbttm",
   "name": "Digital clock (Bottom) widget",
   "shortName": "Digital clock Bottom Widget",
-  "version": "0.03",
-  "description": "Displays time in the bottom area.",
+  "version": "0.04",
+  "description": "Displays time in the bottom of the screen (may not be compatible with some apps)",
   "icon": "widclkbttm.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/widclkbttm/widclkbttm.wid.js b/apps/widclkbttm/widclkbttm.wid.js
index c27906786..c5e85318c 100644
--- a/apps/widclkbttm/widclkbttm.wid.js
+++ b/apps/widclkbttm/widclkbttm.wid.js
@@ -1,31 +1,16 @@
-(function() {
-  // don't show widget if we know we have a clock app running
-  if (Bangle.CLOCK) return;
-
-  let intervalRef = null;
-  var width = 5 * 6*2;
-  var text_color=0x07FF;//cyan 
-
-  function draw() {
-    g.reset().setFont("6x8", 2).setFontAlign(-1, 0).setColor(text_color);
-    var time = require("locale").time(new Date(),1);
-    g.drawString(time, this.x, this.y+11, true); // 5 * 6*2 = 60
+WIDGETS["wdclkbttm"]={area:"br",width:Bangle.CLOCK?0:60,draw:function() {
+  if (!Bangle.CLOCK == !this.width) { // if we're the wrong size for if we have a clock or not...
+    this.width = Bangle.CLOCK?0:60;
+    return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw
   }
-  function clearTimers(){
-    if(intervalRef) {
-      clearInterval(intervalRef);
-      intervalRef = null;
-    }
-  }
-  function startTimers(){
-    intervalRef = setInterval(()=>WIDGETS["wdclkbttm"].draw(), 60*1000);
-    WIDGETS["wdclkbttm"].draw();
-  }
-  Bangle.on('lcdPower', (on) => {
-    clearTimers();
-    if (on) startTimers();
-  });
-
-  WIDGETS["wdclkbttm"]={area:"br",width:width,draw:draw};
-  if (Bangle.isLCDOn) intervalRef = setInterval(()=>WIDGETS["wdclkbttm"].draw(), 60*1000);
-})()
+  if (!this.width) return; // if size not right, return
+  g.reset().setFont("6x8", 2).setFontAlign(-1, 0).setColor("#0ff"); // cyan
+  var time = require("locale").time(new Date(),1);
+  g.drawString(time, this.x, this.y+11, true); // 5 * 6*2 = 60
+  // queue draw in one minute
+  if (this.drawTimeout) clearTimeout(this.drawTimeout);
+  this.drawTimeout = setTimeout(()=>{
+    this.drawTimeout = undefined;
+    this.draw();
+  }, 60000 - (Date.now() % 60000));
+}};
diff --git a/apps/widclose/ChangeLog b/apps/widclose/ChangeLog
index 4be6afb16..1e0c86fc6 100644
--- a/apps/widclose/ChangeLog
+++ b/apps/widclose/ChangeLog
@@ -1 +1,2 @@
-0.01: New widget!
\ No newline at end of file
+0.01: New widget!
+0.02: allow turning on/off when quick-switching apps
diff --git a/apps/widclose/metadata.json b/apps/widclose/metadata.json
index e044a2d39..19009fd82 100644
--- a/apps/widclose/metadata.json
+++ b/apps/widclose/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widclose",
   "name": "Close Button",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A button to close the current app",
   "readme": "README.md",
   "icon": "icon.png",
diff --git a/apps/widclose/widget.js b/apps/widclose/widget.js
index 3a354018b..aeba1de00 100644
--- a/apps/widclose/widget.js
+++ b/apps/widclose/widget.js
@@ -1,14 +1,17 @@
-if (!Bangle.CLOCK) WIDGETS.close = {
-  area: "tr", width: 24, sortorder: 10, // we want the right-most spot please
+WIDGETS.close = {
+  area: "tr", width: Bangle.CLOCK?0:24, sortorder: 10, // we want the right-most spot please
   draw: function() {
-    Bangle.removeListener("touch", this.touch);
-    Bangle.on("touch", this.touch);
-    g.reset().setColor("#f00").drawImage(atob( // hardcoded red to match setUI back button
+    if (!Bangle.CLOCK == !this.width) { // if we're the wrong size for if we have a clock or not...
+      this.width = Bangle.CLOCK?0:24;
+      return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw
+    }
+    if (this.width) g.reset().setColor("#f00").drawImage(atob( // red to match setUI back button
       // b/w version of preview.png, 24x24
       "GBgBABgAAf+AB//gD//wH//4P//8P//8fn5+fjx+fxj+f4H+/8P//8P/f4H+fxj+fjx+fn5+P//8P//8H//4D//wB//gAf+AABgA"
     ), this.x, this.y);
-  }, touch: function(_, c) {
-    const w = WIDGETS.close;
-    if (w && c.x>=w.x && c.x<=w.x+24 && c.y>=w.y && c.y<=w.y+24) load();
+  }, touch: function(_, c) { // if touched
+    const w = WIDGETS.close; // if in range, go back to the clock
+    if (w && c.x>=w.x && c.x<w.x+w.width && c.y>=w.y && c.y<=w.y+24) load();
   }
-};
\ No newline at end of file
+};
+Bangle.on("touch", WIDGETS.close.touch);
diff --git a/apps/widcloselaunch/ChangeLog b/apps/widcloselaunch/ChangeLog
new file mode 100644
index 000000000..1e0c86fc6
--- /dev/null
+++ b/apps/widcloselaunch/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New widget!
+0.02: allow turning on/off when quick-switching apps
diff --git a/apps/widcloselaunch/README.md b/apps/widcloselaunch/README.md
new file mode 100644
index 000000000..1eb384ce1
--- /dev/null
+++ b/apps/widcloselaunch/README.md
@@ -0,0 +1,9 @@
+# Close Button Launcher
+
+Adds a ![X](preview.png) button to close the current app and go back to the launcher.
+(Widget is not visible on the clock screen)
+
+Copied from  widclose by @rigrig and slightly modified.
+
+![Light theme screenshot](screenshot_light.png)
+![Dark theme screenshot](screenshot_dark.png)
diff --git a/apps/widcloselaunch/icon.png b/apps/widcloselaunch/icon.png
new file mode 100644
index 000000000..1d95ba0ce
Binary files /dev/null and b/apps/widcloselaunch/icon.png differ
diff --git a/apps/widcloselaunch/metadata.json b/apps/widcloselaunch/metadata.json
new file mode 100644
index 000000000..b5c83e37e
--- /dev/null
+++ b/apps/widcloselaunch/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "widcloselaunch",
+  "name": "Close Button to launcher",
+  "version": "0.02",
+  "description": "A button to close the current app and go to launcher",
+  "readme": "README.md",
+  "icon": "icon.png",
+  "type": "widget",
+  "tags": "widget,tools",
+  "supports": ["BANGLEJS2"],
+  "screenshots": [{"url":"screenshot_light.png"},{"url":"screenshot_dark.png"}],
+  "storage": [
+    {"name":"widcloselaunch.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widcloselaunch/preview.png b/apps/widcloselaunch/preview.png
new file mode 100644
index 000000000..d90a3b4c5
Binary files /dev/null and b/apps/widcloselaunch/preview.png differ
diff --git a/apps/widcloselaunch/screenshot_dark.png b/apps/widcloselaunch/screenshot_dark.png
new file mode 100644
index 000000000..58067a3b9
Binary files /dev/null and b/apps/widcloselaunch/screenshot_dark.png differ
diff --git a/apps/widcloselaunch/screenshot_light.png b/apps/widcloselaunch/screenshot_light.png
new file mode 100644
index 000000000..32817ea8d
Binary files /dev/null and b/apps/widcloselaunch/screenshot_light.png differ
diff --git a/apps/widcloselaunch/widget.js b/apps/widcloselaunch/widget.js
new file mode 100644
index 000000000..2c9147d16
--- /dev/null
+++ b/apps/widcloselaunch/widget.js
@@ -0,0 +1,17 @@
+WIDGETS.close = {
+  area: "tr", width: Bangle.CLOCK?0:24, sortorder: 10, // we want the right-most spot please
+  draw: function() {
+    if (!Bangle.CLOCK == !this.width) { // if we're the wrong size for if we have a clock or not...
+      this.width = Bangle.CLOCK?0:24;
+      return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw
+    }
+    if (this.width) g.reset().setColor("#f00").drawImage(atob( // red to match setUI back button
+      // b/w version of preview.png, 24x24
+      "GBgBABgAAf+AB//gD//wH//4P//8P//8fn5+fjx+fxj+f4H+/8P//8P/f4H+fxj+fjx+fn5+P//8P//8H//4D//wB//gAf+AABgA"
+    ), this.x, this.y);
+  }, touch: function(_, c) {
+    const w = WIDGETS.close;
+    if (w && c.x>=w.x && c.x<w.x+w.width && c.y>=w.y && c.y<=w.y+24) Bangle.showLauncher();
+  }
+};
+Bangle.on("touch", WIDGETS.close.touch);
diff --git a/apps/widcw/ChangeLog b/apps/widcw/ChangeLog
index a4bc24d1a..07b8f7424 100644
--- a/apps/widcw/ChangeLog
+++ b/apps/widcw/ChangeLog
@@ -1 +1,2 @@
-0.01: First version
\ No newline at end of file
+0.01: First version
+0.02: Fix memory leak
\ No newline at end of file
diff --git a/apps/widcw/metadata.json b/apps/widcw/metadata.json
index 653b093ec..467ab1729 100644
--- a/apps/widcw/metadata.json
+++ b/apps/widcw/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widcw",
   "name": "Calendar Week Widget",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Widget which shows the current calendar week",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widcw/widget.js b/apps/widcw/widget.js
index ef43a4551..e33ad0aad 100644
--- a/apps/widcw/widget.js
+++ b/apps/widcw/widget.js
@@ -34,8 +34,8 @@
     }
     
     // redraw when date changes
-    setTimeout(()=>WIDGETS["widcw"].draw(), (86401 - Math.floor(date/1000) % 86400)*1000);
-    
+    if (WIDGETS["widcw"].to) clearTimeout(WIDGETS["widcw"].to);
+    WIDGETS["widcw"].to = setTimeout(()=>WIDGETS["widcw"].draw(), (86401 - Math.floor(date/1000) % 86400)*1000);
   }
 
   // add your widget
diff --git a/apps/widdst/ChangeLog b/apps/widdst/ChangeLog
index ec66c5568..e350137ee 100644
--- a/apps/widdst/ChangeLog
+++ b/apps/widdst/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial version
+0.02: Checks for correct firmware; E.setDST(...) moved to boot.js
diff --git a/apps/widdst/boot.js b/apps/widdst/boot.js
new file mode 100644
index 000000000..b0a844532
--- /dev/null
+++ b/apps/widdst/boot.js
@@ -0,0 +1,15 @@
+(() => {
+
+  if (E.setDST) {
+    var dstSettings = require('Storage').readJSON('widdst.json',1)||{};
+    if (dstSettings.has_dst) {
+      E.setDST(60*dstSettings.dst_size, 60*dstSettings.tz, dstSettings.dst_start.dow_number, dstSettings.dst_start.dow,
+        dstSettings.dst_start.month, dstSettings.dst_start.day_offset, 60*dstSettings.dst_start.at,
+        dstSettings.dst_end.dow_number, dstSettings.dst_end.dow, dstSettings.dst_end.month, dstSettings.dst_end.day_offset,
+        60*dstSettings.dst_end.at);
+    } else {
+      E.setDST(0,0,0,0,0,0,0,0,0,0,0,0);
+    }
+  }
+
+})()
diff --git a/apps/widdst/metadata.json b/apps/widdst/metadata.json
index 16cc6c94f..144c02998 100644
--- a/apps/widdst/metadata.json
+++ b/apps/widdst/metadata.json
@@ -1,14 +1,15 @@
 { "id": "widdst",
   "name": "Daylight Saving",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Widget to set daylight saving rules. Requires Espruino 2v14.49 or later - see the instructions below for more information.",
   "icon": "icon.png",
   "type": "widget",
   "tags": "widget,tool",
-  "supports" : ["BANGLEJS2"],
+  "supports" : ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"widdst.wid.js","url":"widget.js"},
+    {"name":"widdst.boot.js","url":"boot.js"},
     {"name":"widdst.settings.js","url":"settings.js"}
   ],
   "data": [{"name":"widdst.json"}]
diff --git a/apps/widdst/widget.js b/apps/widdst/widget.js
index f9a5b7f81..f690cc68f 100644
--- a/apps/widdst/widget.js
+++ b/apps/widdst/widget.js
@@ -40,26 +40,16 @@
       clear();
     }
   }
-  
-  function setDst() {
-    var dstSettings = require('Storage').readJSON('widdst.json',1)||{};
-    if (dstSettings.has_dst) {
-      E.setDST(60*dstSettings.dst_size, 60*dstSettings.tz, dstSettings.dst_start.dow_number, dstSettings.dst_start.dow,
-        dstSettings.dst_start.month, dstSettings.dst_start.day_offset, 60*dstSettings.dst_start.at,
-        dstSettings.dst_end.dow_number, dstSettings.dst_end.dow, dstSettings.dst_end.month, dstSettings.dst_end.day_offset,
-        60*dstSettings.dst_end.at);
-    } else {
-      E.setDST(0,0,0,0,0,0,0,0,0,0,0,0);
-    }
+
+  // Register ourselves
+  if (E.setDST) {
+    WIDGETS["widdst"] = {
+      area: "tl",
+      width: 0,
+      draw: draw
+    };
+  } else {
+    E.showAlert("Firmware update needed to support Daylight Saving Time");
   }
 
-  setDst();
-  
-  // Register ourselves
-  WIDGETS["widdst"] = {
-    area: "tl",
-    width: 0,
-    draw: draw
-  };
-
 })()
diff --git a/apps/widgps/ChangeLog b/apps/widgps/ChangeLog
index 0eb9e5692..b530843e7 100644
--- a/apps/widgps/ChangeLog
+++ b/apps/widgps/ChangeLog
@@ -4,3 +4,6 @@
 0.04: Show GPS fix status
 0.05: Don't poll for GPS status, override setGPSPower handler (fix #1456)
 0.06: Periodically update so the always on display does show current GPS fix
+0.07: Alternative marker icon (configurable via settings)
+0.08: Add ability to hide the icon when GPS is off, for a cleaner appearance.
+0.09: Do not take widget space if icon is hidden
diff --git a/apps/widgps/README.md b/apps/widgps/README.md
index 37e088bcf..98f0ba6f7 100644
--- a/apps/widgps/README.md
+++ b/apps/widgps/README.md
@@ -6,12 +6,22 @@ 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 but has no fix
-- Shows in green when the GPS is on and has a fix
 
+There are two icons which can be used to visualize the GPS/GNSS status:
+1. A cross colored depending on the GPS/GNSS status
+    - Shows in grey when the GPS is off
+    - Shows in amber when the GPS is on but has no fix
+    - Shows in green when the GPS is on and has a fix
+2. Different place markers depending on GPS/GNSS status
+
+You can also choose to hide the icon when the GPS is off in the settings.
+    
 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))
+
+Extended by khromov ([khromov](https://github.com/khromov))
+
+Place marker icons from [icons8.com](https://icons8.com/icon/set/maps/material-outlined).
diff --git a/apps/widgps/default.json b/apps/widgps/default.json
new file mode 100644
index 000000000..28482ddb0
--- /dev/null
+++ b/apps/widgps/default.json
@@ -0,0 +1 @@
+{"crossIcon": true, "hideWhenGpsOff": false}
\ No newline at end of file
diff --git a/apps/widgps/metadata.json b/apps/widgps/metadata.json
index b135c77bd..cfd35f5bb 100644
--- a/apps/widgps/metadata.json
+++ b/apps/widgps/metadata.json
@@ -1,14 +1,19 @@
 {
   "id": "widgps",
   "name": "GPS Widget",
-  "version": "0.06",
-  "description": "Tiny widget to show the power and fix status of the GPS",
+  "version": "0.09",
+  "description": "Tiny widget to show the power and fix status of the GPS/GNSS",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget,gps",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"widgps.wid.js","url":"widget.js"}
+    {"name":"widgps.wid.js","url":"widget.js"},
+    {"name":"widgps.default.json","url":"default.json"},
+    {"name":"widgps.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"widgps.json"}
   ]
 }
diff --git a/apps/widgps/settings.js b/apps/widgps/settings.js
new file mode 100644
index 000000000..7a1c186c9
--- /dev/null
+++ b/apps/widgps/settings.js
@@ -0,0 +1,32 @@
+(function(back) {
+function writeSettings(key, value) {
+  var s = require('Storage').readJSON(FILE, true) || {};
+  s[key] = value;
+  require('Storage').writeJSON(FILE, s);
+  readSettings();
+}
+
+function readSettings() {
+  settings = Object.assign(
+      require('Storage').readJSON("widgps.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {});
+}
+
+var FILE = "widgps.json";
+var settings;
+readSettings();
+
+var mainmenu = {
+  '' : {'title' : 'GPS widget'},
+  '< Back' : back,
+  "Cross icon" : {
+    value : settings.crossIcon ,
+      onchange : v => { writeSettings("crossIcon", v); }
+    },
+  "Hide icon when GPS off" : {
+      value : settings.hideWhenGpsOff ,
+        onchange : v => { writeSettings("hideWhenGpsOff", v); }
+      },
+};
+E.showMenu(mainmenu);
+});
\ No newline at end of file
diff --git a/apps/widgps/widget.js b/apps/widgps/widget.js
index 206096013..73351eaa6 100644
--- a/apps/widgps/widget.js
+++ b/apps/widgps/widget.js
@@ -1,36 +1,85 @@
-(function(){
-  var interval;
+(function() {
 
-  // override setGPSPower so we know if GPS is on or off
-  var oldSetGPSPower = Bangle.setGPSPower;
-  Bangle.setGPSPower = function(on,id) {
-    var isGPSon = oldSetGPSPower(on,id);
-    WIDGETS.gps.draw();
-    return isGPSon;
-  }
+let settings = Object.assign(
+      require('Storage').readJSON("widgps.default.json", true) || {},
+      require('Storage').readJSON("widgps.json", true) || {}
+);
 
-  WIDGETS.gps={area:"tr",width:24,draw:function() {
+var interval;
+
+// override setGPSPower so we know if GPS is on or off
+var oldSetGPSPower = Bangle.setGPSPower;
+Bangle.setGPSPower = function(on, id) {
+  var isGPSon = oldSetGPSPower(on, id);
+  WIDGETS.gps.width = !isGPSon && settings.hideWhenGpsOff ? 0 : 24;
+  Bangle.drawWidgets();
+  return isGPSon;
+};
+
+WIDGETS.gps = {
+  area : "tr",
+  width : !Bangle.isGPSOn() && settings.hideWhenGpsOff ? 0 : 24,
+  draw : function() {
     g.reset();
-    if (Bangle.isGPSOn()) {
-      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
-    }
 
     // check if we need to update the widget periodically
     if (Bangle.isGPSOn() && interval === undefined) {
-      interval = setInterval(function() {
-        WIDGETS.gps.draw(WIDGETS.gps);
-      }, 10*1000); // update every 10 seconds to show gps fix/no fix
+      interval = setInterval(
+          function() { WIDGETS.gps.draw(WIDGETS.gps); },
+          10 * 1000); // update every 10 seconds to show gps fix/no fix
     } else if (!Bangle.isGPSOn() && interval !== undefined) {
       clearInterval(interval);
       interval = undefined;
     }
-    g.drawImage(atob("GBiBAAAAAAAAAAAAAA//8B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+A//8AAAAAAAAAAAAA=="), this.x, 2+this.y);
-  }};
+    if (settings.crossIcon) {
+      if (Bangle.isGPSOn()) {
+        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
+        }
+
+        g.drawImage(
+          atob(
+              "GBiBAAAAAAAAAAAAAA//8B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+A//8AAAAAAAAAAAAA=="),
+          this.x, 2 + this.y);
+
+      } else {
+        if(!settings.hideWhenGpsOff) {
+          g.setColor("#888"); // off = grey
+
+          g.drawImage(
+            atob(
+                "GBiBAAAAAAAAAAAAAA//8B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+A//8AAAAAAAAAAAAA=="),
+            this.x, 2 + this.y);
+        }
+      }
+
+    } else { // marker icons
+      if (Bangle.isGPSOn()) {  
+        const gpsObject = Bangle.getGPSFix();
+        if (gpsObject && gpsObject.fix > 0) {
+          // on and has fix
+           g.drawImage(
+                atob("GBiBAAAAAAAAAAB+AAD/AAHDgAMAwAcAwAY8YAY8YAY8YAY8YAMAwAMAwAOBwAGBgAHDgADDAABmAAB+AAA8AAAYAAAAAAAAAAAAAA=="),
+                this.x, 2 + this.y);
+
+        } else {
+          // GNSS on but no fix
+           g.drawImage(
+                atob("GBiBAAAAAAAAAAh+AA3/gA+B4A8AcA+AMAA8GAB+GADnDADDDADDDDDDADBmADB+ABg8ABgYAAwB8A4A8AeB8AH/sAB+EAAAAAAAAA=="),
+                this.x, 2 + this.y);
+        }
+      } else {
+        // GNSS off
+        if(!settings.hideWhenGpsOff) {
+          g.drawImage(
+                atob("GBiBAAAAAAAAAAB+ABj/ABxDgA4AwAcAwAeMYAfEYAbgYAZwYAM4wAMcQAOOAAGHAAHDgADDwABm4AB+cAA8OAAYGAAAAAAAAAAAAA=="),
+                this.x, 2 + this.y);
+        }
+      }
+    }
+  }
+};
 })();
diff --git a/apps/widmeda/ChangeLog b/apps/widmeda/ChangeLog
new file mode 100644
index 000000000..7415150e6
--- /dev/null
+++ b/apps/widmeda/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial Medical Alert Widget!
diff --git a/apps/widmeda/README.md b/apps/widmeda/README.md
new file mode 100644
index 000000000..0bbfc4dc3
--- /dev/null
+++ b/apps/widmeda/README.md
@@ -0,0 +1,23 @@
+# Medical Alert Widget
+
+Shows a medical alert logo in the top right widget area, and a medical alert message in the bottom widget area.
+
+**Note:** this is not a replacement for a medical alert band but hopefully a useful addition.
+
+## Features
+
+Implemented:
+
+- Basic medical alert logo and message
+- Only display bottom widget on clocks
+- High contrast colours depending on theme
+
+Future:
+
+- Configure when to show bottom widget (always/never/clocks)
+- Configure medical alert text
+- Show details when touched
+
+## Creator
+
+James Taylor ([jt-nti](https://github.com/jt-nti))
diff --git a/apps/widmeda/metadata.json b/apps/widmeda/metadata.json
new file mode 100644
index 000000000..346306b8e
--- /dev/null
+++ b/apps/widmeda/metadata.json
@@ -0,0 +1,15 @@
+{ "id": "widmeda",
+  "name": "Medical Alert Widget",
+  "shortName":"Medical Alert",
+  "version":"0.01",
+  "description": "Display a medical alert in the bottom widget section.",
+  "icon": "widget.png",  
+  "type": "widget",
+  "tags": "health,medical,tools,widget",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "screenshots": [{"url":"screenshot_light.png"}],
+  "storage": [
+    {"name":"widmeda.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widmeda/screenshot_light.png b/apps/widmeda/screenshot_light.png
new file mode 100644
index 000000000..bf92d753d
Binary files /dev/null and b/apps/widmeda/screenshot_light.png differ
diff --git a/apps/widmeda/widget.js b/apps/widmeda/widget.js
new file mode 100644
index 000000000..a2d109596
--- /dev/null
+++ b/apps/widmeda/widget.js
@@ -0,0 +1,30 @@
+(() => {
+  // Top right star of life logo
+  WIDGETS["widmedatr"]={
+    area: "tr",
+    width: 24,
+    draw: function() {
+      g.reset();
+      g.setColor("#f00");
+      g.drawImage(atob("FhYBAAAAA/AAD8AAPwAc/OD/P8P8/x/z/n+/+P5/wP58A/nwP5/x/v/n/P+P8/w/z/Bz84APwAA/AAD8AAAAAA=="), this.x + 1, this.y + 1);
+    }
+  };
+
+  // Bottom medical alert message
+  WIDGETS["widmedabl"]={
+    area: "bl",
+    width: Bangle.CLOCK?Bangle.appRect.w:0,
+    draw: function() {
+      // Only show the widget on clocks
+      if (!Bangle.CLOCK) return;
+
+      g.reset();
+      g.setBgColor(g.theme.dark ? "#fff" : "#f00");
+      g.setColor(g.theme.dark ? "#f00" : "#fff");
+      g.setFont("Vector",18);
+      g.setFontAlign(0,0);
+      g.clearRect(this.x, this.y, this.x + this.width - 1, this.y + 23);
+      g.drawString("MEDICAL ALERT", this.width / 2, this.y + ( 23 / 2 ));
+    }
+  };
+})();
diff --git a/apps/widmeda/widget.png b/apps/widmeda/widget.png
new file mode 100644
index 000000000..249bf15bf
Binary files /dev/null and b/apps/widmeda/widget.png differ
diff --git a/apps/widmsggrid/ChangeLog b/apps/widmsggrid/ChangeLog
new file mode 100644
index 000000000..4be6afb16
--- /dev/null
+++ b/apps/widmsggrid/ChangeLog
@@ -0,0 +1 @@
+0.01: New widget!
\ No newline at end of file
diff --git a/apps/widmsggrid/README.md b/apps/widmsggrid/README.md
new file mode 100644
index 000000000..86a80c403
--- /dev/null
+++ b/apps/widmsggrid/README.md
@@ -0,0 +1,28 @@
+# Messages Grid Widget
+
+Widget that displays multiple notification icons in a grid.
+The widget has a fixed size: if there are multiple notifications it uses smaller
+icons.
+It shows a single icon per application, so if you have two SMS messages, the
+grid only has one SMS icon.
+If there are multiple messages waiting, the total number is shown in the 
+bottom-right corner.
+
+Example: one SMS, one Signal, and two WhatsApp messages:
+![screenshot](screenshot.png)
+
+## Installation
+This widget needs the [`messages`](/?id=messages) app to handle notifications.
+
+You probably want to disable the default widget, to do so:
+1. Open `Settings`
+2. Navigate to `Apps`>`Messages`
+3. Scroll down to the `Widget messages` entry, and change it to `Hide`
+
+## Settings
+This widget uses the `Widget` settings from the `messages` app:
+
+### Widget
+* `Flash icon` Toggle flashing of the widget icons.
+<!-- * `Show read` - Also show the widget when there are only old messages. -->
+* `Widget messages` Not used by this widget, but you should select `Hide` to hide the default widget.
\ No newline at end of file
diff --git a/apps/widmsggrid/metadata.json b/apps/widmsggrid/metadata.json
new file mode 100644
index 000000000..b624f5c23
--- /dev/null
+++ b/apps/widmsggrid/metadata.json
@@ -0,0 +1,16 @@
+{
+  "id": "widmsggrid",
+  "name": "Messages Grid Widget",
+  "version": "0.01",
+  "description": "Widget that display notification icons in a grid",
+  "icon": "widget.png",
+  "type": "widget",
+  "dependencies": {"messages":"app"},
+  "tags": "tool,system",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"widmsggrid.wid.js","url":"widget.js"}
+  ],
+  "screenshots": [{"url":"screenshot.png"}]
+}
diff --git a/apps/widmsggrid/screenshot.png b/apps/widmsggrid/screenshot.png
new file mode 100644
index 000000000..b1cdb2a5a
Binary files /dev/null and b/apps/widmsggrid/screenshot.png differ
diff --git a/apps/widmsggrid/widget.js b/apps/widmsggrid/widget.js
new file mode 100644
index 000000000..7c5882e6c
--- /dev/null
+++ b/apps/widmsggrid/widget.js
@@ -0,0 +1,92 @@
+(function () {
+  if (global.MESSAGES) return; // don't load widget while in the app
+  let settings = require('Storage').readJSON("messages.settings.json", true) || {};
+  const s = {
+    flash: (settings.flash === undefined) ? true : !!settings.flash,
+    showRead: !!settings.showRead,
+  };
+  delete settings;
+  WIDGETS["msggrid"] = {
+    area: "tl", width: 0,
+    flash: s.flash,
+    showRead: s.showRead,
+    init: function() {
+      // runs on first draw
+      delete w.init; // don't run again
+      Bangle.on("touch", w.touch);
+      Bangle.on("message", w.listener);
+      w.listener(); // update status now
+    },
+    draw: function () {
+      if (w.init) w.init();
+      // If we had a setTimeout queued from the last time we were called, remove it
+      if (w.t) {
+        clearTimeout(w.t);
+        delete w.t;
+      }
+      if (!w.width) return;
+      const b = w.flash && w.status === "new" && ((Date.now() / 1000) & 1), // Blink(= inverse colors) on this second?
+        // show multiple icons in a grid, by scaling them down
+        cols = Math.ceil(Math.sqrt(w.srcs.length - 0.1)); // cols===rows, -0.1 to work around rounding error
+      g.reset().clearRect(w.x, w.y, w.x + w.width - 1, w.y + 24)
+        .setClipRect(w.x, w.y, w.x + w.width - 1, w.y + 24); // guard against oversized icons
+      let r = 0, c = 0; // row, column
+      const offset = pos => Math.floor(pos / cols * 24); // pixel offset for position in row/column
+      w.srcs.forEach(src => {
+        const appColor = require("messages").getMessageImageCol(src, require("messages").getMessageImageCol("alert"));
+        let colors = [g.theme.bg, g.setColor(appColor).getColor()];
+        if (b) {
+          if (colors[1] == g.theme.fg) colors = colors.reverse();
+          else colors[1] = g.theme.fg;
+        }
+        g.setColor(colors[1]).setBgColor(colors[0]);
+        g.drawImage(require("messages").getMessageImage(src, "alert"), w.x+offset(c), w.y+offset(r), { scale: 1 / cols });
+        if (++c >= cols) {
+          c = 0;
+          r++;
+        }
+      });
+      if (w.total > 1) {
+        // show total number of messages in bottom-right corner
+        g.reset();
+        if (w.total < 10) g.fillCircle(w.x + w.width - 5, w.y + 20, 4); // single digits get a round background, double digits fill their rectangle
+        g.setColor(g.theme.bg).setBgColor(g.theme.fg)
+          .setFont('6x8').setFontAlign(1, 1)
+          .drawString(w.total, w.x + w.width - 1, w.y + 24, w.total > 9);
+      }
+      if (w.flash && w.status === "new") w.t = setTimeout(w.draw, 1000); // schedule redraw while blinking
+    }, show: function () {
+      w.width = 24;
+      w.srcs = require("messages").getMessages()
+        .filter(m => !['call', 'map', 'music'].includes(m.id))
+        .filter(m => m.new || w.showRead)
+        .map(m => m.src);
+      w.total = w.srcs.length;
+      w.srcs = w.srcs.filter((src, i, uniq) => uniq.indexOf(src) === i); // keep unique entries only
+      Bangle.drawWidgets();
+      Bangle.setLCDPower(1); // turns screen on
+    }, hide: function () {
+      w.width = 0;
+      w.srcs = [];
+      w.total = 0;
+      Bangle.drawWidgets();
+    }, touch: function (b, c) {
+      if (!w || !w.width) return; // widget not shown
+      if (process.env.HWVERSION < 2) {
+        // Bangle.js 1: open app when on clock we touch the side with widget
+        if (!Bangle.CLOCK) return;
+        const m = Bangle.appRect / 2;
+        if ((w.x < m && b !== 1) || (w.x > m && b !== 2)) return;
+      }
+      // Bangle.js 2: open app when touching the widget
+      else if (c.x < w.x || c.x > w.x + w.width || c.y < w.y || c.y > w.y + 24) return;
+      load("messages.app.js");
+    }, listener: function () {
+      w.status = require("messages").status();
+      if (w.status === "new" || (w.status === "old" && w.showRead)) w.show();
+      else w.hide();
+    }
+  };
+  delete s;
+  const w = WIDGETS["msggrid"];
+})();
\ No newline at end of file
diff --git a/apps/widmsggrid/widget.png b/apps/widmsggrid/widget.png
new file mode 100644
index 000000000..ce6e7b7ac
Binary files /dev/null and b/apps/widmsggrid/widget.png differ
diff --git a/apps/widram/ChangeLog b/apps/widram/ChangeLog
index e7b406081..7b00c8a48 100644
--- a/apps/widram/ChangeLog
+++ b/apps/widram/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New Widget!
 0.02: Now also visible on Bangle.js 2
+0.03: Remove global declaration of BANGLEJS2 var (fix #2123)
diff --git a/apps/widram/metadata.json b/apps/widram/metadata.json
index 19ae6d311..ebf23742b 100644
--- a/apps/widram/metadata.json
+++ b/apps/widram/metadata.json
@@ -2,7 +2,7 @@
   "id": "widram",
   "name": "RAM Widget",
   "shortName": "RAM Widget",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Display your Bangle's RAM usage percentage in a widget",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widram/widget.js b/apps/widram/widget.js
index 210c85357..07b7c0a5f 100644
--- a/apps/widram/widget.js
+++ b/apps/widram/widget.js
@@ -1,6 +1,6 @@
 (() => {
   function draw() {
-    BANGLEJS2 = process.env.HWVERSION==2;
+    const BANGLEJS2 = process.env.HWVERSION==2;
     g.reset();
     var m = process.memory();
     var percent = Math.round(m.usage*100/m.total);
diff --git a/apps/wpmoto/ChangeLog b/apps/wpmoto/ChangeLog
index 84e7affed..63f4bf24c 100644
--- a/apps/wpmoto/ChangeLog
+++ b/apps/wpmoto/ChangeLog
@@ -1,2 +1,4 @@
 ...
 0.02: First update with ChangeLog Added
+0.03: Move waypoints.json (and editor) to 'waypoints' app
+0.04: Added adjustment for Bangle.js magnetometer heading fix
diff --git a/apps/wpmoto/app.js b/apps/wpmoto/app.js
index 7deacb6ca..f08cb8279 100644
--- a/apps/wpmoto/app.js
+++ b/apps/wpmoto/app.js
@@ -1,6 +1,6 @@
 var loc = require("locale");
 
-var waypoints = require("Storage").readJSON("waypoints.json") || [];
+var waypoints = require("waypoints").load();
 var wp = waypoints[0];
 if (wp == undefined) wp = {name:"NONE"};
 var wp_bearing = 0;
@@ -134,7 +134,7 @@ function read_heading() {
     Bangle.setCompassPower(1);
     var d = 0;
     var m = Bangle.getCompass();
-    if (!isNaN(m.heading)) d = -m.heading;
+    if (!isNaN(m.heading)) d = m.heading;
     heading = d;
   }
 
@@ -196,7 +196,7 @@ function addCurrentWaypoint() {
 }
 
 function saveWaypoints() {
-  require("Storage").writeJSON("waypoints.json", waypoints);
+  require("waypoints").save(waypoints);
 }
 
 function deleteWaypoint(w) {
diff --git a/apps/wpmoto/metadata.json b/apps/wpmoto/metadata.json
index f562b23ba..32c41d757 100644
--- a/apps/wpmoto/metadata.json
+++ b/apps/wpmoto/metadata.json
@@ -2,17 +2,16 @@
   "id": "wpmoto",
   "name": "Waypointer Moto",
   "shortName": "Waypointer Moto",
-  "version": "0.02",
+  "version": "0.04",
   "description": "Waypoint-based motorcycle navigation aid",
   "icon": "wpmoto.png",
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot-menu.png"},{"url":"screenshot-delete.png"}],
   "readme": "README.md",
-  "interface": "wpmoto.html",
+  "dependencies" : { "waypoints":"type" },
   "storage": [
     {"name":"wpmoto.app.js","url":"app.js"},
     {"name":"wpmoto.img","url":"icon.js","evaluate":true}
-  ],
-  "data": [{"name":"waypoints.json","url":"waypoints.json"}]
+  ]
 }
diff --git a/apps/wpmoto/waypoints.json b/apps/wpmoto/waypoints.json
deleted file mode 100644
index 8a4ab83b8..000000000
--- a/apps/wpmoto/waypoints.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  {
-  "name":"NONE"
-  },
-]
diff --git a/backup.js b/backup.js
index 8a894666e..06d98a366 100644
--- a/backup.js
+++ b/backup.js
@@ -101,6 +101,7 @@ function bangleUpload() {
       return Comms.showMessage(`Restoring...`); })
     .then(() => Comms.write("\x10"+Comms.getProgressCmd()+"\n"))
     .then(() => Comms.uploadCommandList(cmds, 0, cmds.length))
+    .then(() => getInstalledApps(true))
     .then(() => Comms.showMessage(Const.MESSAGE_RELOAD))
     .then(() => {
       Progress.hide({sticky:true});
diff --git a/bin/apploader.js b/bin/apploader.js
index 427a0ef99..26c4c1f09 100755
--- a/bin/apploader.js
+++ b/bin/apploader.js
@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env node
 /* Simple Command-line app loader for Node.js
 ===============================================
 
@@ -8,35 +8,44 @@ as a normal dependency) because we want `sanitycheck.js`
 to be able to run *quickly* in travis for every commit,
 and we don't want NPM pulling in (and compiling native modules)
 for Noble.
+
 */
 
 var SETTINGS = {
   pretokenise : true
 };
 var APPSDIR = __dirname+"/../apps/";
-var Utils = require("../core/js/utils.js");
-var AppInfo = require("../core/js/appinfo.js");
 var noble;
-try {
-  noble  = require('@abandonware/noble');
-} catch (e) {}
-if (!noble) try {
-  noble  = require('noble');
-} catch (e) { }
+["@abandonware/noble", "noble"].forEach(module => {
+  if (!noble) try {
+    noble = require(module);
+  } catch(e) {
+    if (e.code !== 'MODULE_NOT_FOUND') {
+      throw e;
+    }
+  }
+});
 if (!noble) {
   console.log("You need to:")
   console.log("  npm install @abandonware/noble")
   console.log("or:")
   console.log("  npm install noble")
+  process.exit(1);
 }
-
-var apps = [];
-
 function ERROR(msg) {
   console.error(msg);
   process.exit(1);
 }
 
+//eval(require("fs").readFileSync(__dirname+"../core/js/utils.js"));
+var AppInfo = require("../core/js/appinfo.js");
+global.Const = {
+  /* Are we only putting a single app on a device? If so
+  apps should all be saved as .bootcde and we write info
+  about the current app into app.info */
+  SINGLE_APP_ONLY : false,
+};
+var deviceId = "BANGLEJS2";
 var apps = [];
 var dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
 dirs.forEach(dir => {
@@ -54,6 +63,10 @@ dirs.forEach(dir => {
 
 var args = process.argv;
 
+var bangleParam = args.findIndex(arg => /-b\d/.test(arg));
+if (bangleParam!==-1) {
+  deviceId = "BANGLEJS"+args.splice(bangleParam, 1)[0][2];
+}
 if (args.length==3 && args[2]=="list") cmdListApps();
 else if (args.length==3 && args[2]=="devices") cmdListDevices();
 else if (args.length==4 && args[2]=="install") cmdInstallApp(args[3]);
@@ -68,7 +81,10 @@ apploader.js list
   - list available apps
 apploader.js devices
   - list available device addresses
-apploader.js install appname [de:vi:ce:ad:dr:es]
+apploader.js install [-b1] appname [de:vi:ce:ad:dr:es]
+
+NOTE: By default this App Loader expects the device it uploads to
+(deviceId) to be BANGLEJS2, pass '-b1' for it to work with Bangle.js 1
 `);
 process.exit(0);
 }
@@ -104,7 +120,10 @@ function cmdInstallApp(appId, deviceAddress) {
     fileGetter:function(url) {
       console.log(__dirname+"/"+url);
       return Promise.resolve(require("fs").readFileSync(__dirname+"/../"+url).toString("binary"));
-    }, settings : SETTINGS}).then(files => {
+    },
+    settings : SETTINGS,
+    device : { id : deviceId }
+  }).then(files => {
     //console.log(files);
     var command = files.map(f=>f.cmd).join("\n")+"\n";
     bangleSend(command, deviceAddress).then(() => process.exit(0));
diff --git a/bin/create_app_supports_field.js b/bin/create_app_supports_field.js
index d6aada357..24d6694f2 100644
--- a/bin/create_app_supports_field.js
+++ b/bin/create_app_supports_field.js
@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /* Quick hack to add proper 'supports' field to apps.json
 */
 
diff --git a/bin/create_apps_json.sh b/bin/create_apps_json.sh
index 30c58bc93..c9f310e57 100755
--- a/bin/create_apps_json.sh
+++ b/bin/create_apps_json.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # ================================================================
 # apps.json used to contain the metadata for every app. Now the
 # metadata is stored in each apps's directory - app/yourapp/metadata.js
diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
index 1c2d9cb77..1dc5ec073 100755
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /*
 Mashes together a bunch of different apps to make
 a single firmware JS file which can be uploaded.
diff --git a/bin/firmwaremaker_c.js b/bin/firmwaremaker_c.js
index 4aa8e087f..87065dab4 100755
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /*
 Mashes together a bunch of different apps into a big binary blob.
 We then store this *inside* the Bangle.js firmware and can use it
diff --git a/bin/pre-publish.sh b/bin/pre-publish.sh
index ee73968d7..710160ded 100755
--- a/bin/pre-publish.sh
+++ b/bin/pre-publish.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cd `dirname $0`/..
 nodejs bin/sanitycheck.js || exit 1
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 53ef3403d..c7dbb0d03 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /* Checks for any obvious problems in apps.json
 */
 
@@ -30,7 +30,11 @@ function ERROR(msg, opt) {
 function WARN(msg, opt) {
   // file=app.js,line=1,col=5,endColumn=7
   opt = opt||{};
-  console.log(`::warning${Object.keys(opt).length?" ":""}${Object.keys(opt).map(k=>k+"="+opt[k]).join(",")}::${msg}`);
+  if (KNOWN_WARNINGS.includes(msg)) {
+    console.log(`Known warning : ${msg}`);
+  } else {
+    console.log(`::warning${Object.keys(opt).length?" ":""}${Object.keys(opt).map(k=>k+"="+opt[k]).join(",")}::${msg}`);
+  }
   warningCount++;
 }
 
@@ -74,13 +78,22 @@ const APP_KEYS = [
   'supports', 'allow_emulator',
   'dependencies'
 ];
-const STORAGE_KEYS = ['name', 'url', 'content', 'evaluate', 'noOverwite', 'supports'];
+const STORAGE_KEYS = ['name', 'url', 'content', 'evaluate', 'noOverwite', 'supports', 'noOverwrite'];
 const DATA_KEYS = ['name', 'wildcard', 'storageFile', 'url', 'content', 'evaluate'];
 const SUPPORTS_DEVICES = ["BANGLEJS","BANGLEJS2"]; // device IDs allowed for 'supports'
-const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","textinput","scheduler","notify","locale","settings"]; // values allowed for "type" field
+const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","textinput","scheduler","notify","locale","settings","waypoints"]; // values allowed for "type" field
 const FORBIDDEN_FILE_NAME_CHARS = /[,;]/; // used as separators in appid.info
 const VALID_DUPLICATES = [ '.tfmodel', '.tfnames' ];
 const GRANDFATHERED_ICONS = ["s7clk",  "snek", "astral", "alpinenav", "slomoclock", "arrow", "pebble", "rebble"];
+const INTERNAL_FILES_IN_APP_TYPE = { // list of app types and files they SHOULD provide...
+  'textinput' : ['textinput'],
+  'waypoints' : ['waypoints'],
+  // notify?
+};
+/* These are warnings we know about but don't want in our output */
+var KNOWN_WARNINGS = [
+"App gpsrec data file wildcard .gpsrc? does not include app ID"
+];
 
 function globToRegex(pattern) {
   const ESCAPE = '.*+-?^${}()|[]\\';
@@ -163,6 +176,7 @@ apps.forEach((app,appIdx) => {
     } else
       ERROR(`App ${app.id} 'dependencies' must be an object`, {file:metadataFile});
   }
+  
   var fileNames = [];
   app.storage.forEach((file) => {
     if (!file.name) ERROR(`App ${app.id} has a file with no name`, {file:metadataFile});
@@ -179,7 +193,12 @@ apps.forEach((app,appIdx) => {
           ERROR(`App ${app.id} file ${file.name} has unknown device in 'supports' field - ${dev}`, {file:metadataFile});
       });
     fileNames.push(file.name);
-    allFiles.push({app: app.id, file: file.name});
+    var fileInternal = false;
+    if (app.type && INTERNAL_FILES_IN_APP_TYPE[app.type]) {
+      if (INTERNAL_FILES_IN_APP_TYPE[app.type].includes(file.name))
+        fileInternal = true;
+    }
+    allFiles.push({app: app.id, file: file.name, internal:fileInternal});
     if (file.url) if (!fs.existsSync(appDir+file.url)) ERROR(`App ${app.id} file ${file.url} doesn't exist`, {file:metadataFile});
     if (!file.url && !file.content && !app.custom) ERROR(`App ${app.id} file ${file.name} has no contents`, {file:metadataFile});
     var fileContents = "";
@@ -214,6 +233,13 @@ apps.forEach((app,appIdx) => {
         console.log("=====================================================");
         ERROR(`App ${app.id}'s ${file.name} is a JS file but isn't valid JS`, {file:appDirRelative+file.url});
       }
+      // clock app checks
+      if (app.type=="clock") {
+        var a = fileContents.indexOf("Bangle.loadWidgets()");
+        var b = fileContents.indexOf("Bangle.setUI(");        
+        if (a>=0 && b>=0 && a<b)
+          WARN(`Clock ${app.id} file calls loadWidgets before setUI (clock widget/etc won't be aware a clock app is running)`, {file:appDirRelative+file.url, line : fileContents.substr(0,a).split("\n").length});
+      }
     }
     for (const key in file) {
       if (!STORAGE_KEYS.includes(key)) ERROR(`App ${app.id} file ${file.name} has unknown key ${key}`, {file:appDirRelative+file.url});
@@ -294,6 +320,12 @@ apps.forEach((app,appIdx) => {
   for (const key in app) {
     if (!APP_KEYS.includes(key)) ERROR(`App ${app.id} has unknown key ${key}`, {file:metadataFile});
   }
+  if (app.type && INTERNAL_FILES_IN_APP_TYPE[app.type]) {
+    INTERNAL_FILES_IN_APP_TYPE[app.type].forEach(fileName => {
+      if (!fileNames.includes(fileName))
+        ERROR(`App ${app.id} should include file named ${fileName} but it doesn't`, {file:metadataFile});
+    });
+  }
 });
 
 
@@ -313,7 +345,7 @@ while(fileA=allFiles.pop()) {
     if (globA.test(nameB)||globB.test(nameA)) {
       if (isGlob(nameA)||isGlob(nameB))
         ERROR(`App ${fileB.app} ${typeB} file ${nameB} matches app ${fileA.app} ${typeB} file ${nameA}`);
-      else if (fileA.app != fileB.app)
+      else if (fileA.app != fileB.app && (!fileA.internal) && (!fileB.internal))
         WARN(`App ${fileB.app} ${typeB} file ${nameB} is also listed as ${typeA} file for app ${fileA.app}`);
     }
   })
diff --git a/bin/thumbnailer.js b/bin/thumbnailer.js
index b6862741a..0895098e9 100755
--- a/bin/thumbnailer.js
+++ b/bin/thumbnailer.js
@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 
 /*
 var EMULATOR = "banglejs2";
@@ -37,7 +37,8 @@ var SETTINGS = {
 var Const = {
 };
 module = undefined;
-eval(require("fs").readFileSync(__dirname + "/../core/lib/espruinotools.js").toString());
+var Espruino = require(__dirname + "/../core/lib/espruinotools.js");
+//eval(require("fs").readFileSync(__dirname + "/../core/lib/espruinotools.js").toString());
 eval(require("fs").readFileSync(__dirname + "/../core/js/utils.js").toString());
 eval(require("fs").readFileSync(__dirname + "/../core/js/appinfo.js").toString());
 var apps = JSON.parse(require("fs").readFileSync(__dirname+"/../apps.json"));
@@ -78,7 +79,7 @@ function getThumbnail(appId, imageFn) {
       settings : SETTINGS,
       device : { id : DEVICEID }
       }).then(files => {
-        console.log("AppInfo returned");//, files);
+        console.log(`AppInfo returned for ${appId}`);//, files);
         flashMemory.set(factoryFlashMemory);
         jsTransmitString("reset()\n");
         console.log("Uploading...");
@@ -88,6 +89,7 @@ function getThumbnail(appId, imageFn) {
         appLog = "";
         jsTransmitString(command);
         console.log("Done.");
+        jsTransmitString("Bangle.setLCDMode();clearInterval();clearTimeout();\n");
         jsStopIdle();
 
         var rgba = new Uint8Array(GFX_WIDTH*GFX_HEIGHT*4);
@@ -96,7 +98,7 @@ function getThumbnail(appId, imageFn) {
         var firstPixel = rgba32[0];
         var blankImage = rgba32.every(col=>col==firstPixel)
 
-        if (appLog.indexOf("Uncaught")>=0)
+        if (appLog.replace("Uncaught Storage Updated!", "").indexOf("Uncaught")>=0)
           erroredApps.push( { id : app.id, log : appLog } );
 
         if (!blankImage) {
diff --git a/core b/core
index c46b4edd2..87cf54203 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c46b4edd2052d0df37fea41f8839af8175a78ec9
+Subproject commit 87cf5420322cd78a13e3d2b76cd12c9fdbddc7d2
diff --git a/css/main.css b/css/main.css
index 96a102119..ceb9fcd17 100644
--- a/css/main.css
+++ b/css/main.css
@@ -30,7 +30,7 @@
 }
 
 a.mr-2{
-  display: flex; 
+  display: flex;
   align-items: center;
 }
 
@@ -102,12 +102,23 @@ a.btn.btn-link.dropdown-toggle {
   content: url("data:image/svg+xml,%3Csvg fill='rgb(87, 85, 217)' xmlns='http://www.w3.org/2000/svg' viewBox='4 4 40 40' width='1em' height='1em'%3E%3Cpath d='M 8.5 5 C 6.0324991 5 4 7.0324991 4 9.5 L 4 30.5 C 4 32.967501 6.0324991 35 8.5 35 L 17 35 L 17 40 L 13.5 40 A 1.50015 1.50015 0 1 0 13.5 43 L 18.253906 43 A 1.50015 1.50015 0 0 0 18.740234 43 L 29.253906 43 A 1.50015 1.50015 0 0 0 29.740234 43 L 34.5 43 A 1.50015 1.50015 0 1 0 34.5 40 L 31 40 L 31 35 L 39.5 35 C 41.967501 35 44 32.967501 44 30.5 L 44 9.5 C 44 7.0324991 41.967501 5 39.5 5 L 8.5 5 z M 8.5 8 L 39.5 8 C 40.346499 8 41 8.6535009 41 9.5 L 41 30.5 C 41 31.346499 40.346499 32 39.5 32 L 29.746094 32 A 1.50015 1.50015 0 0 0 29.259766 32 L 18.746094 32 A 1.50015 1.50015 0 0 0 18.259766 32 L 8.5 32 C 7.6535009 32 7 31.346499 7 30.5 L 7 9.5 C 7 8.6535009 7.6535009 8 8.5 8 z M 17.5 12 C 16.136406 12 15 13.136406 15 14.5 L 15 25.5 C 15 26.863594 16.136406 28 17.5 28 L 30.5 28 C 31.863594 28 33 26.863594 33 25.5 L 33 14.5 C 33 13.136406 31.863594 12 30.5 12 L 17.5 12 z M 18 18 L 30 18 L 30 25 L 18 25 L 18 18 z M 20 35 L 28 35 L 28 40 L 20 40 L 20 35 z'/%3E%3C/svg%3E");
 }
 .icon.icon-favourite { text-indent: 0px; } /*override spectre*/
+.icon.icon-favourite-active { text-indent: 0px; } /*override spectre*/
 .icon.icon-favourite::before {
-  content: "\02661"; /* 0x2661 = empty heart; 0x2606 = empty star */
+  content: url("data:image/svg+xml,%3Csvg fill='rgb(255, 0, 0)' xmlns='http://www.w3.org/2000/svg' viewBox='0 -3 50 47' width='1.5em' height='1.5em'%3E%3Cpath d='M 16.375 9 C 10.117188 9 5 14.054688 5 20.28125 C 5 33.050781 19.488281 39.738281 24.375 43.78125 L 25 44.3125 L 25.625 43.78125 C 30.511719 39.738281 45 33.050781 45 20.28125 C 45 14.054688 39.882813 9 33.625 9 C 30.148438 9 27.085938 10.613281 25 13.0625 C 22.914063 10.613281 19.851563 9 16.375 9 Z M 16.375 11 C 19.640625 11 22.480469 12.652344 24.15625 15.15625 L 25 16.40625 L 25.84375 15.15625 C 27.519531 12.652344 30.359375 11 33.625 11 C 38.808594 11 43 15.144531 43 20.28125 C 43 31.179688 30.738281 37.289063 25 41.78125 C 19.261719 37.289063 7 31.179688 7 20.28125 C 7 15.144531 11.1875 11 16.375 11 Z'/%3E%3C/svg%3E");
 }
 .icon.icon-favourite-active::before {
-  content: "\02665"; /* 0x2665 = solid heart; 0x2605 = solid star  */
+  content: url("data:image/svg+xml,%3Csvg fill='rgb(255, 0, 0)' xmlns='http://www.w3.org/2000/svg' viewBox='0 -3 50 47' width='1.5em' height='1.5em'%3E%3Cpath d='M 25 44.296875 L 24.363281 43.769531 C 23.363281 42.941406 22.019531 42.027344 20.46875 40.96875 C 14.308594 36.765625 5 30.414063 5 20.285156 C 5 14.0625 10.097656 9 16.363281 9 C 19.714844 9 22.851563 10.457031 25 12.957031 C 27.148438 10.457031 30.289063 9 33.636719 9 C 39.902344 9 45 14.0625 45 20.285156 C 45 30.414063 35.691406 36.765625 29.53125 40.96875 C 27.976563 42.027344 26.636719 42.941406 25.636719 43.769531 Z'/%3E%3C/svg%3E");
 }
+.icon.icon-favourite span {
+  font-size: 50%;
+  color : #F66;
+  position:relative;
+  top:-0.7em;
+}
+.icon.icon-favourite-active span {
+  color : white;
+}
+
 .icon.icon-interface {text-indent: 0px;} /*override spectre*/
 .icon.icon-interface::before {
   position: absolute; left: 50%; top: 70%;
diff --git a/index.html b/index.html
index b141cffc9..e037ee7aa 100644
--- a/index.html
+++ b/index.html
@@ -88,8 +88,10 @@
         <div class="sort-nav hidden">
           <span>Sort by:</span>
           <label class="chip active" sortid="">None</label>
-          <label class="chip" sortid="created">New</label>
-          <label class="chip" sortid="modified">Updated</label>
+          <label class="chip hidden" sortid="created">New</label>
+          <label class="chip hidden" sortid="modified">Updated</label>
+          <label class="chip hidden" sortid="installs">Installed</label>
+          <label class="chip hidden" sortid="favourites">Favourited</label>
         </div>
       </div>
 
@@ -151,6 +153,10 @@
             <input type="checkbox" id="settings-ble-compat">
             <i class="form-icon"></i> Bluetooth Compatibility mode (limit to 20 byte writes)
           </label>
+          <label class="form-switch">
+            <input type="checkbox" id="settings-usage-stats">
+            <i class="form-icon"></i> Send app analytics to banglejs.com (apps installed, favourites, firmware version)
+          </label>
           <div class="form-group">
             <select class="form-select form-inline"  id="settings-lang" style="width: 10em">
               <option value="">None (English)</option>
diff --git a/loader.js b/loader.js
index 0e0fdcba0..3a6b41cfe 100644
--- a/loader.js
+++ b/loader.js
@@ -16,11 +16,14 @@ if (window.location.host=="banglejs.com") {
     'This is not the official Bangle.js App Loader - you can try the <a href="https://banglejs.com/apps/">Official Version</a> here.';
 }
 
-var RECOMMENDED_VERSION = "2v14";
+var RECOMMENDED_VERSION = "2v15";
 // could check http://www.espruino.com/json/BANGLEJS.json for this
 
 // We're only interested in Bangles
 DEVICEINFO = DEVICEINFO.filter(x=>x.id.startsWith("BANGLEJS"));
+// Where we get our usage data from
+Const.APP_USAGE_JSON = "https://banglejs.com/apps/appusage.json";
+Const.APP_DATES_CSV = "appdates.csv";
 
 // Set up source code URL
 (function() {
@@ -48,8 +51,6 @@ function onFoundDeviceInfo(deviceId, deviceVersion) {
   } else if (versionLess(deviceVersion, RECOMMENDED_VERSION)) {
     showToast(`You're using an old Bangle.js firmware (${deviceVersion}) and ${RECOMMENDED_VERSION} is available (<a href="http://www.espruino.com/ChangeLog" target="_blank">see changes</a>). You can update ${fwExtraText}<a href="${fwURL}" target="_blank">with the instructions here</a>` ,"warning", 20000);
   }
-
-
   // check against features shown?
   filterAppsForDevice(deviceId);
   /* if we'd saved a device ID but this device is different, ensure
@@ -59,6 +60,43 @@ function onFoundDeviceInfo(deviceId, deviceVersion) {
     setSavedDeviceId(undefined);
 }
 
+// Called when we refresh the list of installed apps
+function onRefreshMyApps() {
+  /* if we're allowed to, send usage stats. We'll only
+  actually send if the data has changed */
+  sendUsageStats();
+}
+
+var submittedUsageInfo = "";
+/* Send usage stats to servers if it has changed */
+function sendUsageStats() {
+  if (!SETTINGS.sendUsageStats) return; // not allowed!
+  if (device.uid === undefined) return; // no data yet!
+  /* Work out what we'll send:
+  * A suitably garbled UID so we can avoid too many duplicates
+  * firmware version
+  * apps installed
+  * apps favourited
+  */
+  var usageInfo = `uid=${encodeURIComponent(device.uid)}&fw=${encodeURIComponent(device.version)}&apps=${encodeURIComponent(device.appsInstalled.map(a=>a.id).join(","))}&favs=${encodeURIComponent(SETTINGS.favourites.join(","))}`;
+  // Do a quick check for unchanged data to reduce server load
+  if (usageInfo != submittedUsageInfo) {
+    console.log("sendUsageStats: Submitting usage stats...");
+    var xmlhttp = new XMLHttpRequest();   // new HttpRequest instance
+    xmlhttp.open("POST", "https://banglejs.com/submit_app_stats.php", true /*async*/);
+    xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    xmlhttp.onload = (e) => {
+      if (xmlhttp.readyState === 4)
+        console.log(`sendUsageStats (${xmlhttp.status}): ${xmlhttp.responseText}`);
+    };
+    xmlhttp.onerror = (e) => {
+      console.error("sendUsageStats ERROR: "+xmlhttp.statusText);
+    };
+    xmlhttp.send(usageInfo);
+    submittedUsageInfo = usageInfo;
+  }
+}
+
 var originalAppJSON = undefined;
 function filterAppsForDevice(deviceId) {
   if (originalAppJSON===undefined && appJSON.length)
@@ -195,16 +233,25 @@ window.addEventListener('load', (event) => {
   });
 
   // BLE Compatibility
-  var selectLang = document.getElementById("settings-ble-compat");
-  if (SETTINGS.bleCompat!==undefined)
-    Puck.increaseMTU = !SETTINGS.bleCompat;
-  selectLang.addEventListener("change",event=>{
+  var selectBLECompat = document.getElementById("settings-ble-compat");
+  Puck.increaseMTU = !SETTINGS.bleCompat;
+  selectBLECompat.checked = !!SETTINGS.bleCompat;
+  selectBLECompat.addEventListener("change",event=>{
     console.log("BLE compatibility mode "+(event.target.checked?"on":"off"));
     SETTINGS.bleCompat = event.target.checked;
     Puck.increaseMTU = !SETTINGS.bleCompat;
     saveSettings();
   });
 
+  // Sending usage stats
+  var selectUsageStats = document.getElementById("settings-usage-stats");
+  selectUsageStats.checked = !!SETTINGS.sendUsageStats;
+  selectUsageStats.addEventListener("change",event=>{
+    console.log("Send Usage Stats "+(event.target.checked?"on":"off"));
+    SETTINGS.sendUsageStats = event.target.checked;
+    saveSettings();
+  });
+
   // Load language list
   httpGet("lang/index.json").then(languagesJSON=>{
     var languages;
diff --git a/modules/ClockFace.js b/modules/ClockFace.js
index 25b278846..a89281d2d 100644
--- a/modules/ClockFace.js
+++ b/modules/ClockFace.js
@@ -49,6 +49,7 @@ function ClockFace(options) {
 }
 
 ClockFace.prototype.tick = function() {
+  "ram"
   const time = new Date();
   const now = {
     d: `${time.getFullYear()}-${time.getMonth()}-${time.getDate()}`,
diff --git a/modules/ClockFace.md b/modules/ClockFace.md
index b2332c805..85482213c 100644
--- a/modules/ClockFace.md
+++ b/modules/ClockFace.md
@@ -208,7 +208,7 @@ let menu = {
   /*LANG*/"< Back": back,  
 };
 require("ClockFace_menu").addSettingsFile(menu, "<appid>.settings.json", [ 
-  "showDate", "loadWidgets"
+  "showDate", "loadWidgets", "powerSave",
 ]);
 E.showMenu(menu);
 
diff --git a/modules/ClockFace_menu.js b/modules/ClockFace_menu.js
index f2267d9ca..a1dd76fee 100644
--- a/modules/ClockFace_menu.js
+++ b/modules/ClockFace_menu.js
@@ -11,12 +11,16 @@ exports.addItems = function(menu, callback, items) {
     const label = {
       showDate:/*LANG*/"Show date",
       loadWidgets:/*LANG*/"Load widgets",
+      powerSave:/*LANG*/"Power saving",
     }[key];
     switch(key) {
+      // boolean options which default to true
       case "showDate":
       case "loadWidgets":
-        // boolean options, which default to true
         if (value===undefined) value = true;
+        // fall through
+      case "powerSave":
+        // same for all boolean options:
         menu[label] = {
           value: !!value,
           onchange: v => callback(key, v),
diff --git a/modules/clock_info.js b/modules/clock_info.js
new file mode 100644
index 000000000..b87c022f2
--- /dev/null
+++ b/modules/clock_info.js
@@ -0,0 +1,193 @@
+var exports = {};
+/* Module that allows for loading of clock 'info' displays
+that can be scrolled through on the clock face.
+
+`load()` returns an array of menu objects, where each object contains a list of menu items:
+* 'name' : text to display and identify menu object (e.g. weather)
+* 'img' : a 24x24px image
+* 'items' : menu items such as temperature, humidity, wind etc.
+
+Note that each item is an object with:
+
+* 'item.name' : friendly name to identify an item (e.g. temperature)
+* 'item.get' : function that resolves with:
+  {
+    'text' : the text to display for this item
+    'img' : a 24x24px image to display for this item
+  }
+* 'item.show' : called when item should be shown. Enables updates. Call BEFORE 'get'
+* 'item.hide' : called when item should be hidden. Disables updates.
+* .on('redraw', ...) : event that is called when 'get' should be called again (only after 'item.show')
+* 'item.run' : (optional) called if the info screen is tapped - can perform some action. Return true if the caller should feedback the user.
+
+See the bottom of this file for example usage...
+
+example.clkinfo.js :
+
+(function() {
+  return {
+    name: "Bangle",
+    img: atob("GBiBAAD+AAH+AAH+AAH+AAH/AAOHAAYBgAwAwBgwYBgwYBgwIBAwOBAwOBgYIBgMYBgAYAwAwAYBgAOHAAH/AAH+AAH+AAH+AAD+AA==") }),
+    items: [
+      { name : "Item1",
+        get : () => ({ text : "TextOfItem1",
+                      img : atob("GBiBAAD+AAH+AAH+AAH+AAH/AAOHAAYBgAwAwBgwYBgwYBgwIBAwOBAwOBgYIBgMYBgAYAwAwAYBgAOHAAH/AAH+AAH+AAH+AAD+AA==") }),
+        show : () => {},
+        hide : () => {}
+      }
+    ]
+  };
+}) // must not have a semi-colon!
+
+*/
+
+
+exports.load = function() {
+  // info used for drawing...
+  var hrm = "--";
+  var alt = "--";
+  // callbacks (needed for easy removal of listeners)
+  function batteryUpdateHandler() { bangleItems[0].emit("redraw"); }
+  function stepUpdateHandler() { bangleItems[1].emit("redraw"); }
+  function hrmUpdateHandler() { bangleItems[2].emit("redraw"); }
+  function altUpdateHandler() {
+    Bangle.getPressure().then(data=>{
+      if (!data) return;
+      alt = Math.round(data.altitude) + "m";
+      bangleItems[3].emit("redraw");
+    });
+  }
+  // actual menu
+  var menu = [{
+    name: "Bangle",
+    img: atob("GBiBAf8B//4B//4B//4B//4A//x4//n+f/P/P+fPn+fPn+fP3+/Px+/Px+fn3+fzn+f/n/P/P/n+f/x4//4A//4B//4B//4B//8B/w=="),
+    items: [
+    { name : "Battery",
+      get : () => ({
+        text : E.getBattery() + "%",
+        img : atob(Bangle.isCharging() ? "GBiBAAABgAADwAAHwAAPgACfAAHOAAPkBgHwDwP4Hwf8Pg/+fB//OD//kD//wD//4D//8D//4B//QB/+AD/8AH/4APnwAHAAACAAAA==" : "GBiBAAAAAAAAAAAAAAAAAAAAAD//+P///IAAAr//Ar//Ar//A7//A7//A7//A7//Ar//AoAAAv///D//+AAAAAAAAAAAAAAAAAAAAA==") }),
+      show : function() { this.interval = setInterval(()=>this.emit('redraw'), 60000); Bangle.on("charging", batteryUpdateHandler); batteryUpdateHandler(); },
+      hide : function() { clearInterval(this.interval); delete this.interval; Bangle.removeListener("charging", batteryUpdateHandler); },
+    },
+    { name : "Steps", get : () => ({
+        text : Bangle.getHealthStatus("day").steps,
+        img : atob("GBiBAAcAAA+AAA/AAA/AAB/AAB/gAA/g4A/h8A/j8A/D8A/D+AfH+AAH8AHn8APj8APj8AHj4AHg4AADAAAHwAAHwAAHgAAHgAADAA==") }),
+      show : function() { Bangle.on("step", stepUpdateHandler); stepUpdateHandler(); },
+      hide : function() { Bangle.removeListener("step", stepUpdateHandler); },
+    },
+    { name : "HRM", get : () => ({
+        text : Math.round(Bangle.getHealthStatus("last").bpm) + " bpm",
+        img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAADAAADAAAHAAAHjAAHjgAPngH9n/n82/gA+AAA8AAA8AAAcAAAYAAAYAAAAAAAAAAAAAAAAAAAAAA==") }),
+      show : function() { Bangle.setHRMPower(1,"clkinfo"); Bangle.on("HRM", hrmUpdateHandler); hrm = Math.round(Bangle.getHealthStatus("last").bpm); hrmUpdateHandler(); },
+      hide : function() { Bangle.setHRMPower(0,"clkinfo"); Bangle.removeListener("HRM", hrmUpdateHandler); hrm = "--"; },
+    }
+  ],
+  }];
+  var bangleItems = menu[0].items;
+
+  if (Bangle.getPressure){  // Altimeter may not exist
+    bangleItems.push({ name : "Altitude", get : () => ({
+        text : alt,
+        img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAAACAAAGAAAPAAEZgAOwwAPwQAZgYAwAMBgAGBAACDAADGAABv///////wAAAAAAAAAAAAAAAAAAAA==") }),
+      show : function() { this.interval = setInterval(altUpdateHandler, 60000); alt = "--"; altUpdateHandler(); },
+      hide : function() { clearInterval(this.interval); delete this.interval; },
+    });
+  }
+
+  // In case there exists already a menu object b with the same name as the next
+  // object a, we append the items. Otherwise we add the new object a to the list.
+  require("Storage").list(/clkinfo.js$/).forEach(fn => {
+    try{
+      var a = eval(require("Storage").read(fn))();
+      var b = menu.find(x => x.name === a.name)
+      if(b) b.items = b.items.concat(a.items);
+      else menu = menu.concat(a);
+    } catch(e){
+      console.log("Could not load clock info.")
+    }
+  });
+
+  // return it all!
+  return menu;
+};
+
+/** Adds an interactive menu that could be used on a clock face by swiping.
+Simply supply the menu data (from .load) and a function to draw the clock info.
+
+For example:
+
+var clockInfoMenu = require("clock_info").addInteractive(require("clock_info").load(), (itm, info) => {
+  var y = 0;
+  g.reset().setFont("6x8:2").setFontAlign(-1,0);
+  g.clearRect(0,y,g.getWidth(),y+23);
+  g.drawImage(info.img, 0,y);
+  g.drawString(info.text, 48,y+12);
+});
+
+Then if you need to unload the clock info so it no longer
+uses memory or responds to swipes, you can call clockInfoMenu.remove()
+and delete clockInfoMenu
+*/
+exports.addInteractive = function(menu, drawFn) {
+  if (!menu.length || !menu[0].items.length) return; // no info
+  var menuA = 0, menuB = 0;
+  function menuShowItem(itm) {
+    itm.on('redraw', ()=>drawFn(itm, itm.get()));
+    itm.show();
+    itm.emit("redraw");
+  }
+  // handling for swipe between menu items
+  function swipeHandler(lr,ud){
+    var oldMenuItem;
+    if (ud) {
+      if (menu[menuA].items.length==1) return; // 1 item - can't move
+      oldMenuItem = menu[menuA].items[menuB];
+      menuB += ud;
+      if (menuB<0) menuB = menu[menuA].items.length-1;
+      if (menuB>=menu[menuA].items.length) menuB = 0;
+    } else if (lr) {
+      if (menu.length==1) return; // 1 item - can't move
+      oldMenuItem = menu[menuA].items[menuB];
+      menuA += ud;
+      if (menuA<0) menuA = menu.length-1;
+      if (menuA>=menu.length) menuA = 0;
+      menuB = 0;
+    }
+    if (oldMenuItem) {
+      oldMenuItem.hide();
+      oldMenuItem.removeAllListeners("draw");
+      menuShowItem(menu[menuA].items[menuB]);
+    }
+  }
+  Bangle.on("swipe",swipeHandler);
+  // draw the first item
+  menuShowItem(menu[menuA].items[menuB]);
+  // return an object with info that can be used to remove the info
+  return {
+    remove : function() {
+      Bangle.removeListener("swipe",swipeHandler);
+      menu[menuA].items[menuB].hide();
+    }
+  };
+};
+
+// Code for testing (plots all elements from first list)
+/*
+g.clear();
+var menu = exports.load(); // or require("clock_info").load()
+var items = menu[0].items;
+items.forEach((itm,i) => {
+  var y = i*24;
+  console.log("Starting", itm.name);
+  function draw() {
+    var info = itm.get();
+    g.reset().setFont("6x8:2").setFontAlign(-1,0);
+    g.clearRect(0,y,g.getWidth(),y+23);
+    g.drawImage(info.img, 0,y);
+    g.drawString(info.text, 48,y+12);
+  }
+  itm.on('redraw', draw); // ensures we redraw when we need to
+  itm.show();
+  draw();
+});
+*/
diff --git a/modules/wear_detect.js b/modules/wear_detect.js
new file mode 100644
index 000000000..9581657cf
--- /dev/null
+++ b/modules/wear_detect.js
@@ -0,0 +1,18 @@
+/** Returns a promise that resolves with whether the Bangle
+is worn or not.
+
+Usage:
+
+require("wear_detect").isWorn().then(worn => {
+  console.log(worn ? "is worn" : "not worn");
+});
+*/
+exports.isWorn = function() {
+  return new Promise(resolve => {
+    if (Bangle.isCharging())
+        return resolve(false);
+    if (Bangle.getHealthStatus().movement > 124)
+        return resolve(true);
+    return resolve(false);
+  });
+};
diff --git a/modules/widget_utils.js b/modules/widget_utils.js
new file mode 100644
index 000000000..5ee98ce05
--- /dev/null
+++ b/modules/widget_utils.js
@@ -0,0 +1,28 @@
+/* Utilities for handling widgets - mainly showing/hiding */
+
+/// hide any visible widgets
+exports.hide = function() {
+  if (!global.WIDGETS) return;
+  g.reset(); // reset colors
+  for (var w of global.WIDGETS) {
+    if (w._draw) return; // already hidden
+    w._draw = w.draw;
+    w.draw = () => {};
+    w._area = w.area;
+    w.area = "";
+    if (w.x!=undefined) g.clearRect(w.x,w.y,w.x+w.width-1,w.y+23);
+  }
+};
+
+/// Show any hidden widgets
+exports.show = function() {
+  if (!global.WIDGETS) return;
+  for (var w of global.WIDGETS) {
+    if (!w._draw) return; // not hidden
+    w.draw = w._draw;
+    w.area = w._area;
+    delete w._draw;
+    delete w._area;
+    w.draw(w);
+  }
+};
diff --git a/package-lock.json b/package-lock.json
index 878b45cb2..e981abdb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,2913 +1,8 @@
 {
   "name": "BangleApps",
   "version": "0.0.1",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "BangleApps",
-      "version": "0.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^7.2.0"
-      },
-      "devDependencies": {
-        "eslint": "^8.14.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.26.0",
-        "npm-watch": "^0.11.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.1.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
-      "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.2",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
-      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.3",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz",
-      "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "dependencies": {
-        "ini": "2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/ignore-by-default": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "dependencies": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/nodemon": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz",
-      "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "chokidar": "^3.5.2",
-        "debug": "^3.2.7",
-        "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.0.4",
-        "pstree.remy": "^1.1.8",
-        "semver": "^5.7.1",
-        "supports-color": "^5.5.0",
-        "touch": "^3.1.0",
-        "undefsafe": "^2.0.5",
-        "update-notifier": "^5.1.0"
-      },
-      "bin": {
-        "nodemon": "bin/nodemon.js"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nodemon"
-      }
-    },
-    "node_modules/nodemon/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/nodemon/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/nodemon/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/nodemon/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/nopt": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-      "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/npm-watch": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.11.0.tgz",
-      "integrity": "sha512-wAOd0moNX2kSA2FNvt8+7ORwYaJpQ1ZoWjUYdb1bBCxq4nkWuU0IiJa9VpVxrj5Ks+FGXQd62OC/Bjk0aSr+dg==",
-      "dev": true,
-      "dependencies": {
-        "nodemon": "^2.0.7",
-        "through2": "^4.0.2"
-      },
-      "bin": {
-        "npm-watch": "cli.js"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pstree.remy": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
-      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/touch": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
-      "dev": true,
-      "dependencies": {
-        "nopt": "~1.0.10"
-      },
-      "bin": {
-        "nodetouch": "bin/nodetouch.js"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/undefsafe": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
-      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
-      "dev": true
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "dependencies": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    }
-  },
   "dependencies": {
     "@eslint/eslintrc": {
       "version": "1.3.0",
@@ -2943,21 +38,6 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true
-    },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "requires": {
-        "defer-to-connect": "^1.0.1"
-      }
-    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -2979,8 +59,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv": {
       "version": "6.12.6",
@@ -2994,15 +73,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.1.0"
-      }
-    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3071,22 +141,6 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
-    "boxen": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
-      "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.2",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3106,38 +160,6 @@
         "fill-range": "^7.0.1"
       }
     },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
-        }
-      }
-    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -3154,12 +176,6 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
-    "camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -3197,27 +213,6 @@
         }
       }
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -3239,20 +234,6 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
     "confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -3270,12 +251,6 @@
         "which": "^2.0.1"
       }
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -3285,33 +260,12 @@
         "ms": "2.1.2"
       }
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
     "define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
@@ -3331,36 +285,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
     "es-abstract": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
@@ -3412,12 +336,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true
-    },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -3765,15 +683,6 @@
         "has-symbols": "^1.0.3"
       }
     },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
     "get-symbol-description": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
@@ -3807,15 +716,6 @@
         "is-glob": "^4.0.3"
       }
     },
-    "global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "requires": {
-        "ini": "2.0.0"
-      }
-    },
     "globals": {
       "version": "13.15.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
@@ -3825,31 +725,6 @@
         "type-fest": "^0.20.2"
       }
     },
-    "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -3895,18 +770,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
-    "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
     "ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -3929,12 +792,6 @@
         "resolve-from": "^4.0.0"
       }
     },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -3957,12 +814,6 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true
-    },
     "internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -4008,15 +859,6 @@
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true
     },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
     "is-core-module": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
@@ -4041,12 +883,6 @@
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
     "is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -4056,28 +892,12 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      }
-    },
     "is-negative-zero": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true
     },
-    "is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4093,18 +913,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -4142,12 +950,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
     "is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -4157,12 +959,6 @@
         "call-bind": "^1.0.2"
       }
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -4178,12 +974,6 @@
         "argparse": "^2.0.1"
       }
     },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -4205,24 +995,6 @@
         "minimist": "^1.2.0"
       }
     },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -4249,36 +1021,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -4307,21 +1049,21 @@
       "dev": true
     },
     "nodemon": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz",
-      "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+      "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
       "dev": true,
       "requires": {
         "chokidar": "^3.5.2",
         "debug": "^3.2.7",
         "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "pstree.remy": "^1.1.8",
         "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
-        "undefsafe": "^2.0.5",
-        "update-notifier": "^5.1.0"
+        "undefsafe": "^2.0.5"
       },
       "dependencies": {
         "debug": {
@@ -4371,12 +1113,6 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true
-    },
     "npm-watch": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.11.0.tgz",
@@ -4456,12 +1192,6 @@
         "word-wrap": "^1.2.3"
       }
     },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true
-    },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -4486,18 +1216,6 @@
       "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true
     },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      }
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -4543,69 +1261,18 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-      "dev": true
-    },
     "pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
       "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
       "dev": true
     },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-          "dev": true
-        }
-      }
-    },
     "readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -4643,24 +1310,6 @@
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
-    "registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
     "resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -4678,15 +1327,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -4708,15 +1348,6 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      }
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4743,30 +1374,21 @@
         "object-inspect": "^1.9.0"
       }
     },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "simple-update-notifier": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
+      "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
       }
     },
     "string.prototype.trimend": {
@@ -4791,6 +1413,15 @@
         "es-abstract": "^1.19.5"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -4842,12 +1473,6 @@
         "readable-stream": "3"
       }
     },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4893,15 +1518,6 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -4920,48 +1536,6 @@
       "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
       "dev": true
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
-    "update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -4971,15 +1545,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -5014,61 +1579,17 @@
         "is-symbol": "^1.0.3"
       }
     },
-    "widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.0.0"
-      }
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
     }
   }
 }
diff --git a/tests/Layout/bin/runalltests.sh b/tests/Layout/bin/runalltests.sh
index 3a7aac50b..2d2985a4f 100755
--- a/tests/Layout/bin/runalltests.sh
+++ b/tests/Layout/bin/runalltests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cd `dirname $0`/..
 ls tests/*.js | xargs -I{} bin/runtest.sh {}
diff --git a/tests/Layout/bin/runtest.sh b/tests/Layout/bin/runtest.sh
index 9bac72283..f6c566d18 100755
--- a/tests/Layout/bin/runtest.sh
+++ b/tests/Layout/bin/runtest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Requires Linux x64 (for ./espruino)
 # Also imagemagick for display
 
diff --git a/typescript/tsconfig.json b/tsconfig.json
similarity index 77%
rename from typescript/tsconfig.json
rename to tsconfig.json
index d36465a01..db3db1fc3 100644
--- a/typescript/tsconfig.json
+++ b/tsconfig.json
@@ -8,10 +8,12 @@
     "noImplicitOverride": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
+    "noLib": true,
     "noUncheckedIndexedAccess": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "strict": true
+    "strict": true,
+    "typeRoots": ["./typescript/types"]
   },
-  "include": ["../apps/**/*", "./**/*"], 
+  "include": ["./**/*"]
 }
diff --git a/typescript/README.md b/typescript/README.md
index 13800aeec..7c1e21abd 100644
--- a/typescript/README.md
+++ b/typescript/README.md
@@ -1,13 +1,10 @@
-# BangleTS
+# Bangle.ts
 
-A generic project setup for compiling apps from Typescript to Bangle.js ready, readable Javascript.
-It includes types for _some_ of the modules and globals that are exposed for apps to use.
-The goal is to have types for everything, but that will take some time. Feel free to help out by contributing!
+A generic project setup for compiling apps from Typescript to
+Bangle.js-ready, readable JavaScript.
 
-## Using the types
-
-All currently typed modules can be found in `/typescript/types.globals.d.ts`.
-The typing is an ongoing process. If anything is still missing, you can add it! It will automatically be available in your TS files.
+The types are now automatically generated by a script (see
+[here](https://github.com/espruino/Espruino/blob/master/TYPESCRIPT.md).
 
 ## Compilation
 
@@ -26,4 +23,4 @@ to install the project's build tools, and:
 npm run build
 ```
 
-To build all Typescript apps and widgets. The last command will generate the `app.js` files containing the transpiled code for the BangleJS.
+To build all Typescript apps and widgets. The last command will generate the `app.js` files containing the transpiled code for the Bangle.js.
diff --git a/typescript/package-lock.json b/typescript/package-lock.json
index 52be5f98a..15653acc2 100644
--- a/typescript/package-lock.json
+++ b/typescript/package-lock.json
@@ -7,10 +7,89 @@
     "": {
       "name": "Bangle.ts",
       "version": "0.0.1",
+      "dependencies": {
+        "node-fetch": "^3.2.10"
+      },
       "devDependencies": {
         "typescript": "4.5.2"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz",
+      "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz",
+      "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
     "node_modules/typescript": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
@@ -23,14 +102,64 @@
       "engines": {
         "node": ">=4.2.0"
       }
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+      "engines": {
+        "node": ">= 8"
+      }
     }
   },
   "dependencies": {
+    "data-uri-to-buffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz",
+      "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA=="
+    },
+    "fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "requires": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      }
+    },
+    "formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "requires": {
+        "fetch-blob": "^3.1.2"
+      }
+    },
+    "node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
+    },
+    "node-fetch": {
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz",
+      "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==",
+      "requires": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      }
+    },
     "typescript": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
       "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
       "dev": true
+    },
+    "web-streams-polyfill": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
     }
   }
 }
diff --git a/typescript/package.json b/typescript/package.json
index 8cd38ce63..9533d77a7 100644
--- a/typescript/package.json
+++ b/typescript/package.json
@@ -1,13 +1,15 @@
 {
   "name": "Bangle.ts",
   "description": "Bangle.js Typescript Project Setup and Types",
-  "author": "Sebastian Di Luzio <sebastian@diluz.io> (https://diluz.io)",
+  "author": "Sebastian Di Luzio <sebastian@diluz.io> (https://diluz.io) and qucchia <qucchia0@gmail.com> (https://github.com/qucchia)",
   "version": "0.0.1",
   "devDependencies": {
     "typescript": "4.5.2"
   },
   "scripts": {
-    "build": "tsc",
-    "build:types": "tsc ./types/globals.d.ts"
+    "build": "tsc"
+  },
+  "dependencies": {
+    "node-fetch": "^3.2.10"
   }
 }
diff --git a/typescript/types/globals.d.ts b/typescript/types/globals.d.ts
deleted file mode 100644
index e2da49a0e..000000000
--- a/typescript/types/globals.d.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-// TODO all of these globals (copied from eslintrc) need to be typed at some point
-/* The typing status is listed on the left of the attribute, e.g.:
-status  "Attribute"
-
-        // Methods and Fields at https://banglejs.com/reference
-        "Array": "readonly",
-        "ArrayBuffer": "readonly",
-        "ArrayBufferView": "readonly",
-started "Bangle": "readonly",
-        "BluetoothDevice": "readonly",
-        "BluetoothRemoteGATTCharacteristic": "readonly",
-        "BluetoothRemoteGATTServer": "readonly",
-        "BluetoothRemoteGATTService": "readonly",
-        "Boolean": "readonly",
-        "console": "readonly",
-        "DataView": "readonly",
-        "Date": "readonly",
-        "E": "readonly",
-        "Error": "readonly",
-        "Flash": "readonly",
-        "Float32Array": "readonly",
-        "Float64Array": "readonly",
-        "fs": "readonly",
-        "Function": "readonly",
-started "Graphics": "readonly",
-done    "heatshrink": "readonly",
-        "I2C": "readonly",
-        "Int16Array": "readonly",
-        "Int32Array": "readonly",
-        "Int8Array": "readonly",
-        "InternalError": "readonly",
-        "JSON": "readonly",
-        "Math": "readonly",
-        "Modules": "readonly",
-        "NRF": "readonly",
-        "Number": "readonly",
-        "Object": "readonly",
-        "OneWire": "readonly",
-        "Pin": "readonly",
-        "process": "readonly",
-        "Promise": "readonly",
-        "ReferenceError": "readonly",
-        "RegExp": "readonly",
-        "Serial": "readonly",
-        "SPI": "readonly",
-        "Storage": "readonly",
-        "StorageFile": "readonly",
-        "String": "readonly",
-        "SyntaxError": "readonly",
-        "tensorflow": "readonly",
-        "TFMicroInterpreter": "readonly",
-        "TypeError": "readonly",
-        "Uint16Array": "readonly",
-        "Uint24Array": "readonly",
-        "Uint32Array": "readonly",
-        "Uint8Array": "readonly",
-        "Uint8ClampedArray": "readonly",
-        "Waveform": "readonly",
-        // Methods and Fields at https://banglejs.com/reference
-        "analogRead": "readonly",
-        "analogWrite": "readonly",
-        "arguments": "readonly",
-        "atob": "readonly",
-        "Bluetooth": "readonly",
-        "BTN": "readonly",
-        "BTN1": "readonly",
-        "BTN2": "readonly",
-        "BTN3": "readonly",
-        "BTN4": "readonly",
-        "BTN5": "readonly",
-        "btoa": "readonly",
-        "changeInterval": "readonly",
-        "clearInterval": "readonly",
-        "clearTimeout": "readonly",
-        "clearWatch": "readonly",
-        "decodeURIComponent": "readonly",
-        "digitalPulse": "readonly",
-        "digitalRead": "readonly",
-        "digitalWrite": "readonly",
-        "dump": "readonly",
-        "echo": "readonly",
-        "edit": "readonly",
-        "encodeURIComponent": "readonly",
-        "eval": "readonly",
-        "getPinMode": "readonly",
-        "getSerial": "readonly",
-        "getTime": "readonly",
-        "global": "readonly",
-        "HIGH": "readonly",
-        "I2C1": "readonly",
-        "Infinity": "readonly",
-        "isFinite": "readonly",
-        "isNaN": "readonly",
-        "LED": "readonly",
-        "LED1": "readonly",
-        "LED2": "readonly",
-        "load": "readonly",
-        "LoopbackA": "readonly",
-        "LoopbackB": "readonly",
-        "LOW": "readonly",
-        "NaN": "readonly",
-        "parseFloat": "readonly",
-        "parseInt": "readonly",
-        "peek16": "readonly",
-        "peek32": "readonly",
-        "peek8": "readonly",
-        "pinMode": "readonly",
-        "poke16": "readonly",
-        "poke32": "readonly",
-        "poke8": "readonly",
-        "print": "readonly",
-started "require": "readonly",
-        "reset": "readonly",
-        "save": "readonly",
-        "Serial1": "readonly",
-        "setBusyIndicator": "readonly",
-        "setInterval": "readonly",
-        "setSleepIndicator": "readonly",
-        "setTime": "readonly",
-        "setTimeout": "readonly",
-        "setWatch": "readonly",
-        "shiftOut": "readonly",
-        "SPI1": "readonly",
-        "Terminal": "readonly",
-        "trace": "readonly",
-        "VIBRATE": "readonly",
-        // Aliases and not defined at https://banglejs.com/reference
-done    "g": "readonly",
-done    "WIDGETS": "readonly"
- */
-
-// ambient JS definitions
-
-declare const require: ((module: 'heatshrink') => {
-  decompress: (compressedString: string) => string;
-}) & // TODO add more
-  ((module: 'otherString') => {});
-
-// ambient bangle.js definitions
-
-declare const Bangle: {
-  // functions
-  buzz: (duration?: number, intensity?: number) => Promise<void>;
-  drawWidgets: () => void;
-  isCharging: () => boolean;
-  // events
-  on(event: 'charging', listener: (charging: boolean) => void): void;
-  // TODO add more
-};
-
-declare type Image = {
-  width: number;
-  height: number;
-  bpp?: number;
-  buffer: ArrayBuffer | string;
-  transparent?: number;
-  palette?: Uint16Array;
-};
-
-declare type GraphicsApi = {
-  reset: () => GraphicsApi;
-  flip: () => void;
-  setColor: (color: string) => GraphicsApi; // TODO we can most likely type color more usefully than this
-  drawImage: (
-    image: string | Image | ArrayBuffer,
-    xOffset: number,
-    yOffset: number,
-    options?: {
-      rotate?: number;
-      scale?: number;
-    }
-  ) => GraphicsApi;
-  // TODO add more
-};
-
-declare const Graphics: GraphicsApi;
-declare const g: GraphicsApi;
-
-type WidgetArea = 'tl' | 'tr' | 'bl' | 'br';
-declare type Widget = {
-  area: WidgetArea;
-  width: number;
-  draw: (this: { x: number; y: number }) => void;
-};
-declare const WIDGETS: { [key: string]: Widget };
diff --git a/typescript/types/main.d.ts b/typescript/types/main.d.ts
new file mode 100644
index 000000000..89921972c
--- /dev/null
+++ b/typescript/types/main.d.ts
@@ -0,0 +1,13012 @@
+// NOTE: This file has been automatically generated.
+
+/// <reference path="other.d.ts" />
+
+// TYPES
+
+/**
+ * Menu item that holds a boolean value.
+ */
+type MenuBooleanItem = {
+  value: boolean;
+  format?: (value: boolean) => string;
+  onchange?: (value: boolean) => void;
+};
+
+/**
+ * Menu item that holds a numerical value.
+ */
+type MenuNumberItem = {
+  value: number;
+  format?: (value: number) => string;
+  onchange?: (value: number) => void;
+  step?: number;
+  min?: number;
+  max?: number;
+  wrap?: boolean;
+};
+
+/**
+ * Options passed to a menu.
+ */
+type MenuOptions = {
+  title?: string;
+  back?: () => void;
+  selected?: number;
+  fontHeight?: number;
+  x?: number;
+  y?: number;
+  x2?: number;
+  y2?: number;
+  cB?: number;
+  cF?: number;
+  cHB?: number;
+  cHF?: number;
+  predraw?: (g: Graphics) => void;
+  preflip?: (g: Graphics, less: boolean, more: boolean) => void;
+};
+
+/**
+ * Object containing data about a menu to pass to `E.showMenu`.
+ */
+type Menu = {
+  ""?: MenuOptions;
+  [key: string]:
+    | MenuOptions
+    | (() => void)
+    | MenuBooleanItem
+    | MenuNumberItem
+    | { value: string; onchange?: () => void }
+    | undefined;
+};
+
+/**
+ * Menu instance.
+ */
+type MenuInstance = {
+  draw: () => void;
+  move: (n: number) => void;
+  select: () => void;
+};
+
+type ImageObject = {
+  width: number;
+  height: number;
+  bpp?: number;
+  buffer: ArrayBuffer | string;
+  transparent?: number;
+  palette?: Uint16Array;
+};
+
+type Image = string | ImageObject | ArrayBuffer | Graphics<true>;
+
+type ColorResolvable = number | `#${string}`;
+
+type FontName =
+  | "4x4"
+  | "4x4Numeric"
+  | "4x5"
+  | "4x5Numeric"
+  | "4x8Numeric"
+  | "5x7Numeric7Seg"
+  | "5x9Numeric7Seg"
+  | "6x8"
+  | "6x12"
+  | "7x11Numeric7Seg"
+  | "8x12"
+  | "8x16"
+  | "Dennis8"
+  | "Cherry6x10"
+  | "Copasectic40x58Numeric"
+  | "Dylex7x13"
+  | "HaxorNarrow7x17"
+  | "Sinclair"
+  | "Teletext10x18Mode7"
+  | "Teletext5x9Ascii"
+  | "Teletext5x9Mode7"
+  | "Vector";
+
+type FontNameWithScaleFactor =
+  | FontName
+  | `${FontName}:${number}`
+  | `${FontName}:${number}x${number}`;
+
+type Theme = {
+  fg: number;
+  bg: number;
+  fg2: number;
+  bg2: number;
+  fgH: number;
+  bgH: number;
+  dark: boolean;
+};
+
+type NRFFilters = {
+  services?: string[];
+  name?: string;
+  namePrefix?: string;
+  id?: string;
+  serviceData?: object;
+  manufacturerData?: object;
+};
+
+declare const BTN1: Pin;
+declare const BTN2: Pin;
+declare const BTN3: Pin;
+declare const BTN4: Pin;
+declare const BTN5: Pin;
+
+declare const g: Graphics<false>;
+
+type WidgetArea = "tl" | "tr" | "bl" | "br";
+type Widget = {
+  area: WidgetArea;
+  width: number;
+  draw: (this: { x: number; y: number }) => void;
+};
+declare const WIDGETS: { [key: string]: Widget };
+
+type AccelData = {
+  x: number;
+  y: number;
+  z: number;
+  diff: number;
+  mag: number;
+};
+
+type HealthStatus = {
+  movement: number;
+  steps: number;
+  bpm: number;
+  bpmConfidence: number;
+};
+
+type CompassData = {
+  x: number;
+  y: number;
+  z: number;
+  dx: number;
+  dy: number;
+  dz: number;
+  heading: number;
+};
+
+type GPSFix = {
+  lat: number;
+  lon: number;
+  alt: number;
+  speed: number;
+  course: number;
+  time: Date;
+  satellites: number;
+  fix: number;
+  hdop: number
+};
+
+type PressureData = {
+  temperature: number;
+  pressure: number;
+  altitude: number;
+}
+
+type TapAxis = -2 | -1 | 0 | 1 | 2;
+
+type SwipeCallback = (directionLR: -1 | 0 | 1, directionUD?: -1 | 0 | 1) => void;
+
+type TouchCallback = (button: number, xy?: { x: number, y: number }) => void;
+
+type DragCallback = (event: {
+  x: number;
+  y: number;
+  dx: number;
+  dy: number;
+  b: 1 | 0;
+}) => void;
+
+type LCDMode =
+  | "direct"
+  | "doublebuffered"
+  | "120x120"
+  | "80x80"
+
+type BangleOptions = {
+  wakeOnBTN1: boolean;
+  wakeOnBTN2: boolean;
+  wakeOnBTN3: boolean;
+  wakeOnFaceUp: boolean;
+  wakeOnTouch: boolean;
+  wakeOnTwist: boolean;
+  twistThreshold: number;
+  twistMaxY: number;
+  twistTimeout: number;
+  gestureStartThresh: number;
+  gestureEndThresh: number;
+  gestureInactiveCount: number;
+  gestureMinLength: number;
+  powerSave: boolean;
+  lockTimeout: number;
+  lcdPowerTimeout: number;
+  backlightTimeout: number;
+};
+
+interface ArrayLike<T> {
+  readonly length: number;
+  readonly [n: number]: T;
+}
+
+type PinMode =
+  | "analog"
+  | "input"
+  | "input_pullup"
+  | "input_pulldown"
+  | "output"
+  | "opendrain"
+  | "af_output"
+  | "af_opendrain";
+
+type ErrorFlag =
+  | "FIFO_FULL"
+  | "BUFFER_FULL"
+  | "CALLBACK"
+  | "LOW_MEMORY"
+  | "MEMORY"
+  | "UART_OVERFLOW";
+
+type Flag =
+  | "deepSleep"
+  | "pretokenise"
+  | "unsafeFlash"
+  | "unsyncFiles";
+
+type Uint8ArrayResolvable =
+  | number
+  | string
+  | Uint8ArrayResolvable[]
+  | ArrayBuffer
+  | ArrayBufferView
+  | { data: Uint8ArrayResolvable, count: number }
+  | { callback: () => Uint8ArrayResolvable }
+
+type VariableSizeInformation = {
+  name: string;
+  size: number;
+  more?: VariableSizeInformation;
+};
+
+
+// CLASSES
+
+/**
+ * Class containing [micro:bit's](https://www.espruino.com/MicroBit) utility
+ * functions.
+ * @url http://www.espruino.com/Reference#Microbit
+ */
+declare class Microbit {
+  /**
+   * The micro:bit's speaker pin
+   * @returns {Pin}
+   * @url http://www.espruino.com/Reference#l_Microbit_SPEAKER
+   */
+  static SPEAKER: Pin;
+
+  /**
+   * The micro:bit's microphone pin
+   * `MIC_ENABLE` should be set to 1 before using this
+   * @returns {Pin}
+   * @url http://www.espruino.com/Reference#l_Microbit_MIC
+   */
+  static MIC: Pin;
+
+  /**
+   * The micro:bit's microphone enable pin
+   * @returns {Pin}
+   * @url http://www.espruino.com/Reference#l_Microbit_MIC_ENABLE
+   */
+  static MIC_ENABLE: Pin;
+
+  /**
+   * Called when the Micro:bit is moved in a deliberate fashion, and includes data on
+   * the detected gesture.
+   * @param {string} event - The event to listen to.
+   * @param {(gesture: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `gesture` An Int8Array containing the accelerations (X,Y,Z) from the last gesture detected by the accelerometer
+   * @url http://www.espruino.com/Reference#l_Microbit_gesture
+   */
+  static on(event: "gesture", callback: (gesture: any) => void): void;
+
+  /**
+   * @returns {any} An Object `{x,y,z}` of magnetometer readings as integers
+   * @url http://www.espruino.com/Reference#l_Microbit_mag
+   */
+  static mag(): any;
+
+  /**
+   * @returns {any} An Object `{x,y,z}` of acceleration readings in G
+   * @url http://www.espruino.com/Reference#l_Microbit_accel
+   */
+  static accel(): any;
+
+  /**
+   * **Note:** This function is only available on the [BBC micro:bit](/MicroBit)
+   * board
+   * Write the given value to the accelerometer
+   *
+   * @param {number} addr - Accelerometer address
+   * @param {number} data - Data to write
+   * @url http://www.espruino.com/Reference#l_Microbit_accelWr
+   */
+  static accelWr(addr: number, data: number): void;
+
+  /**
+   * Turn on the accelerometer, and create `Microbit.accel` and `Microbit.gesture`
+   * events.
+   * **Note:** The accelerometer is currently always enabled - this code just
+   * responds to interrupts and reads
+   * @url http://www.espruino.com/Reference#l_Microbit_accelOn
+   */
+  static accelOn(): void;
+
+  /**
+   * Turn off events from the accelerometer (started with `Microbit.accelOn`)
+   * @url http://www.espruino.com/Reference#l_Microbit_accelOff
+   */
+  static accelOff(): void;
+
+  /**
+   * Play a waveform on the Micro:bit's speaker
+   *
+   * @param {any} waveform - An array of data to play (unsigned 8 bit)
+   * @param {any} samplesPerSecond - The number of samples per second for playback default is 4000
+   * @param {any} callback - A function to call when playback is finished
+   * @url http://www.espruino.com/Reference#l_Microbit_play
+   */
+  static play(waveform: any, samplesPerSecond: any, callback: any): void;
+
+  /**
+   * Records sound from the micro:bit's onboard microphone and returns the result
+   *
+   * @param {any} samplesPerSecond - The number of samples per second for recording - 4000 is recommended
+   * @param {any} callback - A function to call with the result of recording (unsigned 8 bit ArrayBuffer)
+   * @param {any} [samples] - [optional] How many samples to record (6000 default)
+   * @url http://www.espruino.com/Reference#l_Microbit_record
+   */
+  static record(samplesPerSecond: any, callback: any, samples?: any): void;
+
+
+}
+
+interface MathConstructor {
+  /**
+   * @returns {number} The value of E - 2.718281828459045
+   * @url http://www.espruino.com/Reference#l_Math_E
+   */
+  E: number;
+
+  /**
+   * @returns {number} The value of PI - 3.141592653589793
+   * @url http://www.espruino.com/Reference#l_Math_PI
+   */
+  PI: number;
+
+  /**
+   * @returns {number} The natural logarithm of 2 - 0.6931471805599453
+   * @url http://www.espruino.com/Reference#l_Math_LN2
+   */
+  LN2: number;
+
+  /**
+   * @returns {number} The natural logarithm of 10 - 2.302585092994046
+   * @url http://www.espruino.com/Reference#l_Math_LN10
+   */
+  LN10: number;
+
+  /**
+   * @returns {number} The base 2 logarithm of e - 1.4426950408889634
+   * @url http://www.espruino.com/Reference#l_Math_LOG2E
+   */
+  LOG2E: number;
+
+  /**
+   * @returns {number} The base 10 logarithm of e - 0.4342944819032518
+   * @url http://www.espruino.com/Reference#l_Math_LOG10E
+   */
+  LOG10E: number;
+
+  /**
+   * @returns {number} The square root of 2 - 1.4142135623730951
+   * @url http://www.espruino.com/Reference#l_Math_SQRT2
+   */
+  SQRT2: number;
+
+  /**
+   * @returns {number} The square root of 1/2 - 0.7071067811865476
+   * @url http://www.espruino.com/Reference#l_Math_SQRT1_2
+   */
+  SQRT1_2: number;
+
+  /**
+   *
+   * @param {number} x - A floating point value
+   * @returns {number} The absolute value of x (eg, ```Math.abs(2)==2```, but also ```Math.abs(-2)==2```)
+   * @url http://www.espruino.com/Reference#l_Math_abs
+   */
+  abs(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to get the arc cosine of
+   * @returns {number} The arc cosine of x, between 0 and PI
+   * @url http://www.espruino.com/Reference#l_Math_acos
+   */
+  acos(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to get the arc sine of
+   * @returns {number} The arc sine of x, between -PI/2 and PI/2
+   * @url http://www.espruino.com/Reference#l_Math_asin
+   */
+  asin(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to get the arc tangent of
+   * @returns {number} The arc tangent of x, between -PI/2 and PI/2
+   * @url http://www.espruino.com/Reference#l_Math_atan
+   */
+  atan(x: number): number;
+
+  /**
+   *
+   * @param {number} y - The Y-part of the angle to get the arc tangent of
+   * @param {number} x - The X-part of the angle to get the arc tangent of
+   * @returns {number} The arctangent of Y/X, between -PI and PI
+   * @url http://www.espruino.com/Reference#l_Math_atan2
+   */
+  atan2(y: number, x: number): number;
+
+  /**
+   *
+   * @param {number} theta - The angle to get the cosine of
+   * @returns {number} The cosine of theta
+   * @url http://www.espruino.com/Reference#l_Math_cos
+   */
+  cos(theta: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to raise to the power
+   * @param {number} y - The power x should be raised to
+   * @returns {number} x raised to the power y (x^y)
+   * @url http://www.espruino.com/Reference#l_Math_pow
+   */
+  pow(x: number, y: number): number;
+
+  /**
+   * @returns {number} A random number between 0 and 1
+   * @url http://www.espruino.com/Reference#l_Math_random
+   */
+  random(): number;
+
+  /**
+   *
+   * @param {number} x - The value to round
+   * @returns {any} x, rounded to the nearest integer
+   * @url http://www.espruino.com/Reference#l_Math_round
+   */
+  round(x: number): any;
+
+  /**
+   *
+   * @param {number} theta - The angle to get the sine of
+   * @returns {number} The sine of theta
+   * @url http://www.espruino.com/Reference#l_Math_sin
+   */
+  sin(theta: number): number;
+
+  /**
+   *
+   * @param {number} theta - The angle to get the tangent of
+   * @returns {number} The tangent of theta
+   * @url http://www.espruino.com/Reference#l_Math_tan
+   */
+  tan(theta: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to take the square root of
+   * @returns {number} The square root of x
+   * @url http://www.espruino.com/Reference#l_Math_sqrt
+   */
+  sqrt(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to round up
+   * @returns {number} x, rounded upwards to the nearest integer
+   * @url http://www.espruino.com/Reference#l_Math_ceil
+   */
+  ceil(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to round down
+   * @returns {number} x, rounded downwards to the nearest integer
+   * @url http://www.espruino.com/Reference#l_Math_floor
+   */
+  floor(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value raise E to the power of
+   * @returns {number} E^x
+   * @url http://www.espruino.com/Reference#l_Math_exp
+   */
+  exp(x: number): number;
+
+  /**
+   *
+   * @param {number} x - The value to take the logarithm (base E) root of
+   * @returns {number} The log (base E) of x
+   * @url http://www.espruino.com/Reference#l_Math_log
+   */
+  log(x: number): number;
+
+  /**
+   * DEPRECATED - Please use `E.clip()` instead. Clip a number to be between min and
+   * max (inclusive)
+   *
+   * @param {number} x - A floating point value to clip
+   * @param {number} min - The smallest the value should be
+   * @param {number} max - The largest the value should be
+   * @returns {number} The value of x, clipped so as not to be below min or above max.
+   * @url http://www.espruino.com/Reference#l_Math_clip
+   */
+  clip(x: number, min: number, max: number): number;
+
+  /**
+   * DEPRECATED - This is not part of standard JavaScript libraries
+   * Wrap a number around if it is less than 0 or greater than or equal to max. For
+   * instance you might do: ```Math.wrap(angleInDegrees, 360)```
+   *
+   * @param {number} x - A floating point value to wrap
+   * @param {number} max - The largest the value should be
+   * @returns {number} The value of x, wrapped so as not to be below min or above max.
+   * @url http://www.espruino.com/Reference#l_Math_wrap
+   */
+  wrap(x: number, max: number): number;
+
+  /**
+   * Find the minimum of a series of numbers
+   *
+   * @param {any} args - Floating point values to clip
+   * @returns {number} The minimum of the supplied values
+   * @url http://www.espruino.com/Reference#l_Math_min
+   */
+  min(...args: any[]): number;
+
+  /**
+   * Find the maximum of a series of numbers
+   *
+   * @param {any} args - Floating point values to clip
+   * @returns {number} The maximum of the supplied values
+   * @url http://www.espruino.com/Reference#l_Math_max
+   */
+  max(...args: any[]): number;
+}
+
+interface Math {
+
+}
+
+/**
+ * This is a standard JavaScript class that contains useful Maths routines
+ * @url http://www.espruino.com/Reference#Math
+ */
+declare const Math: MathConstructor
+
+/**
+ * Class containing an instance of TFMicroInterpreter
+ * @url http://www.espruino.com/Reference#TFMicroInterpreter
+ */
+declare class TFMicroInterpreter {
+
+
+  /**
+   * @returns {any} An arraybuffer referencing the input data
+   * @url http://www.espruino.com/Reference#l_TFMicroInterpreter_getInput
+   */
+  getInput(): ArrayBufferView;
+
+  /**
+   * @returns {any} An arraybuffer referencing the output data
+   * @url http://www.espruino.com/Reference#l_TFMicroInterpreter_getOutput
+   */
+  getOutput(): ArrayBufferView;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_TFMicroInterpreter_invoke
+   */
+  invoke(): void;
+}
+
+/**
+ * Class containing utility functions for accessing IO on the hexagonal badge
+ * @url http://www.espruino.com/Reference#Badge
+ */
+declare class Badge {
+  /**
+   * Capacitive sense - the higher the capacitance, the higher the number returned.
+   * Supply a corner number between 1 and 6, and an integer value will be returned
+   * that is proportional to the capacitance
+   *
+   * @param {number} corner - The corner to use
+   * @returns {number} Capacitive sense counter
+   * @url http://www.espruino.com/Reference#l_Badge_capSense
+   */
+  static capSense(corner: number): number;
+
+  /**
+   * Return an approximate battery percentage remaining based on a normal CR2032
+   * battery (2.8 - 2.2v)
+   * @returns {number} A percentage between 0 and 100
+   * @url http://www.espruino.com/Reference#l_Badge_getBatteryPercentage
+   */
+  static getBatteryPercentage(): number;
+
+  /**
+   * Set the LCD's contrast
+   *
+   * @param {number} c - Contrast between 0 and 1
+   * @url http://www.espruino.com/Reference#l_Badge_setContrast
+   */
+  static setContrast(c: number): void;
+
+
+}
+
+/**
+ * Class containing [Puck.js's](http://www.puck-js.com) utility functions.
+ * @url http://www.espruino.com/Reference#Puck
+ */
+declare class Puck {
+  /**
+   * Turn on the magnetometer, take a single reading, and then turn it off again.
+   * An object of the form `{x,y,z}` is returned containing magnetometer readings.
+   * Due to residual magnetism in the Puck and magnetometer itself, with no magnetic
+   * field the Puck will not return `{x:0,y:0,z:0}`.
+   * Instead, it's up to you to figure out what the 'zero value' is for your Puck in
+   * your location and to then subtract that from the value returned. If you're not
+   * trying to measure the Earth's magnetic field then it's a good idea to just take
+   * a reading at startup and use that.
+   * With the aerial at the top of the board, the `y` reading is vertical, `x` is
+   * horizontal, and `z` is through the board.
+   * Readings are in increments of 0.1 micro Tesla (uT). The Earth's magnetic field
+   * varies from around 25-60 uT, so the reading will vary by 250 to 600 depending on
+   * location.
+   * @returns {any} An Object `{x,y,z}` of magnetometer readings as integers
+   * @url http://www.espruino.com/Reference#l_Puck_mag
+   */
+  static mag(): any;
+
+  /**
+   * Turn on the magnetometer, take a single temperature reading from the MAG3110
+   * chip, and then turn it off again.
+   * (If the magnetometer is already on, this just returns the last reading obtained)
+   * `E.getTemperature()` uses the microcontroller's temperature sensor, but this
+   * uses the magnetometer's.
+   * The reading obtained is an integer (so no decimal places), but the sensitivity
+   * is factory trimmed. to 1&deg;C, however the temperature offset isn't - so
+   * absolute readings may still need calibrating.
+   * @returns {number} Temperature in degrees C
+   * @url http://www.espruino.com/Reference#l_Puck_magTemp
+   */
+  static magTemp(): number;
+
+  /**
+   * Called after `Puck.magOn()` every time magnetometer data is sampled. There is
+   * one argument which is an object of the form `{x,y,z}` containing magnetometer
+   * readings as integers (for more information see `Puck.mag()`).
+   * Check out [the Puck.js page on the
+   * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Puck_mag
+   */
+  static on(event: "mag", callback: () => void): void;
+
+  /**
+   * Only on Puck.js v2.0
+   * Called after `Puck.accelOn()` every time accelerometer data is sampled. There is
+   * one argument which is an object of the form `{acc:{x,y,z}, gyro:{x,y,z}}`
+   * containing the data.
+   * The data is as it comes off the accelerometer and is not scaled to 1g. For more
+   * information see `Puck.accel()` or [the Puck.js page on the
+   * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals).
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Puck_accel
+   */
+  static on(event: "accel", callback: () => void): void;
+
+  /**
+   * Turn the magnetometer on and start periodic sampling. Samples will then cause a
+   * 'mag' event on 'Puck':
+   * ```
+   * Puck.magOn();
+   * Puck.on('mag', function(xyz) {
+   *   console.log(xyz);
+   *   // {x:..., y:..., z:...}
+   * });
+   * // Turn events off with Puck.magOff();
+   * ```
+   * This call will be ignored if the sampling is already on.
+   * If given an argument, the sample rate is set (if not, it's at 0.63 Hz). The
+   * sample rate must be one of the following (resulting in the given power
+   * consumption):
+   * * 80 Hz - 900uA
+   * * 40 Hz - 550uA
+   * * 20 Hz - 275uA
+   * * 10 Hz - 137uA
+   * * 5 Hz - 69uA
+   * * 2.5 Hz - 34uA
+   * * 1.25 Hz - 17uA
+   * * 0.63 Hz - 8uA
+   * * 0.31 Hz - 8uA
+   * * 0.16 Hz - 8uA
+   * * 0.08 Hz - 8uA
+   * When the battery level drops too low while sampling is turned on, the
+   * magnetometer may stop sampling without warning, even while other Puck functions
+   * continue uninterrupted.
+   * Check out [the Puck.js page on the
+   * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information.
+   *
+   * @param {number} samplerate - The sample rate in Hz, or undefined
+   * @url http://www.espruino.com/Reference#l_Puck_magOn
+   */
+  static magOn(samplerate: number): void;
+
+  /**
+   * Turn the magnetometer off
+   * @url http://www.espruino.com/Reference#l_Puck_magOff
+   */
+  static magOff(): void;
+
+  /**
+   * Writes a register on the LIS3MDL / MAX3110 Magnetometer. Can be used for
+   * configuring advanced functions.
+   * Check out [the Puck.js page on the
+   * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information and links to modules that use this function.
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Puck_magWr
+   */
+  static magWr(reg: number, data: number): void;
+
+  /**
+   * Reads a register from the LIS3MDL / MAX3110 Magnetometer. Can be used for
+   * configuring advanced functions.
+   * Check out [the Puck.js page on the
+   * magnetometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information and links to modules that use this function.
+   *
+   * @param {number} reg
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Puck_magRd
+   */
+  static magRd(reg: number): number;
+
+  /**
+   * On Puck.js v2.0 this will use the on-board PCT2075TP temperature sensor, but on
+   * Puck.js the less accurate on-chip Temperature sensor is used.
+   * @returns {number} Temperature in degrees C
+   * @url http://www.espruino.com/Reference#l_Puck_getTemperature
+   */
+  static getTemperature(): number;
+
+  /**
+   * Accepted values are:
+   * * 1.6 Hz (no Gyro) - 40uA (2v05 and later firmware)
+   * * 12.5 Hz (with Gyro)- 350uA
+   * * 26 Hz (with Gyro) - 450 uA
+   * * 52 Hz (with Gyro) - 600 uA
+   * * 104 Hz (with Gyro) - 900 uA
+   * * 208 Hz (with Gyro) - 1500 uA
+   * * 416 Hz (with Gyro) (not recommended)
+   * * 833 Hz (with Gyro) (not recommended)
+   * * 1660 Hz (with Gyro) (not recommended)
+   * Once `Puck.accelOn()` is called, the `Puck.accel` event will be called each time
+   * data is received. `Puck.accelOff()` can be called to turn the accelerometer off.
+   * For instance to light the red LED whenever Puck.js is face up:
+   * ```
+   * Puck.on('accel', function(a) {
+   *  digitalWrite(LED1, a.acc.z > 0);
+   * });
+   * Puck.accelOn();
+   * ```
+   * Check out [the Puck.js page on the
+   * accelerometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information.
+   *
+   * @param {number} samplerate - The sample rate in Hz, or undefined
+   * @url http://www.espruino.com/Reference#l_Puck_accelOn
+   */
+  static accelOn(samplerate: number): void;
+
+  /**
+   * Turn the accelerometer off after it has been turned on by `Puck.accelOn()`.
+   * Check out [the Puck.js page on the
+   * accelerometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information.
+   * @url http://www.espruino.com/Reference#l_Puck_accelOff
+   */
+  static accelOff(): void;
+
+  /**
+   * Turn on the accelerometer, take a single reading, and then turn it off again.
+   * The values reported are the raw values from the chip. In normal configuration:
+   * * accelerometer: full-scale (32768) is 4g, so you need to divide by 8192 to get
+   *   correctly scaled values
+   * * gyro: full-scale (32768) is 245 dps, so you need to divide by 134 to get
+   *   correctly scaled values
+   * If taking more than one reading, we'd suggest you use `Puck.accelOn()` and the
+   * `Puck.accel` event.
+   * @returns {any} An Object `{acc:{x,y,z}, gyro:{x,y,z}}` of accelerometer/gyro readings
+   * @url http://www.espruino.com/Reference#l_Puck_accel
+   */
+  static accel(): any;
+
+  /**
+   * Writes a register on the LSM6DS3TR-C Accelerometer. Can be used for configuring
+   * advanced functions.
+   * Check out [the Puck.js page on the
+   * accelerometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information and links to modules that use this function.
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Puck_accelWr
+   */
+  static accelWr(reg: number, data: number): void;
+
+  /**
+   * Reads a register from the LSM6DS3TR-C Accelerometer. Can be used for configuring
+   * advanced functions.
+   * Check out [the Puck.js page on the
+   * accelerometer](http://www.espruino.com/Puck.js#on-board-peripherals) for more
+   * information and links to modules that use this function.
+   *
+   * @param {number} reg
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Puck_accelRd
+   */
+  static accelRd(reg: number): number;
+
+  /**
+   * Transmit the given set of IR pulses - data should be an array of pulse times in
+   * milliseconds (as `[on, off, on, off, on, etc]`).
+   * For example `Puck.IR(pulseTimes)` - see http://www.espruino.com/Puck.js+Infrared
+   * for a full example.
+   * You can also attach an external LED to Puck.js, in which case you can just
+   * execute `Puck.IR(pulseTimes, led_cathode, led_anode)`
+   * It is also possible to just supply a single pin for IR transmission with
+   * `Puck.IR(pulseTimes, led_anode)` (on 2v05 and above).
+   *
+   * @param {any} data - An array of pulse lengths, in milliseconds
+   * @param {Pin} cathode - (optional) pin to use for IR LED cathode - if not defined, the built-in IR LED is used
+   * @param {Pin} anode - (optional) pin to use for IR LED anode - if not defined, the built-in IR LED is used
+   * @url http://www.espruino.com/Reference#l_Puck_IR
+   */
+  static IR(data: any, cathode: Pin, anode: Pin): void;
+
+  /**
+   * Capacitive sense - the higher the capacitance, the higher the number returned.
+   * If called without arguments, a value depending on the capacitance of what is
+   * attached to pin D11 will be returned. If you attach a length of wire to D11,
+   * you'll be able to see a higher value returned when your hand is near the wire
+   * than when it is away.
+   * You can also supply pins to use yourself, however if you do this then the TX pin
+   * must be connected to RX pin and sense plate via a roughly 1MOhm resistor.
+   * When not supplying pins, Puck.js uses an internal resistor between D12(tx) and
+   * D11(rx).
+   *
+   * @param {Pin} tx
+   * @param {Pin} rx
+   * @returns {number} Capacitive sense counter
+   * @url http://www.espruino.com/Reference#l_Puck_capSense
+   */
+  static capSense(tx: Pin, rx: Pin): number;
+
+  /**
+   * Return a light value based on the light the red LED is seeing.
+   * **Note:** If called more than 5 times per second, the received light value may
+   * not be accurate.
+   * @returns {number} A light value from 0 to 1
+   * @url http://www.espruino.com/Reference#l_Puck_light
+   */
+  static light(): number;
+
+  /**
+   * DEPRECATED - Please use `E.getBattery()` instead.
+   * Return an approximate battery percentage remaining based on a normal CR2032
+   * battery (2.8 - 2.2v).
+   * @returns {number} A percentage between 0 and 100
+   * @url http://www.espruino.com/Reference#l_Puck_getBatteryPercentage
+   */
+  static getBatteryPercentage(): number;
+
+  /**
+   * Run a self-test, and return true for a pass. This checks for shorts between
+   * pins, so your Puck shouldn't have anything connected to it.
+   * **Note:** This self-test auto starts if you hold the button on your Puck down
+   * while inserting the battery, leave it pressed for 3 seconds (while the green LED
+   * is lit) and release it soon after all LEDs turn on. 5 red blinks is a fail, 5
+   * green is a pass.
+   * If the self test fails, it'll set the Puck.js Bluetooth advertising name to
+   * `Puck.js !ERR` where ERR is a 3 letter error code.
+   * @returns {boolean} True if the self-test passed
+   * @url http://www.espruino.com/Reference#l_Puck_selfTest
+   */
+  static selfTest(): boolean;
+
+
+}
+
+/**
+ * This is the File object - it allows you to stream data to and from files (As
+ * opposed to the `require('fs').readFile(..)` style functions that read an entire
+ * file).
+ * To create a File object, you must type ```var fd =
+ * E.openFile('filepath','mode')``` - see [E.openFile](#l_E_openFile) for more
+ * information.
+ * **Note:** If you want to remove an SD card after you have started using it, you
+ * *must* call `E.unmountSD()` or you may cause damage to the card.
+ * @url http://www.espruino.com/Reference#File
+ */
+declare class File {
+
+
+  /**
+   * Close an open file.
+   * @url http://www.espruino.com/Reference#l_File_close
+   */
+  close(): void;
+
+  /**
+   * Write data to a file.
+   * **Note:** By default this function flushes all changes to the SD card, which
+   * makes it slow (but also safe!). You can use `E.setFlags({unsyncFiles:1})` to
+   * disable this behaviour and really speed up writes - but then you must be sure to
+   * close all files you are writing before power is lost or you will cause damage to
+   * your SD card's filesystem.
+   *
+   * @param {any} buffer - A string containing the bytes to write
+   * @returns {number} the number of bytes written
+   * @url http://www.espruino.com/Reference#l_File_write
+   */
+  write(buffer: any): number;
+
+  /**
+   * Read data in a file in byte size chunks
+   *
+   * @param {number} length - is an integer specifying the number of bytes to read.
+   * @returns {any} A string containing the characters that were read
+   * @url http://www.espruino.com/Reference#l_File_read
+   */
+  read(length: number): any;
+
+  /**
+   * Skip the specified number of bytes forward in the file
+   *
+   * @param {number} nBytes - is a positive integer specifying the number of bytes to skip forwards.
+   * @url http://www.espruino.com/Reference#l_File_skip
+   */
+  skip(nBytes: number): void;
+
+  /**
+   * Seek to a certain position in the file
+   *
+   * @param {number} nBytes - is an integer specifying the number of bytes to skip forwards.
+   * @url http://www.espruino.com/Reference#l_File_seek
+   */
+  seek(nBytes: number): void;
+
+  /**
+   * Pipe this file to a stream (an object with a 'write' method)
+   *
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=32, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_File_pipe
+   */
+  pipe(destination: any, options: any): void;
+}
+
+/**
+ * Class containing utility functions for the Seeed WIO LTE board
+ * @url http://www.espruino.com/Reference#WioLTE
+ */
+declare class WioLTE {
+  /**
+   * Set the WIO's LED
+   *
+   * @param {number} red - 0-255, red LED intensity
+   * @param {number} green - 0-255, green LED intensity
+   * @param {number} blue - 0-255, blue LED intensity
+   * @url http://www.espruino.com/Reference#l_WioLTE_LED
+   */
+  static LED(red: number, green: number, blue: number): void;
+
+  /**
+   * Set the power of Grove connectors, except for `D38` and `D39` which are always
+   * on.
+   *
+   * @param {boolean} onoff - Whether to turn the Grove connectors power on or off (D38/D39 are always powered)
+   * @url http://www.espruino.com/Reference#l_WioLTE_setGrovePower
+   */
+  static setGrovePower(onoff: boolean): void;
+
+  /**
+   * Turn power to the WIO's LED on or off.
+   * Turning the LED on won't immediately display a color - that must be done with
+   * `WioLTE.LED(r,g,b)`
+   *
+   * @param {boolean} onoff - true = on, false = off
+   * @url http://www.espruino.com/Reference#l_WioLTE_setLEDPower
+   */
+  static setLEDPower(onoff: boolean): void;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_D38
+   */
+  static D38: any;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_D20
+   */
+  static D20: any;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_A6
+   */
+  static A6: any;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_I2C
+   */
+  static I2C: any;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_UART
+   */
+  static UART: any;
+
+  /**
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WioLTE_A4
+   */
+  static A4: any;
+
+
+}
+
+/**
+ * Class containing utility functions for
+ * [Pixl.js](http://www.espruino.com/Pixl.js)
+ * @url http://www.espruino.com/Reference#Pixl
+ */
+declare class Pixl {
+  /**
+   * DEPRECATED - Please use `E.getBattery()` instead.
+   * Return an approximate battery percentage remaining based on a normal CR2032
+   * battery (2.8 - 2.2v)
+   * @returns {number} A percentage between 0 and 100
+   * @url http://www.espruino.com/Reference#l_Pixl_getBatteryPercentage
+   */
+  static getBatteryPercentage(): number;
+
+  /**
+   * Set the LCD's contrast
+   *
+   * @param {number} c - Contrast between 0 and 1
+   * @url http://www.espruino.com/Reference#l_Pixl_setContrast
+   */
+  static setContrast(c: number): void;
+
+  /**
+   * This function can be used to turn Pixl.js's LCD off or on.
+   * * With the LCD off, Pixl.js draws around 0.1mA
+   * * With the LCD on, Pixl.js draws around 0.25mA
+   *
+   * @param {boolean} isOn - True if the LCD should be on, false if not
+   * @url http://www.espruino.com/Reference#l_Pixl_setLCDPower
+   */
+  static setLCDPower(isOn: boolean): void;
+
+  /**
+   * Writes a command directly to the ST7567 LCD controller
+   *
+   * @param {number} c
+   * @url http://www.espruino.com/Reference#l_Pixl_lcdw
+   */
+  static lcdw(c: number): void;
+
+  /**
+   * Display a menu on Pixl.js's screen, and set up the buttons to navigate through
+   * it.
+   * DEPRECATED: Use `E.showMenu`
+   *
+   * @param {any} menu - An object containing name->function mappings to to be used in a menu
+   * @returns {any} A menu object with `draw`, `move` and `select` functions
+   * @url http://www.espruino.com/Reference#l_Pixl_menu
+   */
+  static menu(menu: Menu): MenuInstance;
+
+
+}
+
+/**
+ * This class exists in order to interface Espruino with fast-moving trigger
+ * wheels. Trigger wheels are physical discs with evenly spaced teeth cut into
+ * them, and often with one or two teeth next to each other missing. A sensor sends
+ * a signal whenever a tooth passed by, and this allows a device to measure not
+ * only RPM, but absolute position.
+ * This class is currently in testing - it is NOT AVAILABLE on normal boards.
+ * @url http://www.espruino.com/Reference#Trig
+ */
+declare class Trig {
+  /**
+   * Get the position of the trigger wheel at the given time (from getTime)
+   *
+   * @param {number} time - The time at which to find the position
+   * @returns {number} The position of the trigger wheel in degrees - as a floating point number
+   * @url http://www.espruino.com/Reference#l_Trig_getPosAtTime
+   */
+  static getPosAtTime(time: number): number;
+
+  /**
+   * Initialise the trigger class
+   *
+   * @param {Pin} pin - The pin to use for triggering
+   * @param {any} options - Additional options as an object. defaults are: ```{teethTotal:60,teethMissing:2,minRPM:30,keyPosition:0}```
+   * @url http://www.espruino.com/Reference#l_Trig_setup
+   */
+  static setup(pin: Pin, options: any): void;
+
+  /**
+   * Set a trigger for a certain point in the cycle
+   *
+   * @param {number} num - The trigger number (0..7)
+   * @param {number} pos - The position (in degrees) to fire the trigger at
+   * @param {any} pins - An array of pins to pulse (max 4)
+   * @param {number} pulseLength - The time (in msec) to pulse for
+   * @url http://www.espruino.com/Reference#l_Trig_setTrigger
+   */
+  static setTrigger(num: number, pos: number, pins: any, pulseLength: number): void;
+
+  /**
+   * Disable a trigger
+   *
+   * @param {number} num - The trigger number (0..7)
+   * @url http://www.espruino.com/Reference#l_Trig_killTrigger
+   */
+  static killTrigger(num: number): void;
+
+  /**
+   * Get the current state of a trigger
+   *
+   * @param {number} num - The trigger number (0..7)
+   * @returns {any} A structure containing all information about the trigger
+   * @url http://www.espruino.com/Reference#l_Trig_getTrigger
+   */
+  static getTrigger(num: number): any;
+
+  /**
+   * Get the RPM of the trigger wheel
+   * @returns {number} The current RPM of the trigger wheel
+   * @url http://www.espruino.com/Reference#l_Trig_getRPM
+   */
+  static getRPM(): number;
+
+  /**
+   * Get the current error flags from the trigger wheel - and zero them
+   * @returns {number} The error flags
+   * @url http://www.espruino.com/Reference#l_Trig_getErrors
+   */
+  static getErrors(): number;
+
+  /**
+   * Get the current error flags from the trigger wheel - and zero them
+   * @returns {any} An array of error strings
+   * @url http://www.espruino.com/Reference#l_Trig_getErrorArray
+   */
+  static getErrorArray(): any;
+
+
+}
+
+/**
+ * Class containing AES encryption/decryption
+ * **Note:** This library is currently only included in builds for boards where
+ * there is space. For other boards there is `crypto.js` which implements SHA1 in
+ * JS.
+ * @url http://www.espruino.com/Reference#AES
+ */
+declare class AES {
+  /**
+   *
+   * @param {any} passphrase - Message to encrypt
+   * @param {any} key - Key to encrypt message - must be an ArrayBuffer of 128, 192, or 256 BITS
+   * @param {any} options - An optional object, may specify `{ iv : new Uint8Array(16), mode : 'CBC|CFB|CTR|OFB|ECB' }`
+   * @returns {any} Returns an ArrayBuffer
+   * @url http://www.espruino.com/Reference#l_AES_encrypt
+   */
+  static encrypt(passphrase: any, key: any, options: any): ArrayBuffer;
+
+  /**
+   *
+   * @param {any} passphrase - Message to decrypt
+   * @param {any} key - Key to encrypt message - must be an ArrayBuffer of 128, 192, or 256 BITS
+   * @param {any} options - An optional object, may specify `{ iv : new Uint8Array(16), mode : 'CBC|CFB|CTR|OFB|ECB' }`
+   * @returns {any} Returns an ArrayBuffer
+   * @url http://www.espruino.com/Reference#l_AES_decrypt
+   */
+  static decrypt(passphrase: any, key: any, options: any): ArrayBuffer;
+
+
+}
+
+/**
+ * This class provides Graphics operations that can be applied to a surface.
+ * Use Graphics.createXXX to create a graphics object that renders in the way you
+ * want. See [the Graphics page](https://www.espruino.com/Graphics) for more
+ * information.
+ * **Note:** On boards that contain an LCD, there is a built-in 'LCD' object of
+ * type Graphics. For instance to draw a line you'd type:
+ * ```LCD.drawLine(0,0,100,100)```
+ * @url http://www.espruino.com/Reference#Graphics
+ */
+declare class Graphics<IsBuffer extends boolean = boolean> {
+  /**
+   * On devices like Pixl.js or HYSTM boards that contain a built-in display this
+   * will return an instance of the graphics class that can be used to access that
+   * display.
+   * Internally, this is stored as a member called `gfx` inside the 'hiddenRoot'.
+   * @returns {any} An instance of `Graphics` or undefined
+   * @url http://www.espruino.com/Reference#l_Graphics_getInstance
+   */
+  static getInstance(): Graphics | undefined
+
+  /**
+   * Create a Graphics object that renders to an Array Buffer. This will have a field
+   * called 'buffer' that can get used to get at the buffer itself
+   *
+   * @param {number} width - Pixels wide
+   * @param {number} height - Pixels high
+   * @param {number} bpp - Number of bits per pixel
+   * @param {any} options
+   * An object of other options. `{ zigzag : true/false(default), vertical_byte : true/false(default), msb : true/false(default), color_order: 'rgb'(default),'bgr',etc }`
+   * `zigzag` = whether to alternate the direction of scanlines for rows
+   * `vertical_byte` = whether to align bits in a byte vertically or not
+   * `msb` = when bits<8, store pixels most significant bit first, when bits>8, store most significant byte first
+   * `interleavex` = Pixels 0,2,4,etc are from the top half of the image, 1,3,5,etc from the bottom half. Used for P3 LED panels.
+   * `color_order` = re-orders the colour values that are supplied via setColor
+   * @returns {any} The new Graphics object
+   * @url http://www.espruino.com/Reference#l_Graphics_createArrayBuffer
+   */
+  static createArrayBuffer(width: number, height: number, bpp: number, options?: { zigzag?: boolean, vertical_byte?: boolean, msb?: boolean, color_order?: "rgb" | "rbg" | "brg" | "bgr" | "grb" | "gbr" }): Graphics<true>;
+
+  /**
+   * Create a Graphics object that renders by calling a JavaScript callback function
+   * to draw pixels
+   *
+   * @param {number} width - Pixels wide
+   * @param {number} height - Pixels high
+   * @param {number} bpp - Number of bits per pixel
+   * @param {any} callback - A function of the form ```function(x,y,col)``` that is called whenever a pixel needs to be drawn, or an object with: ```{setPixel:function(x,y,col),fillRect:function(x1,y1,x2,y2,col)}```. All arguments are already bounds checked.
+   * @returns {any} The new Graphics object
+   * @url http://www.espruino.com/Reference#l_Graphics_createCallback
+   */
+  static createCallback(width: number, height: number, bpp: number, callback: ((x: number, y: number, col: number) => void) | { setPixel: (x: number, y: number, col: number) => void; fillRect: (x1: number, y1: number, x2: number, y2: number, col: number) => void }): Graphics<false>;
+
+  /**
+   * Create a Graphics object that renders to SDL window (Linux-based devices only)
+   *
+   * @param {number} width - Pixels wide
+   * @param {number} height - Pixels high
+   * @param {number} bpp - Bits per pixel (8,16,24 or 32 supported)
+   * @returns {any} The new Graphics object
+   * @url http://www.espruino.com/Reference#l_Graphics_createSDL
+   */
+  static createSDL(width: number, height: number, bpp: number): Graphics;
+
+  /**
+   * Create a simple Black and White image for use with `Graphics.drawImage`.
+   * Use as follows:
+   * ```
+   * var img = Graphics.createImage(`
+   * XXXXXXXXX
+   * X       X
+   * X   X   X
+   * X   X   X
+   * X       X
+   * XXXXXXXXX
+   * `);
+   * g.drawImage(img, x,y);
+   * ```
+   * If the characters at the beginning and end of the string are newlines, they will
+   * be ignored. Spaces are treated as `0`, and any other character is a `1`
+   *
+   * @param {any} str - A String containing a newline-separated image - space is 0, anything else is 1
+   * @returns {any} An Image object that can be used with `Graphics.drawImage`
+   * @url http://www.espruino.com/Reference#l_Graphics_createImage
+   */
+  static createImage(str: string): ImageObject;
+
+  /**
+   * Set the current font
+   *
+   * @param {number} scale - (optional) If >1 the font will be scaled up by that amount
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFont6x15
+   */
+  setFont6x15(scale: number): Graphics;
+
+  /**
+   * Set the current font
+   *
+   * @param {number} scale - (optional) If >1 the font will be scaled up by that amount
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFont12x20
+   */
+  setFont12x20(scale: number): Graphics;
+
+  /**
+   * On instances of graphics that drive a display with an offscreen buffer, calling
+   * this function will copy the contents of the offscreen buffer to the screen.
+   * Call this when you have drawn something to Graphics and you want it shown on the
+   * screen.
+   * If a display does not have an offscreen buffer, it may not have a `g.flip()`
+   * method.
+   * On Bangle.js 1, there are different graphics modes chosen with
+   * `Bangle.setLCDMode()`. The default mode is unbuffered and in this mode
+   * `g.flip()` does not affect the screen contents.
+   * On some devices, this command will attempt to only update the areas of the
+   * screen that have changed in order to increase speed. If you have accessed the
+   * `Graphics.buffer` directly then you may need to use `Graphics.flip(true)` to
+   * force a full update of the screen.
+   *
+   * @param {boolean} [all] - [optional] (only on some devices) If `true` then copy all pixels, not just those that have changed.
+   * @url http://www.espruino.com/Reference#l_Graphics_flip
+   */
+  flip(all?: boolean): void;
+
+  /**
+   * On Graphics instances with an offscreen buffer, this is an `ArrayBuffer` that
+   * provides access to the underlying pixel data.
+   * ```
+   * g=Graphics.createArrayBuffer(8,8,8)
+   * g.drawLine(0,0,7,7)
+   * print(new Uint8Array(g.buffer))
+   * new Uint8Array([
+   * 255, 0, 0, 0, 0, 0, 0, 0,
+   * 0, 255, 0, 0, 0, 0, 0, 0,
+   * 0, 0, 255, 0, 0, 0, 0, 0,
+   * 0, 0, 0, 255, 0, 0, 0, 0,
+   * 0, 0, 0, 0, 255, 0, 0, 0,
+   * 0, 0, 0, 0, 0, 255, 0, 0,
+   * 0, 0, 0, 0, 0, 0, 255, 0,
+   * 0, 0, 0, 0, 0, 0, 0, 255])
+   * ```
+   * @returns {any} An ArrayBuffer (or not defined on Graphics instances not created with `Graphics.createArrayBuffer`)
+   * @url http://www.espruino.com/Reference#l_Graphics_buffer
+   */
+  buffer: IsBuffer extends true ? ArrayBuffer : undefined
+
+  /**
+   * The width of this Graphics instance
+   * @returns {number} The width of this Graphics instance
+   * @url http://www.espruino.com/Reference#l_Graphics_getWidth
+   */
+  getWidth(): number;
+
+  /**
+   * The height of this Graphics instance
+   * @returns {number} The height of this Graphics instance
+   * @url http://www.espruino.com/Reference#l_Graphics_getHeight
+   */
+  getHeight(): number;
+
+  /**
+   * The number of bits per pixel of this Graphics instance
+   * **Note:** Bangle.js 2 behaves a little differently here. The display is 3 bit,
+   * so `getBPP` returns 3 and `asBMP`/`asImage`/etc return 3 bit images. However in
+   * order to allow dithering, the colors returned by `Graphics.getColor` and
+   * `Graphics.theme` are actually 16 bits.
+   * @returns {number} The bits per pixel of this Graphics instance
+   * @url http://www.espruino.com/Reference#l_Graphics_getBPP
+   */
+  getBPP(): number;
+
+  /**
+   * Reset the state of Graphics to the defaults (e.g. Color, Font, etc) that would
+   * have been used when Graphics was initialised.
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_reset
+   */
+  reset(): Graphics;
+
+  /**
+   * Clear the LCD with the Background Color
+   *
+   * @param {boolean} [reset] - [optional] If `true`, resets the state of Graphics to the default (eg. Color, Font, etc) as if calling `Graphics.reset`
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_clear
+   */
+  clear(reset?: boolean): Graphics;
+
+  /**
+   * Fill a rectangular area in the Foreground Color
+   * On devices with enough memory, you can specify `{x,y,x2,y2,r}` as the first
+   * argument, which allows you to draw a rounded rectangle.
+   *
+   * @param {any} x1 - The left X coordinate OR an object containing `{x,y,x2,y2}` or `{x,y,w,h}`
+   * @param {number} y1 - The top Y coordinate
+   * @param {number} x2 - The right X coordinate
+   * @param {number} y2 - The bottom Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillRect
+   */
+  fillRect(x1: number, y1: number, x2: number, y2: number): Graphics;
+  fillRect(rect: { x: number, y: number, x2: number, y2: number } | { x: number, y: number, w: number, h: number }): Graphics;
+
+  /**
+   * Fill a rectangular area in the Background Color
+   * On devices with enough memory, you can specify `{x,y,x2,y2,r}` as the first
+   * argument, which allows you to draw a rounded rectangle.
+   *
+   * @param {any} x1 - The left X coordinate OR an object containing `{x,y,x2,y2}` or `{x,y,w,h}`
+   * @param {number} y1 - The top Y coordinate
+   * @param {number} x2 - The right X coordinate
+   * @param {number} y2 - The bottom Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_clearRect
+   */
+  clearRect(x1: number, y1: number, x2: number, y2: number): Graphics;
+  clearRect(rect: { x: number, y: number, x2: number, y2: number } | { x: number, y: number, w: number, h: number }): Graphics;
+
+  /**
+   * Draw an unfilled rectangle 1px wide in the Foreground Color
+   *
+   * @param {any} x1 - The left X coordinate OR an object containing `{x,y,x2,y2}` or `{x,y,w,h}`
+   * @param {number} y1 - The top Y coordinate
+   * @param {number} x2 - The right X coordinate
+   * @param {number} y2 - The bottom Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawRect
+   */
+  drawRect(x1: number, y1: number, x2: number, y2: number): Graphics;
+  drawRect(rect: { x: number, y: number, x2: number, y2: number } | { x: number, y: number, w: number, h: number }): Graphics;
+
+  /**
+   * Draw a filled circle in the Foreground Color
+   *
+   * @param {number} x - The X axis
+   * @param {number} y - The Y axis
+   * @param {number} rad - The circle radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillCircle
+   */
+  fillCircle(x: number, y: number, rad: number): Graphics;
+
+  /**
+   * Draw an unfilled circle 1px wide in the Foreground Color
+   *
+   * @param {number} x - The X axis
+   * @param {number} y - The Y axis
+   * @param {number} rad - The circle radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawCircle
+   */
+  drawCircle(x: number, y: number, rad: number): Graphics;
+
+  /**
+   * Draw a circle, centred at (x,y) with radius r in the current foreground color
+   *
+   * @param {number} x - Centre x-coordinate
+   * @param {number} y - Centre y-coordinate
+   * @param {number} r - Radius
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawCircleAA
+   */
+  drawCircleAA(x: number, y: number, r: number): Graphics;
+
+  /**
+   * Draw a filled ellipse in the Foreground Color
+   *
+   * @param {number} x1 - The left X coordinate
+   * @param {number} y1 - The top Y coordinate
+   * @param {number} x2 - The right X coordinate
+   * @param {number} y2 - The bottom Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillEllipse
+   */
+  fillEllipse(x1: number, y1: number, x2: number, y2: number): Graphics;
+
+  /**
+   * Draw an ellipse in the Foreground Color
+   *
+   * @param {number} x1 - The left X coordinate
+   * @param {number} y1 - The top Y coordinate
+   * @param {number} x2 - The right X coordinate
+   * @param {number} y2 - The bottom Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawEllipse
+   */
+  drawEllipse(x1: number, y1: number, x2: number, y2: number): Graphics;
+
+  /**
+   * Get a pixel's color
+   *
+   * @param {number} x - The left
+   * @param {number} y - The top
+   * @returns {number} The color
+   * @url http://www.espruino.com/Reference#l_Graphics_getPixel
+   */
+  getPixel(x: number, y: number): number;
+
+  /**
+   * Set a pixel's color
+   *
+   * @param {number} x - The left
+   * @param {number} y - The top
+   * @param {any} col - The color (if `undefined`, the foreground color is useD)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setPixel
+   */
+  setPixel(x: number, y: number, col?: ColorResolvable): Graphics;
+
+  /**
+   * Work out the color value to be used in the current bit depth based on the arguments.
+   * This is used internally by setColor and setBgColor
+   * ```
+   * // 1 bit
+   * g.toColor(1,1,1) => 1
+   * // 16 bit
+   * g.toColor(1,0,0) => 0xF800
+   * ```
+   *
+   * @param {any} r - Red (between 0 and 1) **OR** an integer representing the color in the current bit depth and color order **OR** a hexidecimal color string of the form `'#rrggbb' or `'#rgb'`
+   * @param {any} g - Green (between 0 and 1)
+   * @param {any} b - Blue (between 0 and 1)
+   * @returns {number} The color index represented by the arguments
+   * @url http://www.espruino.com/Reference#l_Graphics_toColor
+   */
+  toColor(r: number, g: number, b: number): number;
+  toColor(col: ColorResolvable): number;
+
+  /**
+   * Blend between two colors, and return the result.
+   * ```
+   * // dark yellow - halfway between red and green
+   * var col = g.blendColor("#f00","#0f0", 0.5);
+   * // Get a color 25% brighter than the theme's background colour
+   * var col = g.blendColor(g.theme.fg,g.theme.bg, 0.75);
+   * // then...
+   * g.setColor(col).fillRect(10,10,100,100);
+   * ```
+   *
+   * @param {any} col_a - Color to blend from (either a single integer color value, or a string)
+   * @param {any} col_b - Color to blend to (either a single integer color value, or a string)
+   * @param {any} amt - The amount to blend. 0=col_a, 1=col_b, 0.5=halfway between (and so on)
+   * @returns {number} The color index represented by the blended colors
+   * @url http://www.espruino.com/Reference#l_Graphics_blendColor
+   */
+  blendColor(col_a: ColorResolvable, col_b: ColorResolvable, amt: number): number;
+
+  /**
+   * Set the color to use for subsequent drawing operations.
+   * If just `r` is specified as an integer, the numeric value will be written directly into a pixel. eg. On a 24 bit `Graphics` instance you set bright blue with either `g.setColor(0,0,1)` or `g.setColor(0x0000FF)`.
+   * A good shortcut to ensure you get white on all platforms is to use `g.setColor(-1)`
+   * The mapping is as follows:
+   * * 32 bit: `r,g,b` => `0xFFrrggbb`
+   * * 24 bit: `r,g,b` => `0xrrggbb`
+   * * 16 bit: `r,g,b` => `0brrrrrggggggbbbbb` (RGB565)
+   * * Other bpp: `r,g,b` => white if `r+g+b > 50%`, otherwise black (use `r` on its own as an integer)
+   * If you specified `color_order` when creating the `Graphics` instance, `r`,`g` and `b` will be swapped as you specified.
+   * **Note:** On devices with low flash memory, `r` **must** be an integer representing the color in the current bit depth. It cannot
+   * be a floating point value, and `g` and `b` are ignored.
+   *
+   * @param {any} r - Red (between 0 and 1) **OR** an integer representing the color in the current bit depth and color order **OR** a hexidecimal color string of the form `'#012345'`
+   * @param {any} [g] - [optional] Green (between 0 and 1)
+   * @param {any} [b] - [optional] Blue (between 0 and 1)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setColor
+   */
+  setColor(r: number, g: number, b: number): number;
+  setColor(col: ColorResolvable): number;
+
+  /**
+   * Set the background color to use for subsequent drawing operations.
+   * See `Graphics.setColor` for more information on the mapping of `r`, `g`, and `b` to pixel values.
+   * **Note:** On devices with low flash memory, `r` **must** be an integer representing the color in the current bit depth. It cannot
+   * be a floating point value, and `g` and `b` are ignored.
+   *
+   * @param {any} r - Red (between 0 and 1) **OR** an integer representing the color in the current bit depth and color order **OR** a hexidecimal color string of the form `'#012345'`
+   * @param {any} g - Green (between 0 and 1)
+   * @param {any} b - Blue (between 0 and 1)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setBgColor
+   */
+  setBgColor(r: number, g: number, b: number): number;
+  setBgColor(col: ColorResolvable): number;
+
+  /**
+   * Get the color to use for subsequent drawing operations
+   * @returns {number} The integer value of the colour
+   * @url http://www.espruino.com/Reference#l_Graphics_getColor
+   */
+  getColor(): number;
+
+  /**
+   * Get the background color to use for subsequent drawing operations
+   * @returns {number} The integer value of the colour
+   * @url http://www.espruino.com/Reference#l_Graphics_getBgColor
+   */
+  getBgColor(): number;
+
+  /**
+   * This sets the 'clip rect' that subsequent drawing operations are clipped to sit
+   * between.
+   * These values are inclusive - e.g. `g.setClipRect(1,0,5,0)` will ensure that only
+   * pixel rows 1,2,3,4,5 are touched on column 0.
+   * **Note:** For maximum flexibility on Bangle.js 1, the values here are not range
+   * checked. For normal use, X and Y should be between 0 and
+   * `getWidth()-1`/`getHeight()-1`.
+   * **Note:** The x/y values here are rotated, so that if `Graphics.setRotation` is
+   * used they correspond to the coordinates given to the draw functions, *not to the
+   * physical device pixels*.
+   *
+   * @param {number} x1 - Top left X coordinate
+   * @param {number} y1 - Top left Y coordinate
+   * @param {number} x2 - Bottom right X coordinate
+   * @param {number} y2 - Bottom right Y coordinate
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setClipRect
+   */
+  setClipRect(x1: number, y1: number, x2: number, y2: number): Graphics;
+
+  /**
+   * Make subsequent calls to `drawString` use the built-in 4x6 pixel bitmapped Font
+   * It is recommended that you use `Graphics.setFont("4x6")` for more flexibility.
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFontBitmap
+   */
+  setFontBitmap(): Graphics;
+
+  /**
+   * Make subsequent calls to `drawString` use a Vector Font of the given height.
+   * It is recommended that you use `Graphics.setFont("Vector", size)` for more
+   * flexibility.
+   *
+   * @param {number} size - The height of the font, as an integer
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFontVector
+   */
+  setFontVector(size: number): Graphics;
+
+  /**
+   * Make subsequent calls to `drawString` use a Custom Font of the given height. See
+   * the [Fonts page](http://www.espruino.com/Fonts) for more information about
+   * custom fonts and how to create them.
+   * For examples of use, see the [font
+   * modules](https://www.espruino.com/Fonts#font-modules).
+   * **Note:** while you can specify the character code of the first character with
+   * `firstChar`, the newline character 13 will always be treated as a newline and
+   * not rendered.
+   *
+   * @param {any} bitmap - A column-first, MSB-first, 1bpp bitmap containing the font bitmap
+   * @param {number} firstChar - The first character in the font - usually 32 (space)
+   * @param {any} width - The width of each character in the font. Either an integer, or a string where each character represents the width
+   * @param {number} height - The height as an integer (max 255). Bits 8-15 represent the scale factor (eg. `2<<8` is twice the size). Bits 16-23 represent the BPP (0,1=1 bpp, 2=2 bpp, 4=4 bpp)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFontCustom
+   */
+  setFontCustom(bitmap: ArrayBuffer, firstChar: number, width: number | string, height: number): Graphics;
+
+  /**
+   * Set the alignment for subsequent calls to `drawString`
+   *
+   * @param {number} x - X alignment. -1=left (default), 0=center, 1=right
+   * @param {number} y - Y alignment. -1=top (default), 0=center, 1=bottom
+   * @param {number} rotation - Rotation of the text. 0=normal, 1=90 degrees clockwise, 2=180, 3=270
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFontAlign
+   */
+  setFontAlign(x: -1 | 0 | 1, y?: -1 | 0 | 1, rotation?: 0 | 1 | 2 | 3): Graphics;
+
+  /**
+   * Set the font by name. Various forms are available:
+   * * `g.setFont("4x6")` - standard 4x6 bitmap font
+   * * `g.setFont("Vector:12")` - vector font 12px high
+   * * `g.setFont("4x6:2")` - 4x6 bitmap font, doubled in size
+   * * `g.setFont("6x8:2x3")` - 6x8 bitmap font, doubled in width, tripled in height
+   * You can also use these forms, but they are not recommended:
+   * * `g.setFont("Vector12")` - vector font 12px high
+   * * `g.setFont("4x6",2)` - 4x6 bitmap font, doubled in size
+   * `g.getFont()` will return the current font as a String.
+   * For a list of available font names, you can use `g.getFonts()`.
+   *
+   * @param {any} name - The name of the font to use (if undefined, the standard 4x6 font will be used)
+   * @param {number} size - The size of the font (or undefined)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setFont
+   */
+  setFont(name: FontNameWithScaleFactor): Graphics;
+  setFont(name: FontName, size: number): Graphics;
+
+  /**
+   * Get the font by name - can be saved and used with `Graphics.setFont`.
+   * Normally this might return something like `"4x6"`, but if a scale factor is
+   * specified, a colon and then the size is reported, like "4x6:2"
+   * **Note:** For custom fonts, `Custom` is currently reported instead of the font
+   * name.
+   * @returns {any} Get the name of the current font
+   * @url http://www.espruino.com/Reference#l_Graphics_getFont
+   */
+  getFont(): FontNameWithScaleFactor | "Custom"
+
+  /**
+   * Return an array of all fonts currently in the Graphics library.
+   * **Note:** Vector fonts are specified as `Vector#` where `#` is the font height.
+   * As there are effectively infinite fonts, just `Vector` is included in the list.
+   * @returns {any} And array of font names
+   * @url http://www.espruino.com/Reference#l_Graphics_getFonts
+   */
+  getFonts(): FontName[];
+
+  /**
+   * Return the height in pixels of the current font
+   * @returns {number} The height in pixels of the current font
+   * @url http://www.espruino.com/Reference#l_Graphics_getFontHeight
+   */
+  getFontHeight(): number;
+
+  /**
+   * Return the size in pixels of a string of text in the current font
+   *
+   * @param {any} str - The string
+   * @returns {number} The length of the string in pixels
+   * @url http://www.espruino.com/Reference#l_Graphics_stringWidth
+   */
+  stringWidth(str: string): number;
+
+  /**
+   * Return the width and height in pixels of a string of text in the current font
+   *
+   * @param {any} str - The string
+   * @returns {any} An object containing `{width,height}` of the string
+   * @url http://www.espruino.com/Reference#l_Graphics_stringMetrics
+   */
+  stringMetrics(str: string): { width: number, height: number };
+
+  /**
+   * Wrap a string to the given pixel width using the current font, and return the
+   * lines as an array.
+   * To render within the screen's width you can do:
+   * ```
+   * g.drawString(g.wrapString(text, g.getWidth()).join("\n")),
+   * ```
+   *
+   * @param {any} str - The string
+   * @param {number} maxWidth - The width in pixels
+   * @returns {any} An array of lines that are all less than `maxWidth`
+   * @url http://www.espruino.com/Reference#l_Graphics_wrapString
+   */
+  wrapString(str: string, maxWidth: number): string[];
+
+  /**
+   * Draw a string of text in the current font.
+   * ```
+   * g.drawString("Hello World", 10, 10);
+   * ```
+   * Images may also be embedded inside strings (e.g. to render Emoji or characters
+   * not in the current font). To do this, just add `0` then the image string ([about
+   * Images](http://www.espruino.com/Graphics#images-bitmaps)) For example:
+   * ```
+   * g.drawString("Hi \0\7\5\1\x82 D\x17\xC0");
+   * // draws:
+   * // # #  #      #     #
+   * // # #            #
+   * // ### ##         #
+   * // # #  #      #     #
+   * // # # ###      #####
+   * ```
+   *
+   * @param {any} str - The string
+   * @param {number} x - The X position of the leftmost pixel
+   * @param {number} y - The Y position of the topmost pixel
+   * @param {boolean} solid - For bitmap fonts, should empty pixels be filled with the background color?
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawString
+   */
+  drawString(str: string, x: number, y: number, solid?: boolean): Graphics;
+
+  /**
+   * Draw a line between x1,y1 and x2,y2 in the current foreground color
+   *
+   * @param {number} x1 - The left
+   * @param {number} y1 - The top
+   * @param {number} x2 - The right
+   * @param {number} y2 - The bottom
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawLine
+   */
+  drawLine(x1: number, y1: number, x2: number, y2: number): Graphics;
+
+  /**
+   * Draw a line between x1,y1 and x2,y2 in the current foreground color
+   *
+   * @param {number} x1 - The left
+   * @param {number} y1 - The top
+   * @param {number} x2 - The right
+   * @param {number} y2 - The bottom
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawLineAA
+   */
+  drawLineAA(x1: number, y1: number, x2: number, y2: number): Graphics;
+
+  /**
+   * Draw a line from the last position of `lineTo` or `moveTo` to this position
+   *
+   * @param {number} x - X value
+   * @param {number} y - Y value
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_lineTo
+   */
+  lineTo(x: number, y: number): Graphics;
+
+  /**
+   * Move the cursor to a position - see lineTo
+   *
+   * @param {number} x - X value
+   * @param {number} y - Y value
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_moveTo
+   */
+  moveTo(x: number, y: number): Graphics;
+
+  /**
+   * Draw a polyline (lines between each of the points in `poly`) in the current
+   * foreground color
+   * **Note:** there is a limit of 64 points (128 XY elements) for polygons
+   *
+   * @param {any} poly - An array of vertices, of the form ```[x1,y1,x2,y2,x3,y3,etc]```
+   * @param {boolean} closed - Draw another line between the last element of the array and the first
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawPoly
+   */
+  drawPoly(poly: number[], closed?: boolean): Graphics;
+
+  /**
+   * Draw an **antialiased** polyline (lines between each of the points in `poly`) in
+   * the current foreground color
+   * **Note:** there is a limit of 64 points (128 XY elements) for polygons
+   *
+   * @param {any} poly - An array of vertices, of the form ```[x1,y1,x2,y2,x3,y3,etc]```
+   * @param {boolean} closed - Draw another line between the last element of the array and the first
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawPolyAA
+   */
+  drawPolyAA(poly: number[], closed?: boolean): Graphics;
+
+  /**
+   * Draw a filled polygon in the current foreground color.
+   * ```
+   * g.fillPoly([
+   *   16, 0,
+   *   31, 31,
+   *   26, 31,
+   *   16, 12,
+   *   6, 28,
+   *   0, 27 ]);
+   * ```
+   * This fills from the top left hand side of the polygon (low X, low Y) *down to
+   * but not including* the bottom right. When placed together polygons will align
+   * perfectly without overdraw - but this will not fill the same pixels as
+   * `drawPoly` (drawing a line around the edge of the polygon).
+   * **Note:** there is a limit of 64 points (128 XY elements) for polygons
+   *
+   * @param {any} poly - An array of vertices, of the form ```[x1,y1,x2,y2,x3,y3,etc]```
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillPoly
+   */
+  fillPoly(poly: number[]): Graphics;
+
+  /**
+   * Draw a filled polygon in the current foreground color.
+   * ```
+   * g.fillPolyAA([
+   *   16, 0,
+   *   31, 31,
+   *   26, 31,
+   *   16, 12,
+   *   6, 28,
+   *   0, 27 ]);
+   * ```
+   * This fills from the top left hand side of the polygon (low X, low Y) *down to
+   * but not including* the bottom right. When placed together polygons will align
+   * perfectly without overdraw - but this will not fill the same pixels as
+   * `drawPoly` (drawing a line around the edge of the polygon).
+   * **Note:** there is a limit of 64 points (128 XY elements) for polygons
+   *
+   * @param {any} poly - An array of vertices, of the form ```[x1,y1,x2,y2,x3,y3,etc]```
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_fillPolyAA
+   */
+  fillPolyAA(poly: number[]): Graphics;
+
+  /**
+   * Set the current rotation of the graphics device.
+   *
+   * @param {number} rotation - The clockwise rotation. 0 for no rotation, 1 for 90 degrees, 2 for 180, 3 for 270
+   * @param {boolean} reflect - Whether to reflect the image
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setRotation
+   */
+  setRotation(rotation: 0 | 1 | 2 | 3, reflect?: boolean): Graphics;
+
+  /**
+   * Return the width and height in pixels of an image (either Graphics, Image
+   * Object, Image String or ArrayBuffer). Returns `undefined` if image couldn't be
+   * decoded.
+   * `frames` is also included is the image contains more information than you'd
+   * expect for a single bitmap. In this case the bitmap might be an animation with
+   * multiple frames
+   *
+   * @param {any} str - The string
+   * @returns {any} An object containing `{width,height,bpp,transparent}` for the image
+   * @url http://www.espruino.com/Reference#l_Graphics_imageMetrics
+   */
+  imageMetrics(img: Image): { width: number, height: number, bpp: number, transparent: number, frames?: ArrayBuffer[] } | undefined;
+
+  /**
+   * Image can be:
+   * * An object with the following fields `{ width : int, height : int, bpp :
+   *   optional int, buffer : ArrayBuffer/String, transparent: optional int,
+   *   palette : optional Uint16Array(2/4/16) }`. bpp = bits per pixel (default is
+   *   1), transparent (if defined) is the colour that will be treated as
+   *   transparent, and palette is a color palette that each pixel will be looked up
+   *   in first
+   * * A String where the the first few bytes are:
+   *   `width,height,bpp,[transparent,]image_bytes...`. If a transparent colour is
+   *   specified the top bit of `bpp` should be set.
+   * * An ArrayBuffer Graphics object (if `bpp<8`, `msb:true` must be set) - this is
+   *   disabled on devices without much flash memory available
+   * Draw an image at the specified position.
+   * * If the image is 1 bit, the graphics foreground/background colours will be
+   *   used.
+   * * If `img.palette` is a Uint16Array or 2/4/16 elements, color data will be
+   *   looked from the supplied palette
+   * * On Bangle.js, 2 bit images blend from background(0) to foreground(1) colours
+   * * On Bangle.js, 4 bit images use the Apple Mac 16 color palette
+   * * On Bangle.js, 8 bit images use the Web Safe 216 color palette
+   * * Otherwise color data will be copied as-is. Bitmaps are rendered MSB-first
+   * If `options` is supplied, `drawImage` will allow images to be rendered at any
+   * scale or angle. If `options.rotate` is set it will center images at `x,y`.
+   * `options` must be an object of the form:
+   * ```
+   * {
+   *   rotate : float, // the amount to rotate the image in radians (default 0)
+   *   scale : float, // the amount to scale the image up (default 1)
+   *   frame : int    // if specified and the image has frames of data
+   *                  //  after the initial frame, draw one of those frames from the image
+   * }
+   * ```
+   * For example:
+   * ```
+   * // In the top left of the screen
+   * g.drawImage(img,0,0);
+   * // In the top left of the screen, twice as big
+   * g.drawImage(img,0,0,{scale:2});
+   * // In the center of the screen, twice as big, 45 degrees
+   * g.drawImage(img, g.getWidth()/2, g.getHeight()/2,
+   *             {scale:2, rotate:Math.PI/4});
+   * ```
+   *
+   * @param {any} image - An image to draw, either a String or an Object (see below)
+   * @param {number} x - The X offset to draw the image
+   * @param {number} y - The Y offset to draw the image
+   * @param {any} options - options for scaling,rotation,etc (see below)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawImage
+   */
+  drawImage(image: Image, x: number, y: number, options?: { rotate?: number, scale?: number, frame?: number }): Graphics;
+
+  /**
+   * Draws multiple images *at once* - which avoids flicker on unbuffered systems
+   * like Bangle.js. Maximum layer count right now is 4.
+   * ```
+   * layers = [ {
+   *   {x : int, // x start position
+   *    y : int, // y start position
+   *    image : string/object,
+   *    scale : float, // scale factor, default 1
+   *    rotate : float, // angle in radians
+   *    center : bool // center on x,y? default is top left
+   *    repeat : should this image be repeated (tiled?)
+   *    nobounds : bool // if true, the bounds of the image are not used to work out the default area to draw
+   *   }
+   * ]
+   * options = { // the area to render. Defaults to rendering just enough to cover what's requested
+   *  x,y,
+   *  width,height
+   * }
+   * ```
+   *
+   * @param {any} layers - An array of objects {x,y,image,scale,rotate,center} (up to 3)
+   * @param {any} options - options for rendering - see below
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_drawImages
+   */
+  drawImages(layers: { x: number, y: number, image: Image, scale?: number, rotate?: number, center?: boolean, repeat?: boolean, nobounds?: boolean }[], options?: { x: number, y: number, width: number, height: number }): Graphics;
+
+  /**
+   * Return this Graphics object as an Image that can be used with
+   * `Graphics.drawImage`. Check out [the Graphics reference
+   * page](http://www.espruino.com/Graphics#images-bitmaps) for more information on
+   * images.
+   * Will return undefined if data can't be allocated for the image.
+   * The image data itself will be referenced rather than copied if:
+   * * An image `object` was requested (not `string`)
+   * * The Graphics instance was created with `Graphics.createArrayBuffer`
+   * * Is 8 bpp *OR* the `{msb:true}` option was given
+   * * No other format options (zigzag/etc) were given
+   * Otherwise data will be copied, which takes up more space and may be quite slow.
+   *
+   * @param {any} type - The type of image to return. Either `object`/undefined to return an image object, or `string` to return an image string
+   * @returns {any} An Image that can be used with `Graphics.drawImage`
+   * @url http://www.espruino.com/Reference#l_Graphics_asImage
+   */
+  asImage(type?: "object"): ImageObject;
+  asImage(type: "string"): string;
+
+  /**
+   * Return the area of the Graphics canvas that has been modified, and optionally
+   * clear the modified area to 0.
+   * For instance if `g.setPixel(10,20)` was called, this would return `{x1:10,
+   * y1:20, x2:10, y2:20}`
+   *
+   * @param {boolean} reset - Whether to reset the modified area or not
+   * @returns {any} An object {x1,y1,x2,y2} containing the modified area, or undefined if not modified
+   * @url http://www.espruino.com/Reference#l_Graphics_getModified
+   */
+  getModified(reset?: boolean): { x1: number, y1: number, x2: number, y2: number };
+
+  /**
+   * Scroll the contents of this graphics in a certain direction. The remaining area
+   * is filled with the background color.
+   * Note: This uses repeated pixel reads and writes, so will not work on platforms
+   * that don't support pixel reads.
+   *
+   * @param {number} x - X direction. >0 = to right
+   * @param {number} y - Y direction. >0 = down
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_scroll
+   */
+  scroll(x: number, y: number): Graphics;
+
+  /**
+   * Blit one area of the screen (x1,y1 w,h) to another (x2,y2 w,h)
+   * ```
+   * g.blit({
+   *   x1:0, y1:0,
+   *   w:32, h:32,
+   *   x2:100, y2:100,
+   *   setModified : true // should we set the modified area?
+   * });
+   * ```
+   * Note: This uses repeated pixel reads and writes, so will not work on platforms
+   * that don't support pixel reads.
+   *
+   * @param {any} options - options - see below
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_blit
+   */
+  blit(options: { x1: number, y1: number, x2: number, y2: number, w: number, h: number, setModified?: boolean }): Graphics;
+
+  /**
+   * Create a Windows BMP file from this Graphics instance, and return it as a
+   * String.
+   * @returns {any} A String representing the Graphics as a Windows BMP file (or 'undefined' if not possible)
+   * @url http://www.espruino.com/Reference#l_Graphics_asBMP
+   */
+  asBMP(): string;
+
+  /**
+   * Create a URL of the form `data:image/bmp;base64,...` that can be pasted into the
+   * browser.
+   * The Espruino Web IDE can detect this data on the console and render the image
+   * inline automatically.
+   * @returns {any} A String representing the Graphics as a URL (or 'undefined' if not possible)
+   * @url http://www.espruino.com/Reference#l_Graphics_asURL
+   */
+  asURL(): string;
+
+  /**
+   * Output this image as a bitmap URL of the form `data:image/bmp;base64,...`. The
+   * Espruino Web IDE will detect this on the console and will render the image
+   * inline automatically.
+   * This is identical to `console.log(g.asURL())` - it is just a convenient function
+   * for easy debugging and producing screenshots of what is currently in the
+   * Graphics instance.
+   * **Note:** This may not work on some bit depths of Graphics instances. It will
+   * also not work for the main Graphics instance of Bangle.js 1 as the graphics on
+   * Bangle.js 1 are stored in write-only memory.
+   * @url http://www.espruino.com/Reference#l_Graphics_dump
+   */
+  dump(): void;
+
+  /**
+   * Calculate the square area under a Bezier curve.
+   *  x0,y0: start point x1,y1: control point y2,y2: end point
+   *  Max 10 points without start point.
+   *
+   * @param {any} arr - An array of three vertices, six enties in form of ```[x0,y0,x1,y1,x2,y2]```
+   * @param {any} options - number of points to calulate
+   * @returns {any} Array with calculated points
+   * @url http://www.espruino.com/Reference#l_Graphics_quadraticBezier
+   */
+  quadraticBezier(arr: [number, number, number, number, number, number], options?: number): number[];
+
+  /**
+   * Transformation can be:
+   * * An object of the form
+   * ```
+   * {
+   *   x: float, // x offset (default 0)
+   *   y: float, // y offset (default 0)
+   *   scale: float, // scale factor (default 1)
+   *   rotate: float, // angle in radians (default 0)
+   * }
+   * ```
+   * * A six-element array of the form `[a,b,c,d,e,f]`, which represents the 2D transformation matrix
+   * ```
+   * a c e
+   * b d f
+   * 0 0 1
+   * ```
+   *  Apply a transformation to an array of vertices.
+   *
+   * @param {any} verts - An array of vertices, of the form ```[x1,y1,x2,y2,x3,y3,etc]```
+   * @param {any} transformation - The transformation to apply, either an Object or an Array (see below)
+   * @returns {any} Array of transformed vertices
+   * @url http://www.espruino.com/Reference#l_Graphics_transformVertices
+   */
+  transformVertices(arr: number[], transformation: { x?: number, y?: number, scale?: number, rotate?: number } | [number, number, number, number, number, number]): number[];
+
+  /**
+   * Returns an object of the form:
+   * ```
+   * {
+   *   fg : 0xFFFF,  // foreground colour
+   *   bg : 0,       // background colour
+   *   fg2 : 0xFFFF,  // accented foreground colour
+   *   bg2 : 0x0007,  // accented background colour
+   *   fgH : 0xFFFF,  // highlighted foreground colour
+   *   bgH : 0x02F7,  // highlighted background colour
+   *   dark : true,  // Is background dark (e.g. foreground should be a light colour)
+   * }
+   * ```
+   * These values can then be passed to `g.setColor`/`g.setBgColor` for example
+   * `g.setColor(g.theme.fg2)`. When the Graphics instance is reset, the background
+   * color is automatically set to `g.theme.bg` and foreground is set to
+   * `g.theme.fg`.
+   * On Bangle.js these values can be changed by writing updated values to `theme` in
+   * `settings.js` and reloading the app - or they can be changed temporarily by
+   * calling `Graphics.setTheme`
+   * @returns {any} An object containing the current 'theme' (see below)
+   * @url http://www.espruino.com/Reference#l_Graphics_theme
+   */
+  theme: Theme;
+
+  /**
+   * Set the global colour scheme. On Bangle.js, this is reloaded from
+   * `settings.json` for each new app loaded.
+   * See `Graphics.theme` for the fields that can be provided. For instance you can
+   * change the background to red using:
+   * ```
+   * g.setTheme({bg:"#f00"});
+   * ```
+   *
+   * @param {any} theme - An object of the form returned by `Graphics.theme`
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_setTheme
+   */
+  setTheme(theme: { [key in keyof Theme]?: Theme[key] extends number ? ColorResolvable : Theme[key] }): Graphics;
+}
+
+/**
+ * This class helps to convert URLs into Objects of information ready for
+ * http.request/get
+ * @url http://www.espruino.com/Reference#url
+ */
+declare class url {
+  /**
+   * A utility function to split a URL into parts
+   * This is useful in web servers for instance when handling a request.
+   * For instance `url.parse("/a?b=c&d=e",true)` returns
+   * `{"method":"GET","host":"","path":"/a?b=c&d=e","pathname":"/a","search":"?b=c&d=e","port":80,"query":{"b":"c","d":"e"}}`
+   *
+   * @param {any} urlStr - A URL to be parsed
+   * @param {boolean} parseQuery - Whether to parse the query string into an object not (default = false)
+   * @returns {any} An object containing options for ```http.request``` or ```http.get```. Contains `method`, `host`, `path`, `pathname`, `search`, `port` and `query`
+   * @url http://www.espruino.com/Reference#l_url_parse
+   */
+  static parse(urlStr: any, parseQuery: boolean): any;
+
+
+}
+
+/**
+ * The socket server created by `require('net').createServer`
+ * @url http://www.espruino.com/Reference#Server
+ */
+declare class Server {
+
+
+  /**
+   * Start listening for new connections on the given port
+   *
+   * @param {number} port - The port to listen on
+   * @returns {any} The HTTP server instance that 'listen' was called on
+   * @url http://www.espruino.com/Reference#l_Server_listen
+   */
+  listen(port: number): any;
+
+  /**
+   * Stop listening for new connections
+   * @url http://www.espruino.com/Reference#l_Server_close
+   */
+  close(): void;
+}
+
+/**
+ * An actual socket connection - allowing transmit/receive of TCP data
+ * @url http://www.espruino.com/Reference#Socket
+ */
+declare class Socket {
+  /**
+   * The 'data' event is called when data is received. If a handler is defined with
+   * `X.on('data', function(data) { ... })` then it will be called, otherwise data
+   * will be stored in an internal buffer, where it can be retrieved with `X.read()`
+   * @param {string} event - The event to listen to.
+   * @param {(data: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `data` A string containing one or more characters of received data
+   * @url http://www.espruino.com/Reference#l_Socket_data
+   */
+  static on(event: "data", callback: (data: any) => void): void;
+
+  /**
+   * Called when the connection closes.
+   * @param {string} event - The event to listen to.
+   * @param {(had_error: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `had_error` A boolean indicating whether the connection had an error (use an error event handler to get error details).
+   * @url http://www.espruino.com/Reference#l_Socket_close
+   */
+  static on(event: "close", callback: (had_error: any) => void): void;
+
+  /**
+   * There was an error on this socket and it is closing (or wasn't opened in the
+   * first place). If a "connected" event was issued on this socket then the error
+   * event is always followed by a close event. The error codes are:
+   * * -1: socket closed (this is not really an error and will not cause an error
+   *   callback)
+   * * -2: out of memory (typically while allocating a buffer to hold data)
+   * * -3: timeout
+   * * -4: no route
+   * * -5: busy
+   * * -6: not found (DNS resolution)
+   * * -7: max sockets (... exceeded)
+   * * -8: unsent data (some data could not be sent)
+   * * -9: connection reset (or refused)
+   * * -10: unknown error
+   * * -11: no connection
+   * * -12: bad argument
+   * * -13: SSL handshake failed
+   * * -14: invalid SSL data
+   * @param {string} event - The event to listen to.
+   * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `details` An error object with an error code (a negative integer) and a message.
+   * @url http://www.espruino.com/Reference#l_Socket_error
+   */
+  static on(event: "error", callback: (details: any) => void): void;
+
+  /**
+   * An event that is fired when the buffer is empty and it can accept more data to
+   * send.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Socket_drain
+   */
+  static on(event: "drain", callback: () => void): void;
+
+  /**
+   * Return how many bytes are available to read. If there is already a listener for
+   * data, this will always return 0.
+   * @returns {number} How many bytes are available
+   * @url http://www.espruino.com/Reference#l_Socket_available
+   */
+  available(): number;
+
+  /**
+   * Return a string containing characters that have been received
+   *
+   * @param {number} chars - The number of characters to read, or undefined/0 for all available
+   * @returns {any} A string containing the required bytes.
+   * @url http://www.espruino.com/Reference#l_Socket_read
+   */
+  read(chars: number): any;
+
+  /**
+   * Pipe this to a stream (an object with a 'write' method)
+   *
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=32, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_Socket_pipe
+   */
+  pipe(destination: any, options: any): void;
+
+  /**
+   * This function writes the `data` argument as a string. Data that is passed in
+   * (including arrays) will be converted to a string with the normal JavaScript
+   * `toString` method.
+   * If you wish to send binary data then you need to convert that data directly to a
+   * String. This can be done with `String.fromCharCode`, however it's often easier
+   * and faster to use the Espruino-specific `E.toString`, which will read its
+   * arguments as an array of bytes and convert that to a String:
+   * ```
+   * socket.write(E.toString([0,1,2,3,4,5]));
+   * ```
+   * If you need to send something other than bytes, you can use 'Typed Arrays', or
+   * even `DataView`:
+   * ```
+   * var d = new DataView(new ArrayBuffer(8)); // 8 byte array buffer
+   * d.setFloat32(0, 765.3532564); // write float at bytes 0-3
+   * d.setInt8(4, 42); // write int8 at byte 4
+   * socket.write(E.toString(d.buffer))
+   * ```
+   *
+   * @param {any} data - A string containing data to send
+   * @returns {boolean} For node.js compatibility, returns the boolean false. When the send buffer is empty, a `drain` event will be sent
+   * @url http://www.espruino.com/Reference#l_Socket_write
+   */
+  write(data: any): boolean;
+
+  /**
+   * Close this socket - optional data to append as an argument.
+   * See `Socket.write` for more information about the data argument
+   *
+   * @param {any} data - A string containing data to send
+   * @url http://www.espruino.com/Reference#l_Socket_end
+   */
+  end(data: any): void;
+}
+
+/**
+ * An actual socket connection - allowing transmit/receive of TCP data
+ * @url http://www.espruino.com/Reference#dgramSocket
+ */
+declare class dgramSocket {
+  /**
+   * The 'message' event is called when a datagram message is received. If a handler
+   * is defined with `X.on('message', function(msg) { ... })` then it will be called`
+   * @param {string} event - The event to listen to.
+   * @param {(msg: any, rinfo: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `msg` A string containing the received message
+   * * `rinfo` Sender address,port containing information
+   * @url http://www.espruino.com/Reference#l_dgramSocket_message
+   */
+  static on(event: "message", callback: (msg: any, rinfo: any) => void): void;
+
+  /**
+   * Called when the connection closes.
+   * @param {string} event - The event to listen to.
+   * @param {(had_error: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `had_error` A boolean indicating whether the connection had an error (use an error event handler to get error details).
+   * @url http://www.espruino.com/Reference#l_dgramSocket_close
+   */
+  static on(event: "close", callback: (had_error: any) => void): void;
+
+  /**
+   *
+   * @param {any} buffer - A string containing message to send
+   * @param {any} offset - Offset in the passed string where the message starts [optional]
+   * @param {any} length - Number of bytes in the message [optional]
+   * @param {any} args - Destination port number, Destination IP address string
+   * @url http://www.espruino.com/Reference#l_dgramSocket_send
+   */
+  send(buffer: any, offset: any, length: any, ...args: any[]): void;
+
+  /**
+   *
+   * @param {number} port - The port to bind at
+   * @param {any} callback - A function(res) that will be called when the socket is bound. You can then call `res.on('message', function(message, info) { ... })` and `res.on('close', function() { ... })` to deal with the response.
+   * @returns {any} The dgramSocket instance that 'bind' was called on
+   * @url http://www.espruino.com/Reference#l_dgramSocket_bind
+   */
+  bind(port: number, callback: any): any;
+
+  /**
+   * Close the socket
+   * @url http://www.espruino.com/Reference#l_dgramSocket_close
+   */
+  close(): void;
+
+  /**
+   *
+   * @param {any} group - A string containing the group ip to join
+   * @param {any} ip - A string containing the ip to join with
+   * @url http://www.espruino.com/Reference#l_dgramSocket_addMembership
+   */
+  addMembership(group: any, ip: any): void;
+}
+
+/**
+ * An instantiation of a WiFi network adaptor
+ * @url http://www.espruino.com/Reference#WLAN
+ */
+declare class WLAN {
+
+
+  /**
+   * Connect to a wireless network
+   *
+   * @param {any} ap - Access point name
+   * @param {any} key - WPA2 key (or undefined for unsecured connection)
+   * @param {any} callback - Function to call back with connection status. It has one argument which is one of 'connect'/'disconnect'/'dhcp'
+   * @returns {boolean} True if connection succeeded, false if it didn't.
+   * @url http://www.espruino.com/Reference#l_WLAN_connect
+   */
+  connect(ap: any, key: any, callback: any): boolean;
+
+  /**
+   * Completely uninitialise and power down the CC3000. After this you'll have to use
+   * ```require("CC3000").connect()``` again.
+   * @url http://www.espruino.com/Reference#l_WLAN_disconnect
+   */
+  disconnect(): void;
+
+  /**
+   * Completely uninitialise and power down the CC3000, then reconnect to the old
+   * access point.
+   * @url http://www.espruino.com/Reference#l_WLAN_reconnect
+   */
+  reconnect(): void;
+
+  /**
+   * Get the current IP address
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_WLAN_getIP
+   */
+  getIP(): any;
+
+  /**
+   * Set the current IP address for get an IP from DHCP (if no options object is
+   * specified).
+   * **Note:** Changes are written to non-volatile memory, but will only take effect
+   * after calling `wlan.reconnect()`
+   *
+   * @param {any} options - Object containing IP address options `{ ip : '1,2,3,4', subnet, gateway, dns }`, or do not supply an object in otder to force DHCP.
+   * @returns {boolean} True on success
+   * @url http://www.espruino.com/Reference#l_WLAN_setIP
+   */
+  setIP(options: any): boolean;
+}
+
+/**
+ * Class containing utility functions for the
+ * [ESP8266](http://www.espruino.com/EspruinoESP8266)
+ * @url http://www.espruino.com/Reference#ESP8266
+ */
+declare class ESP8266 {
+  /**
+   * **DEPRECATED** - please use `Wifi.ping` instead.
+   * Perform a network ping request. The parameter can be either a String or a
+   * numeric IP address.
+   *
+   * @param {any} ipAddr - A string representation of an IP address.
+   * @param {any} pingCallback - Optional callback function.
+   * @url http://www.espruino.com/Reference#l_ESP8266_ping
+   */
+  static ping(ipAddr: any, pingCallback: any): void;
+
+  /**
+   * Perform a hardware reset/reboot of the esp8266.
+   * @url http://www.espruino.com/Reference#l_ESP8266_reboot
+   */
+  static reboot(): void;
+
+  /**
+   * At boot time the esp8266's firmware captures the cause of the reset/reboot. This
+   * function returns this information in an object with the following fields:
+   * * `reason`: "power on", "wdt reset", "exception", "soft wdt", "restart", "deep
+   *   sleep", or "reset pin"
+   * * `exccause`: exception cause
+   * * `epc1`, `epc2`, `epc3`: instruction pointers
+   * * `excvaddr`: address being accessed
+   * * `depc`: (?)
+   * @returns {any} An object with the reset cause information
+   * @url http://www.espruino.com/Reference#l_ESP8266_getResetInfo
+   */
+  static getResetInfo(): any;
+
+  /**
+   * Enable or disable the logging of debug information. A value of `true` enables
+   * debug logging while a value of `false` disables debug logging. Debug output is
+   * sent to UART1 (gpio2).
+   *
+   * @param {boolean} enable - Enable or disable the debug logging.
+   * @url http://www.espruino.com/Reference#l_ESP8266_logDebug
+   */
+  static logDebug(enable: boolean): void;
+
+  /**
+   * Set the debug logging mode. It can be disabled (which frees ~1.2KB of heap),
+   * enabled in-memory only, or in-memory and output to a UART.
+   *
+   * @param {number} mode - Debug log mode: 0=off, 1=in-memory only, 2=in-mem and uart0, 3=in-mem and uart1.
+   * @url http://www.espruino.com/Reference#l_ESP8266_setLog
+   */
+  static setLog(mode: number): void;
+
+  /**
+   * Prints the contents of the debug log to the console.
+   * @url http://www.espruino.com/Reference#l_ESP8266_printLog
+   */
+  static printLog(): void;
+
+  /**
+   * Returns one line from the log or up to 128 characters.
+   * @url http://www.espruino.com/Reference#l_ESP8266_readLog
+   */
+  static readLog(): void;
+
+  /**
+   * Dumps info about all sockets to the log. This is for troubleshooting the socket
+   * implementation.
+   * @url http://www.espruino.com/Reference#l_ESP8266_dumpSocketInfo
+   */
+  static dumpSocketInfo(): void;
+
+  /**
+   * **Note:** This is deprecated. Use `E.setClock(80/160)` **Note:** Set the
+   * operating frequency of the ESP8266 processor. The default is 160Mhz.
+   * **Warning**: changing the cpu frequency affects the timing of some I/O
+   * operations, notably of software SPI and I2C, so things may be a bit slower at
+   * 80Mhz.
+   *
+   * @param {any} freq - Desired frequency - either 80 or 160.
+   * @url http://www.espruino.com/Reference#l_ESP8266_setCPUFreq
+   */
+  static setCPUFreq(freq: any): void;
+
+  /**
+   * Returns an object that contains details about the state of the ESP8266 with the
+   * following fields:
+   * * `sdkVersion` - Version of the SDK.
+   * * `cpuFrequency` - CPU operating frequency in Mhz.
+   * * `freeHeap` - Amount of free heap in bytes.
+   * * `maxCon` - Maximum number of concurrent connections.
+   * * `flashMap` - Configured flash size&map: '512KB:256/256' .. '4MB:512/512'
+   * * `flashKB` - Configured flash size in KB as integer
+   * * `flashChip` - Type of flash chip as string with manufacturer & chip, ex: '0xEF
+   *   0x4016`
+   * @returns {any} The state of the ESP8266
+   * @url http://www.espruino.com/Reference#l_ESP8266_getState
+   */
+  static getState(): any;
+
+  /**
+   * **Note:** This is deprecated. Use `require("Flash").getFree()`
+   * @returns {any} Array of objects with `addr` and `length` properties describing the free flash areas available
+   * @url http://www.espruino.com/Reference#l_ESP8266_getFreeFlash
+   */
+  static getFreeFlash(): any;
+
+  /**
+   *
+   * @param {any} arrayOfData - Array of data to CRC
+   * @returns {any} 32-bit CRC
+   * @url http://www.espruino.com/Reference#l_ESP8266_crc32
+   */
+  static crc32(arrayOfData: any): any;
+
+  /**
+   * **This function is deprecated.** Please use `require("neopixel").write(pin,
+   * data)` instead
+   *
+   * @param {Pin} pin - Pin for output signal.
+   * @param {any} arrayOfData - Array of LED data.
+   * @url http://www.espruino.com/Reference#l_ESP8266_neopixelWrite
+   */
+  static neopixelWrite(pin: Pin, arrayOfData: any): void;
+
+  /**
+   * Put the ESP8266 into 'deep sleep' for the given number of microseconds, reducing
+   * power consumption drastically.
+   * meaning of option values:
+   * 0 - the 108th Byte of init parameter decides whether RF calibration will be
+   * performed or not.
+   * 1 - run RF calibration after waking up. Power consumption is high.
+   * 2 - no RF calibration after waking up. Power consumption is low.
+   * 4 - no RF after waking up. Power consumption is the lowest.
+   * **Note:** unlike normal Espruino boards' 'deep sleep' mode, ESP8266 deep sleep
+   * actually turns off the processor. After the given number of microseconds have
+   * elapsed, the ESP8266 will restart as if power had been turned off and then back
+   * on. *All contents of RAM will be lost*. Connect GPIO 16 to RST to enable wakeup.
+   * **Special:** 0 microseconds cause sleep forever until external wakeup RST pull
+   * down occurs.
+   *
+   * @param {any} micros - Number of microseconds to sleep.
+   * @param {any} option - posible values are 0, 1, 2 or 4
+   * @url http://www.espruino.com/Reference#l_ESP8266_deepSleep
+   */
+  static deepSleep(micros: any, option: any): void;
+
+
+}
+
+/**
+ * An instantiation of an Ethernet network adaptor
+ * @url http://www.espruino.com/Reference#Ethernet
+ */
+declare class Ethernet {
+
+
+  /**
+   * Get the current IP address, subnet, gateway and mac address.
+   *
+   * @param {any} options - An optional `callback(err, ipinfo)` function to be called back with the IP information.
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Ethernet_getIP
+   */
+  getIP(options: any): any;
+
+  /**
+   * Set the current IP address or get an IP from DHCP (if no options object is
+   * specified)
+   * If 'mac' is specified as an option, it must be a string of the form
+   * `"00:01:02:03:04:05"` The default mac is 00:08:DC:01:02:03.
+   *
+   * @param {any} options - Object containing IP address options `{ ip : '1.2.3.4', subnet : '...', gateway: '...', dns:'...', mac:':::::'  }`, or do not supply an object in order to force DHCP.
+   * @param {any} callback - An optional `callback(err)` function to invoke when ip is set. `err==null` on success, or a string on failure.
+   * @returns {boolean} True on success
+   * @url http://www.espruino.com/Reference#l_Ethernet_setIP
+   */
+  setIP(options: any, callback: any): boolean;
+
+  /**
+   * Set hostname allow to set the hosname used during the dhcp request. min 8 and
+   * max 12 char, best set before calling `eth.setIP()` Default is WIZnet010203,
+   * 010203 is the default nic as part of the mac. Best to set the hosname before
+   * calling setIP().
+   *
+   * @param {any} hostname - hostname as string
+   * @param {any} callback - An optional `callback(err)` function to be called back with null or error text.
+   * @returns {boolean} True on success
+   * @url http://www.espruino.com/Reference#l_Ethernet_setHostname
+   */
+  setHostname(hostname: any, callback: any): boolean;
+
+  /**
+   * Returns the hostname
+   *
+   * @param {any} callback - An optional `callback(err,hostname)` function to be called back with the status information.
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Ethernet_getHostname
+   */
+  getHostname(callback: any): any;
+
+  /**
+   * Get the current status of the ethernet device
+   *
+   * @param {any} options - An optional `callback(err, status)` function to be called back with the status information.
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Ethernet_getStatus
+   */
+  getStatus(options: any): any;
+}
+
+/**
+ * The HTTP server created by `require('http').createServer`
+ * @url http://www.espruino.com/Reference#httpSrv
+ */
+declare class httpSrv {
+
+
+  /**
+   * Start listening for new HTTP connections on the given port
+   *
+   * @param {number} port - The port to listen on
+   * @returns {any} The HTTP server instance that 'listen' was called on
+   * @url http://www.espruino.com/Reference#l_httpSrv_listen
+   */
+  listen(port: number): any;
+
+  /**
+   * Stop listening for new HTTP connections
+   * @url http://www.espruino.com/Reference#l_httpSrv_close
+   */
+  close(): void;
+}
+
+/**
+ * The HTTP server request
+ * @url http://www.espruino.com/Reference#httpSRq
+ */
+declare class httpSRq {
+  /**
+   * The 'data' event is called when data is received. If a handler is defined with
+   * `X.on('data', function(data) { ... })` then it will be called, otherwise data
+   * will be stored in an internal buffer, where it can be retrieved with `X.read()`
+   * @param {string} event - The event to listen to.
+   * @param {(data: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `data` A string containing one or more characters of received data
+   * @url http://www.espruino.com/Reference#l_httpSRq_data
+   */
+  static on(event: "data", callback: (data: any) => void): void;
+
+  /**
+   * Called when the connection closes.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpSRq_close
+   */
+  static on(event: "close", callback: () => void): void;
+
+  /**
+   * The headers to sent to the server with this HTTP request.
+   * @returns {any} An object mapping header name to value
+   * @url http://www.espruino.com/Reference#l_httpSRq_headers
+   */
+  headers: any;
+
+  /**
+   * The HTTP method used with this request. Often `"GET"`.
+   * @returns {any} A string
+   * @url http://www.espruino.com/Reference#l_httpSRq_method
+   */
+  method: any;
+
+  /**
+   * The URL requested in this HTTP request, for instance:
+   * * `"/"` - the main page
+   * * `"/favicon.ico"` - the web page's icon
+   * @returns {any} A string representing the URL
+   * @url http://www.espruino.com/Reference#l_httpSRq_url
+   */
+  url: any;
+
+  /**
+   * Return how many bytes are available to read. If there is already a listener for
+   * data, this will always return 0.
+   * @returns {number} How many bytes are available
+   * @url http://www.espruino.com/Reference#l_httpSRq_available
+   */
+  available(): number;
+
+  /**
+   * Return a string containing characters that have been received
+   *
+   * @param {number} chars - The number of characters to read, or undefined/0 for all available
+   * @returns {any} A string containing the required bytes.
+   * @url http://www.espruino.com/Reference#l_httpSRq_read
+   */
+  read(chars: number): any;
+
+  /**
+   * Pipe this to a stream (an object with a 'write' method)
+   *
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=32, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_httpSRq_pipe
+   */
+  pipe(destination: any, options: any): void;
+}
+
+/**
+ * The HTTP server response
+ * @url http://www.espruino.com/Reference#httpSRs
+ */
+declare class httpSRs {
+  /**
+   * An event that is fired when the buffer is empty and it can accept more data to
+   * send.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpSRs_drain
+   */
+  static on(event: "drain", callback: () => void): void;
+
+  /**
+   * Called when the connection closes.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpSRs_close
+   */
+  static on(event: "close", callback: () => void): void;
+
+  /**
+   * The headers to send back along with the HTTP response.
+   * The default contents are:
+   * ```
+   * {
+   *   "Connection": "close"
+   *  }
+   * ```
+   * @returns {any} An object mapping header name to value
+   * @url http://www.espruino.com/Reference#l_httpSRs_headers
+   */
+  headers: any;
+
+  /**
+   * This function writes the `data` argument as a string. Data that is passed in
+   * (including arrays) will be converted to a string with the normal JavaScript
+   * `toString` method. For more information about sending binary data see
+   * `Socket.write`
+   *
+   * @param {any} data - A string containing data to send
+   * @returns {boolean} For node.js compatibility, returns the boolean false. When the send buffer is empty, a `drain` event will be sent
+   * @url http://www.espruino.com/Reference#l_httpSRs_write
+   */
+  write(data: any): boolean;
+
+  /**
+   * See `Socket.write` for more information about the data argument
+   *
+   * @param {any} data - A string containing data to send
+   * @url http://www.espruino.com/Reference#l_httpSRs_end
+   */
+  end(data: any): void;
+
+  /**
+   * Send the given status code and headers. If not explicitly called this will be
+   * done automatically the first time data is written to the response.
+   * This cannot be called twice, or after data has already been sent in the
+   * response.
+   *
+   * @param {number} statusCode - The HTTP status code
+   * @param {any} headers - An object containing the headers
+   * @url http://www.espruino.com/Reference#l_httpSRs_writeHead
+   */
+  writeHead(statusCode: number, headers: any): void;
+
+  /**
+   * Set a value to send in the header of this HTTP response. This updates the
+   * `httpSRs.headers` property.
+   * Any headers supplied to `writeHead` will overwrite any headers with the same
+   * name.
+   *
+   * @param {any} name - The name of the header as a String
+   * @param {any} value - The value of the header as a String
+   * @url http://www.espruino.com/Reference#l_httpSRs_setHeader
+   */
+  setHeader(name: any, value: any): void;
+}
+
+/**
+ * The HTTP client request, returned by `http.request()` and `http.get()`.
+ * @url http://www.espruino.com/Reference#httpCRq
+ */
+declare class httpCRq {
+  /**
+   * An event that is fired when the buffer is empty and it can accept more data to
+   * send.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpCRq_drain
+   */
+  static on(event: "drain", callback: () => void): void;
+
+  /**
+   * An event that is fired if there is an error making the request and the response
+   * callback has not been invoked. In this case the error event concludes the
+   * request attempt. The error event function receives an error object as parameter
+   * with a `code` field and a `message` field.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpCRq_error
+   */
+  static on(event: "error", callback: () => void): void;
+
+  /**
+   * This function writes the `data` argument as a string. Data that is passed in
+   * (including arrays) will be converted to a string with the normal JavaScript
+   * `toString` method. For more information about sending binary data see
+   * `Socket.write`
+   *
+   * @param {any} data - A string containing data to send
+   * @returns {boolean} For node.js compatibility, returns the boolean false. When the send buffer is empty, a `drain` event will be sent
+   * @url http://www.espruino.com/Reference#l_httpCRq_write
+   */
+  write(data: any): boolean;
+
+  /**
+   * Finish this HTTP request - optional data to append as an argument
+   * See `Socket.write` for more information about the data argument
+   *
+   * @param {any} data - A string containing data to send
+   * @url http://www.espruino.com/Reference#l_httpCRq_end
+   */
+  end(data: any): void;
+}
+
+/**
+ * The HTTP client response, passed to the callback of `http.request()` an
+ * `http.get()`.
+ * @url http://www.espruino.com/Reference#httpCRs
+ */
+declare class httpCRs {
+  /**
+   * The 'data' event is called when data is received. If a handler is defined with
+   * `X.on('data', function(data) { ... })` then it will be called, otherwise data
+   * will be stored in an internal buffer, where it can be retrieved with `X.read()`
+   * @param {string} event - The event to listen to.
+   * @param {(data: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `data` A string containing one or more characters of received data
+   * @url http://www.espruino.com/Reference#l_httpCRs_data
+   */
+  static on(event: "data", callback: (data: any) => void): void;
+
+  /**
+   * Called when the connection closes with one `hadError` boolean parameter, which
+   * indicates whether an error occurred.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpCRs_close
+   */
+  static on(event: "close", callback: () => void): void;
+
+  /**
+   * An event that is fired if there is an error receiving the response. The error
+   * event function receives an error object as parameter with a `code` field and a
+   * `message` field. After the error event the close even will also be triggered to
+   * conclude the HTTP request/response.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_httpCRs_error
+   */
+  static on(event: "error", callback: () => void): void;
+
+  /**
+   * The headers received along with the HTTP response
+   * @returns {any} An object mapping header name to value
+   * @url http://www.espruino.com/Reference#l_httpCRs_headers
+   */
+  headers: any;
+
+  /**
+   * The HTTP response's status code - usually `"200"` if all went well
+   * @returns {any} The status code as a String
+   * @url http://www.espruino.com/Reference#l_httpCRs_statusCode
+   */
+  statusCode: any;
+
+  /**
+   * The HTTP response's status message - Usually `"OK"` if all went well
+   * @returns {any} An String Status Message
+   * @url http://www.espruino.com/Reference#l_httpCRs_statusMessage
+   */
+  statusMessage: any;
+
+  /**
+   * The HTTP version reported back by the server - usually `"1.1"`
+   * @returns {any} Th
+   * @url http://www.espruino.com/Reference#l_httpCRs_httpVersion
+   */
+  httpVersion: any;
+
+  /**
+   * Return how many bytes are available to read. If there is a 'data' event handler,
+   * this will always return 0.
+   * @returns {number} How many bytes are available
+   * @url http://www.espruino.com/Reference#l_httpCRs_available
+   */
+  available(): number;
+
+  /**
+   * Return a string containing characters that have been received
+   *
+   * @param {number} chars - The number of characters to read, or undefined/0 for all available
+   * @returns {any} A string containing the required bytes.
+   * @url http://www.espruino.com/Reference#l_httpCRs_read
+   */
+  read(chars: number): any;
+
+  /**
+   * Pipe this to a stream (an object with a 'write' method)
+   *
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=32, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_httpCRs_pipe
+   */
+  pipe(destination: any, options: any): void;
+}
+
+/**
+ * This class provides functionality to recognise gestures drawn on a touchscreen.
+ * It is only built into Bangle.js 2.
+ * Usage:
+ * ```
+ * var strokes = {
+ *   stroke1 : Unistroke.new(new Uint8Array([x1, y1, x2, y2, x3, y3, ...])),
+ *   stroke2 : Unistroke.new(new Uint8Array([x1, y1, x2, y2, x3, y3, ...])),
+ *   stroke3 : Unistroke.new(new Uint8Array([x1, y1, x2, y2, x3, y3, ...]))
+ * };
+ * var r = Unistroke.recognise(strokes,new Uint8Array([x1, y1, x2, y2, x3, y3, ...]))
+ * print(r); // stroke1/stroke2/stroke3
+ * ```
+ * @url http://www.espruino.com/Reference#Unistroke
+ */
+declare class Unistroke {
+  /**
+   * Create a new Unistroke based on XY coordinates
+   *
+   * @param {any} xy - An array of interleaved XY coordinates
+   * @returns {any} A string of data representing this unistroke
+   * @url http://www.espruino.com/Reference#l_Unistroke_new
+   */
+  static new(xy: any): any;
+
+  /**
+   * Recognise based on an object of named strokes, and a list of XY coordinates
+   *
+   * @param {any} strokes - An object of named strokes : `{arrow:..., circle:...}`
+   * @param {any} xy - An array of interleaved XY coordinates
+   * @returns {any} The key name of the matched stroke
+   * @url http://www.espruino.com/Reference#l_Unistroke_recognise
+   */
+  static recognise(strokes: any, xy: any): any;
+
+
+}
+
+/**
+ * The NRF class is for controlling functionality of the Nordic nRF51/nRF52 chips.
+ * Most functionality is related to Bluetooth Low Energy, however there are also
+ * some functions related to NFC that apply to NRF52-based devices.
+ * @url http://www.espruino.com/Reference#NRF
+ */
+declare class NRF {
+  /**
+   * @returns {any} An object
+   * @url http://www.espruino.com/Reference#l_NRF_getSecurityStatus
+   */
+  static getSecurityStatus(): any;
+
+  /**
+   * @returns {any} An object
+   * @url http://www.espruino.com/Reference#l_NRF_getAddress
+   */
+  static getAddress(): any;
+
+  /**
+   *
+   * @param {any} data - The service (and characteristics) to advertise
+   * @param {any} options - Optional object containing options
+   * @url http://www.espruino.com/Reference#l_NRF_setServices
+   */
+  static setServices(data: any, options: any): void;
+
+  /**
+   *
+   * @param {any} data - The data to advertise as an object - see below for more info
+   * @param {any} options - An optional object of options
+   * @url http://www.espruino.com/Reference#l_NRF_setAdvertising
+   */
+  static setAdvertising(data: any, options: any): void;
+
+  /**
+   * Called when a host device connects to Espruino. The first argument contains the
+   * address.
+   * @param {string} event - The event to listen to.
+   * @param {(addr: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `addr` The address of the device that has connected
+   * @url http://www.espruino.com/Reference#l_NRF_connect
+   */
+  static on(event: "connect", callback: (addr: any) => void): void;
+
+  /**
+   * Called when a host device disconnects from Espruino.
+   * The most common reason is:
+   * * 19 - `REMOTE_USER_TERMINATED_CONNECTION`
+   * * 22 - `LOCAL_HOST_TERMINATED_CONNECTION`
+   * @param {string} event - The event to listen to.
+   * @param {(reason: number) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `reason` The reason code reported back by the BLE stack - see Nordic's [`ble_hci.h` file](https://github.com/espruino/Espruino/blob/master/targetlibs/nrf5x_12/components/softdevice/s132/headers/ble_hci.h#L71) for more information
+   * @url http://www.espruino.com/Reference#l_NRF_disconnect
+   */
+  static on(event: "disconnect", callback: (reason: number) => void): void;
+
+  /**
+   * Contains updates on the security of the current Bluetooth link.
+   * See Nordic's `ble_gap_evt_auth_status_t` structure for more information.
+   * @param {string} event - The event to listen to.
+   * @param {(status: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `status` An object containing `{auth_status,bonded,lv4,kdist_own,kdist_peer}
+   * @url http://www.espruino.com/Reference#l_NRF_security
+   */
+  static on(event: "security", callback: (status: any) => void): void;
+
+  /**
+   * Called with a single byte value when Espruino is set up as a HID device and the
+   * computer it is connected to sends a HID report back to Espruino. This is usually
+   * used for handling indications such as the Caps Lock LED.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_NRF_HID
+   */
+  static on(event: "HID", callback: () => void): void;
+
+  /**
+   * Called with discovered services when discovery is finished
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_NRF_servicesDiscover
+   */
+  static on(event: "servicesDiscover", callback: () => void): void;
+
+  /**
+   * Called with discovered characteristics when discovery is finished
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_NRF_characteristicsDiscover
+   */
+  static on(event: "characteristicsDiscover", callback: () => void): void;
+
+  /**
+   * Called when an NFC field is detected
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_NRF_NFCon
+   */
+  static on(event: "NFCon", callback: () => void): void;
+
+  /**
+   * Called when an NFC field is no longer detected
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_NRF_NFCoff
+   */
+  static on(event: "NFCoff", callback: () => void): void;
+
+  /**
+   * When NFC is started with `NRF.nfcStart`, this is fired when NFC data is
+   * received. It doesn't get called if NFC is started with `NRF.nfcURL` or
+   * `NRF.nfcRaw`
+   * @param {string} event - The event to listen to.
+   * @param {(arr: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `arr` An ArrayBuffer containign the received data
+   * @url http://www.espruino.com/Reference#l_NRF_NFCrx
+   */
+  static on(event: "NFCrx", callback: (arr: any) => void): void;
+
+  /**
+   * If a device is connected to Espruino, disconnect from it.
+   * @url http://www.espruino.com/Reference#l_NRF_disconnect
+   */
+  static disconnect(): void;
+
+  /**
+   * Disable Bluetooth advertising and disconnect from any device that connected to
+   * Puck.js as a peripheral (this won't affect any devices that Puck.js initiated
+   * connections to).
+   * This makes Puck.js undiscoverable, so it can't be connected to.
+   * Use `NRF.wake()` to wake up and make Puck.js connectable again.
+   * @url http://www.espruino.com/Reference#l_NRF_sleep
+   */
+  static sleep(): void;
+
+  /**
+   * Enable Bluetooth advertising (this is enabled by default), which allows other
+   * devices to discover and connect to Puck.js.
+   * Use `NRF.sleep()` to disable advertising.
+   * @url http://www.espruino.com/Reference#l_NRF_wake
+   */
+  static wake(): void;
+
+  /**
+   * Restart the Bluetooth softdevice (if there is currently a BLE connection, it
+   * will queue a restart to be done when the connection closes).
+   * You shouldn't need to call this function in normal usage. However, Nordic's BLE
+   * softdevice has some settings that cannot be reset. For example there are only a
+   * certain number of unique UUIDs. Once these are all used the only option is to
+   * restart the softdevice to clear them all out.
+   *
+   * @param {any} callback - An optional function to be called while the softdevice is uninitialised. Use with caution - accessing console/bluetooth will almost certainly result in a crash.
+   * @url http://www.espruino.com/Reference#l_NRF_restart
+   */
+  static restart(callback: any): void;
+
+  /**
+   * Get this device's default Bluetooth MAC address.
+   * For Puck.js, the last 5 characters of this (eg. `ee:ff`) are used in the
+   * device's advertised Bluetooth name.
+   * @returns {any} MAC address - a string of the form 'aa:bb:cc:dd:ee:ff'
+   * @url http://www.espruino.com/Reference#l_NRF_getAddress
+   */
+  static getAddress(): any;
+
+  /**
+   * Set this device's default Bluetooth MAC address:
+   * ```
+   * NRF.setAddress("ff:ee:dd:cc:bb:aa random");
+   * ```
+   * Addresses take the form:
+   * * `"ff:ee:dd:cc:bb:aa"` or `"ff:ee:dd:cc:bb:aa public"` for a public address
+   * * `"ff:ee:dd:cc:bb:aa random"` for a random static address (the default for
+   *   Espruino)
+   * This may throw a `INVALID_BLE_ADDR` error if the upper two bits of the address
+   * don't match the address type.
+   * To change the address, Espruino must restart the softdevice. It will only do so
+   * when it is disconnected from other devices.
+   *
+   * @param {any} addr - The address to use (as a string)
+   * @url http://www.espruino.com/Reference#l_NRF_setAddress
+   */
+  static setAddress(addr: any): void;
+
+  /**
+   * Get the battery level in volts (the voltage that the NRF chip is running off
+   * of).
+   * This is the battery level of the device itself - it has nothing to with any
+   * device that might be connected.
+   * @returns {number} Battery level in volts
+   * @url http://www.espruino.com/Reference#l_NRF_getBattery
+   */
+  static getBattery(): number;
+
+  /**
+   * Change the data that Espruino advertises.
+   * Data can be of the form `{ UUID : data_as_byte_array }`. The UUID should be a
+   * [Bluetooth Service
+   * ID](https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx).
+   * For example to return battery level at 95%, do:
+   * ```
+   * NRF.setAdvertising({
+   *   0x180F : [95] // Service data 0x180F = 95
+   * });
+   * ```
+   * Or you could report the current temperature:
+   * ```
+   * setInterval(function() {
+   *   NRF.setAdvertising({
+   *     0x1809 : [Math.round(E.getTemperature())]
+   *   });
+   * }, 30000);
+   * ```
+   * If you specify a value for the object key, Service Data is advertised. However
+   * if you specify `undefined`, the Service UUID is advertised:
+   * ```
+   * NRF.setAdvertising({
+   *   0x180D : undefined // Advertise service UUID 0x180D (HRM)
+   * });
+   * ```
+   * Service UUIDs can also be supplied in the second argument of `NRF.setServices`,
+   * but those go in the scan response packet.
+   * You can also supply the raw advertising data in an array. For example to
+   * advertise as an Eddystone beacon:
+   * ```
+   * NRF.setAdvertising([0x03,  // Length of Service List
+   *   0x03,  // Param: Service List
+   *   0xAA, 0xFE,  // Eddystone ID
+   *   0x13,  // Length of Service Data
+   *   0x16,  // Service Data
+   *   0xAA, 0xFE, // Eddystone ID
+   *   0x10,  // Frame type: URL
+   *   0xF8, // Power
+   *   0x03, // https://
+   *   'g','o','o','.','g','l','/','B','3','J','0','O','c'],
+   *     {interval:100});
+   * ```
+   * (However for Eddystone we'd advise that you use the [Espruino Eddystone
+   * library](/Puck.js+Eddystone))
+   * **Note:** When specifying data as an array, certain advertising options such as
+   * `discoverable` and `showName` won't have any effect.
+   * **Note:** The size of Bluetooth LE advertising packets is limited to 31 bytes.
+   * If you want to advertise more data, consider using an array for `data` (See
+   * below), or `NRF.setScanResponse`.
+   * You can even specify an array of arrays or objects, in which case each
+   * advertising packet will be used in turn - for instance to make your device
+   * advertise battery level and its name as well as both Eddystone and iBeacon :
+   * ```
+   * NRF.setAdvertising([
+   *   {0x180F : [Puck.getBatteryPercentage()]}, // normal advertising, with battery %
+   *   require("ble_ibeacon").get(...), // iBeacon
+   *   require("ble_eddystone").get(...), // eddystone
+   * ], {interval:300});
+   * ```
+   * `options` is an object, which can contain:
+   * ```
+   * {
+   *   name: "Hello" // The name of the device
+   *   showName: true/false // include full name, or nothing
+   *   discoverable: true/false // general discoverable, or limited - default is limited
+   *   connectable: true/false // whether device is connectable - default is true
+   *   scannable : true/false // whether device can be scanned for scan response packets - default is true
+   *   interval: 600 // Advertising interval in msec, between 20 and 10000 (default is 375ms)
+   *   manufacturer: 0x0590 // IF sending manufacturer data, this is the manufacturer ID
+   *   manufacturerData: [...] // IF sending manufacturer data, this is an array of data
+   *   phy: "1mbps/2mbps/coded" // (NRF52840 only) use the long-range coded phy for transmission (1mbps default)
+   * }
+   * ```
+   * Setting `connectable` and `scannable` to false gives the lowest power
+   * consumption as the BLE radio doesn't have to listen after sending advertising.
+   * **NOTE:** Non-`connectable` advertising can't have an advertising interval less
+   * than 100ms according to the BLE spec.
+   * So for instance to set the name of Puck.js without advertising any other data
+   * you can just use the command:
+   * ```
+   * NRF.setAdvertising({},{name:"Hello"});
+   * ```
+   * You can also specify 'manufacturer data', which is another form of advertising
+   * data. We've registered the Manufacturer ID 0x0590 (as Pur3 Ltd) for use with
+   * *Official Espruino devices* - use it to advertise whatever data you'd like, but
+   * we'd recommend using JSON.
+   * For example by not advertising a device name you can send up to 24 bytes of JSON
+   * on Espruino's manufacturer ID:
+   * ```
+   * var data = {a:1,b:2};
+   * NRF.setAdvertising({},{
+   *   showName:false,
+   *   manufacturer:0x0590,
+   *   manufacturerData:JSON.stringify(data)
+   * });
+   * ```
+   * If you're using [EspruinoHub](https://github.com/espruino/EspruinoHub) then it
+   * will automatically decode this into the folling MQTT topics:
+   * * `/ble/advertise/ma:c_:_a:dd:re:ss/espruino` -> `{"a":10,"b":15}`
+   * * `/ble/advertise/ma:c_:_a:dd:re:ss/a` -> `1`
+   * * `/ble/advertise/ma:c_:_a:dd:re:ss/b` -> `2`
+   * Note that **you only have 24 characters available for JSON**, so try to use the
+   * shortest field names possible and avoid floating point values that can be very
+   * long when converted to a String.
+   *
+   * @param {any} data - The service data to advertise as an object - see below for more info
+   * @param {any} options - An optional object of options
+   * @url http://www.espruino.com/Reference#l_NRF_setAdvertising
+   */
+  static setAdvertising(data: any, options: any): void;
+
+  /**
+   * This is just like `NRF.setAdvertising`, except instead of advertising the data,
+   * it returns the packet that would be advertised as an array.
+   *
+   * @param {any} data - The data to advertise as an object
+   * @param {any} options - An optional object of options
+   * @returns {any} An array containing the advertising data
+   * @url http://www.espruino.com/Reference#l_NRF_getAdvertisingData
+   */
+  static getAdvertisingData(data: any, options: any): any;
+
+  /**
+   * The raw scan response data should be supplied as an array. For example to return
+   * "Sample" for the device name:
+   * ```
+   * NRF.setScanResponse([0x07,  // Length of Data
+   *   0x09,  // Param: Complete Local Name
+   *   'S', 'a', 'm', 'p', 'l', 'e']);
+   * ```
+   * **Note:** `NRF.setServices(..., {advertise:[ ... ]})` writes advertised services
+   * into the scan response - so you can't use both `advertise` and `NRF.setServices`
+   * or one will overwrite the other.
+   *
+   * @param {any} data - The data to for the scan response
+   * @url http://www.espruino.com/Reference#l_NRF_setScanResponse
+   */
+  static setScanResponse(data: any): void;
+
+  /**
+   * Change the services and characteristics Espruino advertises.
+   * If you want to **change** the value of a characteristic, you need to use
+   * `NRF.updateServices()` instead
+   * To expose some information on Characteristic `ABCD` on service `BCDE` you could
+   * do:
+   * ```
+   * NRF.setServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       value : "Hello",
+   *       readable : true
+   *     }
+   *   }
+   * });
+   * ```
+   * Or to allow the 3 LEDs to be controlled by writing numbers 0 to 7 to a
+   * characteristic, you can do the following. `evt.data` is an ArrayBuffer.
+   * ```
+   * NRF.setServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       writable : true,
+   *       onWrite : function(evt) {
+   *         digitalWrite([LED3,LED2,LED1], evt.data[0]);
+   *       }
+   *     }
+   *   }
+   * });
+   * ```
+   * You can supply many different options:
+   * ```
+   * NRF.setServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       value : "Hello", // optional
+   *       maxLen : 5, // optional (otherwise is length of initial value)
+   *       broadcast : false, // optional, default is false
+   *       readable : true,   // optional, default is false
+   *       writable : true,   // optional, default is false
+   *       notify : true,   // optional, default is false
+   *       indicate : true,   // optional, default is false
+   *       description: "My Characteristic",  // optional, default is null,
+   *       security: { // optional - see NRF.setSecurity
+   *         read: { // optional
+   *           encrypted: false, // optional, default is false
+   *           mitm: false, // optional, default is false
+   *           lesc: false, // optional, default is false
+   *           signed: false // optional, default is false
+   *         },
+   *         write: { // optional
+   *           encrypted: true, // optional, default is false
+   *           mitm: false, // optional, default is false
+   *           lesc: false, // optional, default is false
+   *           signed: false // optional, default is false
+   *         }
+   *       },
+   *       onWrite : function(evt) { // optional
+   *         console.log("Got ", evt.data); // an ArrayBuffer
+   *       },
+   *       onWriteDesc : function(evt) { // optional - called when the 'cccd' descriptor is written
+   *         // for example this is called when notifications are requested by the client:
+   *         console.log("Notifications enabled = ", evt.data[0]&1);
+   *       }
+   *     }
+   *     // more characteristics allowed
+   *   }
+   *   // more services allowed
+   * });
+   * ```
+   * **Note:** UUIDs can be integers between `0` and `0xFFFF`, strings of the form
+   * `"ABCD"`, or strings of the form `"ABCDABCD-ABCD-ABCD-ABCD-ABCDABCDABCD"`
+   * `options` can be of the form:
+   * ```
+   * NRF.setServices(undefined, {
+   *   hid : new Uint8Array(...), // optional, default is undefined. Enable BLE HID support
+   *   uart : true, // optional, default is true. Enable BLE UART support
+   *   advertise: [ '180D' ] // optional, list of service UUIDs to advertise
+   *   ancs : true, // optional, Bangle.js-only, enable Apple ANCS support for notifications
+   *   ams : true // optional, Bangle.js-only, enable Apple AMS support for media control
+   * });
+   * ```
+   * To enable BLE HID, you must set `hid` to an array which is the BLE report
+   * descriptor. The easiest way to do this is to use the `ble_hid_controls` or
+   * `ble_hid_keyboard` modules.
+   * **Note:** Just creating a service doesn't mean that the service will be
+   * advertised. It will only be available after a device connects. To advertise,
+   * specify the UUIDs you wish to advertise in the `advertise` field of the second
+   * `options` argument. For example this will create and advertise a heart rate
+   * service:
+   * ```
+   * NRF.setServices({
+   *   0x180D: { // heart_rate
+   *     0x2A37: { // heart_rate_measurement
+   *       notify: true,
+   *       value : [0x06, heartrate],
+   *     }
+   *   }
+   * }, { advertise: [ '180D' ] });
+   * ```
+   * You may specify 128 bit UUIDs to advertise, however you may get a `DATA_SIZE`
+   * exception because there is insufficient space in the Bluetooth LE advertising
+   * packet for the 128 bit UART UUID as well as the UUID you specified. In this case
+   * you can add `uart:false` after the `advertise` element to disable the UART,
+   * however you then be unable to connect to Puck.js's console via Bluetooth.
+   * If you absolutely require two or more 128 bit UUIDs then you will have to
+   * specify your own raw advertising data packets with `NRF.setAdvertising`
+   * **Note:** The services on Espruino can only be modified when there is no device
+   * connected to it as it requires a restart of the Bluetooth stack. **iOS devices
+   * will 'cache' the list of services** so apps like NRF Connect may incorrectly
+   * display the old services even after you have modified them. To fix this, disable
+   * and re-enable Bluetooth on your iOS device, or use an Android device to run NRF
+   * Connect.
+   * **Note:** Not all combinations of security configuration values are valid, the
+   * valid combinations are: encrypted, encrypted + mitm, lesc, signed, signed +
+   * mitm. See `NRF.setSecurity` for more information.
+   *
+   * @param {any} data - The service (and characteristics) to advertise
+   * @param {any} options - Optional object containing options
+   * @url http://www.espruino.com/Reference#l_NRF_setServices
+   */
+  static setServices(data: any, options: any): void;
+
+  /**
+   * Update values for the services and characteristics Espruino advertises. Only
+   * services and characteristics previously declared using `NRF.setServices` are
+   * affected.
+   * To update the '0xABCD' characteristic in the '0xBCDE' service:
+   * ```
+   * NRF.updateServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       value : "World"
+   *     }
+   *   }
+   * });
+   * ```
+   * You can also use 128 bit UUIDs, for example
+   * `"b7920001-3c1b-4b40-869f-3c0db9be80c6"`.
+   * To define a service and characteristic and then notify connected clients of a
+   * change to it when a button is pressed:
+   * ```
+   * NRF.setServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       value : "Hello",
+   *       maxLen : 20,
+   *       notify: true
+   *     }
+   *   }
+   * });
+   * setWatch(function() {
+   *   NRF.updateServices({
+   *     0xBCDE : {
+   *       0xABCD : {
+   *         value : "World!",
+   *         notify: true
+   *       }
+   *     }
+   *   });
+   * }, BTN, { repeat:true, edge:"rising", debounce: 50 });
+   * ```
+   * This only works if the characteristic was created with `notify: true` using
+   * `NRF.setServices`, otherwise the characteristic will be updated but no
+   * notification will be sent.
+   * Also note that `maxLen` was specified. If it wasn't then the maximum length of
+   * the characteristic would have been 5 - the length of `"Hello"`.
+   * To indicate (i.e. notify with ACK) connected clients of a change to the '0xABCD'
+   * characteristic in the '0xBCDE' service:
+   * ```
+   * NRF.updateServices({
+   *   0xBCDE : {
+   *     0xABCD : {
+   *       value : "World",
+   *       indicate: true
+   *     }
+   *   }
+   * });
+   * ```
+   * This only works if the characteristic was created with `indicate: true` using
+   * `NRF.setServices`, otherwise the characteristic will be updated but no
+   * notification will be sent.
+   * **Note:** See `NRF.setServices` for more information
+   *
+   * @param {any} data - The service (and characteristics) to update
+   * @url http://www.espruino.com/Reference#l_NRF_updateServices
+   */
+  static updateServices(data: any): void;
+
+  /**
+   * Start/stop listening for BLE advertising packets within range. Returns a
+   * `BluetoothDevice` for each advertsing packet. **By default this is not an active
+   * scan, so Scan Response advertising data is not included (see below)**
+   * ```
+   * // Start scanning
+   * packets=10;
+   * NRF.setScan(function(d) {
+   *   packets--;
+   *   if (packets<=0)
+   *     NRF.setScan(); // stop scanning
+   *   else
+   *     console.log(d); // print packet info
+   * });
+   * ```
+   * Each `BluetoothDevice` will look a bit like:
+   * ```
+   * BluetoothDevice {
+   *   "id": "aa:bb:cc:dd:ee:ff", // address
+   *   "rssi": -89,               // signal strength
+   *   "services": [ "128bit-uuid", ... ],     // zero or more service UUIDs
+   *   "data": new Uint8Array([ ... ]).buffer, // ArrayBuffer of returned data
+   *   "serviceData" : { "0123" : [ 1 ] }, // if service data is in 'data', it's extracted here
+   *   "manufacturer" : 0x1234, // if manufacturer data is in 'data', the 16 bit manufacturer ID is extracted here
+   *   "manufacturerData" : new Uint8Array([...]).buffer, // if manufacturer data is in 'data', the data is extracted here as an ArrayBuffer
+   *   "name": "DeviceName"       // the advertised device name
+   *  }
+   * ```
+   * You can also supply a set of filters (as described in `NRF.requestDevice`) as a
+   * second argument, which will allow you to filter the devices you get a callback
+   * for. This helps to cut down on the time spent processing JavaScript code in
+   * areas with a lot of Bluetooth advertisements. For example to find only devices
+   * with the manufacturer data `0x0590` (Espruino's ID) you could do:
+   * ```
+   * NRF.setScan(function(d) {
+   *   console.log(d.manufacturerData);
+   * }, { filters: [{ manufacturerData:{0x0590:{}} }] });
+   * ```
+   * You can also specify `active:true` in the second argument to perform active
+   * scanning (this requests scan response packets) from any devices it finds.
+   * **Note:** Using a filter in `setScan` filters each advertising packet
+   * individually. As a result, if you filter based on a service UUID and a device
+   * advertises with multiple packets (or a scan response when `active:true`) only
+   * the packets matching the filter are returned. To aggregate multiple packets you
+   * can use `NRF.findDevices`.
+   * **Note:** BLE advertising packets can arrive quickly - faster than you'll be
+   * able to print them to the console. It's best only to print a few, or to use a
+   * function like `NRF.findDevices(..)` which will collate a list of available
+   * devices.
+   * **Note:** Using setScan turns the radio's receive mode on constantly. This can
+   * draw a *lot* of power (12mA or so), so you should use it sparingly or you can
+   * run your battery down quickly.
+   *
+   * @param {any} callback - The callback to call with received advertising packets, or undefined to stop
+   * @param {any} options - An optional object `{filters: ...}` (as would be passed to `NRF.requestDevice`) to filter devices by
+   * @url http://www.espruino.com/Reference#l_NRF_setScan
+   */
+  static setScan(callback: any, options: any): void;
+
+  /**
+   * This function can be used to quickly filter through Bluetooth devices.
+   * For instance if you wish to scan for multiple different types of device at the
+   * same time then you could use `NRF.findDevices` with all the filters you're
+   * interested in. When scanning is finished you can then use `NRF.filterDevices` to
+   * pick out just the devices of interest.
+   * ```
+   * // the two types of device we're interested in
+   * var filter1 = [{serviceData:{"fe95":{}}}];
+   * var filter2 = [{namePrefix:"Pixl.js"}];
+   * // the following filter will return both types of device
+   * var allFilters = filter1.concat(filter2);
+   * // now scan for both types of device, and filter them out afterwards
+   * NRF.findDevices(function(devices) {
+   *   var devices1 = NRF.filterDevices(devices, filter1);
+   *   var devices2 = NRF.filterDevices(devices, filter2);
+   *   // ...
+   * }, {filters : allFilters});
+   * ```
+   *
+   * @param {any} devices - An array of `BluetoothDevice` objects, from `NRF.findDevices` or similar
+   * @param {any} filters - A list of filters (as would be passed to `NRF.requestDevice`) to filter devices by
+   * @returns {any} An array of `BluetoothDevice` objects that match the given filters
+   * @url http://www.espruino.com/Reference#l_NRF_filterDevices
+   */
+  static filterDevices(devices: any, filters: any): any;
+
+  /**
+   * Utility function to return a list of BLE devices detected in range. Behind the
+   * scenes, this uses `NRF.setScan(...)` and collates the results.
+   * ```
+   * NRF.findDevices(function(devices) {
+   *   console.log(devices);
+   * }, 1000);
+   * ```
+   * prints something like:
+   * ```
+   * [
+   *   BluetoothDevice {
+   *     "id" : "e7:e0:57:ad:36:a2 random",
+   *     "rssi": -45,
+   *     "services": [ "4567" ],
+   *     "serviceData" : { "0123" : [ 1 ] },
+   *     "manufacturer" : 1424,
+   *     "manufacturerData" : new Uint8Array([ ... ]).buffer,
+   *     "data": new ArrayBuffer([ ... ]).buffer,
+   *     "name": "Puck.js 36a2"
+   *    },
+   *   BluetoothDevice {
+   *     "id": "c0:52:3f:50:42:c9 random",
+   *     "rssi": -65,
+   *     "data": new ArrayBuffer([ ... ]),
+   *     "name": "Puck.js 8f57"
+   *    }
+   *  ]
+   * ```
+   * For more information on the structure returned, see `NRF.setScan`.
+   * If you want to scan only for specific devices you can replace the timeout with
+   * an object of the form `{filters: ..., timeout : ..., active: bool}` using the
+   * filters described in `NRF.requestDevice`. For example to search for devices with
+   * Espruino's `manufacturerData`:
+   * ```
+   * NRF.findDevices(function(devices) {
+   *   ...
+   * }, {timeout : 2000, filters : [{ manufacturerData:{0x0590:{}} }] });
+   * ```
+   * You could then use
+   * [`BluetoothDevice.gatt.connect(...)`](/Reference#l_BluetoothRemoteGATTServer_connect)
+   * on the device returned to make a connection.
+   * You can also use [`NRF.connect(...)`](/Reference#l_NRF_connect) on just the `id`
+   * string returned, which may be useful if you always want to connect to a specific
+   * device.
+   * **Note:** Using findDevices turns the radio's receive mode on for 2000ms (or
+   * however long you specify). This can draw a *lot* of power (12mA or so), so you
+   * should use it sparingly or you can run your battery down quickly.
+   * **Note:** The 'data' field contains the data of *the last packet received*.
+   * There may have been more packets. To get data for each packet individually use
+   * `NRF.setScan` instead.
+   *
+   * @param {any} callback - The callback to call with received advertising packets (as `BluetoothDevice`), or undefined to stop
+   * @param {any} [options] - [optional] A time in milliseconds to scan for (defaults to 2000), Or an optional object `{filters: ..., timeout : ..., active: bool}` (as would be passed to `NRF.requestDevice`) to filter devices by
+   * @url http://www.espruino.com/Reference#l_NRF_findDevices
+   */
+  static findDevices(callback: (devices: BluetoothDevice[]) => void, options?: number | { filters?: NRFFilters, timeout?: number, active?: boolean }): void;
+
+  /**
+   * Start/stop listening for RSSI values on the currently active connection (where
+   * This device is a peripheral and is being connected to by a 'central' device)
+   * ```
+   * // Start scanning
+   * NRF.setRSSIHandler(function(rssi) {
+   *   console.log(rssi); // prints -85 (or similar)
+   * });
+   * // Stop Scanning
+   * NRF.setRSSIHandler();
+   * ```
+   * RSSI is the 'Received Signal Strength Indication' in dBm
+   *
+   * @param {any} callback - The callback to call with the RSSI value, or undefined to stop
+   * @url http://www.espruino.com/Reference#l_NRF_setRSSIHandler
+   */
+  static setRSSIHandler(callback: any): void;
+
+  /**
+   * Set the BLE radio transmit power. The default TX power is 0 dBm, and
+   *
+   * @param {number} power - Transmit power. Accepted values are -40(nRF52 only), -30(nRF51 only), -20, -16, -12, -8, -4, 0, and 4 dBm. On nRF52840 (eg Bangle.js 2) 5/6/7/8 dBm are available too. Others will give an error code.
+   * @url http://www.espruino.com/Reference#l_NRF_setTxPower
+   */
+  static setTxPower(power: number): void;
+
+  /**
+   * **THIS IS DEPRECATED** - please use `NRF.setConnectionInterval` for peripheral
+   * and `NRF.connect(addr, options)`/`BluetoothRemoteGATTServer.connect(options)`
+   * for central connections.
+   * This sets the connection parameters - these affect the transfer speed and power
+   * usage when the device is connected.
+   * * When not low power, the connection interval is between 7.5 and 20ms
+   * * When low power, the connection interval is between 500 and 1000ms
+   * When low power connection is enabled, transfers of data over Bluetooth will be
+   * very slow, however power usage while connected will be drastically decreased.
+   * This will only take effect after the connection is disconnected and
+   * re-established.
+   *
+   * @param {boolean} lowPower - Whether the connection is low power or not
+   * @url http://www.espruino.com/Reference#l_NRF_setLowPowerConnection
+   */
+  static setLowPowerConnection(lowPower: boolean): void;
+
+  /**
+   * Enables NFC and starts advertising the given URL. For example:
+   * ```
+   * NRF.nfcURL("http://espruino.com");
+   * ```
+   *
+   * @param {any} url - The URL string to expose on NFC, or `undefined` to disable NFC
+   * @url http://www.espruino.com/Reference#l_NRF_nfcURL
+   */
+  static nfcURL(url: any): void;
+
+  /**
+   * Enables NFC and with an out of band 16 byte pairing key.
+   * For example the following will enable out of band pairing on BLE such that the
+   * device will pair when you tap the phone against it:
+   * ```
+   * var bleKey = [0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x99, 0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11, 0x00];
+   * NRF.on('security',s=>print("security",JSON.stringify(s)));
+   * NRF.nfcPair(bleKey);
+   * NRF.setSecurity({oob:bleKey, mitm:true});
+   * ```
+   *
+   * @param {any} key - 16 byte out of band key
+   * @url http://www.espruino.com/Reference#l_NRF_nfcPair
+   */
+  static nfcPair(key: any): void;
+
+  /**
+   * Enables NFC with a record that will launch the given android app.
+   * For example:
+   * ```
+   * NRF.nfcAndroidApp("no.nordicsemi.android.nrftoolbox")
+   * ```
+   *
+   * @param {any} app - The unique identifier of the given Android App
+   * @url http://www.espruino.com/Reference#l_NRF_nfcAndroidApp
+   */
+  static nfcAndroidApp(app: any): void;
+
+  /**
+   * Enables NFC and starts advertising with Raw data. For example:
+   * ```
+   * NRF.nfcRaw(new Uint8Array([193, 1, 0, 0, 0, 13, 85, 3, 101, 115, 112, 114, 117, 105, 110, 111, 46, 99, 111, 109]));
+   * // same as NRF.nfcURL("http://espruino.com");
+   * ```
+   *
+   * @param {any} payload - The NFC NDEF message to deliver to the reader
+   * @url http://www.espruino.com/Reference#l_NRF_nfcRaw
+   */
+  static nfcRaw(payload: any): void;
+
+  /**
+   * **Advanced NFC Functionality.** If you just want to advertise a URL, use
+   * `NRF.nfcURL` instead.
+   * Enables NFC and starts advertising. `NFCrx` events will be fired when data is
+   * received.
+   * ```
+   * NRF.nfcStart();
+   * ```
+   *
+   * @param {any} payload - Optional 7 byte UID
+   * @returns {any} Internal tag memory (first 10 bytes of tag data)
+   * @url http://www.espruino.com/Reference#l_NRF_nfcStart
+   */
+  static nfcStart(payload: any): any;
+
+  /**
+   * **Advanced NFC Functionality.** If you just want to advertise a URL, use
+   * `NRF.nfcURL` instead.
+   * Disables NFC.
+   * ```
+   * NRF.nfcStop();
+   * ```
+   *
+   * @url http://www.espruino.com/Reference#l_NRF_nfcStop
+   */
+  static nfcStop(): void;
+
+  /**
+   * **Advanced NFC Functionality.** If you just want to advertise a URL, use
+   * `NRF.nfcURL` instead.
+   * Acknowledges the last frame and optionally transmits a response. If payload is
+   * an array, then a array.length byte nfc frame is sent. If payload is a int, then
+   * a 4bit ACK/NACK is sent. **Note:** ```nfcSend``` should always be called after
+   * an ```NFCrx``` event.
+   * ```
+   * NRF.nfcSend(new Uint8Array([0x01, 0x02, ...]));
+   * // or
+   * NRF.nfcSend(0x0A);
+   * // or
+   * NRF.nfcSend();
+   * ```
+   *
+   * @param {any} payload - Optional tx data
+   * @url http://www.espruino.com/Reference#l_NRF_nfcSend
+   */
+  static nfcSend(payload: any): void;
+
+  /**
+   * Send a USB HID report. HID must first be enabled with `NRF.setServices({}, {hid:
+   * hid_report})`
+   *
+   * @param {any} data - Input report data as an array
+   * @param {any} callback - A callback function to be called when the data is sent
+   * @url http://www.espruino.com/Reference#l_NRF_sendHIDReport
+   */
+  static sendHIDReport(data: any, callback: any): void;
+
+  /**
+   * Check if Apple Notification Center Service (ANCS) is currently active on the BLE
+   * connection
+   *
+   * @returns {boolean} True if Apple Notification Center Service (ANCS) has been initialised and is active
+   * @url http://www.espruino.com/Reference#l_NRF_ancsIsActive
+   */
+  static ancsIsActive(): boolean;
+
+  /**
+   * Send an ANCS action for a specific Notification UID. Corresponds to
+   * posaction/negaction in the 'ANCS' event that was received
+   *
+   * @param {number} uid - The UID of the notification to respond to
+   * @param {boolean} positive - `true` for positive action, `false` for negative
+   * @url http://www.espruino.com/Reference#l_NRF_ancsAction
+   */
+  static ancsAction(uid: number, positive: boolean): void;
+
+  /**
+   * Get ANCS info for a notification, eg:
+   *
+   * @param {number} uid - The UID of the notification to get information for
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_ancsGetNotificationInfo
+   */
+  static ancsGetNotificationInfo(uid: number): Promise<void>;
+
+  /**
+   * Get ANCS info for an app (add id is available via `ancsGetNotificationInfo`)
+   * Promise returns:
+   * ```
+   * {
+   *   "uid" : int,
+   *   "appId" : string,
+   *   "title" : string,
+   *   "subtitle" : string,
+   *   "message" : string,
+   *   "messageSize" : string,
+   *   "date" : string,
+   *   "posAction" : string,
+   *   "negAction" : string,
+   *   "name" : string,
+   * }
+   * ```
+   *
+   * @param {any} id - The app ID to get information for
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_ancsGetAppInfo
+   */
+  static ancsGetAppInfo(id: any): Promise<void>;
+
+  /**
+   * Check if Apple Media Service (AMS) is currently active on the BLE connection
+   *
+   * @returns {boolean} True if Apple Media Service (AMS) has been initialised and is active
+   * @url http://www.espruino.com/Reference#l_NRF_amsIsActive
+   */
+  static amsIsActive(): boolean;
+
+  /**
+   * Get Apple Media Service (AMS) info for the current media player. "playbackinfo"
+   * returns a concatenation of three comma-separated values:
+   * - PlaybackState: a string that represents the integer value of the playback
+   *   state:
+   *     - PlaybackStatePaused = 0
+   *     - PlaybackStatePlaying = 1
+   *     - PlaybackStateRewinding = 2
+   *     - PlaybackStateFastForwarding = 3
+   * - PlaybackRate: a string that represents the floating point value of the
+   *   playback rate.
+   * - ElapsedTime: a string that represents the floating point value of the elapsed
+   *   time of the current track, in seconds
+   *
+   * @param {any} id - Either 'name', 'playbackinfo' or 'volume'
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_amsGetPlayerInfo
+   */
+  static amsGetPlayerInfo(id: any): Promise<void>;
+
+  /**
+   * Get Apple Media Service (AMS) info for the currently-playing track
+   *
+   * @param {any} id - Either 'artist', 'album', 'title' or 'duration'
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_amsGetTrackInfo
+   */
+  static amsGetTrackInfo(id: any): Promise<void>;
+
+  /**
+   * Send an AMS command to an Apple Media Service device to control music playback
+   * Command is one of play, pause, playpause, next, prev, volup, voldown, repeat,
+   * shuffle, skipforward, skipback, like, dislike, bookmark
+   *
+   * @param {any} id - For example, 'play', 'pause', 'volup' or 'voldown'
+   * @url http://www.espruino.com/Reference#l_NRF_amsCommand
+   */
+  static amsCommand(id: any): void;
+
+  /**
+   * Search for available devices matching the given filters. Since we have no UI
+   * here, Espruino will pick the FIRST device it finds, or it'll call `catch`.
+   * `options` can have the following fields:
+   * * `filters` - a list of filters that a device must match before it is returned
+   *   (see below)
+   * * `timeout` - the maximum time to scan for in milliseconds (scanning stops when
+   * a match is found. eg. `NRF.requestDevice({ timeout:2000, filters: [ ... ] })`
+   * * `active` - whether to perform active scanning (requesting 'scan response'
+   * packets from any devices that are found). eg. `NRF.requestDevice({ active:true,
+   * filters: [ ... ] })`
+   * * `phy` - (NRF52840 only) use the long-range coded phy (`"1mbps"` default, can
+   *   be `"1mbps/2mbps/both/coded"`)
+   * * `extended` - (NRF52840 only) support receiving extended-length advertising
+   *   packets (default=true if phy isn't `"1mbps"`)
+   * **NOTE:** `timeout` and `active` are not part of the Web Bluetooth standard.
+   * The following filter types are implemented:
+   * * `services` - list of services as strings (all of which must match). 128 bit
+   *   services must be in the form '01230123-0123-0123-0123-012301230123'
+   * * `name` - exact device name
+   * * `namePrefix` - starting characters of device name
+   * * `id` - exact device address (`id:"e9:53:86:09:89:99 random"`) (this is
+   *   Espruino-specific, and is not part of the Web Bluetooth spec)
+   * * `serviceData` - an object containing service characteristics which must all
+   *   match (`serviceData:{"1809":{}}`). Matching of actual service data is not
+   *   supported yet.
+   * * `manufacturerData` - an object containing manufacturer UUIDs which must all
+   *   match (`manufacturerData:{0x0590:{}}`). Matching of actual manufacturer data
+   *   is not supported yet.
+   * ```
+   * NRF.requestDevice({ filters: [{ namePrefix: 'Puck.js' }] }).then(function(device) { ... });
+   * // or
+   * NRF.requestDevice({ filters: [{ services: ['1823'] }] }).then(function(device) { ... });
+   * // or
+   * NRF.requestDevice({ filters: [{ manufacturerData:{0x0590:{}} }] }).then(function(device) { ... });
+   * ```
+   * As a full example, to send data to another Puck.js to turn an LED on:
+   * ```
+   * var gatt;
+   * NRF.requestDevice({ filters: [{ namePrefix: 'Puck.js' }] }).then(function(device) {
+   *   return device.gatt.connect();
+   * }).then(function(g) {
+   *   gatt = g;
+   *   return gatt.getPrimaryService("6e400001-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(service) {
+   *   return service.getCharacteristic("6e400002-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(characteristic) {
+   *   return characteristic.writeValue("LED1.set()\n");
+   * }).then(function() {
+   *   gatt.disconnect();
+   *   console.log("Done!");
+   * });
+   * ```
+   * Or slightly more concisely, using ES6 arrow functions:
+   * ```
+   * var gatt;
+   * NRF.requestDevice({ filters: [{ namePrefix: 'Puck.js' }]}).then(
+   *   device => device.gatt.connect()).then(
+   *   g => (gatt=g).getPrimaryService("6e400001-b5a3-f393-e0a9-e50e24dcca9e")).then(
+   *   service => service.getCharacteristic("6e400002-b5a3-f393-e0a9-e50e24dcca9e")).then(
+   *   characteristic => characteristic.writeValue("LED1.reset()\n")).then(
+   *   () => { gatt.disconnect(); console.log("Done!"); } );
+   * ```
+   * Note that you have to keep track of the `gatt` variable so that you can
+   * disconnect the Bluetooth connection when you're done.
+   * **Note:** Using a filter in `NRF.requestDevice` filters each advertising packet
+   * individually. As soon as a matching advertisement is received,
+   * `NRF.requestDevice` resolves the promise and stops scanning. This means that if
+   * you filter based on a service UUID and a device advertises with multiple packets
+   * (or a scan response when `active:true`) only the packet matching the filter is
+   * returned - you may not get the device's name is that was in a separate packet.
+   * To aggregate multiple packets you can use `NRF.findDevices`.
+   *
+   * @param {any} options - Options used to filter the device to use
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_requestDevice
+   */
+  static requestDevice(options?: { filters?: NRFFilters, timeout?: number, active?: boolean, phy?: string, extended?: boolean }): Promise<any>;
+
+  /**
+   * Connect to a BLE device by MAC address. Returns a promise, the argument of which
+   * is the `BluetoothRemoteGATTServer` connection.
+   * ```
+   * NRF.connect("aa:bb:cc:dd:ee").then(function(server) {
+   *   // ...
+   * });
+   * ```
+   * This has the same effect as calling `BluetoothDevice.gatt.connect` on a
+   * `BluetoothDevice` requested using `NRF.requestDevice`. It just allows you to
+   * specify the address directly (without having to scan).
+   * You can use it as follows - this would connect to another Puck device and turn
+   * its LED on:
+   * ```
+   * var gatt;
+   * NRF.connect("aa:bb:cc:dd:ee random").then(function(g) {
+   *   gatt = g;
+   *   return gatt.getPrimaryService("6e400001-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(service) {
+   *   return service.getCharacteristic("6e400002-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(characteristic) {
+   *   return characteristic.writeValue("LED1.set()\n");
+   * }).then(function() {
+   *   gatt.disconnect();
+   *   console.log("Done!");
+   * });
+   * ```
+   * **Note:** Espruino Bluetooth devices use a type of BLE address known as 'random
+   * static', which is different to a 'public' address. To connect to an Espruino
+   * device you'll need to use an address string of the form `"aa:bb:cc:dd:ee
+   * random"` rather than just `"aa:bb:cc:dd:ee"`. If you scan for devices with
+   * `NRF.findDevices`/`NRF.setScan` then addresses are already reported in the
+   * correct format.
+   *
+   * @param {any} mac - The MAC address to connect to
+   * @param {any} options - (Espruino-specific) An object of connection options (see `BluetoothRemoteGATTServer.connect` for full details)
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_NRF_connect
+   */
+  static connect(mac: any, options: any): Promise<void>;
+
+  /**
+   * If set to true, whenever a device bonds it will be added to the whitelist.
+   * When set to false, the whitelist is cleared and newly bonded devices will not be
+   * added to the whitelist.
+   * **Note:** This is remembered between `reset()`s but isn't remembered after
+   * power-on (you'll have to add it to `onInit()`.
+   *
+   * @param {boolean} whitelisting - Are we using a whitelist? (default false)
+   * @url http://www.espruino.com/Reference#l_NRF_setWhitelist
+   */
+  static setWhitelist(whitelisting: boolean): void;
+
+  /**
+   * When connected, Bluetooth LE devices communicate at a set interval. Lowering the
+   * interval (eg. more packets/second) means a lower delay when sending data, higher
+   * bandwidth, but also more power consumption.
+   * By default, when connected as a peripheral Espruino automatically adjusts the
+   * connection interval. When connected it's as fast as possible (7.5ms) but when
+   * idle for over a minute it drops to 200ms. On continued activity (>1 BLE
+   * operation) the interval is raised to 7.5ms again.
+   * The options for `interval` are:
+   * * `undefined` / `"auto"` : (default) automatically adjust connection interval
+   * * `100` : set min and max connection interval to the same number (between 7.5ms
+   *   and 4000ms)
+   * * `{minInterval:20, maxInterval:100}` : set min and max connection interval as a
+   *   range
+   * This configuration is not remembered during a `save()` - you will have to re-set
+   * it via `onInit`.
+   * **Note:** If connecting to another device (as Central), you can use an extra
+   * argument to `NRF.connect` or `BluetoothRemoteGATTServer.connect` to specify a
+   * connection interval.
+   * **Note:** This overwrites any changes imposed by the deprecated
+   * `NRF.setLowPowerConnection`
+   *
+   * @param {any} interval - The connection interval to use (see below)
+   * @url http://www.espruino.com/Reference#l_NRF_setConnectionInterval
+   */
+  static setConnectionInterval(interval: any): void;
+
+  /**
+   * Sets the security options used when connecting/pairing. This applies to both
+   * central *and* peripheral mode.
+   * ```
+   * NRF.setSecurity({
+   *   display : bool  // default false, can this device display a passkey
+   *                   // - sent via the `BluetoothDevice.passkey` event
+   *   keyboard : bool // default false, can this device enter a passkey
+   *                   // - request sent via the `BluetoothDevice.passkeyRequest` event
+   *   bond : bool // default true, Perform bonding
+   *   mitm : bool // default false, Man In The Middle protection
+   *   lesc : bool // default false, LE Secure Connections
+   *   passkey : // default "", or a 6 digit passkey to use
+   *   oob : [0..15] // if specified, Out Of Band pairing is enabled and
+   *                 // the 16 byte pairing code supplied here is used
+   *   encryptUart : bool // default false (unless oob or passkey specified)
+   *                      // This sets the BLE UART service such that it
+   *                      // is encrypted and can only be used from a bonded connection
+   * });
+   * ```
+   * **NOTE:** Some combinations of arguments will cause an error. For example
+   * supplying a passkey without `display:1` is not allowed. If `display:1` is set
+   * you do not require a physical display, the user just needs to know the passkey
+   * you supplied.
+   * For instance, to require pairing and to specify a passkey, use:
+   * ```
+   * NRF.setSecurity({passkey:"123456", mitm:1, display:1});
+   * ```
+   * However, while most devices will request a passkey for pairing at this point it
+   * is still possible for a device to connect without requiring one (eg. using the
+   * 'NRF Connect' app).
+   * To force a passkey you need to protect each characteristic you define with
+   * `NRF.setSecurity`. For instance the following code will *require* that the
+   * passkey `123456` is entered before the characteristic
+   * `9d020002-bf5f-1d1a-b52a-fe52091d5b12` can be read.
+   * ```
+   * NRF.setSecurity({passkey:"123456", mitm:1, display:1});
+   * NRF.setServices({
+   *   "9d020001-bf5f-1d1a-b52a-fe52091d5b12" : {
+   *     "9d020002-bf5f-1d1a-b52a-fe52091d5b12" : {
+   *       // readable always
+   *       value : "Not Secret"
+   *     },
+   *     "9d020003-bf5f-1d1a-b52a-fe52091d5b12" : {
+   *       // readable only once bonded
+   *       value : "Secret",
+   *       readable : true,
+   *       security: {
+   *         read: {
+   *           mitm: true,
+   *           encrypted: true
+   *         }
+   *       }
+   *     },
+   *     "9d020004-bf5f-1d1a-b52a-fe52091d5b12" : {
+   *       // readable always
+   *       // writable only once bonded
+   *       value : "Readable",
+   *       readable : true,
+   *       writable : true,
+   *       onWrite : function(evt) {
+   *         console.log("Wrote ", evt.data);
+   *       },
+   *       security: {
+   *         write: {
+   *           mitm: true,
+   *           encrypted: true
+   *         }
+   *       }
+   *     }
+   *   }
+   * });
+   * ```
+   * **Note:** If `passkey` or `oob` is specified, the Nordic UART service (if
+   * enabled) will automatically be set to require encryption, but otherwise it is
+   * open.
+   *
+   * @param {any} options - An object containing security-related options (see below)
+   * @url http://www.espruino.com/Reference#l_NRF_setSecurity
+   */
+  static setSecurity(options: any): void;
+
+  /**
+   * Return an object with information about the security state of the current
+   * peripheral connection:
+   * ```
+   * {
+   *   connected       // The connection is active (not disconnected).
+   *   encrypted       // Communication on this link is encrypted.
+   *   mitm_protected  // The encrypted communication is also protected against man-in-the-middle attacks.
+   *   bonded          // The peer is bonded with us
+   *   connected_addr  // If connected=true, the MAC address of the currently connected device
+   * }
+   * ```
+   * If there is no active connection, `{connected:false}` will be returned.
+   * See `NRF.setSecurity` for information about negotiating a secure connection.
+   * @returns {any} An object
+   * @url http://www.espruino.com/Reference#l_NRF_getSecurityStatus
+   */
+  static getSecurityStatus(): any;
+
+  /**
+   *
+   * @param {boolean} forceRepair - True if we should force repairing even if there is already valid pairing info
+   * @returns {any} A promise
+   * @url http://www.espruino.com/Reference#l_NRF_startBonding
+   */
+  static startBonding(forceRepair: boolean): any;
+
+
+}
+
+/**
+ * @url http://www.espruino.com/Reference#Bluetooth
+ */
+declare class Bluetooth {
+  /**
+   * @url http://www.espruino.com/Reference#l_Bluetooth_setConsole
+   */
+  static setConsole(): void;
+
+
+}
+
+/**
+ * A Web Bluetooth-style device - you can request one using
+ * `NRF.requestDevice(address)`
+ * For example:
+ * ```
+ * var gatt;
+ * NRF.requestDevice({ filters: [{ name: 'Puck.js abcd' }] }).then(function(device) {
+ *   console.log("found device");
+ *   return device.gatt.connect();
+ * }).then(function(g) {
+ *   gatt = g;
+ *   console.log("connected");
+ *   return gatt.startBonding();
+ * }).then(function() {
+ *   console.log("bonded", gatt.getSecurityStatus());
+ *   gatt.disconnect();
+ * }).catch(function(e) {
+ *   console.log("ERROR",e);
+ * });
+ * ```
+ * @url http://www.espruino.com/Reference#BluetoothDevice
+ */
+declare class BluetoothDevice {
+  /**
+   * Called when the device gets disconnected.
+   * To connect and then print `Disconnected` when the device is disconnected, just
+   * do the following:
+   * ```
+   * var gatt;
+   * NRF.connect("aa:bb:cc:dd:ee:ff").then(function(gatt) {
+   *   gatt.device.on('gattserverdisconnected', function(reason) {
+   *     console.log("Disconnected ",reason);
+   *   });
+   * });
+   * ```
+   * Or:
+   * ```
+   * var gatt;
+   * NRF.requestDevice(...).then(function(device) {
+   *   device.on('gattserverdisconnected', function(reason) {
+   *     console.log("Disconnected ",reason);
+   *   });
+   * });
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(reason: number) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `reason` The reason code reported back by the BLE stack - see Nordic's `ble_hci.h` file for more information
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_gattserverdisconnected
+   */
+  static on(event: "gattserverdisconnected", callback: (reason: number) => void): void;
+
+  /**
+   * Called when the device pairs and sends a passkey that Espruino should display.
+   * For this to be used, you'll have to specify that there's a display using
+   * `NRF.setSecurity`
+   * **This is not part of the Web Bluetooth Specification.** It has been added
+   * specifically for Espruino.
+   * @param {string} event - The event to listen to.
+   * @param {(passkey: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `passkey` A 6 character numeric String to be displayed
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_passkey
+   */
+  static on(event: "passkey", callback: (passkey: any) => void): void;
+
+  /**
+   * Called when the device pairs, displays a passkey, and wants Espruino to tell it
+   * what the passkey was.
+   * Respond with `BluetoothDevice.sendPasskey()` with a 6 character string
+   * containing only `0..9`.
+   * For this to be used, you'll have to specify that there's a keyboard using
+   * `NRF.setSecurity`
+   * **This is not part of the Web Bluetooth Specification.** It has been added
+   * specifically for Espruino.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_passkeyRequest
+   */
+  static on(event: "passkeyRequest", callback: () => void): void;
+
+  /**
+   * @returns {any} A `BluetoothRemoteGATTServer` for this device
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_gatt
+   */
+  gatt: any;
+
+  /**
+   * @returns {boolean} The last received RSSI (signal strength) for this device
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_rssi
+   */
+  rssi: boolean;
+
+  /**
+   * To be used as a response when the event `BluetoothDevice.sendPasskey` has been
+   * received.
+   * **This is not part of the Web Bluetooth Specification.** It has been added
+   * specifically for Espruino.
+   *
+   * @param {any} passkey - A 6 character numeric String to be returned to the device
+   * @url http://www.espruino.com/Reference#l_BluetoothDevice_sendPasskey
+   */
+  sendPasskey(passkey: any): void;
+}
+
+/**
+ * Web Bluetooth-style GATT server - get this using `NRF.connect(address)` or
+ * `NRF.requestDevice(options)` and `response.gatt.connect`
+ * https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattserver
+ * @url http://www.espruino.com/Reference#BluetoothRemoteGATTServer
+ */
+declare class BluetoothRemoteGATTServer {
+
+
+  /**
+   * Connect to a BLE device - returns a promise, the argument of which is the
+   * `BluetoothRemoteGATTServer` connection.
+   * See [`NRF.requestDevice`](/Reference#l_NRF_requestDevice) for usage examples.
+   * `options` is an optional object containing:
+   * ```
+   * {
+   *    minInterval // min connection interval in milliseconds, 7.5 ms to 4 s
+   *    maxInterval // max connection interval in milliseconds, 7.5 ms to 4 s
+   * }
+   * ```
+   * By default the interval is 20-200ms (or 500-1000ms if
+   * `NRF.setLowPowerConnection(true)` was called. During connection Espruino
+   * negotiates with the other device to find a common interval that can be used.
+   * For instance calling:
+   * ```
+   * NRF.requestDevice({ filters: [{ namePrefix: 'Pixl.js' }] }).then(function(device) {
+   *   return device.gatt.connect({minInterval:7.5, maxInterval:7.5});
+   * }).then(function(g) {
+   * ```
+   * will force the connection to use the fastest connection interval possible (as
+   * long as the device at the other end supports it).
+   * **Note:** The Web Bluetooth spec states that if a device hasn't advertised its
+   * name, when connected to a device the central (in this case Espruino) should
+   * automatically retrieve the name from the corresponding characteristic (`0x2a00`
+   * on service `0x1800`). Espruino does not automatically do this.
+   *
+   * @param {any} options - (Espruino-specific) An object of connection options (see below)
+   * @returns {any} A `Promise` that is resolved (or rejected) when the connection is complete
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_connect
+   */
+  connect(options: any): Promise<void>;
+
+  /**
+   * @returns {boolean} Whether the device is connected or not
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_connected
+   */
+  connected: boolean;
+
+  /**
+   * @returns {number} The handle to this device (if it is currently connected) - the handle is an internal value used by the Bluetooth Stack
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_handle
+   */
+  handle: number;
+
+  /**
+   * Disconnect from a previously connected BLE device connected with
+   * `BluetoothRemoteGATTServer.connect` - this does not disconnect from something
+   * that has connected to the Espruino.
+   * **Note:** While `.disconnect` is standard Web Bluetooth, in the spec it returns
+   * undefined not a `Promise` for implementation reasons. In Espruino we return a
+   * `Promise` to make it easier to detect when Espruino is free to connect to
+   * something else.
+   * @returns {any} A `Promise` that is resolved (or rejected) when the disconnection is complete (non-standard)
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_disconnect
+   */
+  disconnect(): Promise<void>;
+
+  /**
+   * Start negotiating bonding (secure communications) with the connected device, and
+   * return a Promise that is completed on success or failure.
+   * ```
+   * var gatt;
+   * NRF.requestDevice({ filters: [{ name: 'Puck.js abcd' }] }).then(function(device) {
+   *   console.log("found device");
+   *   return device.gatt.connect();
+   * }).then(function(g) {
+   *   gatt = g;
+   *   console.log("connected");
+   *   return gatt.startBonding();
+   * }).then(function() {
+   *   console.log("bonded", gatt.getSecurityStatus());
+   *   gatt.disconnect();
+   * }).catch(function(e) {
+   *   console.log("ERROR",e);
+   * });
+   * ```
+   * **This is not part of the Web Bluetooth Specification.** It has been added
+   * specifically for Espruino.
+   *
+   * @param {boolean} forceRePair - If the device is already bonded, re-pair it
+   * @returns {any} A `Promise` that is resolved (or rejected) when the bonding is complete
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_startBonding
+   */
+  startBonding(forceRePair: boolean): Promise<void>;
+
+  /**
+   * Return an object with information about the security state of the current
+   * connection:
+   * ```
+   * {
+   *   connected       // The connection is active (not disconnected).
+   *   encrypted       // Communication on this link is encrypted.
+   *   mitm_protected  // The encrypted communication is also protected against man-in-the-middle attacks.
+   *   bonded          // The peer is bonded with us
+   * }
+   * ```
+   * See `BluetoothRemoteGATTServer.startBonding` for information about negotiating a
+   * secure connection.
+   * **This is not part of the Web Bluetooth Specification.** It has been added
+   * specifically for Puck.js.
+   * @returns {any} An object
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_getSecurityStatus
+   */
+  getSecurityStatus(): any;
+
+  /**
+   * See `NRF.connect` for usage examples.
+   *
+   * @param {any} service - The service UUID
+   * @returns {any} A `Promise` that is resolved (or rejected) when the primary service is found (the argument contains a `BluetoothRemoteGATTService`)
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_getPrimaryService
+   */
+  getPrimaryService(service: any): Promise<void>;
+
+  /**
+   * @returns {any} A `Promise` that is resolved (or rejected) when the primary services are found (the argument contains an array of `BluetoothRemoteGATTService`)
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_getPrimaryServices
+   */
+  getPrimaryServices(): Promise<void>;
+
+  /**
+   * Start/stop listening for RSSI values on the active GATT connection
+   * ```
+   * // Start listening for RSSI value updates
+   * gattServer.setRSSIHandler(function(rssi) {
+   *   console.log(rssi); // prints -85 (or similar)
+   * });
+   * // Stop listening
+   * gattServer.setRSSIHandler();
+   * ```
+   * RSSI is the 'Received Signal Strength Indication' in dBm
+   *
+   * @param {any} callback - The callback to call with the RSSI value, or undefined to stop
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_setRSSIHandler
+   */
+  setRSSIHandler(callback: any): void;
+}
+
+/**
+ * Web Bluetooth-style GATT service - get this using
+ * `BluetoothRemoteGATTServer.getPrimaryService(s)`
+ * https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattservice
+ * @url http://www.espruino.com/Reference#BluetoothRemoteGATTService
+ */
+declare class BluetoothRemoteGATTService {
+
+
+  /**
+   * @returns {any} The `BluetoothDevice` this Service came from
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTService_device
+   */
+  device: any;
+
+  /**
+   * See `NRF.connect` for usage examples.
+   *
+   * @param {any} characteristic - The characteristic UUID
+   * @returns {any} A `Promise` that is resolved (or rejected) when the characteristic is found (the argument contains a `BluetoothRemoteGATTCharacteristic`)
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTService_getCharacteristic
+   */
+  getCharacteristic(characteristic: any): Promise<void>;
+
+  /**
+   * @returns {any} A `Promise` that is resolved (or rejected) when the characteristic is found (the argument contains an array of `BluetoothRemoteGATTCharacteristic`)
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTService_getCharacteristics
+   */
+  getCharacteristics(): Promise<void>;
+}
+
+/**
+ * Web Bluetooth-style GATT characteristic - get this using
+ * `BluetoothRemoteGATTService.getCharacteristic(s)`
+ * https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattcharacteristic
+ * @url http://www.espruino.com/Reference#BluetoothRemoteGATTCharacteristic
+ */
+declare class BluetoothRemoteGATTCharacteristic {
+  /**
+   * Called when a characteristic's value changes, *after*
+   * `BluetoothRemoteGATTCharacteristic.startNotifications` has been called.
+   * ```
+   *   ...
+   *   return service.getCharacteristic("characteristic_uuid");
+   * }).then(function(c) {
+   *   c.on('characteristicvaluechanged', function(event) {
+   *     console.log("-> "+event.target.value);
+   *   });
+   *   return c.startNotifications();
+   * }).then(...
+   * ```
+   * The first argument is of the form `{target :
+   * BluetoothRemoteGATTCharacteristic}`, and
+   * `BluetoothRemoteGATTCharacteristic.value` will then contain the new value (as a
+   * DataView).
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_characteristicvaluechanged
+   */
+  static on(event: "characteristicvaluechanged", callback: () => void): void;
+
+  /**
+   * @returns {any} The `BluetoothRemoteGATTService` this Service came from
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_service
+   */
+  service: any;
+
+  /**
+   * Write a characteristic's value
+   * ```
+   * var device;
+   * NRF.connect(device_address).then(function(d) {
+   *   device = d;
+   *   return d.getPrimaryService("service_uuid");
+   * }).then(function(s) {
+   *   console.log("Service ",s);
+   *   return s.getCharacteristic("characteristic_uuid");
+   * }).then(function(c) {
+   *   return c.writeValue("Hello");
+   * }).then(function(d) {
+   *   device.disconnect();
+   * }).catch(function() {
+   *   console.log("Something's broken.");
+   * });
+   * ```
+   *
+   * @param {any} data - The data to write
+   * @returns {any} A `Promise` that is resolved (or rejected) when the characteristic is written
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_writeValue
+   */
+  writeValue(data: any): Promise<void>;
+
+  /**
+   * Read a characteristic's value, return a promise containing a `DataView`
+   * ```
+   * var device;
+   * NRF.connect(device_address).then(function(d) {
+   *   device = d;
+   *   return d.getPrimaryService("service_uuid");
+   * }).then(function(s) {
+   *   console.log("Service ",s);
+   *   return s.getCharacteristic("characteristic_uuid");
+   * }).then(function(c) {
+   *   return c.readValue();
+   * }).then(function(d) {
+   *   console.log("Got:", JSON.stringify(d.buffer));
+   *   device.disconnect();
+   * }).catch(function() {
+   *   console.log("Something's broken.");
+   * });
+   * ```
+   * @returns {any} A `Promise` that is resolved (or rejected) with a `DataView` when the characteristic is read
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_readValue
+   */
+  readValue(): Promise<void>;
+
+  /**
+   * Starts notifications - whenever this characteristic's value changes, a
+   * `characteristicvaluechanged` event is fired and `characteristic.value` will then
+   * contain the new value as a `DataView`.
+   * ```
+   * var device;
+   * NRF.connect(device_address).then(function(d) {
+   *   device = d;
+   *   return d.getPrimaryService("service_uuid");
+   * }).then(function(s) {
+   *   console.log("Service ",s);
+   *   return s.getCharacteristic("characteristic_uuid");
+   * }).then(function(c) {
+   *   c.on('characteristicvaluechanged', function(event) {
+   *     console.log("-> ",event.target.value); // this is a DataView
+   *   });
+   *   return c.startNotifications();
+   * }).then(function(d) {
+   *   console.log("Waiting for notifications");
+   * }).catch(function() {
+   *   console.log("Something's broken.");
+   * });
+   * ```
+   * For example, to listen to the output of another Puck.js's Nordic Serial port
+   * service, you can use:
+   * ```
+   * var gatt;
+   * NRF.connect("pu:ck:js:ad:dr:es random").then(function(g) {
+   *   gatt = g;
+   *   return gatt.getPrimaryService("6e400001-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(service) {
+   *   return service.getCharacteristic("6e400003-b5a3-f393-e0a9-e50e24dcca9e");
+   * }).then(function(characteristic) {
+   *   characteristic.on('characteristicvaluechanged', function(event) {
+   *     console.log("RX: "+JSON.stringify(event.target.value.buffer));
+   *   });
+   *   return characteristic.startNotifications();
+   * }).then(function() {
+   *   console.log("Done!");
+   * });
+   * ```
+   * @returns {any} A `Promise` that is resolved (or rejected) with data when notifications have been added
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_startNotifications
+   */
+  startNotifications(): Promise<void>;
+
+  /**
+   * Stop notifications (that were requested with
+   * `BluetoothRemoteGATTCharacteristic.startNotifications`)
+   * @returns {any} A `Promise` that is resolved (or rejected) with data when notifications have been removed
+   * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_stopNotifications
+   */
+  stopNotifications(): Promise<void>;
+}
+
+/**
+ * Class containing utility functions for the [Bangle.js Smart
+ * Watch](http://www.espruino.com/Bangle.js)
+ * @url http://www.espruino.com/Reference#Bangle
+ */
+declare class Bangle {
+  /**
+   * Accelerometer data available with `{x,y,z,diff,mag}` object as a parameter.
+   * * `x` is X axis (left-right) in `g`
+   * * `y` is Y axis (up-down) in `g`
+   * * `z` is Z axis (in-out) in `g`
+   * * `diff` is difference between this and the last reading in `g`
+   * * `mag` is the magnitude of the acceleration in `g`
+   * You can also retrieve the most recent reading with `Bangle.getAccel()`.
+   * @param {string} event - The event to listen to.
+   * @param {(xyz: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `xyz`
+   * @url http://www.espruino.com/Reference#l_Bangle_accel
+   */
+  static on(event: "accel", callback: (xyz: AccelData) => void): void;
+
+  /**
+   * Called whenever a step is detected by Bangle.js's pedometer.
+   * @param {string} event - The event to listen to.
+   * @param {(up: number) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `up` The number of steps since Bangle.js was last reset
+   * @url http://www.espruino.com/Reference#l_Bangle_step
+   */
+  static on(event: "step", callback: (up: number) => void): void;
+
+  /**
+   * See `Bangle.getHealthStatus()` for more information. This is used for health
+   * tracking to allow Bangle.js to record historical exercise data.
+   * @param {string} event - The event to listen to.
+   * @param {(info: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `info` An object containing the last 10 minutes health data
+   * @url http://www.espruino.com/Reference#l_Bangle_health
+   */
+  static on(event: "health", callback: (info: HealthStatus) => void): void;
+
+  /**
+   * Has the watch been moved so that it is face-up, or not face up?
+   * @param {string} event - The event to listen to.
+   * @param {(up: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `up` `true` if face-up
+   * @url http://www.espruino.com/Reference#l_Bangle_faceUp
+   */
+  static on(event: "faceUp", callback: (up: boolean) => void): void;
+
+  /**
+   * This event happens when the watch has been twisted around it's axis - for
+   * instance as if it was rotated so someone could look at the time.
+   * To tweak when this happens, see the `twist*` options in `Bangle.setOptions()`
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Bangle_twist
+   */
+  static on(event: "twist", callback: () => void): void;
+
+  /**
+   * Is the battery charging or not?
+   * @param {string} event - The event to listen to.
+   * @param {(charging: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `charging` `true` if charging
+   * @url http://www.espruino.com/Reference#l_Bangle_charging
+   */
+  static on(event: "charging", callback: (charging: boolean) => void): void;
+
+  /**
+   * Magnetometer/Compass data available with `{x,y,z,dx,dy,dz,heading}` object as a
+   * parameter
+   * * `x/y/z` raw x,y,z magnetometer readings
+   * * `dx/dy/dz` readings based on calibration since magnetometer turned on
+   * * `heading` in degrees based on calibrated readings (will be NaN if magnetometer
+   *   hasn't been rotated around 360 degrees)
+   * To get this event you must turn the compass on with `Bangle.setCompassPower(1)`.
+   * You can also retrieve the most recent reading with `Bangle.getCompass()`.
+   * @param {string} event - The event to listen to.
+   * @param {(xyz: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `xyz`
+   * @url http://www.espruino.com/Reference#l_Bangle_mag
+   */
+  static on(event: "mag", callback: (xyz: CompassData) => void): void;
+
+  /**
+   * Raw NMEA GPS / u-blox data messages received as a string
+   * To get this event you must turn the GPS on with `Bangle.setGPSPower(1)`.
+   * @param {string} event - The event to listen to.
+   * @param {(nmea: any, dataLoss: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `nmea` A string containing the raw NMEA data from the GPS
+   * * `dataLoss` This is set to true if some lines of GPS data have previously been lost (eg because system was too busy to queue up a GPS-raw event)
+   * @url http://www.espruino.com/Reference#l_Bangle_GPS-raw
+   */
+  static on(event: "GPS-raw", callback: (nmea: string, dataLoss: boolean) => void): void;
+
+  /**
+   * GPS data, as an object. Contains:
+   * ```
+   * { "lat": number,      // Latitude in degrees
+   *   "lon": number,      // Longitude in degrees
+   *   "alt": number,      // altitude in M
+   *   "speed": number,    // Speed in kph
+   *   "course": number,   // Course in degrees
+   *   "time": Date,       // Current Time (or undefined if not known)
+   *   "satellites": 7,    // Number of satellites
+   *   "fix": 1            // NMEA Fix state - 0 is no fix
+   *   "hdop": number,     // Horizontal Dilution of Precision
+   * }
+   * ```
+   * If a value such as `lat` is not known because there is no fix, it'll be `NaN`.
+   * `hdop` is a value from the GPS receiver that gives a rough idea of accuracy of
+   * lat/lon based on the geometry of the satellites in range. Multiply by 5 to get a
+   * value in meters. This is just a ballpark estimation and should not be considered
+   * remotely accurate.
+   * To get this event you must turn the GPS on with `Bangle.setGPSPower(1)`.
+   * @param {string} event - The event to listen to.
+   * @param {(fix: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `fix` An object with fix info (see below)
+   * @url http://www.espruino.com/Reference#l_Bangle_GPS
+   */
+  static on(event: "GPS", callback: (fix: GPSFix) => void): void;
+
+  /**
+   * Heat rate data, as an object. Contains:
+   * ```
+   * { "bpm": number,             // Beats per minute
+   *   "confidence": number,      // 0-100 percentage confidence in the heart rate
+   *   "raw": Uint8Array,         // raw samples from heart rate monitor
+   * }
+   * ```
+   * To get this event you must turn the heart rate monitor on with
+   * `Bangle.setHRMPower(1)`.
+   * @param {string} event - The event to listen to.
+   * @param {(hrm: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `hrm` An object with heart rate info (see below)
+   * @url http://www.espruino.com/Reference#l_Bangle_HRM
+   */
+  static on(event: "HRM", callback: (hrm: { bpm: number, confidence: number, raw: Uint8Array }) => void): void;
+
+  /**
+   * Called when heart rate sensor data is available - see `Bangle.setHRMPower(1)`.
+   * `hrm` is of the form:
+   * ```
+   * { "raw": -1,       // raw value from sensor
+   *   "filt": -1,      // bandpass-filtered raw value from sensor
+   *   "bpm": 88.9,     // last BPM value measured
+   *   "confidence": 0  // confidence in the BPM value
+   * }
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(hrm: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `hrm` A object containing instant readings from the heart rate sensor
+   * @url http://www.espruino.com/Reference#l_Bangle_HRM-raw
+   */
+  static on(event: "HRM-raw", callback: (hrm: { raw: number, filt: number, bpm: number, confidence: number }) => void): void;
+
+  /**
+   * When `Bangle.setBarometerPower(true)` is called, this event is fired containing
+   * barometer readings.
+   * Same format as `Bangle.getPressure()`
+   * @param {string} event - The event to listen to.
+   * @param {(e: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `e` An object containing `{temperature,pressure,altitude}`
+   * @url http://www.espruino.com/Reference#l_Bangle_pressure
+   */
+  static on(event: "pressure", callback: (e: PressureData) => void): void;
+
+  /**
+   * Has the screen been turned on or off? Can be used to stop tasks that are no
+   * longer useful if nothing is displayed. Also see `Bangle.isLCDOn()`
+   * @param {string} event - The event to listen to.
+   * @param {(on: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `on` `true` if screen is on
+   * @url http://www.espruino.com/Reference#l_Bangle_lcdPower
+   */
+  static on(event: "lcdPower", callback: (on: boolean) => void): void;
+
+  /**
+   * Has the screen been locked? Also see `Bangle.isLocked()`
+   * @param {string} event - The event to listen to.
+   * @param {(on: boolean) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `on` `true` if screen is locked, `false` if it is unlocked and touchscreen/buttons will work
+   * @url http://www.espruino.com/Reference#l_Bangle_lock
+   */
+  static on(event: "lock", callback: (on: boolean) => void): void;
+
+  /**
+   * If the watch is tapped, this event contains information on the way it was
+   * tapped.
+   * `dir` reports the side of the watch that was tapped (not the direction it was
+   * tapped in).
+   * ```
+   * {
+   *   dir : "left/right/top/bottom/front/back",
+   *   double : true/false // was this a double-tap?
+   *   x : -2 .. 2, // the axis of the tap
+   *   y : -2 .. 2, // the axis of the tap
+   *   z : -2 .. 2 // the axis of the tap
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(data: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `data` `{dir, double, x, y, z}`
+   * @url http://www.espruino.com/Reference#l_Bangle_tap
+   */
+  static on(event: "tap", callback: (data: { dir: "left" | "right" | "top" | "bottom" | "front" | "back", double: boolean, x: TapAxis, y: TapAxis, z: TapAxis }) => void): void;
+
+  /**
+   * Emitted when a 'gesture' (fast movement) is detected
+   * @param {string} event - The event to listen to.
+   * @param {(xyz: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `xyz` An Int8Array of XYZXYZXYZ data
+   * @url http://www.espruino.com/Reference#l_Bangle_gesture
+   */
+  static on(event: "gesture", callback: (xyz: Int8Array) => void): void;
+
+  /**
+   * Emitted when a 'gesture' (fast movement) is detected, and a Tensorflow model is
+   * in storage in the `".tfmodel"` file.
+   * If a `".tfnames"` file is specified as a comma-separated list of names, it will
+   * be used to decode `gesture` from a number into a string.
+   * @param {string} event - The event to listen to.
+   * @param {(gesture: any, weights: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `gesture` The name of the gesture (if '.tfnames' exists, or the index. 'undefined' if not matching
+   * * `weights` An array of floating point values output by the model
+   * @url http://www.espruino.com/Reference#l_Bangle_aiGesture
+   */
+  static on(event: "aiGesture", callback: (gesture: string | undefined, weights: number[]) => void): void;
+
+  /**
+   * Emitted when a swipe on the touchscreen is detected (a movement from
+   * left->right, right->left, down->up or up->down)
+   * Bangle.js 1 is only capable of detecting left/right swipes as it only contains a
+   * 2 zone touchscreen.
+   * @param {string} event - The event to listen to.
+   * @param {(directionLR: number, directionUD: number) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `directionLR` `-1` for left, `1` for right, `0` for up/down
+   * * `directionUD` `-1` for up, `1` for down, `0` for left/right (Bangle.js 2 only)
+   * @url http://www.espruino.com/Reference#l_Bangle_swipe
+   */
+  static on(event: "swipe", callback: SwipeCallback): void;
+
+  /**
+   * Emitted when the touchscreen is pressed
+   * @param {string} event - The event to listen to.
+   * @param {(button: number, xy: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `button` `1` for left, `2` for right
+   * * `xy` Object of form `{x,y}` containing touch coordinates (if the device supports full touch). Clipped to 0..175 (LCD pixel coordinates) on firmware 2v13 and later.
+   * @url http://www.espruino.com/Reference#l_Bangle_touch
+   */
+  static on(event: "touch", callback: TouchCallback): void;
+
+  /**
+   * Emitted when the touchscreen is dragged or released
+   * The touchscreen extends past the edge of the screen and while `x` and `y`
+   * coordinates are arranged such that they align with the LCD's pixels, if your
+   * finger goes towards the edge of the screen, `x` and `y` could end up larger than
+   * 175 (the screen's maximum pixel coordinates) or smaller than 0. Coordinates from
+   * the `touch` event are clipped.
+   * @param {string} event - The event to listen to.
+   * @param {(event: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `event` Object of form `{x,y,dx,dy,b}` containing touch coordinates, difference in touch coordinates, and an integer `b` containing number of touch points (currently 1 or 0)
+   * @url http://www.espruino.com/Reference#l_Bangle_drag
+   */
+  static on(event: "drag", callback: DragCallback): void;
+
+  /**
+   * Emitted when the touchscreen is dragged for a large enough distance to count as
+   * a gesture.
+   * If Bangle.strokes is defined and populated with data from `Unistroke.new`, the
+   * `event` argument will also contain a `stroke` field containing the most closely
+   * matching stroke name.
+   * For example:
+   * ```
+   * Bangle.strokes = {
+   *   up : Unistroke.new(new Uint8Array([57, 151, ... 158, 137])),
+   *   alpha : Unistroke.new(new Uint8Array([161, 55, ... 159, 161])),
+   * };
+   * Bangle.on('stroke',o=>{
+   *   print(o.stroke);
+   *   g.clear(1).drawPoly(o.xy);
+   * });
+   * // Might print something like
+   * {
+   *   "xy": new Uint8Array([149, 50, ... 107, 136]),
+   *   "stroke": "alpha"
+   * }
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(event: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `event` Object of form `{xy:Uint8Array([x1,y1,x2,y2...])}` containing touch coordinates
+   * @url http://www.espruino.com/Reference#l_Bangle_stroke
+   */
+  static on(event: "stroke", callback: (event: { xy: Uint8Array, stroke?: string }) => void): void;
+
+  /**
+   * Emitted at midnight (at the point the `day` health info is reset to 0).
+   * Can be used for housekeeping tasks that don't want to be run during the day.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Bangle_midnight
+   */
+  static on(event: "midnight", callback: () => void): void;
+
+  /**
+   * This function can be used to turn Bangle.js's LCD off or on.
+   * This function resets the Bangle's 'activity timer' (like pressing a button or
+   * the screen would) so after a time period of inactivity set by
+   * `Bangle.setLCDTimeout` the screen will turn off.
+   * If you want to keep the screen on permanently (until apps are changed) you can
+   * do:
+   * ```
+   * Bangle.setLCDTimeout(0); // turn off the timeout
+   * Bangle.setLCDPower(1); // keep screen on
+   * ```
+   * **When on full, the LCD draws roughly 40mA.** You can adjust When brightness
+   * using `Bangle.setLCDBrightness`.
+   *
+   * @param {boolean} isOn - True if the LCD should be on, false if not
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDPower
+   */
+  static setLCDPower(isOn: boolean): void;
+
+  /**
+   * This function can be used to adjust the brightness of Bangle.js's display, and
+   * hence prolong its battery life.
+   * Due to hardware design constraints, software PWM has to be used which means that
+   * the display may flicker slightly when Bluetooth is active and the display is not
+   * at full power.
+   * **Power consumption**
+   * * 0 = 7mA
+   * * 0.1 = 12mA
+   * * 0.2 = 18mA
+   * * 0.5 = 28mA
+   * * 0.9 = 40mA (switching overhead)
+   * * 1 = 40mA
+   *
+   * @param {number} brightness - The brightness of Bangle.js's display - from 0(off) to 1(on full)
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDBrightness
+   */
+  static setLCDBrightness(brightness: number): void;
+
+  /**
+   * This function can be used to change the way graphics is handled on Bangle.js.
+   * Available options for `Bangle.setLCDMode` are:
+   * * `Bangle.setLCDMode()` or `Bangle.setLCDMode("direct")` (the default) - The
+   *   drawable area is 240x240 16 bit. Unbuffered, so draw calls take effect
+   *   immediately. Terminal and vertical scrolling work (horizontal scrolling
+   *   doesn't).
+   * * `Bangle.setLCDMode("doublebuffered")` - The drawable area is 240x160 16 bit,
+   *   terminal and scrolling will not work. `g.flip()` must be called for draw
+   *   operations to take effect.
+   * * `Bangle.setLCDMode("120x120")` - The drawable area is 120x120 8 bit,
+   *   `g.getPixel`, terminal, and full scrolling work. Uses an offscreen buffer
+   *   stored on Bangle.js, `g.flip()` must be called for draw operations to take
+   *   effect.
+   * * `Bangle.setLCDMode("80x80")` - The drawable area is 80x80 8 bit, `g.getPixel`,
+   *   terminal, and full scrolling work. Uses an offscreen buffer stored on
+   *   Bangle.js, `g.flip()` must be called for draw operations to take effect.
+   * You can also call `Bangle.setLCDMode()` to return to normal, unbuffered
+   * `"direct"` mode.
+   *
+   * @param {any} mode - The LCD mode (See below)
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDMode
+   */
+  static setLCDMode(mode?: LCDMode): void;
+
+  /**
+   * The current LCD mode.
+   * See `Bangle.setLCDMode` for examples.
+   * @returns {any} The LCD mode as a String
+   * @url http://www.espruino.com/Reference#l_Bangle_getLCDMode
+   */
+  static getLCDMode(): LCDMode;
+
+  /**
+   * This can be used to move the displayed memory area up or down temporarily. It's
+   * used for displaying notifications while keeping the main display contents
+   * intact.
+   *
+   * @param {number} y - The amount of pixels to shift the LCD up or down
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDOffset
+   */
+  static setLCDOffset(y: number): void;
+
+  /**
+   * This function can be used to turn Bangle.js's LCD power saving on or off.
+   * With power saving off, the display will remain in the state you set it with
+   * `Bangle.setLCDPower`.
+   * With power saving on, the display will turn on if a button is pressed, the watch
+   * is turned face up, or the screen is updated (see `Bangle.setOptions` for
+   * configuration). It'll turn off automatically after the given timeout.
+   * **Note:** This function also sets the Backlight and Lock timeout (the time at
+   * which the touchscreen/buttons start being ignored). To set both separately, use
+   * `Bangle.setOptions`
+   *
+   * @param {number} isOn - The timeout of the display in seconds, or `0`/`undefined` to turn power saving off. Default is 10 seconds.
+   * @url http://www.espruino.com/Reference#l_Bangle_setLCDTimeout
+   */
+  static setLCDTimeout(isOn: number): void;
+
+  /**
+   * Set how often the watch should poll for new acceleration/gyro data and kick the
+   * Watchdog timer. It isn't recommended that you make this interval much larger
+   * than 1000ms, but values up to 4000ms are allowed.
+   * Calling this will set `Bangle.setOptions({powerSave: false})` - disabling the
+   * dynamic adjustment of poll interval to save battery power when Bangle.js is
+   * stationary.
+   *
+   * @param {number} interval - Polling interval in milliseconds (Default is 80ms - 12.5Hz to match accelerometer)
+   * @url http://www.espruino.com/Reference#l_Bangle_setPollInterval
+   */
+  static setPollInterval(interval: number): void;
+
+  /**
+   * Set internal options used for gestures, etc...
+   * * `wakeOnBTN1` should the LCD turn on when BTN1 is pressed? default = `true`
+   * * `wakeOnBTN2` (Bangle.js 1) should the LCD turn on when BTN2 is pressed?
+   *   default = `true`
+   * * `wakeOnBTN3` (Bangle.js 1) should the LCD turn on when BTN3 is pressed?
+   *   default = `true`
+   * * `wakeOnFaceUp` should the LCD turn on when the watch is turned face up?
+   *   default = `false`
+   * * `wakeOnTouch` should the LCD turn on when the touchscreen is pressed? default
+   *   = `false`
+   * * `wakeOnTwist` should the LCD turn on when the watch is twisted? default =
+   *   `true`
+   * * `twistThreshold` How much acceleration to register a twist of the watch strap?
+   *   Can be negative for opposite direction. default = `800`
+   * * `twistMaxY` Maximum acceleration in Y to trigger a twist (low Y means watch is
+   *   facing the right way up). default = `-800`
+   * * `twistTimeout` How little time (in ms) must a twist take from low->high
+   *   acceleration? default = `1000`
+   * * `gestureStartThresh` how big a difference before we consider a gesture
+   *   started? default = `sqr(800)`
+   * * `gestureEndThresh` how small a difference before we consider a gesture ended?
+   *   default = `sqr(2000)`
+   * * `gestureInactiveCount` how many samples do we keep after a gesture has ended?
+   *   default = `4`
+   * * `gestureMinLength` how many samples must a gesture have before we notify about
+   *   it? default = `10`
+   * * `powerSave` after a minute of not being moved, Bangle.js will change the
+   *    accelerometer poll interval down to 800ms (10x accelerometer samples). On
+   *    movement it'll be raised to the default 80ms. If `Bangle.setPollInterval` is
+   *    used this is disabled, and for it to work the poll interval must be either
+   *    80ms or 800ms. default = `true`. Setting `powerSave:false` will disable this
+   *    automatic power saving, but will **not** change the poll interval from its
+   *    current value. If you desire a specific interval (e.g. the default 80ms) you
+   *    must set it manually with `Bangle.setPollInterval(80)` after setting
+   *    `powerSave:false`.
+   * * `lockTimeout` how many milliseconds before the screen locks
+   * * `lcdPowerTimeout` how many milliseconds before the screen turns off
+   * * `backlightTimeout` how many milliseconds before the screen's backlight turns
+   *   off
+   * * `hrmPollInterval` set the requested poll interval (in milliseconds) for the
+   *   heart rate monitor. On Bangle.js 2 only 10,20,40,80,160,200 ms are supported,
+   *   and polling rate may not be exact. The algorithm's filtering is tuned for
+   *   20-40ms poll intervals, so higher/lower intervals may effect the reliability
+   *   of the BPM reading.
+   * * `seaLevelPressure` (Bangle.js 2) Normally 1013.25 millibars - this is used for
+   *   calculating altitude with the pressure sensor
+   * Where accelerations are used they are in internal units, where `8192 = 1g`
+   *
+   * @param {any} options
+   * @url http://www.espruino.com/Reference#l_Bangle_setOptions
+   */
+  static setOptions(options: { [key in keyof BangleOptions]?: BangleOptions[key] }): void;
+
+  /**
+   * Return the current state of options as set by `Bangle.setOptions`
+   * @returns {any} The current state of all options
+   * @url http://www.espruino.com/Reference#l_Bangle_getOptions
+   */
+  static getOptions(): BangleOptions;
+
+  /**
+   * Also see the `Bangle.lcdPower` event
+   * @returns {boolean} Is the display on or not?
+   * @url http://www.espruino.com/Reference#l_Bangle_isLCDOn
+   */
+  static isLCDOn(): boolean;
+
+  /**
+   * This function can be used to lock or unlock Bangle.js (e.g. whether buttons and
+   * touchscreen work or not)
+   *
+   * @param {boolean} isLocked - `true` if the Bangle is locked (no user input allowed)
+   * @url http://www.espruino.com/Reference#l_Bangle_setLocked
+   */
+  static setLocked(isLocked: boolean): void;
+
+  /**
+   * Also see the `Bangle.lock` event
+   * @returns {boolean} Is the screen locked or not?
+   * @url http://www.espruino.com/Reference#l_Bangle_isLocked
+   */
+  static isLocked(): boolean;
+
+  /**
+   * @returns {boolean} Is the battery charging or not?
+   * @url http://www.espruino.com/Reference#l_Bangle_isCharging
+   */
+  static isCharging(): boolean;
+
+  /**
+   * Writes a command directly to the ST7735 LCD controller
+   *
+   * @param {number} cmd
+   * @param {any} data
+   * @url http://www.espruino.com/Reference#l_Bangle_lcdWr
+   */
+  static lcdWr(cmd: number, data: any): void;
+
+  /**
+   * Set the power to the Heart rate monitor
+   * When on, data is output via the `HRM` event on `Bangle`:
+   * ```
+   * Bangle.setHRMPower(true, "myapp");
+   * Bangle.on('HRM',print);
+   * ```
+   * *When on, the Heart rate monitor draws roughly 5mA*
+   *
+   * @param {boolean} isOn - True if the heart rate monitor should be on, false if not
+   * @param {any} appID - A string with the app's name in, used to ensure one app can't turn off something another app is using
+   * @returns {boolean} Is HRM on?
+   * @url http://www.espruino.com/Reference#l_Bangle_setHRMPower
+   */
+  static setHRMPower(isOn: boolean, appID: string): boolean;
+
+  /**
+   * Is the Heart rate monitor powered?
+   * Set power with `Bangle.setHRMPower(...);`
+   * @returns {boolean} Is HRM on?
+   * @url http://www.espruino.com/Reference#l_Bangle_isHRMOn
+   */
+  static isHRMOn(): boolean;
+
+  /**
+   * Set the power to the GPS.
+   * When on, data is output via the `GPS` event on `Bangle`:
+   * ```
+   * Bangle.setGPSPower(true, "myapp");
+   * Bangle.on('GPS',print);
+   * ```
+   * *When on, the GPS draws roughly 20mA*
+   *
+   * @param {boolean} isOn - True if the GPS should be on, false if not
+   * @param {any} appID - A string with the app's name in, used to ensure one app can't turn off something another app is using
+   * @returns {boolean} Is the GPS on?
+   * @url http://www.espruino.com/Reference#l_Bangle_setGPSPower
+   */
+  static setGPSPower(isOn: boolean, appID: string): boolean;
+
+  /**
+   * Is the GPS powered?
+   * Set power with `Bangle.setGPSPower(...);`
+   * @returns {boolean} Is the GPS on?
+   * @url http://www.espruino.com/Reference#l_Bangle_isGPSOn
+   */
+  static isGPSOn(): boolean;
+
+  /**
+   * Get the last available GPS fix info (or `undefined` if GPS is off).
+   * The fix info received is the same as you'd get from the `Bangle.GPS` event.
+   * @returns {any} A GPS fix object with `{lat,lon,...}`
+   * @url http://www.espruino.com/Reference#l_Bangle_getGPSFix
+   */
+  static getGPSFix(): GPSFix;
+
+  /**
+   * Set the power to the Compass
+   * When on, data is output via the `mag` event on `Bangle`:
+   * ```
+   * Bangle.setCompassPower(true, "myapp");
+   * Bangle.on('mag',print);
+   * ```
+   * *When on, the compass draws roughly 2mA*
+   *
+   * @param {boolean} isOn - True if the Compass should be on, false if not
+   * @param {any} appID - A string with the app's name in, used to ensure one app can't turn off something another app is using
+   * @returns {boolean} Is the Compass on?
+   * @url http://www.espruino.com/Reference#l_Bangle_setCompassPower
+   */
+  static setCompassPower(isOn: boolean, appID: string): boolean;
+
+  /**
+   * Is the compass powered?
+   * Set power with `Bangle.setCompassPower(...);`
+   * @returns {boolean} Is the Compass on?
+   * @url http://www.espruino.com/Reference#l_Bangle_isCompassOn
+   */
+  static isCompassOn(): boolean;
+
+  /**
+   * Resets the compass minimum/maximum values. Can be used if the compass isn't
+   * providing a reliable heading any more.
+   *
+   * @url http://www.espruino.com/Reference#l_Bangle_resetCompass
+   */
+  static resetCompass(): void;
+
+  /**
+   * Set the power to the barometer IC. Once enabled, `Bangle.pressure` events are
+   * fired each time a new barometer reading is available.
+   * When on, the barometer draws roughly 50uA
+   *
+   * @param {boolean} isOn - True if the barometer IC should be on, false if not
+   * @param {any} appID - A string with the app's name in, used to ensure one app can't turn off something another app is using
+   * @returns {boolean} Is the Barometer on?
+   * @url http://www.espruino.com/Reference#l_Bangle_setBarometerPower
+   */
+  static setBarometerPower(isOn: boolean, appID: string): boolean;
+
+  /**
+   * Is the Barometer powered?
+   * Set power with `Bangle.setBarometerPower(...);`
+   * @returns {boolean} Is the Barometer on?
+   * @url http://www.espruino.com/Reference#l_Bangle_isBarometerOn
+   */
+  static isBarometerOn(): boolean;
+
+  /**
+   * Returns the current amount of steps recorded by the step counter
+   * @returns {number} The number of steps recorded by the step counter
+   * @url http://www.espruino.com/Reference#l_Bangle_getStepCount
+   */
+  static getStepCount(): number;
+
+  /**
+   * Sets the current value of the step counter
+   *
+   * @param {number} count - The value with which to reload the step counter
+   * @url http://www.espruino.com/Reference#l_Bangle_setStepCount
+   */
+  static setStepCount(count: number): void;
+
+  /**
+   * Get the most recent Magnetometer/Compass reading. Data is in the same format as
+   * the `Bangle.on('mag',` event.
+   * Returns an `{x,y,z,dx,dy,dz,heading}` object
+   * * `x/y/z` raw x,y,z magnetometer readings
+   * * `dx/dy/dz` readings based on calibration since magnetometer turned on
+   * * `heading` in degrees based on calibrated readings (will be NaN if magnetometer
+   *   hasn't been rotated around 360 degrees)
+   * To get this event you must turn the compass on with `Bangle.setCompassPower(1)`.
+   * @returns {any} An object containing magnetometer readings (as below)
+   * @url http://www.espruino.com/Reference#l_Bangle_getCompass
+   */
+  static getCompass(): CompassData;
+
+  /**
+   * Get the most recent accelerometer reading. Data is in the same format as the
+   * `Bangle.on('accel',` event.
+   * * `x` is X axis (left-right) in `g`
+   * * `y` is Y axis (up-down) in `g`
+   * * `z` is Z axis (in-out) in `g`
+   * * `diff` is difference between this and the last reading in `g` (calculated by
+   *   comparing vectors, not magnitudes)
+   * * `td` is the elapsed
+   * * `mag` is the magnitude of the acceleration in `g`
+   * @returns {any} An object containing accelerometer readings (as below)
+   * @url http://www.espruino.com/Reference#l_Bangle_getAccel
+   */
+  static getAccel(): AccelData & { td: number };
+
+  /**
+   * `range` is one of:
+   * * `undefined` or `'current'` - health data so far in the last 10 minutes is
+   *   returned,
+   * * `'last'` - health data during the last 10 minutes
+   * * `'day'` - the health data so far for the day
+   * `getHealthStatus` returns an object containing:
+   * * `movement` is the 32 bit sum of all `acc.diff` readings since power on (and
+   *   rolls over). It is the difference in accelerometer values as `g*8192`
+   * * `steps` is the number of steps during this period
+   * * `bpm` the best BPM reading from HRM sensor during this period
+   * * `bpmConfidence` best BPM confidence (0-100%) during this period
+   *
+   * @param {any} range - What time period to return data for, see below:
+   * @returns {any} Returns an object containing various health info
+   * @url http://www.espruino.com/Reference#l_Bangle_getHealthStatus
+   */
+  static getHealthStatus(range?: "current" | "last" | "day"): HealthStatus;
+
+  /**
+   * Reads debug info
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Bangle_dbg
+   */
+  static dbg(): any;
+
+  /**
+   * Writes a register on the accelerometer
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Bangle_accelWr
+   */
+  static accelWr(reg: number, data: number): void;
+
+  /**
+   * Reads a register from the accelerometer
+   * **Note:** On Espruino 2v06 and before this function only returns a number (`cnt`
+   * is ignored).
+   *
+   * @param {number} reg
+   * @param {number} cnt - If specified, returns an array of the given length (max 128). If not (or 0) it returns a number
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Bangle_accelRd
+   */
+  static accelRd(reg: number, cnt?: 0): number;
+  static accelRd(reg: number, cnt: number): number[];
+
+  /**
+   * Writes a register on the barometer IC
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Bangle_barometerWr
+   */
+  static barometerWr(reg: number, data: number): void;
+
+  /**
+   * Reads a register from the barometer IC
+   *
+   * @param {number} reg
+   * @param {number} cnt - If specified, returns an array of the given length (max 128). If not (or 0) it returns a number
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Bangle_barometerRd
+   */
+  static barometerRd(reg: number, cnt?: 0): number;
+  static barometerRd(reg: number, cnt: number): number[];
+
+  /**
+   * Writes a register on the Magnetometer/Compass
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Bangle_compassWr
+   */
+  static compassWr(reg: number, data: number): void;
+
+  /**
+   * Read a register on the Magnetometer/Compass
+   *
+   * @param {number} reg
+   * @param {number} cnt - If specified, returns an array of the given length (max 128). If not (or 0) it returns a number
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Bangle_compassRd
+   */
+  static compassRd(reg: number, cnt?: 0): number;
+  static compassRd(reg: number, cnt: number): number[];
+
+  /**
+   * Writes a register on the Heart rate monitor
+   *
+   * @param {number} reg
+   * @param {number} data
+   * @url http://www.espruino.com/Reference#l_Bangle_hrmWr
+   */
+  static hrmWr(reg: number, data: number): void;
+
+  /**
+   * Read a register on the Heart rate monitor
+   *
+   * @param {number} reg
+   * @param {number} cnt - If specified, returns an array of the given length (max 128). If not (or 0) it returns a number
+   * @returns {any}
+   * @url http://www.espruino.com/Reference#l_Bangle_hrmRd
+   */
+  static hrmRd(reg: number, cnt?: 0): number;
+  static hrmRd(reg: number, cnt: number): number[];
+
+  /**
+   * Changes a pin state on the IO expander
+   *
+   * @param {number} mask
+   * @param {number} isOn
+   * @url http://www.espruino.com/Reference#l_Bangle_ioWr
+   */
+  static ioWr(mask: number, isOn: number): void;
+
+  /**
+   * Read temperature, pressure and altitude data. A promise is returned which will
+   * be resolved with `{temperature, pressure, altitude}`.
+   * If the Barometer has been turned on with `Bangle.setBarometerPower` then this
+   * will return almost immediately with the reading. If the Barometer is off,
+   * conversions take between 500-750ms.
+   * Altitude assumes a sea-level pressure of 1013.25 hPa
+   * ```
+   * Bangle.getPressure().then(d=>{
+   *   console.log(d);
+   *   // {temperature, pressure, altitude}
+   * });
+   * ```
+   * @returns {any} A promise that will be resolved with `{temperature, pressure, altitude}`
+   * @url http://www.espruino.com/Reference#l_Bangle_getPressure
+   */
+  static getPressure(): PressureData;
+
+  /**
+   * Perform a Spherical [Web Mercator
+   * projection](https://en.wikipedia.org/wiki/Web_Mercator_projection) of latitude
+   * and longitude into `x` and `y` coordinates, which are roughly equivalent to
+   * meters from `{lat:0,lon:0}`.
+   * This is the formula used for most online mapping and is a good way to compare
+   * GPS coordinates to work out the distance between them.
+   *
+   * @param {any} latlong - `{lat:..., lon:...}`
+   * @returns {any} {x:..., y:...}
+   * @url http://www.espruino.com/Reference#l_Bangle_project
+   */
+  static project(latlong: { lat: number, lon: number }): { x: number, y: number };
+
+  /**
+   * Use the piezo speaker to Beep for a certain time period and frequency
+   *
+   * @param {number} [time] - [optional] Time in ms (default 200)
+   * @param {number} [freq] - [optional] Frequency in hz (default 4000)
+   * @returns {any} A promise, completed when beep is finished
+   * @url http://www.espruino.com/Reference#l_Bangle_beep
+   */
+  static beep(time?: number, freq?: number): Promise<void>;
+
+  /**
+   * Use the vibration motor to buzz for a certain time period
+   *
+   * @param {number} [time] - [optional] Time in ms (default 200)
+   * @param {number} [strength] - [optional] Power of vibration from 0 to 1 (Default 1)
+   * @returns {any} A promise, completed when vibration is finished
+   * @url http://www.espruino.com/Reference#l_Bangle_buzz
+   */
+  static buzz(time?: number, strength?: number): Promise<void>;
+
+  /**
+   * Turn Bangle.js off. It can only be woken by pressing BTN1.
+   * @url http://www.espruino.com/Reference#l_Bangle_off
+   */
+  static off(): void;
+
+  /**
+   * Turn Bangle.js (mostly) off, but keep the CPU in sleep mode until BTN1 is
+   * pressed to preserve the RTC (current time).
+   * @url http://www.espruino.com/Reference#l_Bangle_softOff
+   */
+  static softOff(): void;
+
+  /**
+   * * On platforms with an LCD of >=8bpp this is 222 x 104 x 2 bits
+   * * Otherwise it's 119 x 56 x 1 bits
+   * @returns {any} An image to be used with `g.drawImage` (as a String)
+   * @url http://www.espruino.com/Reference#l_Bangle_getLogo
+   */
+  static getLogo(): string;
+
+  /**
+   * Load all widgets from flash Storage. Call this once at the beginning of your
+   * application if you want any on-screen widgets to be loaded.
+   * They will be loaded into a global `WIDGETS` array, and can be rendered with
+   * `Bangle.drawWidgets`.
+   * @url http://www.espruino.com/Reference#l_Bangle_loadWidgets
+   */
+  static loadWidgets(): void;
+
+  /**
+   * Draw any onscreen widgets that were loaded with `Bangle.loadWidgets()`.
+   * Widgets should redraw themselves when something changes - you'll only need to
+   * call drawWidgets if you decide to clear the entire screen with `g.clear()`.
+   * @url http://www.espruino.com/Reference#l_Bangle_drawWidgets
+   */
+  static drawWidgets(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_Bangle_drawWidgets
+   */
+  static drawWidgets(): void;
+
+  /**
+   * Load the Bangle.js app launcher, which will allow the user to select an
+   * application to launch.
+   * @url http://www.espruino.com/Reference#l_Bangle_showLauncher
+   */
+  static showLauncher(): void;
+
+  /**
+   * This puts Bangle.js into the specified UI input mode, and calls the callback
+   * provided when there is user input.
+   * Currently supported interface types are:
+   * * 'updown' - UI input with upwards motion `cb(-1)`, downwards motion `cb(1)`,
+   *   and select `cb()`
+   *   * Bangle.js 1 uses BTN1/3 for up/down and BTN2 for select
+   *   * Bangle.js 2 uses touchscreen swipe up/down and tap
+   * * 'leftright' - UI input with left motion `cb(-1)`, right motion `cb(1)`, and
+   *   select `cb()`
+   *   * Bangle.js 1 uses BTN1/3 for left/right and BTN2 for select
+   *   * Bangle.js 2 uses touchscreen swipe left/right and tap/BTN1 for select
+   * * 'clock' - called for clocks. Sets `Bangle.CLOCK=1` and allows a button to
+   *   start the launcher
+   *   * Bangle.js 1 BTN2 starts the launcher
+   *   * Bangle.js 2 BTN1 starts the launcher
+   * * 'clockupdown' - called for clocks. Sets `Bangle.CLOCK=1`, allows a button to
+   *   start the launcher, but also provides up/down functionality
+   *   * Bangle.js 1 BTN2 starts the launcher, BTN1/BTN3 call `cb(-1)` and `cb(1)`
+   *   * Bangle.js 2 BTN1 starts the launcher, touchscreen tap in top/bottom right
+   *     hand side calls `cb(-1)` and `cb(1)`
+   * * `{mode:"custom", ...}` allows you to specify custom handlers for different
+   *   interactions. See below.
+   * * `undefined` removes all user interaction code
+   * While you could use setWatch/etc manually, the benefit here is that you don't
+   * end up with multiple `setWatch` instances, and the actual input method (touch,
+   * or buttons) is implemented dependent on the watch (Bangle.js 1 or 2)
+   * **Note:** You can override this function in boot code to change the interaction
+   * mode with the watch. For instance you could make all clocks start the launcher
+   * with a swipe by using:
+   * ```
+   * (function() {
+   *   var sui = Bangle.setUI;
+   *   Bangle.setUI = function(mode, cb) {
+   *     if (mode!="clock") return sui(mode,cb);
+   *     sui(); // clear
+   *     Bangle.CLOCK=1;
+   *     Bangle.swipeHandler = Bangle.showLauncher;
+   *     Bangle.on("swipe", Bangle.swipeHandler);
+   *   };
+   * })();
+   * ```
+   * The first argument can also be an object, in which case more options can be
+   * specified:
+   * ```
+   * Bangle.setUI({
+   *   mode : "custom",
+   *   back : function() {}, // optional - add a 'back' icon in top-left widget area and call this function when it is pressed
+   *   touch : function(n,e) {}, // optional - handler for 'touch' events
+   *   swipe : function(dir) {}, // optional - handler for 'swipe' events
+   *   drag : function(e) {}, // optional - handler for 'drag' events (Bangle.js 2 only)
+   *   btn : function(n) {}, // optional - handler for 'button' events (n==1 on Bangle.js 2, n==1/2/3 depending on button for Bangle.js 1)
+   *   clock : 0 // optional - if set the behavior of 'clock' mode is added (does not override btn if defined)
+   * });
+   * ```
+   *
+   * @param {any} type - The type of UI input: 'updown', 'leftright', 'clock', 'clockupdown' or undefined to cancel. Can also be an object (see below)
+   * @param {any} callback - A function with one argument which is the direction
+   * @url http://www.espruino.com/Reference#l_Bangle_setUI
+   */
+  static setUI(type?: "updown" | "leftright" | "clock" | "clockupdown" | { mode: "custom"; back?: () => void; touch?: TouchCallback; swipe?: SwipeCallback; drag?: DragCallback; btn?: (n: number) => void, clock?: boolean }, callback?: (direction?: -1 | 1) => void): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_Bangle_setUI
+   */
+  static setUI(): void;
+
+  /**
+   * Erase all storage and reload it with the default contents.
+   * This is only available on Bangle.js 2.0. On Bangle.js 1.0 you need to use
+   * `Install Default Apps` under the `More...` tab of http://banglejs.com/apps
+   * @url http://www.espruino.com/Reference#l_Bangle_factoryReset
+   */
+  static factoryReset(): void;
+
+  /**
+   * Returns the rectangle on the screen that is currently reserved for the app.
+   * @returns {any} An object of the form `{x,y,w,h,x2,y2}`
+   * @url http://www.espruino.com/Reference#l_Bangle_appRect
+   */
+  static appRect: { x: number, y: number, w: number, h: number, x2: number, y2: number };
+
+  static CLOCK: boolean;
+  static strokes: undefined | { [key: string]: Unistroke };
+}
+
+interface DateConstructor {
+  /**
+   * Get the number of milliseconds elapsed since 1970 (or on embedded platforms,
+   * since startup)
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_now
+   */
+  now(): number;
+
+  /**
+   * Parse a date string and return milliseconds since 1970. Data can be either
+   * '2011-10-20T14:48:00', '2011-10-20' or 'Mon, 25 Dec 1995 13:30:00 +0430'
+   *
+   * @param {any} str - A String
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_parse
+   */
+  parse(str: string): number;
+
+  /**
+   * Creates a date object
+   * @constructor
+   *
+   * @param {any} args - Either nothing (current time), one numeric argument (milliseconds since 1970), a date string (see `Date.parse`), or [year, month, day, hour, minute, second, millisecond]
+   * @returns {any} A Date object
+   * @url http://www.espruino.com/Reference#l_Date_Date
+   */
+  new(): Date;
+  new(value: number | string): Date;
+  new(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
+}
+
+interface Date {
+  /**
+   * This returns the time-zone offset from UTC, in minutes.
+   * @returns {number} The difference, in minutes, between UTC and local time
+   * @url http://www.espruino.com/Reference#l_Date_getTimezoneOffset
+   */
+  getTimezoneOffset(): number;
+
+  /**
+   * This returns a boolean indicating whether daylight savings time is in effect.
+   * @returns {number} true if daylight savings time is in effect
+   * @url http://www.espruino.com/Reference#l_Date_getIsDST
+   */
+  getIsDST(): boolean
+
+  /**
+   * Return the number of milliseconds since 1970
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getTime
+   */
+  getTime(): number;
+
+  /**
+   * Return the number of milliseconds since 1970
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_valueOf
+   */
+  valueOf(): number;
+
+  /**
+   * Set the time/date of this Date class
+   *
+   * @param {number} timeValue - the number of milliseconds since 1970
+   * @returns {number} the number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setTime
+   */
+  setTime(timeValue: number): number;
+
+  /**
+   * 0..23
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getHours
+   */
+  getHours(): number;
+
+  /**
+   * 0..59
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getMinutes
+   */
+  getMinutes(): number;
+
+  /**
+   * 0..59
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getSeconds
+   */
+  getSeconds(): number;
+
+  /**
+   * 0..999
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getMilliseconds
+   */
+  getMilliseconds(): number;
+
+  /**
+   * Day of the week (0=sunday, 1=monday, etc)
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getDay
+   */
+  getDay(): number;
+
+  /**
+   * Day of the month 1..31
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getDate
+   */
+  getDate(): number;
+
+  /**
+   * Month of the year 0..11
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getMonth
+   */
+  getMonth(): number;
+
+  /**
+   * The year, eg. 2014
+   * @returns {number}
+   * @url http://www.espruino.com/Reference#l_Date_getFullYear
+   */
+  getFullYear(): number;
+
+  /**
+   * 0..23
+   *
+   * @param {number} hoursValue - number of hours, 0..23
+   * @param {any} minutesValue - number of minutes, 0..59
+   * @param {any} secondsValue - optional - number of seconds, 0..59
+   * @param {any} millisecondsValue - optional - number of milliseconds, 0..999
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setHours
+   */
+  setHours(hoursValue: number, minutesValue?: number, secondsValue?: number, millisecondsValue?: number): number;
+
+  /**
+   * 0..59
+   *
+   * @param {number} minutesValue - number of minutes, 0..59
+   * @param {any} secondsValue - optional - number of seconds, 0..59
+   * @param {any} millisecondsValue - optional - number of milliseconds, 0..999
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setMinutes
+   */
+  setMinutes(minutesValue: number, secondsValue?: number, millisecondsValue?: number): number;
+
+  /**
+   * 0..59
+   *
+   * @param {number} secondsValue - number of seconds, 0..59
+   * @param {any} millisecondsValue - optional - number of milliseconds, 0..999
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setSeconds
+   */
+  setSeconds(secondsValue: number, millisecondsValue?: number): number;
+
+  /**
+   *
+   * @param {number} millisecondsValue - number of milliseconds, 0..999
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setMilliseconds
+   */
+  setMilliseconds(millisecondsValue: number): number;
+
+  /**
+   * Day of the month 1..31
+   *
+   * @param {number} dayValue - the day of the month, between 0 and 31
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setDate
+   */
+  setDate(dayValue: number): number;
+
+  /**
+   * Month of the year 0..11
+   *
+   * @param {number} yearValue - The month, between 0 and 11
+   * @param {any} dayValue - optional - the day, between 0 and 31
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setMonth
+   */
+  setMonth(yearValue: number, dayValue?: number): number;
+
+  /**
+   *
+   * @param {number} yearValue - The full year - eg. 1989
+   * @param {any} monthValue - optional - the month, between 0 and 11
+   * @param {any} dayValue - optional - the day, between 0 and 31
+   * @returns {number} The number of milliseconds since 1970
+   * @url http://www.espruino.com/Reference#l_Date_setFullYear
+   */
+  setFullYear(yearValue: number, monthValue?: number, dayValue?: number): number;
+
+  /**
+   * Converts to a String, eg: `Fri Jun 20 2014 14:52:20 GMT+0000`
+   *  **Note:** This uses whatever timezone was set with `E.setTimeZone()` or
+   *  `E.setDST()`
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toString
+   */
+  toString(): string;
+
+  /**
+   * Converts to a String, eg: `Fri, 20 Jun 2014 14:52:20 GMT`
+   *  **Note:** This always assumes a timezone of GMT
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toUTCString
+   */
+  toUTCString(): string;
+
+  /**
+   * Converts to a ISO 8601 String, eg: `2014-06-20T14:52:20.123Z`
+   *  **Note:** This always assumes a timezone of GMT
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toISOString
+   */
+  toISOString(): string;
+
+  /**
+   * Calls `Date.toISOString` to output this date to JSON
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toJSON
+   */
+  toJSON(): string;
+
+  /**
+   * Converts to a ISO 8601 String (with timezone information), eg:
+   * `2014-06-20T14:52:20.123-0500`
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Date_toLocalISOString
+   */
+  toLocalISOString(): string;
+}
+
+/**
+ * The built-in class for handling Dates.
+ * **Note:** By default the time zone is GMT+0, however you can change the timezone
+ * using the `E.setTimeZone(...)` function.
+ * For example `E.setTimeZone(1)` will be GMT+0100
+ * *However* if you have daylight savings time set with `E.setDST(...)` then the
+ * timezone set by `E.setTimeZone(...)` will be _ignored_.
+ * @url http://www.espruino.com/Reference#Date
+ */
+declare const Date: DateConstructor
+
+/**
+ * This class provides a software-defined OneWire master. It is designed to be
+ * similar to Arduino's OneWire library.
+ * @url http://www.espruino.com/Reference#OneWire
+ */
+declare class OneWire {
+  /**
+   * Create a software OneWire implementation on the given pin
+   * @constructor
+   *
+   * @param {Pin} pin - The pin to implement OneWire on
+   * @returns {any} A OneWire object
+   * @url http://www.espruino.com/Reference#l_OneWire_OneWire
+   */
+  static new(pin: Pin): any;
+
+  /**
+   * Perform a reset cycle
+   * @returns {boolean} True is a device was present (it held the bus low)
+   * @url http://www.espruino.com/Reference#l_OneWire_reset
+   */
+  reset(): boolean;
+
+  /**
+   * Select a ROM - always performs a reset first
+   *
+   * @param {any} rom - The device to select (get this using `OneWire.search()`)
+   * @url http://www.espruino.com/Reference#l_OneWire_select
+   */
+  select(rom: any): void;
+
+  /**
+   * Skip a ROM
+   * @url http://www.espruino.com/Reference#l_OneWire_skip
+   */
+  skip(): void;
+
+  /**
+   * Write one or more bytes
+   *
+   * @param {any} data - A byte (or array of bytes) to write
+   * @param {boolean} power - Whether to leave power on after write (default is false)
+   * @url http://www.espruino.com/Reference#l_OneWire_write
+   */
+  write(data: any, power: boolean): void;
+
+  /**
+   * Read a byte
+   *
+   * @param {any} count - (optional) The amount of bytes to read
+   * @returns {any} The byte that was read, or a Uint8Array if count was specified and >=0
+   * @url http://www.espruino.com/Reference#l_OneWire_read
+   */
+  read(count: any): any;
+
+  /**
+   * Search for devices
+   *
+   * @param {number} command - (Optional) command byte. If not specified (or zero), this defaults to 0xF0. This can could be set to 0xEC to perform a DS18B20 'Alarm Search Command'
+   * @returns {any} An array of devices that were found
+   * @url http://www.espruino.com/Reference#l_OneWire_search
+   */
+  search(command: number): any;
+}
+
+interface NumberConstructor {
+  /**
+   * @returns {number} Not a  Number
+   * @url http://www.espruino.com/Reference#l_Number_NaN
+   */
+  NaN: number;
+
+  /**
+   * @returns {number} Maximum representable value
+   * @url http://www.espruino.com/Reference#l_Number_MAX_VALUE
+   */
+  MAX_VALUE: number;
+
+  /**
+   * @returns {number} Smallest representable value
+   * @url http://www.espruino.com/Reference#l_Number_MIN_VALUE
+   */
+  MIN_VALUE: number;
+
+  /**
+   * @returns {number} Negative Infinity (-1/0)
+   * @url http://www.espruino.com/Reference#l_Number_NEGATIVE_INFINITY
+   */
+  NEGATIVE_INFINITY: number;
+
+  /**
+   * @returns {number} Positive Infinity (1/0)
+   * @url http://www.espruino.com/Reference#l_Number_POSITIVE_INFINITY
+   */
+  POSITIVE_INFINITY: number;
+
+  /**
+   * Creates a number
+   * @constructor
+   *
+   * @param {any} value - A single value to be converted to a number
+   * @returns {any} A Number object
+   * @url http://www.espruino.com/Reference#l_Number_Number
+   */
+  new(...value: any[]): any;
+}
+
+interface Number {
+  /**
+   * Format the number as a fixed point number
+   *
+   * @param {number} decimalPlaces - A number between 0 and 20 specifying the number of decimal digits after the decimal point
+   * @returns {any} A string
+   * @url http://www.espruino.com/Reference#l_Number_toFixed
+   */
+  toFixed(decimalPlaces: number): any;
+}
+
+/**
+ * This is the built-in JavaScript class for numbers.
+ * @url http://www.espruino.com/Reference#Number
+ */
+declare const Number: NumberConstructor
+
+interface ArrayBufferConstructor {
+  /**
+   * Create an Array Buffer object
+   * @constructor
+   *
+   * @param {number} byteLength - The length in Bytes
+   * @returns {any} An ArrayBuffer object
+   * @url http://www.espruino.com/Reference#l_ArrayBuffer_ArrayBuffer
+   */
+  new(byteLength: number): ArrayBuffer;
+}
+
+interface ArrayBuffer {
+  /**
+   * The length, in bytes, of the `ArrayBuffer`
+   * @returns {number} The Length in bytes
+   * @url http://www.espruino.com/Reference#l_ArrayBuffer_byteLength
+   */
+  byteLength: number;
+}
+
+/**
+ * This is the built-in JavaScript class for array buffers.
+ * If you want to access arrays of differing types of data you may also find
+ * `DataView` useful.
+ * @url http://www.espruino.com/Reference#ArrayBuffer
+ */
+declare const ArrayBuffer: ArrayBufferConstructor
+
+/**
+ * This is the built-in JavaScript class that is the prototype for:
+ * * [Uint8Array](/Reference#Uint8Array)
+ * * [UintClamped8Array](/Reference#UintClamped8Array)
+ * * [Int8Array](/Reference#Int8Array)
+ * * [Uint16Array](/Reference#Uint16Array)
+ * * [Int16Array](/Reference#Int16Array)
+ * * [Uint24Array](/Reference#Uint24Array) (Espruino-specific - not standard JS)
+ * * [Uint32Array](/Reference#Uint32Array)
+ * * [Int32Array](/Reference#Int32Array)
+ * * [Float32Array](/Reference#Float32Array)
+ * * [Float64Array](/Reference#Float64Array)
+ * If you want to access arrays of differing types of data you may also find
+ * `DataView` useful.
+ * @url http://www.espruino.com/Reference#ArrayBufferView
+ */
+declare class ArrayBufferView<T = ArrayBuffer> {
+
+
+  /**
+   * The buffer this view references
+   * @returns {any} An ArrayBuffer object
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_buffer
+   */
+  readonly buffer: T;
+
+  /**
+   * The length, in bytes, of the `ArrayBufferView`
+   * @returns {number} The Length
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_byteLength
+   */
+  readonly byteLength: number;
+
+  /**
+   * The offset, in bytes, to the first byte of the view within the backing
+   * `ArrayBuffer`
+   * @returns {number} The byte Offset
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_byteOffset
+   */
+  readonly byteOffset: number;
+
+  /**
+   * Copy the contents of `array` into this one, mapping `this[x+offset]=array[x];`
+   *
+   * @param {any} arr - Floating point index to access
+   * @param {number} offset - The offset in this array at which to write the values (optional)
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_set
+   */
+  set(arr: ArrayLike<number>, offset: number): void
+
+  /**
+   * Return an array which is made from the following: ```A.map(function) =
+   * [function(A[0]), function(A[1]), ...]```
+   *  **Note:** This returns an `ArrayBuffer` of the same type it was called on. To
+   *  get an `Array`, use `Array.map`, e.g. `[].map.call(myArray, x=>x+1)`
+   *
+   * @param {any} function - Function used to map one item to another
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} An array containing the results
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_map
+   */
+  map(callbackfn: (value: number, index: number, array: T) => number, thisArg?: any): T;
+
+  /**
+   * Returns a smaller part of this array which references the same data (it doesn't
+   * copy it).
+   *
+   * @param {number} begin - Element to begin at, inclusive. If negative, this is from the end of the array. The entire array is included if this isn't specified
+   * @param {any} end - Element to end at, exclusive. If negative, it is relative to the end of the array. If not specified the whole array is included
+   * @returns {any} An `ArrayBufferView` of the same type as this one, referencing the same data
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_subarray
+   */
+  subarray(begin?: number, end?: number): T;
+
+  /**
+   * Return the index of the value in the array, or `-1`
+   *
+   * @param {any} value - The value to check for
+   * @param {number} startIndex - (optional) the index to search from, or 0 if not specified
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_indexOf
+   */
+  indexOf(value: number, startIndex?: number): number;
+
+  /**
+   * Return `true` if the array includes the value, `false` otherwise
+   *
+   * @param {any} value - The value to check for
+   * @param {number} startIndex - (optional) the index to search from, or 0 if not specified
+   * @returns {boolean} `true` if the array includes the value, `false` otherwise
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_includes
+   */
+  includes(value: number, startIndex?: number): boolean;
+
+  /**
+   * Join all elements of this array together into one string, using 'separator'
+   * between them. e.g. ```[1,2,3].join(' ')=='1 2 3'```
+   *
+   * @param {any} separator - The separator
+   * @returns {any} A String representing the Joined array
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_join
+   */
+  join(separator?: string): string;
+
+  /**
+   * Do an in-place quicksort of the array
+   *
+   * @param {any} var - A function to use to compare array elements (or undefined)
+   * @returns {any} This array object
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_sort
+   */
+  sort(compareFn?: (a: number, b: number) => number): this;
+
+  /**
+   * Executes a provided function once per array element.
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_forEach
+   */
+  forEach(callbackfn: (value: number, index: number, array: T) => void, thisArg?: any): void;
+
+  /**
+   * Execute `previousValue=initialValue` and then `previousValue =
+   * callback(previousValue, currentValue, index, array)` for each element in the
+   * array, and finally return previousValue.
+   *
+   * @param {any} callback - Function used to reduce the array
+   * @param {any} initialValue - if specified, the initial value to pass to the function
+   * @returns {any} The value returned by the last function called
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_reduce
+   */
+  reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: T) => number, initialValue?: number): number;
+
+  /**
+   * Fill this array with the given value, for every index `>= start` and `< end`
+   *
+   * @param {any} value - The value to fill the array with
+   * @param {number} start - Optional. The index to start from (or 0). If start is negative, it is treated as length+start where length is the length of the array
+   * @param {any} end - Optional. The index to end at (or the array length). If end is negative, it is treated as length+end.
+   * @returns {any} This array
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_fill
+   */
+  fill(value: number, start?: number, end?: number): T;
+
+  /**
+   * Return an array which contains only those elements for which the callback
+   * function returns 'true'
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} An array containing the results
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_filter
+   */
+  filter(predicate: (value: number, index: number, array: T) => any, thisArg?: any): T;
+
+  /**
+   * Return the array element where `function` returns `true`, or `undefined` if it
+   * doesn't returns `true` for any element.
+   *
+   * @param {any} function - Function to be executed
+   * @returns {any} The array element where `function` returns `true`, or `undefined`
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_find
+   */
+  find(predicate: (value: number, index: number, obj: T) => boolean, thisArg?: any): number | undefined;
+
+  /**
+   * Return the array element's index where `function` returns `true`, or `-1` if it
+   * doesn't returns `true` for any element.
+   *
+   * @param {any} function - Function to be executed
+   * @returns {any} The array element's index where `function` returns `true`, or `-1`
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_findIndex
+   */
+  findIndex(predicate: (value: number, index: number, obj: T) => boolean, thisArg?: any): number;
+
+  /**
+   * Reverse the contents of this `ArrayBufferView` in-place
+   * @returns {any} This array
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_reverse
+   */
+  reverse(): T
+
+  /**
+   * Return a copy of a portion of this array (in a new array).
+   *  **Note:** This currently returns a normal `Array`, not an `ArrayBuffer`
+   *
+   * @param {number} start - Start index
+   * @param {any} end - End index (optional)
+   * @returns {any} A new array
+   * @url http://www.espruino.com/Reference#l_ArrayBufferView_slice
+   */
+  slice(start?: number, end?: number): number[];
+
+  [index: number]: number
+}
+
+interface Uint8ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Uint8Array_Uint8Array
+   */
+  new(length: number): Uint8Array;
+  new(array: ArrayLike<number>): Uint8Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
+}
+
+type Uint8Array = ArrayBufferView<Uint8Array>;
+
+declare const Uint8Array: Uint8ArrayConstructor
+
+interface Uint8ClampedArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * Clamped arrays clamp their values to the allowed range, rather than 'wrapping'.
+   * e.g. after `a[0]=12345;`, `a[0]==255`.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Uint8ClampedArray_Uint8ClampedArray
+   */
+  new(length: number): Uint8ClampedArray;
+  new(array: ArrayLike<number>): Uint8ClampedArray;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
+}
+
+type Uint8ClampedArray = ArrayBufferView<Uint8ClampedArray>;
+
+declare const Uint8ClampedArray: Uint8ClampedArrayConstructor
+
+interface Int8ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Int8Array_Int8Array
+   */
+  new(length: number): Int8Array;
+  new(array: ArrayLike<number>): Int8Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
+}
+
+type Int8Array = ArrayBufferView<Int8Array>;
+
+declare const Int8Array: Int8ArrayConstructor
+
+interface Uint16ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Uint16Array_Uint16Array
+   */
+  new(length: number): Uint16Array;
+  new(array: ArrayLike<number>): Uint16Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
+}
+
+type Uint16Array = ArrayBufferView<Uint16Array>;
+
+declare const Uint16Array: Uint16ArrayConstructor
+
+interface Int16ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Int16Array_Int16Array
+   */
+  new(length: number): Int16Array;
+  new(array: ArrayLike<number>): Int16Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
+}
+
+type Int16Array = ArrayBufferView<Int16Array>;
+
+declare const Int16Array: Int16ArrayConstructor
+
+/**
+ * This is the built-in JavaScript class for a typed array of 24 bit unsigned
+ * integers.
+ * Instantiate this in order to efficiently store arrays of data (Espruino's normal
+ * arrays store data in a map, which is inefficient for non-sparse arrays).
+ * Arrays of this type include all the methods from
+ * [ArrayBufferView](/Reference#ArrayBufferView)
+ * @url http://www.espruino.com/Reference#Uint24Array
+ */
+declare class Uint24Array {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Uint24Array_Uint24Array
+   */
+  static new(length: number): Uint24Array;
+  static new(array: ArrayLike<number>): Uint24Array;
+  static new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint24Array;
+
+
+}
+
+interface Uint32ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Uint32Array_Uint32Array
+   */
+  new(length: number): Uint32Array;
+  new(array: ArrayLike<number>): Uint32Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
+}
+
+type Uint32Array = ArrayBufferView<Uint32Array>;
+
+declare const Uint32Array: Uint32ArrayConstructor
+
+interface Int32ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Int32Array_Int32Array
+   */
+  new(length: number): Int32Array;
+  new(array: ArrayLike<number>): Int32Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
+}
+
+type Int32Array = ArrayBufferView<Int32Array>;
+
+declare const Int32Array: Int32ArrayConstructor
+
+interface Float32ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Float32Array_Float32Array
+   */
+  new(length: number): Float32Array;
+  new(array: ArrayLike<number>): Float32Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
+}
+
+type Float32Array = ArrayBufferView<Float32Array>;
+
+declare const Float32Array: Float32ArrayConstructor
+
+interface Float64ArrayConstructor {
+  /**
+   * Create a typed array based on the given input. Either an existing Array Buffer,
+   * an Integer as a Length, or a simple array. If an `ArrayBufferView` (e.g.
+   * `Uint8Array` rather than `ArrayBuffer`) is given, it will be completely copied
+   * rather than referenced.
+   * @constructor
+   *
+   * @param {any} arr - The array or typed array to base this off, or an integer which is the array length
+   * @param {number} byteOffset - The byte offset in the ArrayBuffer  (ONLY IF the first argument was an ArrayBuffer)
+   * @param {number} length - The length (ONLY IF the first argument was an ArrayBuffer)
+   * @returns {any} A typed array
+   * @url http://www.espruino.com/Reference#l_Float64Array_Float64Array
+   */
+  new(length: number): Float64Array;
+  new(array: ArrayLike<number>): Float64Array;
+  new(buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
+}
+
+type Float64Array = ArrayBufferView<Float64Array>;
+
+declare const Float64Array: Float64ArrayConstructor
+
+interface PromiseConstructor {
+  /**
+   * Return a new promise that is resolved when all promises in the supplied array
+   * are resolved.
+   *
+   * @param {any} promises - An array of promises
+   * @returns {any} A new Promise
+   * @url http://www.espruino.com/Reference#l_Promise_all
+   */
+  all(promises: Promise<any>[]): Promise<void>;
+
+  /**
+   * Return a new promise that is already resolved (at idle it'll call `.then`)
+   *
+   * @param {any} promises - Data to pass to the `.then` handler
+   * @returns {any} A new Promise
+   * @url http://www.espruino.com/Reference#l_Promise_resolve
+   */
+  resolve<T extends any>(promises: T): Promise<T>;
+
+  /**
+   * Return a new promise that is already rejected (at idle it'll call `.catch`)
+   *
+   * @param {any} promises - Data to pass to the `.catch` handler
+   * @returns {any} A new Promise
+   * @url http://www.espruino.com/Reference#l_Promise_reject
+   */
+  reject(promises: any): any;
+
+  /**
+   * Create a new Promise. The executor function is executed immediately (before the
+   * constructor even returns) and
+   * @constructor
+   *
+   * @param {any} executor - A function of the form `function (resolve, reject)`
+   * @returns {any} A Promise
+   * @url http://www.espruino.com/Reference#l_Promise_Promise
+   */
+  new<T>(executor: (resolve: (value: T) => void, reject: (reason?: any) => void) => void): Promise<T>;
+}
+
+interface Promise<T> {
+  /**
+   *
+   * @param {any} onFulfilled - A callback that is called when this promise is resolved
+   * @param {any} [onRejected] - [optional] A callback that is called when this promise is rejected (or nothing)
+   * @returns {any} The original Promise
+   * @url http://www.espruino.com/Reference#l_Promise_then
+   */
+  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | Promise<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | Promise<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
+
+  /**
+   *
+   * @param {any} onRejected - A callback that is called when this promise is rejected
+   * @returns {any} The original Promise
+   * @url http://www.espruino.com/Reference#l_Promise_catch
+   */
+  catch(onRejected: any): any;
+}
+
+/**
+ * This is the built-in class for ES6 Promises
+ * @url http://www.espruino.com/Reference#Promise
+ */
+declare const Promise: PromiseConstructor
+
+/**
+ * This class allows use of the built-in SPI ports. Currently it is SPI master
+ * only.
+ * @url http://www.espruino.com/Reference#SPI
+ */
+declare class SPI {
+  /**
+   * Try and find an SPI hardware device that will work on this pin (eg. `SPI1`)
+   * May return undefined if no device can be found.
+   *
+   * @param {Pin} pin - A pin to search with
+   * @returns {any} An object of type `SPI`, or `undefined` if one couldn't be found.
+   * @url http://www.espruino.com/Reference#l_SPI_find
+   */
+  static find(pin: Pin): any;
+
+  /**
+   * Create a software SPI port. This has limited functionality (no baud rate), but
+   * it can work on any pins.
+   * Use `SPI.setup` to configure this port.
+   * @constructor
+   * @returns {any} A SPI object
+   * @url http://www.espruino.com/Reference#l_SPI_SPI
+   */
+  static new(): any;
+
+  /**
+   * Set up this SPI port as an SPI Master.
+   * Options can contain the following (defaults are shown where relevant):
+   * ```
+   * {
+   *   sck:pin,
+   *   miso:pin,
+   *   mosi:pin,
+   *   baud:integer=100000, // ignored on software SPI
+   *   mode:integer=0, // between 0 and 3
+   *   order:string='msb' // can be 'msb' or 'lsb'
+   *   bits:8 // only available for software SPI
+   * }
+   * ```
+   * If `sck`,`miso` and `mosi` are left out, they will automatically be chosen.
+   * However if one or more is specified then the unspecified pins will not be set
+   * up.
+   * You can find out which pins to use by looking at [your board's reference
+   * page](#boards) and searching for pins with the `SPI` marker. Some boards such as
+   * those based on `nRF52` chips can have SPI on any pins, so don't have specific
+   * markings.
+   * The SPI `mode` is between 0 and 3 - see
+   * http://en.wikipedia.org/wiki/Serial_Peripheral_Interface_Bus#Clock_polarity_and_phase
+   * On STM32F1-based parts, you cannot mix AF and non-AF pins (SPI pins are usually
+   * grouped on the chip - and you can't mix pins from two groups). Espruino will not
+   * warn you about this.
+   *
+   * @param {any} options - An Object containing extra information on initialising the SPI port
+   * @url http://www.espruino.com/Reference#l_SPI_setup
+   */
+  setup(options: any): void;
+
+  /**
+   * Send data down SPI, and return the result. Sending an integer will return an
+   * integer, a String will return a String, and anything else will return a
+   * Uint8Array.
+   * Sending multiple bytes in one call to send is preferable as they can then be
+   * transmitted end to end. Using multiple calls to send() will result in
+   * significantly slower transmission speeds.
+   * For maximum speeds, please pass either Strings or Typed Arrays as arguments.
+   * Note that you can even pass arrays of arrays, like `[1,[2,3,4],5]`
+   *
+   * @param {any} data - The data to send - either an Integer, Array, String, or Object of the form `{data: ..., count:#}`
+   * @param {Pin} nss_pin - An nSS pin - this will be lowered before SPI output and raised afterwards (optional). There will be a small delay between when this is lowered and when sending starts, and also between sending finishing and it being raised.
+   * @returns {any} The data that was returned
+   * @url http://www.espruino.com/Reference#l_SPI_send
+   */
+  send(data: any, nss_pin: Pin): any;
+
+  /**
+   * Write a character or array of characters to SPI - without reading the result
+   * back.
+   * For maximum speeds, please pass either Strings or Typed Arrays as arguments.
+   *
+   * @param {any} data
+   * One or more items to write. May be ints, strings, arrays, or special objects (see `E.toUint8Array` for more info).
+   * If the last argument is a pin, it is taken to be the NSS pin
+   * @url http://www.espruino.com/Reference#l_SPI_write
+   */
+  write(...data: any[]): void;
+
+  /**
+   * Send data down SPI, using 4 bits for each 'real' bit (MSB first). This can be
+   * useful for faking one-wire style protocols
+   * Sending multiple bytes in one call to send is preferable as they can then be
+   * transmitted end to end. Using multiple calls to send() will result in
+   * significantly slower transmission speeds.
+   *
+   * @param {any} data - The data to send - either an integer, array, or string
+   * @param {number} bit0 - The 4 bits to send for a 0 (MSB first)
+   * @param {number} bit1 - The 4 bits to send for a 1 (MSB first)
+   * @param {Pin} nss_pin - An nSS pin - this will be lowered before SPI output and raised afterwards (optional). There will be a small delay between when this is lowered and when sending starts, and also between sending finishing and it being raised.
+   * @url http://www.espruino.com/Reference#l_SPI_send4bit
+   */
+  send4bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+
+  /**
+   * Send data down SPI, using 8 bits for each 'real' bit (MSB first). This can be
+   * useful for faking one-wire style protocols
+   * Sending multiple bytes in one call to send is preferable as they can then be
+   * transmitted end to end. Using multiple calls to send() will result in
+   * significantly slower transmission speeds.
+   *
+   * @param {any} data - The data to send - either an integer, array, or string
+   * @param {number} bit0 - The 8 bits to send for a 0 (MSB first)
+   * @param {number} bit1 - The 8 bits to send for a 1 (MSB first)
+   * @param {Pin} nss_pin - An nSS pin - this will be lowered before SPI output and raised afterwards (optional). There will be a small delay between when this is lowered and when sending starts, and also between sending finishing and it being raised
+   * @url http://www.espruino.com/Reference#l_SPI_send8bit
+   */
+  send8bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+}
+
+/**
+ * This class allows use of the built-in I2C ports. Currently it allows I2C Master
+ * mode only.
+ * All addresses are in 7 bit format. If you have an 8 bit address then you need to
+ * shift it one bit to the right.
+ * @url http://www.espruino.com/Reference#I2C
+ */
+declare class I2C {
+  /**
+   * Try and find an I2C hardware device that will work on this pin (eg. `I2C1`)
+   * May return undefined if no device can be found.
+   *
+   * @param {Pin} pin - A pin to search with
+   * @returns {any} An object of type `I2C`, or `undefined` if one couldn't be found.
+   * @url http://www.espruino.com/Reference#l_I2C_find
+   */
+  static find(pin: Pin): any;
+
+  /**
+   * Create a software I2C port. This has limited functionality (no baud rate), but
+   * it can work on any pins.
+   * Use `I2C.setup` to configure this port.
+   * @constructor
+   * @returns {any} An I2C object
+   * @url http://www.espruino.com/Reference#l_I2C_I2C
+   */
+  static new(): any;
+
+  /**
+   * Set up this I2C port
+   * If not specified in options, the default pins are used (usually the lowest
+   * numbered pins on the lowest port that supports this peripheral)
+   *
+   * @param {any} options
+   * An optional structure containing extra information on initialising the I2C port
+   * ```{scl:pin, sda:pin, bitrate:100000}```
+   * You can find out which pins to use by looking at [your board's reference page](#boards) and searching for pins with the `I2C` marker. Note that 400kHz is the maximum bitrate for most parts.
+   * @url http://www.espruino.com/Reference#l_I2C_setup
+   */
+  setup(options: any): void;
+
+  /**
+   * Transmit to the slave device with the given address. This is like Arduino's
+   * beginTransmission, write, and endTransmission rolled up into one.
+   *
+   * @param {any} address - The 7 bit address of the device to transmit to, or an object of the form `{address:12, stop:false}` to send this data without a STOP signal.
+   * @param {any} data - One or more items to write. May be ints, strings, arrays, or special objects (see `E.toUint8Array` for more info).
+   * @url http://www.espruino.com/Reference#l_I2C_writeTo
+   */
+  writeTo(address: any, ...data: any[]): void;
+
+  /**
+   * Request bytes from the given slave device, and return them as a Uint8Array
+   * (packed array of bytes). This is like using Arduino Wire's requestFrom,
+   * available and read functions. Sends a STOP
+   *
+   * @param {any} address - The 7 bit address of the device to request bytes from, or an object of the form `{address:12, stop:false}` to send this data without a STOP signal.
+   * @param {number} quantity - The number of bytes to request
+   * @returns {any} The data that was returned - as a Uint8Array
+   * @url http://www.espruino.com/Reference#l_I2C_readFrom
+   */
+  readFrom(address: any, quantity: number): Uint8Array;
+}
+
+/**
+ * This class handles waveforms. In Espruino, a Waveform is a set of data that you
+ * want to input or output.
+ * @url http://www.espruino.com/Reference#Waveform
+ */
+declare class Waveform {
+  /**
+   * Create a waveform class. This allows high speed input and output of waveforms.
+   * It has an internal variable called `buffer` (as well as `buffer2` when
+   * double-buffered - see `options` below) which contains the data to input/output.
+   * When double-buffered, a 'buffer' event will be emitted each time a buffer is
+   * finished with (the argument is that buffer). When the recording stops, a
+   * 'finish' event will be emitted (with the first argument as the buffer).
+   * @constructor
+   *
+   * @param {number} samples - The number of samples
+   * @param {any} options - Optional options struct `{doubleBuffer:bool, bits : 8/16}` where: `doubleBuffer` is whether to allocate two buffers or not (default false), and bits is the amount of bits to use (default 8).
+   * @returns {any} An Waveform object
+   * @url http://www.espruino.com/Reference#l_Waveform_Waveform
+   */
+  static new(samples: number, options: any): any;
+
+  /**
+   * Will start outputting the waveform on the given pin - the pin must have
+   * previously been initialised with analogWrite. If not repeating, it'll emit a
+   * `finish` event when it is done.
+   *
+   * @param {Pin} output - The pin to output on
+   * @param {number} freq - The frequency to output each sample at
+   * @param {any} options - Optional options struct `{time:float,repeat:bool}` where: `time` is the that the waveform with start output at, e.g. `getTime()+1` (otherwise it is immediate), `repeat` is a boolean specifying whether to repeat the give sample
+   * @url http://www.espruino.com/Reference#l_Waveform_startOutput
+   */
+  startOutput(output: Pin, freq: number, options: any): void;
+
+  /**
+   * Will start inputting the waveform on the given pin that supports analog. If not
+   * repeating, it'll emit a `finish` event when it is done.
+   *
+   * @param {Pin} output - The pin to output on
+   * @param {number} freq - The frequency to output each sample at
+   * @param {any} options - Optional options struct `{time:float,repeat:bool}` where: `time` is the that the waveform with start output at, e.g. `getTime()+1` (otherwise it is immediate), `repeat` is a boolean specifying whether to repeat the give sample
+   * @url http://www.espruino.com/Reference#l_Waveform_startInput
+   */
+  startInput(output: Pin, freq: number, options: any): void;
+
+  /**
+   * Stop a waveform that is currently outputting
+   * @url http://www.espruino.com/Reference#l_Waveform_stop
+   */
+  stop(): void;
+}
+
+/**
+ * This is the built-in class for Pins, such as D0,D1,LED1, or BTN
+ * You can call the methods on Pin, or you can use Wiring-style functions such as
+ * digitalWrite
+ * @url http://www.espruino.com/Reference#Pin
+ */
+declare class Pin {
+  /**
+   * Creates a pin from the given argument (or returns undefined if no argument)
+   * @constructor
+   *
+   * @param {any} value - A value to be converted to a pin. Can be a number, pin, or String.
+   * @returns {any} A Pin object
+   * @url http://www.espruino.com/Reference#l_Pin_Pin
+   */
+  static new(value: any): any;
+
+  /**
+   * Returns the input state of the pin as a boolean.
+   *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+   *  reset the pin's state to `"input"`
+   * @returns {boolean} Whether pin is a logical 1 or 0
+   * @url http://www.espruino.com/Reference#l_Pin_read
+   */
+  read(): boolean;
+
+  /**
+   * Sets the output state of the pin to a 1
+   *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+   *  reset the pin's state to `"output"`
+   * @url http://www.espruino.com/Reference#l_Pin_set
+   */
+  set(): void;
+
+  /**
+   * Sets the output state of the pin to a 0
+   *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+   *  reset the pin's state to `"output"`
+   * @url http://www.espruino.com/Reference#l_Pin_reset
+   */
+  reset(): void;
+
+  /**
+   * Sets the output state of the pin to the parameter given
+   *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+   *  reset the pin's state to `"output"`
+   *
+   * @param {boolean} value - Whether to set output high (true/1) or low (false/0)
+   * @url http://www.espruino.com/Reference#l_Pin_write
+   */
+  write(value: boolean): void;
+
+  /**
+   * Sets the output state of the pin to the parameter given at the specified time.
+   *  **Note:** this **doesn't** change the mode of the pin to an output. To do that,
+   *  you need to use `pin.write(0)` or `pinMode(pin, 'output')` first.
+   *
+   * @param {boolean} value - Whether to set output high (true/1) or low (false/0)
+   * @param {number} time - Time at which to write
+   * @url http://www.espruino.com/Reference#l_Pin_writeAtTime
+   */
+  writeAtTime(value: boolean, time: number): void;
+
+  /**
+   * Return the current mode of the given pin. See `pinMode` for more information.
+   * @returns {any} The pin mode, as a string
+   * @url http://www.espruino.com/Reference#l_Pin_getMode
+   */
+  getMode(): any;
+
+  /**
+   * Set the mode of the given pin. See [`pinMode`](#l__global_pinMode) for more
+   * information on pin modes.
+   *
+   * @param {any} mode - The mode - a string that is either 'analog', 'input', 'input_pullup', 'input_pulldown', 'output', 'opendrain', 'af_output' or 'af_opendrain'. Do not include this argument if you want to revert to automatic pin mode setting.
+   * @url http://www.espruino.com/Reference#l_Pin_mode
+   */
+  mode(mode: any): void;
+
+  /**
+   * Toggles the state of the pin from off to on, or from on to off.
+   * **Note:** This method doesn't currently work on the ESP8266 port of Espruino.
+   * **Note:** if you didn't call `pinMode` beforehand then this function will also
+   * reset the pin's state to `"output"`
+   * @returns {boolean} True if the pin is high after calling the function
+   * @url http://www.espruino.com/Reference#l_Pin_toggle
+   */
+  toggle(): boolean;
+
+  /**
+   * Get information about this pin and its capabilities. Of the form:
+   * ```
+   * {
+   *   "port"      : "A", // the Pin's port on the chip
+   *   "num"       : 12, // the Pin's number
+   *   "in_addr"   : 0x..., // (if available) the address of the pin's input address in bit-banded memory (can be used with peek)
+   *   "out_addr"  : 0x..., // (if available) the address of the pin's output address in bit-banded memory (can be used with poke)
+   *   "analog"    : { ADCs : [1], channel : 12 }, // If analog input is available
+   *   "functions" : {
+   *     "TIM1":{type:"CH1, af:0},
+   *     "I2C3":{type:"SCL", af:1}
+   *   }
+   * }
+   * ```
+   * Will return undefined if pin is not valid.
+   * @returns {any} An object containing information about this pins
+   * @url http://www.espruino.com/Reference#l_Pin_getInfo
+   */
+  getInfo(): any;
+}
+
+interface DataViewConstructor {
+  /**
+   * Create a `DataView` object that can be used to access the data in an
+   * `ArrayBuffer`.
+   * ```
+   * var b = new ArrayBuffer(8)
+   * var v = new DataView(b)
+   * v.setUint16(0,"0x1234")
+   * v.setUint8(3,"0x56")
+   * console.log("0x"+v.getUint32(0).toString(16))
+   * // prints 0x12340056
+   * ```
+   * @constructor
+   *
+   * @param {any} buffer - The `ArrayBuffer` to base this on
+   * @param {number} byteOffset - (optional) The offset of this view in bytes
+   * @param {number} byteLength - (optional) The length in bytes
+   * @returns {any} A `DataView` object
+   * @url http://www.espruino.com/Reference#l_DataView_DataView
+   */
+  new(buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
+}
+
+interface DataView {
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getFloat32
+   */
+  getFloat32(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getFloat64
+   */
+  getFloat64(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getInt8
+   */
+  getInt8(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getInt16
+   */
+  getInt16(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getInt32
+   */
+  getInt32(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getUint8
+   */
+  getUint8(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getUint16
+   */
+  getUint16(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_DataView_getUint32
+   */
+  getUint32(byteOffset: number, littleEndian?: boolean): number;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setFloat32
+   */
+  setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setFloat64
+   */
+  setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setInt8
+   */
+  setInt8(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setInt16
+   */
+  setInt16(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setInt32
+   */
+  setInt32(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setUint8
+   */
+  setUint8(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setUint16
+   */
+  setUint16(byteOffset: number, value: number, littleEndian?: boolean): void;
+
+  /**
+   *
+   * @param {number} byteOffset - The offset in bytes to read from
+   * @param {any} value - The value to write
+   * @param {boolean} littleEndian - (optional) Whether to read in little endian - if false or undefined data is read as big endian
+   * @url http://www.espruino.com/Reference#l_DataView_setUint32
+   */
+  setUint32(byteOffset: number, value: number, littleEndian?: boolean): void;
+}
+
+/**
+ * This class helps
+ * @url http://www.espruino.com/Reference#DataView
+ */
+declare const DataView: DataViewConstructor
+
+/**
+ * This class allows use of the built-in USARTs
+ * Methods may be called on the `USB`, `Serial1`, `Serial2`, `Serial3`, `Serial4`,
+ * `Serial5` and `Serial6` objects. While different processors provide different
+ * numbers of USARTs, on official Espruino boards you can always rely on at least
+ * `Serial1` being available
+ * @url http://www.espruino.com/Reference#Serial
+ */
+declare class Serial {
+  /**
+   * The `data` event is called when data is received. If a handler is defined with
+   * `X.on('data', function(data) { ... })` then it will be called, otherwise data
+   * will be stored in an internal buffer, where it can be retrieved with `X.read()`
+   * @param {string} event - The event to listen to.
+   * @param {(data: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `data` A string containing one or more characters of received data
+   * @url http://www.espruino.com/Reference#l_Serial_data
+   */
+  static on(event: "data", callback: (data: any) => void): void;
+
+  /**
+   * The `framing` event is called when there was activity on the input to the UART
+   * but the `STOP` bit wasn't in the correct place. This is either because there was
+   * noise on the line, or the line has been pulled to 0 for a long period of time.
+   * To enable this, you must initialise Serial with `SerialX.setup(..., { ...,
+   * errors:true });`
+   * **Note:** Even though there was an error, the byte will still be received and
+   * passed to the `data` handler.
+   * **Note:** This only works on STM32 and NRF52 based devices (eg. all official
+   * Espruino boards)
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Serial_framing
+   */
+  static on(event: "framing", callback: () => void): void;
+
+  /**
+   * The `parity` event is called when the UART was configured with a parity bit, and
+   * this doesn't match the bits that have actually been received.
+   * To enable this, you must initialise Serial with `SerialX.setup(..., { ...,
+   * errors:true });`
+   * **Note:** Even though there was an error, the byte will still be received and
+   * passed to the `data` handler.
+   * **Note:** This only works on STM32 and NRF52 based devices (eg. all official
+   * Espruino boards)
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_Serial_parity
+   */
+  static on(event: "parity", callback: () => void): void;
+
+  /**
+   * Try and find a USART (Serial) hardware device that will work on this pin (eg.
+   * `Serial1`)
+   * May return undefined if no device can be found.
+   *
+   * @param {Pin} pin - A pin to search with
+   * @returns {any} An object of type `Serial`, or `undefined` if one couldn't be found.
+   * @url http://www.espruino.com/Reference#l_Serial_find
+   */
+  static find(pin: Pin): any;
+
+  /**
+   * Create a software Serial port. This has limited functionality (only low baud
+   * rates), but it can work on any pins.
+   * Use `Serial.setup` to configure this port.
+   * @constructor
+   * @returns {any} A Serial object
+   * @url http://www.espruino.com/Reference#l_Serial_Serial
+   */
+  static new(): any;
+
+  /**
+   * Set this Serial port as the port for the JavaScript console (REPL).
+   * Unless `force` is set to true, changes in the connection state of the board (for
+   * instance plugging in USB) will cause the console to change.
+   * See `E.setConsole` for a more flexible version of this function.
+   *
+   * @param {boolean} force - Whether to force the console to this port
+   * @url http://www.espruino.com/Reference#l_Serial_setConsole
+   */
+  setConsole(force: boolean): void;
+
+  /**
+   * Setup this Serial port with the given baud rate and options.
+   * eg.
+   * ```
+   * Serial1.setup(9600,{rx:a_pin, tx:a_pin});
+   * ```
+   * The second argument can contain:
+   * ```
+   * {
+   *   rx:pin,                           // Receive pin (data in to Espruino)
+   *   tx:pin,                           // Transmit pin (data out of Espruino)
+   *   ck:pin,                           // (default none) Clock Pin
+   *   cts:pin,                          // (default none) Clear to Send Pin
+   *   bytesize:8,                       // (default 8)How many data bits - 7 or 8
+   *   parity:null/'none'/'o'/'odd'/'e'/'even',
+   *                                     // (default none) Parity bit
+   *   stopbits:1,                       // (default 1) Number of stop bits to use
+   *   flow:null/undefined/'none'/'xon', // (default none) software flow control
+   *   path:null/undefined/string        // Linux Only - the path to the Serial device to use
+   *   errors:false                      // (default false) whether to forward framing/parity errors
+   * }
+   * ```
+   * You can find out which pins to use by looking at [your board's reference
+   * page](#boards) and searching for pins with the `UART`/`USART` markers.
+   * If not specified in options, the default pins are used for rx and tx (usually
+   * the lowest numbered pins on the lowest port that supports this peripheral). `ck`
+   * and `cts` are not used unless specified.
+   * Note that even after changing the RX and TX pins, if you have called setup
+   * before then the previous RX and TX pins will still be connected to the Serial
+   * port as well - until you set them to something else using `digitalWrite` or
+   * `pinMode`.
+   * Flow control can be xOn/xOff (`flow:'xon'`) or hardware flow control (receive
+   * only) if `cts` is specified. If `cts` is set to a pin, the pin's value will be 0
+   * when Espruino is ready for data and 1 when it isn't.
+   * By default, framing or parity errors don't create `framing` or `parity` events
+   * on the `Serial` object because storing these errors uses up additional storage
+   * in the queue. If you're intending to receive a lot of malformed data then the
+   * queue might overflow `E.getErrorFlags()` would return `FIFO_FULL`. However if
+   * you need to respond to `framing` or `parity` errors then you'll need to use
+   * `errors:true` when initialising serial.
+   * On Linux builds there is no default Serial device, so you must specify a path to
+   * a device - for instance: `Serial1.setup(9600,{path:"/dev/ttyACM0"})`
+   * You can also set up 'software serial' using code like:
+   * ```
+   * var s = new Serial();
+   * s.setup(9600,{rx:a_pin, tx:a_pin});
+   * ```
+   * However software serial doesn't use `ck`, `cts`, `parity`, `flow` or `errors`
+   * parts of the initialisation object.
+   *
+   * @param {any} baudrate - The baud rate - the default is 9600
+   * @param {any} options - An optional structure containing extra information on initialising the serial port - see below.
+   * @url http://www.espruino.com/Reference#l_Serial_setup
+   */
+  setup(baudrate: any, options: any): void;
+
+  /**
+   * If the serial (or software serial) device was set up, uninitialise it.
+   * @url http://www.espruino.com/Reference#l_Serial_unsetup
+   */
+  unsetup(): void;
+
+  /**
+   * Print a string to the serial port - without a line feed
+   *  **Note:** This function replaces any occurances of `\n` in the string with
+   *  `\r\n`. To avoid this, use `Serial.write`.
+   *
+   * @param {any} string - A String to print
+   * @url http://www.espruino.com/Reference#l_Serial_print
+   */
+  print(string: any): void;
+
+  /**
+   * Print a line to the serial port with a newline (`\r\n`) at the end of it.
+   *  **Note:** This function converts data to a string first, eg
+   *  `Serial.print([1,2,3])` is equivalent to `Serial.print("1,2,3"). If you'd like
+   *  to write raw bytes, use `Serial.write`.
+   *
+   * @param {any} string - A String to print
+   * @url http://www.espruino.com/Reference#l_Serial_println
+   */
+  println(string: any): void;
+
+  /**
+   * Write a character or array of data to the serial port
+   * This method writes unmodified data, eg `Serial.write([1,2,3])` is equivalent to
+   * `Serial.write("\1\2\3")`. If you'd like data converted to a string first, use
+   * `Serial.print`.
+   *
+   * @param {any} data - One or more items to write. May be ints, strings, arrays, or special objects (see `E.toUint8Array` for more info).
+   * @url http://www.espruino.com/Reference#l_Serial_write
+   */
+  write(...data: any[]): void;
+
+  /**
+   * Add data to this device as if it came directly from the input - it will be
+   * returned via `serial.on('data', ...)`;
+   * ```
+   * Serial1.on('data', function(d) { print("Got",d); });
+   * Serial1.inject('Hello World');
+   * // prints "Got Hel","Got lo World" (characters can be split over multiple callbacks)
+   * ```
+   * This is most useful if you wish to send characters to Espruino's REPL (console)
+   * while it is on another device.
+   *
+   * @param {any} data - One or more items to write. May be ints, strings, arrays, or special objects (see `E.toUint8Array` for more info).
+   * @url http://www.espruino.com/Reference#l_Serial_inject
+   */
+  inject(...data: any[]): void;
+
+  /**
+   * Return how many bytes are available to read. If there is already a listener for
+   * data, this will always return 0.
+   * @returns {number} How many bytes are available
+   * @url http://www.espruino.com/Reference#l_Serial_available
+   */
+  available(): number;
+
+  /**
+   * Return a string containing characters that have been received
+   *
+   * @param {number} chars - The number of characters to read, or undefined/0 for all available
+   * @returns {any} A string containing the required bytes.
+   * @url http://www.espruino.com/Reference#l_Serial_read
+   */
+  read(chars: number): any;
+
+  /**
+   * Pipe this USART to a stream (an object with a 'write' method)
+   *
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=32, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_Serial_pipe
+   */
+  pipe(destination: any, options: any): void;
+}
+
+/**
+ * These objects are created from `require("Storage").open` and allow Storage items
+ * to be read/written.
+ * The `Storage` library writes into Flash memory (which can only be erased in
+ * chunks), and unlike a normal filesystem it allocates files in one long
+ * contiguous area to allow them to be accessed easily from Espruino.
+ * This presents a challenge for `StorageFile` which allows you to append to a
+ * file, so instead `StorageFile` stores files in chunks. It uses the last
+ * character of the filename to denote the chunk number (eg `"foobar\1"`,
+ * `"foobar\2"`, etc).
+ * This means that while `StorageFile` files exist in the same area as those from
+ * `Storage`, they should be read using `Storage.open` (and not `Storage.read`).
+ * ```
+ * f = s.open("foobar","w");
+ * f.write("Hell");
+ * f.write("o World\n");
+ * f.write("Hello\n");
+ * f.write("World 2\n");
+ * // there's no need to call 'close'
+ * // then
+ * f = s.open("foobar","r");
+ * f.read(13) // "Hello World\nH"
+ * f.read(13) // "ello\nWorld 2\n"
+ * f.read(13) // "Hello World 3"
+ * f.read(13) // "\n"
+ * f.read(13) // undefined
+ * // or
+ * f = s.open("foobar","r");
+ * f.readLine() // "Hello World\n"
+ * f.readLine() // "Hello\n"
+ * f.readLine() // "World 2\n"
+ * f.readLine() // "Hello World 3\n"
+ * f.readLine() // undefined
+ * // now get rid of file
+ * f.erase();
+ * ```
+ * **Note:** `StorageFile` uses the fact that all bits of erased flash memory are 1
+ * to detect the end of a file. As such you should not write character code 255
+ * (`"\xFF"`) to these files.
+ * @url http://www.espruino.com/Reference#StorageFile
+ */
+declare class StorageFile {
+
+
+  /**
+   * Read 'len' bytes of data from the file, and return a String containing those
+   * bytes.
+   * If the end of the file is reached, the String may be smaller than the amount of
+   * bytes requested, or if the file is already at the end, `undefined` is returned.
+   *
+   * @param {number} len - How many bytes to read
+   * @returns {any} A String, or undefined
+   * @url http://www.espruino.com/Reference#l_StorageFile_read
+   */
+  read(len: number): string;
+
+  /**
+   * Read a line of data from the file (up to and including `"\n"`)
+   * @returns {any} A line of data
+   * @url http://www.espruino.com/Reference#l_StorageFile_readLine
+   */
+  readLine(): string;
+
+  /**
+   * Return the length of the current file.
+   * This requires Espruino to read the file from scratch, which is not a fast
+   * operation.
+   * @returns {number} The current length in bytes of the file
+   * @url http://www.espruino.com/Reference#l_StorageFile_getLength
+   */
+  getLength(): number;
+
+  /**
+   * Append the given data to a file. You should not attempt to append `"\xFF"`
+   * (character code 255).
+   *
+   * @param {any} data - The data to write. This should not include `'\xFF'` (character code 255)
+   * @url http://www.espruino.com/Reference#l_StorageFile_write
+   */
+  write(data: string): void;
+
+  /**
+   * Erase this file
+   * @url http://www.espruino.com/Reference#l_StorageFile_erase
+   */
+  erase(): void;
+}
+
+interface processConstructor {
+  /**
+   * This event is called when an exception gets thrown and isn't caught (eg. it gets
+   * all the way back to the event loop).
+   * You can use this for logging potential problems that might occur during
+   * execution when you might not be able to see what is written to the console, for
+   * example:
+   * ```
+   * var lastError;
+   * process.on('uncaughtException', function(e) {
+   *   lastError=e;
+   *   print(e,e.stack?"\n"+e.stack:"")
+   * });
+   * function checkError() {
+   *   if (!lastError) return print("No Error");
+   *   print(lastError,lastError.stack?"\n"+lastError.stack:"")
+   * }
+   * ```
+   * **Note:** When this is used, exceptions will cease to be reported on the
+   * console - which may make debugging difficult!
+   * @param {string} event - The event to listen to.
+   * @param {(exception: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `exception` The uncaught exception
+   * @url http://www.espruino.com/Reference#l_process_uncaughtException
+   */
+  on(event: "uncaughtException", callback: (exception: any) => void): void;
+
+  /**
+   * Returns the version of Espruino as a String
+   * @returns {any} The version of Espruino
+   * @url http://www.espruino.com/Reference#l_process_version
+   */
+  version: any;
+
+  /**
+   * Returns an Object containing various pre-defined variables.
+   * * `VERSION` - is the Espruino version
+   * * `GIT_COMMIT` - is Git commit hash this firmware was built from
+   * * `BOARD` - the board's ID (eg. `PUCKJS`)
+   * * `RAM` - total amount of on-chip RAM in bytes
+   * * `FLASH` - total amount of on-chip flash memory in bytes
+   * * `SPIFLASH` - (on Bangle.js) total amount of off-chip flash memory in bytes
+   * * `HWVERSION` - For Puck.js this is the board revision (1, 2, 2.1), or for
+   *   Bangle.js it's 1 or 2
+   * * `STORAGE` - memory in bytes dedicated to the `Storage` module
+   * * `SERIAL` - the serial number of this chip
+   * * `CONSOLE` - the name of the current console device being used (`Serial1`,
+   *   `USB`, `Bluetooth`, etc)
+   * * `MODULES` - a list of built-in modules separated by commas
+   * * `EXPTR` - The address of the `exportPtrs` structure in flash (this includes
+   *   links to built-in functions that compiled JS code needs)
+   * * `APP_RAM_BASE` - On nRF5x boards, this is the RAM required by the Softdevice
+   *   *if it doesn't exactly match what was allocated*. You can use this to update
+   *   `LD_APP_RAM_BASE` in the `BOARD.py` file
+   * For example, to get a list of built-in modules, you can use
+   * `process.env.MODULES.split(',')`
+   * @returns {any} An object
+   * @url http://www.espruino.com/Reference#l_process_env
+   */
+  env: any;
+
+  /**
+   * Run a Garbage Collection pass, and return an object containing information on
+   * memory usage.
+   * * `free` : Memory that is available to be used (in blocks)
+   * * `usage` : Memory that has been used (in blocks)
+   * * `total` : Total memory (in blocks)
+   * * `history` : Memory used for command history - that is freed if memory is low.
+   *   Note that this is INCLUDED in the figure for 'free'
+   * * `gc` : Memory freed during the GC pass
+   * * `gctime` : Time taken for GC pass (in milliseconds)
+   * * `blocksize` : Size of a block (variable) in bytes
+   * * `stackEndAddress` : (on ARM) the address (that can be used with peek/poke/etc)
+   *   of the END of the stack. The stack grows down, so unless you do a lot of
+   *   recursion the bytes above this can be used.
+   * * `flash_start` : (on ARM) the address of the start of flash memory (usually
+   *   `0x8000000`)
+   * * `flash_binary_end` : (on ARM) the address in flash memory of the end of
+   *   Espruino's firmware.
+   * * `flash_code_start` : (on ARM) the address in flash memory of pages that store
+   *   any code that you save with `save()`.
+   * * `flash_length` : (on ARM) the amount of flash memory this firmware was built
+   *   for (in bytes). **Note:** Some STM32 chips actually have more memory than is
+   *   advertised.
+   * Memory units are specified in 'blocks', which are around 16 bytes each
+   * (depending on your device). The actual size is available in `blocksize`. See
+   * http://www.espruino.com/Performance for more information.
+   * **Note:** To find free areas of flash memory, see `require('Flash').getFree()`
+   *
+   * @param {any} gc - An optional boolean. If `undefined` or `true` Garbage collection is performed, if `false` it is not
+   * @returns {any} Information about memory usage
+   * @url http://www.espruino.com/Reference#l_process_memory
+   */
+  memory(gc: any): any;
+}
+
+interface process {
+
+}
+
+/**
+ * This class contains information about Espruino itself
+ * @url http://www.espruino.com/Reference#process
+ */
+declare const process: processConstructor
+
+/**
+ * Built-in class that caches the modules used by the `require` command
+ * @url http://www.espruino.com/Reference#Modules
+ */
+declare class Modules {
+  /**
+   * Return an array of module names that have been cached
+   * @returns {any} An array of module names
+   * @url http://www.espruino.com/Reference#l_Modules_getCached
+   */
+  static getCached(): any;
+
+  /**
+   * Remove the given module from the list of cached modules
+   *
+   * @param {any} id - The module name to remove
+   * @url http://www.espruino.com/Reference#l_Modules_removeCached
+   */
+  static removeCached(id: any): void;
+
+  /**
+   * Remove all cached modules
+   * @url http://www.espruino.com/Reference#l_Modules_removeAllCached
+   */
+  static removeAllCached(): void;
+
+  /**
+   * Add the given module to the cache
+   *
+   * @param {any} id - The module name to add
+   * @param {any} sourcecode - The module's sourcecode
+   * @url http://www.espruino.com/Reference#l_Modules_addCached
+   */
+  static addCached(id: any, sourcecode: any): void;
+
+
+}
+
+interface StringConstructor {
+  /**
+   * Return the character(s) represented by the given character code(s).
+   *
+   * @param {any} code - One or more character codes to create a string from (range 0-255).
+   * @returns {any} The character
+   * @url http://www.espruino.com/Reference#l_String_fromCharCode
+   */
+  fromCharCode(...code: any[]): any;
+
+  /**
+   * Create a new String
+   * @constructor
+   *
+   * @param {any} str - A value to turn into a string. If undefined or not supplied, an empty String is created.
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_String_String
+   */
+  new(...str: any[]): any;
+}
+
+interface String {
+  /**
+   * Find the length of the string
+   * @returns {any} The value of the string
+   * @url http://www.espruino.com/Reference#l_String_length
+   */
+  length: any;
+
+  /**
+   * Return a single character at the given position in the String.
+   *
+   * @param {number} pos - The character number in the string. Negative values return characters from end of string (-1 = last char)
+   * @returns {any} The character in the string
+   * @url http://www.espruino.com/Reference#l_String_charAt
+   */
+  charAt(pos: number): any;
+
+  /**
+   * Return the integer value of a single character at the given position in the
+   * String.
+   * Note that this returns 0 not 'NaN' for out of bounds characters
+   *
+   * @param {number} pos - The character number in the string. Negative values return characters from end of string (-1 = last char)
+   * @returns {number} The integer value of a character in the string
+   * @url http://www.espruino.com/Reference#l_String_charCodeAt
+   */
+  charCodeAt(pos: number): number;
+
+  /**
+   * Return the index of substring in this string, or -1 if not found
+   *
+   * @param {any} substring - The string to search for
+   * @param {any} fromIndex - Index to search from
+   * @returns {number} The index of the string, or -1 if not found
+   * @url http://www.espruino.com/Reference#l_String_indexOf
+   */
+  indexOf(substring: any, fromIndex: any): number;
+
+  /**
+   * Return the last index of substring in this string, or -1 if not found
+   *
+   * @param {any} substring - The string to search for
+   * @param {any} fromIndex - Index to search from
+   * @returns {number} The index of the string, or -1 if not found
+   * @url http://www.espruino.com/Reference#l_String_lastIndexOf
+   */
+  lastIndexOf(substring: any, fromIndex: any): number;
+
+  /**
+   * Matches an occurrence `subStr` in the string.
+   * Returns `null` if no match, or:
+   * ```
+   * "abcdef".match("b") == [
+   *   "b",         // array index 0 - the matched string
+   *   index: 1,    // the start index of the match
+   *   input: "b"   // the input string
+   *  ]
+   * "abcdefabcdef".match(/bcd/) == [
+   *   "bcd", index: 1,
+   *   input: "abcdefabcdef"
+   *  ]
+   * ```
+   * 'Global' RegEx matches just return an array of matches (with no indices):
+   * ```
+   * "abcdefabcdef".match(/bcd/g) = [
+   *   "bcd",
+   *   "bcd"
+   *  ]
+   * ```
+   *
+   * @param {any} substr - Substring or RegExp to match
+   * @returns {any} A match array or `null` (see below):
+   * @url http://www.espruino.com/Reference#l_String_match
+   */
+  match(substr: any): any;
+
+  /**
+   * Search and replace ONE occurrance of `subStr` with `newSubStr` and return the
+   * result. This doesn't alter the original string. Regular expressions not
+   * supported.
+   *
+   * @param {any} subStr - The string to search for
+   * @param {any} newSubStr - The string to replace it with
+   * @returns {any} This string with `subStr` replaced
+   * @url http://www.espruino.com/Reference#l_String_replace
+   */
+  replace(subStr: any, newSubStr: any): any;
+
+  /**
+   *
+   * @param {number} start - The start character index (inclusive)
+   * @param {any} end - The end character index (exclusive)
+   * @returns {any} The part of this string between start and end
+   * @url http://www.espruino.com/Reference#l_String_substring
+   */
+  substring(start: number, end: any): any;
+
+  /**
+   *
+   * @param {number} start - The start character index
+   * @param {any} len - The number of characters
+   * @returns {any} Part of this string from start for len characters
+   * @url http://www.espruino.com/Reference#l_String_substr
+   */
+  substr(start: number, len: any): any;
+
+  /**
+   *
+   * @param {number} start - The start character index, if negative it is from the end of the string
+   * @param {any} end - The end character index, if negative it is from the end of the string, and if omitted it is the end of the string
+   * @returns {any} Part of this string from start for len characters
+   * @url http://www.espruino.com/Reference#l_String_slice
+   */
+  slice(start: number, end: any): any;
+
+  /**
+   * Return an array made by splitting this string up by the separator. eg.
+   * ```'1,2,3'.split(',')==['1', '2', '3']```
+   * Regular Expressions can also be used to split strings, eg. `'1a2b3
+   * 4'.split(/[^0-9]/)==['1', '2', '3', '4']`.
+   *
+   * @param {any} separator - The separator `String` or `RegExp` to use
+   * @returns {any} Part of this string from start for len characters
+   * @url http://www.espruino.com/Reference#l_String_split
+   */
+  split(separator: any): any;
+
+  /**
+   *
+   * @returns {any} The lowercase version of this string
+   * @url http://www.espruino.com/Reference#l_String_toLowerCase
+   */
+  toLowerCase(): any;
+
+  /**
+   *
+   * @returns {any} The uppercase version of this string
+   * @url http://www.espruino.com/Reference#l_String_toUpperCase
+   */
+  toUpperCase(): any;
+
+  /**
+   * Return a new string with any whitespace (tabs, space, form feed, newline,
+   * carriage return, etc) removed from the beginning and end.
+   * @returns {any} A String with Whitespace removed from the beginning and end
+   * @url http://www.espruino.com/Reference#l_String_trim
+   */
+  trim(): string;
+
+  /**
+   * Append all arguments to this `String` and return the result. Does not modify the
+   * original `String`.
+   *
+   * @param {any} args - Strings to append
+   * @returns {any} The result of appending all arguments to this string
+   * @url http://www.espruino.com/Reference#l_String_concat
+   */
+  concat(...args: any[]): any;
+
+  /**
+   *
+   * @param {any} searchString - The string to search for
+   * @param {number} position - The start character index (or 0 if not defined)
+   * @returns {boolean} `true` if the given characters are found at the beginning of the string, otherwise, `false`.
+   * @url http://www.espruino.com/Reference#l_String_startsWith
+   */
+  startsWith(searchString: any, position: number): boolean;
+
+  /**
+   *
+   * @param {any} searchString - The string to search for
+   * @param {any} length - The 'end' of the string - if left off the actual length of the string is used
+   * @returns {boolean} `true` if the given characters are found at the end of the string, otherwise, `false`.
+   * @url http://www.espruino.com/Reference#l_String_endsWith
+   */
+  endsWith(searchString: any, length: any): boolean;
+
+  /**
+   *
+   * @param {any} substring - The string to search for
+   * @param {any} fromIndex - The start character index (or 0 if not defined)
+   * @returns {boolean} `true` if the given characters are in the string, otherwise, `false`.
+   * @url http://www.espruino.com/Reference#l_String_includes
+   */
+  includes(substring: any, fromIndex: any): boolean;
+
+  /**
+   * Repeat this string the given number of times.
+   *
+   * @param {number} count - An integer with the amount of times to repeat this String
+   * @returns {any} A string containing repetitions of this string
+   * @url http://www.espruino.com/Reference#l_String_repeat
+   */
+  repeat(count: number): string;
+
+  /**
+   * Pad this string at the beginnind to the required number of characters
+   * ```
+   * "Hello".padStart(10) == "     Hello"
+   * "123".padStart(10,".-") == ".-.-.-.123"
+   * ```
+   *
+   * @param {number} targetLength - The length to pad this string to
+   * @param {any} [padString] - [optional] The string to pad with, default is `' '`
+   * @returns {any} A string containing this string padded to the correct length
+   * @url http://www.espruino.com/Reference#l_String_padStart
+   */
+  padStart(targetLength: number, padString?: any): string;
+
+  /**
+   * Pad this string at the end to the required number of characters
+   * ```
+   * "Hello".padEnd(10) == "Hello     "
+   * "123".padEnd(10,".-") == "123.-.-.-."
+   * ```
+   *
+   * @param {number} targetLength - The length to pad this string to
+   * @param {any} [padString] - [optional] The string to pad with, default is `' '`
+   * @returns {any} A string containing this string padded to the correct length
+   * @url http://www.espruino.com/Reference#l_String_padEnd
+   */
+  padEnd(targetLength: number, padString?: any): string;
+}
+
+/**
+ * This is the built-in class for Text Strings.
+ * Text Strings in Espruino are not zero-terminated, so you can store zeros in
+ * them.
+ * @url http://www.espruino.com/Reference#String
+ */
+declare const String: StringConstructor
+
+interface ArrayConstructor {
+  /**
+   * Returns true if the provided object is an array
+   *
+   * @param {any} var - The variable to be tested
+   * @returns {boolean} True if var is an array, false if not.
+   * @url http://www.espruino.com/Reference#l_Array_isArray
+   */
+  isArray(arg: any): arg is any[];
+
+  /**
+   * Create an Array. Either give it one integer argument (>=0) which is the length
+   * of the array, or any number of arguments
+   * @constructor
+   *
+   * @param {any} args - The length of the array OR any number of items to add to the array
+   * @returns {any} An Array
+   * @url http://www.espruino.com/Reference#l_Array_Array
+   */
+  new(arrayLength?: number): any[];
+  new<T>(arrayLength: number): T[];
+  new<T>(...items: T[]): T[];
+  (arrayLength?: number): any[];
+  <T>(arrayLength: number): T[];
+  <T>(...items: T[]): T[];
+}
+
+interface Array<T> {
+  /**
+   * Convert the Array to a string
+   *
+   * @param {any} radix - unused
+   * @returns {any} A String representing the array
+   * @url http://www.espruino.com/Reference#l_Array_toString
+   */
+  toString(): string;
+
+  /**
+   * Find the length of the array
+   * @returns {any} The length of the array
+   * @url http://www.espruino.com/Reference#l_Array_length
+   */
+  length: number;
+
+  /**
+   * Return the index of the value in the array, or -1
+   *
+   * @param {any} value - The value to check for
+   * @param {number} startIndex - (optional) the index to search from, or 0 if not specified
+   * @returns {any} the index of the value in the array, or -1
+   * @url http://www.espruino.com/Reference#l_Array_indexOf
+   */
+  indexOf(value: T, startIndex?: number): number;
+
+  /**
+   * Return `true` if the array includes the value, `false` otherwise
+   *
+   * @param {any} value - The value to check for
+   * @param {number} startIndex - (optional) the index to search from, or 0 if not specified
+   * @returns {boolean} `true` if the array includes the value, `false` otherwise
+   * @url http://www.espruino.com/Reference#l_Array_includes
+   */
+  includes(value: T, startIndex?: number): boolean;
+
+  /**
+   * Join all elements of this array together into one string, using 'separator'
+   * between them. e.g. ```[1,2,3].join(' ')=='1 2 3'```
+   *
+   * @param {any} separator - The separator
+   * @returns {any} A String representing the Joined array
+   * @url http://www.espruino.com/Reference#l_Array_join
+   */
+  join(separator?: string): string;
+
+  /**
+   * Push a new value onto the end of this array'
+   * This is the opposite of `[1,2,3].unshift(0)`, which adds one or more elements to
+   * the beginning of the array.
+   *
+   * @param {any} arguments - One or more arguments to add
+   * @returns {number} The new size of the array
+   * @url http://www.espruino.com/Reference#l_Array_push
+   */
+  push(...arguments: T[]): number;
+
+  /**
+   * Remove and return the value on the end of this array.
+   * This is the opposite of `[1,2,3].shift()`, which removes an element from the
+   * beginning of the array.
+   * @returns {any} The value that is popped off
+   * @url http://www.espruino.com/Reference#l_Array_pop
+   */
+  pop(): T | undefined;
+
+  /**
+   * Return an array which is made from the following: ```A.map(function) =
+   * [function(A[0]), function(A[1]), ...]```
+   *
+   * @param {any} function - Function used to map one item to another
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} An array containing the results
+   * @url http://www.espruino.com/Reference#l_Array_map
+   */
+  map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
+
+  /**
+   * Executes a provided function once per array element.
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} [thisArg] - [optional] If specified, the function is called with 'this' set to thisArg (optional)
+   * @url http://www.espruino.com/Reference#l_Array_forEach
+   */
+  forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
+
+  /**
+   * Return an array which contains only those elements for which the callback
+   * function returns 'true'
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} An array containing the results
+   * @url http://www.espruino.com/Reference#l_Array_filter
+   */
+  filter<S extends T>(predicate: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[];
+  filter(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[];
+
+  /**
+   * Return the array element where `function` returns `true`, or `undefined` if it
+   * doesn't returns `true` for any element.
+   * ```
+   * ["Hello","There","World"].find(a=>a[0]=="T")
+   * // returns "There"
+   * ```
+   *
+   * @param {any} function - Function to be executed
+   * @returns {any} The array element where `function` returns `true`, or `undefined`
+   * @url http://www.espruino.com/Reference#l_Array_find
+   */
+  find<S extends T>(predicate: (this: void, value: T, index: number, obj: T[]) => value is S): S | undefined;
+  find(predicate: (value: T, index: number, obj: T[]) => unknown): T | undefined;
+
+  /**
+   * Return the array element's index where `function` returns `true`, or `-1` if it
+   * doesn't returns `true` for any element.
+   * ```
+   * ["Hello","There","World"].findIndex(a=>a[0]=="T")
+   * // returns 1
+   * ```
+   *
+   * @param {any} function - Function to be executed
+   * @returns {any} The array element's index where `function` returns `true`, or `-1`
+   * @url http://www.espruino.com/Reference#l_Array_findIndex
+   */
+  findIndex(predicate: (value: T, index: number, obj: T[]) => unknown): number;
+
+  /**
+   * Return 'true' if the callback returns 'true' for any of the elements in the
+   * array
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} A boolean containing the result
+   * @url http://www.espruino.com/Reference#l_Array_some
+   */
+  some(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
+
+  /**
+   * Return 'true' if the callback returns 'true' for every element in the array
+   *
+   * @param {any} function - Function to be executed
+   * @param {any} thisArg - if specified, the function is called with 'this' set to thisArg (optional)
+   * @returns {any} A boolean containing the result
+   * @url http://www.espruino.com/Reference#l_Array_every
+   */
+  every(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
+
+  /**
+   * Execute `previousValue=initialValue` and then `previousValue =
+   * callback(previousValue, currentValue, index, array)` for each element in the
+   * array, and finally return previousValue.
+   *
+   * @param {any} callback - Function used to reduce the array
+   * @param {any} initialValue - if specified, the initial value to pass to the function
+   * @returns {any} The value returned by the last function called
+   * @url http://www.espruino.com/Reference#l_Array_reduce
+   */
+  reduce(callback: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+
+  /**
+   * Both remove and add items to an array
+   *
+   * @param {number} index - Index at which to start changing the array. If negative, will begin that many elements from the end
+   * @param {any} howMany - An integer indicating the number of old array elements to remove. If howMany is 0, no elements are removed.
+   * @param {any} elements - One or more items to add to the array
+   * @returns {any} An array containing the removed elements. If only one element is removed, an array of one element is returned.
+   * @url http://www.espruino.com/Reference#l_Array_splice
+   */
+  splice(index: number, howMany?: number, ...elements: T[]): T[];
+
+  /**
+   * Remove and return the first element of the array.
+   * This is the opposite of `[1,2,3].pop()`, which takes an element off the end.
+   *
+   * @returns {any} The element that was removed
+   * @url http://www.espruino.com/Reference#l_Array_shift
+   */
+  shift(): T | undefined;
+
+  /**
+   * Add one or more items to the start of the array, and return its new length.
+   * This is the opposite of `[1,2,3].push(4)`, which puts one or more elements on
+   * the end.
+   *
+   * @param {any} elements - One or more items to add to the beginning of the array
+   * @returns {number} The new array length
+   * @url http://www.espruino.com/Reference#l_Array_unshift
+   */
+  unshift(...elements: T[]): number;
+
+  /**
+   * Return a copy of a portion of this array (in a new array)
+   *
+   * @param {number} start - Start index
+   * @param {any} end - End index (optional)
+   * @returns {any} A new array
+   * @url http://www.espruino.com/Reference#l_Array_slice
+   */
+  slice(start?: number, end?: number): T[];
+
+  /**
+   * Do an in-place quicksort of the array
+   *
+   * @param {any} var - A function to use to compare array elements (or undefined)
+   * @returns {any} This array object
+   * @url http://www.espruino.com/Reference#l_Array_sort
+   */
+  sort(compareFn?: (a: T, b: T) => number): T[];
+
+  /**
+   * Create a new array, containing the elements from this one and any arguments, if
+   * any argument is an array then those elements will be added.
+   *
+   * @param {any} args - Any items to add to the array
+   * @returns {any} An Array
+   * @url http://www.espruino.com/Reference#l_Array_concat
+   */
+  concat(...args: (T | T[])[]): T[];
+
+  /**
+   * Fill this array with the given value, for every index `>= start` and `< end`
+   *
+   * @param {any} value - The value to fill the array with
+   * @param {number} start - Optional. The index to start from (or 0). If start is negative, it is treated as length+start where length is the length of the array
+   * @param {any} end - Optional. The index to end at (or the array length). If end is negative, it is treated as length+end.
+   * @returns {any} This array
+   * @url http://www.espruino.com/Reference#l_Array_fill
+   */
+  fill(value: T, start: number, end?: number): T[];
+
+  /**
+   * Reverse all elements in this array (in place)
+   * @returns {any} The array, but reversed.
+   * @url http://www.espruino.com/Reference#l_Array_reverse
+   */
+  reverse(): T[];
+
+  [index: number]: T
+}
+
+/**
+ * This is the built-in JavaScript class for arrays.
+ * Arrays can be defined with ```[]```, ```new Array()```, or ```new
+ * Array(length)```
+ * @url http://www.espruino.com/Reference#Array
+ */
+declare const Array: ArrayConstructor
+
+interface ObjectConstructor {
+  /**
+   * Return all enumerable keys of the given object
+   *
+   * @param {any} object - The object to return keys for
+   * @returns {any} An array of strings - one for each key on the given object
+   * @url http://www.espruino.com/Reference#l_Object_keys
+   */
+  keys(object: any): any;
+
+  /**
+   * Returns an array of all properties (enumerable or not) found directly on a given
+   * object.
+   *
+   * @param {any} object - The Object to return a list of property names for
+   * @returns {any} An array of the Object's own properties
+   * @url http://www.espruino.com/Reference#l_Object_getOwnPropertyNames
+   */
+  getOwnPropertyNames(object: any): any;
+
+  /**
+   * Return all enumerable values of the given object
+   *
+   * @param {any} object - The object to return values for
+   * @returns {any} An array of values - one for each key on the given object
+   * @url http://www.espruino.com/Reference#l_Object_values
+   */
+  values(object: any): any;
+
+  /**
+   * Return all enumerable keys and values of the given object
+   *
+   * @param {any} object - The object to return values for
+   * @returns {any} An array of `[key,value]` pairs - one for each key on the given object
+   * @url http://www.espruino.com/Reference#l_Object_entries
+   */
+  entries(object: any): any;
+
+  /**
+   * Creates a new object with the specified prototype object and properties.
+   * properties are currently unsupported.
+   *
+   * @param {any} proto - A prototype object
+   * @param {any} propertiesObject - An object containing properties. NOT IMPLEMENTED
+   * @returns {any} A new object
+   * @url http://www.espruino.com/Reference#l_Object_create
+   */
+  create(proto: any, propertiesObject: any): any;
+
+  /**
+   * Get information on the given property in the object, or undefined
+   *
+   * @param {any} obj - The object
+   * @param {any} name - The name of the property
+   * @returns {any} An object with a description of the property. The values of writable/enumerable/configurable may not be entirely correct due to Espruino's implementation.
+   * @url http://www.espruino.com/Reference#l_Object_getOwnPropertyDescriptor
+   */
+  getOwnPropertyDescriptor(obj: any, name: any): any;
+
+  /**
+   * Add a new property to the Object. 'Desc' is an object with the following fields:
+   * * `configurable` (bool = false) - can this property be changed/deleted (not
+   *   implemented)
+   * * `enumerable` (bool = false) - can this property be enumerated (not
+   *   implemented)
+   * * `value` (anything) - the value of this property
+   * * `writable` (bool = false) - can the value be changed with the assignment
+   *   operator?
+   * * `get` (function) - the getter function, or undefined if no getter (only
+   *   supported on some platforms)
+   * * `set` (function) - the setter function, or undefined if no setter (only
+   *   supported on some platforms)
+   * **Note:** `configurable`, `enumerable` and `writable` are not implemented and
+   * will be ignored.
+   *
+   * @param {any} obj - An object
+   * @param {any} name - The name of the property
+   * @param {any} desc - The property descriptor
+   * @returns {any} The object, obj.
+   * @url http://www.espruino.com/Reference#l_Object_defineProperty
+   */
+  defineProperty(obj: any, name: any, desc: any): any;
+
+  /**
+   * Adds new properties to the Object. See `Object.defineProperty` for more
+   * information
+   *
+   * @param {any} obj - An object
+   * @param {any} props - An object whose fields represent property names, and whose values are property descriptors.
+   * @returns {any} The object, obj.
+   * @url http://www.espruino.com/Reference#l_Object_defineProperties
+   */
+  defineProperties(obj: any, props: any): any;
+
+  /**
+   * Get the prototype of the given object - this is like writing `object.__proto__`
+   * but is the 'proper' ES6 way of doing it
+   *
+   * @param {any} object - An object
+   * @returns {any} The prototype
+   * @url http://www.espruino.com/Reference#l_Object_getPrototypeOf
+   */
+  getPrototypeOf(object: any): any;
+
+  /**
+   * Set the prototype of the given object - this is like writing `object.__proto__ =
+   * prototype` but is the 'proper' ES6 way of doing it
+   *
+   * @param {any} object - An object
+   * @param {any} prototype - The prototype to set on the object
+   * @returns {any} The object passed in
+   * @url http://www.espruino.com/Reference#l_Object_setPrototypeOf
+   */
+  setPrototypeOf(object: any, prototype: any): any;
+
+  /**
+   * Appends all keys and values in any subsequent objects to the first object
+   * **Note:** Unlike the standard ES6 `Object.assign`, this will throw an exception
+   * if given raw strings, bools or numbers rather than objects.
+   *
+   * @param {any} args - The target object, then any items objects to use as sources of keys
+   * @returns {any} The target object
+   * @url http://www.espruino.com/Reference#l_Object_assign
+   */
+  assign(...args: any[]): any;
+
+  /**
+   * Creates an Object from the supplied argument
+   * @constructor
+   *
+   * @param {any} value - A single value to be converted to an object
+   * @returns {any} An Object
+   * @url http://www.espruino.com/Reference#l_Object_Object
+   */
+  new(value: any): any;
+}
+
+interface Object {
+  /**
+   * Find the length of the object
+   * @returns {any} The length of the object
+   * @url http://www.espruino.com/Reference#l_Object_length
+   */
+  length: any;
+
+  /**
+   * Returns the primitive value of this object.
+   * @returns {any} The primitive value of this object
+   * @url http://www.espruino.com/Reference#l_Object_valueOf
+   */
+  valueOf(): any;
+
+  /**
+   * Convert the Object to a string
+   *
+   * @param {any} radix - If the object is an integer, the radix (between 2 and 36) to use. NOTE: Setting a radix does not work on floating point numbers.
+   * @returns {any} A String representing the object
+   * @url http://www.espruino.com/Reference#l_Object_toString
+   */
+  toString(radix: any): any;
+
+  /**
+   * Copy this object completely
+   * @returns {any} A copy of this Object
+   * @url http://www.espruino.com/Reference#l_Object_clone
+   */
+  clone(): any;
+
+  /**
+   * Return true if the object (not its prototype) has the given property.
+   * NOTE: This currently returns false-positives for built-in functions in
+   * prototypes
+   *
+   * @param {any} name - The name of the property to search for
+   * @returns {boolean} True if it exists, false if it doesn't
+   * @url http://www.espruino.com/Reference#l_Object_hasOwnProperty
+   */
+  hasOwnProperty(name: any): boolean;
+
+  /**
+   * Register an event listener for this object, for instance `Serial1.on('data',
+   * function(d) {...})`.
+   * This is the same as Node.js's [EventEmitter](https://nodejs.org/api/events.html)
+   * but on Espruino the functionality is built into every object:
+   * * `Object.on`
+   * * `Object.emit`
+   * * `Object.removeListener`
+   * * `Object.removeAllListeners`
+   * ```
+   * var o = {}; // o can be any object...
+   * // call an arrow function when the 'answer' event is received
+   * o.on('answer', x => console.log(x));
+   * // call a named function when the 'answer' event is received
+   * function printAnswer(d) {
+   *   console.log("The answer is", d);
+   * }
+   * o.on('answer', printAnswer);
+   * // emit the 'answer' event - functions added with 'on' will be executed
+   * o.emit('answer', 42);
+   * // prints: 42
+   * // prints: The answer is 42
+   * // If you have a named function, it can be removed by name
+   * o.removeListener('answer', printAnswer);
+   * // Now 'printAnswer' is removed
+   * o.emit('answer', 43);
+   * // prints: 43
+   * // Or you can remove all listeners for 'answer'
+   * o.removeAllListeners('answer')
+   * // Now nothing happens
+   * o.emit('answer', 44);
+   * // nothing printed
+   * ```
+   *
+   * @param {any} event - The name of the event, for instance 'data'
+   * @param {any} listener - The listener to call when this event is received
+   * @url http://www.espruino.com/Reference#l_Object_on
+   */
+  on(event: any, listener: any): void;
+
+  /**
+   * Call any event listeners that were added to this object with `Object.on`, for
+   * instance `obj.emit('data', 'Foo')`.
+   * For more information see `Object.on`
+   *
+   * @param {any} event - The name of the event, for instance 'data'
+   * @param {any} args - Optional arguments
+   * @url http://www.espruino.com/Reference#l_Object_emit
+   */
+  emit(event: any, ...args: any[]): void;
+
+  /**
+   * Removes the specified event listener.
+   * ```
+   * function foo(d) {
+   *   console.log(d);
+   * }
+   * Serial1.on("data", foo);
+   * Serial1.removeListener("data", foo);
+   * ```
+   * For more information see `Object.on`
+   *
+   * @param {any} event - The name of the event, for instance 'data'
+   * @param {any} listener - The listener to remove
+   * @url http://www.espruino.com/Reference#l_Object_removeListener
+   */
+  removeListener(event: any, listener: any): void;
+
+  /**
+   * Removes all listeners (if `event===undefined`), or those of the specified event.
+   * ```
+   * Serial1.on("data", function(data) { ... });
+   * Serial1.removeAllListeners("data");
+   * // or
+   * Serial1.removeAllListeners(); // removes all listeners for all event types
+   * ```
+   * For more information see `Object.on`
+   *
+   * @param {any} event - The name of the event, for instance `'data'`. If not specified *all* listeners are removed.
+   * @url http://www.espruino.com/Reference#l_Object_removeAllListeners
+   */
+  removeAllListeners(event: any): void;
+}
+
+/**
+ * This is the built-in class for Objects
+ * @url http://www.espruino.com/Reference#Object
+ */
+declare const Object: ObjectConstructor
+
+interface FunctionConstructor {
+  /**
+   * Creates a function
+   * @constructor
+   *
+   * @param {any} args - Zero or more arguments (as strings), followed by a string representing the code to run
+   * @returns {any} A Number object
+   * @url http://www.espruino.com/Reference#l_Function_Function
+   */
+  new(...args: any[]): any;
+}
+
+interface Function {
+  /**
+   * This replaces the function with the one in the argument - while keeping the old
+   * function's scope. This allows inner functions to be edited, and is used when
+   * edit() is called on an inner function.
+   *
+   * @param {any} newFunc - The new function to replace this function with
+   * @url http://www.espruino.com/Reference#l_Function_replaceWith
+   */
+  replaceWith(newFunc: any): void;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} this - The value to use as the 'this' argument when executing the function
+   * @param {any} params - Optional Parameters
+   * @returns {any} The return value of executing this function
+   * @url http://www.espruino.com/Reference#l_Function_call
+   */
+  call(this: any, ...params: any[]): any;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} this - The value to use as the 'this' argument when executing the function
+   * @param {any} args - Optional Array of Arguments
+   * @returns {any} The return value of executing this function
+   * @url http://www.espruino.com/Reference#l_Function_apply
+   */
+  apply(this: any, args: any): any;
+
+  /**
+   * This executes the function with the supplied 'this' argument and parameters
+   *
+   * @param {any} this - The value to use as the 'this' argument when executing the function
+   * @param {any} params - Optional Default parameters that are prepended to the call
+   * @returns {any} The 'bound' function
+   * @url http://www.espruino.com/Reference#l_Function_bind
+   */
+  bind(this: any, ...params: any[]): any;
+}
+
+/**
+ * This is the built-in class for Functions
+ * @url http://www.espruino.com/Reference#Function
+ */
+declare const Function: FunctionConstructor
+
+/**
+ * This is the built-in JavaScript class for Espruino utility functions.
+ * @url http://www.espruino.com/Reference#E
+ */
+declare class E {
+  /**
+   * Setup the filesystem so that subsequent calls to `E.openFile` and
+   * `require('fs').*` will use an SD card on the supplied SPI device and pin.
+   * It can even work using software SPI - for instance:
+   * ```
+   * // DI/CMD = C7
+   * // DO/DAT0 = C8
+   * // CK/CLK = C9
+   * // CD/CS/DAT3 = C6
+   * var spi = new SPI();
+   * spi.setup({mosi:C7, miso:C8, sck:C9});
+   * E.connectSDCard(spi, C6);
+   * console.log(require("fs").readdirSync());
+   * ```
+   * See [the page on File IO](http://www.espruino.com/File+IO) for more information.
+   * **Note:** We'd strongly suggest you add a pullup resistor from CD/CS pin to
+   * 3.3v. It is good practise to avoid accidental writes before Espruino is
+   * initialised, and some cards will not work reliably without one.
+   * **Note:** If you want to remove an SD card after you have started using it, you
+   * *must* call `E.unmountSD()` or you may cause damage to the card.
+   *
+   * @param {any} spi - The SPI object to use for communication
+   * @param {Pin} csPin - The pin to use for Chip Select
+   * @url http://www.espruino.com/Reference#l_E_connectSDCard
+   */
+  static connectSDCard(spi: any, csPin: Pin): void;
+
+  /**
+   * Unmount the SD card, so it can be removed. If you remove the SD card without
+   * calling this you may cause corruption, and you will be unable to access another
+   * SD card until you reset Espruino or call `E.unmountSD()`.
+   * @url http://www.espruino.com/Reference#l_E_unmountSD
+   */
+  static unmountSD(): void;
+
+  /**
+   * Open a file
+   *
+   * @param {any} path - the path to the file to open.
+   * @param {any} mode - The mode to use when opening the file. Valid values for mode are 'r' for read, 'w' for write new, 'w+' for write existing, and 'a' for append. If not specified, the default is 'r'.
+   * @returns {any} A File object
+   * @url http://www.espruino.com/Reference#l_E_openFile
+   */
+  static openFile(path: any, mode: any): File;
+
+  /**
+   * Change the parameters used for the flash filesystem. The default address is the
+   * last 1Mb of 4Mb Flash, 0x300000, with total size of 1Mb.
+   * Before first use the media needs to be formatted.
+   * ```
+   * fs=require("fs");
+   * try {
+   *   fs.readdirSync();
+   *  } catch (e) { //'Uncaught Error: Unable to mount media : NO_FILESYSTEM'
+   *   console.log('Formatting FS - only need to do once');
+   *   E.flashFatFS({ format: true });
+   * }
+   * fs.writeFileSync("bang.txt", "This is the way the world ends\nnot with a bang but a whimper.\n");
+   * fs.readdirSync();
+   * ```
+   * This will create a drive of 100 * 4096 bytes at 0x300000. Be careful with the
+   * selection of flash addresses as you can overwrite firmware! You only need to
+   * format once, as each will erase the content.
+   * `E.flashFatFS({ addr:0x300000,sectors:100,format:true });`
+   *
+   * @param {any} options
+   * An optional object `{ addr : int=0x300000, sectors : int=256, format : bool=false }`
+   * addr : start address in flash
+   * sectors: number of sectors to use
+   * format:  Format the media
+   * @returns {boolean} True on success, or false on failure
+   * @url http://www.espruino.com/Reference#l_E_flashFatFS
+   */
+  static flashFatFS(options: any): boolean;
+
+  /**
+   * Display a menu on the screen, and set up the buttons to navigate through it.
+   * Supply an object containing menu items. When an item is selected, the function
+   * it references will be executed. For example:
+   * ```
+   * var boolean = false;
+   * var number = 50;
+   * // First menu
+   * var mainmenu = {
+   *   "" : { "title" : "-- Main Menu --" },
+   *   "Backlight On" : function() { LED1.set(); },
+   *   "Backlight Off" : function() { LED1.reset(); },
+   *   "Submenu" : function() { E.showMenu(submenu); },
+   *   "A Boolean" : {
+   *     value : boolean,
+   *     format : v => v?"On":"Off",
+   *     onchange : v => { boolean=v; }
+   *   },
+   *   "A Number" : {
+   *     value : number,
+   *     min:0,max:100,step:10,
+   *     onchange : v => { number=v; }
+   *   },
+   *   "Exit" : function() { E.showMenu(); }, // remove the menu
+   * };
+   * // Submenu
+   * var submenu = {
+   *   "" : { title : "-- SubMenu --",
+   *          back : function() { E.showMenu(mainmenu); } },
+   *   "One" : undefined, // do nothing
+   *   "Two" : undefined // do nothing
+   * };
+   * // Actually display the menu
+   * E.showMenu(mainmenu);
+   * ```
+   * The menu will stay onscreen and active until explicitly removed, which you can
+   * do by calling `E.showMenu()` without arguments.
+   * See http://www.espruino.com/graphical_menu for more detailed information.
+   *
+   * @param {any} menu - An object containing name->function mappings to to be used in a menu
+   * @returns {any} A menu object with `draw`, `move` and `select` functions
+   * @url http://www.espruino.com/Reference#l_E_showMenu
+   */
+  static showMenu(menu: Menu): MenuInstance;
+  static showMenu(): void;
+
+  /**
+   * A utility function for displaying a full screen message on the screen.
+   * Draws to the screen and returns immediately.
+   * ```
+   * E.showMessage("These are\nLots of\nLines","My Title")
+   * ```
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} title - (optional) a title for the message
+   * @url http://www.espruino.com/Reference#l_E_showMessage
+   */
+  static showMessage(message: string, title?: string): void;
+
+  /**
+   * Displays a full screen prompt on the screen, with the buttons requested (or
+   * `Yes` and `No` for defaults).
+   * When the button is pressed the promise is resolved with the requested values
+   * (for the `Yes` and `No` defaults, `true` and `false` are returned).
+   * ```
+   * E.showPrompt("Do you like fish?").then(function(v) {
+   *   if (v) print("'Yes' chosen");
+   *   else print("'No' chosen");
+   * });
+   * // Or
+   * E.showPrompt("How many fish\ndo you like?",{
+   *   title:"Fish",
+   *   buttons : {"One":1,"Two":2,"Three":3}
+   * }).then(function(v) {
+   *   print("You like "+v+" fish");
+   * });
+   * ```
+   * To remove the prompt, call `E.showPrompt()` with no arguments.
+   * The second `options` argument can contain:
+   * ```
+   * {
+   *   title: "Hello",                      // optional Title
+   *   buttons : {"Ok":true,"Cancel":false} // list of button text & return value
+   * }
+   * ```
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} options - (optional) an object of options (see below)
+   * @returns {any} A promise that is resolved when 'Ok' is pressed
+   * @url http://www.espruino.com/Reference#l_E_showPrompt
+   */
+  static showPrompt<T = boolean>(message: string, options?: { title?: string, buttons?: { [key: string]: T } }): Promise<T>;
+  static showPrompt(): void;
+
+  /**
+   * Displays a full screen prompt on the screen, with a single 'Ok' button.
+   * When the button is pressed the promise is resolved.
+   * ```
+   * E.showAlert("Hello").then(function() {
+   *   print("Ok pressed");
+   * });
+   * // or
+   * E.showAlert("These are\nLots of\nLines","My Title").then(function() {
+   *   print("Ok pressed");
+   * });
+   * ```
+   * To remove the window, call `E.showAlert()` with no arguments.
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} options - (optional) a title for the message
+   * @returns {any} A promise that is resolved when 'Ok' is pressed
+   * @url http://www.espruino.com/Reference#l_E_showAlert
+   */
+  static showAlert(message?: string, options?: string): Promise<void>;
+
+  /**
+   * Called when a notification arrives on an Apple iOS device Bangle.js is connected
+   * to
+   * ```
+   * {
+   * event:"add",
+   * uid:42,
+   * category:4,
+   * categoryCnt:42,
+   * silent:true,
+   * important:false,
+   * preExisting:true,
+   * positive:false,
+   * negative:true
+   * }
+   * ```
+   * You can then get more information with something like:
+   * ```
+   * NRF.ancsGetNotificationInfo( event.uid ).then(a=>print("Notify",E.toJS(a)));
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(info: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `info` An object (see below)
+   * @url http://www.espruino.com/Reference#l_E_ANCS
+   */
+  static on(event: "ANCS", callback: (info: any) => void): void;
+
+  /**
+   * Called when a media event arrives on an Apple iOS device Bangle.js is connected
+   * to
+   * ```
+   * {
+   * id : "artist"/"album"/"title"/"duration",
+   * value : "Some text",
+   * truncated : bool // the 'value' was too big to be sent completely
+   * }
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(info: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `info` An object (see below)
+   * @url http://www.espruino.com/Reference#l_E_AMS
+   */
+  static on(event: "AMS", callback: (info: any) => void): void;
+
+  /**
+   * Display a menu on the screen, and set up the buttons to navigate through it.
+   * Supply an object containing menu items. When an item is selected, the function
+   * it references will be executed. For example:
+   * ```
+   * var boolean = false;
+   * var number = 50;
+   * // First menu
+   * var mainmenu = {
+   *   "" : { title : "-- Main Menu --" }, // options
+   *   "LED On" : function() { LED1.set(); },
+   *   "LED Off" : function() { LED1.reset(); },
+   *   "Submenu" : function() { E.showMenu(submenu); },
+   *   "A Boolean" : {
+   *     value : boolean,
+   *     format : v => v?"On":"Off",
+   *     onchange : v => { boolean=v; }
+   *   },
+   *   "A Number" : {
+   *     value : number,
+   *     min:0,max:100,step:10,
+   *     onchange : v => { number=v; }
+   *   },
+   *   "Exit" : function() { E.showMenu(); }, // remove the menu
+   * };
+   * // Submenu
+   * var submenu = {
+   *   "" : { title : "-- SubMenu --",
+   *          back : function() { E.showMenu(mainmenu); } },
+   *   "One" : undefined, // do nothing
+   *   "Two" : undefined // do nothing
+   * };
+   * // Actually display the menu
+   * E.showMenu(mainmenu);
+   * ```
+   * The menu will stay onscreen and active until explicitly removed, which you can
+   * do by calling `E.showMenu()` without arguments.
+   * See http://www.espruino.com/graphical_menu for more detailed information.
+   * On Bangle.js there are a few additions over the standard `graphical_menu`:
+   * * The options object can contain:
+   *   * `back : function() { }` - add a 'back' button, with the function called when
+   *     it is pressed
+   *   * (Bangle.js 2) `scroll : int` - an integer specifying how much the initial
+   *     menu should be scrolled by
+   * * The object returned by `E.showMenu` contains:
+   *   * (Bangle.js 2) `scroller` - the object returned by `E.showScroller` -
+   *     `scroller.scroll` returns the amount the menu is currently scrolled by
+   * * In the object specified for editable numbers:
+   *   * (Bangle.js 2) the `format` function is called with `format(value)` in the
+   *     main menu, `format(value,1)` when in a scrollable list, or `format(value,2)`
+   *     when in a popup window.
+   * You can also specify menu items as an array (rather than an Object). This can be
+   * useful if you have menu items with the same title, or you want to `push` menu
+   * items onto an array:
+   * ```
+   * var menu = [
+   *   { title:"Something", onchange:function() { print("selected"); } },
+   *   { title:"On or Off", value:false, onchange: v => print(v) },
+   *   { title:"A Value", value:3, min:0, max:10, onchange: v => print(v) },
+   * ];
+   * menu[""] = { title:"Hello" };
+   * E.showMenu(menu);
+   * ```
+   *
+   * @param {any} menu - An object containing name->function mappings to to be used in a menu
+   * @returns {any} A menu object with `draw`, `move` and `select` functions
+   * @url http://www.espruino.com/Reference#l_E_showMenu
+   */
+  static showMenu(menu: Menu): MenuInstance;
+  static showMenu(): void;
+
+  /**
+   * A utility function for displaying a full screen message on the screen.
+   * Draws to the screen and returns immediately.
+   * ```
+   * E.showMessage("These are\nLots of\nLines","My Title")
+   * ```
+   * or to display an image as well as text:
+   * ```
+   * E.showMessage("Lots of text will wrap automatically",{
+   *   title:"Warning",
+   *   img:atob("FBQBAfgAf+Af/4P//D+fx/n+f5/v+f//n//5//+f//n////3//5/n+P//D//wf/4B/4AH4A=")
+   * })
+   * ```
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} options - (optional) a title for the message, or an object of options `{title:string, img:image_string}`
+   * @url http://www.espruino.com/Reference#l_E_showMessage
+   */
+  static showMessage(message: string, title?: string | { title?: string, img?: string }): void;
+
+  /**
+   * Displays a full screen prompt on the screen, with the buttons requested (or
+   * `Yes` and `No` for defaults).
+   * When the button is pressed the promise is resolved with the requested values
+   * (for the `Yes` and `No` defaults, `true` and `false` are returned).
+   * ```
+   * E.showPrompt("Do you like fish?").then(function(v) {
+   *   if (v) print("'Yes' chosen");
+   *   else print("'No' chosen");
+   * });
+   * // Or
+   * E.showPrompt("How many fish\ndo you like?",{
+   *   title:"Fish",
+   *   buttons : {"One":1,"Two":2,"Three":3}
+   * }).then(function(v) {
+   *   print("You like "+v+" fish");
+   * });
+   * // Or
+   * E.showPrompt("Continue?", {
+   *   title:"Alert",
+   *   img:atob("FBQBAfgAf+Af/4P//D+fx/n+f5/v+f//n//5//+f//n////3//5/n+P//D//wf/4B/4AH4A=")}).then(function(v) {
+   *   if (v) print("'Yes' chosen");
+   *   else print("'No' chosen");
+   * });
+   * ```
+   * To remove the prompt, call `E.showPrompt()` with no arguments.
+   * The second `options` argument can contain:
+   * ```
+   * {
+   *   title: "Hello",                       // optional Title
+   *   buttons : {"Ok":true,"Cancel":false}, // optional list of button text & return value
+   *   img: "image_string"                   // optional image string to draw
+   * }
+   * ```
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} options - (optional) an object of options (see below)
+   * @returns {any} A promise that is resolved when 'Ok' is pressed
+   * @url http://www.espruino.com/Reference#l_E_showPrompt
+   */
+  static showPrompt<T = boolean>(message: string, options?: { title?: string, buttons?: { [key: string]: T } }): Promise<T>;
+  static showPrompt(): void;
+
+  /**
+   * Display a scrollable menu on the screen, and set up the buttons/touchscreen to
+   * navigate through it and select items.
+   * Supply an object containing:
+   * ```
+   * {
+   *   h : 24, // height of each menu item in pixels
+   *   c : 10, // number of menu items
+   *   // a function to draw a menu item
+   *   draw : function(idx, rect) { ... }
+   *   // a function to call when the item is selected
+   *   select : function(idx) { ... }
+   *   // optional function to be called when 'back' is tapped
+   *   back : function() { ...}
+   * }
+   * ```
+   * For example to display a list of numbers:
+   * ```
+   * E.showScroller({
+   *   h : 40, c : 8,
+   *   draw : (idx, r) => {
+   *     g.setBgColor((idx&1)?"#666":"#999").clearRect(r.x,r.y,r.x+r.w-1,r.y+r.h-1);
+   *     g.setFont("6x8:2").drawString("Item Number\n"+idx,r.x+10,r.y+4);
+   *   },
+   *   select : (idx) => console.log("You selected ", idx)
+   * });
+   * ```
+   * To remove the scroller, just call `E.showScroller()`
+   *
+   * @param {any} options - An object containing `{ h, c, draw, select }` (see below)
+   * @returns {any} A menu object with `draw()` and `drawItem(itemNo)` functions
+   * @url http://www.espruino.com/Reference#l_E_showScroller
+   */
+  static showScroller(options?: { h: number, c: number, draw: (idx: number, rect: { x: number, y: number, w: number, h: number }) => void, select: (idx: number) => void, back?: () => void }): { draw: () => void, drawItem: (itemNo: number) => void };
+  static showScroller(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showMenu
+   */
+  static showMenu(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showMenu
+   */
+  static showMenu(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showPrompt
+   */
+  static showPrompt(): void;
+
+  /**
+   * @url http://www.espruino.com/Reference#l_E_showScroller
+   */
+  static showScroller(): void;
+
+  /**
+   * Displays a full screen prompt on the screen, with a single 'Ok' button.
+   * When the button is pressed the promise is resolved.
+   * ```
+   * E.showAlert("Hello").then(function() {
+   *   print("Ok pressed");
+   * });
+   * // or
+   * E.showAlert("These are\nLots of\nLines","My Title").then(function() {
+   *   print("Ok pressed");
+   * });
+   * ```
+   * To remove the window, call `E.showAlert()` with no arguments.
+   *
+   * @param {any} message - A message to display. Can include newlines
+   * @param {any} options - (optional) a title for the message
+   * @returns {any} A promise that is resolved when 'Ok' is pressed
+   * @url http://www.espruino.com/Reference#l_E_showAlert
+   */
+  static showAlert(message?: string, options?: string): Promise<void>;
+
+  /**
+   * This event is called right after the board starts up, and has a similar effect
+   * to creating a function called `onInit`.
+   * For example to write `"Hello World"` every time Espruino starts, use:
+   * ```
+   * E.on('init', function() {
+   *   console.log("Hello World!");
+   * });
+   * ```
+   * **Note:** that subsequent calls to `E.on('init', ` will **add** a new handler,
+   * rather than replacing the last one. This allows you to write modular code -
+   * something that was not possible with `onInit`.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_E_init
+   */
+  static on(event: "init", callback: () => void): void;
+
+  /**
+   * This event is called just before the device shuts down for commands such as
+   * `reset()`, `load()`, `save()`, `E.reboot()` or `Bangle.off()`
+   * For example to write `"Bye!"` just before shutting down use:
+   * ```
+   * E.on('kill', function() {
+   *   console.log("Bye!");
+   * });
+   * ```
+   * **NOTE:** This event is not called when the device is 'hard reset' - for example
+   * by removing power, hitting an actual reset button, or via a Watchdog timer
+   * reset.
+   * @param {string} event - The event to listen to.
+   * @param {() => void} callback - A function that is executed when the event occurs.
+   * @url http://www.espruino.com/Reference#l_E_kill
+   */
+  static on(event: "kill", callback: () => void): void;
+
+  /**
+   * This event is called when an error is created by Espruino itself (rather than JS
+   * code) which changes the state of the error flags reported by `E.getErrorFlags()`
+   * This could be low memory, full buffers, UART overflow, etc. `E.getErrorFlags()`
+   * has a full description of each type of error.
+   * This event will only be emitted when error flag is set. If the error flag was
+   * already set nothing will be emitted. To clear error flags so that you do get a
+   * callback each time a flag is set, call `E.getErrorFlags()`.
+   * @param {string} event - The event to listen to.
+   * @param {(errorFlags: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `errorFlags` An array of new error flags, as would be returned by `E.getErrorFlags()`. Error flags that were present before won't be reported.
+   * @url http://www.espruino.com/Reference#l_E_errorFlag
+   */
+  static on(event: "errorFlag", callback: (errorFlags: ErrorFlag[]) => void): void;
+
+  /**
+   * This event is called when a full touchscreen device on an Espruino is interacted
+   * with.
+   * **Note:** This event is not implemented on Bangle.js because it only has a two
+   * area touchscreen.
+   * To use the touchscreen to draw lines, you could do:
+   * ```
+   * var last;
+   * E.on('touch',t=>{
+   *   if (last) g.lineTo(t.x, t.y);
+   *   else g.moveTo(t.x, t.y);
+   *   last = t.b;
+   * });
+   * ```
+   * @param {string} event - The event to listen to.
+   * @param {(x: number, y: number, b: number) => void} callback - A function that is executed when the event occurs. Its arguments are:
+   * * `x` X coordinate in display coordinates
+   * * `y` Y coordinate in display coordinates
+   * * `b` Touch count - 0 for released, 1 for pressed
+   * @url http://www.espruino.com/Reference#l_E_touch
+   */
+  static on(event: "touch", callback: (x: number, y: number, b: number) => void): void;
+
+  /**
+   * Use the microcontroller's internal thermistor to work out the temperature.
+   * On Puck.js v2.0 this will use the on-board PCT2075TP temperature sensor, but on
+   * other devices it may not be desperately well calibrated.
+   * While this is implemented on Espruino boards, it may not be implemented on other
+   * devices. If so it'll return NaN.
+   *  **Note:** This is not entirely accurate and varies by a few degrees from chip
+   *  to chip. It measures the **die temperature**, so when connected to USB it could
+   *  be reading 10 over degrees C above ambient temperature. When running from
+   *  battery with `setDeepSleep(true)` it is much more accurate though.
+   * @returns {number} The temperature in degrees C
+   * @url http://www.espruino.com/Reference#l_E_getTemperature
+   */
+  static getTemperature(): number;
+
+  /**
+   * Check the internal voltage reference. To work out an actual voltage of an input
+   * pin, you can use `analogRead(pin)*E.getAnalogVRef()`
+   *  **Note:** This value is calculated by reading the voltage on an internal
+   * voltage reference with the ADC. It will be slightly noisy, so if you need this
+   * for accurate measurements we'd recommend that you call this function several
+   * times and average the results.
+   * While this is implemented on Espruino boards, it may not be implemented on other
+   * devices. If so it'll return NaN.
+   * @returns {number} The voltage (in Volts) that a reading of 1 from `analogRead` actually represents - usually around 3.3v
+   * @url http://www.espruino.com/Reference#l_E_getAnalogVRef
+   */
+  static getAnalogVRef(): number;
+
+  /**
+   * ADVANCED: This is a great way to crash Espruino if you're not sure what you are
+   * doing
+   * Create a native function that executes the code at the given address, e.g.
+   * `E.nativeCall(0x08012345,'double (double,double)')(1.1, 2.2)`
+   * If you're executing a thumb function, you'll almost certainly need to set the
+   * bottom bit of the address to 1.
+   * Note it's not guaranteed that the call signature you provide can be used - there
+   * are limits on the number of arguments allowed.
+   * When supplying `data`, if it is a 'flat string' then it will be used directly,
+   * otherwise it'll be converted to a flat string and used.
+   *
+   * @param {number} addr - The address in memory of the function (or offset in `data` if it was supplied
+   * @param {any} sig - The signature of the call, `returnType (arg1,arg2,...)`. Allowed types are `void`,`bool`,`int`,`double`,`Pin`,`JsVar`
+   * @param {any} data - (Optional) A string containing the function itself. If not supplied then 'addr' is used as an absolute address.
+   * @returns {any} The native function
+   * @url http://www.espruino.com/Reference#l_E_nativeCall
+   */
+  static nativeCall(addr: number, sig: string, data?: string): any;
+
+  /**
+   * Clip a number to be between min and max (inclusive)
+   *
+   * @param {number} x - A floating point value to clip
+   * @param {number} min - The smallest the value should be
+   * @param {number} max - The largest the value should be
+   * @returns {number} The value of x, clipped so as not to be below min or above max.
+   * @url http://www.espruino.com/Reference#l_E_clip
+   */
+  static clip(x: number, min: number, max: number): number;
+
+  /**
+   * Sum the contents of the given Array, String or ArrayBuffer and return the result
+   *
+   * @param {any} arr - The array to sum
+   * @returns {number} The sum of the given buffer
+   * @url http://www.espruino.com/Reference#l_E_sum
+   */
+  static sum(arr: string | number[] | ArrayBuffer): number;
+
+  /**
+   * Work out the variance of the contents of the given Array, String or ArrayBuffer
+   * and return the result. This is equivalent to `v=0;for (i in arr)
+   * v+=Math.pow(mean-arr[i],2)`
+   *
+   * @param {any} arr - The array to work out the variance for
+   * @param {number} mean - The mean value of the array
+   * @returns {number} The variance of the given buffer
+   * @url http://www.espruino.com/Reference#l_E_variance
+   */
+  static variance(arr: string | number[] | ArrayBuffer, mean: number): number;
+
+  /**
+   * Convolve arr1 with arr2. This is equivalent to `v=0;for (i in arr1) v+=arr1[i] *
+   * arr2[(i+offset) % arr2.length]`
+   *
+   * @param {any} arr1 - An array to convolve
+   * @param {any} arr2 - An array to convolve
+   * @param {number} offset - The mean value of the array
+   * @returns {number} The variance of the given buffer
+   * @url http://www.espruino.com/Reference#l_E_convolve
+   */
+  static convolve(arr1: string | number[] | ArrayBuffer, arr2: string | number[] | ArrayBuffer, offset: number): number;
+
+  /**
+   * Performs a Fast Fourier Transform (FFT) in 32 bit floats on the supplied data
+   * and writes it back into the original arrays. Note that if only one array is
+   * supplied, the data written back is the modulus of the complex result
+   * `sqrt(r*r+i*i)`.
+   * In order to perform the FFT, there has to be enough room on the stack to
+   * allocate two arrays of 32 bit floating point numbers - this will limit the
+   * maximum size of FFT possible to around 1024 items on most platforms.
+   * **Note:** on the Original Espruino board, FFTs are performed in 64bit arithmetic
+   * as there isn't space to include the 32 bit maths routines (2x more RAM is
+   * required).
+   *
+   * @param {any} arrReal - An array of real values
+   * @param {any} arrImage - An array of imaginary values (or if undefined, all values will be taken to be 0)
+   * @param {boolean} inverse - Set this to true if you want an inverse FFT - otherwise leave as 0
+   * @url http://www.espruino.com/Reference#l_E_FFT
+   */
+  static FFT(arrReal: string | number[] | ArrayBuffer, arrImage?: string | number[] | ArrayBuffer, inverse?: boolean): any;
+
+  /**
+   * Enable the watchdog timer. This will reset Espruino if it isn't able to return
+   * to the idle loop within the timeout.
+   * If `isAuto` is false, you must call `E.kickWatchdog()` yourself every so often
+   * or the chip will reset.
+   * ```
+   * E.enableWatchdog(0.5); // automatic mode
+   * while(1); // Espruino will reboot because it has not been idle for 0.5 sec
+   * ```
+   * ```
+   * E.enableWatchdog(1, false);
+   * setInterval(function() {
+   *   if (everything_ok)
+   *     E.kickWatchdog();
+   * }, 500);
+   * // Espruino will now reset if everything_ok is false,
+   * // or if the interval fails to be called
+   * ```
+   * **NOTE:** This is only implemented on STM32 and nRF5x devices (all official
+   * Espruino boards).
+   * **NOTE:** On STM32 (Pico, WiFi, Original) with `setDeepSleep(1)` you need to
+   * explicitly wake Espruino up with an interval of less than the watchdog timeout
+   * or the watchdog will fire and the board will reboot. You can do this with
+   * `setInterval("", time_in_milliseconds)`.
+   *
+   * @param {number} timeout - The timeout in seconds before a watchdog reset
+   * @param {any} isAuto - If undefined or true, the watchdog is kicked automatically. If not, you must call `E.kickWatchdog()` yourself
+   * @url http://www.espruino.com/Reference#l_E_enableWatchdog
+   */
+  static enableWatchdog(timeout: number, isAuto?: boolean): void;
+
+  /**
+   * Kicks a Watchdog timer set up with `E.enableWatchdog(..., false)`. See
+   * `E.enableWatchdog` for more information.
+   * **NOTE:** This is only implemented on STM32 and nRF5x devices (all official
+   * Espruino boards).
+   * @url http://www.espruino.com/Reference#l_E_kickWatchdog
+   */
+  static kickWatchdog(): void;
+
+  /**
+   * Get and reset the error flags. Returns an array that can contain:
+   * `'FIFO_FULL'`: The receive FIFO filled up and data was lost. This could be state
+   * transitions for setWatch, or received characters.
+   * `'BUFFER_FULL'`: A buffer for a stream filled up and characters were lost. This
+   * can happen to any stream - Serial,HTTP,etc.
+   * `'CALLBACK'`: A callback (`setWatch`, `setInterval`, `on('data',...)`) caused an
+   * error and so was removed.
+   * `'LOW_MEMORY'`: Memory is running low - Espruino had to run a garbage collection
+   * pass or remove some of the command history
+   * `'MEMORY'`: Espruino ran out of memory and was unable to allocate some data that
+   * it needed.
+   * `'UART_OVERFLOW'` : A UART received data but it was not read in time and was
+   * lost
+   * @returns {any} An array of error flags
+   * @url http://www.espruino.com/Reference#l_E_getErrorFlags
+   */
+  static getErrorFlags(): ErrorFlag[]
+
+  /**
+   * Get Espruino's interpreter flags that control the way it handles your JavaScript
+   * code.
+   * * `deepSleep` - Allow deep sleep modes (also set by setDeepSleep)
+   * * `pretokenise` - When adding functions, pre-minify them and tokenise reserved
+   *   words
+   * * `unsafeFlash` - Some platforms stop writes/erases to interpreter memory to
+   *   stop you bricking the device accidentally - this removes that protection
+   * * `unsyncFiles` - When writing files, *don't* flush all data to the SD card
+   *   after each command (the default is *to* flush). This is much faster, but can
+   *   cause filesystem damage if power is lost without the filesystem unmounted.
+   * @returns {any} An object containing flag names and their values
+   * @url http://www.espruino.com/Reference#l_E_getFlags
+   */
+  static getFlags(): { [key in Flag]: boolean }
+
+  /**
+   * Set the Espruino interpreter flags that control the way it handles your
+   * JavaScript code.
+   * Run `E.getFlags()` and check its description for a list of available flags and
+   * their values.
+   *
+   * @param {any} flags - An object containing flag names and boolean values. You need only specify the flags that you want to change.
+   * @url http://www.espruino.com/Reference#l_E_setFlags
+   */
+  static setFlags(flags: { [key in Flag]?: boolean }): void
+
+  /**
+   *
+   * @param {any} source - The source file/stream that will send content.
+   * @param {any} destination - The destination file/stream that will receive content from the source.
+   * @param {any} options
+   * An optional object `{ chunkSize : int=64, end : bool=true, complete : function }`
+   * chunkSize : The amount of data to pipe from source to destination at a time
+   * complete : a function to call when the pipe activity is complete
+   * end : call the 'end' function on the destination when the source is finished
+   * @url http://www.espruino.com/Reference#l_E_pipe
+   */
+  static pipe(source: any, destination: any, options?: { chunkSize?: number, end?: boolean, complete?: () => void }): void
+
+  /**
+   * Create an ArrayBuffer from the given string. This is done via a reference, not a
+   * copy - so it is very fast and memory efficient.
+   * Note that this is an ArrayBuffer, not a Uint8Array. To get one of those, do:
+   * `new Uint8Array(E.toArrayBuffer('....'))`.
+   *
+   * @param {any} str - The string to convert to an ArrayBuffer
+   * @returns {any} An ArrayBuffer that uses the given string
+   * @url http://www.espruino.com/Reference#l_E_toArrayBuffer
+   */
+  static toArrayBuffer(str: string): ArrayBuffer;
+
+  /**
+   * Returns a 'flat' string representing the data in the arguments, or return
+   * `undefined` if a flat string cannot be created.
+   * This creates a string from the given arguments. If an argument is a String or an
+   * Array, each element is traversed and added as an 8 bit character. If it is
+   * anything else, it is converted to a character directly.
+   * In the case where there's one argument which is an 8 bit typed array backed by a
+   * flat string of the same length, the backing string will be returned without
+   * doing a copy or other allocation. The same applies if there's a single argument
+   * which is itself a flat string.
+   *
+   * @param {any} args - The arguments to convert to a String
+   * @returns {any} A String (or `undefined` if a Flat String cannot be created)
+   * @url http://www.espruino.com/Reference#l_E_toString
+   */
+  static toString(...args: any[]): string | undefined;
+
+  /**
+   * This creates a Uint8Array from the given arguments. These are handled as
+   * follows:
+   *  * `Number` -> read as an integer, using the lowest 8 bits
+   *  * `String` -> use each character's numeric value (e.g.
+   *    `String.charCodeAt(...)`)
+   *  * `Array` -> Call itself on each element
+   *  * `ArrayBuffer` or Typed Array -> use the lowest 8 bits of each element
+   *  * `Object`:
+   *    * `{data:..., count: int}` -> call itself `object.count` times, on
+   *      `object.data`
+   *    * `{callback : function}` -> call the given function, call itself on return
+   *      value
+   * For example:
+   * ```
+   * E.toUint8Array([1,2,3])
+   * =new Uint8Array([1, 2, 3])
+   * E.toUint8Array([1,{data:2,count:3},3])
+   * =new Uint8Array([1, 2, 2, 2, 3])
+   * E.toUint8Array("Hello")
+   * =new Uint8Array([72, 101, 108, 108, 111])
+   * E.toUint8Array(["hi",{callback:function() { return [1,2,3] }}])
+   * =new Uint8Array([104, 105, 1, 2, 3])
+   * ```
+   *
+   * @param {any} args - The arguments to convert to a Uint8Array
+   * @returns {any} A Uint8Array
+   * @url http://www.espruino.com/Reference#l_E_toUint8Array
+   */
+  static toUint8Array(...args: Uint8ArrayResolvable[]): Uint8Array;
+
+  /**
+   * This performs the same basic function as `JSON.stringify`, however
+   * `JSON.stringify` adds extra characters to conform to the JSON spec which aren't
+   * required if outputting JS.
+   * `E.toJS` will also stringify JS functions, whereas `JSON.stringify` ignores
+   * them.
+   * For example:
+   * * `JSON.stringify({a:1,b:2}) == '{"a":1,"b":2}'`
+   * * `E.toJS({a:1,b:2}) == '{a:1,b:2}'`
+   * **Note:** Strings generated with `E.toJS` can't be reliably parsed by
+   * `JSON.parse` - however they are valid JS so will work with `eval` (but this has
+   * security implications if you don't trust the source of the string).
+   * On the desktop [JSON5 parsers](https://github.com/json5/json5) will parse the
+   * strings produced by `E.toJS` without trouble.
+   *
+   * @param {any} arg - The JS variable to convert to a string
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_E_toJS
+   */
+  static toJS(arg: any): string;
+
+  /**
+   * This creates and returns a special type of string, which actually references a
+   * specific memory address. It can be used in order to use sections of Flash memory
+   * directly in Espruino (for example to execute code straight from flash memory
+   * with `eval(E.memoryArea( ... ))`)
+   * **Note:** This is only tested on STM32-based platforms (Espruino Original and
+   * Espruino Pico) at the moment.
+   *
+   * @param {number} addr - The address of the memory area
+   * @param {number} len - The length (in bytes) of the memory area
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_E_memoryArea
+   */
+  static memoryArea(addr: number, len: number): string;
+
+  /**
+   * This writes JavaScript code into Espruino's flash memory, to be executed on
+   * startup. It differs from `save()` in that `save()` saves the whole state of the
+   * interpreter, whereas this just saves JS code that is executed at boot.
+   * Code will be executed before `onInit()` and `E.on('init', ...)`.
+   * If `alwaysExec` is `true`, the code will be executed even after a call to
+   * `reset()`. This is useful if you're making something that you want to program,
+   * but you want some code that is always built in (for instance setting up a
+   * display or keyboard).
+   * To remove boot code that has been saved previously, use `E.setBootCode("")`
+   * **Note:** this removes any code that was previously saved with `save()`
+   *
+   * @param {any} code - The code to execute (as a string)
+   * @param {boolean} alwaysExec - Whether to always execute the code (even after a reset)
+   * @url http://www.espruino.com/Reference#l_E_setBootCode
+   */
+  static setBootCode(code: string, alwaysExec?: boolean): void;
+
+  /**
+   * This sets the clock frequency of Espruino's processor. It will return `0` if it
+   * is unimplemented or the clock speed cannot be changed.
+   * **Note:** On pretty much all boards, UART, SPI, I2C, PWM, etc will change
+   * frequency and will need setting up again in order to work.
+   * ### STM32F4
+   * Options is of the form `{ M: int, N: int, P: int, Q: int }` - see the 'Clocks'
+   * section of the microcontroller's reference manual for what these mean.
+   * * System clock = 8Mhz * N / ( M * P )
+   * * USB clock (should be 48Mhz) = 8Mhz * N / ( M * Q )
+   * Optional arguments are:
+   * * `latency` - flash latency from 0..15
+   * * `PCLK1` - Peripheral clock 1 divisor (default: 2)
+   * * `PCLK2` - Peripheral clock 2 divisor (default: 4)
+   * The Pico's default is `{M:8, N:336, P:4, Q:7, PCLK1:2, PCLK2:4}`, use `{M:8,
+   * N:336, P:8, Q:7, PCLK:1, PCLK2:2}` to halve the system clock speed while keeping
+   * the peripherals running at the same speed (omitting PCLK1/2 will lead to the
+   * peripherals changing speed too).
+   * On STM32F4 boards (e.g. Espruino Pico), the USB clock needs to be kept at 48Mhz
+   * or USB will fail to work. You'll also experience USB instability if the
+   * processor clock falls much below 48Mhz.
+   * ### ESP8266
+   * Just specify an integer value, either 80 or 160 (for 80 or 160Mhz)
+   *
+   * @param {any} options - Platform-specific options for setting clock speed
+   * @returns {number} The actual frequency the clock has been set to
+   * @url http://www.espruino.com/Reference#l_E_setClock
+   */
+  static setClock(options: number | { M: number, N: number, P: number, Q: number, latency?: number, PCLK?: number, PCLK2?: number }): number;
+
+  /**
+   * Changes the device that the JS console (otherwise known as the REPL) is attached
+   * to. If the console is on a device, that device can be used for programming
+   * Espruino.
+   * Rather than calling `Serial.setConsole` you can call
+   * `E.setConsole("DeviceName")`.
+   * This is particularly useful if you just want to remove the console.
+   * `E.setConsole(null)` will make the console completely inaccessible.
+   * `device` may be `"Serial1"`,`"USB"`,`"Bluetooth"`,`"Telnet"`,`"Terminal"`, any
+   * other *hardware* `Serial` device, or `null` to disable the console completely.
+   * `options` is of the form:
+   * ```
+   * {
+   *   force : bool // default false, force the console onto this device so it does not move
+   *                //   if false, changes in connection state (e.g. USB/Bluetooth) can move
+   *                //   the console automatically.
+   * }
+   * ```
+   *
+   * @param {any} device
+   * @param {any} options - (optional) object of options, see below
+   * @url http://www.espruino.com/Reference#l_E_setConsole
+   */
+  static setConsole(device: "Serial1" | "USB" | "Bluetooth" | "Telnet" | "Terminal" | Serial | null, options?: { force?: boolean }): void;
+
+  /**
+   * Returns the current console device - see `E.setConsole` for more information.
+   * @returns {any} The current console device as a string, or just `null` if the console is null
+   * @url http://www.espruino.com/Reference#l_E_getConsole
+   */
+  static getConsole(): string | null
+
+  /**
+   * Reverse the 8 bits in a byte, swapping MSB and LSB.
+   * For example, `E.reverseByte(0b10010000) == 0b00001001`.
+   * Note that you can reverse all the bytes in an array with: `arr =
+   * arr.map(E.reverseByte)`
+   *
+   * @param {number} x - A byte value to reverse the bits of
+   * @returns {number} The byte with reversed bits
+   * @url http://www.espruino.com/Reference#l_E_reverseByte
+   */
+  static reverseByte(x: number): number;
+
+  /**
+   * Output the current list of Utility Timer Tasks - for debugging only
+   * @url http://www.espruino.com/Reference#l_E_dumpTimers
+   */
+  static dumpTimers(): void;
+
+  /**
+   * Dump any locked variables that aren't referenced from `global` - for debugging
+   * memory leaks only.
+   * @url http://www.espruino.com/Reference#l_E_dumpLockedVars
+   */
+  static dumpLockedVars(): void;
+
+  /**
+   * Dump any locked variables that aren't referenced from `global` - for debugging
+   * memory leaks only.
+   * @url http://www.espruino.com/Reference#l_E_dumpFreeList
+   */
+  static dumpFreeList(): void;
+
+  /**
+   * Show fragmentation.
+   * * ` ` is free space
+   * * `#` is a normal variable
+   * * `L` is a locked variable (address used, cannot be moved)
+   * * `=` represents data in a Flat String (must be contiguous)
+   * @url http://www.espruino.com/Reference#l_E_dumpFragmentation
+   */
+  static dumpFragmentation(): void;
+
+  /**
+   * Dumps a comma-separated list of all allocated variables along with the variables
+   * they link to. Can be used to visualise where memory is used.
+   * @url http://www.espruino.com/Reference#l_E_dumpVariables
+   */
+  static dumpVariables(): void;
+
+  /**
+   * BETA: defragment memory!
+   * @url http://www.espruino.com/Reference#l_E_defrag
+   */
+  static defrag(): void;
+
+  /**
+   * Return the number of variable blocks used by the supplied variable. This is
+   * useful if you're running out of memory and you want to be able to see what is
+   * taking up most of the available space.
+   * If `depth>0` and the variable can be recursed into, an array listing all
+   * property names (including internal Espruino names) and their sizes is returned.
+   * If `depth>1` there is also a `more` field that inspects the objects' children's
+   * children.
+   * For instance `E.getSizeOf(function(a,b) { })` returns `5`.
+   * But `E.getSizeOf(function(a,b) { }, 1)` returns:
+   * ```
+   *  [
+   *   {
+   *     "name": "a",
+   *     "size": 1 },
+   *   {
+   *     "name": "b",
+   *     "size": 1 },
+   *   {
+   *     "name": "\xFFcod",
+   *     "size": 2 }
+   *  ]
+   * ```
+   * In this case setting depth to `2` will make no difference as there are no more
+   * children to traverse.
+   * See http://www.espruino.com/Internals for more information
+   *
+   * @param {any} v - A variable to get the size of
+   * @param {number} depth - The depth that detail should be provided for. If depth<=0 or undefined, a single integer will be returned
+   * @returns {any} Information about the variable size - see below
+   * @url http://www.espruino.com/Reference#l_E_getSizeOf
+   */
+  static getSizeOf(v: any, depth?: 0): number;
+  static getSizeOf(v: any, depth: number): VariableSizeInformation;
+
+  /**
+   * Return the address in memory of the given variable. This can then be used with
+   * `peek` and `poke` functions. However, changing data in JS variables directly
+   * (flatAddress=false) will most likely result in a crash.
+   * This functions exists to allow embedded targets to set up peripherals such as
+   * DMA so that they write directly to JS variables.
+   * See http://www.espruino.com/Internals for more information
+   *
+   * @param {any} v - A variable to get the address of
+   * @param {boolean} flatAddress - (boolean) If `true` and a Flat String or Flat ArrayBuffer is supplied, return the address of the data inside it - otherwise 0. If `false` (the default) return the address of the JsVar itself.
+   * @returns {number} The address of the given variable
+   * @url http://www.espruino.com/Reference#l_E_getAddressOf
+   */
+  static getAddressOf(v: any, flatAddress: boolean): number;
+
+  /**
+   * Take each element of the `from` array, look it up in `map` (or call
+   * `map(value,index)` if it is a function), and write it into the corresponding
+   * element in the `to` array.
+   * You can use an array to map:
+   * ```
+   * var a = new Uint8Array([1,2,3,1,2,3]);
+   * var lut = new Uint8Array([128,129,130,131]);
+   * E.mapInPlace(a, a, lut);
+   * // a = [129, 130, 131, 129, 130, 131]
+   * ```
+   * Or `undefined` to pass straight through, or a function to do a normal 'mapping':
+   * ```
+   * var a = new Uint8Array([0x12,0x34,0x56,0x78]);
+   * var b = new Uint8Array(8);
+   * E.mapInPlace(a, b, undefined); // straight through
+   * // b = [0x12,0x34,0x56,0x78,0,0,0,0]
+   * E.mapInPlace(a, b, (value,index)=>index); // write the index in the first 4 (because a.length==4)
+   * // b = [0,1,2,3,4,0,0,0]
+   * E.mapInPlace(a, b, undefined, 4); // 4 bits from 8 bit input -> 2x as many outputs, msb-first
+   * // b = [1, 2, 3, 4, 5, 6, 7, 8]
+   *  E.mapInPlace(a, b, undefined, -4); // 4 bits from 8 bit input -> 2x as many outputs, lsb-first
+   * // b = [2, 1, 4, 3, 6, 5, 8, 7]
+   * E.mapInPlace(a, b, a=>a+2, 4);
+   * // b = [3, 4, 5, 6, 7, 8, 9, 10]
+   * var b = new Uint16Array(4);
+   * E.mapInPlace(a, b, undefined, 12); // 12 bits from 8 bit input, msb-first
+   * // b = [0x123, 0x456, 0x780, 0]
+   * E.mapInPlace(a, b, undefined, -12); // 12 bits from 8 bit input, lsb-first
+   * // b = [0x412, 0x563, 0x078, 0]
+   * ```
+   *
+   * @param {any} from - An ArrayBuffer to read elements from
+   * @param {any} to - An ArrayBuffer to write elements too
+   * @param {any} map - An array or `function(value,index)` to use to map one element to another, or `undefined` to provide no mapping
+   * @param {number} bits - If specified, the number of bits per element (MSB first) - otherwise use a 1:1 mapping. If negative, use LSB first.
+   * @url http://www.espruino.com/Reference#l_E_mapInPlace
+   */
+  static mapInPlace(from: ArrayBuffer, to: ArrayBuffer, map?: number[] | ((value: number, index: number) => number) | undefined, bits?: number): void;
+
+  /**
+   * Search in an Object, Array, or Function
+   *
+   * @param {any} haystack - The Array/Object/Function to search
+   * @param {any} needle - The key to search for
+   * @param {boolean} returnKey - If true, return the key, else return the value itself
+   * @returns {any} The value in the Object matching 'needle', or if `returnKey==true` the key's name - or undefined
+   * @url http://www.espruino.com/Reference#l_E_lookupNoCase
+   */
+  static lookupNoCase(haystack: any[] | object | Function, needle: string, returnKey?: false): any;
+  static lookupNoCase<T>(haystack: any[] | object | Function, needle: T, returnKey: true): T | undefined;
+
+  /**
+   * Get the current interpreter state in a text form such that it can be copied to a
+   * new device
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_E_dumpStr
+   */
+  static dumpStr(): string;
+
+  /**
+   * Set the seed for the random number generator used by `Math.random()`.
+   *
+   * @param {number} v - The 32 bit integer seed to use for the random number generator
+   * @url http://www.espruino.com/Reference#l_E_srand
+   */
+  static srand(v: number): void;
+
+  /**
+   * Unlike 'Math.random()' which uses a pseudo-random number generator, this method
+   * reads from the internal voltage reference several times, XOR-ing and rotating to
+   * try and make a relatively random value from the noise in the signal.
+   * @returns {number} A random number
+   * @url http://www.espruino.com/Reference#l_E_hwRand
+   */
+  static hwRand(): number;
+
+  /**
+   * Perform a standard 32 bit CRC (Cyclic redundancy check) on the supplied data
+   * (one byte at a time) and return the result as an unsigned integer.
+   *
+   * @param {any} data - Iterable data to perform CRC32 on (each element treated as a byte)
+   * @returns {any} The CRC of the supplied data
+   * @url http://www.espruino.com/Reference#l_E_CRC32
+   */
+  static CRC32(data: any): any;
+
+  /**
+   * Convert hue, saturation and brightness to red, green and blue (packed into an
+   * integer if `asArray==false` or an array if `asArray==true`).
+   * This replaces `Graphics.setColorHSB` and `Graphics.setBgColorHSB`. On devices
+   * with 24 bit colour it can be used as: `Graphics.setColor(E.HSBtoRGB(h, s, b))`
+   * You can quickly set RGB items in an Array or Typed Array using
+   * `array.set(E.HSBtoRGB(h, s, b,true), offset)`, which can be useful with arrays
+   * used with `require("neopixel").write`.
+   *
+   * @param {number} hue - The hue, as a value between 0 and 1
+   * @param {number} sat - The saturation, as a value between 0 and 1
+   * @param {number} bri - The brightness, as a value between 0 and 1
+   * @param {boolean} asArray - If true, return an array of [R,G,B] values betwen 0 and 255
+   * @returns {any} A 24 bit number containing bytes representing red, green, and blue `0xBBGGRR`. Or if `asArray` is true, an array `[R,G,B]`
+   * @url http://www.espruino.com/Reference#l_E_HSBtoRGB
+   */
+  static HSBtoRGB(hue: number, sat: number, bri: number, asArray?: false): number;
+  static HSBtoRGB(hue: number, sat: number, bri: number, asArray: true): [number, number, number];
+
+  /**
+   * Set a password on the console (REPL). When powered on, Espruino will then demand
+   * a password before the console can be used. If you want to lock the console
+   * immediately after this you can call `E.lockConsole()`
+   * To remove the password, call this function with no arguments.
+   * **Note:** There is no protection against multiple password attempts, so someone
+   * could conceivably try every password in a dictionary.
+   * **Note:** This password is stored in memory in plain text. If someone is able to
+   * execute arbitrary JavaScript code on the device (e.g., you use `eval` on input
+   * from unknown sources) or read the device's firmware then they may be able to
+   * obtain it.
+   *
+   * @param {any} password - The password - max 20 chars
+   * @url http://www.espruino.com/Reference#l_E_setPassword
+   */
+  static setPassword(password: string): void;
+
+  /**
+   * If a password has been set with `E.setPassword()`, this will lock the console so
+   * the password needs to be entered to unlock it.
+   * @url http://www.espruino.com/Reference#l_E_lockConsole
+   */
+  static lockConsole(): void;
+
+  /**
+   * Set the time zone to be used with `Date` objects.
+   * For example `E.setTimeZone(1)` will be GMT+0100
+   * Note that `E.setTimeZone()` will have no effect when daylight savings time rules
+   * have been set with `E.setDST()`. The timezone value will be stored, but never
+   * used so long as DST settings are in effect.
+   * Time can be set with `setTime`.
+   *
+   * @param {number} zone - The time zone in hours
+   * @url http://www.espruino.com/Reference#l_E_setTimeZone
+   */
+  static setTimeZone(zone: number): void;
+
+  /**
+   * Set the daylight savings time parameters to be used with `Date` objects.
+   * The parameters are
+   * - dstOffset: The number of minutes daylight savings time adds to the clock
+   *   (usually 60) - set to 0 to disable DST
+   * - timezone: The time zone, in minutes, when DST is not in effect - positive east
+   *   of Greenwich
+   * - startDowNumber: The index of the day-of-week in the month when DST starts - 0
+   *   for first, 1 for second, 2 for third, 3 for fourth and 4 for last
+   * - startDow: The day-of-week for the DST start calculation - 0 for Sunday, 6 for
+   *   Saturday
+   * - startMonth: The number of the month that DST starts - 0 for January, 11 for
+   *   December
+   * - startDayOffset: The number of days between the selected day-of-week and the
+   *   actual day that DST starts - usually 0
+   * - startTimeOfDay: The number of minutes elapsed in the day before DST starts
+   * - endDowNumber: The index of the day-of-week in the month when DST ends - 0 for
+   *   first, 1 for second, 2 for third, 3 for fourth and 4 for last
+   * - endDow: The day-of-week for the DST end calculation - 0 for Sunday, 6 for
+   *   Saturday
+   * - endMonth: The number of the month that DST ends - 0 for January, 11 for
+   *   December
+   * - endDayOffset: The number of days between the selected day-of-week and the
+   *   actual day that DST ends - usually 0
+   * - endTimeOfDay: The number of minutes elapsed in the day before DST ends
+   * To determine what the `dowNumber, dow, month, dayOffset, timeOfDay` parameters
+   * should be, start with a sentence of the form "DST starts on the last Sunday of
+   * March (plus 0 days) at 03:00". Since it's the last Sunday, we have
+   * startDowNumber = 4, and since it's Sunday, we have startDow = 0. That it is
+   * March gives us startMonth = 2, and that the offset is zero days, we have
+   * startDayOffset = 0. The time that DST starts gives us startTimeOfDay = 3*60.
+   * "DST ends on the Friday before the second Sunday in November at 02:00" would
+   * give us endDowNumber=1, endDow=0, endMonth=10, endDayOffset=-2 and
+   * endTimeOfDay=120.
+   * Using Ukraine as an example, we have a time which is 2 hours ahead of GMT in
+   * winter (EET) and 3 hours in summer (EEST). DST starts at 03:00 EET on the last
+   * Sunday in March, and ends at 04:00 EEST on the last Sunday in October. So
+   * someone in Ukraine might call `E.setDST(60,120,4,0,2,0,180,4,0,9,0,240);`
+   * Note that when DST parameters are set (i.e. when `dstOffset` is not zero),
+   * `E.setTimeZone()` has no effect.
+   *
+   * @param {any} params - An array containing the settings for DST
+   * @url http://www.espruino.com/Reference#l_E_setDST
+   */
+  static setDST(dstOffset: number, timezone: number, startDowNumber: number, startDow: number, startMonth: number, startDayOffset: number, startTimeOfDay: number, endDowNumber: number, endDow: number, endMonth: number, endDayOffset: number, endTimeOfDay: number): void
+
+  /**
+   * Create an object where every field accesses a specific 32 bit address in the
+   * microcontroller's memory. This is perfect for accessing on-chip peripherals.
+   * ```
+   * // for NRF52 based chips
+   * var GPIO = E.memoryMap(0x50000000,{OUT:0x504, OUTSET:0x508, OUTCLR:0x50C, IN:0x510, DIR:0x514, DIRSET:0x518, DIRCLR:0x51C});
+   * GPIO.DIRSET = 1; // set GPIO0 to output
+   * GPIO.OUT ^= 1; // toggle the output state of GPIO0
+   * ```
+   *
+   * @param {any} baseAddress - The base address (added to every address in `registers`)
+   * @param {any} registers - An object containing `{name:address}`
+   * @returns {any} An object where each field is memory-mapped to a register.
+   * @url http://www.espruino.com/Reference#l_E_memoryMap
+   */
+  static memoryMap<T extends string>(baseAddress: number, registers: { [key in T]: number }): { [key in T]: number };
+
+  /**
+   * Provide assembly to Espruino.
+   * **This function is not part of Espruino**. Instead, it is detected by the
+   * Espruino IDE (or command-line tools) at upload time and is replaced with machine
+   * code and an `E.nativeCall` call.
+   * See [the documentation on the Assembler](http://www.espruino.com/Assembler) for
+   * more information.
+   *
+   * @param {any} callspec - The arguments this assembly takes - e.g. `void(int)`
+   * @param {any} assemblycode - One of more strings of assembler code
+   * @url http://www.espruino.com/Reference#l_E_asm
+   */
+  static asm(callspec: string, ...assemblycode: string[]): any;
+
+  /**
+   * Provides the ability to write C code inside your JavaScript file.
+   * **This function is not part of Espruino**. Instead, it is detected by the
+   * Espruino IDE (or command-line tools) at upload time, is sent to our web service
+   * to be compiled, and is replaced with machine code and an `E.nativeCall` call.
+   * See [the documentation on Inline C](http://www.espruino.com/InlineC) for more
+   * information and examples.
+   *
+   * @param {any} code - A Templated string of C code
+   * @url http://www.espruino.com/Reference#l_E_compiledC
+   */
+  static compiledC(code: string): any;
+
+  /**
+   * Forces a hard reboot of the microcontroller - as close as possible to if the
+   * reset pin had been toggled.
+   * **Note:** This is different to `reset()`, which performs a software reset of
+   * Espruino (resetting the interpreter and pin states, but not all the hardware)
+   * @url http://www.espruino.com/Reference#l_E_reboot
+   */
+  static reboot(): void;
+
+  /**
+   * USB HID will only take effect next time you unplug and re-plug your Espruino. If
+   * you're disconnecting it from power you'll have to make sure you have `save()`d
+   * after calling this function.
+   *
+   * @param {any} opts - An object containing at least reportDescriptor, an array representing the report descriptor. Pass undefined to disable HID.
+   * @url http://www.espruino.com/Reference#l_E_setUSBHID
+   */
+  static setUSBHID(opts?: { reportDescriptor: any[] }): void;
+
+  /**
+   *
+   * @param {any} data - An array of bytes to send as a USB HID packet
+   * @returns {boolean} 1 on success, 0 on failure
+   * @url http://www.espruino.com/Reference#l_E_sendUSBHID
+   */
+  static sendUSBHID(data: string | ArrayBuffer | number[]): boolean;
+
+  /**
+   * In devices that come with batteries, this function returns the battery charge
+   * percentage as an integer between 0 and 100.
+   * **Note:** this is an estimation only, based on battery voltage. The temperature
+   * of the battery (as well as the load being drawn from it at the time
+   * `E.getBattery` is called) will affect the readings.
+   * @returns {number} A percentage between 0 and 100
+   * @url http://www.espruino.com/Reference#l_E_getBattery
+   */
+  static getBattery(): number;
+
+  /**
+   * Sets the RTC's prescaler's maximum value. This is the counter that counts up on
+   * each oscillation of the low speed oscillator. When the prescaler counts to the
+   * value supplied, one second is deemed to have passed.
+   * By default this is set to the oscillator's average speed as specified in the
+   * datasheet, and usually that is fine. However on early [Espruino Pico](/Pico)
+   * boards the STM32F4's internal oscillator could vary by as much as 15% from the
+   * value in the datasheet. In that case you may want to alter this value to reflect
+   * the true RTC speed for more accurate timekeeping.
+   * To change the RTC's prescaler value to a computed value based on comparing
+   * against the high speed oscillator, just run the following command, making sure
+   * it's done a few seconds after the board starts up:
+   * ```
+   * E.setRTCPrescaler(E.getRTCPrescaler(true));
+   * ```
+   * When changing the RTC prescaler, the RTC 'follower' counters are reset and it
+   * can take a second or two before readings from getTime are stable again.
+   * To test, you can connect an input pin to a known frequency square wave and then
+   * use `setWatch`. If you don't have a frequency source handy, you can check
+   * against the high speed oscillator:
+   * ```
+   * // connect pin B3 to B4
+   * analogWrite(B3, 0.5, {freq:0.5});
+   * setWatch(function(e) {
+   *   print(e.time - e.lastTime);
+   * }, B4, {repeat:true});
+   * ```
+   * **Note:** This is only used on official Espruino boards containing an STM32
+   * microcontroller. Other boards (even those using an STM32) don't use the RTC and
+   * so this has no effect.
+   *
+   * @param {number} prescaler - The amount of counts for one second of the RTC - this is a 15 bit integer value (0..32767)
+   * @url http://www.espruino.com/Reference#l_E_setRTCPrescaler
+   */
+  static setRTCPrescaler(prescaler: number): void;
+
+  /**
+   * Gets the RTC's current prescaler value if `calibrate` is undefined or false.
+   * If `calibrate` is true, the low speed oscillator's speed is calibrated against
+   * the high speed oscillator (usually +/- 20 ppm) and a suggested value to be fed
+   * into `E.setRTCPrescaler(...)` is returned.
+   * See `E.setRTCPrescaler` for more information.
+   *
+   * @param {boolean} calibrate - If `false`, the current value. If `true`, the calculated 'correct' value
+   * @returns {number} The RTC prescaler's current value
+   * @url http://www.espruino.com/Reference#l_E_getRTCPrescaler
+   */
+  static getRTCPrescaler(calibrate: boolean): number;
+
+  /**
+   * Decode a UTF8 string.
+   * * Any decoded character less than 256 gets passed straight through
+   * * Otherwise if `lookup` is an array and an item with that char code exists in `lookup` then that is used
+   * * Otherwise if `lookup` is an object and an item with that char code (as lowercase hex) exists in `lookup` then that is used
+   * * Otherwise `replaceFn(charCode)` is called and the result used if `replaceFn` is a function
+   * * If `replaceFn` is a string, that is used
+   * * Or finally if nothing else matches, the character is ignored
+   * For instance:
+   * ```
+   * let unicodeRemap = {
+   *   0x20ac:"\u0080", // Euro symbol
+   *   0x2026:"\u0085", // Ellipsis
+   * };
+   * E.decodeUTF8("UTF-8 Euro: \u00e2\u0082\u00ac", unicodeRemap, '[?]') == "UTF-8 Euro: \u0080"
+   * ```
+   *
+   * @param {any} str - A string of UTF8-encoded data
+   * @param {any} lookup - An array containing a mapping of character code -> replacement string
+   * @param {any} replaceFn - If not in lookup, `replaceFn(charCode)` is called and the result used if it's a function, *or* if it's a string, the string value is used
+   * @returns {any} A string containing all UTF8 sequences flattened to 8 bits
+   * @url http://www.espruino.com/Reference#l_E_decodeUTF8
+   */
+  static decodeUTF8(str: string, lookup: string[], replaceFn: string | ((charCode: number) => string)): string;
+
+
+}
+
+interface consoleConstructor {
+  /**
+   * Print the supplied string(s) to the console
+   *  **Note:** If you're connected to a computer (not a wall adaptor) via USB but
+   *  **you are not running a terminal app** then when you print data Espruino may
+   *  pause execution and wait until the computer requests the data it is trying to
+   *  print.
+   *
+   * @param {any} text - One or more arguments to print
+   * @url http://www.espruino.com/Reference#l_console_log
+   */
+  log(...text: any[]): void;
+}
+
+interface console {
+
+}
+
+/**
+ * An Object that contains functions for writing to the interactive console
+ * @url http://www.espruino.com/Reference#console
+ */
+declare const console: consoleConstructor
+
+interface ErrorConstructor {
+  /**
+   * Creates an Error object
+   * @constructor
+   *
+   * @param {any} message - An optional message string
+   * @returns {any} An Error object
+   * @url http://www.espruino.com/Reference#l_Error_Error
+   */
+  new(message?: string): Error;
+}
+
+interface Error {
+  /**
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_Error_toString
+   */
+  toString(): string;
+}
+
+/**
+ * The base class for runtime errors
+ * @url http://www.espruino.com/Reference#Error
+ */
+declare const Error: ErrorConstructor
+
+interface SyntaxErrorConstructor {
+  /**
+   * Creates a SyntaxError object
+   * @constructor
+   *
+   * @param {any} message - An optional message string
+   * @returns {any} A SyntaxError object
+   * @url http://www.espruino.com/Reference#l_SyntaxError_SyntaxError
+   */
+  new(message?: string): SyntaxError;
+}
+
+interface SyntaxError {
+  /**
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_SyntaxError_toString
+   */
+  toString(): string;
+}
+
+/**
+ * The base class for syntax errors
+ * @url http://www.espruino.com/Reference#SyntaxError
+ */
+declare const SyntaxError: SyntaxErrorConstructor
+
+interface TypeErrorConstructor {
+  /**
+   * Creates a TypeError object
+   * @constructor
+   *
+   * @param {any} message - An optional message string
+   * @returns {any} A TypeError object
+   * @url http://www.espruino.com/Reference#l_TypeError_TypeError
+   */
+  new(message?: string): TypeError;
+}
+
+interface TypeError {
+  /**
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_TypeError_toString
+   */
+  toString(): string;
+}
+
+/**
+ * The base class for type errors
+ * @url http://www.espruino.com/Reference#TypeError
+ */
+declare const TypeError: TypeErrorConstructor
+
+/**
+ * The base class for internal errors
+ * @url http://www.espruino.com/Reference#InternalError
+ */
+declare class InternalError {
+  /**
+   * Creates an InternalError object
+   * @constructor
+   *
+   * @param {any} message - An optional message string
+   * @returns {any} An InternalError object
+   * @url http://www.espruino.com/Reference#l_InternalError_InternalError
+   */
+  static new(message?: string): InternalError;
+
+  /**
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_InternalError_toString
+   */
+  toString(): string;
+}
+
+interface ReferenceErrorConstructor {
+  /**
+   * Creates a ReferenceError object
+   * @constructor
+   *
+   * @param {any} message - An optional message string
+   * @returns {any} A ReferenceError object
+   * @url http://www.espruino.com/Reference#l_ReferenceError_ReferenceError
+   */
+  new(message?: string): ReferenceError;
+}
+
+interface ReferenceError {
+  /**
+   * @returns {any} A String
+   * @url http://www.espruino.com/Reference#l_ReferenceError_toString
+   */
+  toString(): string;
+}
+
+/**
+ * The base class for reference errors - where a variable which doesn't exist has
+ * been accessed.
+ * @url http://www.espruino.com/Reference#ReferenceError
+ */
+declare const ReferenceError: ReferenceErrorConstructor
+
+interface JSONConstructor {
+  /**
+   * Convert the given object into a JSON string which can subsequently be parsed
+   * with JSON.parse or eval.
+   * **Note:** This differs from JavaScript's standard `JSON.stringify` in that:
+   * * The `replacer` argument is ignored
+   * * Typed arrays like `new Uint8Array(5)` will be dumped as if they were arrays,
+   *   not as if they were objects (since it is more compact)
+   *
+   * @param {any} data - The data to be converted to a JSON string
+   * @param {any} replacer - This value is ignored
+   * @param {any} space - The number of spaces to use for padding, a string, or null/undefined for no whitespace
+   * @returns {any} A JSON string
+   * @url http://www.espruino.com/Reference#l_JSON_stringify
+   */
+  stringify(data: any, replacer: any, space: any): any;
+
+  /**
+   * Parse the given JSON string into a JavaScript object
+   * NOTE: This implementation uses eval() internally, and as such it is unsafe as it
+   * can allow arbitrary JS commands to be executed.
+   *
+   * @param {any} string - A JSON string
+   * @returns {any} The JavaScript object created by parsing the data string
+   * @url http://www.espruino.com/Reference#l_JSON_parse
+   */
+  parse(string: any): any;
+}
+
+interface JSON {
+
+}
+
+/**
+ * An Object that handles conversion to and from the JSON data interchange format
+ * @url http://www.espruino.com/Reference#JSON
+ */
+declare const JSON: JSONConstructor
+
+interface RegExpConstructor {
+  /**
+   * Creates a RegExp object, for handling Regular Expressions
+   * @constructor
+   *
+   * @param {any} regex - A regular expression as a string
+   * @param {any} flags - Flags for the regular expression as a string
+   * @returns {any} A RegExp object
+   * @url http://www.espruino.com/Reference#l_RegExp_RegExp
+   */
+  new(regex: any, flags: any): RegExp;
+}
+
+interface RegExp {
+  /**
+   * Test this regex on a string - returns a result array on success, or `null`
+   * otherwise.
+   * `/Wo/.exec("Hello World")` will return:
+   * ```
+   * [
+   *  "Wo",
+   *  "index": 6,
+   *  "input": "Hello World"
+   * ]
+   * ```
+   * Or with groups `/W(o)rld/.exec("Hello World")` returns:
+   * ```
+   * [
+   *  "World",
+   *  "o", "index": 6,
+   *  "input": "Hello World"
+   * ]
+   * ```
+   *
+   * @param {any} str - A string to match on
+   * @returns {any} A result array, or null
+   * @url http://www.espruino.com/Reference#l_RegExp_exec
+   */
+  exec(str: any): any;
+
+  /**
+   * Test this regex on a string - returns `true` on a successful match, or `false`
+   * otherwise
+   *
+   * @param {any} str - A string to match on
+   * @returns {boolean} true for a match, or false
+   * @url http://www.espruino.com/Reference#l_RegExp_test
+   */
+  test(str: any): boolean;
+}
+
+/**
+ * The built-in class for handling Regular Expressions
+ * **Note:** Espruino's regular expression parser does not contain all the features
+ * present in a full ES6 JS engine. However it does contain support for the all the
+ * basics.
+ * @url http://www.espruino.com/Reference#RegExp
+ */
+declare const RegExp: RegExpConstructor
+
+/**
+ * This is the built-in class for the Arduino-style pin namings on ST Nucleo boards
+ * @url http://www.espruino.com/Reference#Nucleo
+ */
+declare class Nucleo {
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A0
+   */
+  static A0: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A1
+   */
+  static A1: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A2
+   */
+  static A2: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A3
+   */
+  static A3: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A4
+   */
+  static A4: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_A5
+   */
+  static A5: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D0
+   */
+  static D0: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D1
+   */
+  static D1: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D2
+   */
+  static D2: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D3
+   */
+  static D3: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D4
+   */
+  static D4: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D5
+   */
+  static D5: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D6
+   */
+  static D6: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D7
+   */
+  static D7: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D8
+   */
+  static D8: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D9
+   */
+  static D9: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D10
+   */
+  static D10: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D11
+   */
+  static D11: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D12
+   */
+  static D12: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D13
+   */
+  static D13: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D14
+   */
+  static D14: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_Nucleo_D15
+   */
+  static D15: Pin;
+
+
+}
+
+/**
+ * This is a built-in class to allow you to use the ESP8266 NodeMCU boards's pin
+ * namings to access pins. It is only available on ESP8266-based boards.
+ * @url http://www.espruino.com/Reference#NodeMCU
+ */
+declare class NodeMCU {
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_A0
+   */
+  static A0: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D0
+   */
+  static D0: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D1
+   */
+  static D1: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D2
+   */
+  static D2: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D3
+   */
+  static D3: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D4
+   */
+  static D4: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D5
+   */
+  static D5: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D6
+   */
+  static D6: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D7
+   */
+  static D7: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D8
+   */
+  static D8: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D9
+   */
+  static D9: Pin;
+
+  /**
+   * @returns {Pin} A Pin
+   * @url http://www.espruino.com/Reference#l_NodeMCU_D10
+   */
+  static D10: Pin;
+
+
+}
+
+/**
+ * Class containing utility functions for the
+ * [ESP32](http://www.espruino.com/ESP32)
+ * @url http://www.espruino.com/Reference#ESP32
+ */
+declare class ESP32 {
+  /**
+   *
+   * @param {Pin} pin - Pin for Analog read
+   * @param {number} atten - Attenuate factor
+   * @url http://www.espruino.com/Reference#l_ESP32_setAtten
+   */
+  static setAtten(pin: Pin, atten: number): void;
+
+  /**
+   * Perform a hardware reset/reboot of the ESP32.
+   * @url http://www.espruino.com/Reference#l_ESP32_reboot
+   */
+  static reboot(): void;
+
+  /**
+   * Put device in deepsleep state for "us" microseconds.
+   *
+   * @param {number} us - Sleeptime in us
+   * @url http://www.espruino.com/Reference#l_ESP32_deepSleep
+   */
+  static deepSleep(us: number): void;
+
+  /**
+   * Returns an object that contains details about the state of the ESP32 with the
+   * following fields:
+   * * `sdkVersion` - Version of the SDK.
+   * * `freeHeap` - Amount of free heap in bytes.
+   * * `BLE` - Status of BLE, enabled if true.
+   * * `Wifi` - Status of Wifi, enabled if true.
+   * * `minHeap` - Minimum heap, calculated by heap_caps_get_minimum_free_size
+   * @returns {any} The state of the ESP32
+   * @url http://www.espruino.com/Reference#l_ESP32_getState
+   */
+  static getState(): any;
+
+  /**
+   *
+   * @param {number} level - which events should be shown (GATTS, GATTC, GAP)
+   * @url http://www.espruino.com/Reference#l_ESP32_setBLE_Debug
+   */
+  static setBLE_Debug(level: number): void;
+
+  /**
+   * Switches Bluetooth off/on, removes saved code from Flash, resets the board, and
+   * on restart creates jsVars depending on available heap (actual additional 1800)
+   *
+   * @param {boolean} enable - switches Bluetooth on or off
+   * @url http://www.espruino.com/Reference#l_ESP32_enableBLE
+   */
+  static enableBLE(enable: boolean): void;
+
+  /**
+   * Switches Wifi off/on, removes saved code from Flash, resets the board, and on
+   * restart creates jsVars depending on available heap (actual additional 3900)
+   *
+   * @param {boolean} enable - switches Wifi on or off
+   * @url http://www.espruino.com/Reference#l_ESP32_enableWifi
+   */
+  static enableWifi(enable: boolean): void;
+
+
+}
+
+/**
+ * A class to support some simple Queue handling for RTOS queues
+ * @url http://www.espruino.com/Reference#Queue
+ */
+declare class Queue {
+  /**
+   * Creates a Queue Object
+   * @constructor
+   *
+   * @param {any} queueName - Name of the queue
+   * @returns {any} A Queue object
+   * @url http://www.espruino.com/Reference#l_Queue_Queue
+   */
+  static new(queueName: any): any;
+
+  /**
+   * reads one character from queue, if available
+   * @url http://www.espruino.com/Reference#l_Queue_read
+   */
+  read(): void;
+
+  /**
+   * Writes one character to queue
+   *
+   * @param {any} char - char to be send
+   * @url http://www.espruino.com/Reference#l_Queue_writeChar
+   */
+  writeChar(char: any): void;
+
+  /**
+   * logs list of queues
+   * @url http://www.espruino.com/Reference#l_Queue_log
+   */
+  log(): void;
+}
+
+/**
+ * A class to support some simple Task handling for RTOS tasks
+ * @url http://www.espruino.com/Reference#Task
+ */
+declare class Task {
+  /**
+   * Creates a Task Object
+   * @constructor
+   *
+   * @param {any} taskName - Name of the task
+   * @returns {any} A Task object
+   * @url http://www.espruino.com/Reference#l_Task_Task
+   */
+  static new(taskName: any): any;
+
+  /**
+   * Suspend task, be careful not to suspend Espruino task itself
+   * @url http://www.espruino.com/Reference#l_Task_suspend
+   */
+  suspend(): void;
+
+  /**
+   * Resumes a suspended task
+   * @url http://www.espruino.com/Reference#l_Task_resume
+   */
+  resume(): void;
+
+  /**
+   * returns name of actual task
+   * @returns {any} Name of current task
+   * @url http://www.espruino.com/Reference#l_Task_getCurrent
+   */
+  getCurrent(): any;
+
+  /**
+   * Sends a binary notify to task
+   * @url http://www.espruino.com/Reference#l_Task_notify
+   */
+  notify(): void;
+
+  /**
+   * logs list of tasks
+   * @url http://www.espruino.com/Reference#l_Task_log
+   */
+  log(): void;
+}
+
+/**
+ * A class to handle Timer on base of ESP32 Timer
+ * @url http://www.espruino.com/Reference#Timer
+ */
+declare class Timer {
+  /**
+   * Creates a Timer Object
+   * @constructor
+   *
+   * @param {any} timerName - Timer Name
+   * @param {number} group - Timer group
+   * @param {number} index - Timer index
+   * @param {number} isrIndex - isr (0 = Espruino, 1 = test)
+   * @returns {any} A Timer Object
+   * @url http://www.espruino.com/Reference#l_Timer_Timer
+   */
+  static new(timerName: any, group: number, index: number, isrIndex: number): any;
+
+  /**
+   * Starts a timer
+   *
+   * @param {number} duration - duration of timmer in micro secs
+   * @url http://www.espruino.com/Reference#l_Timer_start
+   */
+  start(duration: number): void;
+
+  /**
+   * Reschedules a timer, needs to be started at least once
+   *
+   * @param {number} duration - duration of timmer in micro secs
+   * @url http://www.espruino.com/Reference#l_Timer_reschedule
+   */
+  reschedule(duration: number): void;
+
+  /**
+   * logs list of timers
+   * @url http://www.espruino.com/Reference#l_Timer_log
+   */
+  log(): void;
+}
+
+interface BooleanConstructor {
+  /**
+   * Creates a boolean
+   * @constructor
+   *
+   * @param {any} value - A single value to be converted to a number
+   * @returns {boolean} A Boolean object
+   * @url http://www.espruino.com/Reference#l_Boolean_Boolean
+   */
+  new(value: any): boolean;
+}
+
+interface Boolean {
+
+}
+
+
+declare const Boolean: BooleanConstructor
+
+// GLOBALS
+
+/**
+ * **Note:** This function is only available on the [BBC micro:bit](/MicroBit)
+ * board
+ * Show an image on the in-built 5x5 LED screen.
+ * Image can be:
+ * * A number where each bit represents a pixel (so 25 bits). eg. `5` or
+ *   `0x1FFFFFF`
+ * * A string, eg: `show("10001")`. Newlines are ignored, and anything that is not
+ * a space or `0` is treated as a 1.
+ * * An array of 4 bytes (more will be ignored), eg `show([1,2,3,0])`
+ * For instance the following works for images:
+ * ```
+ * show("#   #"+
+ *      "  #  "+
+ *      "  #  "+
+ *      "#   #"+
+ *      " ### ")
+ * ```
+ * This means you can also use Espruino's graphics library:
+ * ```
+ * var g = Graphics.createArrayBuffer(5,5,1)
+ * g.drawString("E",0,0)
+ * show(g.buffer)
+ * ```
+ *
+ * @param {any} image - The image to show
+ * @url http://www.espruino.com/Reference#l__global_show
+ */
+declare function show(image: any): void;
+
+/**
+ * **Note:** This function is only available on the [BBC micro:bit](/MicroBit)
+ * board
+ * Get the current acceleration of the micro:bit from the on-board accelerometer
+ * **This is deprecated.** Please use `Microbit.accel` instead.
+ * @returns {any} An object with x, y, and z fields in it
+ * @url http://www.espruino.com/Reference#l__global_acceleration
+ */
+declare function acceleration(): any;
+
+/**
+ * **Note:** This function is only available on the [BBC micro:bit](/MicroBit)
+ * board
+ * Get the current compass position for the micro:bit from the on-board
+ * magnetometer
+ * **This is deprecated.** Please use `Microbit.mag` instead.
+ * @returns {any} An object with x, y, and z fields in it
+ * @url http://www.espruino.com/Reference#l__global_compass
+ */
+declare function compass(): any;
+
+/**
+ * The pin connected to the 'A' button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTNA
+ */
+declare const BTNA: Pin;
+
+/**
+ * The pin connected to the 'B' button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTNB
+ */
+declare const BTNB: Pin;
+
+/**
+ * The pin connected to the up button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTNU
+ */
+declare const BTNU: Pin;
+
+/**
+ * The pin connected to the down button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTND
+ */
+declare const BTND: Pin;
+
+/**
+ * The pin connected to the left button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTNL
+ */
+declare const BTNL: Pin;
+
+/**
+ * The pin connected to the right button. Reads as `1` when pressed, `0` when not
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_BTNR
+ */
+declare const BTNR: Pin;
+
+/**
+ * The pin connected to Corner #1
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER1
+ */
+declare const CORNER1: Pin;
+
+/**
+ * The pin connected to Corner #2
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER2
+ */
+declare const CORNER2: Pin;
+
+/**
+ * The pin connected to Corner #3
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER3
+ */
+declare const CORNER3: Pin;
+
+/**
+ * The pin connected to Corner #4
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER4
+ */
+declare const CORNER4: Pin;
+
+/**
+ * The pin connected to Corner #5
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER5
+ */
+declare const CORNER5: Pin;
+
+/**
+ * The pin connected to Corner #6
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_CORNER6
+ */
+declare const CORNER6: Pin;
+
+/**
+ * On Puck.js V2 (not v1.0) this is the pin that controls the FET, for high-powered
+ * outputs.
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_FET
+ */
+declare const FET: Pin;
+
+/**
+ * The pin marked SDA on the Arduino pin footprint. This is connected directly to
+ * pin A4.
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_SDA
+ */
+declare const SDA: Pin;
+
+/**
+ * The pin marked SDA on the Arduino pin footprint. This is connected directly to
+ * pin A5.
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_SCL
+ */
+declare const SCL: Pin;
+
+/**
+ * The Bangle.js's vibration motor.
+ * @returns {Pin}
+ * @url http://www.espruino.com/Reference#l__global_VIBRATE
+ */
+declare const VIBRATE: Pin;
+
+/**
+ * On most Espruino board there are LEDs, in which case `LED` will be an actual
+ * Pin.
+ * On Bangle.js there are no LEDs, so to remain compatible with example code that
+ * might expect an LED, this is an object that behaves like a pin, but which just
+ * displays a circle on the display
+ * @returns {any} A `Pin` object for a fake LED which appears on
+ * @url http://www.espruino.com/Reference#l__global_LED
+ */
+declare const LED: any;
+
+/**
+ * On most Espruino board there are LEDs, in which case `LED1` will be an actual
+ * Pin.
+ * On Bangle.js there are no LEDs, so to remain compatible with example code that
+ * might expect an LED, this is an object that behaves like a pin, but which just
+ * displays a circle on the display
+ * @returns {any} A `Pin` object for a fake LED which appears on
+ * @url http://www.espruino.com/Reference#l__global_LED1
+ */
+declare const LED1: any;
+
+/**
+ * On most Espruino board there are LEDs, in which case `LED2` will be an actual
+ * Pin.
+ * On Bangle.js there are no LEDs, so to remain compatible with example code that
+ * might expect an LED, this is an object that behaves like a pin, but which just
+ * displays a circle on the display
+ * @returns {any} A `Pin` object for a fake LED which appears on
+ * @url http://www.espruino.com/Reference#l__global_LED2
+ */
+declare const LED2: any;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_MOS1
+ */
+declare const MOS1: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_MOS2
+ */
+declare const MOS2: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_MOS3
+ */
+declare const MOS3: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_MOS4
+ */
+declare const MOS4: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_IOEXT0
+ */
+declare const IOEXT0: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_IOEXT1
+ */
+declare const IOEXT1: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_IOEXT2
+ */
+declare const IOEXT2: Pin;
+
+/**
+ * @returns {Pin} A Pin
+ * @url http://www.espruino.com/Reference#l__global_IOEXT3
+ */
+declare const IOEXT3: Pin;
+
+/**
+ * @returns {number} Not a  Number
+ * @url http://www.espruino.com/Reference#l__global_NaN
+ */
+declare const NaN: number;
+
+/**
+ * @returns {number} Positive Infinity (1/0)
+ * @url http://www.espruino.com/Reference#l__global_Infinity
+ */
+declare const Infinity: number;
+
+/**
+ * @returns {number} Logic 1 for Arduino compatibility - this is the same as just typing `1`
+ * @url http://www.espruino.com/Reference#l__global_HIGH
+ */
+declare const HIGH: 1;
+
+/**
+ * @returns {number} Logic 0 for Arduino compatibility - this is the same as just typing `0`
+ * @url http://www.espruino.com/Reference#l__global_LOW
+ */
+declare const LOW: 0;
+
+/**
+ * A variable containing the arguments given to the function:
+ * ```
+ * function hello() {
+ *   console.log(arguments.length, JSON.stringify(arguments));
+ * }
+ * hello()        // 0 []
+ * hello("Test")  // 1 ["Test"]
+ * hello(1,2,3)   // 3 [1,2,3]
+ * ```
+ * **Note:** Due to the way Espruino works this is doesn't behave exactly the same
+ * as in normal JavaScript. The length of the arguments array will never be less
+ * than the number of arguments specified in the function declaration:
+ * `(function(a){ return arguments.length; })() == 1`. Normal JavaScript
+ * interpreters would return `0` in the above case.
+ * @returns {any} An array containing all the arguments given to the function
+ * @url http://www.espruino.com/Reference#l__global_arguments
+ */
+declare const arguments: any;
+
+/**
+ * Evaluate a string containing JavaScript code
+ *
+ * @param {any} code
+ * @returns {any} The result of evaluating the string
+ * @url http://www.espruino.com/Reference#l__global_eval
+ */
+declare function eval(code: any): any;
+
+/**
+ * Convert a string representing a number into an integer
+ *
+ * @param {any} string
+ * @param {any} radix - The Radix of the string (optional)
+ * @returns {any} The integer value of the string (or NaN)
+ * @url http://www.espruino.com/Reference#l__global_parseInt
+ */
+declare function parseInt(string: any, radix: any): any;
+
+/**
+ * Convert a string representing a number into an float
+ *
+ * @param {any} string
+ * @returns {number} The value of the string
+ * @url http://www.espruino.com/Reference#l__global_parseFloat
+ */
+declare function parseFloat(string: any): number;
+
+/**
+ * Is the parameter a finite num,ber or not? If needed, the parameter is first
+ * converted to a number.
+ *
+ * @param {any} x
+ * @returns {boolean} True is the value is a Finite number, false if not.
+ * @url http://www.espruino.com/Reference#l__global_isFinite
+ */
+declare function isFinite(x: any): boolean;
+
+/**
+ * Whether the x is NaN (Not a Number) or not
+ *
+ * @param {any} x
+ * @returns {boolean} True is the value is NaN, false if not.
+ * @url http://www.espruino.com/Reference#l__global_isNaN
+ */
+declare function isNaN(x: any): boolean;
+
+/**
+ * Encode the supplied string (or array) into a base64 string
+ *
+ * @param {any} binaryData - A string of data to encode
+ * @returns {any} A base64 encoded string
+ * @url http://www.espruino.com/Reference#l__global_btoa
+ */
+declare function btoa(binaryData: any): any;
+
+/**
+ * Decode the supplied base64 string into a normal string
+ *
+ * @param {any} base64Data - A string of base64 data to decode
+ * @returns {any} A string containing the decoded data
+ * @url http://www.espruino.com/Reference#l__global_atob
+ */
+declare function atob(base64Data: any): any;
+
+/**
+ * Convert a string with any character not alphanumeric or `- _ . ! ~ * ' ( )`
+ * converted to the form `%XY` where `XY` is its hexadecimal representation
+ *
+ * @param {any} str - A string to encode as a URI
+ * @returns {any} A string containing the encoded data
+ * @url http://www.espruino.com/Reference#l__global_encodeURIComponent
+ */
+declare function encodeURIComponent(str: any): any;
+
+/**
+ * Convert any groups of characters of the form '%ZZ', into characters with hex
+ * code '0xZZ'
+ *
+ * @param {any} str - A string to decode from a URI
+ * @returns {any} A string containing the decoded data
+ * @url http://www.espruino.com/Reference#l__global_decodeURIComponent
+ */
+declare function decodeURIComponent(str: any): any;
+
+/**
+ * Load the given module, and return the exported functions and variables.
+ * For example:
+ * ```
+ * var s = require("Storage");
+ * s.write("test", "hello world");
+ * print(s.read("test"));
+ * // prints "hello world"
+ * ```
+ * Check out [the page on Modules](/Modules) for an explanation of what modules are
+ * and how you can use them.
+ *
+ * @param {any} moduleName - A String containing the name of the given module
+ * @returns {any} The result of evaluating the string
+ * @url http://www.espruino.com/Reference#l__global_require
+ */
+declare function require<T extends keyof Libraries>(moduleName: T): Libraries[T];
+declare function require<T extends Exclude<string, keyof Libraries>>(moduleName: T): any;
+
+/**
+ * Read 8 bits of memory at the given location - DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to read
+ * @param {number} count - (optional) the number of items to read. If >1 a Uint8Array will be returned.
+ * @returns {any} The value of memory at the given location
+ * @url http://www.espruino.com/Reference#l__global_peek8
+ */
+declare function peek8(addr: number, count?: 1): number;
+declare function peek8(addr: number, count: number): Uint8Array;
+
+/**
+ * Write 8 bits of memory at the given location - VERY DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to write
+ * @param {any} value - The value to write, or an array of values
+ * @url http://www.espruino.com/Reference#l__global_poke8
+ */
+declare function poke8(addr: number, value: number | number[]): void;
+
+/**
+ * Read 16 bits of memory at the given location - DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to read
+ * @param {number} count - (optional) the number of items to read. If >1 a Uint16Array will be returned.
+ * @returns {any} The value of memory at the given location
+ * @url http://www.espruino.com/Reference#l__global_peek16
+ */
+declare function peek16(addr: number, count?: 1): number;
+declare function peek16(addr: number, count: number): Uint8Array;
+
+/**
+ * Write 16 bits of memory at the given location - VERY DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to write
+ * @param {any} value - The value to write, or an array of values
+ * @url http://www.espruino.com/Reference#l__global_poke16
+ */
+declare function poke16(addr: number, value: number | number[]): void;
+
+/**
+ * Read 32 bits of memory at the given location - DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to read
+ * @param {number} count - (optional) the number of items to read. If >1 a Uint32Array will be returned.
+ * @returns {any} The value of memory at the given location
+ * @url http://www.espruino.com/Reference#l__global_peek32
+ */
+declare function peek32(addr: number, count?: 1): number;
+declare function peek32(addr: number, count: number): Uint8Array;
+
+/**
+ * Write 32 bits of memory at the given location - VERY DANGEROUS!
+ *
+ * @param {number} addr - The address in memory to write
+ * @param {any} value - The value to write, or an array of values
+ * @url http://www.espruino.com/Reference#l__global_poke32
+ */
+declare function poke32(addr: number, value: number | number[]): void;
+
+/**
+ * Get the analog value of the given pin
+ * This is different to Arduino which only returns an integer between 0 and 1023
+ * However only pins connected to an ADC will work (see the datasheet)
+ *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+ *  reset pin's state to `"analog"`
+ *
+ * @param {Pin} pin
+ * The pin to use
+ * You can find out which pins to use by looking at [your board's reference page](#boards) and searching for pins with the `ADC` markers.
+ * @returns {number} The analog Value of the Pin between 0 and 1
+ * @url http://www.espruino.com/Reference#l__global_analogRead
+ */
+declare function analogRead(pin: Pin): number;
+
+/**
+ * Set the analog Value of a pin. It will be output using PWM.
+ * Objects can contain:
+ * * `freq` - pulse frequency in Hz, eg. ```analogWrite(A0,0.5,{ freq : 10 });``` -
+ *   specifying a frequency will force PWM output, even if the pin has a DAC
+ * * `soft` - boolean, If true software PWM is used if hardware is not available.
+ * * `forceSoft` - boolean, If true software PWM is used even if hardware PWM or a
+ *   DAC is available
+ *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+ *  reset pin's state to `"output"`
+ *
+ * @param {Pin} pin
+ * The pin to use
+ * You can find out which pins to use by looking at [your board's reference page](#boards) and searching for pins with the `PWM` or `DAC` markers.
+ * @param {number} value - A value between 0 and 1
+ * @param {any} options
+ * An object containing options for analog output - see below
+ * @url http://www.espruino.com/Reference#l__global_analogWrite
+ */
+declare function analogWrite(pin: Pin, value: number, options?: { freq?: number, soft?: boolean, forceSoft?: boolean }): void;
+
+/**
+ * Pulse the pin with the value for the given time in milliseconds. It uses a
+ * hardware timer to produce accurate pulses, and returns immediately (before the
+ * pulse has finished). Use `digitalPulse(A0,1,0)` to wait until a previous pulse
+ * has finished.
+ * eg. `digitalPulse(A0,1,5);` pulses A0 high for 5ms.
+ * `digitalPulse(A0,1,[5,2,4]);` pulses A0 high for 5ms, low for 2ms, and high for
+ * 4ms
+ *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+ *  reset pin's state to `"output"`
+ * digitalPulse is for SHORT pulses that need to be very accurate. If you're doing
+ * anything over a few milliseconds, use setTimeout instead.
+ *
+ * @param {Pin} pin - The pin to use
+ * @param {boolean} value - Whether to pulse high (true) or low (false)
+ * @param {any} time - A time in milliseconds, or an array of times (in which case a square wave will be output starting with a pulse of 'value')
+ * @url http://www.espruino.com/Reference#l__global_digitalPulse
+ */
+declare function digitalPulse(pin: Pin, value: boolean, time: number | number[]): void;
+
+/**
+ * Set the digital value of the given pin.
+ *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+ *  reset pin's state to `"output"`
+ * If pin argument is an array of pins (eg. `[A2,A1,A0]`) the value argument will
+ * be treated as an array of bits where the last array element is the least
+ * significant bit.
+ * In this case, pin values are set least significant bit first (from the
+ * right-hand side of the array of pins). This means you can use the same pin
+ * multiple times, for example `digitalWrite([A1,A1,A0,A0],0b0101)` would pulse A0
+ * followed by A1.
+ * If the pin argument is an object with a `write` method, the `write` method will
+ * be called with the value passed through.
+ *
+ * @param {any} pin - The pin to use
+ * @param {number} value - Whether to pulse high (true) or low (false)
+ * @url http://www.espruino.com/Reference#l__global_digitalWrite
+ */
+declare function digitalWrite(pin: Pin, value: typeof HIGH | typeof LOW): void;
+
+/**
+ * Get the digital value of the given pin.
+ *  **Note:** if you didn't call `pinMode` beforehand then this function will also
+ *  reset pin's state to `"input"`
+ * If the pin argument is an array of pins (eg. `[A2,A1,A0]`) the value returned
+ * will be an number where the last array element is the least significant bit, for
+ * example if `A0=A1=1` and `A2=0`, `digitalRead([A2,A1,A0]) == 0b011`
+ * If the pin argument is an object with a `read` method, the `read` method will be
+ * called and the integer value it returns passed back.
+ *
+ * @param {any} pin - The pin to use
+ * @returns {number} The digital Value of the Pin
+ * @url http://www.espruino.com/Reference#l__global_digitalRead
+ */
+declare function digitalRead(pin: Pin): number;
+
+/**
+ * Set the mode of the given pin.
+ *  * `auto`/`undefined` - Don't change state, but allow `digitalWrite`/etc to
+ *    automatically change state as appropriate
+ *  * `analog` - Analog input
+ *  * `input` - Digital input
+ *  * `input_pullup` - Digital input with internal ~40k pull-up resistor
+ *  * `input_pulldown` - Digital input with internal ~40k pull-down resistor
+ *  * `output` - Digital output
+ *  * `opendrain` - Digital output that only ever pulls down to 0v. Sending a
+ *    logical `1` leaves the pin open circuit
+ *  * `opendrain_pullup` - Digital output that pulls down to 0v. Sending a logical
+ *    `1` enables internal ~40k pull-up resistor
+ *  * `af_output` - Digital output from built-in peripheral
+ *  * `af_opendrain` - Digital output from built-in peripheral that only ever pulls
+ *    down to 0v. Sending a logical `1` leaves the pin open circuit
+ *  **Note:** `digitalRead`/`digitalWrite`/etc set the pin mode automatically
+ * *unless* `pinMode` has been called first. If you want `digitalRead`/etc to set
+ * the pin mode automatically after you have called `pinMode`, simply call it again
+ * with no mode argument (`pinMode(pin)`), `auto` as the argument (`pinMode(pin,
+ * "auto")`), or with the 3rd 'automatic' argument set to true (`pinMode(pin,
+ * "output", true)`).
+ *
+ * @param {Pin} pin - The pin to set pin mode for
+ * @param {any} mode - The mode - a string that is either 'analog', 'input', 'input_pullup', 'input_pulldown', 'output', 'opendrain', 'af_output' or 'af_opendrain'. Do not include this argument or use 'auto' if you want to revert to automatic pin mode setting.
+ * @param {boolean} automatic - Optional, default is false. If true, subsequent commands will automatically change the state (see notes below)
+ * @url http://www.espruino.com/Reference#l__global_pinMode
+ */
+declare function pinMode(pin: Pin, mode?: PinMode | "auto", automatic?: boolean): void;
+
+/**
+ * Return the current mode of the given pin. See `pinMode` for more information on
+ * returned values.
+ *
+ * @param {Pin} pin - The pin to check
+ * @returns {any} The pin mode, as a string
+ * @url http://www.espruino.com/Reference#l__global_getPinMode
+ */
+declare function getPinMode(pin: Pin): PinMode;
+
+/**
+ * Shift an array of data out using the pins supplied *least significant bit
+ * first*, for example:
+ * ```
+ * // shift out to single clk+data
+ * shiftOut(A0, { clk : A1 }, [1,0,1,0]);
+ * ```
+ * ```
+ * // shift out a whole byte (like software SPI)
+ * shiftOut(A0, { clk : A1, repeat: 8 }, [1,2,3,4]);
+ * ```
+ * ```
+ * // shift out via 4 data pins
+ * shiftOut([A3,A2,A1,A0], { clk : A4 }, [1,2,3,4]);
+ * ```
+ * `options` is an object of the form:
+ * ```
+ * {
+ *   clk : pin, // a pin to use as the clock (undefined = no pin)
+ *   clkPol : bool, // clock polarity - default is 0 (so 1 normally, pulsing to 0 to clock data in)
+ *   repeat : int, // number of clocks per array item
+ * }
+ * ```
+ * Each item in the `data` array will be output to the pins, with the first pin in
+ * the array being the MSB and the last the LSB, then the clock will be pulsed in
+ * the polarity given.
+ * `repeat` is the amount of times shift data out for each array item. For instance
+ * we may want to shift 8 bits out through 2 pins - in which case we need to set
+ * repeat to 4.
+ *
+ * @param {any} pins - A pin, or an array of pins to use
+ * @param {any} options - Options, for instance the clock (see below)
+ * @param {any} data - The data to shift out (see `E.toUint8Array` for info on the forms this can take)
+ * @url http://www.espruino.com/Reference#l__global_shiftOut
+ */
+declare function shiftOut(pins: Pin | Pin[], options: { clk?: Pin, clkPol?: boolean, repeat?: number }, data: Uint8ArrayResolvable): void;
+
+/**
+ * Call the function specified when the pin changes. Watches set with `setWatch`
+ * can be removed using `clearWatch`.
+ * If the `options` parameter is an object, it can contain the following
+ * information (all optional):
+ * ```
+ * {
+ *    // Whether to keep producing callbacks, or remove the watch after the first callback
+ *    repeat: true/false(default),
+ *    // Trigger on the rising or falling edge of the signal. Can be a string, or 1='rising', -1='falling', 0='both'
+ *    edge:'rising'(default for built-in buttons)/'falling'/'both'(default for pins),
+ *    // Use software-debouncing to stop multiple calls if a switch bounces
+ *    // This is the time in milliseconds to wait for bounces to subside, or 0 to disable
+ *    debounce:10 (0 is default for pins, 25 is default for built-in buttons),
+ *    // Advanced: If the function supplied is a 'native' function (compiled or assembly)
+ *    // setting irq:true will call that function in the interrupt itself
+ *    irq : false(default)
+ *    // Advanced: If specified, the given pin will be read whenever the watch is called
+ *    // and the state will be included as a 'data' field in the callback
+ *    data : pin
+ *    // Advanced: On Nordic devices, a watch may be 'high' or 'low' accuracy. By default low
+ *    // accuracy is used (which is better for power consumption), but this means that
+ *    // high speed pulses (less than 25us) may not be reliably received. Setting hispeed=true
+ *    // allows for detecting high speed pulses at the expense of higher idle power consumption
+ *    hispeed : true
+ * }
+ * ```
+ * The `function` callback is called with an argument, which is an object of type
+ * `{state:bool, time:float, lastTime:float}`.
+ *  * `state` is whether the pin is currently a `1` or a `0`
+ *  * `time` is the time in seconds at which the pin changed state
+ *  * `lastTime` is the time in seconds at which the **pin last changed state**.
+ *    When using `edge:'rising'` or `edge:'falling'`, this is not the same as when
+ *    the function was last called.
+ *  * `data` is included if `data:pin` was specified in the options, and can be
+ *    used for reading in clocked data
+ * For instance, if you want to measure the length of a positive pulse you could
+ * use `setWatch(function(e) { console.log(e.time-e.lastTime); }, BTN, {
+ * repeat:true, edge:'falling' });`. This will only be called on the falling edge
+ * of the pulse, but will be able to measure the width of the pulse because
+ * `e.lastTime` is the time of the rising edge.
+ * Internally, an interrupt writes the time of the pin's state change into a queue
+ * with the exact time that it happened, and the function supplied to `setWatch` is
+ * executed only from the main message loop. However, if the callback is a native
+ * function `void (bool state)` then you can add `irq:true` to options, which will
+ * cause the function to be called from within the IRQ. When doing this, interrupts
+ * will happen on both edges and there will be no debouncing.
+ * **Note:** if you didn't call `pinMode` beforehand then this function will reset
+ * pin's state to `"input"`
+ * **Note:** The STM32 chip (used in the [Espruino Board](/EspruinoBoard) and
+ * [Pico](/Pico)) cannot watch two pins with the same number - eg `A0` and `B0`.
+ * **Note:** On nRF52 chips (used in Puck.js, Pixl.js, MDBT42Q) `setWatch` disables
+ * the GPIO output on that pin. In order to be able to write to the pin again you
+ * need to disable the watch with `clearWatch`.
+ *
+ * @param {any} function - A Function or String to be executed
+ * @param {Pin} pin - The pin to watch
+ * @param {any} options - If a boolean or integer, it determines whether to call this once (false = default) or every time a change occurs (true). Can be an object of the form `{ repeat: true/false(default), edge:'rising'/'falling'/'both'(default), debounce:10}` - see below for more information.
+ * @returns {any} An ID that can be passed to clearWatch
+ * @url http://www.espruino.com/Reference#l__global_setWatch
+ */
+declare function setWatch(func: ((arg: { state: boolean, time: number, lastTime: number }) => void) | string, pin: Pin, options?: boolean | { repeat?: boolean, edge?: "rising" | "falling" | "both", debounce?: number, irq?: boolean, data?: Pin, hispeed?: boolean }): number;
+
+/**
+ * Clear the Watch that was created with setWatch. If no parameter is supplied, all watches will be removed.
+ * To avoid accidentally deleting all Watches, if a parameter is supplied but is `undefined` then an Exception will be thrown.
+ *
+ * @param {any} id - The id returned by a previous call to setWatch. **Only one argument is allowed.**
+ * @url http://www.espruino.com/Reference#l__global_clearWatch
+ */
+declare function clearWatch(id: number): void;
+
+declare const global: {
+  show: typeof show;
+  acceleration: typeof acceleration;
+  compass: typeof compass;
+  BTNA: typeof BTNA;
+  BTNB: typeof BTNB;
+  BTNU: typeof BTNU;
+  BTND: typeof BTND;
+  BTNL: typeof BTNL;
+  BTNR: typeof BTNR;
+  CORNER1: typeof CORNER1;
+  CORNER2: typeof CORNER2;
+  CORNER3: typeof CORNER3;
+  CORNER4: typeof CORNER4;
+  CORNER5: typeof CORNER5;
+  CORNER6: typeof CORNER6;
+  FET: typeof FET;
+  SDA: typeof SDA;
+  SCL: typeof SCL;
+  VIBRATE: typeof VIBRATE;
+  LED: typeof LED;
+  LED1: typeof LED1;
+  LED2: typeof LED2;
+  MOS1: typeof MOS1;
+  MOS2: typeof MOS2;
+  MOS3: typeof MOS3;
+  MOS4: typeof MOS4;
+  IOEXT0: typeof IOEXT0;
+  IOEXT1: typeof IOEXT1;
+  IOEXT2: typeof IOEXT2;
+  IOEXT3: typeof IOEXT3;
+  NaN: typeof NaN;
+  Infinity: typeof Infinity;
+  HIGH: typeof HIGH;
+  LOW: typeof LOW;
+  arguments: typeof arguments;
+  eval: typeof eval;
+  parseInt: typeof parseInt;
+  parseFloat: typeof parseFloat;
+  isFinite: typeof isFinite;
+  isNaN: typeof isNaN;
+  btoa: typeof btoa;
+  atob: typeof atob;
+  encodeURIComponent: typeof encodeURIComponent;
+  decodeURIComponent: typeof decodeURIComponent;
+  require: typeof require;
+  peek8: typeof peek8;
+  poke8: typeof poke8;
+  peek16: typeof peek16;
+  poke16: typeof poke16;
+  peek32: typeof peek32;
+  poke32: typeof poke32;
+  analogRead: typeof analogRead;
+  analogWrite: typeof analogWrite;
+  digitalPulse: typeof digitalPulse;
+  digitalWrite: typeof digitalWrite;
+  digitalRead: typeof digitalRead;
+  pinMode: typeof pinMode;
+  getPinMode: typeof getPinMode;
+  shiftOut: typeof shiftOut;
+  setWatch: typeof setWatch;
+  clearWatch: typeof clearWatch;
+  global: typeof global;
+  setBusyIndicator: typeof setBusyIndicator;
+  setSleepIndicator: typeof setSleepIndicator;
+  setDeepSleep: typeof setDeepSleep;
+  trace: typeof trace;
+  dump: typeof dump;
+  load: typeof load;
+  save: typeof save;
+  reset: typeof reset;
+  print: typeof print;
+  edit: typeof edit;
+  echo: typeof echo;
+  getTime: typeof getTime;
+  setTime: typeof setTime;
+  getSerial: typeof getSerial;
+  setInterval: typeof setInterval;
+  setTimeout: typeof setTimeout;
+  clearInterval: typeof clearInterval;
+  clearTimeout: typeof clearTimeout;
+  changeInterval: typeof changeInterval;
+  [key: string]: any;
+}
+
+/**
+ * When Espruino is busy, set the pin specified here high. Set this to undefined to
+ * disable the feature.
+ *
+ * @param {any} pin
+ * @url http://www.espruino.com/Reference#l__global_setBusyIndicator
+ */
+declare function setBusyIndicator(pin: any): void;
+
+/**
+ * When Espruino is asleep, set the pin specified here low (when it's awake, set it
+ * high). Set this to undefined to disable the feature.
+ * Please see http://www.espruino.com/Power+Consumption for more details on this.
+ *
+ * @param {any} pin
+ * @url http://www.espruino.com/Reference#l__global_setSleepIndicator
+ */
+declare function setSleepIndicator(pin: any): void;
+
+/**
+ * Set whether we can enter deep sleep mode, which reduces power consumption to
+ * around 100uA. This only works on STM32 Espruino Boards (nRF52 boards sleep
+ * automatically).
+ * Please see http://www.espruino.com/Power+Consumption for more details on this.
+ *
+ * @param {boolean} sleep
+ * @url http://www.espruino.com/Reference#l__global_setDeepSleep
+ */
+declare function setDeepSleep(sleep: boolean): void;
+
+/**
+ * Output debugging information
+ * Note: This is not included on boards with low amounts of flash memory, or the
+ * Espruino board.
+ *
+ * @param {any} root - The symbol to output (optional). If nothing is specified, everything will be output
+ * @url http://www.espruino.com/Reference#l__global_trace
+ */
+declare function trace(root: any): void;
+
+/**
+ * Output current interpreter state in a text form such that it can be copied to a
+ * new device
+ * Espruino keeps its current state in RAM (even if the function code is stored in
+ * Flash). When you type `dump()` it dumps the current state of code in RAM plus
+ * the hardware state, then if there's code saved in flash it writes "// Code saved
+ * with E.setBootCode" and dumps that too.
+ * **Note:** 'Internal' functions are currently not handled correctly. You will
+ * need to recreate these in the `onInit` function.
+ * @url http://www.espruino.com/Reference#l__global_dump
+ */
+declare function dump(): void;
+
+/**
+ * Restart and load the program out of flash - this has an effect similar to
+ * completely rebooting Espruino (power off/power on), but without actually
+ * performing a full reset of the hardware.
+ * This command only executes when the Interpreter returns to the Idle state - for
+ * instance ```a=1;load();a=2;``` will still leave 'a' as undefined (or what it was
+ * set to in the saved program).
+ * Espruino will resume from where it was when you last typed `save()`. If you want
+ * code to be executed right after loading (for instance to initialise devices
+ * connected to Espruino), add an `init` event handler to `E` with `E.on('init',
+ * function() { ... your_code ... });`. This will then be automatically executed by
+ * Espruino every time it starts.
+ * **If you specify a filename in the argument then that file will be loaded from
+ * Storage after reset** in much the same way as calling `reset()` then
+ * `eval(require("Storage").read(filename))`
+ *
+ * @param {any} filename - optional: The name of a text JS file to load from Storage after reset
+ * @url http://www.espruino.com/Reference#l__global_load
+ */
+declare function load(filename: any): void;
+
+/**
+ * Save the state of the interpreter into flash (including the results of calling
+ * `setWatch`, `setInterval`, `pinMode`, and any listeners). The state will then be
+ * loaded automatically every time Espruino powers on or is hard-reset. To see what
+ * will get saved you can call `dump()`.
+ * **Note:** If you set up intervals/etc in `onInit()` and you have already called
+ * `onInit` before running `save()`, when Espruino resumes there will be two copies
+ * of your intervals - the ones from before the save, and the ones from after -
+ * which may cause you problems.
+ * For more information about this and other options for saving, please see the
+ * [Saving code on Espruino](https://www.espruino.com/Saving) page.
+ * This command only executes when the Interpreter returns to the Idle state - for
+ * instance ```a=1;save();a=2;``` will save 'a' as 2.
+ * When Espruino powers on, it will resume from where it was when you typed
+ * `save()`. If you want code to be executed right after loading (for instance to
+ * initialise devices connected to Espruino), add a function called `onInit`, or
+ * add a `init` event handler to `E` with `E.on('init', function() { ... your_code
+ * ... });`. This will then be automatically executed by Espruino every time it
+ * starts.
+ * In order to stop the program saved with this command being loaded automatically,
+ * check out [the Troubleshooting
+ * guide](https://www.espruino.com/Troubleshooting#espruino-stopped-working-after-i-typed-save-)
+ * @url http://www.espruino.com/Reference#l__global_save
+ */
+declare function save(): void;
+
+/**
+ * Reset the interpreter - clear program memory in RAM, and do not load a saved
+ * program from flash. This does NOT reset the underlying hardware (which allows
+ * you to reset the device without it disconnecting from USB).
+ * This command only executes when the Interpreter returns to the Idle state - for
+ * instance ```a=1;reset();a=2;``` will still leave 'a' as undefined.
+ * The safest way to do a full reset is to hit the reset button.
+ * If `reset()` is called with no arguments, it will reset the board's state in RAM
+ * but will not reset the state in flash. When next powered on (or when `load()` is
+ * called) the board will load the previously saved code.
+ * Calling `reset(true)` will cause *all saved code in flash memory to be cleared
+ * as well*.
+ *
+ * @param {boolean} clearFlash - Remove saved code from flash as well
+ * @url http://www.espruino.com/Reference#l__global_reset
+ */
+declare function reset(clearFlash: boolean): void;
+
+/**
+ * Print the supplied string(s) to the console
+ *  **Note:** If you're connected to a computer (not a wall adaptor) via USB but
+ *  **you are not running a terminal app** then when you print data Espruino may
+ *  pause execution and wait until the computer requests the data it is trying to
+ *  print.
+ *
+ * @param {any} text
+ * @url http://www.espruino.com/Reference#l__global_print
+ */
+declare function print(...text: any[]): void;
+
+/**
+ * Fill the console with the contents of the given function, so you can edit it.
+ * NOTE: This is a convenience function - it will not edit 'inner functions'. For
+ * that, you must edit the 'outer function' and re-execute it.
+ *
+ * @param {any} funcName - The name of the function to edit (either a string or just the unquoted name)
+ * @url http://www.espruino.com/Reference#l__global_edit
+ */
+declare function edit(funcName: any): void;
+
+/**
+ * Should Espruino echo what you type back to you? true = yes (Default), false =
+ * no. When echo is off, the result of executing a command is not returned.
+ * Instead, you must use 'print' to send output.
+ *
+ * @param {boolean} echoOn
+ * @url http://www.espruino.com/Reference#l__global_echo
+ */
+declare function echo(echoOn: boolean): void;
+
+/**
+ * Return the current system time in Seconds (as a floating point number)
+ * @returns {number}
+ * @url http://www.espruino.com/Reference#l__global_getTime
+ */
+declare function getTime(): number;
+
+/**
+ * Set the current system time in seconds (`time` can be a floating point value).
+ * This is used with `getTime`, the time reported from `setWatch`, as well as when
+ * using `new Date()`.
+ * `Date.prototype.getTime()` reports the time in milliseconds, so you can set the
+ * time to a `Date` object using:
+ * ```
+ * setTime((new Date("Tue, 19 Feb 2019 10:57")).getTime()/1000)
+ * ```
+ * To set the timezone for all new Dates, use `E.setTimeZone(hours)`.
+ *
+ * @param {number} time
+ * @url http://www.espruino.com/Reference#l__global_setTime
+ */
+declare function setTime(time: number): void;
+
+/**
+ * Get the serial number of this board
+ * @returns {any} The board's serial number
+ * @url http://www.espruino.com/Reference#l__global_getSerial
+ */
+declare function getSerial(): any;
+
+/**
+ * Call the function (or evaluate the string) specified REPEATEDLY after the
+ * timeout in milliseconds.
+ * For instance:
+ * ```
+ * setInterval(function () {
+ *   console.log("Hello World");
+ * }, 1000);
+ * // or
+ * setInterval('console.log("Hello World");', 1000);
+ * // both print 'Hello World' every second
+ * ```
+ * You can also specify extra arguments that will be sent to the function when it
+ * is executed. For example:
+ * ```
+ * setInterval(function (a,b) {
+ *   console.log(a+" "+b);
+ * }, 1000, "Hello", "World");
+ * // prints 'Hello World' every second
+ * ```
+ * If you want to stop your function from being called, pass the number that was
+ * returned by `setInterval` into the `clearInterval` function.
+ *  **Note:** If `setDeepSleep(true)` has been called and the interval is greater
+ *  than 5 seconds, Espruino may execute the interval up to 1 second late. This is
+ *  because Espruino can only wake from deep sleep every second - and waking early
+ *  would cause Espruino to waste power while it waited for the correct time.
+ *
+ * @param {any} function - A Function or String to be executed
+ * @param {number} timeout - The time between calls to the function (max 3153600000000 = 100 years
+ * @param {any} args - Optional arguments to pass to the function when executed
+ * @returns {any} An ID that can be passed to clearInterval
+ * @url http://www.espruino.com/Reference#l__global_setInterval
+ */
+declare function setInterval(func: any, timeout: number, ...args: any[]): any;
+
+/**
+ * Call the function (or evaluate the string) specified ONCE after the timeout in
+ * milliseconds.
+ * For instance:
+ * ```
+ * setTimeout(function () {
+ *   console.log("Hello World");
+ * }, 1000);
+ * // or
+ * setTimeout('console.log("Hello World");', 1000);
+ * // both print 'Hello World' after a second
+ * ```
+ * You can also specify extra arguments that will be sent to the function when it
+ * is executed. For example:
+ * ```
+ * setTimeout(function (a,b) {
+ *   console.log(a+" "+b);
+ * }, 1000, "Hello", "World");
+ * // prints 'Hello World' after 1 second
+ * ```
+ * If you want to stop the function from being called, pass the number that was
+ * returned by `setTimeout` into the `clearTimeout` function.
+ *  **Note:** If `setDeepSleep(true)` has been called and the interval is greater
+ *  than 5 seconds, Espruino may execute the interval up to 1 second late. This is
+ *  because Espruino can only wake from deep sleep every second - and waking early
+ *  would cause Espruino to waste power while it waited for the correct time.
+ *
+ * @param {any} function - A Function or String to be executed
+ * @param {number} timeout - The time until the function will be executed (max 3153600000000 = 100 years
+ * @param {any} args - Optional arguments to pass to the function when executed
+ * @returns {any} An ID that can be passed to clearTimeout
+ * @url http://www.espruino.com/Reference#l__global_setTimeout
+ */
+declare function setTimeout(func: any, timeout: number, ...args: any[]): any;
+
+/**
+ * Clear the Interval that was created with `setInterval`, for example:
+ * ```var id = setInterval(function () { print('foo'); }, 1000);```
+ * ```clearInterval(id);```
+ * If no argument is supplied, all timeouts and intervals are stopped.
+ * To avoid accidentally deleting all Intervals, if a parameter is supplied but is `undefined` then an Exception will be thrown.
+ *
+ * @param {any} id - The id returned by a previous call to setInterval. **Only one argument is allowed.**
+ * @url http://www.espruino.com/Reference#l__global_clearInterval
+ */
+declare function clearInterval(...id: any[]): void;
+
+/**
+ * Clear the Timeout that was created with `setTimeout`, for example:
+ * ```var id = setTimeout(function () { print('foo'); }, 1000);```
+ * ```clearTimeout(id);```
+ * If no argument is supplied, all timeouts and intervals are stopped.
+ * To avoid accidentally deleting all Timeouts, if a parameter is supplied but is `undefined` then an Exception will be thrown.
+ *
+ * @param {any} id - The id returned by a previous call to setTimeout. **Only one argument is allowed.**
+ * @url http://www.espruino.com/Reference#l__global_clearTimeout
+ */
+declare function clearTimeout(...id: any[]): void;
+
+/**
+ * Change the Interval on a callback created with `setInterval`, for example:
+ * ```var id = setInterval(function () { print('foo'); }, 1000); // every second```
+ * ```changeInterval(id, 1500); // now runs every 1.5 seconds```
+ * This takes effect immediately and resets the timeout, so in the example above,
+ * regardless of when you call `changeInterval`, the next interval will occur
+ * 1500ms after it.
+ *
+ * @param {any} id - The id returned by a previous call to setInterval
+ * @param {number} time - The new time period in ms
+ * @url http://www.espruino.com/Reference#l__global_changeInterval
+ */
+declare function changeInterval(id: any, time: number): void;
+
+// LIBRARIES
+
+type Libraries = {
+  /**
+   * @url http://www.espruino.com/Reference#tensorflow
+   */
+  tensorflow: {
+    /**
+     *
+     * @param {number} arenaSize - The TensorFlow Arena size
+     * @param {any} model - The model to use - this should be a flat array/string
+     * @returns {any} A tensorflow instance
+     * @url http://www.espruino.com/Reference#l_tensorflow_create
+     */
+    create(arenaSize: number, model: any): TFMicroInterpreter;
+  }
+
+  /**
+   * This library handles interfacing with a FAT32 filesystem on an SD card. The API
+   * is designed to be similar to node.js's - However Espruino does not currently
+   * support asynchronous file IO, so the functions behave like node.js's xxxxSync
+   * functions. Versions of the functions with 'Sync' after them are also provided
+   * for compatibility.
+   * To use this, you must type ```var fs = require('fs')``` to get access to the
+   * library
+   * See [the page on File IO](http://www.espruino.com/File+IO) for more information,
+   * and for examples on wiring up an SD card if your device doesn't come with one.
+   * **Note:** If you want to remove an SD card after you have started using it, you
+   * *must* call `E.unmountSD()` or you may cause damage to the card.
+   * @url http://www.espruino.com/Reference#fs
+   */
+  fs: {
+    /**
+     * List all files in the supplied directory, returning them as an array of strings.
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The path of the directory to list. If it is not supplied, '' is assumed, which will list the root directory
+     * @returns {any} An array of filename strings (or undefined if the directory couldn't be listed)
+     * @url http://www.espruino.com/Reference#l_fs_readdir
+     */
+    readdir(path: any): any;
+
+    /**
+     * List all files in the supplied directory, returning them as an array of strings.
+     *
+     * @param {any} path - The path of the directory to list. If it is not supplied, '' is assumed, which will list the root directory
+     * @returns {any} An array of filename strings (or undefined if the directory couldn't be listed)
+     * @url http://www.espruino.com/Reference#l_fs_readdirSync
+     */
+    readdirSync(path: any): any;
+
+    /**
+     * Write the data to the given file
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The path of the file to write
+     * @param {any} data - The data to write to the file
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_fs_writeFile
+     */
+    writeFile(path: any, data: any): boolean;
+
+    /**
+     * Write the data to the given file
+     *
+     * @param {any} path - The path of the file to write
+     * @param {any} data - The data to write to the file
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_fs_writeFileSync
+     */
+    writeFileSync(path: any, data: any): boolean;
+
+    /**
+     * Append the data to the given file, created a new file if it doesn't exist
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The path of the file to write
+     * @param {any} data - The data to write to the file
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_fs_appendFile
+     */
+    appendFile(path: any, data: any): boolean;
+
+    /**
+     * Append the data to the given file, created a new file if it doesn't exist
+     *
+     * @param {any} path - The path of the file to write
+     * @param {any} data - The data to write to the file
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_fs_appendFileSync
+     */
+    appendFileSync(path: any, data: any): boolean;
+
+    /**
+     * Read all data from a file and return as a string
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The path of the file to read
+     * @returns {any} A string containing the contents of the file (or undefined if the file doesn't exist)
+     * @url http://www.espruino.com/Reference#l_fs_readFile
+     */
+    readFile(path: any): any;
+
+    /**
+     * Read all data from a file and return as a string.
+     * **Note:** The size of files you can load using this method is limited by the
+     * amount of available RAM. To read files a bit at a time, see the `File` class.
+     *
+     * @param {any} path - The path of the file to read
+     * @returns {any} A string containing the contents of the file (or undefined if the file doesn't exist)
+     * @url http://www.espruino.com/Reference#l_fs_readFileSync
+     */
+    readFileSync(path: any): any;
+
+    /**
+     * Delete the given file
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The path of the file to delete
+     * @returns {boolean} True on success, or false on failure
+     * @url http://www.espruino.com/Reference#l_fs_unlink
+     */
+    unlink(path: any): boolean;
+
+    /**
+     * Delete the given file
+     *
+     * @param {any} path - The path of the file to delete
+     * @returns {boolean} True on success, or false on failure
+     * @url http://www.espruino.com/Reference#l_fs_unlinkSync
+     */
+    unlinkSync(path: any): boolean;
+
+    /**
+     * Return information on the given file. This returns an object with the following
+     * fields:
+     * size: size in bytes dir: a boolean specifying if the file is a directory or not
+     * mtime: A Date structure specifying the time the file was last modified
+     *
+     * @param {any} path - The path of the file to get information on
+     * @returns {any} An object describing the file, or undefined on failure
+     * @url http://www.espruino.com/Reference#l_fs_statSync
+     */
+    statSync(path: any): any;
+
+    /**
+     * Create the directory
+     * NOTE: Espruino does not yet support Async file IO, so this function behaves like
+     * the 'Sync' version.
+     *
+     * @param {any} path - The name of the directory to create
+     * @returns {boolean} True on success, or false on failure
+     * @url http://www.espruino.com/Reference#l_fs_mkdir
+     */
+    mkdir(path: any): boolean;
+
+    /**
+     * Create the directory
+     *
+     * @param {any} path - The name of the directory to create
+     * @returns {boolean} True on success, or false on failure
+     * @url http://www.espruino.com/Reference#l_fs_mkdirSync
+     */
+    mkdirSync(path: any): boolean;
+
+    /**
+     *
+     * @param {any} source - The source file/stream that will send content.
+     * @param {any} destination - The destination file/stream that will receive content from the source.
+     * @param {any} options
+     * An optional object `{ chunkSize : int=64, end : bool=true, complete : function }`
+     * chunkSize : The amount of data to pipe from source to destination at a time
+     * complete : a function to call when the pipe activity is complete
+     * end : call the 'end' function on the destination when the source is finished
+     * @url http://www.espruino.com/Reference#l_fs_pipe
+     */
+    pipe(source: any, destination: any, options: any): void;
+  }
+
+  /**
+   * Cryptographic functions
+   * **Note:** This library is currently only included in builds for boards where
+   * there is space. For other boards there is `crypto.js` which implements SHA1 in
+   * JS.
+   * @url http://www.espruino.com/Reference#crypto
+   */
+  crypto: {
+    /**
+     * Class containing AES encryption/decryption
+     * @returns {any}
+     * @url http://www.espruino.com/Reference#l_crypto_AES
+     */
+    AES: AES;
+
+    /**
+     * Performs a SHA1 hash and returns the result as a 20 byte ArrayBuffer.
+     * **Note:** On some boards (currently only Espruino Original) there isn't space
+     * for a fully unrolled SHA1 implementation so a slower all-JS implementation is
+     * used instead.
+     *
+     * @param {any} message - The message to apply the hash to
+     * @returns {any} Returns a 20 byte ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_SHA1
+     */
+    SHA1(message: any): ArrayBuffer;
+
+    /**
+     * Performs a SHA224 hash and returns the result as a 28 byte ArrayBuffer
+     *
+     * @param {any} message - The message to apply the hash to
+     * @returns {any} Returns a 20 byte ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_SHA224
+     */
+    SHA224(message: any): ArrayBuffer;
+
+    /**
+     * Performs a SHA256 hash and returns the result as a 32 byte ArrayBuffer
+     *
+     * @param {any} message - The message to apply the hash to
+     * @returns {any} Returns a 20 byte ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_SHA256
+     */
+    SHA256(message: any): ArrayBuffer;
+
+    /**
+     * Performs a SHA384 hash and returns the result as a 48 byte ArrayBuffer
+     *
+     * @param {any} message - The message to apply the hash to
+     * @returns {any} Returns a 20 byte ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_SHA384
+     */
+    SHA384(message: any): ArrayBuffer;
+
+    /**
+     * Performs a SHA512 hash and returns the result as a 64 byte ArrayBuffer
+     *
+     * @param {any} message - The message to apply the hash to
+     * @returns {any} Returns a 32 byte ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_SHA512
+     */
+    SHA512(message: any): ArrayBuffer;
+
+    /**
+     * Password-Based Key Derivation Function 2 algorithm, using SHA512
+     *
+     * @param {any} passphrase - Passphrase
+     * @param {any} salt - Salt for turning passphrase into a key
+     * @param {any} options - Object of Options, `{ keySize: 8 (in 32 bit words), iterations: 10, hasher: 'SHA1'/'SHA224'/'SHA256'/'SHA384'/'SHA512' }`
+     * @returns {any} Returns an ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_crypto_PBKDF2
+     */
+    PBKDF2(passphrase: any, salt: any, options: any): ArrayBuffer;
+  }
+
+  /**
+   * Library that initialises a network device that calls into JavaScript
+   * @url http://www.espruino.com/Reference#NetworkJS
+   */
+  NetworkJS: {
+    /**
+     * Initialise the network using the callbacks given and return the first argument.
+     * For instance:
+     * ```
+     * require("NetworkJS").create({
+     *   create : function(host, port, socketType, options) {
+     *     // Create a socket and return its index, host is a string, port is an integer.
+     *     // If host isn't defined, create a server socket
+     *     console.log("Create",host,port);
+     *     return 1;
+     *   },
+     *   close : function(sckt) {
+     *     // Close the socket. returns nothing
+     *   },
+     *   accept : function(sckt) {
+     *     // Accept the connection on the server socket. Returns socket number or -1 if no connection
+     *     return -1;
+     *   },
+     *   recv : function(sckt, maxLen, socketType) {
+     *     // Receive data. Returns a string (even if empty).
+     *     // If non-string returned, socket is then closed
+     *     return null;//or "";
+     *   },
+     *   send : function(sckt, data, socketType) {
+     *     // Send data (as string). Returns the number of bytes sent - 0 is ok.
+     *     // Less than 0
+     *     return data.length;
+     *   }
+     * });
+     * ```
+     * `socketType` is an integer - 2 for UDP, or see SocketType in
+     * https://github.com/espruino/Espruino/blob/master/libs/network/network.h for more
+     * information.
+     *
+     * @param {any} obj - An object containing functions to access the network device
+     * @returns {any} The object passed in
+     * @url http://www.espruino.com/Reference#l_NetworkJS_create
+     */
+    create(obj: any): any;
+  }
+
+  /**
+   * This library implements a telnet console for the Espruino interpreter. It
+   * requires a network connection, e.g. Wifi, and **currently only functions on the
+   * ESP8266 and on Linux **. It uses port 23 on the ESP8266 and port 2323 on Linux.
+   * **Note:** To enable on Linux, run `./espruino --telnet`
+   * @url http://www.espruino.com/Reference#TelnetServer
+   */
+  TelnetServer: {
+    /**
+     *
+     * @param {any} options - Options controlling the telnet console server `{ mode : 'on|off'}`
+     * @url http://www.espruino.com/Reference#l_TelnetServer_setOptions
+     */
+    setOptions(options: any): void;
+  }
+
+  /**
+   * This library allows you to create TCPIP servers and clients
+   * In order to use this, you will need an extra module to get network connectivity.
+   * This is designed to be a cut-down version of the [node.js
+   * library](http://nodejs.org/api/net.html). Please see the [Internet](/Internet)
+   * page for more information on how to use it.
+   * @url http://www.espruino.com/Reference#net
+   */
+  net: {
+    /**
+     * Create a Server
+     * When a request to the server is made, the callback is called. In the callback
+     * you can use the methods on the connection to send data. You can also add
+     * `connection.on('data',function() { ... })` to listen for received data
+     *
+     * @param {any} callback - A `function(connection)` that will be called when a connection is made
+     * @returns {any} Returns a new Server Object
+     * @url http://www.espruino.com/Reference#l_net_createServer
+     */
+    createServer(callback: any): Server;
+
+    /**
+     * Create a TCP socket connection
+     *
+     * @param {any} options - An object containing host,port fields
+     * @param {any} callback - A `function(sckt)` that will be called  with the socket when a connection is made. You can then call `sckt.write(...)` to send data, and `sckt.on('data', function(data) { ... })` and `sckt.on('close', function() { ... })` to deal with the response.
+     * @returns {any} Returns a new net.Socket object
+     * @url http://www.espruino.com/Reference#l_net_connect
+     */
+    connect(options: any, callback: any): Socket;
+  }
+
+  /**
+   * This library allows you to create UDP/DATAGRAM servers and clients
+   * In order to use this, you will need an extra module to get network connectivity.
+   * This is designed to be a cut-down version of the [node.js
+   * library](http://nodejs.org/api/dgram.html). Please see the [Internet](/Internet)
+   * page for more information on how to use it.
+   * @url http://www.espruino.com/Reference#dgram
+   */
+  dgram: {
+    /**
+     * Create a UDP socket
+     *
+     * @param {any} type - Socket type to create e.g. 'udp4'. Or options object { type: 'udp4', reuseAddr: true, recvBufferSize: 1024 }
+     * @param {any} callback - A `function(sckt)` that will be called  with the socket when a connection is made. You can then call `sckt.send(...)` to send data, and `sckt.on('message', function(data) { ... })` and `sckt.on('close', function() { ... })` to deal with the response.
+     * @returns {any} Returns a new dgram.Socket object
+     * @url http://www.espruino.com/Reference#l_dgram_createSocket
+     */
+    createSocket(type: any, callback: any): dgramSocket;
+  }
+
+  /**
+   * This library allows you to create TCPIP servers and clients using TLS encryption
+   * In order to use this, you will need an extra module to get network connectivity.
+   * This is designed to be a cut-down version of the [node.js
+   * library](http://nodejs.org/api/tls.html). Please see the [Internet](/Internet)
+   * page for more information on how to use it.
+   * @url http://www.espruino.com/Reference#tls
+   */
+  tls: {
+    /**
+     * Create a socket connection using TLS
+     * Options can have `ca`, `key` and `cert` fields, which should be the decoded
+     * content of the certificate.
+     * ```
+     * var options = url.parse("localhost:1234");
+     * options.key = atob("MIIJKQ ... OZs08C");
+     * options.cert = atob("MIIFi ... Uf93rN+");
+     * options.ca = atob("MIIFgDCC ... GosQML4sc=");
+     * require("tls").connect(options, ... );
+     * ```
+     * If you have the certificates as `.pem` files, you need to load these files, take
+     * the information between the lines beginning with `----`, remove the newlines
+     * from it so you have raw base64, and then feed it into `atob` as above.
+     * You can also:
+     * * Just specify the filename (<=100 characters) and it will be loaded and parsed
+     *   if you have an SD card connected. For instance `options.key = "key.pem";`
+     * * Specify a function, which will be called to retrieve the data. For instance
+     *   `options.key = function() { eeprom.load_my_info(); };
+     * For more information about generating and using certificates, see:
+     * https://engineering.circle.com/https-authorized-certs-with-node-js/
+     * (You'll need to use 2048 bit certificates as opposed to 4096 bit shown above)
+     *
+     * @param {any} options - An object containing host,port fields
+     * @param {any} callback - A function(res) that will be called when a connection is made. You can then call `res.on('data', function(data) { ... })` and `res.on('close', function() { ... })` to deal with the response.
+     * @returns {any} Returns a new net.Socket object
+     * @url http://www.espruino.com/Reference#l_tls_connect
+     */
+    connect(options: any, callback: any): Socket;
+  }
+
+  /**
+   * @url http://www.espruino.com/Reference#CC3000
+   */
+  CC3000: {
+    /**
+     * Initialise the CC3000 and return a WLAN object
+     *
+     * @param {any} spi - Device to use for SPI (or undefined to use the default). SPI should be 1,000,000 baud, and set to 'mode 1'
+     * @param {Pin} cs - The pin to use for Chip Select
+     * @param {Pin} en - The pin to use for Enable
+     * @param {Pin} irq - The pin to use for Interrupts
+     * @returns {any} A WLAN Object
+     * @url http://www.espruino.com/Reference#l_CC3000_connect
+     */
+    connect(spi: any, cs: Pin, en: Pin, irq: Pin): WLAN;
+  }
+
+  /**
+   * Library for communication with the WIZnet Ethernet module
+   * @url http://www.espruino.com/Reference#WIZnet
+   */
+  WIZnet: {
+    /**
+     * Initialise the WIZnet module and return an Ethernet object
+     *
+     * @param {any} spi - Device to use for SPI (or undefined to use the default)
+     * @param {Pin} cs - The pin to use for Chip Select
+     * @returns {any} An Ethernet Object
+     * @url http://www.espruino.com/Reference#l_WIZnet_connect
+     */
+    connect(spi: any, cs: Pin): Ethernet;
+  }
+
+  /**
+   * The Wifi library is designed to control the Wifi interface. It supports
+   * functionality such as connecting to wifi networks, getting network information,
+   * starting an access point, etc.
+   * It is available on these devices:
+   * * [Espruino WiFi](http://www.espruino.com/WiFi#using-wifi)
+   * * [ESP8266](http://www.espruino.com/EspruinoESP8266)
+   * * [ESP32](http://www.espruino.com/ESP32)
+   * **Certain features may or may not be implemented on your device** however we
+   * have documented what is available and what isn't.
+   * If you're not using one of the devices above, a separate WiFi library is
+   * provided. For instance:
+   * * An [ESP8266 connected to an Espruino
+   *   board](http://www.espruino.com/ESP8266#software)
+   * * An [CC3000 WiFi Module](http://www.espruino.com/CC3000)
+   * [Other ways of connecting to the
+   * net](http://www.espruino.com/Internet#related-pages) such as GSM, Ethernet and
+   * LTE have their own libraries.
+   * You can use the WiFi library as follows:
+   * ```
+   * var wifi = require("Wifi");
+   * wifi.connect("my-ssid", {password:"my-pwd"}, function(ap){ console.log("connected:", ap); });
+   * ```
+   * On ESP32/ESP8266 if you want the connection to happen automatically at boot, add
+   * `wifi.save();`. On other platforms, place `wifi.connect` in a function called
+   * `onInit`.
+   * @url http://www.espruino.com/Reference#Wifi
+   */
+  Wifi: {
+    /**
+     * The 'associated' event is called when an association with an access point has
+     * succeeded, i.e., a connection to the AP's network has been established.
+     * On ESP32/ESP8266 there is a `details` parameter which includes:
+     * * ssid - The SSID of the access point to which the association was established
+     * * mac - The BSSID/mac address of the access point
+     * * channel - The wifi channel used (an integer, typ 1..14)
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_associated
+     */
+    on(event: "associated", callback: (details: any) => void): void;
+
+    /**
+     * The 'disconnected' event is called when an association with an access point has
+     * been lost.
+     * On ESP32/ESP8266 there is a `details` parameter which includes:
+     * * ssid - The SSID of the access point from which the association was lost
+     * * mac - The BSSID/mac address of the access point
+     * * reason - The reason for the disconnection (string)
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_disconnected
+     */
+    on(event: "disconnected", callback: (details: any) => void): void;
+
+    /**
+     * The 'auth_change' event is called when the authentication mode with the
+     * associated access point changes. The details include:
+     * * oldMode - The old auth mode (string: open, wep, wpa, wpa2, wpa_wpa2)
+     * * newMode - The new auth mode (string: open, wep, wpa, wpa2, wpa_wpa2)
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_auth_change
+     */
+    on(event: "auth_change", callback: (details: any) => void): void;
+
+    /**
+     * The 'dhcp_timeout' event is called when a DHCP request to the connected access
+     * point fails and thus no IP address could be acquired (or renewed).
+     * @param {string} event - The event to listen to.
+     * @param {() => void} callback - A function that is executed when the event occurs.
+     * @url http://www.espruino.com/Reference#l_Wifi_dhcp_timeout
+     */
+    on(event: "dhcp_timeout", callback: () => void): void;
+
+    /**
+     * The 'connected' event is called when the connection with an access point is
+     * ready for traffic. In the case of a dynamic IP address configuration this is
+     * when an IP address is obtained, in the case of static IP address allocation this
+     * happens when an association is formed (in that case the 'associated' and
+     * 'connected' events are fired in rapid succession).
+     * On ESP32/ESP8266 there is a `details` parameter which includes:
+     * * ip - The IP address obtained as string
+     * * netmask - The network's IP range mask as string
+     * * gw - The network's default gateway as string
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_connected
+     */
+    on(event: "connected", callback: (details: any) => void): void;
+
+    /**
+     * The 'sta_joined' event is called when a station establishes an association (i.e.
+     * connects) with the esp8266's access point. The details include:
+     * * mac - The MAC address of the station in string format (00:00:00:00:00:00)
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_sta_joined
+     */
+    on(event: "sta_joined", callback: (details: any) => void): void;
+
+    /**
+     * The 'sta_left' event is called when a station disconnects from the esp8266's
+     * access point (or its association times out?). The details include:
+     * * mac - The MAC address of the station in string format (00:00:00:00:00:00)
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_sta_left
+     */
+    on(event: "sta_left", callback: (details: any) => void): void;
+
+    /**
+     * The 'probe_recv' event is called when a probe request is received from some
+     * station by the esp8266's access point. The details include:
+     * * mac - The MAC address of the station in string format (00:00:00:00:00:00)
+     * * rssi - The signal strength in dB of the probe request
+     * @param {string} event - The event to listen to.
+     * @param {(details: any) => void} callback - A function that is executed when the event occurs. Its arguments are:
+     * * `details` An object with event details
+     * @url http://www.espruino.com/Reference#l_Wifi_probe_recv
+     */
+    on(event: "probe_recv", callback: (details: any) => void): void;
+
+    /**
+     * Disconnect the wifi station from an access point and disable the station mode.
+     * It is OK to call `disconnect` to turn off station mode even if no connection
+     * exists (for example, connection attempts may be failing). Station mode can be
+     * re-enabled by calling `connect` or `scan`.
+     *
+     * @param {any} callback - An optional `callback()` function to be called back on disconnection. The callback function receives no argument.
+     * @url http://www.espruino.com/Reference#l_Wifi_disconnect
+     */
+    disconnect(callback: any): void;
+
+    /**
+     * Stop being an access point and disable the AP operation mode. AP mode can be
+     * re-enabled by calling `startAP`.
+     *
+     * @param {any} callback - An optional `callback()` function to be called back on successful stop. The callback function receives no argument.
+     * @url http://www.espruino.com/Reference#l_Wifi_stopAP
+     */
+    stopAP(callback: any): void;
+
+    /**
+     * Connect to an access point as a station. If there is an existing connection to
+     * an AP it is first disconnected if the SSID or password are different from those
+     * passed as parameters. Put differently, if the passed SSID and password are
+     * identical to the currently connected AP then nothing is changed. When the
+     * connection attempt completes the callback function is invoked with one `err`
+     * parameter, which is NULL if there is no error and a string message if there is
+     * an error. If DHCP is enabled the callback occurs once an IP addres has been
+     * obtained, if a static IP is set the callback occurs once the AP's network has
+     * been joined. The callback is also invoked if a connection already exists and
+     * does not need to be changed.
+     * The options properties may contain:
+     * * `password` - Password string to be used to access the network.
+     * * `dnsServers` (array of String) - An array of up to two DNS servers in dotted
+     *   decimal format string.
+     * * `channel` - Wifi channel of the access point (integer, typ 0..14, 0 means any
+     *   channel), only on ESP8266.
+     * * `bssid` - Mac address of the access point (string, type "00:00:00:00:00:00"),
+     *   only on ESP8266.
+     * Notes:
+     * * the options should include the ability to set a static IP and associated
+     *   netmask and gateway, this is a future enhancement.
+     * * the only error reported in the callback is "Bad password", all other errors
+     *   (such as access point not found or DHCP timeout) just cause connection
+     *   retries. If the reporting of such temporary errors is desired, the caller must
+     *   use its own timeout and the `getDetails().status` field.
+     * * the `connect` call automatically enabled station mode, it can be disabled
+     *   again by calling `disconnect`.
+     *
+     * @param {any} ssid - The access point network id.
+     * @param {any} options - Connection options (optional).
+     * @param {any} callback - A `callback(err)`  function to be called back on completion. `err` is null on success, or contains an error string on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_connect
+     */
+    connect(ssid: any, options: any, callback: any): void;
+
+    /**
+     * Perform a scan for access points. This will enable the station mode if it is not
+     * currently enabled. Once the scan is complete the callback function is called
+     * with an array of APs found, each AP is an object with:
+     * * `ssid`: SSID string.
+     * * `mac`: access point MAC address in 00:00:00:00:00:00 format.
+     * * `authMode`: `open`, `wep`, `wpa`, `wpa2`, or `wpa_wpa2`.
+     * * `channel`: wifi channel 1..13.
+     * * `hidden`: true if the SSID is hidden (ESP32/ESP8266 only)
+     * * `rssi`: signal strength in dB in the range -110..0.
+     * Notes:
+     * * in order to perform the scan the station mode is turned on and remains on, use
+     *   Wifi.disconnect() to turn it off again, if desired.
+     * * only one scan can be in progress at a time.
+     *
+     * @param {any} callback - A `callback(err, ap_list)` function to be called back on completion. `err==null` and `ap_list` is an array on success, or `err` is an error string and `ap_list` is undefined on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_scan
+     */
+    scan(callback: any): void;
+
+    /**
+     * Create a WiFi access point allowing stations to connect. If the password is NULL
+     * or an empty string the access point is open, otherwise it is encrypted. The
+     * callback function is invoked once the access point is set-up and receives one
+     * `err` argument, which is NULL on success and contains an error message string
+     * otherwise.
+     * The `options` object can contain the following properties.
+     * * `authMode` - The authentication mode to use. Can be one of "open", "wpa2",
+     *   "wpa", "wpa_wpa2". The default is open (but open access points are not
+     *   recommended).
+     * * `password` - The password for connecting stations if authMode is not open.
+     * * `channel` - The channel to be used for the access point in the range 1..13. If
+     *   the device is also connected to an access point as a station then that access
+     *   point determines the channel.
+     * * `hidden` - The flag if visible or not (0:visible, 1:hidden), default is
+     *   visible.
+     * Notes:
+     * * the options should include the ability to set the AP IP and associated
+     *   netmask, this is a future enhancement.
+     * * the `startAP` call automatically enables AP mode. It can be disabled again by
+     *   calling `stopAP`.
+     *
+     * @param {any} ssid - The network id.
+     * @param {any} options - Configuration options (optional).
+     * @param {any} callback - Optional `callback(err)` function to be called when the AP is successfully started. `err==null` on success, or an error string on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_startAP
+     */
+    startAP(ssid: any, options: any, callback: any): void;
+
+    /**
+     * Retrieve the current overall WiFi configuration. This call provides general
+     * information that pertains to both station and access point modes. The getDetails
+     * and getAPDetails calls provide more in-depth information about the station and
+     * access point configurations, respectively. The status object has the following
+     * properties:
+     * * `station` - Status of the wifi station: `off`, `connecting`, ...
+     * * `ap` - Status of the wifi access point: `disabled`, `enabled`.
+     * * `mode` - The current operation mode: `off`, `sta`, `ap`, `sta+ap`.
+     * * `phy` - Modulation standard configured: `11b`, `11g`, `11n` (the esp8266 docs
+     *   are not very clear, but it is assumed that 11n means b/g/n). This setting
+     *   limits the modulations that the radio will use, it does not indicate the
+     *   current modulation used with a specific access point.
+     * * `powersave` - Power saving mode: `none` (radio is on all the time), `ps-poll`
+     *   (radio is off between beacons as determined by the access point's DTIM
+     *   setting). Note that in 'ap' and 'sta+ap' modes the radio is always on, i.e.,
+     *   no power saving is possible.
+     * * `savedMode` - The saved operation mode which will be applied at boot time:
+     *   `off`, `sta`, `ap`, `sta+ap`.
+     *
+     * @param {any} callback - Optional `callback(status)` function to be called back with the current Wifi status, i.e. the same object as returned directly.
+     * @returns {any} An object representing the current WiFi status, if available immediately.
+     * @url http://www.espruino.com/Reference#l_Wifi_getStatus
+     */
+    getStatus(callback: any): any;
+
+    /**
+     * Sets a number of global wifi configuration settings. All parameters are optional
+     * and which are passed determines which settings are updated. The settings
+     * available are:
+     * * `phy` - Modulation standard to allow: `11b`, `11g`, `11n` (the esp8266 docs
+     *   are not very clear, but it is assumed that 11n means b/g/n).
+     * * `powersave` - Power saving mode: `none` (radio is on all the time), `ps-poll`
+     *   (radio is off between beacons as determined by the access point's DTIM
+     *   setting). Note that in 'ap' and 'sta+ap' modes the radio is always on, i.e.,
+     *   no power saving is possible.
+     * Note: esp8266 SDK programmers may be missing an "opmode" option to set the
+     * sta/ap/sta+ap operation mode. Please use connect/scan/disconnect/startAP/stopAP,
+     * which all set the esp8266 opmode indirectly.
+     *
+     * @param {any} settings - An object with the configuration settings to change.
+     * @url http://www.espruino.com/Reference#l_Wifi_setConfig
+     */
+    setConfig(settings: any): void;
+
+    /**
+     * Retrieve the wifi station configuration and status details. The details object
+     * has the following properties:
+     * * `status` - Details about the wifi station connection, one of `off`,
+     *   `connecting`, `wrong_password`, `no_ap_found`, `connect_fail`, or `connected`.
+     *   The off, bad_password and connected states are stable, the other states are
+     *   transient. The connecting state will either result in connected or one of the
+     *   error states (bad_password, no_ap_found, connect_fail) and the no_ap_found and
+     *   connect_fail states will result in a reconnection attempt after some interval.
+     * * `rssi` - signal strength of the connected access point in dB, typically in the
+     *   range -110 to 0, with anything greater than -30 being an excessively strong
+     *   signal.
+     * * `ssid` - SSID of the access point.
+     * * `password` - the password used to connect to the access point.
+     * * `authMode` - the authentication used: `open`, `wpa`, `wpa2`, `wpa_wpa2` (not
+     *   currently supported).
+     * * `savedSsid` - the SSID to connect to automatically at boot time, null if none.
+     *
+     * @param {any} callback - An optional `callback(details)` function to be called back with the wifi details, i.e. the same object as returned directly.
+     * @returns {any} An object representing the wifi station details, if available immediately.
+     * @url http://www.espruino.com/Reference#l_Wifi_getDetails
+     */
+    getDetails(callback: any): any;
+
+    /**
+     * Retrieve the current access point configuration and status. The details object
+     * has the following properties:
+     * * `status` - Current access point status: `enabled` or `disabled`
+     * * `stations` - an array of the stations connected to the access point. This
+     *   array may be empty. Each entry in the array is an object describing the
+     *   station which, at a minimum contains `ip` being the IP address of the station.
+     * * `ssid` - SSID to broadcast.
+     * * `password` - Password for authentication.
+     * * `authMode` - the authentication required of stations: `open`, `wpa`, `wpa2`,
+     *   `wpa_wpa2`.
+     * * `hidden` - True if the SSID is hidden, false otherwise.
+     * * `maxConn` - Max number of station connections supported.
+     * * `savedSsid` - the SSID to broadcast automatically at boot time, null if the
+     *   access point is to be disabled at boot.
+     *
+     * @param {any} callback - An optional `callback(details)` function to be called back with the current access point details, i.e. the same object as returned directly.
+     * @returns {any} An object representing the current access point details, if available immediately.
+     * @url http://www.espruino.com/Reference#l_Wifi_getAPDetails
+     */
+    getAPDetails(callback: any): any;
+
+    /**
+     * On boards where this is not available, just issue the `connect` commands you
+     * need to run at startup from an `onInit` function.
+     * Save the current wifi configuration (station and access point) to flash and
+     * automatically apply this configuration at boot time, unless `what=="clear"`, in
+     * which case the saved configuration is cleared such that wifi remains disabled at
+     * boot. The saved configuration includes:
+     * * mode (off/sta/ap/sta+ap)
+     * * SSIDs & passwords
+     * * phy (11b/g/n)
+     * * powersave setting
+     * * DHCP hostname
+     *
+     * @param {any} what - An optional parameter to specify what to save, on the esp8266 the two supported values are `clear` and `sta+ap`. The default is `sta+ap`
+     * @url http://www.espruino.com/Reference#l_Wifi_save
+     */
+    save(what: any): void;
+
+    /**
+     * Restores the saved Wifi configuration from flash. See `Wifi.save()`.
+     * @url http://www.espruino.com/Reference#l_Wifi_restore
+     */
+    restore(): void;
+
+    /**
+     * Return the station IP information in an object as follows:
+     * * ip - IP address as string (e.g. "192.168.1.5")
+     * * netmask - The interface netmask as string (ESP8266/ESP32 only)
+     * * gw - The network gateway as string (ESP8266/ESP32 only)
+     * * mac - The MAC address as string of the form 00:00:00:00:00:00
+     * Note that the `ip`, `netmask`, and `gw` fields are omitted if no connection is established:
+     *
+     * @param {any} callback - An optional `callback(err, ipinfo)` function to be called back with the IP information.
+     * @returns {any} An object representing the station IP information, if available immediately (**ONLY** on ESP8266/ESP32).
+     * @url http://www.espruino.com/Reference#l_Wifi_getIP
+     */
+    getIP(callback: any): any;
+
+    /**
+     * Return the access point IP information in an object which contains:
+     * * ip - IP address as string (typ "192.168.4.1")
+     * * netmask - The interface netmask as string
+     * * gw - The network gateway as string
+     * * mac - The MAC address as string of the form 00:00:00:00:00:00
+     *
+     * @param {any} callback - An optional `callback(err, ipinfo)` function to be called back with the the IP information.
+     * @returns {any} An object representing the esp8266's Access Point IP information, if available immediately (**ONLY** on ESP8266/ESP32).
+     * @url http://www.espruino.com/Reference#l_Wifi_getAPIP
+     */
+    getAPIP(callback: any): any;
+
+    /**
+     * Lookup the hostname and invoke a callback with the IP address as integer
+     * argument. If the lookup fails, the callback is invoked with a null argument.
+     * **Note:** only a single hostname lookup can be made at a time, concurrent
+     * lookups are not supported.
+     *
+     * @param {any} hostname - The hostname to lookup.
+     * @param {any} callback - The `callback(ip)` to invoke when the IP is returned. `ip==null` on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_getHostByName
+     */
+    getHostByName(hostname: any, callback: any): void;
+
+    /**
+     * Returns the hostname announced to the DHCP server and broadcast via mDNS when
+     * connecting to an access point.
+     *
+     * @param {any} callback - An optional `callback(hostname)` function to be called back with the hostname.
+     * @returns {any} The currently configured hostname, if available immediately.
+     * @url http://www.espruino.com/Reference#l_Wifi_getHostname
+     */
+    getHostname(callback: any): any;
+
+    /**
+     * Set the hostname. Depending on implemenation, the hostname is sent with every
+     * DHCP request and is broadcast via mDNS. The DHCP hostname may be visible in the
+     * access point and may be forwarded into DNS as hostname.local. If a DHCP lease
+     * currently exists changing the hostname will cause a disconnect and reconnect in
+     * order to transmit the change to the DHCP server. The mDNS announcement also
+     * includes an announcement for the "espruino" service.
+     *
+     * @param {any} hostname - The new hostname.
+     * @param {any} callback - An optional `callback()` function to be called back when the hostname is set
+     * @url http://www.espruino.com/Reference#l_Wifi_setHostname
+     */
+    setHostname(hostname: any, callback: any): void;
+
+    /**
+     * Starts the SNTP (Simple Network Time Protocol) service to keep the clock
+     * synchronized with the specified server. Note that the time zone is really just
+     * an offset to UTC and doesn't handle daylight savings time. The interval
+     * determines how often the time server is queried and Espruino's time is
+     * synchronized. The initial synchronization occurs asynchronously after setSNTP
+     * returns.
+     *
+     * @param {any} server - The NTP server to query, for example, `us.pool.ntp.org`
+     * @param {any} tz_offset - Local time zone offset in the range -11..13.
+     * @url http://www.espruino.com/Reference#l_Wifi_setSNTP
+     */
+    setSNTP(server: any, tz_offset: any): void;
+
+    /**
+     * The `settings` object must contain the following properties.
+     * * `ip` IP address as string (e.g. "192.168.5.100")
+     * * `gw` The network gateway as string (e.g. "192.168.5.1")
+     * * `netmask` The interface netmask as string (e.g. "255.255.255.0")
+     *
+     * @param {any} settings - Configuration settings
+     * @param {any} callback - A `callback(err)` function to invoke when ip is set. `err==null` on success, or a string on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_setIP
+     */
+    setIP(settings: any, callback: any): void;
+
+    /**
+     * The `settings` object must contain the following properties.
+     * * `ip` IP address as string (e.g. "192.168.5.100")
+     * * `gw` The network gateway as string (e.g. "192.168.5.1")
+     * * `netmask` The interface netmask as string (e.g. "255.255.255.0")
+     *
+     * @param {any} settings - Configuration settings
+     * @param {any} callback - A `callback(err)` function to invoke when ip is set. `err==null` on success, or a string on failure.
+     * @url http://www.espruino.com/Reference#l_Wifi_setAPIP
+     */
+    setAPIP(settings: any, callback: any): void;
+
+    /**
+     * Issues a ping to the given host, and calls a callback with the time when the
+     * ping is received.
+     *
+     * @param {any} hostname - The host to ping
+     * @param {any} callback - A `callback(time)` function to invoke when a ping is received
+     * @url http://www.espruino.com/Reference#l_Wifi_ping
+     */
+    ping(hostname: any, callback: any): void;
+
+    /**
+     * Switch to using a higher communication speed with the WiFi module.
+     * * `true` = 921600 baud
+     * * `false` = 115200
+     * * `1843200` (or any number) = use a specific baud rate. * eg.
+     * `wifi.turbo(true,callback)` or `wifi.turbo(1843200,callback)`
+     *
+     * @param {any} enable - true (or a baud rate as a number) to enable, false to disable
+     * @param {any} callback - A `callback()` function to invoke when turbo mode has been set
+     * @url http://www.espruino.com/Reference#l_Wifi_turbo
+     */
+    turbo(enable: any, callback: any): void;
+  }
+
+  /**
+   * This library allows you to create http servers and make http requests
+   * In order to use this, you will need an extra module to get network connectivity
+   * such as the [TI CC3000](/CC3000) or [WIZnet W5500](/WIZnet).
+   * This is designed to be a cut-down version of the [node.js
+   * library](http://nodejs.org/api/http.html). Please see the [Internet](/Internet)
+   * page for more information on how to use it.
+   * @url http://www.espruino.com/Reference#http
+   */
+  http: {
+    /**
+     * Create an HTTP Server
+     * When a request to the server is made, the callback is called. In the callback
+     * you can use the methods on the response (`httpSRs`) to send data. You can also
+     * add `request.on('data',function() { ... })` to listen for POSTed data
+     *
+     * @param {any} callback - A function(request,response) that will be called when a connection is made
+     * @returns {any} Returns a new httpSrv object
+     * @url http://www.espruino.com/Reference#l_http_createServer
+     */
+    createServer(callback: any): httpSrv;
+
+    /**
+     * Create an HTTP Request - `end()` must be called on it to complete the operation.
+     * `options` is of the form:
+     * ```
+     * var options = {
+     *     host: 'example.com', // host name
+     *     port: 80,            // (optional) port, defaults to 80
+     *     path: '/',           // path sent to server
+     *     method: 'GET',       // HTTP command sent to server (must be uppercase 'GET', 'POST', etc)
+     *     protocol: 'http:',   // optional protocol - https: or http:
+     *     headers: { key : value, key : value } // (optional) HTTP headers
+     *   };
+     * var req = require("http").request(options, function(res) {
+     *   res.on('data', function(data) {
+     *     console.log("HTTP> "+data);
+     *   });
+     *   res.on('close', function(data) {
+     *     console.log("Connection closed");
+     *   });
+     * });
+     * // You can req.write(...) here if your request requires data to be sent.
+     * req.end(); // called to finish the HTTP request and get the response
+     * ```
+     * You can easily pre-populate `options` from a URL using `var options =
+     * url.parse("http://www.example.com/foo.html")`
+     * There's an example of using [`http.request` for HTTP POST
+     * here](/Internet#http-post)
+     * **Note:** if TLS/HTTPS is enabled, options can have `ca`, `key` and `cert`
+     * fields. See `tls.connect` for more information about these and how to use them.
+     *
+     * @param {any} options - An object containing host,port,path,method,headers fields (and also ca,key,cert if HTTPS is enabled)
+     * @param {any} callback - A function(res) that will be called when a connection is made. You can then call `res.on('data', function(data) { ... })` and `res.on('close', function() { ... })` to deal with the response.
+     * @returns {any} Returns a new httpCRq object
+     * @url http://www.espruino.com/Reference#l_http_request
+     */
+    request(options: any, callback: any): httpCRq;
+
+    /**
+     * Request a webpage over HTTP - a convenience function for `http.request()` that
+     * makes sure the HTTP command is 'GET', and that calls `end` automatically.
+     * ```
+     * require("http").get("http://pur3.co.uk/hello.txt", function(res) {
+     *   res.on('data', function(data) {
+     *     console.log("HTTP> "+data);
+     *   });
+     *   res.on('close', function(data) {
+     *     console.log("Connection closed");
+     *   });
+     * });
+     * ```
+     * See `http.request()` and [the Internet page](/Internet) and ` for more usage
+     * examples.
+     *
+     * @param {any} options - A simple URL, or an object containing host,port,path,method fields
+     * @param {any} callback - A function(res) that will be called when a connection is made. You can then call `res.on('data', function(data) { ... })` and `res.on('close', function() { ... })` to deal with the response.
+     * @returns {any} Returns a new httpCRq object
+     * @url http://www.espruino.com/Reference#l_http_get
+     */
+    get(options: any, callback: any): httpCRq;
+  }
+
+  /**
+   * This library provides TV out capability on the Espruino and Espruino Pico.
+   * See the [Television](/Television) page for more information.
+   * @url http://www.espruino.com/Reference#tv
+   */
+  tv: {
+    /**
+     * This initialises the TV output. Options for PAL are as follows:
+     * ```
+     * var g = require('tv').setup({ type : "pal",
+     *   video : A7, // Pin - SPI MOSI Pin for Video output (MUST BE SPI1)
+     *   sync : A6, // Pin - Timer pin to use for video sync
+     *   width : 384,
+     *   height : 270, // max 270
+     * });
+     * ```
+     * and for VGA:
+     * ```
+     * var g = require('tv').setup({ type : "vga",
+     *   video : A7, // Pin - SPI MOSI Pin for Video output (MUST BE SPI1)
+     *   hsync : A6, // Pin - Timer pin to use for video sync
+     *   vsync : A5, // Pin - pin to use for video sync
+     *   width : 220,
+     *   height : 240,
+     *   repeat : 2, // amount of times to repeat each line
+     * });
+     * ```
+     * or
+     * ```
+     * var g = require('tv').setup({ type : "vga",
+     *   video : A7, // Pin - SPI MOSI Pin for Video output (MUST BE SPI1)
+     *   hsync : A6, // Pin - Timer pin to use for video sync
+     *   vsync : A5, // Pin - pin to use for video sync
+     *   width : 220,
+     *   height : 480,
+     *   repeat : 1, // amount of times to repeat each line
+     * });
+     * ```
+     * See the [Television](/Television) page for more information.
+     *
+     * @param {any} options - Various options for the TV output
+     * @param {number} width
+     * @returns {any} A graphics object
+     * @url http://www.espruino.com/Reference#l_tv_setup
+     */
+    setup(options: any, width: number): any;
+  }
+
+  /**
+   * Simple library for compression/decompression using
+   * [heatshrink](https://github.com/atomicobject/heatshrink), an
+   * [LZSS](https://en.wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Storer%E2%80%93Szymanski)
+   * compression tool.
+   * Espruino uses heatshrink internally to compress RAM down to fit in Flash memory
+   * when `save()` is used. This just exposes that functionality.
+   * Functions here take and return buffers of data. There is no support for
+   * streaming, so both the compressed and decompressed data must be able to fit in
+   * memory at the same time.
+   * @url http://www.espruino.com/Reference#heatshrink
+   */
+  heatshrink: {
+    /**
+     *
+     * @param {any} data - The data to compress
+     * @returns {any} Returns the result as an ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_heatshrink_compress
+     */
+    compress(data: any): ArrayBuffer;
+
+    /**
+     *
+     * @param {any} data - The data to decompress
+     * @returns {any} Returns the result as an ArrayBuffer
+     * @url http://www.espruino.com/Reference#l_heatshrink_decompress
+     */
+    decompress(data: any): ArrayBuffer;
+  }
+
+  /**
+   * This library allows you to write to Neopixel/WS281x/APA10x/SK6812 LED strips
+   * These use a high speed single-wire protocol which needs platform-specific
+   * implementation on some devices - hence this library to simplify things.
+   * @url http://www.espruino.com/Reference#neopixel
+   */
+  neopixel: {
+    /**
+     * Write to a strip of NeoPixel/WS281x/APA104/APA106/SK6812-style LEDs attached to
+     * the given pin.
+     * ```
+     * // set just one pixel, red, green, blue
+     * require("neopixel").write(B15, [255,0,0]);
+     * ```
+     * ```
+     * // Produce an animated rainbow over 25 LEDs
+     * var rgb = new Uint8ClampedArray(25*3);
+     * var pos = 0;
+     * function getPattern() {
+     *   pos++;
+     *   for (var i=0;i<rgb.length;) {
+     *     rgb[i++] = (1 + Math.sin((i+pos)*0.1324)) * 127;
+     *     rgb[i++] = (1 + Math.sin((i+pos)*0.1654)) * 127;
+     *     rgb[i++] = (1 + Math.sin((i+pos)*0.1)) * 127;
+     *   }
+     *   return rgb;
+     * }
+     * setInterval(function() {
+     *   require("neopixel").write(B15, getPattern());
+     * }, 100);
+     * ```
+     * **Note:**
+     * * Different types of LED have the data in different orders - so don't be
+     * surprised by RGB or BGR orderings!
+     * * Some LED strips (SK6812) actually take 4 bytes per LED (red, green, blue and
+     * white). These are still supported but the array of data supplied must still be a
+     * multiple of 3 bytes long. Just round the size up - it won't cause any problems.
+     * * On some platforms like STM32, pins capable of hardware SPI MOSI are required.
+     * * Espruino devices tend to have 3.3v IO, while WS2812/etc run off of 5v. Many
+     * WS2812 will only register a logic '1' at 70% of their input voltage - so if
+     * powering them off 5v you will not be able to send them data reliably. You can
+     * work around this by powering the LEDs off a lower voltage (for example 3.7v from
+     * a LiPo battery), can put the output into the `af_opendrain` state and use a
+     * pullup resistor to 5v on STM32 based boards (nRF52 are not 5v tolerant so you
+     * can't do this), or can use a level shifter to shift the voltage up into the 5v
+     * range.
+     *
+     * @param {Pin} pin - The Pin the LEDs are connected to
+     * @param {any} data - The data to write to the LED strip (must be a multiple of 3 bytes long)
+     * @url http://www.espruino.com/Reference#l_neopixel_write
+     */
+    write(pin: Pin, data: any): void;
+  }
+
+  /**
+   * This module allows you to read and write part of the nonvolatile flash memory of
+   * your device using a filesystem-like API.
+   * Also see the `Flash` library, which provides a low level, more dangerous way to
+   * access all parts of your flash memory.
+   * The `Storage` library provides two distinct types of file:
+   * * `require("Storage").write(...)`/`require("Storage").read(...)`/etc create
+   * simple contiguous files of fixed length. This is the recommended file type.
+   * * `require("Storage").open(...)` creates a `StorageFile`, which stores the file
+   * in numbered chunks (`"filename\1"`/`"filename\2"`/etc). It allows data to be
+   * appended and for the file to be read line by line.
+   * You must read a file using the same method you used to write it - eg. you can't
+   * create a file with `require("Storage").open(...)` and then read it with
+   * `require("Storage").read(...)`.
+   * **Note:** In firmware 2v05 and later, the maximum length for filenames is 28
+   * characters. However in 2v04 and earlier the max length is 8.
+   * @url http://www.espruino.com/Reference#Storage
+   */
+  Storage: {
+    /**
+     * Erase the flash storage area. This will remove all files created with
+     * `require("Storage").write(...)` as well as any code saved with `save()` or
+     * `E.setBootCode()`.
+     * @url http://www.espruino.com/Reference#l_Storage_eraseAll
+     */
+    eraseAll(): void;
+
+    /**
+     * Erase a single file from the flash storage area.
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @url http://www.espruino.com/Reference#l_Storage_erase
+     */
+    erase(name: string): void;
+
+    /**
+     * Read a file from the flash storage area that has been written with
+     * `require("Storage").write(...)`.
+     * This function returns a memory-mapped String that points to the actual memory
+     * area in read-only memory, so it won't use up RAM.
+     * As such you can check if a file exists efficiently using
+     * `require("Storage").read(filename)!==undefined`.
+     * If you evaluate this string with `eval`, any functions contained in the String
+     * will keep their code stored in flash memory.
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @param {number} offset - (optional) The offset in bytes to start from
+     * @param {number} length - (optional) The length to read in bytes (if <=0, the entire file is read)
+     * @returns {any} A string of data, or `undefined` if the file is not found
+     * @url http://www.espruino.com/Reference#l_Storage_read
+     */
+    read(name: string, offset?: number, length?: number): string | undefined;
+
+    /**
+     * Read a file from the flash storage area that has been written with
+     * `require("Storage").write(...)`, and parse JSON in it into a JavaScript object.
+     * This is identical to `JSON.parse(require("Storage").read(...))`. It will throw
+     * an exception if the data in the file is not valid JSON.
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @param {boolean} noExceptions - If true and the JSON is not valid, just return `undefined` - otherwise an `Exception` is thrown
+     * @returns {any} An object containing parsed JSON from the file, or undefined
+     * @url http://www.espruino.com/Reference#l_Storage_readJSON
+     */
+    readJSON(name: string, noExceptions: boolean): any;
+
+    /**
+     * Read a file from the flash storage area that has been written with
+     * `require("Storage").write(...)`, and return the raw binary data as an
+     * ArrayBuffer.
+     * This can be used:
+     * * In a `DataView` with `new DataView(require("Storage").readArrayBuffer("x"))`
+     * * In a `Uint8Array/Float32Array/etc` with `new
+     *   Uint8Array(require("Storage").readArrayBuffer("x"))`
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @returns {any} An ArrayBuffer containing data from the file, or undefined
+     * @url http://www.espruino.com/Reference#l_Storage_readArrayBuffer
+     */
+    readArrayBuffer(name: string): ArrayBuffer | undefined;
+
+    /**
+     * Write/create a file in the flash storage area. This is nonvolatile and will not
+     * disappear when the device resets or power is lost.
+     * Simply write `require("Storage").write("MyFile", "Some data")` to write a new
+     * file, and `require("Storage").read("MyFile")` to read it.
+     * If you supply:
+     * * A String, it will be written as-is
+     * * An array, will be written as a byte array (but read back as a String)
+     * * An object, it will automatically be converted to a JSON string before being
+     * written.
+     * **Note:** If an array is supplied it will not be converted to JSON. To be
+     * explicit about the conversion you can use `Storage.writeJSON`
+     * You may also create a file and then populate data later **as long as you don't
+     * try and overwrite data that already exists**. For instance:
+     * ```
+     * var f = require("Storage");
+     * f.write("a","Hello",0,14);
+     * f.write("a"," ",5);
+     * f.write("a","World!!!",6);
+     * print(f.read("a")); // "Hello World!!!"
+     * f.write("a"," ",0); // Writing to location 0 again will cause the file to be re-written
+     * print(f.read("a")); // " "
+     * ```
+     * This can be useful if you've got more data to write than you have RAM
+     * available - for instance the Web IDE uses this method to write large files into
+     * onboard storage.
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @param {any} data - The data to write
+     * @param {number} [offset] - [optional] The offset within the file to write
+     * @param {number} [size] - [optional] The size of the file (if a file is to be created that is bigger than the data)
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_Storage_write
+     */
+    write(name: string | ArrayBuffer | ArrayBufferView | number[] | object, data: any, offset?: number, size?: number): boolean;
+
+    /**
+     * Write/create a file in the flash storage area. This is nonvolatile and will not
+     * disappear when the device resets or power is lost.
+     * Simply write `require("Storage").writeJSON("MyFile", [1,2,3])` to write a new
+     * file, and `require("Storage").readJSON("MyFile")` to read it.
+     * This is equivalent to: `require("Storage").write(name, JSON.stringify(data))`
+     * **Note:** This function should be used with normal files, and not `StorageFile`s
+     * created with `require("Storage").open(filename, ...)`
+     *
+     * @param {any} name - The filename - max 28 characters (case sensitive)
+     * @param {any} data - The JSON data to write
+     * @returns {boolean} True on success, false on failure
+     * @url http://www.espruino.com/Reference#l_Storage_writeJSON
+     */
+    writeJSON(name: string, data: any): boolean;
+
+    /**
+     * List all files in the flash storage area. An array of Strings is returned.
+     * By default this lists files created by `StorageFile` (`require("Storage").open`)
+     * which have a file number (`"\1"`/`"\2"`/etc) appended to them.
+     * ```
+     * // All files
+     * require("Storage").list()
+     * // Files ending in '.js'
+     * require("Storage").list(/\.js$/)
+     * // All Storage Files
+     * require("Storage").list(undefined, {sf:true})
+     * // All normal files (eg created with Storage.write)
+     * require("Storage").list(undefined, {sf:false})
+     * ```
+     * **Note:** This will output system files (eg. saved code) as well as files that
+     * you may have written.
+     *
+     * @param {any} regex - (optional) If supplied, filenames are checked against this regular expression (with `String.match(regexp)`) to see if they match before being returned
+     * @param {any} filter - (optional) If supplied, File Types are filtered based on this: `{sf:true}` or `{sf:false}` for whether to show StorageFile
+     * @returns {any} An array of filenames
+     * @url http://www.espruino.com/Reference#l_Storage_list
+     */
+    list(regex?: RegExp, filter?: { sf: boolean }): string[];
+
+    /**
+     * List all files in the flash storage area matching the specfied regex (ignores
+     * StorageFiles), and then hash their filenames *and* file locations.
+     * Identical files may have different hashes (eg. if Storage is compacted and the
+     * file moves) but the changes of different files having the same hash are
+     * extremely small.
+     * ```
+     * // Hash files
+     * require("Storage").hash()
+     * // Files ending in '.boot.js'
+     * require("Storage").hash(/\.boot\.js$/)
+     * ```
+     * **Note:** This function is used by Bangle.js as a way to cache files. For
+     * instance the bootloader will add all `.boot.js` files together into a single
+     * `.boot0` file, but it needs to know quickly whether anything has changed.
+     *
+     * @param {any} regex - (optional) If supplied, filenames are checked against this regular expression (with `String.match(regexp)`) to see if they match before being hashed
+     * @returns {number} A hash of the files matching
+     * @url http://www.espruino.com/Reference#l_Storage_hash
+     */
+    hash(regex: RegExp): number;
+
+    /**
+     * The Flash Storage system is journaling. To make the most of the limited write
+     * cycles of Flash memory, Espruino marks deleted/replaced files as garbage and
+     * moves on to a fresh part of flash memory. Espruino only fully erases those files
+     * when it is running low on flash, or when `compact` is called.
+     * `compact` may fail if there isn't enough RAM free on the stack to use as swap
+     * space, however in this case it will not lose data.
+     * **Note:** `compact` rearranges the contents of memory. If code is referencing
+     * that memory (eg. functions that have their code stored in flash) then they may
+     * become garbled when compaction happens. To avoid this, call `eraseFiles` before
+     * uploading data that you intend to reference to ensure that uploaded files are
+     * right at the start of flash and cannot be compacted further.
+     * @url http://www.espruino.com/Reference#l_Storage_compact
+     */
+    compact(): void;
+
+    /**
+     * This writes information about all blocks in flash memory to the console - and is
+     * only useful for debugging flash storage.
+     * @url http://www.espruino.com/Reference#l_Storage_debug
+     */
+    debug(): void;
+
+    /**
+     * Return the amount of free bytes available in Storage. Due to fragmentation there
+     * may be more bytes available, but this represents the maximum size of file that
+     * can be written.
+     * @returns {number} The amount of free bytes
+     * @url http://www.espruino.com/Reference#l_Storage_getFree
+     */
+    getFree(): number;
+
+    /**
+     * Returns:
+     * ```
+     * {
+     *   totalBytes // Amount of bytes in filesystem
+     *   freeBytes // How many bytes are left at the end of storage?
+     *   fileBytes // How many bytes of allocated files do we have?
+     *   fileCount // How many allocated files do we have?
+     *   trashBytes // How many bytes of trash files do we have?
+     *   trashCount // How many trash files do we have?
+     * }
+     * ```
+     * @returns {any} An object containing info about the current Storage system
+     * @url http://www.espruino.com/Reference#l_Storage_getStats
+     */
+    getStats(): any;
+
+    /**
+     * Writes a lookup table for files into Bangle.js's storage. This allows any file
+     * stored up to that point to be accessed quickly.
+     * @url http://www.espruino.com/Reference#l_Storage_optimise
+     */
+    optimise(): void;
+
+    /**
+     * Open a file in the Storage area. This can be used for appending data
+     * (normal read/write operations only write the entire file).
+     * Please see `StorageFile` for more information (and examples).
+     * **Note:** These files write through immediately - they do not need closing.
+     *
+     * @param {any} name - The filename - max **27** characters (case sensitive)
+     * @param {any} mode - The open mode - must be either `'r'` for read,`'w'` for write , or `'a'` for append
+     * @returns {any} An object containing {read,write,erase}
+     * @url http://www.espruino.com/Reference#l_Storage_open
+     */
+    open(name: string, mode: "r" | "w" | "a"): StorageFile;
+  }
+
+  /**
+   * This module allows you to read and write the nonvolatile flash memory of your
+   * device.
+   * Also see the `Storage` library, which provides a safer file-like interface to
+   * nonvolatile storage.
+   * It should be used with extreme caution, as it is easy to overwrite parts of
+   * Flash memory belonging to Espruino or even its bootloader. If you damage the
+   * bootloader then you may need external hardware such as a USB-TTL converter to
+   * restore it. For more information on restoring the bootloader see `Advanced
+   * Reflashing` in your board's reference pages.
+   * To see which areas of memory you can and can't overwrite, look at the values
+   * reported by `process.memory()`.
+   * **Note:** On Nordic platforms there are checks in place to help you avoid
+   * 'bricking' your device be damaging the bootloader. You can disable these with
+   * `E.setFlags({unsafeFlash:1})`
+   * @url http://www.espruino.com/Reference#Flash
+   */
+  Flash: {
+    /**
+     * Returns the start and length of the flash page containing the given address.
+     *
+     * @param {number} addr - An address in memory
+     * @returns {any} An object of the form `{ addr : #, length : #}`, where `addr` is the start address of the page, and `length` is the length of it (in bytes). Returns undefined if no page at address
+     * @url http://www.espruino.com/Reference#l_Flash_getPage
+     */
+    getPage(addr: number): any;
+
+    /**
+     * This method returns an array of objects of the form `{addr : #, length : #}`,
+     * representing contiguous areas of flash memory in the chip that are not used for
+     * anything.
+     * The memory areas returned are on page boundaries. This means that you can safely
+     * erase the page containing any address here, and you won't risk deleting part of
+     * the Espruino firmware.
+     * @returns {any} Array of objects with `addr` and `length` properties
+     * @url http://www.espruino.com/Reference#l_Flash_getFree
+     */
+    getFree(): any;
+
+    /**
+     * Erase a page of flash memory
+     *
+     * @param {any} addr - An address in the page that is to be erased
+     * @url http://www.espruino.com/Reference#l_Flash_erasePage
+     */
+    erasePage(addr: any): void;
+
+    /**
+     * Write data into memory at the given address
+     * In flash memory you may only turn bits that are 1 into bits that are 0. If
+     * you're writing data into an area that you have already written (so `read`
+     * doesn't return all `0xFF`) you'll need to call `erasePage` to clear the entire
+     * page.
+     *
+     * @param {any} data - The data to write
+     * @param {number} addr - The address to start writing from
+     * @url http://www.espruino.com/Reference#l_Flash_write
+     */
+    write(data: any, addr: number): void;
+
+    /**
+     * Read flash memory from the given address
+     *
+     * @param {number} length - The amount of data to read (in bytes)
+     * @param {number} addr - The address to start reading from
+     * @returns {any} A Uint8Array of data
+     * @url http://www.espruino.com/Reference#l_Flash_read
+     */
+    read(length: number, addr: number): any;
+  }
+}
diff --git a/typescript/types/other.d.ts b/typescript/types/other.d.ts
new file mode 100644
index 000000000..2a58b9fe1
--- /dev/null
+++ b/typescript/types/other.d.ts
@@ -0,0 +1,11 @@
+// Required for TypeScript to work properly
+interface NewableFunction extends Function {}
+interface CallableFunction extends Function {}
+interface IArguments {
+  [index: number]: any;
+  length: number;
+  callee: Function;
+}
+
+// Helper type
+type Exclude<T, U> = T extends U ? never : T;
diff --git a/typescript/types/package.json b/typescript/types/package.json
new file mode 100644
index 000000000..7259e2ab0
--- /dev/null
+++ b/typescript/types/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "banglejs",
+  "version": "1.0.0",
+  "typings": "main.d.ts"
+}